v4.65.12.1S - address crashing issue on app start up by resetting blo…

…ckchain
dashpay · Mar 16, 2017 · 1763da7 · 1763da7
1 parent cd97513
commit 1763da7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml
@@ -3,8 +3,8 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	package="hashengineering.darkcoin.wallet"
 	android:installLocation="internalOnly"
-	android:versionCode="40055"
-	android:versionName="4.65.12.1R" >
+	android:versionCode="40056"
+	android:versionName="4.65.12.1S" >
 	<uses-sdk
 		android:minSdkVersion="15"
 		android:targetSdkVersion="23"

diff --git a/wallet/src/de/schildbach/wallet/WalletApplication.java b/wallet/src/de/schildbach/wallet/WalletApplication.java
@@ -167,7 +167,18 @@ private void afterLoadWallet()
 		wallet.autosaveToFile(walletFile, 10, TimeUnit.SECONDS, new WalletAutosaveEventListener());
 
 		// clean up spam
-		wallet.cleanup();
+		try {
+			wallet.cleanup();
+            //throw new IllegalStateException("Inconsistent spent tx:  77");
+		}
+		catch(IllegalStateException x) {
+			if(x.getMessage().contains("Inconsistent spent tx:"))
+			{
+				File blockChainFile = new File(getDir("blockstore", Context.MODE_PRIVATE), Constants.Files.BLOCKCHAIN_FILENAME);
+				blockChainFile.delete();
+			}
+			else throw x;
+		}
 
 		migrateBackup();
 	}

diff --git a/wallet/src/de/schildbach/wallet/ui/InputParser.java b/wallet/src/de/schildbach/wallet/ui/InputParser.java
@@ -79,7 +79,7 @@ public abstract static class StringInputParser extends InputParser
 
 		public StringInputParser(final String input)
 		{
-			this.input = input;
+			this.input = input.trim();
 		}
 
 		@Override