diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-03-08 17:23:12 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-03-08 17:23:12 +0100 |
| commit | bd2c41df22edcd5bac82f57d4ff7f63c6caa91f4 (patch) | |
| tree | 8eb7f04bbe0d42ee5507a06289162b29f487d868 | |
| parent | 305fee5ea1bb8c52deeb9f43672f104d7f86f0a6 (diff) | |
| parent | 4a33cc83171cbb868a9bca61638ee230de19f30e (diff) | |
| download | open-keychain-bd2c41df22edcd5bac82f57d4ff7f63c6caa91f4.tar.gz open-keychain-bd2c41df22edcd5bac82f57d4ff7f63c6caa91f4.tar.bz2 open-keychain-bd2c41df22edcd5bac82f57d4ff7f63c6caa91f4.zip | |
Merge pull request #1769 from 007durgesh219/Issue#1766
Fix NullPointerException in ImportKeysListFragment.checkAndRequestReadPermission, #1766
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java index 18063ed1a..4d4219f56 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java @@ -335,7 +335,7 @@ public class ImportKeysListFragment extends ListFragment implements if (mLoaderState instanceof BytesLoaderState) { BytesLoaderState ls = (BytesLoaderState) mLoaderState; - if ( ! checkAndRequestReadPermission(ls.mDataUri)) { + if ( ls.mDataUri != null && ! checkAndRequestReadPermission(ls.mDataUri)) { return; } } |