From d11358671e472975cd9a529c14a94d6e3f1e816f Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Fri, 19 Mar 2021 03:24:14 +0800
Subject: [PATCH] Fix isolated process display

---
 .../main/java/com/topjohnwu/magisk/ui/hide/HideInfo.kt   | 6 +++---
 .../java/com/topjohnwu/magisk/ui/hide/HideRvItems.kt     | 9 +++++++--
 app/src/main/res/layout/item_hide_process_md2.xml        | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideInfo.kt b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideInfo.kt
index 7cd7add51..bd3d46317 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideInfo.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideInfo.kt
@@ -60,7 +60,7 @@ class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<Cmdl
 
         val hidden = hideList.filter { it.packageName == packageName || it.packageName == ISOLATED_MAGIC }
         fun createProcess(name: String, pkg: String = packageName): HideProcessInfo {
-            return HideProcessInfo(name, pkg, hidden.any { it.process == name })
+            return HideProcessInfo(name, pkg, hidden.any { it.process == name && it.packageName == pkg })
         }
 
         var haveAppZygote = false
@@ -86,7 +86,7 @@ class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<Cmdl
             receivers?.processes().orEmpty() +
             providers?.processes().orEmpty() +
             listOf(if (haveAppZygote) createProcess("${processName}_zygote") else null)
-        }.filterNotNull().distinctBy { it.name }.sortedBy { it.name }
+        }.filterNotNull().distinct().sortedBy { it.name }
     }
 
     companion object {
@@ -102,6 +102,6 @@ data class HideProcessInfo(
     val packageName: String,
     var isHidden: Boolean
 ) {
-    val isIsolated get() = name == ISOLATED_MAGIC
+    val isIsolated get() = packageName == ISOLATED_MAGIC
     val isAppZygote get() = name.endsWith("_zygote")
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideRvItems.kt b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideRvItems.kt
index ed8b77c7b..2c1375071 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideRvItems.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideRvItems.kt
@@ -93,6 +93,8 @@ class HideProcessRvItem(
 
     override val layoutRes get() = R.layout.item_hide_process_md2
 
+    val displayName = if (process.isIsolated) "(isolated) ${process.name}" else process.name
+
     @get:Bindable
     var isHidden
         get() = process.isHidden
@@ -109,7 +111,10 @@ class HideProcessRvItem(
     val defaultSelection get() =
         process.isIsolated || process.isAppZygote || process.name == process.packageName
 
-    override fun contentSameAs(other: HideProcessRvItem) = process == other.process
-    override fun itemSameAs(other: HideProcessRvItem) = process.name == other.process.name
+    override fun contentSameAs(other: HideProcessRvItem) =
+        process.isHidden == other.process.isHidden
+
+    override fun itemSameAs(other: HideProcessRvItem) =
+        process.name == other.process.name && process.packageName == other.process.packageName
 
 }
diff --git a/app/src/main/res/layout/item_hide_process_md2.xml b/app/src/main/res/layout/item_hide_process_md2.xml
index 45a3b9865..0b684e617 100644
--- a/app/src/main/res/layout/item_hide_process_md2.xml
+++ b/app/src/main/res/layout/item_hide_process_md2.xml
@@ -30,7 +30,7 @@
             android:layout_marginBottom="@dimen/l_75"
             android:singleLine="true"
             android:ellipsize="middle"
-            android:text="@{item.process.name}"
+            android:text="@{item.displayName}"
             android:textAppearance="@style/AppearanceFoundation.Caption.Variant"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/hide_process_checkbox"