Update dependencies

[signal-cli] / 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 6a57e50ba3423f5f6c5a453b20801401cc133759..14aa1fbd7126a7242608f32f5b3ab02d1bdb39c6 100644 (file)
--- 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(),
                 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();
                 ));
             } catch (DBusException e) {
                 e.printStackTrace();


@@ -40,8 +40,8 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
             SignalServiceDataMessage message = content.getDataMessage().get();
 
             if (!message.isEndSession() &&
             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()) {
                 List<String> attachments = new ArrayList<>();
                 if (message.getAttachments().isPresent()) {
                     for (SignalServiceAttachment attachment : message.getAttachments().get()) {


@@ -55,8 +55,9 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                     conn.sendSignal(new Signal.MessageReceived(
                             objectPath,
                             message.getTimestamp(),
                     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) {
                             message.getBody().isPresent() ? message.getBody().get() : "",
                             attachments));
                 } catch (DBusException e) {