X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/860ec6f5dcda56b55e0e756e862c8c55865ccd19..e684a902bb40e56286fad3991c8f6cd44534b588:/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java?ds=sidebyside

diff --git a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
index 533a1aed..14aa1fbd 100644
--- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
@@ -4,18 +4,22 @@ import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
-import org.whispersystems.signalservice.api.messages.*;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
+import org.whispersystems.signalservice.api.messages.SignalServiceContent;
+import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
+import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 
 import java.util.ArrayList;
 import java.util.List;
 
-class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
+public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
 
     private final DBusConnection conn;
 
     private final String objectPath;
 
-    JsonDbusReceiveMessageHandler(Manager m, DBusConnection conn, final String objectPath) {
+    public JsonDbusReceiveMessageHandler(Manager m, DBusConnection conn, final String objectPath) {
         super(m);
         this.conn = conn;
         this.objectPath = objectPath;
@@ -27,7 +31,7 @@ class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                 conn.sendSignal(new Signal.ReceiptReceived(
                         objectPath,
                         envelope.getTimestamp(),
-                        envelope.getSource()
+                        !envelope.isUnidentifiedSender() && envelope.hasSource() ? envelope.getSourceE164().get() : content.getSender().getNumber().get()
                 ));
             } catch (DBusException e) {
                 e.printStackTrace();
@@ -36,8 +40,8 @@ class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
             SignalServiceDataMessage message = content.getDataMessage().get();
 
             if (!message.isEndSession() &&
-                    !(message.getGroupInfo().isPresent() &&
-                            message.getGroupInfo().get().getType() != SignalServiceGroup.Type.DELIVER)) {
+                    !(message.getGroupContext().isPresent() &&
+                            message.getGroupContext().get().getGroupV1Type() != SignalServiceGroup.Type.DELIVER)) {
                 List<String> attachments = new ArrayList<>();
                 if (message.getAttachments().isPresent()) {
                     for (SignalServiceAttachment attachment : message.getAttachments().get()) {
@@ -51,8 +55,9 @@ class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                     conn.sendSignal(new Signal.MessageReceived(
                             objectPath,
                             message.getTimestamp(),
-                            envelope.getSource(),
-                            message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
+                            envelope.isUnidentifiedSender() || !envelope.hasSource() ? content.getSender().getNumber().get() : envelope.getSourceE164().get(),
+                            message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()
+                                    ? message.getGroupContext().get().getGroupV1().get().getGroupId() : new byte[0],
                             message.getBody().isPresent() ? message.getBody().get() : "",
                             attachments));
                 } catch (DBusException e) {