fix: blockchainservice ANR's

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         kotlin_version = '1.9.23'
         coroutinesVersion = '1.6.4'
         ok_http_version = '4.9.1'
-        dashjVersion = '21.1.3'
+        dashjVersion = '21.1.5-SNAPSHOT'
         dppVersion = "1.5.1-SNAPSHOT"
         hiltVersion = '2.51'
         hiltCompilerVersion = '1.2.0'

wallet/res/values-eo/strings.xml

@@ -7,7 +7,7 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d tagoj malantaŭ</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d semajnoj malantaŭ</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d monatoj malantaŭ</string>
-    <string name="blockchain_state_progress_downloading">Sinkronigado kun reto</string>
+    <string name="blockchain_state_progress_downloading">Sinkronigado kun reto (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Sinkronigo stagnis</string>
     <string name="blockchain_state_progress_problem_storage">Sinkronigado: Stokante problemo</string>
     <string name="blockchain_state_progress_problem_network">Sinkronigado: Reta problemo</string>

wallet/res/values-he/strings.xml

@@ -7,7 +7,7 @@
   <string name="blockchain_state_progress_days">%1$s, %2$d ימי איחור</string>
   <string name="blockchain_state_progress_weeks">%1$s, %2$d שבועות איחור</string>
   <string name="blockchain_state_progress_months">%1$s, %2$d חודשי איחור</string>
-  <string name="blockchain_state_progress_downloading">מסנכרן רשת</string>
+  <string name="blockchain_state_progress_downloading">(%1$s%%) מסנכרן רשת</string>
   <string name="blockchain_state_progress_stalled">סינכרון עוקב</string>
   <string name="blockchain_state_progress_problem_storage">סינכרון: בעיית אחסון</string>
   <string name="blockchain_state_progress_problem_network">סינכרון:בעיית רשת</string>

wallet/res/values-hr/strings.xml

@@ -5,7 +5,7 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d dani iza</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d tjedana iza</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d mjeseci iza</string>
-    <string name="blockchain_state_progress_downloading">Sinkroniziranje sa mrežom</string>
+    <string name="blockchain_state_progress_downloading">Sinkroniziranje sa mrežom (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Sinkronizacija u zastoju</string>
     <string name="blockchain_state_progress_problem_storage">Sinkroniziranje: Spremišni problem</string>
     <string name="blockchain_state_progress_problem_network">Sinkroniziranje: Mrežni problem</string>

wallet/res/values-iw/strings.xml

@@ -8,7 +8,7 @@
 	<string name="blockchain_state_progress_days">%1$s, %2$d ימי איחור</string>
 	<string name="blockchain_state_progress_weeks">%1$s, %2$d שבועות איחור</string>
 	<string name="blockchain_state_progress_months">%1$s, %2$d חודשי איחור</string>
-	<string name="blockchain_state_progress_downloading">מסנכרן רשת</string>
+	<string name="blockchain_state_progress_downloading">מסנכרן רשת (%1$s%%)</string>
 	<string name="blockchain_state_progress_stalled">סינכרון עוקב</string>
 	<string name="blockchain_state_progress_problem_storage">סינכרון: בעיית אחסון</string>
 	<string name="blockchain_state_progress_problem_network">סינכרון:בעיית רשת</string>

wallet/res/values-mk/strings.xml

@@ -7,7 +7,7 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d денови заостанува</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d недели заостанува</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d месеци заостанува</string>
-    <string name="blockchain_state_progress_downloading">Се синхронизира со мрежата</string>
+    <string name="blockchain_state_progress_downloading">Се синхронизира со мрежата (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Синхронизацијата застана</string>
     <string name="blockchain_state_progress_problem_storage">Се синхронизира: Проблем со простор за складирање</string>
     <string name="blockchain_state_progress_problem_network">Се синхронизира: Проблем со мрежата</string>

wallet/res/values-sw/strings.xml

@@ -7,7 +7,7 @@
   <string name="blockchain_state_progress_days">siku %1$s, %2$d mwishoni mwa</string>
   <string name="blockchain_state_progress_weeks">wiki %1$s, %2$d marehemu</string>
   <string name="blockchain_state_progress_months">miezi %1$s, %2$d marehemu</string>
-  <string name="blockchain_state_progress_downloading">Sambamba na mtandao</string>
+  <string name="blockchain_state_progress_downloading">Sambamba na mtandao (%1$s%%)</string>
   <string name="blockchain_state_progress_stalled">Sambamba kusimamishwa</string>
   <string name="blockchain_state_progress_problem_storage">Haitoshi disc nafasi</string>
   <string name="blockchain_state_progress_problem_network">Hakuna signal wa mtandao</string>

wallet/src/de/schildbach/wallet/WalletApplication.java

@@ -60,6 +60,7 @@
 import org.bitcoinj.core.TransactionBag;
 import org.bitcoinj.core.VerificationException;
 import org.bitcoinj.crypto.LinuxSecureRandom;
+import org.bitcoinj.manager.DashSystem;
 import org.bitcoinj.utils.Threading;
 import org.bitcoinj.core.VersionMessage;
 import org.bitcoinj.crypto.IKey;
@@ -90,6 +91,7 @@
 import ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy;
 import ch.qos.logback.core.util.FileSize;
 import de.schildbach.wallet.service.BlockchainStateDataProvider;
+import de.schildbach.wallet.service.DashSystemService;
 import de.schildbach.wallet.service.PackageInfoProvider;
 import de.schildbach.wallet.service.WalletFactory;
 import de.schildbach.wallet.transactions.MasternodeObserver;
@@ -172,7 +174,6 @@ public class WalletApplication extends MultiDexApplication
 
     private File walletFile;
     private Wallet wallet;
-
     public static final String ACTION_WALLET_REFERENCE_CHANGED = WalletApplication.class.getPackage().getName()
             + ".wallet_reference_changed";
 
@@ -190,6 +191,7 @@ public class WalletApplication extends MultiDexApplication
 
     private AutoLogout autoLogout;
     private AnrSupervisor anrSupervisor;
+    private Function0 afterWipeFunction;
 
     @Inject
     RestartService restartService;
@@ -211,6 +213,8 @@ public class WalletApplication extends MultiDexApplication
     PackageInfoProvider packageInfoProvider;
     @Inject
     WalletFactory walletFactory;
+    @Inject
+    DashSystemService dashSystemService;
 
     @Override
     protected void attachBaseContext(Context base) {
@@ -431,7 +435,7 @@ public void saveWalletAndFinalizeInitialization() {
     }
 
     public void finalizeInitialization() {
-        wallet.getContext().initDash(true, true, Constants.SYNC_FLAGS, Constants.VERIFY_FLAGS);
+        dashSystemService.getSystem().initDash(true, true, Constants.SYNC_FLAGS, Constants.VERIFY_FLAGS);
 
         if (config.versionCodeCrossed(packageInfoProvider.getVersionCode(), VERSION_CODE_SHOW_BACKUP_REMINDER)
                 && !wallet.getImportedKeys().isEmpty()) {
@@ -972,8 +976,9 @@ else if (lastUsedAgo < Constants.LAST_USAGE_THRESHOLD_RECENTLY_MS)
     /**
      * Removes all the data and restarts the app showing onboarding screen.
      */
-    public void triggerWipe() {
+    public void triggerWipe(Function0 afterWipeFunction) {
         log.info("Removing all the data and restarting the app.");
+        this.afterWipeFunction = afterWipeFunction;
         startService(new Intent(BlockchainService.ACTION_WIPE_WALLET, null, this, BlockchainServiceImpl.class));
     }
 
@@ -1016,6 +1021,9 @@ public void finalizeWipe() {
         // wallet must be null for the OnboardingActivity flow
         log.info("removing wallet from memory during wipe");
         wallet = null;
+        if (afterWipeFunction != null)
+            afterWipeFunction.invoke();
+        afterWipeFunction = null;
     }
 
     public AnalyticsService getAnalyticsService() {

wallet/src/de/schildbach/wallet/di/AppModule.kt

@@ -157,4 +157,8 @@ abstract class AppModule {
     @Binds
     @Singleton
     abstract fun bindZenLedgerClient(zenLedgerClient: ZenLedgerClient): ZenLedgerApi
+
+    @Singleton
+    @Binds
+    abstract fun provideDashSystemService(dashSystemService: DashSystemServiceImpl): DashSystemService
 }