cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle denied storage permission, use ContentResolver.SCHEME_FILE constant

Browse Source
This commit is contained in:
Dominik Schürmann
2015-11-19 18:26:06 +01:00
parent 0eac497754
commit 562c0546c6
5 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
View File

@@ -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();

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
View File

@@ -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();
}
}