From b2cf7f5e5eabe61343c44abb8c3cff2dcb3f68c5 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Tue, 1 Apr 2025 23:00:41 +0200 Subject: [PATCH] Fix nullability of resolveCustomIcon return value Fix #1181 --- .../src/main/java/de/mm20/launcher2/icons/IconService.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/icons/src/main/java/de/mm20/launcher2/icons/IconService.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/IconService.kt index b032c0bb..deadc177 100644 --- a/services/icons/src/main/java/de/mm20/launcher2/icons/IconService.kt +++ b/services/icons/src/main/java/de/mm20/launcher2/icons/IconService.kt @@ -166,9 +166,9 @@ class IconService( } } - fun resolveCustomIcon(searchable: SavableSearchable, size: Int, customIcon: CustomIcon?): Flow { + fun resolveCustomIcon(searchable: SavableSearchable, size: Int, customIcon: CustomIcon?): Flow { return combine(iconProviders, transformations) { providers, transformations -> - var icon = cache.get(searchable.key + customIcon.hashCode() + providers.hashCode() + transformations.hashCode()) + var icon: LauncherIcon? = cache.get(searchable.key + customIcon.hashCode() + providers.hashCode() + transformations.hashCode()) if (icon != null) { return@combine icon }