diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-19 18:26:06 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-19 18:26:06 +0100 |
commit | 562c0546c6e89f0720ab8ec88194be4357afb134 (patch) | |
tree | 440c550a670aca8a662e254cf845bdc4a21f66d9 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
parent | 0eac49775484daf9319f5982e818f9223f0adf23 (diff) | |
download | open-keychain-562c0546c6e89f0720ab8ec88194be4357afb134.tar.gz open-keychain-562c0546c6e89f0720ab8ec88194be4357afb134.tar.bz2 open-keychain-562c0546c6e89f0720ab8ec88194be4357afb134.zip |
Handle denied storage permission, use ContentResolver.SCHEME_FILE constant
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | 7 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | 9 |
2 files changed, 10 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 b60b06df5..922dd7307 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java @@ -29,6 +29,7 @@ import android.Manifest; import android.annotation.TargetApi; import android.app.Activity; import android.content.ClipDescription; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.pm.LabeledIntent; @@ -635,7 +636,7 @@ public class DecryptListFragment * see https://commonsware.com/blog/2015/10/07/runtime-permissions-files-action-send.html */ private boolean checkAndRequestReadPermission(Activity activity, final Uri uri) { - if ( ! "file".equals(uri.getScheme())) { + if ( ! ContentResolver.SCHEME_FILE.equals(uri.getScheme())) { return true; } @@ -676,7 +677,7 @@ public class DecryptListFragment Iterator<Uri> it = mCancelledInputUris.iterator(); while (it.hasNext()) { Uri uri = it.next(); - if ( ! "file".equals(uri.getScheme())) { + if ( ! ContentResolver.SCHEME_FILE.equals(uri.getScheme())) { continue; } it.remove(); @@ -694,7 +695,7 @@ public class DecryptListFragment Iterator<Uri> it = mPendingInputUris.iterator(); while (it.hasNext()) { Uri uri = it.next(); - if ( ! "file".equals(uri.getScheme())) { + if ( ! ContentResolver.SCHEME_FILE.equals(uri.getScheme())) { continue; } it.remove(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java index 7f5e4bd3d..be08f6a53 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java @@ -31,6 +31,7 @@ import android.annotation.TargetApi; import android.app.Activity; import android.content.ClipData; import android.content.ClipboardManager; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -55,6 +56,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; @@ -267,7 +269,7 @@ public class EncryptFilesFragment * see https://commonsware.com/blog/2015/10/07/runtime-permissions-files-action-send.html */ private boolean checkAndRequestReadPermission(final Uri uri) { - if ( ! "file".equals(uri.getScheme())) { + if ( ! ContentResolver.SCHEME_FILE.equals(uri.getScheme())) { return true; } @@ -305,8 +307,9 @@ public class EncryptFilesFragment // permission granted -> restart processing uris processPendingInputUris(); } else { - // permission denied -> - + Toast.makeText(getActivity(), R.string.error_denied_storage_permission, Toast.LENGTH_LONG).show(); + getActivity().setResult(Activity.RESULT_CANCELED); + getActivity().finish(); } } |