diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-21 23:25:41 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-21 23:25:41 +0200 |
| commit | fc4cdaa24b5df376e918de2583cb95dbb6baa3b0 (patch) | |
| tree | 07ec6fc99cf3e13aae7498572fe2b0a373c1472a /OpenKeychain/src/main/java | |
| parent | db7da6525ee12af54002f7edf6574b0b49f17b41 (diff) | |
| download | open-keychain-fc4cdaa24b5df376e918de2583cb95dbb6baa3b0.tar.gz open-keychain-fc4cdaa24b5df376e918de2583cb95dbb6baa3b0.tar.bz2 open-keychain-fc4cdaa24b5df376e918de2583cb95dbb6baa3b0.zip | |
Fix possible nullpointer in ImportKeysFileFragment
Diffstat (limited to 'OpenKeychain/src/main/java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
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())); |