From 2ad14800d1e948b28cb21fb7a3bf2bbef497db6e Mon Sep 17 00:00:00 2001 From: Michelle Tang Date: Thu, 26 Mar 2026 10:50:26 -0400 Subject: [PATCH] Only get collapsed timer state when necessary. --- .../securesms/conversation/ConversationMessage.java | 2 +- .../java/org/thoughtcrime/securesms/database/MessageTable.kt | 2 +- 2 files changed, 2 insertions(+), 2 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 99612df4e1..fb98ac3980 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java @@ -310,7 +310,7 @@ public class ConversationMessage { long collapsedExpirationInMs = 0; if (CollapsedState.isHead(messageRecord.getCollapsedState())) { collapsedSize = SignalDatabase.messages().getCollapsedCount(messageRecord.getId()); - if (CollapsibleEvents.getCollapsibleType(messageRecord.getType(), messageRecord.getMessageExtras()) == CollapsibleEvents.CollapsibleType.DISAPPEARING_TIMER) { + if (CollapsibleEvents.getCollapsibleType(messageRecord.getType(), messageRecord.getMessageExtras()) == CollapsibleEvents.CollapsibleType.DISAPPEARING_TIMER && collapsedSize > 1) { collapsedExpirationInMs = SignalDatabase.messages().getDisappearingTimerStateForCollapsedSet(messageRecord.getId()); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt index 9ec1ccc20e..1ba8c81b88 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt @@ -6212,7 +6212,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat } /** - * Returns the number of updates that belong in a collapsed update set where [messageId] is the head (first update) in that set + * Returns the number of updates that belong in a collapsed update set where [messageId] is the head (first update) in that set. * If an event is [PENDING_COLLAPSED], we do not want to consider it part of the count until it is seen. */ fun getCollapsedCount(messageId: Long): Int {