Adds grant permissions request for marshmallow and later. Since not g…

…ranted permissions are unhandled and cause runtime exceptions, the grant permission request will pop up every time when entering accounts activity until all permissions are granted.

gradle.properties

@@ -12,4 +12,5 @@ ckchangelog=1.2.2
 glide=3.8.0
 tokenautocomplete=2.0.8
 safecontentresolver=0.9.0
-showcaseview=5.4.3
+showcaseview=5.4.3
+dexter=4.1.0

k9mail/build.gradle

@@ -36,6 +36,7 @@ dependencies {
     compile "com.splitwise:tokenautocomplete:${tokenautocomplete}"
     compile "de.cketti.safecontentresolver:safe-content-resolver-v14:${safecontentresolver}"
     compile "com.github.amlcurran.showcaseview:library:${showcaseview}"
+    compile "com.karumi:dexter:${dexter}"
 
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
 

k9mail/src/main/java/com/fsck/k9/activity/Accounts.java

@@ -1,6 +1,7 @@
 
 package com.fsck.k9.activity;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Application;
@@ -15,6 +16,8 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
+import android.os.Build;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.ActionBar;
@@ -81,6 +84,8 @@
 import com.fsck.k9.search.SearchSpecification.Attribute;
 import com.fsck.k9.search.SearchSpecification.SearchField;
 import com.fsck.k9.view.ColorChip;
+import com.karumi.dexter.Dexter;
+import com.karumi.dexter.listener.multi.DialogOnAnyDeniedMultiplePermissionsListener;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -432,6 +437,19 @@ public void onCreate(Bundle icicle) {
             mNonConfigurationInstance.restore(this);
         }
 
+        if (Build.VERSION.SDK_INT >= VERSION_CODES.M) {
+            Dexter.withActivity(Accounts.this)
+                    .withPermissions(
+                            Manifest.permission.READ_CONTACTS,
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE
+                    ).withListener(DialogOnAnyDeniedMultiplePermissionsListener.Builder
+                    .withContext(Accounts.this)
+                    .withTitle("Contacts & storage permission")
+                    .withMessage("Both contact and storage permission are needed for K-9 to work properly.")
+                    .withButtonText(android.R.string.ok)
+                    .build()).check();
+        }
+
         ChangeLog cl = new ChangeLog(this);
         if (cl.isFirstRun()) {
             cl.getLogDialog().show();