X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/b2efef4d8c3238b413fe9fe758bd6a5c428498a2..4ca3fe87f4db56cfac27fb9eb68f3933c62fe829:/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java

diff --git a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
index 6a57e50b..06cd31ac 100644
--- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
@@ -31,7 +31,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                 conn.sendSignal(new Signal.ReceiptReceived(
                         objectPath,
                         envelope.getTimestamp(),
-                        envelope.getSource()
+                        envelope.getSourceE164().get()
                 ));
             } catch (DBusException e) {
                 e.printStackTrace();
@@ -55,7 +55,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                     conn.sendSignal(new Signal.MessageReceived(
                             objectPath,
                             message.getTimestamp(),
-                            envelope.getSource(),
+                            envelope.isUnidentifiedSender() ? content.getSender().getNumber().get() : envelope.getSourceE164().get(),
                             message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
                             message.getBody().isPresent() ? message.getBody().get() : "",
                             attachments));