优化 OnPermissionDescription 需要实现的方法数量

优化 OnPermissionDescription 类中的方法代码注释
优化 OnPermissionDescription 类中的方法参数名称

Author: getActivity

app/src/main/java/com/hjq/permissions/demo/PermissionDescription.java

@@ -57,7 +57,7 @@ public final class PermissionDescription implements OnPermissionDescription {
 
     @Override
     public void askWhetherRequestPermission(@NonNull Activity activity, @NonNull List<String> requestPermissions,
-                                            @NonNull Runnable confirmRequestRunnable, @NonNull Runnable cancelRequestRunnable) {
+                                            @NonNull Runnable continueRequestRunnable, @NonNull Runnable breakRequestRunnable) {
         if (XXPermissions.containsSpecialPermission(requestPermissions)) {
             // 如果请求的权限中包含特殊权限，那么就用 Dialog 来展示权限说明弹窗
             mDescriptionWindowType = DESCRIPTION_WINDOW_TYPE_DIALOG;
@@ -73,18 +73,18 @@ public void askWhetherRequestPermission(@NonNull Activity activity, @NonNull Lis
         }
 
         if (mDescriptionWindowType == DESCRIPTION_WINDOW_TYPE_POPUP) {
-            confirmRequestRunnable.run();
+            continueRequestRunnable.run();
             return;
         }
 
         showDialog(activity, activity.getString(R.string.common_permission_description_title),
             generatePermissionDescription(activity, requestPermissions),
             activity.getString(R.string.common_permission_granted), (dialog, which) -> {
                 dialog.dismiss();
-                confirmRequestRunnable.run();
+                continueRequestRunnable.run();
             }, activity.getString(R.string.common_permission_denied), (dialog, which) -> {
                 dialog.dismiss();
-                cancelRequestRunnable.run();
+                breakRequestRunnable.run();
             });
     }
 

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

@@ -17,17 +17,29 @@ public interface OnPermissionDescription {
      *
      * @param activity                      Activity 对象
      * @param requestPermissions            请求的权限
-     * @param confirmRequestRunnable        确认按钮
-     * @param cancelRequestRunnable
+     * @param continueRequestRunnable       继续请求任务对象
+     * @param breakRequestRunnable          中断请求任务对象
      */
     default void askWhetherRequestPermission(@NonNull Activity activity,
                                             @NonNull List<String> requestPermissions,
-                                            @NonNull Runnable confirmRequestRunnable,
-                                            @NonNull Runnable cancelRequestRunnable) {
-        confirmRequestRunnable.run();
+                                            @NonNull Runnable continueRequestRunnable,
+                                            @NonNull Runnable breakRequestRunnable) {
+        continueRequestRunnable.run();
     }
 
-    default void onRequestPermissionStart(@NonNull Activity activity, @NonNull List<String> requestPermissions) {}
+    /**
+     * 权限请求开始
+     *
+     * @param activity                      Activity 对象
+     * @param requestPermissions            请求的权限
+     */
+    void onRequestPermissionStart(@NonNull Activity activity, @NonNull List<String> requestPermissions);
 
-    default void onRequestPermissionEnd(@NonNull Activity activity, @NonNull List<String> requestPermissions) {}
+    /**
+     * 权限请求结束
+     *
+     * @param activity                      Activity 对象
+     * @param requestPermissions            请求的权限
+     */
+    void onRequestPermissionEnd(@NonNull Activity activity, @NonNull List<String> requestPermissions);
 }

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

@@ -243,7 +243,7 @@ private static void requestPermissions(@NonNull Activity activity, List<String>
             return;
         }
 
-        Runnable confirmRequestRunnable = () -> fragmentFactory.createAndCommitFragment(permissions, permissionType, new OnPermissionFlowCallback() {
+        Runnable continueRequestRunnable = () -> fragmentFactory.createAndCommitFragment(permissions, permissionType, new OnPermissionFlowCallback() {
 
             @Override
             public void onRequestPermissionNow() {
@@ -262,7 +262,7 @@ public void onRequestPermissionAnomaly() {
             }
         });
 
-        permissionDescription.askWhetherRequestPermission(activity, permissions, confirmRequestRunnable, finishRunnable);
+        permissionDescription.askWhetherRequestPermission(activity, permissions, continueRequestRunnable, finishRunnable);
     }
 
     /**

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

@@ -97,7 +97,18 @@ public static OnPermissionDescription getPermissionDescription() {
             }
         }
         if (permissionDescription == null) {
-            permissionDescription = new OnPermissionDescription() {};
+            permissionDescription = new OnPermissionDescription() {
+
+                @Override
+                public void onRequestPermissionStart(@NonNull Activity activity, @NonNull List<String> requestPermissions) {
+                    // default implementation ignored
+                }
+
+                @Override
+                public void onRequestPermissionEnd(@NonNull Activity activity, @NonNull List<String> requestPermissions) {
+                    // default implementation ignored
+                }
+            };
         }
         return permissionDescription;
     }