From 26739491a52acf2acdda98930c96f68c67c204ce Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 30 Jan 2026 13:01:58 -0500
Subject: [PATCH] Fix instrumentation test compilation.

---
 .../messages/DataMessageProcessorTest_polls.kt        | 11 ++++++-----
 .../securesms/testing/MessageContentFuzzer.kt         |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/DataMessageProcessorTest_polls.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/DataMessageProcessorTest_polls.kt
index e7045940f2..f0dfee0cdc 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/DataMessageProcessorTest_polls.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/DataMessageProcessorTest_polls.kt
@@ -8,6 +8,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.signal.libsignal.protocol.message.CiphertextMessage
 import org.thoughtcrime.securesms.database.MessageTable
 import org.thoughtcrime.securesms.database.MessageType
 import org.thoughtcrime.securesms.database.SignalDatabase
@@ -99,7 +100,7 @@ class DataMessageProcessorTest_polls {
       envelope = MessageContentFuzzer.envelope(200),
       message = DataMessage(pollTerminate = DataMessage.PollTerminate(targetSentTimestamp = 100)),
       senderRecipient = alice,
-      metadata = EnvelopeMetadata(alice.requireServiceId(), null, 1, false, null, harness.self.requireServiceId()),
+      metadata = EnvelopeMetadata(alice.requireServiceId(), null, 1, false, null, harness.self.requireServiceId(), CiphertextMessage.WHISPER_TYPE),
       threadRecipient = bob,
       groupId = groupId,
       receivedTime = 200
@@ -120,7 +121,7 @@ class DataMessageProcessorTest_polls {
       envelope = MessageContentFuzzer.envelope(200),
       message = DataMessage(pollTerminate = DataMessage.PollTerminate(200)),
       senderRecipient = alice,
-      metadata = EnvelopeMetadata(alice.requireServiceId(), null, 1, false, null, harness.self.requireServiceId()),
+      metadata = EnvelopeMetadata(alice.requireServiceId(), null, 1, false, null, harness.self.requireServiceId(), CiphertextMessage.WHISPER_TYPE),
       threadRecipient = bob,
       groupId = groupId,
       receivedTime = 200
@@ -138,7 +139,7 @@ class DataMessageProcessorTest_polls {
       envelope = MessageContentFuzzer.envelope(200),
       message = DataMessage(pollTerminate = DataMessage.PollTerminate(100)),
       senderRecipient = bob,
-      metadata = EnvelopeMetadata(alice.requireServiceId(), null, 1, false, null, harness.self.requireServiceId()),
+      metadata = EnvelopeMetadata(alice.requireServiceId(), null, 1, false, null, harness.self.requireServiceId(), CiphertextMessage.WHISPER_TYPE),
       threadRecipient = bob,
       groupId = groupId,
       receivedTime = 200
@@ -154,7 +155,7 @@ class DataMessageProcessorTest_polls {
       envelope = MessageContentFuzzer.envelope(200),
       message = DataMessage(pollTerminate = DataMessage.PollTerminate(100)),
       senderRecipient = alice,
-      metadata = EnvelopeMetadata(alice.requireServiceId(), null, 1, false, null, harness.self.requireServiceId()),
+      metadata = EnvelopeMetadata(alice.requireServiceId(), null, 1, false, null, harness.self.requireServiceId(), CiphertextMessage.WHISPER_TYPE),
       threadRecipient = bob,
       groupId = groupId,
       receivedTime = 200
@@ -299,7 +300,7 @@ class DataMessageProcessorTest_polls {
       groupId = groupId,
       receivedTime = 0,
       context = ApplicationProvider.getApplicationContext(),
-      metadata = EnvelopeMetadata(alice.requireServiceId(), null, 1, false, null, harness.self.requireServiceId())
+      metadata = EnvelopeMetadata(alice.requireServiceId(), null, 1, false, null, harness.self.requireServiceId(), CiphertextMessage.WHISPER_TYPE)
     )
   }
 
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt
index 71e007723c..92c4f4e207 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt
@@ -5,6 +5,7 @@ import okio.ByteString.Companion.toByteString
 import org.signal.core.util.Base64
 import org.signal.core.util.UuidUtil
 import org.signal.core.util.toByteArray
+import org.signal.libsignal.protocol.message.CiphertextMessage
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.buildWith
@@ -58,7 +59,8 @@ object MessageContentFuzzer {
       sourceDeviceId = sourceDeviceId,
       sealedSender = true,
       groupId = groupId?.decodedId,
-      destinationServiceId = Recipient.resolved(destination).requireServiceId()
+      destinationServiceId = Recipient.resolved(destination).requireServiceId(),
+      ciphertextMessageType = CiphertextMessage.WHISPER_TYPE
     )
   }