fix: global rule should not be show when turn off (#666)

gkd-kit · Jul 20, 2024 · dc26d96 · dc26d96
1 parent 3766c35
commit dc26d96
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/AppConfigVm.kt b/app/src/main/kotlin/li/songe/gkd/ui/AppConfigVm.kt
@@ -81,13 +81,19 @@ class AppConfigVm @Inject constructor(stateHandle: SavedStateHandle) : ViewModel
         DbSet.subsConfigDao.queryGlobalConfig(subs.map { it.first.id })
     }.flatMapLatest { it }
     val globalGroupsFlow = combine(sortedGlobalGroupsFlow, globalConfigs) { groups, configs ->
-        groups.map { g ->
-            ResolvedGlobalGroup(
-                group = g.group,
-                subsItem = g.subsItem,
-                subscription = g.subscription,
-                config = configs.find { c -> c.subsItemId == g.subsItem.id && c.groupKey == g.group.key },
-            )
+        groups.mapNotNull { g ->
+            val config =
+                configs.find { c -> c.subsItemId == g.subsItem.id && c.groupKey == g.group.key }
+            if (config?.enable == false) {
+                null
+            } else {
+                ResolvedGlobalGroup(
+                    group = g.group,
+                    subsItem = g.subsItem,
+                    subscription = g.subscription,
+                    config = config,
+                )
+            }
         }
     }.stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())