Create an AvatarStore

[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 9025aa554cde60267e1f4d3b319022665123a00c..9d718abbd903250b037ec3d050c66b2f84cddc88 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -1,5 +1,11 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+

 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;


@@ -7,12 +13,14 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.Signal;
 import org.asamk.signal.JsonReceiveMessageHandler;
 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.Signal;
 import org.asamk.signal.JsonReceiveMessageHandler;
 import org.asamk.signal.ReceiveMessageHandler;

+import org.asamk.signal.json.JsonMessageEnvelope;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
 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.connections.impl.DBusConnection;

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

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.util.Base64;

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


@@ -21,6 +29,9 @@ import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 
 public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
 
 public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 

+    // TODO delete later when "json" variable is removed
+    private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-t", "--timeout")
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-t", "--timeout")


@@ -30,62 +41,131 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--json")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--json")

-                .help("Output received messages in json format, one json object per line.")
+                .help("WARNING: This parameter is now deprecated! Please use the global \"--output=json\" option instead.\n\nOutput received messages in json format, one json object per line.")

                 .action(Arguments.storeTrue());
     }
 
     public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
                 .action(Arguments.storeTrue());
     }
 
     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);
-                            }
+        final ObjectMapper jsonProcessor;
+
+        boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json");
+
+        // TODO delete later when "json" variable is removed
+        if (ns.getBoolean("json")) {
+            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");
+        }
+
+        if (inJson) {
+            jsonProcessor = new ObjectMapper();
+            jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+            jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+        } else {
+            jsonProcessor = null;
+        }
+        try {
+            dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
+                if (jsonProcessor != null) {
+                    JsonMessageEnvelope envelope = new JsonMessageEnvelope(messageReceived);
+                    ObjectNode result = jsonProcessor.createObjectNode();
+                    result.putPOJO("envelope", envelope);
+                    try {
+                        jsonProcessor.writeValue(System.out, result);
+                        System.out.println();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    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();
+                }
+            });
+
+            dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
+                if (jsonProcessor != null) {
+                    JsonMessageEnvelope envelope = new JsonMessageEnvelope(receiptReceived);
+                    ObjectNode result = jsonProcessor.createObjectNode();
+                    result.putPOJO("envelope", envelope);
+                    try {
+                        jsonProcessor.writeValue(System.out, result);
+                        System.out.println();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
+                            receiptReceived.getSender(),
+                            DateUtils.formatTimestamp(receiptReceived.getTimestamp())));
+                }
+            });
+
+            dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
+                if (jsonProcessor != null) {
+                    JsonMessageEnvelope envelope = new JsonMessageEnvelope(syncReceived);
+                    ObjectNode result = jsonProcessor.createObjectNode();
+                    result.putPOJO("envelope", envelope);
+                    try {
+                        jsonProcessor.writeValue(System.out, result);

                         System.out.println();
                         System.out.println();

+                    } catch (IOException e) {
+                        e.printStackTrace();

                     }
                     }

-                });
-                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())));
+                } else {
+                    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()));

                     }
                     }

-                });
-            } catch (UnsatisfiedLinkError e) {
-                System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
-                return 1;
-            } catch (DBusException e) {
-                e.printStackTrace();
-                return 1;
-            }
-            while (true) {
-                try {
-                    Thread.sleep(10000);
-                } catch (InterruptedException e) {
-                    return 0;
+                    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());
+            return 1;
+        } catch (DBusException e) {
+            e.printStackTrace();
+            return 1;
+        }
+        while (true) {
+            try {
+                Thread.sleep(10000);
+            } catch (InterruptedException e) {
+                return 0;

             }
         }
             }
         }

-        return 0;

     }
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
     }
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {

-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
+        boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json");
+
+        // TODO delete later when "json" variable is removed
+        if (ns.getBoolean("json")) {
+            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");

         }
         }

+

         double timeout = 5;
         if (ns.getDouble("timeout") != null) {
             timeout = ns.getDouble("timeout");
         double timeout = 5;
         if (ns.getDouble("timeout") != null) {
             timeout = ns.getDouble("timeout");


@@ -97,8 +177,14 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
         }
         boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
         try {
         }
         boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
         try {

-            final Manager.ReceiveMessageHandler handler = ns.getBoolean("json") ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m);
-            m.receiveMessages((long) (timeout * 1000), TimeUnit.MILLISECONDS, returnOnTimeout, ignoreAttachments, handler);
+            final Manager.ReceiveMessageHandler handler = inJson
+                    ? new JsonReceiveMessageHandler(m)
+                    : new ReceiveMessageHandler(m);
+            m.receiveMessages((long) (timeout * 1000),
+                    TimeUnit.MILLISECONDS,
+                    returnOnTimeout,
+                    ignoreAttachments,
+                    handler);

             return 0;
         } catch (IOException e) {
             System.err.println("Error while receiving messages: " + e.getMessage());
             return 0;
         } catch (IOException e) {
             System.err.println("Error while receiving messages: " + e.getMessage());