Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-25 20:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge IncomingTextMessages into IncomingMessage.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-10-25 09:52:10 -07:00
committed by Cody Henthorne
parent 23b696c9cf
commit 6b3f41d675
29 changed files with 410 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/test/java/org/thoughtcrime/securesms/database/TestSms.kt
View File

@@ -1,9 +1,10 @@
package org.thoughtcrime.securesms.database
import android.content.ContentValues
import org.signal.core.util.orNull
import org.thoughtcrime.securesms.groups.GroupId
import org.thoughtcrime.securesms.mms.IncomingMessage
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.sms.IncomingTextMessage
import java.util.Optional
import java.util.UUID
import android.database.sqlite.SQLiteDatabase as AndroidSQLiteDatabase
@@ -29,17 +30,16 @@ object TestSms {
unread: Boolean = false,
threadId: Long = 1
): Long {
val message = IncomingTextMessage(
sender,
senderDeviceId,
sentTimestampMillis,
serverTimestampMillis,
receivedTimestampMillis,
encodedBody,
groupId,
expiresInMillis,
unidentified,
serverGuid
val message = IncomingMessage(
from = sender,
sentTimeMillis = sentTimestampMillis,
serverTimeMillis = serverTimestampMillis,
receivedTimeMillis = receivedTimestampMillis,
body = encodedBody,
groupId = groupId.orNull(),
expiresIn = expiresInMillis,
isUnidentified = unidentified,
serverGuid = serverGuid
)
return insert(
@@ -53,23 +53,22 @@ object TestSms {
fun insert(
db: AndroidSQLiteDatabase,
message: IncomingTextMessage,
message: IncomingMessage,
type: Long = MessageTypes.BASE_INBOX_TYPE,
unread: Boolean = false,
threadId: Long = 1
): Long {
val values = ContentValues().apply {
put(MessageTable.FROM_RECIPIENT_ID, message.authorId.serialize())
put(MessageTable.FROM_DEVICE_ID, message.authorDeviceId)
put(MessageTable.TO_RECIPIENT_ID, message.authorId.serialize())
put(MessageTable.DATE_RECEIVED, message.receivedTimestampMillis)
put(MessageTable.DATE_SENT, message.sentTimestampMillis)
put(MessageTable.DATE_SERVER, message.serverTimestampMillis)
put(MessageTable.FROM_RECIPIENT_ID, message.from.serialize())
put(MessageTable.TO_RECIPIENT_ID, message.from.serialize())
put(MessageTable.DATE_RECEIVED, message.receivedTimeMillis)
put(MessageTable.DATE_SENT, message.sentTimeMillis)
put(MessageTable.DATE_SERVER, message.serverTimeMillis)
put(MessageTable.READ, if (unread) 0 else 1)
put(MessageTable.SMS_SUBSCRIPTION_ID, message.subscriptionId)
put(MessageTable.EXPIRES_IN, message.expiresIn)
put(MessageTable.UNIDENTIFIED, message.isUnidentified)
put(MessageTable.BODY, message.messageBody)
put(MessageTable.BODY, message.body)
put(MessageTable.TYPE, type)
put(MessageTable.THREAD_ID, threadId)
put(MessageTable.SERVER_GUID, message.serverGuid)