From caa0c26a546474d18c2eb91d7c68740b239df7a0 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 18 Nov 2025 20:05:49 -0500
Subject: [PATCH] Fix potential NPE with disappearing group updates.

---
 .../securesms/conversation/ConversationUpdateItem.java        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
index c684f611a1..52b51e927a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -420,6 +420,10 @@ public final class ConversationUpdateItem extends FrameLayout
   }
 
   private void updateBodyWithTimer() {
+    if (displayBody == null) {
+      return;
+    }
+
     SpannableStringBuilder builder = new SpannableStringBuilder(displayBody);
 
     if (latestFrame != 0) {