From 95e6562386471b9da9905953361c262a262b6ac1 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 29 Sep 2017 23:41:27 +0200
Subject: [PATCH] fix more NPEs in ManageSecurityTokenFragment

---
 .../ui/token/ManageSecurityTokenFragment.java  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenFragment.java
index a92541f6c..e62675bef 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenFragment.java
@@ -146,6 +146,8 @@ public class ManageSecurityTokenFragment extends Fragment implements ManageSecur
         super.onDestroyView();
 
         presenter.detach();
+        currentImportKeyringParcel = null;
+        currentPromoteKeyringParcel = null;
     }
 
     @Override
@@ -462,12 +464,20 @@ public class ManageSecurityTokenFragment extends Fragment implements ManageSecur
 
                 @Override
                 public void onCryptoOperationSuccess(ImportKeyResult result) {
+                    if (currentImportKeyringParcel == null) {
+                        return;
+                    }
+
                     currentImportKeyringParcel = null;
                     presenter.onImportSuccess(result);
                 }
 
                 @Override
                 public void onCryptoOperationError(ImportKeyResult result) {
+                    if (currentImportKeyringParcel == null) {
+                        return;
+                    }
+
                     currentImportKeyringParcel = null;
                     presenter.onImportError(result);
                 }
@@ -482,12 +492,20 @@ public class ManageSecurityTokenFragment extends Fragment implements ManageSecur
 
                 @Override
                 public void onCryptoOperationSuccess(PromoteKeyResult result) {
+                    if (currentPromoteKeyringParcel == null) {
+                        return;
+                    }
+
                     currentPromoteKeyringParcel = null;
                     presenter.onPromoteSuccess(result);
                 }
 
                 @Override
                 public void onCryptoOperationError(PromoteKeyResult result) {
+                    if (currentPromoteKeyringParcel == null) {
+                        return;
+                    }
+
                     currentPromoteKeyringParcel = null;
                     presenter.onPromoteError(result);
                 }