From 3acb7fb0878afb369e5bf91db3c6a83a10e0a6ed Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 28 Jun 2014 20:12:50 +0200
Subject: fix nullpointerexception in importkeyactivity

---
 .../org/sufficientlysecure/keychain/ui/ImportKeysActivity.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')

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;
-- 
cgit v1.2.3