empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ensure that destinationUuid is always populated.

Browse source
This commit is contained in:
Greyson Parrelli 2022-04-26 09:36:45 -04:00 • committed by Cody Henthorne
parent 4635a77fbc
commit eccb796199
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java
View file

@ -221,7 +221,8 @@ public class SignalServiceMessageReceiver {
entity.getContent(),
entity.getServerTimestamp(),
messageResult.getServerDeliveredTimestamp(),
entity.getServerUuid());
entity.getServerUuid(),
entity.getDestinationUuid());
}
callback.onMessage(envelope);

6
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java
View file

@ -99,12 +99,14 @@ public class SignalServiceEnvelope {
byte[] content,
long serverReceivedTimestamp,
long serverDeliveredTimestamp,
String uuid)
String uuid,
String destinationUuid)
{
Envelope.Builder builder = Envelope.newBuilder()
.setType(Envelope.Type.valueOf(type))
.setTimestamp(timestamp)
.setServerTimestamp(serverReceivedTimestamp);
.setServerTimestamp(serverReceivedTimestamp)
.setDestinationUuid(destinationUuid);
if (uuid != null) {
builder.setServerGuid(uuid);