From fc4cdaa24b5df376e918de2583cb95dbb6baa3b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 21 Sep 2014 23:25:41 +0200
Subject: Fix possible nullpointer in ImportKeysFileFragment

---
 .../java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
index a1c49b569..e5bad16ce 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
@@ -104,7 +104,7 @@ public class ImportKeysFileFragment extends Fragment {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
             case REQUEST_CODE_FILE: {
-                if (resultCode == Activity.RESULT_OK && data != null) {
+                if (resultCode == Activity.RESULT_OK && data != null && data.getData() != null) {
 
                     // load data
                     mImportActivity.loadCallback(new ImportKeysListFragment.BytesLoaderState(null, data.getData()));
-- 
cgit v1.2.3