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

Add read support for binary service ids.

Browse Source
This commit is contained in:
Michelle Tang
2025-10-28 14:29:43 -04:00
committed by jeffrey-signal
parent bf4aa9cae9
commit f16405fabf
48 changed files with 399 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/androidTest/java/org/thoughtcrime/securesms/testing/FakeClientHelpers.kt
View File

@@ -14,6 +14,7 @@ import org.whispersystems.signalservice.api.crypto.EnvelopeContent
import org.whispersystems.signalservice.api.crypto.SealedSenderAccess
import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
import org.whispersystems.signalservice.api.push.ServiceId
import org.whispersystems.signalservice.api.util.toByteArray
import org.whispersystems.signalservice.internal.push.Content
import org.whispersystems.signalservice.internal.push.DataMessage
import org.whispersystems.signalservice.internal.push.Envelope
@@ -52,13 +53,16 @@ object FakeClientHelpers {
}
fun OutgoingPushMessage.toEnvelope(timestamp: Long, destination: ServiceId): Envelope {
val serverGuid = UUID.randomUUID()
return Envelope.Builder()
.type(Envelope.Type.fromValue(this.type))
.sourceDevice(1)
.timestamp(timestamp)
.serverTimestamp(timestamp + 1)
.destinationServiceId(destination.toString())
.serverGuid(UUID.randomUUID().toString())
.destinationServiceIdBinary(destination.toByteString())
.serverGuid(serverGuid.toString())
.serverGuidBinary(serverGuid.toByteArray().toByteString())
.content(Base64.decode(this.content).toByteString())
.urgent(true)
.story(false)

29
app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt
View File

@@ -11,6 +11,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
import org.whispersystems.signalservice.api.util.UuidUtil
import org.whispersystems.signalservice.api.util.toByteArray
import org.whispersystems.signalservice.internal.push.AddressableMessage
import org.whispersystems.signalservice.internal.push.AttachmentPointer
import org.whispersystems.signalservice.internal.push.BodyRange
@@ -43,7 +44,7 @@ object MessageContentFuzzer {
return Envelope.Builder()
.timestamp(timestamp)
.serverTimestamp(timestamp + 5)
.serverGuid(serverGuid.toString())
.serverGuidBinary(serverGuid.toByteArray().toByteString())
.build()
}
@@ -127,7 +128,7 @@ object MessageContentFuzzer {
unidentifiedStatus(
deliveredTo.map {
SyncMessage.Sent.UnidentifiedDeliveryStatus.Builder().buildWith {
destinationServiceId = Recipient.resolved(it).requireServiceId().toString()
destinationServiceIdBinary = Recipient.resolved(it).requireServiceId().toByteString()
unidentified = true
}
}
@@ -147,7 +148,7 @@ object MessageContentFuzzer {
SyncMessage.Builder().buildWith {
read = timestamps.map { (senderId, timestamp) ->
SyncMessage.Read.Builder().buildWith {
this.senderAci = Recipient.resolved(senderId).requireAci().toString()
this.senderAciBinary = Recipient.resolved(senderId).requireAci().toByteString()
this.timestamp = timestamp
}
}
@@ -167,12 +168,12 @@ object MessageContentFuzzer {
conversation = if (conversation.isGroup) {
ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
} else {
ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
ConversationIdentifier(threadServiceIdBinary = conversation.requireAci().toByteString())
},
messages = conversationDeletes.map { (author, timestamp) ->
AddressableMessage(
authorServiceId = Recipient.resolved(author).requireAci().toString(),
authorServiceIdBinary = Recipient.resolved(author).requireAci().toByteString(),
sentTimestamp = timestamp
)
}
@@ -195,19 +196,19 @@ object MessageContentFuzzer {
conversation = if (conversation.isGroup) {
ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
} else {
ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
ConversationIdentifier(threadServiceIdBinary = conversation.requireAci().toByteString())
},
mostRecentMessages = delete.messages.map { (author, timestamp) ->
AddressableMessage(
authorServiceId = Recipient.resolved(author).requireAci().toString(),
authorServiceIdBinary = Recipient.resolved(author).requireAci().toByteString(),
sentTimestamp = timestamp
)
},
mostRecentNonExpiringMessages = delete.nonExpiringMessages.map { (author, timestamp) ->
AddressableMessage(
authorServiceId = Recipient.resolved(author).requireAci().toString(),
authorServiceIdBinary = Recipient.resolved(author).requireAci().toByteString(),
sentTimestamp = timestamp
)
},
@@ -232,7 +233,7 @@ object MessageContentFuzzer {
conversation = if (conversation.isGroup) {
ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
} else {
ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
ConversationIdentifier(threadServiceIdBinary = conversation.requireAci().toByteString())
}
)
}
@@ -254,10 +255,10 @@ object MessageContentFuzzer {
conversation = if (conversation.isGroup) {
ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
} else {
ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
ConversationIdentifier(threadServiceIdBinary = conversation.requireAci().toByteString())
},
targetMessage = AddressableMessage(
authorServiceId = Recipient.resolved(message.first).requireAci().toString(),
authorServiceIdBinary = Recipient.resolved(message.first).requireAci().toByteString(),
sentTimestamp = message.second
),
clientUuid = uuid?.let { UuidUtil.toByteString(it) },
@@ -290,7 +291,7 @@ object MessageContentFuzzer {
val quoted = quoteAble.random(random)
quote = DataMessage.Quote.Builder().buildWith {
id = quoted.envelope.timestamp
authorAci = quoted.metadata.sourceServiceId.toString()
authorAciBinary = quoted.metadata.sourceServiceId.toByteString()
text = quoted.content.dataMessage?.body
attachments(quoted.content.dataMessage?.attachments ?: emptyList())
bodyRanges(quoted.content.dataMessage?.bodyRanges ?: emptyList())
@@ -302,7 +303,7 @@ object MessageContentFuzzer {
val quoted = quoteAble.random(random)
quote = DataMessage.Quote.Builder().buildWith {
id = random.nextLong(quoted.envelope.timestamp!! - 1000000, quoted.envelope.timestamp!!)
authorAci = quoted.metadata.sourceServiceId.toString()
authorAciBinary = quoted.metadata.sourceServiceId.toByteString()
text = quoted.content.dataMessage?.body
}
}
@@ -329,7 +330,7 @@ object MessageContentFuzzer {
reaction = DataMessage.Reaction.Builder().buildWith {
emoji = emojis.random(random)
remove = false
targetAuthorAci = reactTo.metadata.sourceServiceId.toString()
targetAuthorAciBinary = reactTo.metadata.sourceServiceId.toByteString()
targetSentTimestamp = reactTo.envelope.timestamp
}
}