Merge pull request #948 from d4rken-org/appcontrol_force_reload

AppControl: Long pressing refresh force reloads the pkg cache
d4rken-org · Jan 24, 2024 · 59de5ce · 59de5ce
2 parents 1ef2f93 + 364aae5
commit 59de5ce
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/app-common-pkgs/src/main/java/eu/darken/sdmse/common/pkgs/PkgRepo.kt b/app-common-pkgs/src/main/java/eu/darken/sdmse/common/pkgs/PkgRepo.kt
@@ -3,6 +3,8 @@ package eu.darken.sdmse.common.pkgs
 import eu.darken.sdmse.common.collections.mutate
 import eu.darken.sdmse.common.coroutine.AppScope
 import eu.darken.sdmse.common.debug.Bugs
+import eu.darken.sdmse.common.debug.logging.Logging.Priority.DEBUG
+import eu.darken.sdmse.common.debug.logging.Logging.Priority.INFO
 import eu.darken.sdmse.common.debug.logging.Logging.Priority.VERBOSE
 import eu.darken.sdmse.common.debug.logging.log
 import eu.darken.sdmse.common.debug.logging.logTag
@@ -40,7 +42,10 @@ class PkgRepo @Inject constructor(
     data class CacheContainer(
         val isInitialized: Boolean = false,
         val pkgData: Map<CacheKey, CachedInfo> = emptyMap(),
-    )
+    ) {
+        internal val pkgCount: Int
+            get() = pkgData.count { it.value.data != null }
+    }
 
     private val cacheLock = Mutex()
     private val pkgCache = MutableStateFlow(CacheContainer())
@@ -52,7 +57,7 @@ class PkgRepo @Inject constructor(
         .onStart {
             cacheLock.withLock {
                 if (!pkgCache.value.isInitialized) {
-                    log(TAG) { "Init due to pkgs subscription" }
+                    log(TAG, INFO) { "Init due to pkgs subscription" }
                     load()
                 }
             }
@@ -62,7 +67,7 @@ class PkgRepo @Inject constructor(
     init {
         pkgEventListener.events
             .onEach {
-                log(TAG) { "Refreshing package cache due to event: $it" }
+                log(TAG, INFO) { "Refreshing package cache due to event: $it" }
                 Bugs.leaveBreadCrumb("Installed package data has changed")
                 refresh()
             }
@@ -78,7 +83,7 @@ class PkgRepo @Inject constructor(
     }
 
     private suspend fun generatePkgcache(): Map<CacheKey, CachedInfo> {
-        log(TAG) { "Generating package cache" }
+        log(TAG, INFO) { "Generating package cache" }
         return gatewaySwitch.useRes {
             pkgOps.useRes {
                 val sourceMap: Map<KClass<out PkgDataSource>, Collection<Installed>> = pkgSources.associate { source ->
@@ -114,8 +119,8 @@ class PkgRepo @Inject constructor(
                         mergedData.putAll(extraPkgs)
                     }
 
-                log(TAG) { "Pkgs total: ${mergedData.size}" }
-                mergedData.values.forEach { log(TAG, VERBOSE) { "Installed package: $it" } }
+                log(TAG, INFO) { "Pkgs total: ${mergedData.size}" }
+                mergedData.values.forEach { log(TAG, DEBUG) { "Installed package: $it" } }
 
                 mergedData
             }
@@ -172,8 +177,9 @@ class PkgRepo @Inject constructor(
     }
 
     suspend fun refresh(): Collection<Installed> = cacheLock.withLock {
-        log(TAG) { "refresh()" }
+        log(TAG) { "refresh()... (before=${pkgCache.value.pkgCount})" }
         load()
+        log(TAG, INFO) { "...refresh()ed (after=${pkgCache.value.pkgCount})" }
         pkgCache.value.pkgData.mapNotNull { it.value.data }
     }
 

diff --git a/app/src/main/java/eu/darken/sdmse/appcontrol/core/AppControl.kt b/app/src/main/java/eu/darken/sdmse/appcontrol/core/AppControl.kt
@@ -110,8 +110,8 @@ class AppControl @Inject constructor(
         internalData.value = null
 
         val currentUserHandle = userManager.currentUser().handle
-
-        val appInfos = pkgRepo.currentPkgs()
+        val pkgs = if (task.refreshPkgCache) pkgRepo.refresh() else pkgRepo.currentPkgs()
+        val appInfos = pkgs
             .filter { it.userHandle == currentUserHandle }
             .map { it.toAppInfo() }
 

diff --git a/app/src/main/java/eu/darken/sdmse/appcontrol/core/AppControlScanTask.kt b/app/src/main/java/eu/darken/sdmse/appcontrol/core/AppControlScanTask.kt
@@ -8,6 +8,7 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class AppControlScanTask(
     val pkgIdFilter: Set<Pkg.Id> = emptySet(),
+    val refreshPkgCache: Boolean = false,
 ) : AppControlTask {
 
     @Parcelize

diff --git a/app/src/main/java/eu/darken/sdmse/appcontrol/ui/list/AppControlListFragment.kt b/app/src/main/java/eu/darken/sdmse/appcontrol/ui/list/AppControlListFragment.kt
@@ -308,9 +308,16 @@ class AppControlListFragment : Fragment3(R.layout.appcontrol_list_fragment) {
             }
         }
 
-        ui.refreshAction.setOnClickListener {
-            tracker.clearSelection()
-            vm.refresh()
+        ui.refreshAction.apply {
+            setOnClickListener {
+                tracker.clearSelection()
+                vm.refresh()
+            }
+            setOnLongClickListener {
+                tracker.clearSelection()
+                vm.refresh(refreshPkgCache = true)
+                true
+            }
         }
 
         super.onViewCreated(view, savedInstanceState)

diff --git a/app/src/main/java/eu/darken/sdmse/appcontrol/ui/list/AppControlListViewModel.kt b/app/src/main/java/eu/darken/sdmse/appcontrol/ui/list/AppControlListViewModel.kt
@@ -294,9 +294,9 @@ class AppControlListViewModel @Inject constructor(
         settings.listFilter.update { old -> old.copy(tags = emptySet()) }
     }
 
-    fun refresh() = launch {
+    fun refresh(refreshPkgCache: Boolean = false) = launch {
         log(TAG) { "refresh()" }
-        appControl.submit(AppControlScanTask())
+        appControl.submit(AppControlScanTask(refreshPkgCache = refreshPkgCache))
     }
 
     fun exclude(items: Collection<AppControlListAdapter.Item>) = launch {