diff options
Diffstat (limited to 'OpenKeychain/src/main/java/org')
| -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()));  | 
