Refactor activity caching logic to extend CustomActivityCachingLogic …

Omega/src/com/neoapps/neolauncher/util/CustomActivityCachingLogic.kt

@@ -0,0 +1,39 @@
+/*
+ * This file is part of Neo Launcher
+ * Copyright (c) 2022   Neo Launcher Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.neoapps.neolauncher.util
+
+import android.content.pm.LauncherActivityInfo
+import com.android.launcher3.dagger.LauncherAppSingleton
+import com.android.launcher3.icons.cache.LauncherActivityCachingLogic
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.util.SafeCloseable
+import com.neoapps.neolauncher.preferences.NeoPrefs
+
+@LauncherAppSingleton
+class CustomActivityCachingLogic : LauncherActivityCachingLogic() {
+    private val prefs = NeoPrefs.getInstance()
+
+    override fun getLabel(info: LauncherActivityInfo): CharSequence? {
+        val key = ComponentKey(info.componentName, info.user)
+        val customLabel = prefs.customAppName[key]
+        if (!customLabel.isNullOrEmpty()) {
+            return customLabel
+        }
+        return super.getLabel(info)
+    }
+}

build.gradle.kts

@@ -91,7 +91,7 @@ android {
         javaCompileOptions.annotationProcessorOptions.arguments["dagger.hilt.disableModulesHaveInstallInCheck"] =
             "true"
         versionName = "1.0.1"
-        versionCode = 1006
+        versionCode = 1007
         buildConfigField("String", "BUILD_DATE", "\"${getBuildDate()}\"")
         buildConfigField("boolean", "ENABLE_AUTO_INSTALLS_LAYOUT", "false")
         buildConfigField("boolean", "IS_DEBUG_DEVICE", "false")

libs_systemui/iconloaderlib/src/com/android/launcher3/icons/cache/LauncherActivityCachingLogic.kt

@@ -27,8 +27,7 @@ import com.android.launcher3.icons.BaseIconFactory.IconOptions
 import com.android.launcher3.icons.BitmapInfo
 import com.android.launcher3.icons.IconProvider
 
-object LauncherActivityCachingLogic : CachingLogic<LauncherActivityInfo> {
-    const val TAG = "LauncherActivityCachingLogic"
+open class LauncherActivityCachingLogic : CachingLogic<LauncherActivityInfo> {
 
     override fun getComponent(info: LauncherActivityInfo): ComponentName = info.componentName
 
@@ -73,4 +72,8 @@ object LauncherActivityCachingLogic : CachingLogic<LauncherActivityInfo> {
         item: LauncherActivityInfo,
         provider: IconProvider,
     ): String? = provider.getStateForApp(getApplicationInfo(item))
+
+    companion object{
+        const val TAG = "LauncherActivityCachingLogic"
+    }
 }

src/com/android/launcher3/icons/IconCache.java

@@ -76,6 +76,7 @@
 import com.android.launcher3.widget.WidgetSections;
 import com.android.launcher3.widget.WidgetSections.WidgetSection;
 import com.neoapps.neolauncher.icons.CustomIconProvider;
+import com.neoapps.neolauncher.util.CustomActivityCachingLogic;
 
 import java.util.Collections;
 import java.util.List;
@@ -168,7 +169,7 @@ public synchronized void updateIconsForPkg(@NonNull final String packageName,
         removeIconsForPkg(packageName, user);
         long userSerial = mUserManager.getSerialNumberForUser(user);
         for (LauncherActivityInfo app : apps) {
-            addIconToDBAndMemCache(app, LauncherActivityCachingLogic.INSTANCE, userSerial);
+            addIconToDBAndMemCache(app, new CustomActivityCachingLogic(), userSerial);
         }
     }
 
@@ -239,7 +240,7 @@ private void onIconRequestEnd() {
      */
     public synchronized void updateTitleAndIcon(AppInfo application) {
         CacheEntry entry = cacheLocked(application.componentName,
-                application.user, () -> null, LauncherActivityCachingLogic.INSTANCE,
+                application.user, () -> null, new CustomActivityCachingLogic(),
                 application.getMatchingLookupFlag());
         if (entry.bitmap != null || !isDefaultIcon(entry.bitmap, application.user)) {
             applyCacheEntry(entry, application);
@@ -389,7 +390,7 @@ public synchronized void getTitleAndIcon(
             @NonNull Supplier<LauncherActivityInfo> activityInfoProvider,
             @NonNull CacheLookupFlag lookupFlag) {
         CacheEntry entry = cacheLocked(infoInOut.getTargetComponent(), infoInOut.user,
-                activityInfoProvider, LauncherActivityCachingLogic.INSTANCE, lookupFlag);
+                activityInfoProvider, new CustomActivityCachingLogic(), lookupFlag);
         applyCacheEntry(entry, infoInOut);
     }
 
@@ -490,7 +491,7 @@ private <T extends ItemInfoWithIcon> void loadIconSubsection(
                                 cn,
                                 /* user = */ sectionKey.first,
                                 () -> duplicateIconRequests.get(0).launcherActivityInfo,
-                                LauncherActivityCachingLogic.INSTANCE,
+                                new CustomActivityCachingLogic(),
                                 sectionKey.second,
                                 c);
 
@@ -539,7 +540,7 @@ private <T extends ItemInfoWithIcon> void loadIconSubsection(
                     loadFallbackIcon(
                             lai,
                             entry,
-                            LauncherActivityCachingLogic.INSTANCE,
+                            new CustomActivityCachingLogic(),
                             DEFAULT_LOOKUP_FLAG.withUsePackageIcon(false),
                             /* usePackageTitle= */ loadFallbackTitle,
                             cn,
@@ -549,7 +550,7 @@ private <T extends ItemInfoWithIcon> void loadIconSubsection(
                     loadFallbackTitle(
                             lai,
                             entry,
-                            LauncherActivityCachingLogic.INSTANCE,
+                            new CustomActivityCachingLogic(),
                             sectionKey.first);
                 }
 
@@ -643,7 +644,7 @@ public void updateSessionCache(PackageUserKey key, PackageInstaller.SessionInfo
     @VisibleForTesting
     synchronized boolean isItemInDb(ComponentKey cacheKey) {
         return getEntryFromDBLocked(cacheKey, new CacheEntry(), DEFAULT_LOOKUP_FLAG,
-                LauncherActivityCachingLogic.INSTANCE);
+                new CustomActivityCachingLogic());
     }
 
     /**

src/com/android/launcher3/model/LoaderTask.java

@@ -102,6 +102,7 @@
 import com.android.launcher3.util.UserIconInfo;
 import com.android.launcher3.widget.WidgetInflater;
 import com.android.launcher3.widget.util.WidgetSizeHandler;
+import com.neoapps.neolauncher.util.CustomActivityCachingLogic;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -254,20 +255,24 @@ private void sendFirstScreenActiveInstallsBroadcast() {
                         .collect(Collectors.toList());
         boolean shouldAttachArchivingExtras = mIsRestoreFromBackup
                 && !mSettingsCache.getValue(DISABLE_INSTALLED_APPS_BROADCAST);
-        if (Utilities.ATLEAST_V) {
-        List<FirstScreenBroadcastModel> broadcastModels =
-                mFirstScreenBroadcastHelper.createModelsForFirstScreenBroadcast(
-                        firstScreenItems,
-                        mInstallingPkgsCached,
-                        mBgDataModel.itemsIdMap.stream().filter(WIDGET_FILTER).collect(Collectors.toList()),
-                        shouldAttachArchivingExtras
-                );
-        logASplit("Sending first screen broadcast with shouldAttachArchivingExtras="
-                + shouldAttachArchivingExtras);
+        if (shouldAttachArchivingExtras) {
+            List<FirstScreenBroadcastModel> broadcastModels =
+                    mFirstScreenBroadcastHelper.createModelsForFirstScreenBroadcast(
+                            firstScreenItems,
+                            mInstallingPkgsCached,
+                            mBgDataModel.itemsIdMap.stream().filter(WIDGET_FILTER).collect(Collectors.toList()),
+                            shouldAttachArchivingExtras
+                    );
+            logASplit("Sending first screen broadcast with shouldAttachArchivingExtras="
+                    + shouldAttachArchivingExtras);
             broadcastModels.forEach(bm -> bm.sentBroadcast(mContext));
+        } else {
+            logASplit("Sending first screen broadcast");
+            //mFirstScreenBroadcastHelper.sendBroadcasts(mContext, firstScreenItems);
         }
     }
 
+
     private void loadAllSurfacesOrdered(
             LoaderMemoryLogger memoryLogger, LauncherRestoreEventLogger restoreEventLogger) {
 
@@ -330,7 +335,7 @@ private void loadAllSurfacesOrdered(
         IconCacheUpdateHandler updateHandler = mIconCache.getUpdateHandler();
         setIgnorePackages(updateHandler);
         updateHandler.updateIcons(allActivityList,
-                LauncherActivityCachingLogic.INSTANCE,
+                new CustomActivityCachingLogic(),
                 mModel::onPackageIconsUpdated);
         logASplit("update AllApps icon cache finished");