mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-20 16:49:40 +01:00
Update SignalService.proto to match shared one.
This commit is contained in:
committed by
Alex Hart
parent
5ae51f844e
commit
f04a0533cb
@@ -16,7 +16,7 @@ import org.whispersystems.signalservice.internal.push.BodyRange
|
||||
import org.whispersystems.signalservice.internal.push.Content
|
||||
import org.whispersystems.signalservice.internal.push.DataMessage
|
||||
import org.whispersystems.signalservice.internal.push.GroupContextV2
|
||||
import org.whispersystems.signalservice.internal.push.SyncMessage
|
||||
import org.whispersystems.signalservice.internal.push.PniSignatureMessage
|
||||
|
||||
class BuildSizeTreeTest {
|
||||
|
||||
@@ -136,12 +136,12 @@ class BuildSizeTreeTest {
|
||||
fun `multiple top-level fields are all included`() {
|
||||
val msg = Content(
|
||||
dataMessage = DataMessage(body = "hi"),
|
||||
syncMessage = SyncMessage()
|
||||
pniSignatureMessage = PniSignatureMessage()
|
||||
)
|
||||
val tree = msg.buildSizeTree("Content")
|
||||
|
||||
assertThat(tree).contains("dataMessage(")
|
||||
assertThat(tree).contains("syncMessage(")
|
||||
assertThat(tree).contains("pniSignatureMessage(")
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -23,7 +23,7 @@ class EnvelopeContentValidatorTest {
|
||||
@Test
|
||||
fun `validate - ensure mismatched timestamps are marked invalid`() {
|
||||
val envelope = Envelope(
|
||||
timestamp = 1234
|
||||
clientTimestamp = 1234
|
||||
)
|
||||
|
||||
val content = Content(
|
||||
@@ -172,11 +172,10 @@ class EnvelopeContentValidatorTest {
|
||||
fun `validate - plaintext content via envelope type with unexpected DataMessage is invalid`() {
|
||||
val envelope = Envelope(
|
||||
type = Envelope.Type.PLAINTEXT_CONTENT,
|
||||
timestamp = 1234
|
||||
clientTimestamp = 1234
|
||||
)
|
||||
|
||||
val content = Content(
|
||||
decryptionErrorMessage = createValidDecryptionErrorMessage(),
|
||||
dataMessage = DataMessage(timestamp = 1234)
|
||||
)
|
||||
|
||||
@@ -188,11 +187,10 @@ class EnvelopeContentValidatorTest {
|
||||
fun `validate - plaintext content via ciphertext message type (sealed sender) with unexpected DataMessage is invalid`() {
|
||||
val envelope = Envelope(
|
||||
type = Envelope.Type.UNIDENTIFIED_SENDER,
|
||||
timestamp = 1234
|
||||
clientTimestamp = 1234
|
||||
)
|
||||
|
||||
val content = Content(
|
||||
decryptionErrorMessage = createValidDecryptionErrorMessage(),
|
||||
dataMessage = DataMessage(timestamp = 1234)
|
||||
)
|
||||
|
||||
@@ -231,7 +229,6 @@ class EnvelopeContentValidatorTest {
|
||||
)
|
||||
|
||||
val content = Content(
|
||||
decryptionErrorMessage = createValidDecryptionErrorMessage(),
|
||||
syncMessage = org.whispersystems.signalservice.internal.push.SyncMessage()
|
||||
)
|
||||
|
||||
@@ -242,8 +239,8 @@ class EnvelopeContentValidatorTest {
|
||||
@Test
|
||||
fun `validate - regular encrypted message is not subject to plaintext validation`() {
|
||||
val envelope = Envelope(
|
||||
type = Envelope.Type.CIPHERTEXT,
|
||||
timestamp = 1234
|
||||
type = Envelope.Type.DOUBLE_RATCHET,
|
||||
clientTimestamp = 1234
|
||||
)
|
||||
|
||||
val content = Content(
|
||||
|
||||
Reference in New Issue
Block a user