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

Centralize media message inserts.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-10-23 14:18:26 -04:00
parent 4b004f70ec
commit 4f754ae309
7 changed files with 81 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
View File

@@ -330,7 +330,7 @@ object DataMessageProcessor {
isPushMessage = true
)
val insertResult: InsertResult? = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mediaMessage, -1).orNull()
val insertResult: InsertResult? = SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
SignalDatabase.recipients.setExpireMessages(threadRecipientId, expiresIn.inWholeSeconds.toInt())
if (insertResult != null) {
@@ -433,7 +433,7 @@ object DataMessageProcessor {
serverGuid = envelope.serverGuid
)
val insertResult: InsertResult? = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mediaMessage, -1).orNull()
val insertResult: InsertResult? = SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
if (insertResult != null) {
SignalDatabase.messages.setTransactionSuccessful()
@@ -595,7 +595,7 @@ object DataMessageProcessor {
isPaymentsActivated = isPaymentsActivated
)
val insertResult: InsertResult? = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mediaMessage, -1).orNull()
val insertResult: InsertResult? = SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
if (insertResult != null) {
return MessageId(insertResult.messageId)
@@ -651,7 +651,7 @@ object DataMessageProcessor {
isPaymentsNotification = true
)
val insertResult: InsertResult? = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mediaMessage, -1).orNull()
val insertResult: InsertResult? = SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
if (insertResult != null) {
val messageId = MessageId(insertResult.messageId)
ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.threadId))
@@ -766,7 +766,7 @@ object DataMessageProcessor {
messageRanges = bodyRanges
)
val insertResult: InsertResult? = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mediaMessage, -1).orNull()
val insertResult: InsertResult? = SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
if (insertResult != null) {
SignalDatabase.messages.setTransactionSuccessful()
@@ -830,7 +830,7 @@ object DataMessageProcessor {
giftBadge = dbGiftBadge
)
SignalDatabase.messages.insertSecureDecryptedMessageInbox(mediaMessage, -1).orNull()
SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
} catch (e: MmsException) {
throw StorageFailedException(e, metadata.sourceServiceId.toString(), metadata.sourceDeviceId)
}
@@ -894,7 +894,7 @@ object DataMessageProcessor {
isPushMessage = true
)
insertResult = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mediaMessage, -1).orNull()
insertResult = SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
if (insertResult != null) {
SignalDatabase.messages.setTransactionSuccessful()
}

2
app/src/main/java/org/thoughtcrime/securesms/messages/StoryMessageProcessor.kt
View File

@@ -77,7 +77,7 @@ object StoryMessageProcessor {
messageRanges = storyMessage.bodyRanges.filter { it.mentionAci == null }.toBodyRangeList()
)
insertResult = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mediaMessage, -1).orNull()
insertResult = SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
if (insertResult != null) {
SignalDatabase.messages.setTransactionSuccessful()
}