From fc53f9b449e4c2aff84d484b77c539cae1e35c4d Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 3 Nov 2019 20:07:26 +0100 Subject: [PATCH] Small improvement --- app/src/main/java/eu/faircode/email/ActivityDSN.java | 2 +- app/src/main/java/eu/faircode/email/ActivityEML.java | 2 +- app/src/main/java/eu/faircode/email/ActivitySetup.java | 4 ++-- app/src/main/java/eu/faircode/email/Core.java | 2 +- app/src/main/java/eu/faircode/email/FragmentBase.java | 2 +- app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +- app/src/main/java/eu/faircode/email/FragmentMessages.java | 2 +- .../java/eu/faircode/email/FragmentOptionsNotifications.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityDSN.java b/app/src/main/java/eu/faircode/email/ActivityDSN.java index 1f5215a524..50ae009e5a 100644 --- a/app/src/main/java/eu/faircode/email/ActivityDSN.java +++ b/app/src/main/java/eu/faircode/email/ActivityDSN.java @@ -73,7 +73,7 @@ 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 (!"content".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)); diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java index 5c10d3c16d..d3f9acfe2d 100644 --- a/app/src/main/java/eu/faircode/email/ActivityEML.java +++ b/app/src/main/java/eu/faircode/email/ActivityEML.java @@ -96,7 +96,7 @@ 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 (!"content".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)); diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index cfe5d26d3b..d3cd6b3b0a 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -463,7 +463,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac Uri uri = args.getParcelable("uri"); String password = args.getString("password"); - if ("file".equals(uri.getScheme())) { + if (!"content".equals(uri.getScheme())) { Log.w("Export uri=" + uri); throw new IllegalArgumentException(context.getString(R.string.title_no_stream)); } @@ -642,7 +642,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac Uri uri = args.getParcelable("uri"); String password = args.getString("password"); - if ("file".equals(uri.getScheme())) { + if (!"content".equals(uri.getScheme())) { Log.w("Import uri=" + uri); throw new IllegalArgumentException(context.getString(R.string.title_no_stream)); } diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index d727673a5d..14c08f2329 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -3169,7 +3169,7 @@ class Core { } Uri uri = (sound == null ? null : Uri.parse(sound)); - if (uri == null || "file".equals(uri.getScheme())) + if (uri == null || !"content".equals(uri.getScheme())) uri = null; Log.i("Notify sound=" + uri); diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java index 9f17e0128b..e82c0d8754 100644 --- a/app/src/main/java/eu/faircode/email/FragmentBase.java +++ b/app/src/main/java/eu/faircode/email/FragmentBase.java @@ -320,7 +320,7 @@ public class FragmentBase extends Fragment { long id = args.getLong("id"); Uri uri = args.getParcelable("uri"); - if ("file".equals(uri.getScheme())) { + if (!"content".equals(uri.getScheme())) { Log.w("Save attachment uri=" + uri); throw new IllegalArgumentException(context.getString(R.string.title_no_stream)); } diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index fafd8947e4..0a9b4515dd 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -1962,7 +1962,7 @@ public class FragmentCompose extends FragmentBase { boolean image) throws IOException { Log.w("Add attachment uri=" + uri); - if ("file".equals(uri.getScheme()) && + if (!"content".equals(uri.getScheme()) && !Helper.hasPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) { Log.w("Add attachment uri=" + uri); throw new SecurityException("Add attachment with file scheme"); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 02d9cda170..20054afd02 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -3867,7 +3867,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. long id = args.getLong("id"); Uri uri = args.getParcelable("uri"); - if ("file".equals(uri.getScheme())) { + if (!"content".equals(uri.getScheme())) { Log.w("Save raw uri=" + uri); throw new IllegalArgumentException(context.getString(R.string.title_no_stream)); } diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java index aa47b5e9bd..0abaef3eac 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java @@ -430,7 +430,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared private void onSelectSound(Uri uri) { Log.i("Selected ringtone=" + uri); - if (uri != null && "file".equals(uri.getScheme())) + if (uri != null && !"content".equals(uri.getScheme())) uri = null; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());