From c9ee2c6304f9745cd314784e1d8174adbb2f2f53 Mon Sep 17 00:00:00 2001
From: Josia Pietsch <git@jrpie.de>
Date: Fri, 14 Mar 2025 02:00:26 +0100
Subject: [PATCH] handle exception when acessing shortcuts

---
 .../de/jrpie/android/launcher/Functions.kt    |  2 +-
 .../launcher/apps/PinnedShortcutInfo.kt       | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/de/jrpie/android/launcher/Functions.kt b/app/src/main/java/de/jrpie/android/launcher/Functions.kt
index 81e58d7..7c2abbf 100644
--- a/app/src/main/java/de/jrpie/android/launcher/Functions.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/Functions.kt
@@ -100,7 +100,7 @@ fun removeUnusedShortcuts(context: Context) {
                 },
                 profile
             )
-        } catch (e: IllegalStateException) {
+        } catch (e: Exception) {
             // https://github.com/jrpie/launcher/issues/116
             return null
         }
diff --git a/app/src/main/java/de/jrpie/android/launcher/apps/PinnedShortcutInfo.kt b/app/src/main/java/de/jrpie/android/launcher/apps/PinnedShortcutInfo.kt
index a2815e5..1dc1e1f 100644
--- a/app/src/main/java/de/jrpie/android/launcher/apps/PinnedShortcutInfo.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/apps/PinnedShortcutInfo.kt
@@ -28,15 +28,20 @@ class PinnedShortcutInfo(
     fun getShortcutInfo(context: Context): ShortcutInfo? {
         val launcherApps = context.getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps
 
-        return launcherApps.getShortcuts(
-            ShortcutQuery().apply {
-                setQueryFlags(ShortcutQuery.FLAG_MATCH_PINNED)
-                setPackage(packageName)
-                setActivity(ComponentName(packageName, activityName))
-                setShortcutIds(listOf(id))
-            },
-            getUserFromId(user, context)
-        )?.firstOrNull()
+        return try {
+            launcherApps.getShortcuts(
+                ShortcutQuery().apply {
+                    setQueryFlags(ShortcutQuery.FLAG_MATCH_PINNED)
+                    setPackage(packageName)
+                    setActivity(ComponentName(packageName, activityName))
+                    setShortcutIds(listOf(id))
+                },
+                getUserFromId(user, context)
+            )?.firstOrNull()
+        } catch(_: Exception) {
+            // can throw SecurityException or IllegalStateException when profile is locked
+            null
+        }
     }
 
     override fun equals(other: Any?): Boolean {