修复权限被拒绝后自动申请时的逻辑

Author: HJQ

README.md

@@ -9,7 +9,7 @@
 #### 集成步骤
 
     dependencies {
-        implementation 'com.hjq:xxpermissions:3.8'
+        implementation 'com.hjq:xxpermissions:5.0'
     }
 
 #### 一句代码搞定权限请求，从未如此简单

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.permissions.demo"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 38
-        versionName "3.8"
+        versionCode 50
+        versionName "5.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

library/build.gradle

@@ -8,16 +8,16 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 26
-        versionCode 38
-        versionName "3.8"
+        versionCode 50
+        versionName "5.0"
     }
 }
 
 publish {
     userOrg = 'getactivity'//填写bintray用户名，注意大小写
     groupId = 'com.hjq'//定义的maven group id最终引用形式
     artifactId = 'xxpermissions'//maven的artifact id
-    version = '3.8'//maven 上发布版本号
+    version = '5.0'//maven 上发布版本号
     description = 'Android 6.0 permissions adaptation framework'//描述，自己定义
     website = "https://github.com/getActivity/XXPermissions"//项目在github中的地址
 }

library/src/main/java/com/hjq/permissions/OnPermission.java

@@ -22,7 +22,7 @@ public interface OnPermission {
      * 有权限被拒绝授予时回调
      *
      * @param denied 请求失败的权限组
-     * @param quick  是否被系统自动拒绝了
+     * @param quick  是否有某个权限被永久拒绝了
      */
     void noPermission(List<String> denied, boolean quick);
 }

library/src/main/java/com/hjq/permissions/PermissionFragment.java

@@ -131,14 +131,17 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
             //获取拒绝权限
             List<String> failPermissions = PermissionUtils.getFailPermissions(permissions, grantResults);
 
-            if (getArguments().getBoolean(REQUEST_CONSTANT) && PermissionUtils.checkPermissionPermanentDenied(getActivity(), failPermissions)) {
-                //继续请求权限直到用户授权或者永久拒绝
+            //检查是否开启了继续申请模式，如果是则检查没有授予的权限是否还能继续申请
+            if (getArguments().getBoolean(REQUEST_CONSTANT)
+                    && PermissionUtils.isRequestDeniedPermission(getActivity(), failPermissions)) {
+
+                //如果有的话就继续申请权限，直到用户授权或者永久拒绝
                 requestPermission();
                 return;
             }
 
-            //代表申请的权限中有不同意授予的，如果拒绝的时间过快证明是系统自动拒绝
-            call.noPermission(failPermissions, PermissionUtils.checkPermissionPermanentDenied(getActivity(), failPermissions));
+            //代表申请的权限中有不同意授予的，如果有某个权限被永久拒绝就返回true给开发人员，让开发者引导用户去设置界面开启权限
+            call.noPermission(failPermissions, PermissionUtils.checkMorePermissionPermanentDenied(getActivity(), failPermissions));
 
             //证明还有一部分权限被成功授予，回调成功接口
             if (!succeedPermissions.isEmpty()) {

library/src/main/java/com/hjq/permissions/PermissionUtils.java

@@ -130,25 +130,55 @@ static ArrayList<String> getFailPermissions(Context context, List<String> permis
     }
 
     /**
-     * 检查某个权限是否被永久拒绝
+     * 是否还能继续申请没有授予的权限
+     *
+     * @param activity              Activity对象
+     * @param failPermissions       失败的权限
+     */
+    static boolean isRequestDeniedPermission(Activity activity, List<String> failPermissions) {
+        for (String permission : failPermissions) {
+            //检查是否还有权限还能继续申请的（这里指没有被授予的权限但是也没有被永久拒绝的）
+            if (!checkSinglePermissionPermanentDenied(activity, permission)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 在权限组检查某个权限是否被永久拒绝
      *
      * @param activity              Activity对象
      * @param permissions            请求的权限
      */
-    static boolean checkPermissionPermanentDenied(Activity activity, List<String> permissions) {
+    static boolean checkMorePermissionPermanentDenied(Activity activity, List<String> permissions) {
 
         for (String permission : permissions) {
 
-            //安装权限和浮窗权限不算在内
-            if (permission.equals(Permission.REQUEST_INSTALL_PACKAGES) || permission.equals(Permission.SYSTEM_ALERT_WINDOW)) {
-                continue;
+            if (checkSinglePermissionPermanentDenied(activity, permission)) {
+                return true;
             }
+        }
+        return false;
+    }
+
+    /**
+     * 检查某个权限是否被永久拒绝
+     *
+     * @param activity              Activity对象
+     * @param permission            请求的权限
+     */
+    static boolean checkSinglePermissionPermanentDenied(Activity activity, String permission) {
+
+        //安装权限和浮窗权限不算，本身申请方式和危险权限申请方式不同，因为没有永久拒绝的选项，所以这里返回false
+        if (permission.equals(Permission.REQUEST_INSTALL_PACKAGES) || permission.equals(Permission.SYSTEM_ALERT_WINDOW)) {
+            return false;
+        }
 
-            if (PermissionUtils.isOverMarshmallow()) {
-                if (activity.checkSelfPermission(permission) == PackageManager.PERMISSION_DENIED) {
-                    if (!activity.shouldShowRequestPermissionRationale(permission)) {
-                        return true;
-                    }
+        if (PermissionUtils.isOverMarshmallow()) {
+            if (activity.checkSelfPermission(permission) == PackageManager.PERMISSION_DENIED) {
+                if (!activity.shouldShowRequestPermissionRationale(permission)) {
+                    return true;
                 }
             }
         }