Merge branch 'master' into develop

android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
     }
 
 
     dependencies {
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.4.0'
     }
     }
 }
 }
 
 

android/gradle/wrapper/gradle-wrapper.properties

+#Wed Feb 13 12:10:05 CET 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

android/src/main/java/com/baseflow/permissionhandler/PermissionHandlerPlugin.java

@@ -33,7 +33,7 @@ import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 
 public class PermissionHandlerPlugin implements MethodCallHandler {
 public class PermissionHandlerPlugin implements MethodCallHandler {
   private static final String LOG_TAG = "permissions_handler";
   private static final String LOG_TAG = "permissions_handler";
-  private static final int PERMISSION_CODE = 25;
+  private static final int PERMISSION_CODE = 24;
 
 
   //PERMISSION_GROUP
   //PERMISSION_GROUP
   private static final int PERMISSION_GROUP_CALENDAR = 0;
   private static final int PERMISSION_GROUP_CALENDAR = 0;
@@ -202,6 +202,7 @@ public class PermissionHandlerPlugin implements MethodCallHandler {
               "ERROR_ALREADY_REQUESTING_PERMISSIONS",
               "ERROR_ALREADY_REQUESTING_PERMISSIONS",
               "A request for permissions is already running, please wait for it to finish before doing another request (note that you can request multiple permissions at the same time).",
               "A request for permissions is already running, please wait for it to finish before doing another request (note that you can request multiple permissions at the same time).",
               null);
               null);
+          return;
         }
         }
 
 
         mResult = result;
         mResult = result;

example/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
     }
 
 
     dependencies {
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.4.0'
     }
     }
 }
 }
 
 

example/android/gradle/wrapper/gradle-wrapper.properties

-#Fri Jun 23 08:50:38 CEST 2017
+#Thu May 16 14:57:52 BST 2019
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip