aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-03-05 16:12:13 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2016-03-05 16:12:13 +0100
commit82c3426c6f6f594817c6df6724d79db1d089c8fd (patch)
treed0b1dab6788e1bb2787df49dadd6d3b8f43fd9b8 /OpenKeychain/src/main/java/org
parent97d157a28230f6ff32390210479f73777de1fa3a (diff)
parent81ba0ff108310d70dfbec30261276c75d2286121 (diff)
downloadopen-keychain-82c3426c6f6f594817c6df6724d79db1d089c8fd.tar.gz
open-keychain-82c3426c6f6f594817c6df6724d79db1d089c8fd.tar.bz2
open-keychain-82c3426c6f6f594817c6df6724d79db1d089c8fd.zip
Merge pull request #1738 from runnerway/storage-permission-fix
Always check read permission
Diffstat (limited to 'OpenKeychain/src/main/java/org')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java9
1 files changed, 8 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 b399af950..18063ed1a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -330,9 +330,16 @@ public class ImportKeysListFragment extends ListFragment implements
}
public void loadNew(LoaderState loaderState) {
-
mLoaderState = loaderState;
+ if (mLoaderState instanceof BytesLoaderState) {
+ BytesLoaderState ls = (BytesLoaderState) mLoaderState;
+
+ if ( ! checkAndRequestReadPermission(ls.mDataUri)) {
+ return;
+ }
+ }
+
restartLoaders();
}