mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 04:35:57 +00:00
Code Issues Releases Wiki Activity

To do: fix permission request

Browse source
This commit is contained in:
M66B 2019-12-07 17:45:41 +01:00
parent 22df24d91b
commit 334c67d79d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/ActivitySetup.java
View file

@ -991,9 +991,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
protected void onExecuted(Bundle args, Boolean oauth) {
ToastEx.makeText(ActivitySetup.this, R.string.title_setup_imported, Toast.LENGTH_LONG).show();
if (oauth &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) {
if (oauth && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
List<String> permissions = new ArrayList<>();
permissions.add(Manifest.permission.READ_CONTACTS); // profile
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
@ -1001,11 +999,13 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
for (String permission : permissions)
if (!hasPermission(permission)) {
// TODO: fix permissions request
requestPermissions(permissions.toArray(new String[0]), REQUEST_IMPORT_OAUTH);
break;
//return;
}
} else
ServiceSynchronize.eval(ActivitySetup.this, false, "import");
}
ServiceSynchronize.eval(ActivitySetup.this, false, "import");
}
@Override