Merge commit '8bb75c3' into mainnet

ACINQ · Sep 12, 2018 · 073efc6 · 073efc6
2 parents f184819 + 8bb75c3
commit 073efc6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
     minSdkVersion 21
     targetSdkVersion 27
     versionCode 23
-    versionName "0.3.7"
+    versionName "0.3.8-DEV"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     multiDexEnabled true
   }
@@ -71,7 +71,7 @@ dependencies {
   implementation 'org.slf4j:slf4j-api:1.7.25'
   implementation 'com.github.tony19:logback-android:1.1.1-12'
   // eclair core
-  implementation 'fr.acinq.eclair:eclair-core_2.11:0.2-android-beta10'
+  implementation 'fr.acinq.eclair:eclair-core_2.11:0.2-android-beta11'
   // database orm
   implementation 'org.greenrobot:greendao:3.2.2'
   // required for greendao encryption, disabled for now

diff --git a/app/src/main/java/fr/acinq/eclair/wallet/activities/HomeActivity.java b/app/src/main/java/fr/acinq/eclair/wallet/activities/HomeActivity.java
@@ -501,8 +501,12 @@ public void popinSyncProgress(final View view) {
   @Subscribe(threadMode = ThreadMode.MAIN)
   public void handleSyncProgressEvent(SyncProgress progress) {
     final int p = (int) (progress.progress() * 100);
-    if (p == 100) {
+    if (p >= 100) {
       mBinding.syncProgressIcon.clearAnimation();
+    } else {
+      if (mBinding.syncProgressIcon.getAnimation() == null || mBinding.syncProgressIcon.getAnimation().hasEnded()) {
+        mBinding.syncProgressIcon.startAnimation(mRotatingAnimation);
+      }
     }
     mBinding.setSyncProgress(p);
   }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -44,7 +44,7 @@
   <string name="home_sync_progress_about"><![CDATA[
   The wallet is currently downloading an up-to-date map of the Lightning Network. Lightning payments might fail until synchronization is complete.
   <br><br>
-  Note that this wallet computes its payments route on-device to protect your privacy.
+  Note that this wallet computes payments routes on-device to protect your privacy.
   ]]></string>
   <string name="home_no_backup">NO BACKUP</string>
   <string name="home_backup_disabled_icon_desc">Channels backup is disabled!</string>