From 38a825d58083a1530bd2e2dfccb5ac902199f585 Mon Sep 17 00:00:00 2001 From: m2049r Date: Tue, 13 Nov 2018 22:32:31 +0100 Subject: [PATCH] avoid possible NPE (#471) --- app/src/main/java/com/m2049r/xmrwallet/util/Helper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java b/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java index 42bb8b8..705d583 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java +++ b/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java @@ -438,8 +438,10 @@ public class Helper { if (result) { Helper.hideKeyboardAlways((Activity) context); cancelSignal.cancel(); - openDialog.dismiss(); - openDialog = null; + if (openDialog != null) { // maybe it was cancelled in the meantime + openDialog.dismiss(); + openDialog = null; + } } else { if (fingerprintUsed) { incorrectSavedPass.set(true); @@ -458,7 +460,6 @@ public class Helper { etPassword.setError(context.getString(R.string.bad_password)); } } - loginTask = null; } }