diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-08 09:55:13 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-08 09:55:13 +0200 |
commit | 69c8ecd553e96f42799f16947501f102f86a5ac0 (patch) | |
tree | 369693600cef085e63bafaf9c6aba89adf4692b7 | |
parent | 7cfc0d80d0b4318ce1ae027536d70c2cda4c8605 (diff) | |
parent | 82f3d70224c91fcaef78128b861eec3c2d99da07 (diff) | |
download | open-keychain-69c8ecd553e96f42799f16947501f102f86a5ac0.tar.gz open-keychain-69c8ecd553e96f42799f16947501f102f86a5ac0.tar.bz2 open-keychain-69c8ecd553e96f42799f16947501f102f86a5ac0.zip |
Merge pull request #1327 from adithyaphilip/fix-null
Prevent NullPointerException due to Activity death
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 6 |
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; } |