Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 21:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use distinct timestamp for sync message expire timer updates.

Browse Source
This commit is contained in:
Cody Henthorne
2023-04-21 13:44:34 -04:00
parent 1d793de213
commit 4fce7cc3cc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
View File

@@ -598,7 +598,7 @@ object SyncMessageProcessor {
}
@Throws(MmsException::class)
private fun handleSynchronizeSentExpirationUpdate(sent: Sent): Long {
private fun handleSynchronizeSentExpirationUpdate(sent: Sent, sideEffect: Boolean = false): Long {
log(sent.timestamp, "Synchronize sent expiration update.")
val groupId: GroupId? = getSyncMessageDestination(sent).groupId.orNull()
@@ -609,7 +609,7 @@ object SyncMessageProcessor {
}
val recipient: Recipient = getSyncMessageDestination(sent)
val expirationUpdateMessage: OutgoingMessage = expirationUpdateMessage(recipient, sent.timestamp, sent.message.expireTimer.seconds.inWholeMilliseconds)
val expirationUpdateMessage: OutgoingMessage = expirationUpdateMessage(recipient, if (sideEffect) sent.timestamp - 1 else sent.timestamp, sent.message.expireTimer.seconds.inWholeMilliseconds)
val threadId: Long = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
val messageId: Long = SignalDatabase.messages.insertMessageOutbox(expirationUpdateMessage, threadId, false, null)
@@ -680,7 +680,7 @@ object SyncMessageProcessor {
)
if (recipient.expiresInSeconds != sent.message.expireTimer) {
handleSynchronizeSentExpirationUpdate(sent)
handleSynchronizeSentExpirationUpdate(sent, sideEffect = true)
}
val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
@@ -751,7 +751,7 @@ object SyncMessageProcessor {
)
if (recipient.expiresInSeconds != sent.message.expireTimer) {
handleSynchronizeSentExpirationUpdate(sent)
handleSynchronizeSentExpirationUpdate(sent, sideEffect = true)
}
val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
@@ -808,7 +808,7 @@ object SyncMessageProcessor {
val bodyRanges = sent.message.bodyRangesList.filterNot { it.hasMentionUuid() }.toBodyRangeList()
if (recipient.expiresInSeconds != sent.message.expireTimer) {
handleSynchronizeSentExpirationUpdate(sent)
handleSynchronizeSentExpirationUpdate(sent, sideEffect = true)
}
val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)