diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java index aec5406f83..18a430e004 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java @@ -221,7 +221,8 @@ public class SignalServiceMessageReceiver { entity.getContent(), entity.getServerTimestamp(), messageResult.getServerDeliveredTimestamp(), - entity.getServerUuid()); + entity.getServerUuid(), + entity.getDestinationUuid()); } callback.onMessage(envelope); diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java index 270911b8d3..7081455929 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java @@ -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);