From 6879778f4b85404bed43acc66632bf33678df967 Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Thu, 22 May 2025 14:32:11 -0400
Subject: [PATCH] Fix missing avatars in notifications.

---
 .../java/org/thoughtcrime/securesms/util/AvatarUtil.java | 9 +++++++++
 .../thoughtcrime/securesms/util/ConversationUtil.java    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
index 625a51b3be..a545f7b252 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
@@ -120,6 +120,15 @@ public final class AvatarUtil {
     }
   }
 
+  /**
+   * Shortcut icons cannot be created with uris:
+   * https://developer.android.com/reference/android/content/pm/ShortcutInfo.Builder#setIcon(android.graphics.drawable.Icon)
+   */
+  @WorkerThread
+  public static @NonNull IconCompat getIconCompatForShortcut(@NonNull Context context, @NonNull Recipient recipient) {
+    return IconCompat.createWithBitmap(getBitmapForNotification(context, recipient, AdaptiveBitmapMetrics.getInnerWidth()));
+  }
+
   @WorkerThread
   public static Bitmap getBitmapForNotification(@NonNull Context context, @NonNull Recipient recipient) {
     return getBitmapForNotification(context, recipient, UNDEFINED_SIZE);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
index e8713c330a..e145e7b5b4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
@@ -228,7 +228,7 @@ public final class ConversationUtil {
                                  .setIntent(ConversationIntents.createBuilderSync(context, resolved.getId(), threadId).build())
                                  .setShortLabel(shortName)
                                  .setLongLabel(longName)
-                                 .setIcon(AvatarUtil.getIconCompat(context, resolved))
+                                 .setIcon(AvatarUtil.getIconCompatForShortcut(context, resolved))
                                  .setPersons(persons)
                                  .setCategories(Sets.newHashSet(CATEGORY_SHARE_TARGET))
                                  .setActivity(activity)