diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/fragment/CompileDialogFragment.java b/app/src/main/java/org/meowcat/edxposed/manager/ui/fragment/CompileDialogFragment.java index e910c7be..9cc5dd51 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/fragment/CompileDialogFragment.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/ui/fragment/CompileDialogFragment.java @@ -28,6 +28,7 @@ import java.util.List; import rikka.shizuku.ShizukuSystemProperties; +import static android.content.pm.PackageManager.PERMISSION_DENIED; import static android.content.pm.PackageManager.PERMISSION_GRANTED; @SuppressWarnings("deprecation") @@ -125,8 +126,7 @@ public class CompileDialogFragment extends AppCompatDialogFragment { int type = arguments.getInt(KEY_TYPE); appInfo = arguments.getParcelable(KEY_APP_INFO); type = type * 10 + 1; - if (App.checkPermission(type)) - onRequestPermissionsResult(type, PERMISSION_GRANTED); + onRequestPermissionsResult(type, App.checkPermission(type) ? PERMISSION_GRANTED : PERMISSION_DENIED); } else { dismissAllowingStateLoss(); } diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/CompileUtil.java b/app/src/main/java/org/meowcat/edxposed/manager/util/CompileUtil.java index 628c302c..8e987347 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/CompileUtil.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/util/CompileUtil.java @@ -24,6 +24,7 @@ import rikka.shizuku.ShizukuBinderWrapper; import rikka.shizuku.ShizukuSystemProperties; import rikka.shizuku.SystemServiceHelper; +import static android.content.pm.PackageManager.PERMISSION_DENIED; import static android.content.pm.PackageManager.PERMISSION_GRANTED; @SuppressWarnings("deprecation") @@ -125,15 +126,13 @@ public class CompileUtil { public static void compileAllDexopt(Activity activity) { sActivity = activity; int type = CompileType.DEXOPT_ALL.ordinal() * 10 + 1; - if (App.checkPermission(type)) - onRequestPermissionsResult(type, PERMISSION_GRANTED); + onRequestPermissionsResult(type, App.checkPermission(type) ? PERMISSION_GRANTED : PERMISSION_DENIED); } public static void compileAllSpeed(Activity activity) { sActivity = activity; int type = CompileType.SPEED_ALL.ordinal() * 10 + 1; - if (App.checkPermission(type)) - onRequestPermissionsResult(type, PERMISSION_GRANTED); + onRequestPermissionsResult(type, App.checkPermission(type) ? PERMISSION_GRANTED : PERMISSION_DENIED); } private static void compilePackageInBg(FragmentManager fragmentManager, diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/RebootUtil.java b/app/src/main/java/org/meowcat/edxposed/manager/util/RebootUtil.java index 090e7f48..503ca98e 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/RebootUtil.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/util/RebootUtil.java @@ -15,6 +15,7 @@ import rikka.shizuku.ShizukuBinderWrapper; import rikka.shizuku.ShizukuSystemProperties; import rikka.shizuku.SystemServiceHelper; +import static android.content.pm.PackageManager.PERMISSION_DENIED; import static android.content.pm.PackageManager.PERMISSION_GRANTED; public class RebootUtil { @@ -60,9 +61,8 @@ public class RebootUtil { public static void reboot(RebootType mode) { - if (App.checkPermission(mode.ordinal())) { - onRequestPermissionsResult(mode.ordinal(), PERMISSION_GRANTED); - } + onRequestPermissionsResult(mode.ordinal(), App.checkPermission(mode.ordinal()) ? PERMISSION_GRANTED : PERMISSION_DENIED); + } private static void rebootWithShell(RebootType mode) {