Shizuku

app/src/main/java/com/jens/automation2/ActivityPermissions.java

@@ -277,6 +277,11 @@ public class ActivityPermissions extends Activity
                         if (!havePermission(s, context))
                             return true;
                 }
+                else if(s.equalsIgnoreCase(permissionNameShizuku))
+                {
+                    if(!ShizukuAccess.isAuthorized())
+                        return true;
+                }
                 else if (!havePermission(s, context))
                     return true;
             }
@@ -448,8 +453,6 @@ public class ActivityPermissions extends Activity
             addToArrayListUnique("android.permission.RECEIVE_BOOT_COMPLETED", requiredPermissions);
         */
 
-            addToArrayListUnique(permissionNameShizuku, requiredPermissions);
-
             if(!havePermission(Manifest.permission.WRITE_SETTINGS, workingContext))
             {
                 for (Profile profile : Profile.getProfileCollection())
@@ -535,6 +538,7 @@ public class ActivityPermissions extends Activity
 
         if (rule.isRuleActive())
         {
+            addToArrayListUnique(permissionNameShizuku, requiredPermissions);
             for (Trigger trigger : rule.getTriggerSet())
             {
                 switch (trigger.getTriggerType())
@@ -1399,6 +1403,7 @@ public class ActivityPermissions extends Activity
                     else if(s.equals(permissionNameShizuku))
                     {
                         ShizukuAccess.requestAuthorization();
+                        return;
                     }
                 }
             }