aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-11-19 16:47:31 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-11-19 16:47:31 +0100
commit0eac49775484daf9319f5982e818f9223f0adf23 (patch)
tree20507389b9644059be75dc4fc32266981a4dfc5e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
parent2fe508c60e51693b383481d6e626ccada85313f5 (diff)
downloadopen-keychain-0eac49775484daf9319f5982e818f9223f0adf23.tar.gz
open-keychain-0eac49775484daf9319f5982e818f9223f0adf23.tar.bz2
open-keychain-0eac49775484daf9319f5982e818f9223f0adf23.zip
Request READ_EXTERNAL_STORAGE permission for encryption of files (shared by file managers to OpenKeychain)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
index 8adaa0670..b60b06df5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
@@ -639,17 +639,13 @@ public class DecryptListFragment
return true;
}
- if (Build.VERSION.SDK_INT < VERSION_CODES.M) {
- return true;
- }
-
// Additional check due to https://commonsware.com/blog/2015/11/09/you-cannot-hold-nonexistent-permissions.html
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
+ if (Build.VERSION.SDK_INT < VERSION_CODES.M) {
return true;
}
if (ContextCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE)
- == PackageManager.PERMISSION_GRANTED) {
+ == PackageManager.PERMISSION_GRANTED) {
return true;
}