Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 03:58:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid setting the isStory field in an Envelope when possible

Browse Source
This commit is contained in:
Jordan Rose
2025-06-18 13:31:14 -07:00
committed by Chris Eager
parent b8e8fd3313
commit dc3920a99c
7 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
service/src/test/java/org/whispersystems/textsecuregcm/grpc/MessagesAnonymousGrpcServiceTest.java
View File

@@ -199,7 +199,6 @@ class MessagesAnonymousGrpcServiceTest extends
.setServerTimestamp(CLOCK.millis())
.setEphemeral(ephemeral)
.setUrgent(urgent)
.setStory(false)
.setContent(ByteString.copyFrom(payload));
if (includeReportSpamToken) {

1
service/src/test/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManagerTest.java
View File

@@ -181,7 +181,6 @@ public class ChangeNumberManagerTest {
.setUpdatedPni(updatedPhoneNumberIdentifiersByAccount.get(account).toString())
.setUrgent(true)
.setEphemeral(false)
.setStory(false)
.build();
verify(messageSender).sendMessages(argThat(a -> a.getIdentifier(IdentityType.ACI).equals(aci)),

10
service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesManagerTest.java
View File

@@ -152,15 +152,17 @@ class MessagesManagerTest {
final boolean isEphemeral = ThreadLocalRandom.current().nextBoolean();
final boolean isUrgent = ThreadLocalRandom.current().nextBoolean();
final Envelope prototypeExpectedMessage = Envelope.newBuilder()
final Envelope.Builder expectedEnvelopeBuilder = Envelope.newBuilder()
.setType(Envelope.Type.UNIDENTIFIED_SENDER)
.setClientTimestamp(clientTimestamp)
.setServerTimestamp(CLOCK.millis())
.setStory(isStory)
.setEphemeral(isEphemeral)
.setUrgent(isUrgent)
.setSharedMrmKey(ByteString.copyFrom(sharedMrmKey))
.build();
.setSharedMrmKey(ByteString.copyFrom(sharedMrmKey));
if (isStory) {
expectedEnvelopeBuilder.setStory(true);
}
final Envelope prototypeExpectedMessage = expectedEnvelopeBuilder.build();
assertEquals(expectedPresenceByAccountAndDeviceId,
messagesManager.insertMultiRecipientMessage(multiRecipientMessage, resolvedRecipients, clientTimestamp, isStory, isEphemeral, isUrgent).join());