From 2b344542143af3cab374f1c70eb720b31351ecac Mon Sep 17 00:00:00 2001 From: m2049r Date: Wed, 10 Mar 2021 19:29:10 +0100 Subject: [PATCH] Fix restoreheights prior to 2014 (#723) * fix pre-2014 dates * update heights --- .../main/java/com/m2049r/xmrwallet/GenerateFragment.java | 6 +++--- .../main/java/com/m2049r/xmrwallet/util/RestoreHeight.java | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java index fd6da0b..079956f 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java @@ -378,7 +378,7 @@ public class GenerateFragment extends Fragment { } private long getHeight() { - long height = 0; + long height = -1; String restoreHeight = etWalletRestoreHeight.getEditText().getText().toString().trim(); if (restoreHeight.isEmpty()) return -1; @@ -389,7 +389,7 @@ public class GenerateFragment extends Fragment { height = RestoreHeight.getInstance().getHeight(parser.parse(restoreHeight)); } catch (ParseException ex) { } - if ((height <= 0) && (restoreHeight.length() == 8)) + if ((height < 0) && (restoreHeight.length() == 8)) try { // is it a date without dashes? SimpleDateFormat parser = new SimpleDateFormat("yyyyMMdd"); @@ -397,7 +397,7 @@ public class GenerateFragment extends Fragment { height = RestoreHeight.getInstance().getHeight(parser.parse(restoreHeight)); } catch (ParseException ex) { } - if (height <= 0) + if (height < 0) try { // or is it a height? height = Long.parseLong(restoreHeight); 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 0ca4582..f0177d3 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/RestoreHeight.java +++ b/app/src/main/java/com/m2049r/xmrwallet/util/RestoreHeight.java @@ -121,6 +121,10 @@ public class RestoreHeight { blockheight.put("2020-09-01", 2176790L); blockheight.put("2020-10-01", 2198370L); blockheight.put("2020-11-01", 2220670L); + blockheight.put("2020-12-01", 2242241L); + blockheight.put("2021-01-01", 2264584L); + blockheight.put("2021-02-01", 2286892L); + blockheight.put("2021-03-01", 2307079L); } public long getHeight(String date) {