From 633cc0214d9d8c3baf6fc0a4844b7822bd31ae15 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Mon, 2 Oct 2023 10:54:51 +0200
Subject: [PATCH] Add logging to shortcut pin request handler

---
 .../mm20/launcher2/activity/AddItemActivity.kt   |  3 +++
 .../launcher2/search/data/LauncherShortcut.kt    | 16 ++++++++++++++--
 .../mm20/launcher2/search/data/LegacyShortcut.kt |  2 ++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/app/src/main/java/de/mm20/launcher2/activity/AddItemActivity.kt b/app/app/src/main/java/de/mm20/launcher2/activity/AddItemActivity.kt
index 09f99245..9f8f1fc4 100644
--- a/app/app/src/main/java/de/mm20/launcher2/activity/AddItemActivity.kt
+++ b/app/app/src/main/java/de/mm20/launcher2/activity/AddItemActivity.kt
@@ -2,6 +2,7 @@ package de.mm20.launcher2.activity
 
 import android.app.Activity
 import android.os.Bundle
+import android.util.Log
 import de.mm20.launcher2.searchable.SearchableRepository
 import de.mm20.launcher2.search.data.AppShortcut
 import de.mm20.launcher2.services.favorites.FavoritesService
@@ -16,6 +17,8 @@ class AddItemActivity : Activity() {
         val shortcut = AppShortcut.fromPinRequestIntent(this, intent)
         if (shortcut != null) {
             favoritesService.pinItem(shortcut)
+        } else {
+            Log.w("MM20", "Shortcut could not be added")
         }
         finish()
     }
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 d9d190cc..ac30929e 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
@@ -9,6 +9,7 @@ import android.content.pm.ShortcutInfo
 import android.graphics.drawable.AdaptiveIconDrawable
 import android.os.Bundle
 import android.os.Process
+import android.util.Log
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
 import de.mm20.launcher2.appshortcuts.R
@@ -143,8 +144,19 @@ data class LauncherShortcut(
             val launcherApps =
                 context.getSystemService(Context.LAUNCHER_APPS_SERVICE) as LauncherApps
             val pinRequest = launcherApps.getPinItemRequest(data)
-            val shortcutInfo = pinRequest?.shortcutInfo ?: return null
-            if (!pinRequest.accept()) return null
+            if (pinRequest == null) {
+                Log.w("MM20", "Pin request could not be retrieved from intent")
+                return null
+            }
+            val shortcutInfo = pinRequest.shortcutInfo
+            if (shortcutInfo == null) {
+                Log.w("MM20", "Pin request is missing shortcut info")
+                return null
+            }
+            if (!pinRequest.accept()) {
+                Log.w("MM20", "Pin request could not be accepted")
+                return null
+            }
             return LauncherShortcut(
                 context,
                 shortcutInfo,
diff --git a/data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LegacyShortcut.kt b/data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LegacyShortcut.kt
index 349a69c9..c4eb13a0 100644
--- a/data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LegacyShortcut.kt
+++ b/data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LegacyShortcut.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.content.Intent.ShortcutIconResource
 import android.graphics.drawable.AdaptiveIconDrawable
 import android.os.Bundle
+import android.util.Log
 import de.mm20.launcher2.icons.*
 import de.mm20.launcher2.ktx.getDrawableOrNull
 import de.mm20.launcher2.ktx.isAtLeastApiLevel
@@ -85,6 +86,7 @@ data class LegacyShortcut(
                 data.extras?.getParcelable(Intent.EXTRA_SHORTCUT_ICON_RESOURCE)
 
             if (intent == null || name == null) {
+                Log.w("MM20", "Pin request intent is missing required extras: intent=$intent, name=$name")
                 return null
             }