Refactor CustomIconProvider and LauncherModel to improve state management and task execution

Signed-off-by: Saul Henriquez <saul_henriquez@hotmail.com>

Author: saulhdev

Omega/src/com/neoapps/neolauncher/icons/CustomIconProvider.kt

@@ -51,7 +51,7 @@ class CustomIconProvider @JvmOverloads @Inject constructor(
 
     private val prefs = NeoPrefs.getInstance()
     private val iconPackPref = prefs.profileIconPack
-    private val drawerThemedIcons = prefs.profileThemedIcons.getValue()
+    private val drawerThemedIcons get() = prefs.profileThemedIcons.getValue()
     private var isOlderLawnIconsInstalled =
         context.packageManager.getPackageVersionCode(LAWNICONS_PACKAGE_NAME) in 1..3
     private val iconPackProvider = IconPackProvider.INSTANCE.get(context)
@@ -177,6 +177,11 @@ class CustomIconProvider @JvmOverloads @Inject constructor(
         mThemedIconMap = if (isSupported && isOlderLawnIconsInstalled) null else DISABLED_MAP
     }
 
+    override fun updateSystemState() {
+        super.updateSystemState()
+        mSystemState += ",${iconPackPref.getValue()},$drawerThemedIcons"
+    }
+
     override fun getIcon(info: ComponentInfo?): Drawable {
         return CustomAdaptiveIconDrawable.wrapNonNull(super.getIcon(info))
     }

src/com/android/launcher3/LauncherModel.kt

@@ -79,6 +79,7 @@ constructor(
 ) : LauncherDumpable {
 
     private val mCallbacksList = ArrayList<BgDataModel.Callbacks>(1)
+    private val mPendingTasks = ArrayList<ModelUpdateTask>()
 
     private val mLock = Any()
 
@@ -190,6 +191,9 @@ constructor(
             stopLoader()
             mModelLoaded = false
         }
+        MODEL_EXECUTOR.execute {
+            taskControllerProvider.get().iconCache.clearMemoryCache()
+        }
         rebindCallbacks()
     }
 
@@ -333,9 +337,19 @@ constructor(
         }
 
         fun commit() {
+            val pendingTasks: List<ModelUpdateTask>
             synchronized(mLock) {
                 // Everything loaded bind the data.
                 mModelLoaded = true
+                pendingTasks = ArrayList(mPendingTasks)
+                mPendingTasks.clear()
+            }
+            if (pendingTasks.isNotEmpty()) {
+                MODEL_EXECUTOR.execute {
+                    for (task in pendingTasks) {
+                        task.execute(taskControllerProvider.get(), mBgDataModel, mBgAllAppsList)
+                    }
+                }
             }
             if (Flags.simplifiedLauncherModelBinding())
                 installQueue.resumeModelPush(ItemInstallQueue.FLAG_LOADER_RUNNING)
@@ -387,9 +401,12 @@ constructor(
             return
         }
         MODEL_EXECUTOR.execute {
-            if (!isModelLoaded()) {
-                // Loader has not yet run.
-                return@execute
+            synchronized(mLock) {
+                if (!mModelLoaded) {
+                    // Loader has not yet run.
+                    mPendingTasks.add(task)
+                    return@execute
+                }
             }
             task.execute(taskControllerProvider.get(), mBgDataModel, mBgAllAppsList)
         }