From c388b01fe832eddffbcc1fb63863b2988856d20e Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sat, 4 Dec 2021 13:55:29 +0100
Subject: [PATCH] Rename loadIconAsync to loadIcon as it's no longer guaranteed
 to be called off the main thread

---
 .../main/java/de/mm20/launcher2/search/data/AppInstallation.kt  | 2 +-
 .../src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt  | 2 +-
 .../src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt  | 2 +-
 contacts/src/main/java/de/mm20/launcher2/search/data/Contact.kt | 2 +-
 files/src/main/java/de/mm20/launcher2/search/data/File.kt       | 2 +-
 files/src/main/java/de/mm20/launcher2/search/data/GDriveFile.kt | 2 +-
 .../src/main/java/de/mm20/launcher2/search/data/OneDriveFile.kt | 2 +-
 .../src/main/java/de/mm20/launcher2/search/data/Searchable.kt   | 2 +-
 ui/src/main/java/de/mm20/launcher2/ui/ShapedLauncherIcon.kt     | 2 +-
 websites/src/main/java/de/mm20/launcher2/search/data/Website.kt | 2 +-
 .../src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt    | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/applications/src/main/java/de/mm20/launcher2/search/data/AppInstallation.kt b/applications/src/main/java/de/mm20/launcher2/search/data/AppInstallation.kt
index ace6257f..2c6a8f5d 100644
--- a/applications/src/main/java/de/mm20/launcher2/search/data/AppInstallation.kt
+++ b/applications/src/main/java/de/mm20/launcher2/search/data/AppInstallation.kt
@@ -38,7 +38,7 @@ class AppInstallation(
                 foregroundScale = 0.5f)
     }
 
-    override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
         val icon = session.appIcon ?: return getPlaceholderIcon(context)
         val foreground = BitmapDrawable(context.resources, icon)
         foreground.colorFilter = ColorMatrixColorFilter(ColorMatrix().apply {
diff --git a/applications/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt b/applications/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt
index 6c1c113d..6d05a4a0 100644
--- a/applications/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt
+++ b/applications/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt
@@ -79,7 +79,7 @@ class AppShortcut(
                 foregroundScale = 0.5f)
     }
 
-    override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
         val launcherApps = context.getSystemService(Context.LAUNCHER_APPS_SERVICE) as LauncherApps
         val icon = launcherApps.getShortcutIconDrawable(launcherShortcut, context.resources.displayMetrics.densityDpi)
         icon ?: return null
diff --git a/applications/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt b/applications/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt
index 4bf0b6be..2b723338 100644
--- a/applications/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt
+++ b/applications/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt
@@ -68,7 +68,7 @@ class LauncherApp(
         return launcherActivityInfo.user
     }
 
-    override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
         try {
             val icon =
                 withContext(Dispatchers.IO) {
diff --git a/contacts/src/main/java/de/mm20/launcher2/search/data/Contact.kt b/contacts/src/main/java/de/mm20/launcher2/search/data/Contact.kt
index 54fc8ed1..c64ad086 100644
--- a/contacts/src/main/java/de/mm20/launcher2/search/data/Contact.kt
+++ b/contacts/src/main/java/de/mm20/launcher2/search/data/Contact.kt
@@ -48,7 +48,7 @@ class Contact(
         )
     }
 
-    override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
         val contentResolver = context.contentResolver
         val uri = ContactsContract.Contacts.getLookupUri(id, lookupKey) ?: return null
         val bmp = ContactsContract.Contacts.openContactPhotoInputStream(contentResolver, uri, false)
diff --git a/files/src/main/java/de/mm20/launcher2/search/data/File.kt b/files/src/main/java/de/mm20/launcher2/search/data/File.kt
index 49dd3043..4a7836f5 100644
--- a/files/src/main/java/de/mm20/launcher2/search/data/File.kt
+++ b/files/src/main/java/de/mm20/launcher2/search/data/File.kt
@@ -51,7 +51,7 @@ open class File(
 
     open val isStoredInCloud = false
 
-    override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
         if (!JavaIOFile(path).exists()) return null
         when {
             mimeType.startsWith("image/") -> {
diff --git a/files/src/main/java/de/mm20/launcher2/search/data/GDriveFile.kt b/files/src/main/java/de/mm20/launcher2/search/data/GDriveFile.kt
index 0db7b7a4..d9033922 100644
--- a/files/src/main/java/de/mm20/launcher2/search/data/GDriveFile.kt
+++ b/files/src/main/java/de/mm20/launcher2/search/data/GDriveFile.kt
@@ -36,7 +36,7 @@ class GDriveFile(
         }
     }
 
-    override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
         return null
     }
 
diff --git a/files/src/main/java/de/mm20/launcher2/search/data/OneDriveFile.kt b/files/src/main/java/de/mm20/launcher2/search/data/OneDriveFile.kt
index b8d59582..b6a9272b 100644
--- a/files/src/main/java/de/mm20/launcher2/search/data/OneDriveFile.kt
+++ b/files/src/main/java/de/mm20/launcher2/search/data/OneDriveFile.kt
@@ -26,7 +26,7 @@ class OneDriveFile(
 
     override val isStoredInCloud = true
 
-    override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
         return null
     }
 
diff --git a/search/src/main/java/de/mm20/launcher2/search/data/Searchable.kt b/search/src/main/java/de/mm20/launcher2/search/data/Searchable.kt
index d0f9c86f..754bbc50 100644
--- a/search/src/main/java/de/mm20/launcher2/search/data/Searchable.kt
+++ b/search/src/main/java/de/mm20/launcher2/search/data/Searchable.kt
@@ -32,7 +32,7 @@ abstract class Searchable : Comparable<Searchable> {
         }
     }
 
-    open suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? = null
+    open suspend fun loadIcon(context: Context, size: Int): LauncherIcon? = null
     abstract fun getPlaceholderIcon(context: Context): LauncherIcon
 
     override fun compareTo(other: Searchable): Int {
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/ShapedLauncherIcon.kt b/ui/src/main/java/de/mm20/launcher2/ui/ShapedLauncherIcon.kt
index d68898c6..a4cc7bc1 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/ShapedLauncherIcon.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/ShapedLauncherIcon.kt
@@ -48,7 +48,7 @@ fun ShapedLauncherIcon(
 
     LaunchedEffect(item) {
         icon = withContext(Dispatchers.IO) {
-            item.loadIconAsync(context, iconSize)
+            item.loadIcon(context, iconSize)
         }
     }
 
diff --git a/websites/src/main/java/de/mm20/launcher2/search/data/Website.kt b/websites/src/main/java/de/mm20/launcher2/search/data/Website.kt
index c5b57e41..83382064 100644
--- a/websites/src/main/java/de/mm20/launcher2/search/data/Website.kt
+++ b/websites/src/main/java/de/mm20/launcher2/search/data/Website.kt
@@ -41,7 +41,7 @@ class Website(
 ) : Searchable() {
 
     override val key = "web://$url"
-    override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
         if (favicon.isEmpty()) return null
         try {
             return withContext(Dispatchers.IO) {
diff --git a/wikipedia/src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt b/wikipedia/src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt
index 63993357..7dcbe705 100644
--- a/wikipedia/src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt
+++ b/wikipedia/src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt
@@ -29,7 +29,7 @@ class Wikipedia(
 ) : Searchable() {
     override val key = "wikipedia://$id"
 
-    override suspend fun loadIconAsync(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
         return null
     }