Add a new sync dbus message which shows messages you sent. Necessary for having synch...

[signal-cli] / src / main / java / org / asamk / signal / commands / ReceiveCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 03f3d1b2ee42e78fd69703cd9f73b4877ac3be82..42ab732704b92c81c015b0bade1bd40731d48ce4 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -3,15 +3,15 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;

+

 import org.asamk.Signal;
 import org.asamk.signal.JsonReceiveMessageHandler;
 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
 import org.freedesktop.dbus.DBusConnection;
 import org.asamk.Signal;
 import org.asamk.signal.JsonReceiveMessageHandler;
 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
 import org.freedesktop.dbus.DBusConnection;

-import org.freedesktop.dbus.DBusSigHandler;

 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusException;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;


@@ -36,30 +36,38 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
     public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
         if (dbusconnection != null) {
             try {
     public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
         if (dbusconnection != null) {
             try {

-                dbusconnection.addSigHandler(Signal.MessageReceived.class, new DBusSigHandler<Signal.MessageReceived>() {
-                    @Override
-                    public void handle(Signal.MessageReceived s) {
-                        System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
-                                s.getSender(), DateUtils.formatTimestamp(s.getTimestamp()), s.getMessage()));
-                        if (s.getGroupId().length > 0) {
-                            System.out.println("Group info:");
-                            System.out.println("  Id: " + Base64.encodeBytes(s.getGroupId()));
-                        }
-                        if (s.getAttachments().size() > 0) {
-                            System.out.println("Attachments: ");
-                            for (String attachment : s.getAttachments()) {
-                                System.out.println("-  Stored plaintext in: " + attachment);
-                            }
+                dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
+                    System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
+                            messageReceived.getSender(), DateUtils.formatTimestamp(messageReceived.getTimestamp()), messageReceived.getMessage()));
+                    if (messageReceived.getGroupId().length > 0) {
+                        System.out.println("Group info:");
+                        System.out.println("  Id: " + Base64.encodeBytes(messageReceived.getGroupId()));
+                    }
+                    if (messageReceived.getAttachments().size() > 0) {
+                        System.out.println("Attachments: ");
+                        for (String attachment : messageReceived.getAttachments()) {
+                            System.out.println("-  Stored plaintext in: " + attachment);

                         }
                         }

-                        System.out.println();

                     }
                     }

+                    System.out.println();

                 });
                 });

-                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, new DBusSigHandler<Signal.ReceiptReceived>() {
-                    @Override
-                    public void handle(Signal.ReceiptReceived s) {
-                        System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
-                                s.getSender(), DateUtils.formatTimestamp(s.getTimestamp())));
+                dbusconnection.addSigHandler(Signal.ReceiptReceived.class,
+                        receiptReceived -> System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
+                            receiptReceived.getSender(), DateUtils.formatTimestamp(receiptReceived.getTimestamp()))));
+                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
+                    System.out.print(String.format("Sync Envelope from: %s to: %s\nTimestamp: %s\nBody: %s\n",
+                            syncReceived.getSource(), syncReceived.getDestination(), DateUtils.formatTimestamp(syncReceived.getTimestamp()), syncReceived.getMessage()));
+                    if (syncReceived.getGroupId().length > 0) {
+                        System.out.println("Group info:");
+                        System.out.println("  Id: " + Base64.encodeBytes(syncReceived.getGroupId()));
+                    }
+                    if (syncReceived.getAttachments().size() > 0) {
+                        System.out.println("Attachments: ");
+                        for (String attachment : syncReceived.getAttachments()) {
+                            System.out.println("-  Stored plaintext in: " + attachment);
+                        }

                     }
                     }

+                    System.out.println();

                 });
             } catch (UnsatisfiedLinkError e) {
                 System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
                 });
             } catch (UnsatisfiedLinkError e) {
                 System.err.println("Missing native library dependency for dbus service: " + e.getMessage());