From 975ad2e14920ea5f142b49c51024bf7115f89f24 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Fri, 8 May 2026 17:01:47 +0200
Subject: [PATCH] wrap with try-catch

---
 .../securesms/BaseConversationListFragment.java        | 10 ++++++++--
 .../org/thoughtcrime/securesms/WebxdcActivity.java     |  9 ++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java b/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java
index 0ec891f2f..30d58152f 100644
--- a/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java
@@ -423,8 +423,14 @@ public abstract class BaseConversationListFragment extends Fragment implements A
                   .setIcon(IconCompat.createWithAdaptiveBitmap(avatar))
                   .setIntent(intent)
                   .build();
-          boolean success =
-              ShortcutManagerCompat.requestPinShortcut(activity, shortcutInfoCompat, null);
+
+          boolean success;
+          try {
+            success = ShortcutManagerCompat.requestPinShortcut(activity, shortcutInfoCompat, null);
+          } catch (Exception e) {
+            Log.e(TAG, "ErrAddToHomescreen: requestPinShortcut() failed", e);
+            success = false;
+          }
           Util.runOnMain(
               () -> {
                 if (!success) {
diff --git a/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java
index 652799457..0a9391d73 100644
--- a/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java
@@ -547,7 +547,14 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
       Toast.makeText(context, R.string.one_moment, Toast.LENGTH_SHORT).show();
       Util.runOnAnyBackgroundThread(
           () -> {
-            if (!ShortcutManagerCompat.requestPinShortcut(context, shortcutInfoCompat, null)) {
+            boolean success;
+            try {
+              sucess = ShortcutManagerCompat.requestPinShortcut(context, shortcutInfoCompat, null);
+            } catch (Exception e) {
+              Log.e(TAG, "ErrAddToHomescreen: requestPinShortcut() failed", e);
+              success = false;
+            }
+            if (!success) {
               Util.runOnMain(
                   () ->
                       Toast.makeText(