fix: can not exclude page when manual enable app

isEqual · Mar 1, 2024 · f98daef · f98daef
1 parent 0806d14
commit f98daef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/kotlin/li/songe/gkd/data/GlobalRule.kt b/app/src/main/kotlin/li/songe/gkd/data/GlobalRule.kt
@@ -62,12 +62,14 @@ class GlobalRule(
         if (excludeData.excludeAppIds.contains(appId)) {
             return false
         }
+        if (activityId != null && excludeData.activityIds.contains(appId to activityId)) {
+            return false
+        }
         if (excludeData.includeAppIds.contains(appId)) {
             activityId ?: return true
             val app = apps[appId] ?: return true
+            // 规则自带页面的禁用
             return !app.excludeActivityIds.any { e -> e.startsWith(activityId) }
-        } else if (activityId != null && excludeData.activityIds.contains(appId to activityId)) {
-            return false
         }
         if (!matchLauncher && appId == launcherAppId) {
             return false

diff --git a/app/src/main/kotlin/li/songe/gkd/data/SubsConfig.kt b/app/src/main/kotlin/li/songe/gkd/data/SubsConfig.kt
@@ -85,8 +85,8 @@ data class ExcludeData(
     val appIds: Map<String, Boolean>,
     val activityIds: Set<Pair<String, String>>,
 ) {
-    val excludeAppIds = appIds.entries.filter { e -> e.value }.map { e -> e.key }.toSet()
-    val includeAppIds = appIds.entries.filter { e -> !e.value }.map { e -> e.key }.toSet()
+    val excludeAppIds = appIds.entries.filter { e -> e.value }.map { e -> e.key }.toHashSet()
+    val includeAppIds = appIds.entries.filter { e -> !e.value }.map { e -> e.key }.toHashSet()
 
     companion object {
         fun parse(exclude: String?): ExcludeData {