From dcbaa35b5765f4b6a867335c5d993573a9ffacc0 Mon Sep 17 00:00:00 2001
From: m2049r <30435443+m2049r@users.noreply.github.com>
Date: Tue, 17 Oct 2017 14:48:45 +0200
Subject: [PATCH] avoid calling isAddressValid with null address

---
 app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
index 481df90..4dfb332 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -699,7 +699,7 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
             amount = Wallet.getAmountFromString(amountString);
         }
         if ((paymentId != null) && !Wallet.isPaymentIdValid(paymentId)) {
-            address = null;
+            return null;
         }
 
         if (Wallet.isAddressValid(address, WalletManager.getInstance().isTestNet())) {
@@ -757,4 +757,4 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
     public void onExchange(AsyncExchangeRate.Listener listener, String currencyA, String currencyB) {
         new AsyncExchangeRate(listener).execute(currencyA, currencyB);
     }
-}
\ No newline at end of file
+}