From 8aecb35f2ac00deebc1296556bbefe1f716c5ed0 Mon Sep 17 00:00:00 2001
From: Suphon Thanakornpakapong <paphonb@gmail.com>
Date: Sun, 15 May 2022 23:37:25 +0700
Subject: [PATCH] Only update item filter once

---
 .../allapps/LawnchairAlphabeticalAppsList.kt  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt b/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt
index 8e889ca02b..96e12f8075 100644
--- a/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt
+++ b/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt
@@ -8,6 +8,7 @@ import com.android.launcher3.allapps.AllAppsStore
 import com.android.launcher3.allapps.AlphabeticalAppsList
 import com.android.launcher3.allapps.WorkAdapterProvider
 import com.android.launcher3.model.data.AppInfo
+import com.android.launcher3.util.ComponentKey
 import com.android.launcher3.util.ItemInfoMatcher
 import com.patrykmichalik.preferencemanager.onEach
 
@@ -17,20 +18,24 @@ class LawnchairAlphabeticalAppsList(
     adapterProvider: WorkAdapterProvider?,
 ) : AlphabeticalAppsList(context, appsStore, adapterProvider) {
 
-    private val preferenceManager2 = PreferenceManager2.getInstance(context)
+    private var hiddenApps: Set<String> = setOf()
     private var itemFilter: ItemInfoMatcher? = null
 
     init {
-        preferenceManager2.hiddenApps.onEach(launchIn = context.launcher.lifecycleScope) {
-            super.updateItemFilter { info, cn ->
-                require(info is AppInfo) { "`info` must be an instance of `AppInfo`." }
-                when {
-                    itemFilter?.matches(info, cn) == false -> false
-                    it.contains(info.toComponentKey().toString()) -> false
-                    else -> true
-                }
+        super.updateItemFilter { info, cn ->
+            require(info is AppInfo) { "`info` must be an instance of `AppInfo`." }
+            when {
+                itemFilter?.matches(info, cn) == false -> false
+                hiddenApps.contains(info.toComponentKey().toString()) -> false
+                else -> true
             }
         }
+
+        val prefs = PreferenceManager2.getInstance(context)
+        prefs.hiddenApps.onEach(launchIn = context.launcher.lifecycleScope) {
+            hiddenApps = it
+            onAppsUpdated()
+        }
     }
 
     override fun updateItemFilter(itemFilter: ItemInfoMatcher?) {