From c6aa04e986d47d2df5596d37879c514e25dd5720 Mon Sep 17 00:00:00 2001 From: m2049r Date: Sun, 8 Mar 2020 20:33:34 +0100 Subject: [PATCH] update heights & fix date parsing bug (#654) --- app/build.gradle | 2 +- app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java | 2 +- .../main/java/com/m2049r/xmrwallet/util/RestoreHeight.java | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bacc2f1..f7a4a24 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { minSdkVersion 21 targetSdkVersion 28 versionCode 201 - versionName "1.12.11 'Caerbannog'" + versionName "1.12.12 'Caerbannog'" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java index e1b4603..0d2e317 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java @@ -438,7 +438,7 @@ public class GenerateFragment extends Fragment { height = RestoreHeight.getInstance().getHeight(parser.parse(restoreHeight)); } catch (ParseException ex) { } - if (height <= 0) + if ((height <= 0) && (restoreHeight.length() == 8)) try { // is it a date without dashes? SimpleDateFormat parser = new SimpleDateFormat("yyyyMMdd"); diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/RestoreHeight.java b/app/src/main/java/com/m2049r/xmrwallet/util/RestoreHeight.java index 1bc4e1f..c8aebe1 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/RestoreHeight.java +++ b/app/src/main/java/com/m2049r/xmrwallet/util/RestoreHeight.java @@ -109,6 +109,10 @@ public class RestoreHeight { blockheight.put("2019-09-01", 1913201L); blockheight.put("2019-10-01", 1934732L); blockheight.put("2019-11-01", 1957051L); + blockheight.put("2019-12-01", 1978433L); + blockheight.put("2020-01-01", 2001315L); + blockheight.put("2020-02-01", 2023656L); + blockheight.put("2020-03-01", 2044552L); } public long getHeight(String date) {