From 6d96d3ae8f124135e4b63ce04586ea710fdf24c0 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Fri, 13 Oct 2023 15:11:26 +0200
Subject: [PATCH] Catch NPE

Fix #551, #549
---
 .../java/de/mm20/launcher2/search/data/LauncherShortcut.kt    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LauncherShortcut.kt b/data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LauncherShortcut.kt
index acba2a78..86d84384 100644
--- a/data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LauncherShortcut.kt
+++ b/data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LauncherShortcut.kt
@@ -19,6 +19,7 @@ import de.mm20.launcher2.ktx.getSerialNumber
 import de.mm20.launcher2.ktx.isAtLeastApiLevel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import java.lang.NullPointerException
 
 /**
  * Represents a modern (Android O+) launcher shortcut
@@ -105,6 +106,9 @@ data class LauncherShortcut(
             } catch (e: SecurityException) {
                 CrashReporter.logException(e)
                 null
+            } catch (e: NullPointerException) {
+                CrashReporter.logException(e)
+                null
             }
         } ?: return null
         if (icon is AdaptiveIconDrawable) {