From b2e445c04b48727e5c8898cf3c7748119aa8473b Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 14 May 2019 12:12:13 +0200 Subject: [PATCH] Small improvements --- app/src/main/java/eu/faircode/email/ActivityDSN.java | 6 +++++- app/src/main/java/eu/faircode/email/ActivityEml.java | 6 +++++- app/src/main/java/eu/faircode/email/FragmentCompose.java | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityDSN.java b/app/src/main/java/eu/faircode/email/ActivityDSN.java index eacb060278..21cbeb801b 100644 --- a/app/src/main/java/eu/faircode/email/ActivityDSN.java +++ b/app/src/main/java/eu/faircode/email/ActivityDSN.java @@ -19,6 +19,7 @@ package eu.faircode.email; Copyright 2018-2019 by Marcel Bokhorst (M66B) */ +import android.Manifest; import android.content.ContentResolver; import android.content.Context; import android.content.res.AssetFileDescriptor; @@ -71,8 +72,11 @@ public class ActivityDSN extends ActivityBase { protected Result onExecute(Context context, Bundle args) throws Throwable { Uri uri = args.getParcelable("uri"); - if ("file".equals(uri.getScheme())) + if ("file".equals(uri.getScheme()) && + !Helper.hasPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) { + Log.w("DSN uri=" + uri); throw new IllegalArgumentException(context.getString(R.string.title_no_stream)); + } Result result = new Result(); diff --git a/app/src/main/java/eu/faircode/email/ActivityEml.java b/app/src/main/java/eu/faircode/email/ActivityEml.java index 323046f509..fd4b2aa593 100644 --- a/app/src/main/java/eu/faircode/email/ActivityEml.java +++ b/app/src/main/java/eu/faircode/email/ActivityEml.java @@ -19,6 +19,7 @@ package eu.faircode.email; Copyright 2018-2019 by Marcel Bokhorst (M66B) */ +import android.Manifest; import android.content.ContentResolver; import android.content.Context; import android.content.res.AssetFileDescriptor; @@ -85,8 +86,11 @@ public class ActivityEml extends ActivityBase { protected Result onExecute(Context context, Bundle args) throws Throwable { Uri uri = args.getParcelable("uri"); - if ("file".equals(uri.getScheme())) + if ("file".equals(uri.getScheme()) && + !Helper.hasPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) { + Log.w("EML uri=" + uri); throw new IllegalArgumentException(context.getString(R.string.title_no_stream)); + } Result result = new Result(); diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index a0df90a1e3..89b1ed5953 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -1744,8 +1744,10 @@ public class FragmentCompose extends FragmentBase { Log.w("Add attachment uri=" + uri); if ("file".equals(uri.getScheme()) && - !Helper.hasPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) + !Helper.hasPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) { + Log.w("Add attachment uri=" + uri); throw new SecurityException(); + } EntityAttachment attachment = new EntityAttachment();