Use correct sender device for receiving sealed messages

[signal-cli] / src / main / java / org / asamk / signal / JsonMessageEnvelope.java

diff --git a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
index e7003130b72a4a956ef7e31491db76e6010d4686..2e3018a336c0d0926841026b4bd0d34b0bb2aefc 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
@@ -20,6 +20,10 @@ class JsonMessageEnvelope {
         SignalServiceAddress source = envelope.getSourceAddress();
         this.source = source.getNumber();
         this.sourceDevice = envelope.getSourceDevice();
         SignalServiceAddress source = envelope.getSourceAddress();
         this.source = source.getNumber();
         this.sourceDevice = envelope.getSourceDevice();

+        if (this.source.equals("")) {
+            this.source = content.getSender();
+            this.sourceDevice = content.getSenderDevice();
+        }

         this.relay = source.getRelay().isPresent() ? source.getRelay().get() : null;
         this.timestamp = envelope.getTimestamp();
         this.isReceipt = envelope.isReceipt();
         this.relay = source.getRelay().isPresent() ? source.getRelay().get() : null;
         this.timestamp = envelope.getTimestamp();
         this.isReceipt = envelope.isReceipt();