catch NPE (#655)

m2049r · Mar 8, 2020 · 9c92118 · 9c92118
1 parent b978396
commit 9c92118
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeEditText.java b/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeEditText.java
@@ -68,15 +68,19 @@ public boolean validate(double max, double min) {
         }
         boolean ok = true;
         String nativeAmount = getNativeAmount();
-        try {
-            double amount = Double.parseDouble(nativeAmount);
-            if ((amount < min) || (amount > max)) {
+        if (nativeAmount == null) {
+            ok = false;
+        } else {
+            try {
+                double amount = Double.parseDouble(nativeAmount);
+                if ((amount < min) || (amount > max)) {
+                    ok = false;
+                }
+            } catch (NumberFormatException ex) {
+                // this cannot be
+                Timber.e(ex.getLocalizedMessage());
                 ok = false;
             }
-        } catch (NumberFormatException ex) {
-            // this cannot be
-            Timber.e(ex.getLocalizedMessage());
-            ok = false;
         }
         if (!ok) {
             shakeAmountField();