Make type a mandatory param on IncomingMessage.

This commit is contained in:
Greyson Parrelli
2023-10-25 10:23:48 -07:00
committed by Nicholas Tinsley
parent c0fed1498e
commit 617369dbc0
12 changed files with 43 additions and 20 deletions

View File

@@ -9,6 +9,7 @@ import org.junit.runner.RunWith
import org.signal.core.util.ThreadUtil
import org.thoughtcrime.securesms.attachments.PointerAttachment
import org.thoughtcrime.securesms.conversation.v2.ConversationActivity
import org.thoughtcrime.securesms.database.MessageType
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.mms.IncomingMessage
import org.thoughtcrime.securesms.mms.OutgoingMessage
@@ -65,6 +66,7 @@ class ConversationItemPreviewer {
}
val message = IncomingMessage(
type = MessageType.NORMAL,
from = other.id,
body = body,
sentTimeMillis = System.currentTimeMillis(),
@@ -84,6 +86,7 @@ class ConversationItemPreviewer {
}
val message = IncomingMessage(
type = MessageType.NORMAL,
from = other.id,
body = body,
sentTimeMillis = System.currentTimeMillis(),

View File

@@ -74,6 +74,7 @@ class MmsTableTest_stories {
MmsHelper.insert(
IncomingMessage(
type = MessageType.NORMAL,
from = sender,
sentTimeMillis = 2,
serverTimeMillis = 2,
@@ -96,6 +97,7 @@ class MmsTableTest_stories {
val sender = recipients[0]
val messageId = MmsHelper.insert(
IncomingMessage(
type = MessageType.NORMAL,
from = sender,
sentTimeMillis = 2,
serverTimeMillis = 2,
@@ -123,6 +125,7 @@ class MmsTableTest_stories {
val messageIds = recipients.take(5).map {
MmsHelper.insert(
IncomingMessage(
type = MessageType.NORMAL,
from = it,
sentTimeMillis = 2,
serverTimeMillis = 2,
@@ -155,6 +158,7 @@ class MmsTableTest_stories {
Thread.sleep(5)
MmsHelper.insert(
IncomingMessage(
type = MessageType.NORMAL,
from = recipients[it],
sentTimeMillis = System.currentTimeMillis(),
serverTimeMillis = 2,
@@ -169,6 +173,7 @@ class MmsTableTest_stories {
Thread.sleep(5)
MmsHelper.insert(
IncomingMessage(
type = MessageType.NORMAL,
from = recipients[it],
sentTimeMillis = System.currentTimeMillis(),
serverTimeMillis = 2,
@@ -214,6 +219,7 @@ class MmsTableTest_stories {
// GIVEN
MmsHelper.insert(
IncomingMessage(
type = MessageType.NORMAL,
from = recipients[0],
sentTimeMillis = 200,
serverTimeMillis = 2,
@@ -322,6 +328,7 @@ class MmsTableTest_stories {
MmsHelper.insert(
IncomingMessage(
type = MessageType.NORMAL,
from = myStory.id,
sentTimeMillis = 201,
serverTimeMillis = 201,

View File

@@ -949,6 +949,7 @@ class RecipientTableTest_getAndPossiblyMerge {
private fun smsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMessage {
return IncomingMessage(
type = MessageType.NORMAL,
from = sender,
sentTimeMillis = time,
serverTimeMillis = time,
@@ -961,6 +962,7 @@ class RecipientTableTest_getAndPossiblyMerge {
private fun mmsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMessage {
return IncomingMessage(
type = MessageType.NORMAL,
from = sender,
groupId = groupId.orNull(),
body = body,

View File

@@ -273,6 +273,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
private fun smsMessage(sender: RecipientId, body: String? = ""): IncomingMessage {
wallClock++
return IncomingMessage(
type = MessageType.NORMAL,
from = sender,
sentTimeMillis = wallClock,
serverTimeMillis = wallClock,