Merge pull request #30 from hotchemi/fix-16

Shintaro Katafuchi · Shintaro Katafuchi · commit 7fe3a12686c6 · 2015-09-14T02:11:42.000+09:00
Fix to use support fragment methods to handle permissions stuff.
diff --git a/permissionsdispatcher-processor/src/main/java/permissions/dispatcher/processor/ClassType.java b/permissionsdispatcher-processor/src/main/java/permissions/dispatcher/processor/ClassType.java
@@ -2,7 +2,7 @@
 
 enum ClassType {
     ACTIVITY("target"),
-    FRAGMENT("target.getActivity()");
+    V4FRAGMENT("target.getActivity()");
 
     private final String activity;
 
@@ -18,7 +18,7 @@ static ClassType getClassType(String className, TypeResolver resolver) {
         if (resolver.isSubTypeOf(className, ConstantsProvider.ACTIVITY)) {
             return ACTIVITY;
         } else if (resolver.isSubTypeOf(className, ConstantsProvider.V4FRAGMENT)) {
-            return FRAGMENT;
+            return V4FRAGMENT;
         }
         return null;
     }
diff --git a/permissionsdispatcher-processor/src/main/java/permissions/dispatcher/processor/JavaFileBuilder.java b/permissionsdispatcher-processor/src/main/java/permissions/dispatcher/processor/JavaFileBuilder.java
@@ -1,11 +1,13 @@
 package permissions.dispatcher.processor;
 
 import com.squareup.javapoet.*;
+
 import permissions.dispatcher.NeedsPermission;
 import permissions.dispatcher.NeedsPermissions;
 
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,7 +28,8 @@ private static List<MethodSpec> createNeedsPermissionMethods(RuntimePermissionsA
             String value = element.getAnnotation(NeedsPermission.class).value();
             ExecutableElement showsRationale = clazz.getShowsRationaleFromValue(value);
             String activity = clazz.getClassType().getActivity();
-            methodSpecs.add(createMethodWithCheck(activity, clazz.getClassName(), element, showsRationale));
+            methodSpecs.add(createMethodWithCheck(clazz.getClassType(), activity,
+                    clazz.getClassName(), element, showsRationale));
         }
         return methodSpecs;
     }
@@ -38,12 +41,14 @@ private static List<MethodSpec> createNeedsPermissionsMethods(RuntimePermissions
             String[] value = element.getAnnotation(NeedsPermissions.class).value();
             ExecutableElement showsRationale = clazz.getShowsRationaleFromValue(value);
             String activity = clazz.getClassType().getActivity();
-            methodSpecs.add(createMethodWithCheck(activity, clazz.getClassName(), element, showsRationale));
+            methodSpecs.add(createMethodWithCheck(clazz.getClassType(), activity,
+                    clazz.getClassName(), element, showsRationale));
         }
         return methodSpecs;
     }
 
-    private static MethodSpec createMethodWithCheck(String activity, ClassName target, ExecutableElement needsPermission, ExecutableElement showsRationale) {
+    private static MethodSpec createMethodWithCheck(ClassType classType, String activity, ClassName target,
+                                                    ExecutableElement needsPermission, ExecutableElement showsRationale) {
         String methodName = needsPermission.getSimpleName().toString();
         String value = getPermissionFieldName(needsPermission.getSimpleName().toString());
         MethodSpec.Builder
@@ -55,15 +60,26 @@ private static MethodSpec createMethodWithCheck(String activity, ClassName targe
                 .addStatement("target.$N()", methodName)
                 .nextControlFlow("else");
         if (showsRationale != null) {
-            methodBuilder.beginControlFlow("if ($T.shouldShowRequestPermissionRationale($N, $N))",
-                    PERMISSION_UTILS, activity, value)
+            String rationaleTarget = null;
+            if (classType == ClassType.ACTIVITY) {
+                rationaleTarget = activity;
+            } else if (classType == ClassType.V4FRAGMENT) {
+                rationaleTarget = "target";
+            }
+            methodBuilder
+                    .beginControlFlow("if ($T.shouldShowRequestPermissionRationale($N, $N))",
+                            PERMISSION_UTILS, rationaleTarget, value)
                     .addStatement("target.$N()", showsRationale.getSimpleName())
                     .endControlFlow();
         }
-        return methodBuilder.addStatement("$T.requestPermissions($N, $N, $N)",
-                ACTIVITY_COMPAT, activity, value, getRequestCodeFieldName(methodName))
-                .endControlFlow()
-                .build();
+        if (classType == ClassType.ACTIVITY) {
+            methodBuilder.addStatement("$T.requestPermissions($N, $N, $N)",
+                    ACTIVITY_COMPAT, activity, value, getRequestCodeFieldName(methodName));
+        } else if (classType == ClassType.V4FRAGMENT) {
+            methodBuilder.addStatement("target.requestPermissions($N, $N)",
+                    value, getRequestCodeFieldName(methodName));
+        }
+        return methodBuilder.endControlFlow().build();
     }
 
     private static MethodSpec createOnRequestPermissionsResult(RuntimePermissionsAnnotatedElement element) {
diff --git a/permissionsdispatcher-processor/src/test/java/permissions/dispatcher/processor/ClassTypeTest.java b/permissionsdispatcher-processor/src/test/java/permissions/dispatcher/processor/ClassTypeTest.java
@@ -12,7 +12,7 @@ public class ClassTypeTest {
     @Test
     public void getActivityTest() {
         assertThat(ClassType.ACTIVITY.getActivity()).isEqualTo("target");
-        assertThat(ClassType.FRAGMENT.getActivity()).isEqualTo("target.getActivity()");
+        assertThat(ClassType.V4FRAGMENT.getActivity()).isEqualTo("target.getActivity()");
     }
 
 }
diff --git a/permissionsdispatcher-processor/src/test/java/permissions/dispatcher/processor/UtilsTest.java b/permissionsdispatcher-processor/src/test/java/permissions/dispatcher/processor/UtilsTest.java
@@ -69,8 +69,8 @@ public void testGetFieldName() {
             assertThat(getRequestCodeFieldName(name)).isEqualTo("REQUEST_ACTIVITY");
         }
         {
-            String name = "FRAGMENT";
-            assertThat(getRequestCodeFieldName(name)).isEqualTo("REQUEST_FRAGMENT");
+            String name = "V4FRAGMENT";
+            assertThat(getRequestCodeFieldName(name)).isEqualTo("REQUEST_V4FRAGMENT");
         }
     }
 
diff --git a/permissionsdispatcher-processor/src/test/java/permissions/dispatcher/processor/data/Source.java b/permissionsdispatcher-processor/src/test/java/permissions/dispatcher/processor/data/Source.java
@@ -90,7 +90,6 @@ public static class OnePermissionFragment {
         public static final String[] EXPECT = {
                 "package permissions.dispatcher.sample;",
                 "\n",
-                "import android.support.v4.app.ActivityCompat;",
                 "import java.lang.String;",
                 "import permissions.dispatcher.PermissionUtils;",
                 "\n",
@@ -106,10 +105,10 @@ public static class OnePermissionFragment {
                 "    if (PermissionUtils.hasSelfPermissions(target.getActivity(), PERMISSION_SHOWCAMERA)) {",
                 "      target.showCamera();",
                 "    } else {",
-                "      if (PermissionUtils.shouldShowRequestPermissionRationale(target.getActivity(), PERMISSION_SHOWCAMERA)) {",
+                "      if (PermissionUtils.shouldShowRequestPermissionRationale(target, PERMISSION_SHOWCAMERA)) {",
                 "        target.showRationaleForCamera();",
                 "      }",
-                "      ActivityCompat.requestPermissions(target.getActivity(), PERMISSION_SHOWCAMERA, REQUEST_SHOWCAMERA);",
+                "      target.requestPermissions(PERMISSION_SHOWCAMERA, REQUEST_SHOWCAMERA);",
                 "    }",
                 "  }",
                 "\n",
@@ -920,7 +919,6 @@ public static class NestedSuperClassFragment {
         public static final String[] EXPECT = {
                 "package permissions.dispatcher.sample;",
                 "\n",
-                "import android.support.v4.app.ActivityCompat;",
                 "import java.lang.String;",
                 "import permissions.dispatcher.PermissionUtils;",
                 "\n",
@@ -936,10 +934,10 @@ public static class NestedSuperClassFragment {
                 "    if (PermissionUtils.hasSelfPermissions(target.getActivity(), PERMISSION_SHOWCAMERA)) {",
                 "      target.showCamera();",
                 "    } else {",
-                "      if (PermissionUtils.shouldShowRequestPermissionRationale(target.getActivity(), PERMISSION_SHOWCAMERA)) {",
+                "      if (PermissionUtils.shouldShowRequestPermissionRationale(target, PERMISSION_SHOWCAMERA)) {",
                 "        target.showRationaleForCamera();",
                 "      }",
-                "      ActivityCompat.requestPermissions(target.getActivity(), PERMISSION_SHOWCAMERA, REQUEST_SHOWCAMERA);",
+                "      target.requestPermissions(PERMISSION_SHOWCAMERA, REQUEST_SHOWCAMERA);",
                 "    }",
                 "  }",
                 "\n",
diff --git a/permissionsdispatcher-processor/src/test/libs/permissionsdispatcher-sources.jar b/permissionsdispatcher-processor/src/test/libs/permissionsdispatcher-sources.jar
diff --git a/permissionsdispatcher/src/main/android/permissions/dispatcher/PermissionUtils.java b/permissionsdispatcher/src/main/android/permissions/dispatcher/PermissionUtils.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.Fragment;
 
 import static android.support.v4.content.PermissionChecker.checkSelfPermission;
 
@@ -59,4 +60,20 @@ public static boolean shouldShowRequestPermissionRationale(Activity activity, St
         return false;
     }
 
+    /**
+     * Checks given permissions are needed to show rationale.
+     *
+     * @param fragment fragment
+     * @param permissions permission list
+     * @return returns true if one of the permission is needed to show rationale.
+     */
+    public static boolean shouldShowRequestPermissionRationale(Fragment fragment, String... permissions) {
+        for (String permission : permissions) {
+            if (fragment.shouldShowRequestPermissionRationale(permission)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`enum ClassType {`
`4`	`4`	`ACTIVITY("target"),`
`5`		`- FRAGMENT("target.getActivity()");`
	`5`	`+ V4FRAGMENT("target.getActivity()");`
`6`	`6`
`7`	`7`	`private final String activity;`
`8`	`8`
`@@ -18,7 +18,7 @@ static ClassType getClassType(String className, TypeResolver resolver) {`
`18`	`18`	`if (resolver.isSubTypeOf(className, ConstantsProvider.ACTIVITY)) {`
`19`	`19`	`return ACTIVITY;`
`20`	`20`	`} else if (resolver.isSubTypeOf(className, ConstantsProvider.V4FRAGMENT)) {`
`21`		`- return FRAGMENT;`
	`21`	`+ return V4FRAGMENT;`
`22`	`22`	`}`
`23`	`23`	`return null;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class ClassTypeTest {`
`12`	`12`	`@Test`
`13`	`13`	`public void getActivityTest() {`
`14`	`14`	`assertThat(ClassType.ACTIVITY.getActivity()).isEqualTo("target");`
`15`		`- assertThat(ClassType.FRAGMENT.getActivity()).isEqualTo("target.getActivity()");`
	`15`	`+ assertThat(ClassType.V4FRAGMENT.getActivity()).isEqualTo("target.getActivity()");`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ public void testGetFieldName() {`
`69`	`69`	`assertThat(getRequestCodeFieldName(name)).isEqualTo("REQUEST_ACTIVITY");`
`70`	`70`	`}`
`71`	`71`	`{`
`72`		`- String name = "FRAGMENT";`
`73`		`- assertThat(getRequestCodeFieldName(name)).isEqualTo("REQUEST_FRAGMENT");`
	`72`	`+ String name = "V4FRAGMENT";`
	`73`	`+ assertThat(getRequestCodeFieldName(name)).isEqualTo("REQUEST_V4FRAGMENT");`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`