From e089be310bb18af0c04b84c3db1f3d306d4ea662 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sun, 21 Dec 2025 13:36:08 -0500
Subject: [PATCH] Fix crash related to timer updates.

---
 .../securesms/conversation/ConversationMessage.java      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
index a611343fe5..d02537c093 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
@@ -165,9 +165,12 @@ public class ConversationMessage {
   }
 
   public static @NonNull FormattedDate getFormattedDate(@NonNull Context context, @NonNull MessageRecord messageRecord) {
-    String time = DateUtils.getOnlyTimeString(context, ((MmsMessageRecord) messageRecord).getScheduledDate());
-    return MessageRecordUtil.isScheduled(messageRecord) ? new FormattedDate(false, false, time, time)
-                                                        : DateUtils.getDatelessRelativeTimeSpanFormattedDate(context, Locale.getDefault(), messageRecord.getTimestamp());
+    if (MessageRecordUtil.isScheduled(messageRecord)) {
+      String time = DateUtils.getOnlyTimeString(context, ((MmsMessageRecord) messageRecord).getScheduledDate());
+      return new FormattedDate(false, false, time, time);
+    } else {
+      return DateUtils.getDatelessRelativeTimeSpanFormattedDate(context, Locale.getDefault(), messageRecord.getTimestamp());
+    }
   }
 
   public static class ComputedProperties {