X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/90b752b912db167ef9750843c1abf84188ef2438..e508fc50e9d9efcc9259897c27ed9ba13d19de42:/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 2e3018a3..b0d49ca5 100644
--- a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
@@ -20,14 +20,14 @@ class JsonMessageEnvelope {
         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();
         if (content != null) {
+            if (envelope.isUnidentifiedSender()) {
+                this.source = content.getSender();
+                this.sourceDevice = content.getSenderDevice();
+            }
             if (content.getDataMessage().isPresent()) {
                 this.dataMessage = new JsonDataMessage(content.getDataMessage().get());
             }