Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-02 00:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only get collapsed timer state when necessary.

Browse Source
This commit is contained in:
Michelle Tang
2026-03-26 10:50:26 -04:00
committed by Alex Hart
parent f04a0533cb
commit 2ad14800d1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
View File

@@ -310,7 +310,7 @@ public class ConversationMessage {
long collapsedExpirationInMs = 0; long collapsedExpirationInMs = 0;
if (CollapsedState.isHead(messageRecord.getCollapsedState())) { if (CollapsedState.isHead(messageRecord.getCollapsedState())) {
collapsedSize = SignalDatabase.messages().getCollapsedCount(messageRecord.getId()); 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()); collapsedExpirationInMs = SignalDatabase.messages().getDisappearingTimerStateForCollapsedSet(messageRecord.getId());
} }
} }

2
app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
View File

@@ -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. * 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 { fun getCollapsedCount(messageId: Long): Int {