Improve constraints on thread and message tables.

This commit is contained in:
Greyson Parrelli
2022-12-03 12:38:25 -05:00
committed by Cody Henthorne
parent 5d9f00b268
commit 95eba78d9c
29 changed files with 789 additions and 1158 deletions

View File

@@ -151,7 +151,6 @@ object FakeMessageRecords {
threadId,
body,
slideDeck,
partCount,
mailbox,
mismatches,
failures,

View File

@@ -77,13 +77,13 @@ object TestMms {
): Long {
val contentValues = ContentValues().apply {
put(MmsTable.DATE_SENT, message.sentTimeMillis)
put(MmsTable.MESSAGE_TYPE, PduHeaders.MESSAGE_TYPE_SEND_REQ)
put(MmsTable.MMS_MESSAGE_TYPE, PduHeaders.MESSAGE_TYPE_SEND_REQ)
put(MmsTable.MESSAGE_BOX, type)
put(MmsTable.TYPE, type)
put(MmsSmsColumns.THREAD_ID, threadId)
put(MmsSmsColumns.READ, if (unread) 0 else 1)
put(MmsTable.DATE_RECEIVED, receivedTimestampMillis)
put(MmsSmsColumns.SUBSCRIPTION_ID, message.subscriptionId)
put(MmsSmsColumns.SMS_SUBSCRIPTION_ID, message.subscriptionId)
put(MmsSmsColumns.EXPIRES_IN, message.expiresIn)
put(MmsTable.VIEW_ONCE, message.isViewOnce)
put(MmsSmsColumns.RECIPIENT_ID, recipientId.serialize())
@@ -93,7 +93,6 @@ object TestMms {
put(MmsTable.STORY_TYPE, message.storyType.code)
put(MmsSmsColumns.BODY, body)
put(MmsTable.PART_COUNT, 0)
put(MmsTable.MENTIONS_SELF, 0)
}
@@ -106,7 +105,6 @@ object TestMms {
values.putNull(MmsSmsColumns.BODY)
values.putNull(MmsTable.QUOTE_BODY)
values.putNull(MmsTable.QUOTE_AUTHOR)
values.putNull(MmsTable.QUOTE_ATTACHMENT)
values.put(MmsTable.QUOTE_TYPE, -1)
values.putNull(MmsTable.QUOTE_ID)
values.putNull(MmsTable.LINK_PREVIEWS)

View File

@@ -1,7 +1,6 @@
package org.thoughtcrime.securesms.database
import android.content.ContentValues
import android.text.TextUtils
import org.thoughtcrime.securesms.groups.GroupId
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.sms.IncomingTextMessage
@@ -61,22 +60,14 @@ object TestSms {
): Long {
val values = ContentValues().apply {
put(MmsSmsColumns.RECIPIENT_ID, message.sender.serialize())
put(MmsSmsColumns.ADDRESS_DEVICE_ID, message.senderDeviceId)
put(MmsSmsColumns.RECIPIENT_DEVICE_ID, message.senderDeviceId)
put(SmsTable.DATE_RECEIVED, message.receivedTimestampMillis)
put(SmsTable.DATE_SENT, message.sentTimestampMillis)
put(MmsSmsColumns.DATE_SERVER, message.serverTimestampMillis)
put(SmsTable.PROTOCOL, message.protocol)
put(MmsSmsColumns.READ, if (unread) 0 else 1)
put(MmsSmsColumns.SUBSCRIPTION_ID, message.subscriptionId)
put(MmsSmsColumns.SMS_SUBSCRIPTION_ID, message.subscriptionId)
put(MmsSmsColumns.EXPIRES_IN, message.expiresIn)
put(MmsSmsColumns.UNIDENTIFIED, message.isUnidentified)
if (!TextUtils.isEmpty(message.pseudoSubject)) {
put(SmsTable.SUBJECT, message.pseudoSubject)
}
put(SmsTable.REPLY_PATH_PRESENT, message.isReplyPathPresent)
put(SmsTable.SERVICE_CENTER, message.serviceCenterAddress)
put(MmsSmsColumns.BODY, message.messageBody)
put(SmsTable.TYPE, type)
put(MmsSmsColumns.THREAD_ID, threadId)