Stop calling rationale methods in the OnRequestPermissionsResult.

Author: Shintaro Katafuchi

permissionsdispatcher-processor/src/main/java/permissions/dispatcher/processor/JavaFileBuilder.java

@@ -17,7 +17,6 @@
 import static permissions.dispatcher.processor.ConstantsProvider.ACTIVITY_COMPAT;
 import static permissions.dispatcher.processor.ConstantsProvider.METHOD_SUFFIX;
 import static permissions.dispatcher.processor.ConstantsProvider.PERMISSION_UTIL;
-import static permissions.dispatcher.processor.Utils.findShowsRationaleFromValue;
 import static permissions.dispatcher.processor.Utils.getFieldName;
 
 final class JavaFileBuilder {
@@ -65,7 +64,7 @@ ACTIVITY_COMPAT, activity, value, getFieldName(methodName))
                 .build();
     }
 
-    private static MethodSpec createOnRequestPermissionsResult(ClassName target, List<ExecutableElement> methods, List<ExecutableElement> showsRationaleMethods) {
+    private static MethodSpec createOnRequestPermissionsResult(ClassName target, List<ExecutableElement> methods) {
         MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("onRequestPermissionsResult")
                 .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
                 .addParameter(target, "target")
@@ -77,18 +76,10 @@ private static MethodSpec createOnRequestPermissionsResult(ClassName target, Lis
 
         for (ExecutableElement method : methods) {
             String methodName = method.getSimpleName().toString();
-            String value = method.getAnnotation(NeedsPermission.class).value();
-            ExecutableElement showsRationale = findShowsRationaleFromValue(value, showsRationaleMethods);
             methodBuilder
                     .addCode("case $N:\n", getFieldName(methodName))
                     .beginControlFlow("if ($T.verifyPermissions(grantResults))", PERMISSION_UTIL)
-                    .addStatement("target.$N()", methodName);
-            if (showsRationale != null) {
-                methodBuilder
-                        .nextControlFlow("else")
-                        .addStatement("target.$N()", showsRationale.getSimpleName());
-            }
-            methodBuilder
+                    .addStatement("target.$N()", methodName)
                     .endControlFlow()
                     .addStatement("break");
         }
@@ -117,13 +108,12 @@ private static FieldSpec createField(String name, int index) {
 
     public static JavaFile createJavaFile(RuntimePermissionsAnnotatedElement element) {
         List<ExecutableElement> needsPermissionMethods = element.getNeedsPermissionMethods();
-        List<ExecutableElement> showsRationaleMethods = element.getShowsRationaleMethods();
         TypeSpec clazz = TypeSpec.classBuilder(element.getDispatchClassName())
                 .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
                 .addFields(createFields(needsPermissionMethods))
                 .addMethod(createConstructor())
                 .addMethods(createMethodsWithCheck(element))
-                .addMethod(createOnRequestPermissionsResult(element.getClassName(), needsPermissionMethods, showsRationaleMethods))
+                .addMethod(createOnRequestPermissionsResult(element.getClassName(), needsPermissionMethods))
                         .build();
         String packageName = element.getPackageName();
         return JavaFile.builder(packageName, clazz).build();

permissionsdispatcher-processor/src/main/java/permissions/dispatcher/processor/RuntimePermissionsAnnotatedElement.java

@@ -66,10 +66,6 @@ public List<ExecutableElement> getNeedsPermissionMethods() {
         return needsPermissionMethods;
     }
 
-    public List<ExecutableElement> getShowsRationaleMethods() {
-        return showsRationaleMethods;
-    }
-
     public ExecutableElement getShowsRationaleMethodFromValue(String value) {
         return findShowsRationaleFromValue(value, showsRationaleMethods);
     }

permissionsdispatcher-processor/src/test/java/permissions/dispatcher/processor/data/Source.java

@@ -56,8 +56,6 @@ public static class OnePermissionActivity {
                 "      case REQUEST_SHOWCAMERA:",
                 "      if (PermissionUtils.verifyPermissions(grantResults)) {",
                 "        target.showCamera();",
-                "      } else {",
-                "        target.showRationaleForCamera();",
                 "      }",
                 "      break;",
                 "      default:",
@@ -120,8 +118,6 @@ public static class OnePermissionFragment {
                 "      case REQUEST_SHOWCAMERA:",
                 "      if (PermissionUtils.verifyPermissions(grantResults)) {",
                 "        target.showCamera();",
-                "      } else {",
-                "        target.showRationaleForCamera();",
                 "      }",
                 "      break;",
                 "      default:",
@@ -259,15 +255,11 @@ public static class TwoPermissions {
                 "      case REQUEST_SHOWCAMERA:",
                 "      if (PermissionUtils.verifyPermissions(grantResults)) {",
                 "        target.showCamera();",
-                "      } else {",
-                "        target.showRationaleForCamera();",
                 "      }",
                 "      break;",
                 "      case REQUEST_SHOWCONTACT:",
                 "      if (PermissionUtils.verifyPermissions(grantResults)) {",
                 "        target.showContact();",
-                "      } else {",
-                "        target.showRationaleForContact();",
                 "      }",
                 "      break;",
                 "      default:",