WalletApplication: Fix RuntimeException if wallet was auto-restored.

dexter4life · Apr 13, 2018 · e3f9c9c · e3f9c9c
1 parent 6f9676c
commit e3f9c9c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/wallet/src/de/schildbach/wallet/WalletApplication.java b/wallet/src/de/schildbach/wallet/WalletApplication.java
@@ -46,6 +46,7 @@
 import de.schildbach.wallet.service.BlockchainService;
 import de.schildbach.wallet.util.Bluetooth;
 import de.schildbach.wallet.util.CrashReporter;
+import de.schildbach.wallet.util.Toast;
 import de.schildbach.wallet.util.WalletUtils;
 
 import android.app.ActivityManager;
@@ -192,10 +193,14 @@ private void loadWalletFromProtobuf() {
                     } catch (final IOException | UnreadableWalletException x) {
                         log.warn("problem loading wallet, auto-restoring: " + walletFile, x);
                         wallet = WalletUtils.restoreWalletFromAutoBackup(WalletApplication.this);
+                        if (wallet != null)
+                            new Toast(WalletApplication.this).postLongToast(R.string.toast_wallet_reset);
                     }
                     if (!wallet.isConsistent()) {
                         log.warn("inconsistent wallet, auto-restoring: " + walletFile);
                         wallet = WalletUtils.restoreWalletFromAutoBackup(WalletApplication.this);
+                        if (wallet != null)
+                            new Toast(WalletApplication.this).postLongToast(R.string.toast_wallet_reset);
                     }
 
                     if (!wallet.getParams().equals(Constants.NETWORK_PARAMETERS))

diff --git a/wallet/src/de/schildbach/wallet/util/WalletUtils.java b/wallet/src/de/schildbach/wallet/util/WalletUtils.java
@@ -59,7 +59,6 @@
 import com.google.common.base.Stopwatch;
 
 import de.schildbach.wallet.Constants;
-import de.schildbach.wallet.R;
 import de.schildbach.wallet.service.BlockchainService;
 
 import android.content.Context;
@@ -69,7 +68,6 @@
 import android.text.SpannedString;
 import android.text.format.DateUtils;
 import android.text.style.TypefaceSpan;
-import android.widget.Toast;
 
 /**
  * @author Andreas Schildbach
@@ -216,7 +214,6 @@ public static Wallet restoreWalletFromAutoBackup(final Context context) {
                 throw new Error("inconsistent backup");
 
             BlockchainService.resetBlockchain(context);
-            Toast.makeText(context, R.string.toast_wallet_reset, Toast.LENGTH_LONG).show();
             log.info("wallet restored from backup: '" + Constants.Files.WALLET_KEY_BACKUP_PROTOBUF + "'");
             return wallet;
         } catch (final IOException | UnreadableWalletException x) {