Added JSON output to listGroups and allowed json to be activated with -j (#401)

[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 571f9d42a706b6dd8588ee6b3d434b51c3e1d39a..b90b7cba1ad0706fb2ee1c0edb461868210f7f11 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -1,1100 +1,318 @@
-/**
- * Copyright (C) 2015 AsamK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/*
+  Copyright (C) 2015-2021 AsamK and contributors
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */
 package org.asamk.signal;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
  */
 package org.asamk.signal;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;

-import net.sourceforge.argparse4j.inf.*;
-import org.apache.http.util.TextUtils;
+import net.sourceforge.argparse4j.inf.ArgumentParser;
+import net.sourceforge.argparse4j.inf.ArgumentParserException;
+import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+import net.sourceforge.argparse4j.inf.Subparsers;
+

 import org.asamk.Signal;
 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.Base64;
-import org.asamk.signal.util.Hex;
-import org.freedesktop.dbus.DBusConnection;
-import org.freedesktop.dbus.DBusSigHandler;
+import org.asamk.signal.commands.Command;
+import org.asamk.signal.commands.Commands;
+import org.asamk.signal.commands.DbusCommand;
+import org.asamk.signal.commands.ExtendedDbusCommand;
+import org.asamk.signal.commands.LocalCommand;
+import org.asamk.signal.commands.ProvisioningCommand;
+import org.asamk.signal.commands.RegistrationCommand;
+import org.asamk.signal.dbus.DbusSignalImpl;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.NotRegisteredException;
+import org.asamk.signal.manager.ProvisioningManager;
+import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.manager.ServiceConfig;
+import org.asamk.signal.util.IOUtils;
+import org.asamk.signal.util.SecurityProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.freedesktop.dbus.connections.impl.DBusConnection;

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

-import org.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.whispersystems.libsignal.InvalidKeyException;
-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
-import org.whispersystems.signalservice.api.messages.*;
-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.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;

+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;

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

-import java.io.InputStream;
-import java.io.StringWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;

 import java.security.Security;
 import java.security.Security;

-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.Map;

 
 public class Main {
 
 
 public class Main {
 

-    public static final String SIGNAL_BUSNAME = "org.asamk.Signal";
-    public static final String SIGNAL_OBJECTPATH = "/org/asamk/Signal";
-
-    private static final TimeZone tzUTC = TimeZone.getTimeZone("UTC");
+    final static Logger logger = LoggerFactory.getLogger(Main.class);

 
     public static void main(String[] args) {
 
     public static void main(String[] args) {

-        // Workaround for BKS truststore
-        Security.insertProviderAt(new org.bouncycastle.jce.provider.BouncyCastleProvider(), 1);
+        installSecurityProviderWorkaround();

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

-        int res = handleCommands(ns);
+        int res = init(ns);

         System.exit(res);
     }
 
         System.exit(res);
     }
 

-    private static int handleCommands(Namespace ns) {
-        final String username = ns.getString("username");
-        Manager m;
-        Signal ts;
-        DBusConnection dBusConn = null;
-        try {
-            if (ns.getBoolean("dbus") || ns.getBoolean("dbus_system")) {
-                try {
-                    m = null;
-                    int busType;
-                    if (ns.getBoolean("dbus_system")) {
-                        busType = DBusConnection.SYSTEM;
-                    } else {
-                        busType = DBusConnection.SESSION;
-                    }
-                    dBusConn = DBusConnection.getConnection(busType);
-                    ts = (Signal) dBusConn.getRemoteObject(
-                            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();
-                    }
-                    return 3;
-                }
-            } else {
-                String settingsPath = ns.getString("config");
-                if (TextUtils.isEmpty(settingsPath)) {
-                    settingsPath = System.getProperty("user.home") + "/.config/signal";
-                    if (!new File(settingsPath).exists()) {
-                        String legacySettingsPath = System.getProperty("user.home") + "/.config/textsecure";
-                        if (new File(legacySettingsPath).exists()) {
-                            settingsPath = legacySettingsPath;
-                        }
-                    }
-                }
-
-                m = new Manager(username, settingsPath);
-                ts = m;
-                if (m.userExists()) {
-                    try {
-                        m.init();
-                    } catch (Exception e) {
-                        System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage());
-                        return 2;
-                    }
-                }
-            }
-
-            switch (ns.getString("command")) {
-                case "register":
-                    if (dBusConn != null) {
-                        System.err.println("register is not yet implemented via dbus");
-                        return 1;
-                    }
-                    if (!m.userHasKeys()) {
-                        m.createNewIdentity();
-                    }
-                    try {
-                        m.register(ns.getBoolean("voice"));
-                    } catch (IOException e) {
-                        System.err.println("Request verify error: " + e.getMessage());
-                        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 "verify":
-                    if (dBusConn != null) {
-                        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.");
-                        return 1;
-                    }
-                    if (m.isRegistered()) {
-                        System.err.println("User registration is already verified");
-                        return 1;
-                    }
-                    try {
-                        m.verifyAccount(ns.getString("verificationCode"));
-                    } catch (IOException e) {
-                        System.err.println("Verify error: " + e.getMessage());
-                        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: " + formatTimestamp(d.getCreated()));
-                            System.out.println(" Last seen: " + 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.");
-                        return 1;
-                    }
+    public static void installSecurityProviderWorkaround() {
+        // Register our own security provider
+        Security.insertProviderAt(new SecurityProvider(), 1);
+        Security.addProvider(new BouncyCastleProvider());
+    }

 
 

-                    if (ns.getBoolean("endsession")) {
-                        if (ns.getList("recipient") == null) {
-                            System.err.println("No recipients given");
-                            System.err.println("Aborting sending.");
-                            return 1;
-                        }
-                        try {
-                            ts.sendEndSessionMessage(ns.<String>getList("recipient"));
-                        } catch (IOException e) {
-                            handleIOException(e);
-                            return 3;
-                        } catch (EncapsulatedExceptions e) {
-                            handleEncapsulatedExceptions(e);
-                            return 3;
-                        } catch (AssertionError e) {
-                            handleAssertionError(e);
-                            return 1;
-                        } catch (DBusExecutionException e) {
-                            handleDBusExecutionException(e);
-                            return 1;
-                        }
-                    } else {
-                        String messageText = ns.getString("message");
-                        if (messageText == null) {
-                            try {
-                                messageText = readAll(System.in);
-                            } catch (IOException e) {
-                                System.err.println("Failed to read message from stdin: " + e.getMessage());
-                                System.err.println("Aborting sending.");
-                                return 1;
-                            }
-                        }
+    public static int init(Namespace ns) {
+        Command command = getCommand(ns);
+        if (command == null) {
+            logger.error("Command not implemented!");
+            return 3;
+        }

 
 

-                        try {
-                            List<String> attachments = ns.getList("attachment");
-                            if (attachments == null) {
-                                attachments = new ArrayList<>();
-                            }
-                            if (ns.getString("group") != null) {
-                                byte[] groupId = decodeGroupId(ns.getString("group"));
-                                ts.sendGroupMessage(messageText, attachments, groupId);
-                            } else {
-                                ts.sendMessage(messageText, attachments, ns.<String>getList("recipient"));
-                            }
-                        } catch (IOException e) {
-                            handleIOException(e);
-                            return 3;
-                        } catch (EncapsulatedExceptions e) {
-                            handleEncapsulatedExceptions(e);
-                            return 3;
-                        } catch (AssertionError e) {
-                            handleAssertionError(e);
-                            return 1;
-                        } 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.");
-                            return 1;
-                        } catch (DBusExecutionException e) {
-                            handleDBusExecutionException(e);
-                            return 1;
-                        }
-                    }
+        if (ns.getBoolean("dbus") || ns.getBoolean("dbus_system")) {
+            return initDbusClient(command, ns, ns.getBoolean("dbus_system"));
+        }

 
 

-                    break;
-                case "receive":
-                    if (dBusConn != null) {
-                        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(), 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();
-                                }
-                            });
-                        } 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.");
-                        return 1;
-                    }
-                    double timeout = 5;
-                    if (ns.getDouble("timeout") != null) {
-                        timeout = ns.getDouble("timeout");
-                    }
-                    boolean returnOnTimeout = true;
-                    if (timeout < 0) {
-                        returnOnTimeout = false;
-                        timeout = 3600;
-                    }
-                    boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
-                    try {
-                        m.receiveMessages((long) (timeout * 1000), TimeUnit.MILLISECONDS, returnOnTimeout, ignoreAttachments, new ReceiveMessageHandler(m));
-                    } catch (IOException e) {
-                        System.err.println("Error while receiving messages: " + e.getMessage());
-                        return 3;
-                    } catch (AssertionError e) {
-                        handleAssertionError(e);
-                        return 1;
-                    }
-                    break;
-                case "quitGroup":
-                    if (dBusConn != null) {
-                        System.err.println("quitGroup is not yet implemented via dbus");
-                        return 1;
-                    }
-                    if (!m.isRegistered()) {
-                        System.err.println("User is not registered.");
-                        return 1;
-                    }
+        final String username = ns.getString("username");

 
 

-                    try {
-                        m.sendQuitGroupMessage(decodeGroupId(ns.getString("group")));
-                    } catch (IOException e) {
-                        handleIOException(e);
-                        return 3;
-                    } catch (EncapsulatedExceptions e) {
-                        handleEncapsulatedExceptions(e);
-                        return 3;
-                    } catch (AssertionError e) {
-                        handleAssertionError(e);
-                        return 1;
-                    } catch (GroupNotFoundException e) {
-                        handleGroupNotFoundException(e);
-                        return 1;
-                    } catch (NotAGroupMemberException e) {
-                        handleNotAGroupMemberException(e);
-                        return 1;
-                    }
+        final File dataPath;
+        String config = ns.getString("config");
+        if (config != null) {
+            dataPath = new File(config);
+        } else {
+            dataPath = getDefaultDataPath();
+        }

 
 

-                    break;
-                case "updateGroup":
-                    if (dBusConn != null) {
-                        System.err.println("updateGroup is not yet implemented via dbus");
-                        return 1;
-                    }
-                    if (!m.isRegistered()) {
-                        System.err.println("User is not registered.");
-                        return 1;
-                    }
+        final SignalServiceConfiguration serviceConfiguration = ServiceConfig.createDefaultServiceConfiguration(
+                BaseConfig.USER_AGENT);

 
 

-                    try {
-                        byte[] groupId = null;
-                        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) {
-                            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.");
-                        return 1;
-                    } catch (GroupNotFoundException e) {
-                        handleGroupNotFoundException(e);
-                        return 1;
-                    } catch (NotAGroupMemberException e) {
-                        handleNotAGroupMemberException(e);
-                        return 1;
-                    } catch (EncapsulatedExceptions e) {
-                        handleEncapsulatedExceptions(e);
-                        return 3;
-                    }
+        if (!ServiceConfig.getCapabilities().isGv2()) {
+            logger.warn("WARNING: Support for new group V2 is disabled,"
+                    + " because the required native library dependency is missing: libzkgroup");
+        }

 
 

-                    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.");
-                        return 1;
-                    }
-                    if (!m.isRegistered()) {
-                        System.err.println("User is not registered.");
-                        return 1;
-                    }
-                    DBusConnection conn = null;
-                    try {
-                        try {
-                            int busType;
-                            if (ns.getBoolean("system")) {
-                                busType = DBusConnection.SYSTEM;
-                            } else {
-                                busType = DBusConnection.SESSION;
-                            }
-                            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();
-                            return 2;
-                        }
-                        ignoreAttachments = ns.getBoolean("ignore_attachments");
-                        try {
-                            m.receiveMessages(1, TimeUnit.HOURS, false, ignoreAttachments, new DbusReceiveMessageHandler(m, conn));
-                        } catch (IOException e) {
-                            System.err.println("Error while receiving messages: " + e.getMessage());
-                            return 3;
-                        } catch (AssertionError e) {
-                            handleAssertionError(e);
-                            return 1;
-                        }
-                    } finally {
-                        if (conn != null) {
-                            conn.disconnect();
-                        }
-                    }
+        if (username == null) {
+            ProvisioningManager pm = new ProvisioningManager(dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
+            return handleCommand(command, ns, pm);
+        }

 
 

-                    break;
+        if (command instanceof RegistrationCommand) {
+            final RegistrationManager manager;
+            try {
+                manager = RegistrationManager.init(username, dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
+            } catch (Throwable e) {
+                logger.error("Error loading or creating state file: {}", e.getMessage());
+                return 2;

             }
             }

-            return 0;
-        } finally {
-            if (dBusConn != null) {
-                dBusConn.disconnect();
+            try (RegistrationManager m = manager) {
+                return handleCommand(command, ns, m);
+            } catch (Exception e) {
+                logger.error("Cleanup failed", e);
+                return 3;

             }
         }
             }
         }

-    }

 
 

-    private static void printIdentityFingerprint(Manager m, String theirUsername, JsonIdentityKeyStore.Identity theirId) {
-        String digits = 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 String formatSafetyNumber(String digits) {
-        final int partCount = 12;
-        int partSize = digits.length() / partCount;
-        StringBuilder f = new StringBuilder(digits.length() + partCount);
-        for (int i = 0; i < partCount; i++) {
-            f.append(digits.substring(i * partSize, (i * partSize) + partSize)).append(" ");
+        Manager manager;
+        try {
+            manager = Manager.init(username, dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
+        } catch (NotRegisteredException e) {
+            System.err.println("User is not registered.");
+            return 1;
+        } catch (Throwable e) {
+            logger.error("Error loading state file: {}", e.getMessage());
+            return 2;

         }
         }

-        return f.toString();
-    }
-
-    private static void handleGroupNotFoundException(GroupNotFoundException e) {
-        System.err.println("Failed to send to group: " + e.getMessage());
-        System.err.println("Aborting sending.");
-    }
-
-    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.");
-    }
+        try (Manager m = manager) {
+            try {
+                m.checkAccountState();
+            } catch (IOException e) {
+                logger.error("Error while checking account: {}", e.getMessage());
+                return 2;
+            }

 
 

-    private static byte[] decodeGroupId(String groupId) {
-        try {
-            return Base64.decode(groupId);
+            return handleCommand(command, ns, m);

         } catch (IOException e) {
         } catch (IOException e) {

-            System.err.println("Failed to decode groupId (must be base64) \"" + groupId + "\": " + e.getMessage());
-            System.err.println("Aborting sending.");
-            System.exit(1);
-            return null;
+            logger.error("Cleanup failed", e);
+            return 3;

         }
     }
 
         }
     }
 

-    private static Namespace parseArgs(String[] args) {
-        ArgumentParser parser = ArgumentParsers.newArgumentParser("signal-cli")
-                .defaultHelp(true)
-                .description("Commandline interface for Signal.")
-                .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
-
-        parser.addArgument("-v", "--version")
-                .help("Show package version.")
-                .action(Arguments.version());
-        parser.addArgument("--config")
-                .help("Set the path, where to store the config (Default: $HOME/.config/signal).");
-
-        MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
-        mut.addArgument("-u", "--username")
-                .help("Specify your phone number, that will be used for verification.");
-        mut.addArgument("--dbus")
-                .help("Make request via user dbus.")
-                .action(Arguments.storeTrue());
-        mut.addArgument("--dbus-system")
-                .help("Make request via system dbus.")
-                .action(Arguments.storeTrue());
-
-        Subparsers subparsers = parser.addSubparsers()
-                .title("subcommands")
-                .dest("command")
-                .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 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 parserVerify = subparsers.addParser("verify");
-        parserVerify.addArgument("verificationCode")
-                .help("The verification code you received via sms or voice call.");
-
-        Subparser parserSend = subparsers.addParser("send");
-        parserSend.addArgument("-g", "--group")
-                .help("Specify the recipient group ID.");
-        parserSend.addArgument("recipient")
-                .help("Specify the recipients' phone number.")
-                .nargs("*");
-        parserSend.addArgument("-m", "--message")
-                .help("Specify the message, if missing standard input is used.");
-        parserSend.addArgument("-a", "--attachment")
-                .nargs("*")
-                .help("Add file as attachment");
-        parserSend.addArgument("-e", "--endsession")
-                .help("Clear session state and send end session message.")
-                .action(Arguments.storeTrue());
-
-        Subparser parserLeaveGroup = subparsers.addParser("quitGroup");
-        parserLeaveGroup.addArgument("-g", "--group")
-                .required(true)
-                .help("Specify the recipient group ID.");
-
-        Subparser parserUpdateGroup = subparsers.addParser("updateGroup");
-        parserUpdateGroup.addArgument("-g", "--group")
-                .help("Specify the recipient group ID.");
-        parserUpdateGroup.addArgument("-n", "--name")
-                .help("Specify the new group name.");
-        parserUpdateGroup.addArgument("-a", "--avatar")
-                .help("Specify a new group avatar image file");
-        parserUpdateGroup.addArgument("-m", "--member")
-                .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")
-                .type(double.class)
-                .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());
-
-        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());
-
+    private static int initDbusClient(final Command command, final Namespace ns, final boolean systemBus) {

         try {
         try {

-            Namespace ns = parser.parseArgs(args);
-            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)");
-                    System.exit(2);
-                }
-                if (!PhoneNumberFormatter.isValidNumber(ns.getString("username"))) {
-                    System.err.println("Invalid username (phone number), make sure you include the country code.");
-                    System.exit(2);
-                }
+            DBusConnection.DBusBusType busType;
+            if (systemBus) {
+                busType = DBusConnection.DBusBusType.SYSTEM;
+            } else {
+                busType = DBusConnection.DBusBusType.SESSION;

             }
             }

-            if (ns.getList("recipient") != null && !ns.getList("recipient").isEmpty() && ns.getString("group") != null) {
-                System.err.println("You cannot specify recipients by phone number and groups a the same time");
-                System.exit(2);
+            try (DBusConnection dBusConn = DBusConnection.getConnection(busType)) {
+                Signal ts = dBusConn.getRemoteObject(DbusConfig.SIGNAL_BUSNAME,
+                        DbusConfig.SIGNAL_OBJECTPATH,
+                        Signal.class);
+
+                return handleCommand(command, ns, ts, dBusConn);

             }
             }

-            return ns;
-        } catch (ArgumentParserException e) {
-            parser.handleError(e);
-            return null;
+        } catch (DBusException | IOException e) {
+            logger.error("Dbus client failed", e);
+            return 3;

         }
     }
 
         }
     }
 

-    private static void handleAssertionError(AssertionError e) {
-        System.err.println("Failed to send/receive message (Assertion): " + e.getMessage());
-        e.printStackTrace();
-        System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");
+    private static Command getCommand(Namespace ns) {
+        String commandKey = ns.getString("command");
+        final Map<String, Command> commands = Commands.getCommands();
+        if (!commands.containsKey(commandKey)) {
+            return null;
+        }
+        return commands.get(commandKey);

     }
 
     }
 

-    private static void handleEncapsulatedExceptions(EncapsulatedExceptions e) {
-        System.err.println("Failed to send (some) messages:");
-        for (NetworkFailureException n : e.getNetworkExceptions()) {
-            System.err.println("Network failure for \"" + n.getE164number() + "\": " + n.getMessage());
-        }
-        for (UnregisteredUserException n : e.getUnregisteredUserExceptions()) {
-            System.err.println("Unregistered user \"" + n.getE164Number() + "\": " + n.getMessage());
-        }
-        for (UntrustedIdentityException n : e.getUntrustedIdentityExceptions()) {
-            System.err.println("Untrusted Identity for \"" + n.getE164Number() + "\": " + n.getMessage());
+    private static int handleCommand(Command command, Namespace ns, Signal ts, DBusConnection dBusConn) {
+        if (command instanceof ExtendedDbusCommand) {
+            return ((ExtendedDbusCommand) command).handleCommand(ns, ts, dBusConn);
+        } else if (command instanceof DbusCommand) {
+            return ((DbusCommand) command).handleCommand(ns, ts);
+        } else {
+            System.err.println("Command is not yet implemented via dbus");
+            return 1;

         }
     }
 
         }
     }
 

-    private static void handleIOException(IOException e) {
-        System.err.println("Failed to send message: " + e.getMessage());
+    private static int handleCommand(Command command, Namespace ns, ProvisioningManager pm) {
+        if (command instanceof ProvisioningCommand) {
+            return ((ProvisioningCommand) command).handleCommand(ns, pm);
+        } else {
+            System.err.println("Command only works with a username");
+            return 1;
+        }

     }
 
     }
 

-    private static String readAll(InputStream in) throws IOException {
-        StringWriter output = new StringWriter();
-        byte[] buffer = new byte[4096];
-        long count = 0;
-        int n;
-        while (-1 != (n = System.in.read(buffer))) {
-            output.write(new String(buffer, 0, n, Charset.defaultCharset()));
-            count += n;
+    private static int handleCommand(Command command, Namespace ns, RegistrationManager m) {
+        if (command instanceof RegistrationCommand) {
+            return ((RegistrationCommand) command).handleCommand(ns, m);

         }
         }

-        return output.toString();
+        return 1;

     }
 
     }
 

-    private static class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
-        final Manager m;
+    private static int handleCommand(Command command, Namespace ns, Manager m) {
+        if (command instanceof LocalCommand) {
+            return ((LocalCommand) command).handleCommand(ns, m);
+        } else if (command instanceof DbusCommand) {
+            return ((DbusCommand) command).handleCommand(ns, new DbusSignalImpl(m));
+        } else {
+            System.err.println("Command only works via dbus");
+            return 1;
+        }
+    }

 
 

-        public ReceiveMessageHandler(Manager m) {
-            this.m = m;
+    /**
+     * Uses $XDG_DATA_HOME/signal-cli if it exists, or if none of the legacy directories exist:
+     * - $HOME/.config/signal
+     * - $HOME/.config/textsecure
+     *
+     * @return the data directory to be used by signal-cli.
+     */
+    private static File getDefaultDataPath() {
+        File dataPath = new File(IOUtils.getDataHomeDir(), "signal-cli");
+        if (dataPath.exists()) {
+            return dataPath;

         }
 
         }
 

-        @Override
-        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
-            SignalServiceAddress source = envelope.getSourceAddress();
-            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());
-            }
-            System.out.println("Timestamp: " + formatTimestamp(envelope.getTimestamp()));
+        File configPath = new File(System.getProperty("user.home"), ".config");

 
 

-            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();
-                        handleSignalServiceDataMessage(message);
-                    }
-                    if (content.getSyncMessage().isPresent()) {
-                        System.out.println("Received a sync message");
-                        SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
+        File legacySettingsPath = new File(configPath, "signal");
+        if (legacySettingsPath.exists()) {
+            return legacySettingsPath;
+        }

 
 

-                        if (syncMessage.getContacts().isPresent()) {
-                            System.out.println("Received sync contacts");
-                            printAttachment(syncMessage.getContacts().get());
-                        }
-                        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: " + 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 {
-                                to = "Unknown";
-                            }
-                            System.out.println("To: " + to + " , Message timestamp: " + formatTimestamp(sentTranscriptMessage.getTimestamp()));
-                            if (sentTranscriptMessage.getExpirationStartTimestamp() > 0) {
-                                System.out.println("Expiration started at: " + formatTimestamp(sentTranscriptMessage.getExpirationStartTimestamp()));
-                            }
-                            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);
-                            }
-                        }
-                    }
-                }
-            } else {
-                System.out.println("Unknown message received.");
-            }
-            System.out.println();
+        legacySettingsPath = new File(configPath, "textsecure");
+        if (legacySettingsPath.exists()) {
+            return legacySettingsPath;

         }
 
         }
 

-        private void handleSignalServiceDataMessage(SignalServiceDataMessage message) {
-            System.out.println("Message timestamp: " + formatTimestamp(message.getTimestamp()));
+        return dataPath;
+    }

 
 

-            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");
-            }
+    private static Namespace parseArgs(String[] args) {
+        ArgumentParser parser = buildArgumentParser();

 
 

-            if (message.getAttachments().isPresent()) {
-                System.out.println("Attachments: ");
-                for (SignalServiceAttachment attachment : message.getAttachments().get()) {
-                    printAttachment(attachment);
-                }
-            }
+        Namespace ns;
+        try {
+            ns = parser.parseArgs(args);
+        } catch (ArgumentParserException e) {
+            parser.handleError(e);
+            return null;

         }
 
         }
 

-        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);
-                }
+        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)");
+                System.exit(2);
+            }
+            if (!PhoneNumberFormatter.isValidNumber(ns.getString("username"), null)) {
+                System.err.println("Invalid username (phone number), make sure you include the country code.");
+                System.exit(2);

             }
         }
             }
         }

+        if (ns.getList("recipient") != null && !ns.getList("recipient").isEmpty() && ns.getString("group") != null) {
+            System.err.println("You cannot specify recipients by phone number and groups at the same time");
+            System.exit(2);
+        }
+        return ns;

     }
 
     }
 

-    private static class DbusReceiveMessageHandler extends ReceiveMessageHandler {
-        final DBusConnection conn;
+    private static ArgumentParser buildArgumentParser() {
+        ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
+                .build()
+                .defaultHelp(true)
+                .description("Commandline interface for Signal.")
+                .version(BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);

 
 

-        public DbusReceiveMessageHandler(Manager m, DBusConnection conn) {
-            super(m);
-            this.conn = conn;
-        }
+        parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version());
+        parser.addArgument("--config")
+                .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).");

 
 

-        @Override
-        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
-            super.handleMessage(envelope, content, exception);
+        MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
+        mut.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification.");
+        mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
+        mut.addArgument("--dbus-system").help("Make request via system dbus.").action(Arguments.storeTrue());

 
 

-            if (!envelope.isReceipt() && content != null && content.getDataMessage().isPresent()) {
-                SignalServiceDataMessage message = content.getDataMessage().get();
+        parser.addArgument("-o", "--output").help("Choose to output in plain text or JSON")
+                .choices("plain-text", "json").setDefault("plain-text");

 
 

-                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());
-                            }
-                        }
-                    }
+        Subparsers subparsers = parser.addSubparsers()
+                .title("subcommands")
+                .dest("command")
+                .description("valid subcommands")
+                .help("additional help");

 
 

-                    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();
-                    }
-                }
-            }
+        final Map<String, Command> commands = Commands.getCommands();
+        for (Map.Entry<String, Command> entry : commands.entrySet()) {
+            Subparser subparser = subparsers.addParser(entry.getKey());
+            entry.getValue().attachToSubparser(subparser);

         }
         }

-
-    }
-
-    private static String formatTimestamp(long timestamp) {
-        Date date = new Date(timestamp);
-        final DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); // Quoted "Z" to indicate UTC, no timezone offset
-        df.setTimeZone(tzUTC);
-        return timestamp + " (" + df.format(date) + ")";
+        return parser;

     }
 }
     }
 }