Update compile SDK version, latest gradle and handle Permissions via permission dispatcher

Author: jaroslavhavelik

app/build.gradle

@@ -1,18 +1,21 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId 'com.vansuita.pickimage.sample'
-        minSdkVersion 14
-        targetSdkVersion 25
+        minSdkVersion 16
+        targetSdkVersion 27
         versionCode 4
         versionName "1.0"
     }
 }
 
 dependencies {
-    compile project(':library')
-    compile 'com.jrummyapps:colorpicker:2.0.4'
+    implementation project(':library')
+    implementation("com.jrummyapps:colorpicker:2.0.4") {
+        // if you don't use android.app.Fragment you can exclude support for them
+        exclude module: "support-v7"
+    }
 }

build.gradle

@@ -3,11 +3,12 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
 
     dependencies {
 
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // Add this line
     }
 }
@@ -17,6 +18,7 @@ allprojects {
         jcenter()
 
         maven { url "https://jitpack.io" }
+        google()
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Mar 10 13:58:41 BRT 2017
+#Tue Jun 12 14:56:02 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

library/build.gradle

@@ -5,12 +5,12 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.jrvansuita'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 25
+        minSdkVersion 16
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -21,8 +21,14 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'com.android.support:cardview-v7:25.2.0'
-    compile 'com.android.support:support-annotations:25.2.0'
+    api  'com.android.support:appcompat-v7:27.1.1'
+    api  'com.android.support:cardview-v7:27.1.1'
+    api  'com.android.support:support-annotations:27.1.1'
+
+    implementation("com.github.hotchemi:permissionsdispatcher:3.2.0") {
+        // if you don't use android.app.Fragment you can exclude support for them
+        exclude module: "support-v13"
+    }
+    annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:3.2.0"
 }
 

library/src/main/java/com/vansuita/pickimage/dialog/PickImageBaseDialog.java

@@ -1,10 +1,12 @@
 package com.vansuita.pickimage.dialog;
 
+import android.Manifest;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.widget.CardView;
@@ -27,12 +29,15 @@
 import com.vansuita.pickimage.resolver.IntentResolver;
 import com.vansuita.pickimage.util.Util;
 
+import permissions.dispatcher.NeedsPermission;
+import permissions.dispatcher.RuntimePermissions;
+
 import static com.vansuita.pickimage.R.layout.dialog;
 
 /**
  * Created by jrvansuita on 08/02/17.
  */
-
+@RuntimePermissions
 public abstract class PickImageBaseDialog extends DialogFragment implements IPickClick {
 
     protected static final String SETUP_TAG = "SETUP_TAG";
@@ -154,18 +159,18 @@ private boolean isValidProviders() {
     }
 
     private void onBindViewsHolders(View v) {
-        card = (CardView) v.findViewById(R.id.card);
+        card = v.findViewById(R.id.card);
         vFirstLayer = v.findViewById(R.id.first_layer);
         vSecondLayer = v.findViewById(R.id.second_layer);
     }
 
     private void onBindViews(View v) {
-        llButtons = (LinearLayout) v.findViewById(R.id.buttons_holder);
-        tvTitle = (TextView) v.findViewById(R.id.title);
-        tvCamera = (TextView) v.findViewById(R.id.camera);
-        tvGallery = (TextView) v.findViewById(R.id.gallery);
-        tvCancel = (TextView) v.findViewById(R.id.cancel);
-        tvProgress = (TextView) v.findViewById(R.id.loading_text);
+        llButtons = v.findViewById(R.id.buttons_holder);
+        tvTitle = v.findViewById(R.id.title);
+        tvCamera = v.findViewById(R.id.camera);
+        tvGallery = v.findViewById(R.id.gallery);
+        tvCancel = v.findViewById(R.id.cancel);
+        tvProgress = v.findViewById(R.id.loading_text);
     }
 
 
@@ -248,15 +253,14 @@ protected void showProgress(boolean show) {
         Util.gone(vSecondLayer, !show);
     }
 
-
+    @NeedsPermission({Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE})
     protected void launchCamera() {
-        if (resolver.requestCameraPermissions(this))
-            resolver.launchCamera(this);
+        resolver.launchCamera(this);
     }
 
+    @NeedsPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
     protected void launchGallery() {
-        if (resolver.requestGalleryPermissions(this))
-            resolver.launchGallery(this);
+        resolver.launchGallery(this);
     }
 
     protected boolean launchSystemDialog() {
@@ -335,4 +339,10 @@ protected void onError(Error e) {
             dismissAllowingStateLoss();
         }
     }
+
+    @Override
+    public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        PickImageBaseDialogPermissionsDispatcher.onRequestPermissionsResult(this, requestCode, grantResults);
+    }
 }

library/src/main/java/com/vansuita/pickimage/dialog/PickImageDialog.java

@@ -1,15 +1,11 @@
 package com.vansuita.pickimage.dialog;
 
-import android.Manifest;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 
 import com.vansuita.pickimage.bundle.PickSetup;
-import com.vansuita.pickimage.keep.Keep;
 import com.vansuita.pickimage.listeners.IPickCancel;
 import com.vansuita.pickimage.listeners.IPickClick;
 import com.vansuita.pickimage.listeners.IPickResult;
@@ -21,7 +17,6 @@
 /**
  * Created by jrvansuita build 01/11/16.
  */
-
 public class PickImageDialog extends PickImageBaseDialog {
 
     public static PickImageDialog newInstance(PickSetup setup) {
@@ -62,12 +57,12 @@ public PickImageDialog show(FragmentManager fragmentManager) {
 
     @Override
     public void onCameraClick() {
-        launchCamera();
+        PickImageBaseDialogPermissionsDispatcher.launchCameraWithPermissionCheck(this);
     }
 
     @Override
     public void onGalleryClick() {
-        launchGallery();
+        PickImageBaseDialogPermissionsDispatcher.launchGalleryWithPermissionCheck(this);
     }
 
     @Override
@@ -81,13 +76,12 @@ public PickImageDialog setOnPickResult(IPickResult onPickResult) {
     }
 
     @Override
-  public PickImageDialog setOnPickCancel(IPickCancel onPickCancel)
-   {
-    return (PickImageDialog) super.setOnPickCancel(onPickCancel);
-   }
+    public PickImageDialog setOnPickCancel(IPickCancel onPickCancel) {
+        return (PickImageDialog) super.setOnPickCancel(onPickCancel);
+    }
 
 
-  @Override
+    @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == IntentResolver.REQUESTER) {
@@ -102,56 +96,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             }
         }
     }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
-        if (requestCode == IntentResolver.REQUESTER) {
-            boolean granted = true;
-
-            for (Integer i : grantResults)
-                granted = granted && i == PackageManager.PERMISSION_GRANTED;
-
-            if (granted) {
-                if (!launchSystemDialog()) {
-                    // See if the CAMERA permission is among the granted ones
-                    int cameraIndex = -1;
-                    for (int i = 0; i < permissions.length; i++) {
-                        if (permissions[cameraIndex].equals(Manifest.permission.CAMERA)) {
-                            cameraIndex = i;
-                            break;
-                        }
-                    }
-
-                    if (cameraIndex != -1) {
-                        launchGallery();
-                    } else {
-                        launchCamera();
-                    }
-                }
-            } else {
-                dismissAllowingStateLoss();
-
-                if (grantResults.length > 1)
-                    Keep.with(getActivity()).askedForPermission();
-            }
-        }
-    }
-
-
-   /* public static void forceDismiss(FragmentManager fm) {
-        Fragment fragment = fm.findFragmentByTag(PickImageDialog.DIALOG_FRAGMENT_TAG);
-
-        if (fragment != null) {
-            DialogFragment dialog = (PickImageDialog) fragment;
-
-            if (dialog.isVisible())
-                dialog.dismiss();
-        }
-    }*/
-
-
 }