YumeYucca
diff --git a/‎app/src/screen/settings/AccessControlScreen.kt‎
Lines changed: 2 additions & 0 deletions b/‎app/src/screen/settings/AccessControlScreen.kt‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎app/src/screen/settings/AccessControlViewModel.kt‎
Lines changed: 16 additions & 3 deletions b/‎app/src/screen/settings/AccessControlViewModel.kt‎
Lines changed: 16 additions & 3 deletions
diff --git a/‎kernel.properties‎
Lines changed: 1 addition & 1 deletion b/‎kernel.properties‎
Lines changed: 1 addition & 1 deletion
@@ -59,6 +59,8 @@ fun AccessControlScreen(navigator: Navigator) {
     val uiState by viewModel.uiState.collectAsState()
     val filteredApps by viewModel.filteredApps.collectAsState()
 
+    LaunchedEffect(viewModel) { viewModel.refreshSelection() }
+
     var showSortMenu by remember { mutableStateOf(false) }
     var showOpsMenu by remember { mutableStateOf(false) }
     val mainListState = rememberLazyListState()
 
@@ -72,9 +72,8 @@ class AccessControlViewModel(
         val apps: List<AppInfo> = emptyList(),
         val selectedPackages: Set<String> = emptySet(),
         /**
-         * Snapshot of the selected packages taken when the screen loads. Selected-first sorting
-         * only ever looks at this snapshot, so toggling apps never reorders the visible list —
-         * newly selected apps float to the top on the next screen entry instead.
+         * Selection snapshot used for ordering the currently visible list. It is refreshed when
+         * the screen is entered, so changing a checkbox does not immediately move that row.
          */
         val initialSelectedPackages: Set<String> = emptySet(),
         val searchQuery: String = "",
@@ -183,6 +182,20 @@ class AccessControlViewModel(
         }
     }
 
+    /**
+     * Synchronize selection-related state when the screen becomes visible again. The ViewModel is
+     * activity-scoped by the Compose Koin owner, so navigating away does not recreate it.
+     */
+    fun refreshSelection() {
+        val selectedPackages = settings.accessControlPackages.value
+        _uiState.update { state ->
+            state.copy(
+                selectedPackages = selectedPackages,
+                initialSelectedPackages = selectedPackages,
+            )
+        }
+    }
+
     private fun loadInstalledApps(): List<AppInfo> {
         val pm = getApplication<Application>().packageManager
         val selfPackageName = getApplication<Application>().packageName
 
@@ -32,4 +32,4 @@ external.mihomo.includeTimestamp=false
 # Golang build configuration
 golang.buildTags=foss,with_gvisor,cmfa
 golang.buildFlags=-trimpath,-ldflags,-s -w
-golang.packageName=cfa/native
+golang.packageName=cfa/native