Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-09-13 12:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't fail batch message processing on duplicate message insert.

Browse Source
This commit is contained in:
Cody Henthorne
2026-08-19 19:05:49 -04:00
parent a77dee9cd0
commit 07e09f2821
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
+18 -11
View File
@@ -432,6 +432,7 @@ object DataMessageProcessor {
val storyGroupId: GroupId? = storyGroupRecord?.id?.takeIf { storyGroupRecord.isActive }
if (storyGroupId != groupId) {
warn(envelope.clientTimestamp!!, "Story reaction target does not belong to the same conversation as the incoming message. Dropping reaction.")
SignalDatabase.messages.setTransactionSuccessful()
return null
}
@@ -452,10 +453,12 @@ object DataMessageProcessor {
expiresIn = message.expireTimerDuration
} else {
warn(envelope.clientTimestamp!!, "Story has reactions disabled. Dropping reaction.")
SignalDatabase.messages.setTransactionSuccessful()
return null
}
} catch (e: NoSuchMessageException) {
warn(envelope.clientTimestamp!!, "Couldn't find story for reaction.", e)
SignalDatabase.messages.setTransactionSuccessful()
return null
}
@@ -476,9 +479,10 @@ object DataMessageProcessor {
)
val insertResult: InsertResult? = SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
if (insertResult != null) {
SignalDatabase.messages.setTransactionSuccessful()
SignalDatabase.messages.setTransactionSuccessful()
if (insertResult != null) {
if (parentStoryId.isGroupReply()) {
AppDependencies.messageNotifier.updateNotification(context, ConversationId.fromThreadAndReply(insertResult.threadId, parentStoryId as GroupReply))
} else {
@@ -759,6 +763,7 @@ object DataMessageProcessor {
val storyGroupId: GroupId? = groupRecord?.id?.takeIf { groupStory }
if (storyGroupId != groupId) {
warn(envelope.clientTimestamp!!, "Story reply target does not belong to the same conversation as the incoming message. Dropping reply.")
SignalDatabase.messages.setTransactionSuccessful()
return null
}
@@ -766,8 +771,6 @@ object DataMessageProcessor {
threadRecipient = senderRecipient
}
handlePossibleExpirationUpdate(envelope, metadata, senderRecipient, threadRecipient, groupId, message.expireTimerDuration, message.expireTimerVersion, receivedTime)
if (message.hasGroupContext) {
parentStoryId = GroupReply(storyMessageId.id)
} else if (groupStory || SignalDatabase.storySends.canReply(senderRecipient.id, sentTimestamp)) {
@@ -784,10 +787,14 @@ object DataMessageProcessor {
expiresInMillis = message.expireTimerDuration
} else {
warn(envelope.clientTimestamp!!, "Story has replies disabled. Dropping reply.")
SignalDatabase.messages.setTransactionSuccessful()
return null
}
handlePossibleExpirationUpdate(envelope, metadata, senderRecipient, threadRecipient, groupId, message.expireTimerDuration, message.expireTimerVersion, receivedTime)
} catch (e: NoSuchMessageException) {
warn(envelope.clientTimestamp!!, "Couldn't find story for reply.", e)
SignalDatabase.messages.setTransactionSuccessful()
return null
}
@@ -813,9 +820,9 @@ object DataMessageProcessor {
val insertResult: InsertResult? = SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
if (insertResult != null) {
SignalDatabase.messages.setTransactionSuccessful()
SignalDatabase.messages.setTransactionSuccessful()
if (insertResult != null) {
if (parentStoryId.isGroupReply()) {
AppDependencies.messageNotifier.updateNotification(context, ConversationId.fromThreadAndReply(insertResult.threadId, parentStoryId as GroupReply))
} else {
@@ -942,11 +949,11 @@ object DataMessageProcessor {
)
insertResult = SignalDatabase.messages.insertMessageInbox(retrieved = mediaMessage, candidateThreadId = -1, skipThreadUpdate = batchCache.batchThreadUpdates).orNull()
if (insertResult != null) {
SignalDatabase.messages.setTransactionSuccessful()
if (insertResult.needsThreadUpdate) {
batchCache.addIncomingMessageInsertThreadUpdate(insertResult.threadId)
}
SignalDatabase.messages.setTransactionSuccessful()
if (insertResult != null && insertResult.needsThreadUpdate) {
batchCache.addIncomingMessageInsertThreadUpdate(insertResult.threadId)
}
} catch (e: MmsException) {
throw StorageFailedException(e, metadata.sourceServiceId.toString(), metadata.sourceDeviceId)
app/src/main/java/org/thoughtcrime/securesms/messages/StoryMessageProcessor.kt
+2 -3
View File
@@ -90,9 +90,8 @@ object StoryMessageProcessor {
)
insertResult = SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
if (insertResult != null) {
SignalDatabase.messages.setTransactionSuccessful()
}
SignalDatabase.messages.setTransactionSuccessful()
} catch (e: MmsException) {
throw StorageFailedException(e, metadata.sourceServiceId.toString(), metadata.sourceDeviceId)
} finally {