Extract util methods to separate classes

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

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 076d3cc5a2722878f70d9744c0aa1decd8c281de..03d1c3ccb84101dc5c0e8e09d959180c33a2dbfd 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -16,29 +16,55 @@
  */
 package org.asamk.signal;
 
  */
 package org.asamk.signal;
 

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

 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;

-import org.apache.commons.io.IOUtils;

 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;

+import org.asamk.signal.storage.contacts.ContactInfo;
+import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
+import org.asamk.signal.util.DateUtils;
+import org.asamk.signal.util.Hex;
+import org.asamk.signal.util.IOUtils;
+import org.asamk.signal.util.Util;

 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.DBusConnection;

+import org.freedesktop.dbus.DBusSigHandler;

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

+import org.whispersystems.libsignal.InvalidKeyException;
+import org.whispersystems.libsignal.util.guava.Optional;

 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.*;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.*;

-import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+import org.whispersystems.signalservice.api.messages.calls.*;
+import org.whispersystems.signalservice.api.messages.multidevice.*;

 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
 import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
 import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;

+import org.whispersystems.signalservice.internal.push.LockedException;
+import org.whispersystems.signalservice.internal.util.Base64;

 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;

+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;

 import java.security.Security;
 import java.util.ArrayList;
 import java.util.List;
 import java.security.Security;
 import java.util.ArrayList;
 import java.util.List;

+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;

 
 public class Main {
 
 
 public class Main {
 


@@ -47,13 +73,18 @@ public class Main {
 
     public static void main(String[] args) {
         // Workaround for BKS truststore
 
     public static void main(String[] args) {
         // Workaround for BKS truststore

-        Security.insertProviderAt(new org.spongycastle.jce.provider.BouncyCastleProvider(), 1);
+        Security.insertProviderAt(new org.bouncycastle.jce.provider.BouncyCastleProvider(), 1);

 
         Namespace ns = parseArgs(args);
         if (ns == null) {
             System.exit(1);
         }
 
 
         Namespace ns = parseArgs(args);
         if (ns == null) {
             System.exit(1);
         }
 

+        int res = handleCommands(ns);
+        System.exit(res);
+    }
+
+    private static int handleCommands(Namespace ns) {

         final String username = ns.getString("username");
         Manager m;
         Signal ts;
         final String username = ns.getString("username");
         Manager m;
         Signal ts;


@@ -69,16 +100,18 @@ public class Main {
                         busType = DBusConnection.SESSION;
                     }
                     dBusConn = DBusConnection.getConnection(busType);
                         busType = DBusConnection.SESSION;
                     }
                     dBusConn = DBusConnection.getConnection(busType);

-                    ts = (Signal) dBusConn.getRemoteObject(
+                    ts = dBusConn.getRemoteObject(

                             SIGNAL_BUSNAME, SIGNAL_OBJECTPATH,
                             Signal.class);
                             SIGNAL_BUSNAME, SIGNAL_OBJECTPATH,
                             Signal.class);

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

                 } catch (DBusException e) {
                     e.printStackTrace();
                     if (dBusConn != null) {
                         dBusConn.disconnect();
                     }
                 } catch (DBusException e) {
                     e.printStackTrace();
                     if (dBusConn != null) {
                         dBusConn.disconnect();
                     }

-                    System.exit(3);
-                    return;
+                    return 3;

                 }
             } else {
                 String settingsPath = ns.getString("config");
                 }
             } else {
                 String settingsPath = ns.getString("config");


@@ -96,11 +129,10 @@ public class Main {
                 ts = m;
                 if (m.userExists()) {
                     try {
                 ts = m;
                 if (m.userExists()) {
                     try {

-                        m.load();
+                        m.init();

                     } catch (Exception e) {
                         System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage());
                     } catch (Exception e) {
                         System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage());

-                        System.exit(2);
-                        return;
+                        return 2;

                     }
                 }
             }
                     }
                 }
             }


@@ -108,8 +140,8 @@ public class Main {
             switch (ns.getString("command")) {
                 case "register":
                     if (dBusConn != null) {
             switch (ns.getString("command")) {
                 case "register":
                     if (dBusConn != null) {

-                        System.err.println("register is not yet implementd via dbus");
-                        System.exit(1);
+                        System.err.println("register is not yet implemented via dbus");
+                        return 1;

                     }
                     if (!m.userHasKeys()) {
                         m.createNewIdentity();
                     }
                     if (!m.userHasKeys()) {
                         m.createNewIdentity();


@@ -118,61 +150,234 @@ public class Main {
                         m.register(ns.getBoolean("voice"));
                     } catch (IOException e) {
                         System.err.println("Request verify error: " + e.getMessage());
                         m.register(ns.getBoolean("voice"));
                     } catch (IOException e) {
                         System.err.println("Request verify error: " + e.getMessage());

-                        System.exit(3);
+                        return 3;
+                    }
+                    break;
+                case "unregister":
+                    if (dBusConn != null) {
+                        System.err.println("unregister is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+                    try {
+                        m.unregister();
+                    } catch (IOException e) {
+                        System.err.println("Unregister error: " + e.getMessage());
+                        return 3;
+                    }
+                    break;
+                case "updateAccount":
+                    if (dBusConn != null) {
+                        System.err.println("updateAccount is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+                    try {
+                        m.updateAccountAttributes();
+                    } catch (IOException e) {
+                        System.err.println("UpdateAccount error: " + e.getMessage());
+                        return 3;
+                    }
+                    break;
+                case "setPin":
+                    if (dBusConn != null) {
+                        System.err.println("setPin is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+                    try {
+                        String registrationLockPin = ns.getString("registrationLockPin");
+                        m.setRegistrationLockPin(Optional.of(registrationLockPin));
+                    } catch (IOException e) {
+                        System.err.println("Set pin error: " + e.getMessage());
+                        return 3;
+                    }
+                    break;
+                case "removePin":
+                    if (dBusConn != null) {
+                        System.err.println("removePin is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+                    try {
+                        m.setRegistrationLockPin(Optional.<String>absent());
+                    } catch (IOException e) {
+                        System.err.println("Remove pin error: " + e.getMessage());
+                        return 3;

                     }
                     break;
                 case "verify":
                     if (dBusConn != null) {
                     }
                     break;
                 case "verify":
                     if (dBusConn != null) {

-                        System.err.println("verify is not yet implementd via dbus");
-                        System.exit(1);
+                        System.err.println("verify is not yet implemented via dbus");
+                        return 1;

                     }
                     if (!m.userHasKeys()) {
                         System.err.println("User has no keys, first call register.");
                     }
                     if (!m.userHasKeys()) {
                         System.err.println("User has no keys, first call register.");

-                        System.exit(1);
+                        return 1;

                     }
                     if (m.isRegistered()) {
                         System.err.println("User registration is already verified");
                     }
                     if (m.isRegistered()) {
                         System.err.println("User registration is already verified");

-                        System.exit(1);
+                        return 1;

                     }
                     try {
                     }
                     try {

-                        m.verifyAccount(ns.getString("verificationCode"));
+                        String verificationCode = ns.getString("verificationCode");
+                        String pin = ns.getString("pin");
+                        m.verifyAccount(verificationCode, pin);
+                    } catch (LockedException e) {
+                        System.err.println("Verification failed! This number is locked with a pin. Hours remaining until reset: " + (e.getTimeRemaining() / 1000 / 60 / 60));
+                        System.err.println("Use '--pin PIN_CODE' to specify the registration lock PIN");
+                        return 3;

                     } catch (IOException e) {
                         System.err.println("Verify error: " + e.getMessage());
                     } catch (IOException e) {
                         System.err.println("Verify error: " + e.getMessage());

-                        System.exit(3);
+                        return 3;
+                    }
+                    break;
+                case "link":
+                    if (dBusConn != null) {
+                        System.err.println("link is not yet implemented via dbus");
+                        return 1;
+                    }
+
+                    // When linking, username is null and we always have to create keys
+                    m.createNewIdentity();
+
+                    String deviceName = ns.getString("name");
+                    if (deviceName == null) {
+                        deviceName = "cli";
+                    }
+                    try {
+                        System.out.println(m.getDeviceLinkUri());
+                        m.finishDeviceLink(deviceName);
+                        System.out.println("Associated with: " + m.getUsername());
+                    } catch (TimeoutException e) {
+                        System.err.println("Link request timed out, please try again.");
+                        return 3;
+                    } catch (IOException e) {
+                        System.err.println("Link request error: " + e.getMessage());
+                        return 3;
+                    } catch (AssertionError e) {
+                        handleAssertionError(e);
+                        return 1;
+                    } catch (InvalidKeyException e) {
+                        e.printStackTrace();
+                        return 2;
+                    } catch (UserAlreadyExists e) {
+                        System.err.println("The user " + e.getUsername() + " already exists\nDelete \"" + e.getFileName() + "\" before trying again.");
+                        return 1;
+                    }
+                    break;
+                case "addDevice":
+                    if (dBusConn != null) {
+                        System.err.println("link is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+                    try {
+                        m.addDeviceLink(new URI(ns.getString("uri")));
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        return 3;
+                    } catch (InvalidKeyException e) {
+                        e.printStackTrace();
+                        return 2;
+                    } catch (AssertionError e) {
+                        handleAssertionError(e);
+                        return 1;
+                    } catch (URISyntaxException e) {
+                        e.printStackTrace();
+                        return 2;
+                    }
+                    break;
+                case "listDevices":
+                    if (dBusConn != null) {
+                        System.err.println("listDevices is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+                    try {
+                        List<DeviceInfo> devices = m.getLinkedDevices();
+                        for (DeviceInfo d : devices) {
+                            System.out.println("Device " + d.getId() + (d.getId() == m.getDeviceId() ? " (this device)" : "") + ":");
+                            System.out.println(" Name: " + d.getName());
+                            System.out.println(" Created: " + DateUtils.formatTimestamp(d.getCreated()));
+                            System.out.println(" Last seen: " + DateUtils.formatTimestamp(d.getLastSeen()));
+                        }
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        return 3;
+                    }
+                    break;
+                case "removeDevice":
+                    if (dBusConn != null) {
+                        System.err.println("removeDevice is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+                    try {
+                        int deviceId = ns.getInt("deviceId");
+                        m.removeLinkedDevices(deviceId);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        return 3;

                     }
                     break;
                 case "send":
                     if (dBusConn == null && !m.isRegistered()) {
                         System.err.println("User is not registered.");
                     }
                     break;
                 case "send":
                     if (dBusConn == null && !m.isRegistered()) {
                         System.err.println("User is not registered.");

-                        System.exit(1);
+                        return 1;

                     }
 
                     if (ns.getBoolean("endsession")) {
                         if (ns.getList("recipient") == null) {
                             System.err.println("No recipients given");
                             System.err.println("Aborting sending.");
                     }
 
                     if (ns.getBoolean("endsession")) {
                         if (ns.getList("recipient") == null) {
                             System.err.println("No recipients given");
                             System.err.println("Aborting sending.");

-                            System.exit(1);
+                            return 1;

                         }
                         try {
                             ts.sendEndSessionMessage(ns.<String>getList("recipient"));
                         } catch (IOException e) {
                             handleIOException(e);
                         }
                         try {
                             ts.sendEndSessionMessage(ns.<String>getList("recipient"));
                         } catch (IOException e) {
                             handleIOException(e);

+                            return 3;

                         } catch (EncapsulatedExceptions e) {
                             handleEncapsulatedExceptions(e);
                         } catch (EncapsulatedExceptions e) {
                             handleEncapsulatedExceptions(e);

+                            return 3;

                         } catch (AssertionError e) {
                             handleAssertionError(e);
                         } catch (AssertionError e) {
                             handleAssertionError(e);

+                            return 1;

                         } catch (DBusExecutionException e) {
                             handleDBusExecutionException(e);
                         } catch (DBusExecutionException e) {
                             handleDBusExecutionException(e);

+                            return 1;

                         }
                     } else {
                         String messageText = ns.getString("message");
                         if (messageText == null) {
                             try {
                         }
                     } else {
                         String messageText = ns.getString("message");
                         if (messageText == null) {
                             try {

-                                messageText = IOUtils.toString(System.in);
+                                messageText = IOUtils.readAll(System.in, Charset.defaultCharset());

                             } catch (IOException e) {
                                 System.err.println("Failed to read message from stdin: " + e.getMessage());
                                 System.err.println("Aborting sending.");
                             } catch (IOException e) {
                                 System.err.println("Failed to read message from stdin: " + e.getMessage());
                                 System.err.println("Aborting sending.");

-                                System.exit(1);
+                                return 1;

                             }
                         }
 
                             }
                         }
 


@@ -189,80 +394,132 @@ public class Main {
                             }
                         } catch (IOException e) {
                             handleIOException(e);
                             }
                         } catch (IOException e) {
                             handleIOException(e);

+                            return 3;

                         } catch (EncapsulatedExceptions e) {
                             handleEncapsulatedExceptions(e);
                         } catch (EncapsulatedExceptions e) {
                             handleEncapsulatedExceptions(e);

+                            return 3;

                         } catch (AssertionError e) {
                             handleAssertionError(e);
                         } catch (AssertionError e) {
                             handleAssertionError(e);

+                            return 1;

                         } catch (GroupNotFoundException e) {
                             handleGroupNotFoundException(e);
                         } catch (GroupNotFoundException e) {
                             handleGroupNotFoundException(e);

+                            return 1;
+                        } catch (NotAGroupMemberException e) {
+                            handleNotAGroupMemberException(e);
+                            return 1;

                         } catch (AttachmentInvalidException e) {
                             System.err.println("Failed to add attachment: " + e.getMessage());
                             System.err.println("Aborting sending.");
                         } catch (AttachmentInvalidException e) {
                             System.err.println("Failed to add attachment: " + e.getMessage());
                             System.err.println("Aborting sending.");

-                            System.exit(1);
+                            return 1;

                         } catch (DBusExecutionException e) {
                             handleDBusExecutionException(e);
                         } catch (DBusExecutionException e) {
                             handleDBusExecutionException(e);

+                            return 1;

                         }
                     }
 
                     break;
                 case "receive":
                     if (dBusConn != null) {
                         }
                     }
 
                     break;
                 case "receive":
                     if (dBusConn != null) {

-                        System.err.println("receive is not yet implementd via dbus");
-                        System.exit(1);
+                        try {
+                            dBusConn.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);
+                                        }
+                                    }
+                                    System.out.println();
+                                }
+                            });
+                            dBusConn.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())));
+                                }
+                            });
+                        } 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 (!m.isRegistered()) {
                         System.err.println("User is not registered.");
                     }
                     if (!m.isRegistered()) {
                         System.err.println("User is not registered.");

-                        System.exit(1);
+                        return 1;

                     }
                     }

-                    int timeout = 5;
-                    if (ns.getInt("timeout") != null) {
-                        timeout = ns.getInt("timeout");
+                    double timeout = 5;
+                    if (ns.getDouble("timeout") != null) {
+                        timeout = ns.getDouble("timeout");

                     }
                     boolean returnOnTimeout = true;
                     if (timeout < 0) {
                         returnOnTimeout = false;
                         timeout = 3600;
                     }
                     }
                     boolean returnOnTimeout = true;
                     if (timeout < 0) {
                         returnOnTimeout = false;
                         timeout = 3600;
                     }

+                    boolean ignoreAttachments = ns.getBoolean("ignore_attachments");

                     try {
                     try {

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

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

-                        System.exit(3);
+                        return 3;

                     } catch (AssertionError e) {
                         handleAssertionError(e);
                     } catch (AssertionError e) {
                         handleAssertionError(e);

+                        return 1;

                     }
                     break;
                 case "quitGroup":
                     if (dBusConn != null) {
                     }
                     break;
                 case "quitGroup":
                     if (dBusConn != null) {

-                        System.err.println("quitGroup is not yet implementd via dbus");
-                        System.exit(1);
+                        System.err.println("quitGroup is not yet implemented via dbus");
+                        return 1;

                     }
                     if (!m.isRegistered()) {
                         System.err.println("User is not registered.");
                     }
                     if (!m.isRegistered()) {
                         System.err.println("User is not registered.");

-                        System.exit(1);
+                        return 1;

                     }
 
                     try {
                         m.sendQuitGroupMessage(decodeGroupId(ns.getString("group")));
                     } catch (IOException e) {
                         handleIOException(e);
                     }
 
                     try {
                         m.sendQuitGroupMessage(decodeGroupId(ns.getString("group")));
                     } catch (IOException e) {
                         handleIOException(e);

+                        return 3;

                     } catch (EncapsulatedExceptions e) {
                         handleEncapsulatedExceptions(e);
                     } catch (EncapsulatedExceptions e) {
                         handleEncapsulatedExceptions(e);

+                        return 3;

                     } catch (AssertionError e) {
                         handleAssertionError(e);
                     } catch (AssertionError e) {
                         handleAssertionError(e);

+                        return 1;

                     } catch (GroupNotFoundException e) {
                         handleGroupNotFoundException(e);
                     } catch (GroupNotFoundException e) {
                         handleGroupNotFoundException(e);

+                        return 1;
+                    } catch (NotAGroupMemberException e) {
+                        handleNotAGroupMemberException(e);
+                        return 1;

                     }
 
                     break;
                 case "updateGroup":
                     }
 
                     break;
                 case "updateGroup":

-                    if (dBusConn != null) {
-                        System.err.println("updateGroup is not yet implementd via dbus");
-                        System.exit(1);
-                    }
-                    if (!m.isRegistered()) {
+                    if (dBusConn == null && !m.isRegistered()) {

                         System.err.println("User is not registered.");
                         System.err.println("User is not registered.");

-                        System.exit(1);
+                        return 1;

                     }
 
                     try {
                     }
 
                     try {


@@ -270,31 +527,140 @@ public class Main {
                         if (ns.getString("group") != null) {
                             groupId = decodeGroupId(ns.getString("group"));
                         }
                         if (ns.getString("group") != null) {
                             groupId = decodeGroupId(ns.getString("group"));
                         }

-                        byte[] newGroupId = m.sendUpdateGroupMessage(groupId, ns.getString("name"), ns.<String>getList("member"), ns.getString("avatar"));

                         if (groupId == null) {
                         if (groupId == null) {

+                            groupId = new byte[0];
+                        }
+                        String groupName = ns.getString("name");
+                        if (groupName == null) {
+                            groupName = "";
+                        }
+                        List<String> groupMembers = ns.<String>getList("member");
+                        if (groupMembers == null) {
+                            groupMembers = new ArrayList<String>();
+                        }
+                        String groupAvatar = ns.getString("avatar");
+                        if (groupAvatar == null) {
+                            groupAvatar = "";
+                        }
+                        byte[] newGroupId = ts.updateGroup(groupId, groupName, groupMembers, groupAvatar);
+                        if (groupId.length != newGroupId.length) {

                             System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …");
                         }
                     } catch (IOException e) {
                         handleIOException(e);
                             System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …");
                         }
                     } catch (IOException e) {
                         handleIOException(e);

+                        return 3;

                     } catch (AttachmentInvalidException e) {
                         System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
                         System.err.println("Aborting sending.");
                     } catch (AttachmentInvalidException e) {
                         System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
                         System.err.println("Aborting sending.");

-                        System.exit(1);
+                        return 1;

                     } catch (GroupNotFoundException e) {
                         handleGroupNotFoundException(e);
                     } catch (GroupNotFoundException e) {
                         handleGroupNotFoundException(e);

+                        return 1;
+                    } catch (NotAGroupMemberException e) {
+                        handleNotAGroupMemberException(e);
+                        return 1;

                     } catch (EncapsulatedExceptions e) {
                         handleEncapsulatedExceptions(e);
                     } catch (EncapsulatedExceptions e) {
                         handleEncapsulatedExceptions(e);

+                        return 3;
+                    }
+
+                    break;
+                case "listGroups":
+                    if (dBusConn != null) {
+                        System.err.println("listGroups is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;

                     }
 
                     }
 

+                    List<GroupInfo> groups = m.getGroups();
+                    boolean detailed = ns.getBoolean("detailed");
+
+                    for (GroupInfo group : groups) {
+                        printGroup(group, detailed);
+                    }
+                    break;
+                case "listIdentities":
+                    if (dBusConn != null) {
+                        System.err.println("listIdentities is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+                    if (ns.get("number") == null) {
+                        for (Map.Entry<String, List<JsonIdentityKeyStore.Identity>> keys : m.getIdentities().entrySet()) {
+                            for (JsonIdentityKeyStore.Identity id : keys.getValue()) {
+                                printIdentityFingerprint(m, keys.getKey(), id);
+                            }
+                        }
+                    } else {
+                        String number = ns.getString("number");
+                        for (JsonIdentityKeyStore.Identity id : m.getIdentities(number)) {
+                            printIdentityFingerprint(m, number, id);
+                        }
+                    }
+                    break;
+                case "trust":
+                    if (dBusConn != null) {
+                        System.err.println("trust is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+                    String number = ns.getString("number");
+                    if (ns.getBoolean("trust_all_known_keys")) {
+                        boolean res = m.trustIdentityAllKeys(number);
+                        if (!res) {
+                            System.err.println("Failed to set the trust for this number, make sure the number is correct.");
+                            return 1;
+                        }
+                    } else {
+                        String fingerprint = ns.getString("verified_fingerprint");
+                        if (fingerprint != null) {
+                            fingerprint = fingerprint.replaceAll(" ", "");
+                            if (fingerprint.length() == 66) {
+                                byte[] fingerprintBytes;
+                                try {
+                                    fingerprintBytes = Hex.toByteArray(fingerprint.toLowerCase(Locale.ROOT));
+                                } catch (Exception e) {
+                                    System.err.println("Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
+                                    return 1;
+                                }
+                                boolean res = m.trustIdentityVerified(number, fingerprintBytes);
+                                if (!res) {
+                                    System.err.println("Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
+                                    return 1;
+                                }
+                            } else if (fingerprint.length() == 60) {
+                                boolean res = m.trustIdentityVerifiedSafetyNumber(number, fingerprint);
+                                if (!res) {
+                                    System.err.println("Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");
+                                    return 1;
+                                }
+                            } else {
+                                System.err.println("Fingerprint has invalid format, either specify the old hex fingerprint or the new safety number");
+                                return 1;
+                            }
+                        } else {
+                            System.err.println("You need to specify the fingerprint you have verified with -v FINGERPRINT");
+                            return 1;
+                        }
+                    }

                     break;
                 case "daemon":
                     if (dBusConn != null) {
                         System.err.println("Stop it.");
                     break;
                 case "daemon":
                     if (dBusConn != null) {
                         System.err.println("Stop it.");

-                        System.exit(1);
+                        return 1;

                     }
                     if (!m.isRegistered()) {
                         System.err.println("User is not registered.");
                     }
                     if (!m.isRegistered()) {
                         System.err.println("User is not registered.");

-                        System.exit(1);
+                        return 1;

                     }
                     DBusConnection conn = null;
                     try {
                     }
                     DBusConnection conn = null;
                     try {


@@ -308,17 +674,22 @@ public class Main {
                             conn = DBusConnection.getConnection(busType);
                             conn.exportObject(SIGNAL_OBJECTPATH, m);
                             conn.requestBusName(SIGNAL_BUSNAME);
                             conn = DBusConnection.getConnection(busType);
                             conn.exportObject(SIGNAL_OBJECTPATH, m);
                             conn.requestBusName(SIGNAL_BUSNAME);

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

                         } catch (DBusException e) {
                             e.printStackTrace();
                         } catch (DBusException e) {
                             e.printStackTrace();

-                            System.exit(3);
+                            return 2;

                         }
                         }

+                        ignoreAttachments = ns.getBoolean("ignore_attachments");

                         try {
                         try {

-                            m.receiveMessages(3600, false, new DbusReceiveMessageHandler(m, conn));
+                            m.receiveMessages(1, TimeUnit.HOURS, false, ignoreAttachments, ns.getBoolean("json") ? new JsonDbusReceiveMessageHandler(m, conn) : new DbusReceiveMessageHandler(m, conn));

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

-                            System.exit(3);
+                            return 3;

                         } catch (AssertionError e) {
                             handleAssertionError(e);
                         } catch (AssertionError e) {
                             handleAssertionError(e);

+                            return 1;

                         }
                     } finally {
                         if (conn != null) {
                         }
                     } finally {
                         if (conn != null) {


@@ -328,7 +699,7 @@ public class Main {
 
                     break;
             }
 
                     break;
             }

-            System.exit(0);
+            return 0;

         } finally {
             if (dBusConn != null) {
                 dBusConn.disconnect();
         } finally {
             if (dBusConn != null) {
                 dBusConn.disconnect();


@@ -336,16 +707,37 @@ public class Main {
         }
     }
 
         }
     }
 

+    private static void printIdentityFingerprint(Manager m, String theirUsername, JsonIdentityKeyStore.Identity theirId) {
+        String digits = Util.formatSafetyNumber(m.computeSafetyNumber(theirUsername, theirId.getIdentityKey()));
+        System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s", theirUsername,
+                theirId.getTrustLevel(), theirId.getDateAdded(), Hex.toStringCondensed(theirId.getFingerprint()), digits));
+    }
+
+    private static void printGroup(GroupInfo group, boolean detailed) {
+        if (detailed) {
+            System.out.println(String.format("Id: %s Name: %s  Active: %s Members: %s",
+                    Base64.encodeBytes(group.groupId), group.name, group.active, group.members));
+        } else {
+            System.out.println(String.format("Id: %s Name: %s  Active: %s", Base64.encodeBytes(group.groupId),
+                    group.name, group.active));
+        }
+    }
+

     private static void handleGroupNotFoundException(GroupNotFoundException e) {
         System.err.println("Failed to send to group: " + e.getMessage());
         System.err.println("Aborting sending.");
     private static void handleGroupNotFoundException(GroupNotFoundException e) {
         System.err.println("Failed to send to group: " + e.getMessage());
         System.err.println("Aborting sending.");

-        System.exit(1);

     }
 
     }
 

+    private static void handleNotAGroupMemberException(NotAGroupMemberException e) {
+        System.err.println("Failed to send to group: " + e.getMessage());
+        System.err.println("Update the group on another device to readd the user to this group.");
+        System.err.println("Aborting sending.");
+    }
+
+

     private static void handleDBusExecutionException(DBusExecutionException e) {
         System.err.println("Cannot connect to dbus: " + e.getMessage());
         System.err.println("Aborting.");
     private static void handleDBusExecutionException(DBusExecutionException e) {
         System.err.println("Cannot connect to dbus: " + e.getMessage());
         System.err.println("Aborting.");

-        System.exit(1);

     }
 
     private static byte[] decodeGroupId(String groupId) {
     }
 
     private static byte[] decodeGroupId(String groupId) {


@@ -360,7 +752,8 @@ public class Main {
     }
 
     private static Namespace parseArgs(String[] args) {
     }
 
     private static Namespace parseArgs(String[] args) {

-        ArgumentParser parser = ArgumentParsers.newArgumentParser("signal-cli")
+        ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
+                .build()

                 .defaultHelp(true)
                 .description("Commandline interface for Signal.")
                 .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
                 .defaultHelp(true)
                 .description("Commandline interface for Signal.")
                 .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);


@@ -369,7 +762,7 @@ public class Main {
                 .help("Show package version.")
                 .action(Arguments.version());
         parser.addArgument("--config")
                 .help("Show package version.")
                 .action(Arguments.version());
         parser.addArgument("--config")

-                .help("Set the path, where to store the config (Default: $HOME/.config/signal-cli).");
+                .help("Set the path, where to store the config (Default: $HOME/.config/signal).");

 
         MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
         mut.addArgument("-u", "--username")
 
         MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
         mut.addArgument("-u", "--username")


@@ -387,14 +780,45 @@ public class Main {
                 .description("valid subcommands")
                 .help("additional help");
 
                 .description("valid subcommands")
                 .help("additional help");
 

+        Subparser parserLink = subparsers.addParser("link");
+        parserLink.addArgument("-n", "--name")
+                .help("Specify a name to describe this new device.");
+
+        Subparser parserAddDevice = subparsers.addParser("addDevice");
+        parserAddDevice.addArgument("--uri")
+                .required(true)
+                .help("Specify the uri contained in the QR code shown by the new device.");
+
+        Subparser parserDevices = subparsers.addParser("listDevices");
+
+        Subparser parserRemoveDevice = subparsers.addParser("removeDevice");
+        parserRemoveDevice.addArgument("-d", "--deviceId")
+                .type(int.class)
+                .required(true)
+                .help("Specify the device you want to remove. Use listDevices to see the deviceIds.");
+

         Subparser parserRegister = subparsers.addParser("register");
         parserRegister.addArgument("-v", "--voice")
                 .help("The verification should be done over voice, not sms.")
                 .action(Arguments.storeTrue());
 
         Subparser parserRegister = subparsers.addParser("register");
         parserRegister.addArgument("-v", "--voice")
                 .help("The verification should be done over voice, not sms.")
                 .action(Arguments.storeTrue());
 

+        Subparser parserUnregister = subparsers.addParser("unregister");
+        parserUnregister.help("Unregister the current device from the signal server.");
+
+        Subparser parserUpdateAccount = subparsers.addParser("updateAccount");
+        parserUpdateAccount.help("Update the account attributes on the signal server.");
+
+        Subparser parserSetPin = subparsers.addParser("setPin");
+        parserSetPin.addArgument("registrationLockPin")
+                .help("The registration lock PIN, that will be required for new registrations (resets after 7 days of inactivity)");
+
+        Subparser parserRemovePin = subparsers.addParser("removePin");
+

         Subparser parserVerify = subparsers.addParser("verify");
         parserVerify.addArgument("verificationCode")
                 .help("The verification code you received via sms or voice call.");
         Subparser parserVerify = subparsers.addParser("verify");
         parserVerify.addArgument("verificationCode")
                 .help("The verification code you received via sms or voice call.");

+        parserVerify.addArgument("-p", "--pin")
+                .help("The registration lock PIN, that was set by the user (Optional)");

 
         Subparser parserSend = subparsers.addParser("send");
         parserSend.addArgument("-g", "--group")
 
         Subparser parserSend = subparsers.addParser("send");
         parserSend.addArgument("-g", "--group")


@@ -427,19 +851,57 @@ public class Main {
                 .nargs("*")
                 .help("Specify one or more members to add to the group");
 
                 .nargs("*")
                 .help("Specify one or more members to add to the group");
 

+        Subparser parserListGroups = subparsers.addParser("listGroups");
+        parserListGroups.addArgument("-d", "--detailed").action(Arguments.storeTrue())
+                .help("List members of each group");
+        parserListGroups.help("List group name and ids");
+
+        Subparser parserListIdentities = subparsers.addParser("listIdentities");
+        parserListIdentities.addArgument("-n", "--number")
+                .help("Only show identity keys for the given phone number.");
+
+        Subparser parserTrust = subparsers.addParser("trust");
+        parserTrust.addArgument("number")
+                .help("Specify the phone number, for which to set the trust.")
+                .required(true);
+        MutuallyExclusiveGroup mutTrust = parserTrust.addMutuallyExclusiveGroup();
+        mutTrust.addArgument("-a", "--trust-all-known-keys")
+                .help("Trust all known keys of this user, only use this for testing.")
+                .action(Arguments.storeTrue());
+        mutTrust.addArgument("-v", "--verified-fingerprint")
+                .help("Specify the fingerprint of the key, only use this option if you have verified the fingerprint.");
+

         Subparser parserReceive = subparsers.addParser("receive");
         parserReceive.addArgument("-t", "--timeout")
         Subparser parserReceive = subparsers.addParser("receive");
         parserReceive.addArgument("-t", "--timeout")

-                .type(int.class)
+                .type(double.class)

                 .help("Number of seconds to wait for new messages (negative values disable timeout)");
                 .help("Number of seconds to wait for new messages (negative values disable timeout)");

+        parserReceive.addArgument("--ignore-attachments")
+                .help("Don’t download attachments of received messages.")
+                .action(Arguments.storeTrue());
+        parserReceive.addArgument("--json")
+                .help("Output received messages in json format, one json object per line.")
+                .action(Arguments.storeTrue());

 
         Subparser parserDaemon = subparsers.addParser("daemon");
         parserDaemon.addArgument("--system")
                 .action(Arguments.storeTrue())
                 .help("Use DBus system bus instead of user bus.");
 
         Subparser parserDaemon = subparsers.addParser("daemon");
         parserDaemon.addArgument("--system")
                 .action(Arguments.storeTrue())
                 .help("Use DBus system bus instead of user bus.");

+        parserDaemon.addArgument("--ignore-attachments")
+                .help("Don’t download attachments of received messages.")
+                .action(Arguments.storeTrue());
+        parserDaemon.addArgument("--json")
+                .help("Output received messages in json format, one json object per line.")
+                .action(Arguments.storeTrue());

 
         try {
             Namespace ns = parser.parseArgs(args);
 
         try {
             Namespace ns = parser.parseArgs(args);

-            if (!ns.getBoolean("dbus") && !ns.getBoolean("dbus_system")) {
+            if ("link".equals(ns.getString("command"))) {
+                if (ns.getString("username") != null) {
+                    parser.printUsage();
+                    System.err.println("You cannot specify a username (phone number) when linking");
+                    System.exit(2);
+                }
+            } else if (!ns.getBoolean("dbus") && !ns.getBoolean("dbus_system")) {

                 if (ns.getString("username") == null) {
                     parser.printUsage();
                     System.err.println("You need to specify a username (phone number)");
                 if (ns.getString("username") == null) {
                     parser.printUsage();
                     System.err.println("You need to specify a username (phone number)");


@@ -463,9 +925,8 @@ public class Main {
 
     private static void handleAssertionError(AssertionError e) {
         System.err.println("Failed to send/receive message (Assertion): " + e.getMessage());
 
     private static void handleAssertionError(AssertionError e) {
         System.err.println("Failed to send/receive message (Assertion): " + e.getMessage());

-        System.err.println(e.getStackTrace());
+        e.printStackTrace();

         System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");
         System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");

-        System.exit(1);

     }
 
     private static void handleEncapsulatedExceptions(EncapsulatedExceptions e) {
     }
 
     private static void handleEncapsulatedExceptions(EncapsulatedExceptions e) {


@@ -493,64 +954,166 @@ public class Main {
         }
 
         @Override
         }
 
         @Override

-        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
+        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {

             SignalServiceAddress source = envelope.getSourceAddress();
             SignalServiceAddress source = envelope.getSourceAddress();

-            System.out.println(String.format("Envelope from: %s (device: %d)", source.getNumber(), envelope.getSourceDevice()));
+            ContactInfo sourceContact = m.getContact(source.getNumber());
+            System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber(), envelope.getSourceDevice()));

             if (source.getRelay().isPresent()) {
                 System.out.println("Relayed by: " + source.getRelay().get());
             }
             if (source.getRelay().isPresent()) {
                 System.out.println("Relayed by: " + source.getRelay().get());
             }

-            System.out.println("Timestamp: " + envelope.getTimestamp());
+            System.out.println("Timestamp: " + DateUtils.formatTimestamp(envelope.getTimestamp()));
+            if (envelope.isUnidentifiedSender()) {
+                System.out.println("Sent by unidentified/sealed sender");
+            }

 
             if (envelope.isReceipt()) {
                 System.out.println("Got receipt.");
             } else if (envelope.isSignalMessage() | envelope.isPreKeySignalMessage()) {
 
             if (envelope.isReceipt()) {
                 System.out.println("Got receipt.");
             } else if (envelope.isSignalMessage() | envelope.isPreKeySignalMessage()) {

+                if (exception != null) {
+                    if (exception instanceof org.whispersystems.libsignal.UntrustedIdentityException) {
+                        org.whispersystems.libsignal.UntrustedIdentityException e = (org.whispersystems.libsignal.UntrustedIdentityException) exception;
+                        System.out.println("The user’s key is untrusted, either the user has reinstalled Signal or a third party sent this message.");
+                        System.out.println("Use 'signal-cli -u " + m.getUsername() + " listIdentities -n " + e.getName() + "', verify the key and run 'signal-cli -u " + m.getUsername() + " trust -v \"FINGER_PRINT\" " + e.getName() + "' to mark it as trusted");
+                        System.out.println("If you don't care about security, use 'signal-cli -u " + m.getUsername() + " trust -a " + e.getName() + "' to trust it without verification");
+                    } else {
+                        System.out.println("Exception: " + exception.getMessage() + " (" + exception.getClass().getSimpleName() + ")");
+                    }
+                }

                 if (content == null) {
                     System.out.println("Failed to decrypt message.");
                 } else {
                     if (content.getDataMessage().isPresent()) {
                         SignalServiceDataMessage message = content.getDataMessage().get();
                 if (content == null) {
                     System.out.println("Failed to decrypt message.");
                 } else {
                     if (content.getDataMessage().isPresent()) {
                         SignalServiceDataMessage message = content.getDataMessage().get();

+                        handleSignalServiceDataMessage(message);
+                    }
+                    if (content.getSyncMessage().isPresent()) {
+                        System.out.println("Received a sync message");
+                        SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();

 
 

-                        System.out.println("Message timestamp: " + message.getTimestamp());
-
-                        if (message.getBody().isPresent()) {
-                            System.out.println("Body: " + message.getBody().get());
+                        if (syncMessage.getContacts().isPresent()) {
+                            final ContactsMessage contactsMessage = syncMessage.getContacts().get();
+                            if (contactsMessage.isComplete()) {
+                                System.out.println("Received complete sync contacts");
+                            } else {
+                                System.out.println("Received sync contacts");
+                            }
+                            printAttachment(contactsMessage.getContactsStream());

                         }
                         }

-                        if (message.getGroupInfo().isPresent()) {
-                            SignalServiceGroup groupInfo = message.getGroupInfo().get();
-                            System.out.println("Group info:");
-                            System.out.println("  Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
-                            if (groupInfo.getName().isPresent()) {
-                                System.out.println("  Name: " + groupInfo.getName().get());
-                            } else if (group != null) {
-                                System.out.println("  Name: " + group.name);
+                        if (syncMessage.getGroups().isPresent()) {
+                            System.out.println("Received sync groups");
+                            printAttachment(syncMessage.getGroups().get());
+                        }
+                        if (syncMessage.getRead().isPresent()) {
+                            System.out.println("Received sync read messages list");
+                            for (ReadMessage rm : syncMessage.getRead().get()) {
+                                ContactInfo fromContact = m.getContact(rm.getSender());
+                                System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + DateUtils.formatTimestamp(rm.getTimestamp()));
+                            }
+                        }
+                        if (syncMessage.getRequest().isPresent()) {
+                            System.out.println("Received sync request");
+                            if (syncMessage.getRequest().get().isContactsRequest()) {
+                                System.out.println(" - contacts request");
+                            }
+                            if (syncMessage.getRequest().get().isGroupsRequest()) {
+                                System.out.println(" - groups request");
+                            }
+                        }
+                        if (syncMessage.getSent().isPresent()) {
+                            System.out.println("Received sync sent message");
+                            final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get();
+                            String to;
+                            if (sentTranscriptMessage.getDestination().isPresent()) {
+                                String dest = sentTranscriptMessage.getDestination().get();
+                                ContactInfo destContact = m.getContact(dest);
+                                to = (destContact == null ? "" : "“" + destContact.name + "” ") + dest;

                             } else {
                             } else {

-                                System.out.println("  Name: <Unknown group>");
+                                to = "Unknown";

                             }
                             }

-                            System.out.println("  Type: " + groupInfo.getType());
-                            if (groupInfo.getMembers().isPresent()) {
-                                for (String member : groupInfo.getMembers().get()) {
-                                    System.out.println("  Member: " + member);
-                                }
+                            System.out.println("To: " + to + " , Message timestamp: " + DateUtils.formatTimestamp(sentTranscriptMessage.getTimestamp()));
+                            if (sentTranscriptMessage.getExpirationStartTimestamp() > 0) {
+                                System.out.println("Expiration started at: " + DateUtils.formatTimestamp(sentTranscriptMessage.getExpirationStartTimestamp()));

                             }
                             }

-                            if (groupInfo.getAvatar().isPresent()) {
-                                System.out.println("  Avatar:");
-                                printAttachment(groupInfo.getAvatar().get());
+                            SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
+                            handleSignalServiceDataMessage(message);
+                        }
+                        if (syncMessage.getBlockedList().isPresent()) {
+                            System.out.println("Received sync message with block list");
+                            System.out.println("Blocked numbers:");
+                            final BlockedListMessage blockedList = syncMessage.getBlockedList().get();
+                            for (String number : blockedList.getNumbers()) {
+                                System.out.println(" - " + number);

                             }
                         }
                             }
                         }

-                        if (message.isEndSession()) {
-                            System.out.println("Is end session");
+                        if (syncMessage.getVerified().isPresent()) {
+                            System.out.println("Received sync message with verified identities:");
+                            final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
+                            System.out.println(" - " + verifiedMessage.getDestination() + ": " + verifiedMessage.getVerified());
+                            String safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey()));
+                            System.out.println("   " + safetyNumber);

                         }
                         }

-
-                        if (message.getAttachments().isPresent()) {
-                            System.out.println("Attachments: ");
-                            for (SignalServiceAttachment attachment : message.getAttachments().get()) {
-                                printAttachment(attachment);
+                        if (syncMessage.getConfiguration().isPresent()) {
+                            System.out.println("Received sync message with configuration:");
+                            final ConfigurationMessage configurationMessage = syncMessage.getConfiguration().get();
+                            if (configurationMessage.getReadReceipts().isPresent()) {
+                                System.out.println(" - Read receipts: " + (configurationMessage.getReadReceipts().get() ? "enabled" : "disabled"));

                             }
                         }
                     }
                             }
                         }
                     }

-                    if (content.getSyncMessage().isPresent()) {
-                        SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
-                        System.out.println("Received sync message");
+                    if (content.getCallMessage().isPresent()) {
+                        System.out.println("Received a call message");
+                        SignalServiceCallMessage callMessage = content.getCallMessage().get();
+                        if (callMessage.getAnswerMessage().isPresent()) {
+                            AnswerMessage answerMessage = callMessage.getAnswerMessage().get();
+                            System.out.println("Answer message: " + answerMessage.getId() + ": " + answerMessage.getDescription());
+                        }
+                        if (callMessage.getBusyMessage().isPresent()) {
+                            BusyMessage busyMessage = callMessage.getBusyMessage().get();
+                            System.out.println("Busy message: " + busyMessage.getId());
+                        }
+                        if (callMessage.getHangupMessage().isPresent()) {
+                            HangupMessage hangupMessage = callMessage.getHangupMessage().get();
+                            System.out.println("Hangup message: " + hangupMessage.getId());
+                        }
+                        if (callMessage.getIceUpdateMessages().isPresent()) {
+                            List<IceUpdateMessage> iceUpdateMessages = callMessage.getIceUpdateMessages().get();
+                            for (IceUpdateMessage iceUpdateMessage : iceUpdateMessages) {
+                                System.out.println("Ice update message: " + iceUpdateMessage.getId() + ", sdp: " + iceUpdateMessage.getSdp());
+                            }
+                        }
+                        if (callMessage.getOfferMessage().isPresent()) {
+                            OfferMessage offerMessage = callMessage.getOfferMessage().get();
+                            System.out.println("Offer message: " + offerMessage.getId() + ": " + offerMessage.getDescription());
+                        }
+                    }
+                    if (content.getReceiptMessage().isPresent()) {
+                        System.out.println("Received a receipt message");
+                        SignalServiceReceiptMessage receiptMessage = content.getReceiptMessage().get();
+                        System.out.println(" - When: " + DateUtils.formatTimestamp(receiptMessage.getWhen()));
+                        if (receiptMessage.isDeliveryReceipt()) {
+                            System.out.println(" - Is delivery receipt");
+                        }
+                        if (receiptMessage.isReadReceipt()) {
+                            System.out.println(" - Is read receipt");
+                        }
+                        System.out.println(" - Timestamps:");
+                        for (long timestamp : receiptMessage.getTimestamps()) {
+                            System.out.println("    " + DateUtils.formatTimestamp(timestamp));
+                        }
+                    }
+                    if (content.getTypingMessage().isPresent()) {
+                        System.out.println("Received a typing message");
+                        SignalServiceTypingMessage typingMessage = content.getTypingMessage().get();
+                        System.out.println(" - Action: " + typingMessage.getAction());
+                        System.out.println(" - Timestamp: " + DateUtils.formatTimestamp(typingMessage.getTimestamp()));
+                        if (typingMessage.getGroupId().isPresent()) {
+                            GroupInfo group = m.getGroup(typingMessage.getGroupId().get());
+                            if (group != null) {
+                                System.out.println("  Name: " + group.name);
+                            } else {
+                                System.out.println("  Name: <Unknown group>");
+                            }
+                        }

                     }
                 }
             } else {
                     }
                 }
             } else {


@@ -559,12 +1122,85 @@ public class Main {
             System.out.println();
         }
 
             System.out.println();
         }
 

+        private void handleSignalServiceDataMessage(SignalServiceDataMessage message) {
+            System.out.println("Message timestamp: " + DateUtils.formatTimestamp(message.getTimestamp()));
+
+            if (message.getBody().isPresent()) {
+                System.out.println("Body: " + message.getBody().get());
+            }
+            if (message.getGroupInfo().isPresent()) {
+                SignalServiceGroup groupInfo = message.getGroupInfo().get();
+                System.out.println("Group info:");
+                System.out.println("  Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
+                if (groupInfo.getType() == SignalServiceGroup.Type.UPDATE && groupInfo.getName().isPresent()) {
+                    System.out.println("  Name: " + groupInfo.getName().get());
+                } else {
+                    GroupInfo group = m.getGroup(groupInfo.getGroupId());
+                    if (group != null) {
+                        System.out.println("  Name: " + group.name);
+                    } else {
+                        System.out.println("  Name: <Unknown group>");
+                    }
+                }
+                System.out.println("  Type: " + groupInfo.getType());
+                if (groupInfo.getMembers().isPresent()) {
+                    for (String member : groupInfo.getMembers().get()) {
+                        System.out.println("  Member: " + member);
+                    }
+                }
+                if (groupInfo.getAvatar().isPresent()) {
+                    System.out.println("  Avatar:");
+                    printAttachment(groupInfo.getAvatar().get());
+                }
+            }
+            if (message.isEndSession()) {
+                System.out.println("Is end session");
+            }
+            if (message.isExpirationUpdate()) {
+                System.out.println("Is Expiration update: " + message.isExpirationUpdate());
+            }
+            if (message.getExpiresInSeconds() > 0) {
+                System.out.println("Expires in: " + message.getExpiresInSeconds() + " seconds");
+            }
+            if (message.getProfileKey().isPresent()) {
+                System.out.println("Profile key update, key length:" + message.getProfileKey().get().length);
+            }
+
+            if (message.getQuote().isPresent()) {
+                SignalServiceDataMessage.Quote quote = message.getQuote().get();
+                System.out.println("Quote: (" + quote.getId() + ")");
+                System.out.println(" Author: " + quote.getAuthor().getNumber());
+                System.out.println(" Text: " + quote.getText());
+                if (quote.getAttachments().size() > 0) {
+                    System.out.println(" Attachments: ");
+                    for (SignalServiceDataMessage.Quote.QuotedAttachment attachment : quote.getAttachments()) {
+                        System.out.println("  Filename: " + attachment.getFileName());
+                        System.out.println("  Type: " + attachment.getContentType());
+                        System.out.println("  Thumbnail:");
+                        if (attachment.getThumbnail() != null) {
+                            printAttachment(attachment.getThumbnail());
+                        }
+                    }
+                }
+            }
+
+            if (message.getAttachments().isPresent()) {
+                System.out.println("Attachments: ");
+                for (SignalServiceAttachment attachment : message.getAttachments().get()) {
+                    printAttachment(attachment);
+                }
+            }
+        }
+

         private void printAttachment(SignalServiceAttachment attachment) {
             System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")");
             if (attachment.isPointer()) {
                 final SignalServiceAttachmentPointer pointer = attachment.asPointer();
         private void printAttachment(SignalServiceAttachment attachment) {
             System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")");
             if (attachment.isPointer()) {
                 final SignalServiceAttachmentPointer pointer = attachment.asPointer();

-                System.out.println("  Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));
+                System.out.println("  Id: " + pointer.getId() + " Key length: " + pointer.getKey().length);
+                System.out.println("  Filename: " + (pointer.getFileName().isPresent() ? pointer.getFileName().get() : "-"));

                 System.out.println("  Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
                 System.out.println("  Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));

+                System.out.println("  Voice note: " + (pointer.getVoiceNote() ? "yes" : "no"));
+                System.out.println("  Dimensions: " + pointer.getWidth() + "x" + pointer.getHeight());

                 File file = m.getAttachmentFile(pointer.getId());
                 if (file.exists()) {
                     System.out.println("  Stored plaintext in: " + file);
                 File file = m.getAttachmentFile(pointer.getId());
                 if (file.exists()) {
                     System.out.println("  Stored plaintext in: " + file);


@@ -573,105 +1209,105 @@ public class Main {
         }
     }
 
         }
     }
 

-    private static class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler {
-        final Manager m;
+    private static class DbusReceiveMessageHandler extends ReceiveMessageHandler {

         final DBusConnection conn;
 
         public DbusReceiveMessageHandler(Manager m, DBusConnection conn) {
         final DBusConnection conn;
 
         public DbusReceiveMessageHandler(Manager m, DBusConnection conn) {

-            this.m = m;
+            super(m);

             this.conn = conn;
         }
 
         @Override
             this.conn = conn;
         }
 
         @Override

-        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
-            System.out.println("Envelope from: " + envelope.getSource());
-            System.out.println("Timestamp: " + envelope.getTimestamp());
+        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
+            super.handleMessage(envelope, content, exception);

 
 

-            if (envelope.isReceipt()) {
-                System.out.println("Got receipt.");
-            } else if (envelope.isSignalMessage() | envelope.isPreKeySignalMessage()) {
-                if (content == null) {
-                    System.out.println("Failed to decrypt message.");
-                } else {
-                    if (content.getDataMessage().isPresent()) {
-                        SignalServiceDataMessage message = content.getDataMessage().get();
+            JsonDbusReceiveMessageHandler.sendReceivedMessageToDbus(envelope, content, conn, m);
+        }
+    }

 
 

-                        System.out.println("Message timestamp: " + message.getTimestamp());
+    private static class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
+        final Manager m;
+        final ObjectMapper jsonProcessor;

 
 

-                        if (message.getBody().isPresent()) {
-                            System.out.println("Body: " + message.getBody().get());
-                        }
+        public JsonReceiveMessageHandler(Manager m) {
+            this.m = m;
+            this.jsonProcessor = new ObjectMapper();
+            jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); // disable autodetect
+            jsonProcessor.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
+            jsonProcessor.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+            jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+        }

 
 

-                        if (message.getGroupInfo().isPresent()) {
-                            SignalServiceGroup groupInfo = message.getGroupInfo().get();
-                            System.out.println("Group info:");
-                            System.out.println("  Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
-                            if (groupInfo.getName().isPresent()) {
-                                System.out.println("  Name: " + groupInfo.getName().get());
-                            } else if (group != null) {
-                                System.out.println("  Name: " + group.name);
-                            } else {
-                                System.out.println("  Name: <Unknown group>");
-                            }
-                            System.out.println("  Type: " + groupInfo.getType());
-                            if (groupInfo.getMembers().isPresent()) {
-                                for (String member : groupInfo.getMembers().get()) {
-                                    System.out.println("  Member: " + member);
-                                }
-                            }
-                            if (groupInfo.getAvatar().isPresent()) {
-                                System.out.println("  Avatar:");
-                                printAttachment(groupInfo.getAvatar().get());
-                            }
-                        }
-                        if (message.isEndSession()) {
-                            System.out.println("Is end session");
-                        }
+        @Override
+        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
+            ObjectNode result = jsonProcessor.createObjectNode();
+            if (exception != null) {
+                result.putPOJO("error", new JsonError(exception));
+            }
+            if (envelope != null) {
+                result.putPOJO("envelope", new JsonMessageEnvelope(envelope, content));
+            }
+            try {
+                jsonProcessor.writeValue(System.out, result);
+                System.out.println();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }

 
 

-                        List<String> attachments = new ArrayList<>();
-                        if (message.getAttachments().isPresent()) {
-                            System.out.println("Attachments: ");
-                            for (SignalServiceAttachment attachment : message.getAttachments().get()) {
-                                if (attachment.isPointer()) {
-                                    attachments.add(m.getAttachmentFile(attachment.asPointer().getId()).getAbsolutePath());
-                                }
-                                printAttachment(attachment);
-                            }
-                        }
-                        if (!message.isEndSession() &&
-                                !(message.getGroupInfo().isPresent() && message.getGroupInfo().get().getType() != SignalServiceGroup.Type.DELIVER)) {
-                            try {
-                                conn.sendSignal(new Signal.MessageReceived(
-                                        SIGNAL_OBJECTPATH,
-                                        envelope.getSource(),
-                                        message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
-                                        message.getBody().isPresent() ? message.getBody().get() : "",
-                                        attachments));
-                            } catch (DBusException e) {
-                                e.printStackTrace();
+    private static class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
+        final DBusConnection conn;
+
+        public JsonDbusReceiveMessageHandler(Manager m, DBusConnection conn) {
+            super(m);
+            this.conn = conn;
+        }
+
+        @Override
+        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
+            super.handleMessage(envelope, content, exception);
+
+            sendReceivedMessageToDbus(envelope, content, conn, m);
+        }
+
+        private static void sendReceivedMessageToDbus(SignalServiceEnvelope envelope, SignalServiceContent content, DBusConnection conn, Manager m) {
+            if (envelope.isReceipt()) {
+                try {
+                    conn.sendSignal(new Signal.ReceiptReceived(
+                            SIGNAL_OBJECTPATH,
+                            envelope.getTimestamp(),
+                            envelope.getSource()
+                    ));
+                } catch (DBusException e) {
+                    e.printStackTrace();
+                }
+            } else if (content != null && content.getDataMessage().isPresent()) {
+                SignalServiceDataMessage message = content.getDataMessage().get();
+
+                if (!message.isEndSession() &&
+                        !(message.getGroupInfo().isPresent() &&
+                                message.getGroupInfo().get().getType() != SignalServiceGroup.Type.DELIVER)) {
+                    List<String> attachments = new ArrayList<>();
+                    if (message.getAttachments().isPresent()) {
+                        for (SignalServiceAttachment attachment : message.getAttachments().get()) {
+                            if (attachment.isPointer()) {
+                                attachments.add(m.getAttachmentFile(attachment.asPointer().getId()).getAbsolutePath());

                             }
                         }
                     }
                             }
                         }
                     }

-                    if (content.getSyncMessage().isPresent()) {
-                        SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
-                        System.out.println("Received sync message");
-                    }
-                }
-            } else {
-                System.out.println("Unknown message received.");
-            }
-            System.out.println();
-        }

 
 

-        private void printAttachment(SignalServiceAttachment attachment) {
-            System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")");
-            if (attachment.isPointer()) {
-                final SignalServiceAttachmentPointer pointer = attachment.asPointer();
-                System.out.println("  Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));
-                System.out.println("  Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
-                File file = m.getAttachmentFile(pointer.getId());
-                if (file.exists()) {
-                    System.out.println("  Stored plaintext in: " + file);
+                    try {
+                        conn.sendSignal(new Signal.MessageReceived(
+                                SIGNAL_OBJECTPATH,
+                                message.getTimestamp(),
+                                envelope.getSource(),
+                                message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
+                                message.getBody().isPresent() ? message.getBody().get() : "",
+                                attachments));
+                    } catch (DBusException e) {
+                        e.printStackTrace();
+                    }

                 }
             }
         }
                 }
             }
         }