mirror of https://github.com/M66B/FairEmail.git
Import with read permissions
This commit is contained in:
parent
3790cbe5fb
commit
b367a6e0a0
|
@ -19,6 +19,7 @@ package eu.faircode.email;
|
||||||
Copyright 2018-2021 by Marcel Bokhorst (M66B)
|
Copyright 2018-2021 by Marcel Bokhorst (M66B)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import android.Manifest;
|
||||||
import android.app.Dialog;
|
import android.app.Dialog;
|
||||||
import android.app.NotificationChannel;
|
import android.app.NotificationChannel;
|
||||||
import android.app.NotificationChannelGroup;
|
import android.app.NotificationChannelGroup;
|
||||||
|
@ -712,7 +713,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
|
||||||
Uri uri = args.getParcelable("uri");
|
Uri uri = args.getParcelable("uri");
|
||||||
String password = args.getString("password");
|
String password = args.getString("password");
|
||||||
|
|
||||||
if (!"content".equals(uri.getScheme())) {
|
if (!"content".equals(uri.getScheme()) &&
|
||||||
|
!Helper.hasPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) {
|
||||||
Log.w("Import uri=" + uri);
|
Log.w("Import uri=" + uri);
|
||||||
throw new IllegalArgumentException(context.getString(R.string.title_no_stream));
|
throw new IllegalArgumentException(context.getString(R.string.title_no_stream));
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,7 @@ package eu.faircode.email;
|
||||||
Copyright 2018-2021 by Marcel Bokhorst (M66B)
|
Copyright 2018-2021 by Marcel Bokhorst (M66B)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import android.Manifest;
|
||||||
import android.content.ContentResolver;
|
import android.content.ContentResolver;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
@ -392,7 +393,8 @@ public class FragmentRules extends FragmentBase {
|
||||||
long fid = args.getLong("folder");
|
long fid = args.getLong("folder");
|
||||||
Uri uri = args.getParcelable("uri");
|
Uri uri = args.getParcelable("uri");
|
||||||
|
|
||||||
if (!"content".equals(uri.getScheme())) {
|
if (!"content".equals(uri.getScheme()) &&
|
||||||
|
!Helper.hasPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) {
|
||||||
Log.w("Import uri=" + uri);
|
Log.w("Import uri=" + uri);
|
||||||
throw new IllegalArgumentException(context.getString(R.string.title_no_stream));
|
throw new IllegalArgumentException(context.getString(R.string.title_no_stream));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue