Add support for legacy app shortcuts

badges/src/main/java/de/mm20/launcher2/badges/providers/AppShortcutBadgeProvider.kt

@@ -4,7 +4,8 @@ import android.content.Context
 import android.content.pm.PackageManager
 import de.mm20.launcher2.badges.Badge
 import de.mm20.launcher2.graphics.BadgeDrawable
-import de.mm20.launcher2.search.data.AppShortcut
+import de.mm20.launcher2.search.data.LauncherShortcut
+import de.mm20.launcher2.search.data.LegacyShortcut
 import de.mm20.launcher2.search.data.Searchable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
@@ -15,7 +16,7 @@ class AppShortcutBadgeProvider(
     private val context: Context
 ) : BadgeProvider {
     override fun getBadge(searchable: Searchable): Flow<Badge?> = channelFlow {
-        if (searchable is AppShortcut) {
+        if (searchable is LauncherShortcut) {
             val componentName = searchable.launcherShortcut.activity
             if (componentName == null) {
                 send(null)
@@ -32,6 +33,23 @@ class AppShortcutBadgeProvider(
                 val badge = Badge(icon = BadgeDrawable(context, icon))
                 send(badge)
             }
+        } else if (searchable is LegacyShortcut) {
+            val packageName = searchable.packageName
+            if (packageName == null) {
+                send(null)
+                return@channelFlow
+            }
+            withContext(Dispatchers.IO) {
+                val icon = try {
+                    context.packageManager.getApplicationIcon(
+                        packageName
+                    )
+                } catch (e: PackageManager.NameNotFoundException) {
+                    return@withContext
+                }
+                val badge = Badge(icon = BadgeDrawable(context, icon))
+                send(badge)
+            }
         } else {
             send(null)
         }

badges/src/main/java/de/mm20/launcher2/badges/providers/WorkProfileBadgeProvider.kt

@@ -4,13 +4,14 @@ import de.mm20.launcher2.badges.Badge
 import de.mm20.launcher2.badges.R
 import de.mm20.launcher2.search.data.AppShortcut
 import de.mm20.launcher2.search.data.LauncherApp
+import de.mm20.launcher2.search.data.LauncherShortcut
 import de.mm20.launcher2.search.data.Searchable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 
 class WorkProfileBadgeProvider : BadgeProvider {
     override fun getBadge(searchable: Searchable): Flow<Badge?> = flow {
-        if (searchable is LauncherApp && !searchable.isMainProfile || searchable is AppShortcut && !searchable.isMainProfile) {
+        if (searchable is LauncherApp && !searchable.isMainProfile || searchable is LauncherShortcut && !searchable.isMainProfile) {
             emit(
                 Badge(
                     iconRes = R.drawable.ic_badge_workprofile