diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-28 20:12:50 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-28 20:54:13 +0200 |
commit | 3acb7fb0878afb369e5bf91db3c6a83a10e0a6ed (patch) | |
tree | a5a4fa394a5404e928ba4081352a567461b555f6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | |
parent | 0067cdf221be2189c06946f11fc94eada2afc7f1 (diff) | |
download | open-keychain-3acb7fb0878afb369e5bf91db3c6a83a10e0a6ed.tar.gz open-keychain-3acb7fb0878afb369e5bf91db3c6a83a10e0a6ed.tar.bz2 open-keychain-3acb7fb0878afb369e5bf91db3c6a83a10e0a6ed.zip |
fix nullpointerexception in importkeyactivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 7 |
1 files changed, 6 insertions, 1 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 fab394a14..81061501e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -428,9 +428,14 @@ public class ImportKeysActivity extends ActionBarActivity { if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { // get returned data bundle Bundle returnData = message.getData(); + if (returnData == null) { + return; + } final ImportResult result = returnData.getParcelable(KeychainIntentService.RESULT); - + if (result == null) { + return; + } int resultType = result.getResult(); String str; |