backup: apply Magisk hide/denylist rules only if it is enabled

MuntashirAkon · MuntashirAkon · commit 0c43c3de94e4 · 2025-09-06T00:32:36.000-07:00
In App Info tab, adding a package or process to Magisk hide/denylist continues
to enable the feature automatically since it is done actively.

Signed-off-by: Muntashir Al-Islam &lt;muntashirakon@riseup.net&gt;
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/backup/RestoreOp.java b/app/src/main/java/io/github/muntashirakon/AppManager/backup/RestoreOp.java
@@ -609,15 +609,15 @@ private synchronized void restoreExtras() throws BackupException {
                     case MAGISK_HIDE: {
                         MagiskHideRule magiskHideRule = (MagiskHideRule) entry;
                         if (magiskHideAvailable) {
-                            MagiskHide.apply(magiskHideRule.getMagiskProcess());
+                            MagiskHide.apply(magiskHideRule.getMagiskProcess(), false);
                         } else {
                             // Fall-back to Magisk DenyList
-                            MagiskDenyList.apply(magiskHideRule.getMagiskProcess());
+                            MagiskDenyList.apply(magiskHideRule.getMagiskProcess(), false);
                         }
                         break;
                     }
                     case MAGISK_DENY_LIST: {
-                        MagiskDenyList.apply(((MagiskDenyListRule) entry).getMagiskProcess());
+                        MagiskDenyList.apply(((MagiskDenyListRule) entry).getMagiskProcess(), false);
                         break;
                     }
                     case NOTIFICATION:
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/details/info/AppInfoFragment.java b/app/src/main/java/io/github/muntashirakon/AppManager/details/info/AppInfoFragment.java
@@ -1217,7 +1217,7 @@ private void displayMagiskHideDialog() {
         builder = getMagiskProcessDialog(mMagiskHiddenProcesses, (dialog, which, mp, isChecked) ->
                 ThreadUtils.postOnBackgroundThread(() -> {
                     mp.setEnabled(isChecked);
-                    if (MagiskHide.apply(mp)) {
+                    if (MagiskHide.apply(mp, true)) {
                         try (ComponentsBlocker cb = ComponentsBlocker.getMutableInstance(mPackageName, mUserId)) {
                             cb.setMagiskHide(mp);
                             mMainModel.getTagsAlteredLiveData().postValue(true);
@@ -1239,7 +1239,7 @@ private void displayMagiskDenyListDialog() {
         builder = getMagiskProcessDialog(mMagiskDeniedProcesses, (dialog, which, mp, isChecked) ->
                 ThreadUtils.postOnBackgroundThread(() -> {
                     mp.setEnabled(isChecked);
-                    if (MagiskDenyList.apply(mp)) {
+                    if (MagiskDenyList.apply(mp, true)) {
                         try (ComponentsBlocker cb = ComponentsBlocker.getMutableInstance(mPackageName, mUserId)) {
                             cb.setMagiskDenyList(mp);
                             mMainModel.getTagsAlteredLiveData().postValue(true);
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/magisk/MagiskDenyList.java b/app/src/main/java/io/github/muntashirakon/AppManager/magisk/MagiskDenyList.java
@@ -39,23 +39,23 @@ public static boolean enableIfNotAlready(boolean forceEnable) {
         } else return true;
     }
 
-    public static boolean apply(@NonNull MagiskProcess magiskProcess) {
+    public static boolean apply(@NonNull MagiskProcess magiskProcess, boolean forceEnable) {
         String packageName = magiskProcess.isIsolatedProcess() && !magiskProcess.isAppZygote() ? ISOLATED_MAGIC
                 : magiskProcess.packageName;
         if (magiskProcess.isEnabled()) {
-            return add(packageName, magiskProcess.name);
+            return add(packageName, magiskProcess.name, forceEnable);
         }
         return remove(packageName, magiskProcess.name);
     }
 
-    public static boolean add(String packageName, String processName) {
+    private static boolean add(String packageName, String processName, boolean forceEnable) {
         // Check DenyList status
-        if (!enableIfNotAlready(true)) return false;
+        if (!enableIfNotAlready(forceEnable)) return false;
         // DenyList is enabled, enable hide for the package
         return Runner.runCommand(new String[]{"magisk", "--denylist", "add", packageName, processName}).isSuccessful();
     }
 
-    public static boolean remove(String packageName, String processName) {
+    private static boolean remove(String packageName, String processName) {
         // Disable hide for the package (don't need to check for status)
         return Runner.runCommand(new String[]{"magisk", "--denylist", "rm", packageName, processName}).isSuccessful();
     }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/magisk/MagiskHide.java b/app/src/main/java/io/github/muntashirakon/AppManager/magisk/MagiskHide.java
@@ -39,18 +39,18 @@ public static boolean enableIfNotAlready(boolean forceEnable) {
         } else return true;
     }
 
-    public static boolean apply(@NonNull MagiskProcess magiskProcess) {
+    public static boolean apply(@NonNull MagiskProcess magiskProcess, boolean forceEnable) {
         String packageName = magiskProcess.isIsolatedProcess() && !magiskProcess.isAppZygote() ? ISOLATED_MAGIC
                 : magiskProcess.packageName;
         if (magiskProcess.isEnabled()) {
-            return add(packageName, magiskProcess.name);
+            return add(packageName, magiskProcess.name, forceEnable);
         }
         return remove(packageName, magiskProcess.name);
     }
 
-    private static boolean add(String packageName, String processName) {
+    private static boolean add(String packageName, String processName, boolean forceEnable) {
         // Check MagiskHide status
-        if (!enableIfNotAlready(true)) return false;
+        if (!enableIfNotAlready(forceEnable)) return false;
         // MagiskHide is enabled, enable hide for the package
         return Runner.runCommand(new String[]{"magiskhide", "add", packageName, processName}).isSuccessful();
     }

Original file line number	Diff line number	Diff line change
`@@ -609,15 +609,15 @@ private synchronized void restoreExtras() throws BackupException {`
`609`	`609`	`case MAGISK_HIDE: {`
`610`	`610`	`MagiskHideRule magiskHideRule = (MagiskHideRule) entry;`
`611`	`611`	`if (magiskHideAvailable) {`
`612`		`- MagiskHide.apply(magiskHideRule.getMagiskProcess());`
	`612`	`+ MagiskHide.apply(magiskHideRule.getMagiskProcess(), false);`
`613`	`613`	`} else {`
`614`	`614`	`// Fall-back to Magisk DenyList`
`615`		`- MagiskDenyList.apply(magiskHideRule.getMagiskProcess());`
	`615`	`+ MagiskDenyList.apply(magiskHideRule.getMagiskProcess(), false);`
`616`	`616`	`}`
`617`	`617`	`break;`
`618`	`618`	`}`
`619`	`619`	`case MAGISK_DENY_LIST: {`
`620`		`- MagiskDenyList.apply(((MagiskDenyListRule) entry).getMagiskProcess());`
	`620`	`+ MagiskDenyList.apply(((MagiskDenyListRule) entry).getMagiskProcess(), false);`
`621`	`621`	`break;`
`622`	`622`	`}`
`623`	`623`	`case NOTIFICATION:`
Original file line number	Diff line number	Diff line change
`@@ -39,23 +39,23 @@ public static boolean enableIfNotAlready(boolean forceEnable) {`
`39`	`39`	`} else return true;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public static boolean apply(@NonNull MagiskProcess magiskProcess) {`
	`42`	`+ public static boolean apply(@NonNull MagiskProcess magiskProcess, boolean forceEnable) {`
`43`	`43`	`String packageName = magiskProcess.isIsolatedProcess() && !magiskProcess.isAppZygote() ? ISOLATED_MAGIC`
`44`	`44`	`: magiskProcess.packageName;`
`45`	`45`	`if (magiskProcess.isEnabled()) {`
`46`		`- return add(packageName, magiskProcess.name);`
	`46`	`+ return add(packageName, magiskProcess.name, forceEnable);`
`47`	`47`	`}`
`48`	`48`	`return remove(packageName, magiskProcess.name);`
`49`	`49`	`}`
`50`	`50`
`51`		`- public static boolean add(String packageName, String processName) {`
	`51`	`+ private static boolean add(String packageName, String processName, boolean forceEnable) {`
`52`	`52`	`// Check DenyList status`
`53`		`- if (!enableIfNotAlready(true)) return false;`
	`53`	`+ if (!enableIfNotAlready(forceEnable)) return false;`
`54`	`54`	`// DenyList is enabled, enable hide for the package`
`55`	`55`	`return Runner.runCommand(new String[]{"magisk", "--denylist", "add", packageName, processName}).isSuccessful();`
`56`	`56`	`}`
`57`	`57`
`58`		`- public static boolean remove(String packageName, String processName) {`
	`58`	`+ private static boolean remove(String packageName, String processName) {`
`59`	`59`	`// Disable hide for the package (don't need to check for status)`
`60`	`60`	`return Runner.runCommand(new String[]{"magisk", "--denylist", "rm", packageName, processName}).isSuccessful();`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,18 +39,18 @@ public static boolean enableIfNotAlready(boolean forceEnable) {`
`39`	`39`	`} else return true;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public static boolean apply(@NonNull MagiskProcess magiskProcess) {`
	`42`	`+ public static boolean apply(@NonNull MagiskProcess magiskProcess, boolean forceEnable) {`
`43`	`43`	`String packageName = magiskProcess.isIsolatedProcess() && !magiskProcess.isAppZygote() ? ISOLATED_MAGIC`
`44`	`44`	`: magiskProcess.packageName;`
`45`	`45`	`if (magiskProcess.isEnabled()) {`
`46`		`- return add(packageName, magiskProcess.name);`
	`46`	`+ return add(packageName, magiskProcess.name, forceEnable);`
`47`	`47`	`}`
`48`	`48`	`return remove(packageName, magiskProcess.name);`
`49`	`49`	`}`
`50`	`50`
`51`		`- private static boolean add(String packageName, String processName) {`
	`51`	`+ private static boolean add(String packageName, String processName, boolean forceEnable) {`
`52`	`52`	`// Check MagiskHide status`
`53`		`- if (!enableIfNotAlready(true)) return false;`
	`53`	`+ if (!enableIfNotAlready(forceEnable)) return false;`
`54`	`54`	`// MagiskHide is enabled, enable hide for the package`
`55`	`55`	`return Runner.runCommand(new String[]{"magiskhide", "add", packageName, processName}).isSuccessful();`
`56`	`56`	`}`