From 8a3d29fca3df88814ac804abc71ea73464f3384a Mon Sep 17 00:00:00 2001
From: d2weber <29163905+d2weber@users.noreply.github.com>
Date: Wed, 3 Jun 2026 22:06:15 +0200
Subject: [PATCH] fixup: handle null from getAvatar()

---
 .../securesms/notifications/NotificationCenter.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
index 888a749dc..650e45e10 100644
--- a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
+++ b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
@@ -810,11 +810,12 @@ public class NotificationCenter {
     }
   }
 
-  public IconCompat getAvatarIcon(DcContact contact) {
-    return IconCompat.createWithBitmap(getAvatar(new Recipient(context, contact)));
+  public @Nullable IconCompat getAvatarIcon(DcContact contact) {
+    Bitmap avatar = getAvatar(new Recipient(context, contact));
+    return avatar != null ? IconCompat.createWithBitmap(avatar) : null;
   }
 
-  public Bitmap getAvatar(Recipient recipient) {
+  public @Nullable Bitmap getAvatar(Recipient recipient) {
     try {
       Drawable drawable;
       ContactPhoto contactPhoto = recipient.getContactPhoto(context);