X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/8717665d1d273a32afef136c15c0d5abaaae0f85..50b6174dd68b51c659111f3712b77e3d3e8cf2e6:/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 2ce39cc5..9484ce2e 100644
--- a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
@@ -5,6 +5,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 class JsonMessageEnvelope {
+
     String source;
     int sourceDevice;
     String relay;
@@ -13,10 +14,14 @@ class JsonMessageEnvelope {
     JsonDataMessage dataMessage;
     JsonSyncMessage syncMessage;
     JsonCallMessage callMessage;
+    JsonReceiptMessage receiptMessage;
 
     public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content) {
         SignalServiceAddress source = envelope.getSourceAddress();
         this.source = source.getNumber();
+        if (this.source.equals("")) {
+            this.source = content.getSender();
+        }
         this.sourceDevice = envelope.getSourceDevice();
         this.relay = source.getRelay().isPresent() ? source.getRelay().get() : null;
         this.timestamp = envelope.getTimestamp();
@@ -31,6 +36,9 @@ class JsonMessageEnvelope {
             if (content.getCallMessage().isPresent()) {
                 this.callMessage = new JsonCallMessage(content.getCallMessage().get());
             }
+            if (content.getReceiptMessage().isPresent()) {
+                this.receiptMessage = new JsonReceiptMessage(content.getReceiptMessage().get());
+            }
         }
     }
 }