Merge pull request #1327 from adithyaphilip/fix-null

Prevent NullPointerException due to Activity death

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 5251f5949..06d824f94 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -263,7 +263,7 @@ public class ImportKeysActivity extends BaseNfcActivity {
         // However, if we're being restored from a previous state,
         // then we don't need to do anything and should return or else
         // we could end up with overlapping fragments.
-        if (savedInstanceState != null) {
+        if (mListFragment != null) {
             return;
         }
 
@@ -283,7 +283,7 @@ public class ImportKeysActivity extends BaseNfcActivity {
         // However, if we're being restored from a previous state,
         // then we don't need to do anything and should return or else
         // we could end up with overlapping fragments.
-        if (savedInstanceState != null) {
+        if (mTopFragment != null) {
             return;
         }
 
@@ -314,7 +314,7 @@ public class ImportKeysActivity extends BaseNfcActivity {
         // However, if we're being restored from a previous state,
         // then we don't need to do anything and should return or else
         // we could end up with overlapping fragments.
-        if (savedInstanceState != null) {
+        if (mTopFragment != null) {
             return;
         }