Cleanup manager package

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

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 6dc3d799c2a9c52c9a75ffd998fcfeab5f23745f..4e5b1e9fcb9be3d3d7a61f3b4132133a099f12c0 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -3,39 +3,52 @@ package org.asamk.signal;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParser;

-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;

 import net.sourceforge.argparse4j.inf.Namespace;
 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.SignalControl;

 import org.asamk.signal.commands.Command;
 import org.asamk.signal.commands.Commands;
 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.MultiLocalCommand;
 import org.asamk.signal.commands.ProvisioningCommand;
 import org.asamk.signal.commands.RegistrationCommand;
 import org.asamk.signal.commands.LocalCommand;
 import org.asamk.signal.commands.MultiLocalCommand;
 import org.asamk.signal.commands.ProvisioningCommand;
 import org.asamk.signal.commands.RegistrationCommand;

+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.dbus.DbusManagerImpl;
+import org.asamk.signal.dbus.DbusMultiAccountManagerImpl;
+import org.asamk.signal.dbus.DbusProvisioningManagerImpl;
+import org.asamk.signal.dbus.DbusRegistrationManagerImpl;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.NotRegisteredException;
+import org.asamk.signal.manager.MultiAccountManager;

 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;

-import org.asamk.signal.manager.ServiceConfig;
+import org.asamk.signal.manager.api.AccountCheckException;
+import org.asamk.signal.manager.api.NotRegisteredException;
+import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.config.ServiceEnvironment;
+import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
+import org.asamk.signal.output.JsonWriterImpl;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriterImpl;

 import org.asamk.signal.util.IOUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.asamk.signal.util.IOUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;

+import org.freedesktop.dbus.errors.ServiceUnknown;
+import org.freedesktop.dbus.errors.UnknownMethod;

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

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

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
-import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;

 
 

+import java.io.BufferedWriter;

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

-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+
+import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS;

 
 public class App {
 
 
 public class App {
 


@@ -44,7 +57,8 @@ public class App {
     private final Namespace ns;
 
     static ArgumentParser buildArgumentParser() {
     private final Namespace ns;
 
     static ArgumentParser buildArgumentParser() {

-        ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
+        var parser = ArgumentParsers.newFor("signal-cli", VERSION_0_9_0_DEFAULT_SETTINGS)
+                .includeArgumentNamesAsKeysInResult(true)

                 .build()
                 .defaultHelp(true)
                 .description("Commandline interface for Signal.")
                 .build()
                 .defaultHelp(true)
                 .description("Commandline interface for Signal.")


@@ -52,29 +66,44 @@ public class App {
 
         parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version());
         parser.addArgument("--verbose")
 
         parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version());
         parser.addArgument("--verbose")

-                .help("Raise log level and include lib signal logs.")
-                .action(Arguments.storeTrue());
-        parser.addArgument("--config")
+                .help("Raise log level and include lib signal logs. Specify multiple times for even more logs.")
+                .action(Arguments.count());
+        parser.addArgument("--log-file")
+                .type(File.class)
+                .help("Write log output to the given file. If --verbose is also given, the detailed logs will only be written to the log file.");
+        parser.addArgument("-c", "--config")

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

-        parser.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification.");
+        parser.addArgument("-a", "--account", "-u", "--username")
+                .help("Specify your phone number, that will be your identifier.");

 
 

-        MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
-        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());
+        var mut = parser.addMutuallyExclusiveGroup();
+        mut.addArgument("--dbus").dest("global-dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
+        mut.addArgument("--dbus-system")
+                .dest("global-dbus-system")
+                .help("Make request via system dbus.")
+                .action(Arguments.storeTrue());

 
         parser.addArgument("-o", "--output")
                 .help("Choose to output in plain text or JSON")
 
         parser.addArgument("-o", "--output")
                 .help("Choose to output in plain text or JSON")

-                .type(Arguments.enumStringType(OutputType.class))
-                .setDefault(OutputType.PLAIN_TEXT);
+                .type(Arguments.enumStringType(OutputType.class));

 
 

-        Subparsers subparsers = parser.addSubparsers().title("subcommands").dest("command");
+        parser.addArgument("--service-environment")
+                .help("Choose the server environment to use.")
+                .type(Arguments.enumStringType(ServiceEnvironmentCli.class))
+                .setDefault(ServiceEnvironmentCli.LIVE);

 
 

-        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);
-        }
+        parser.addArgument("--trust-new-identities")
+                .help("Choose when to trust new identities.")
+                .type(Arguments.enumStringType(TrustNewIdentityCli.class))
+                .setDefault(TrustNewIdentityCli.ON_FIRST_USE);
+
+        var subparsers = parser.addSubparsers().title("subcommands").dest("command");
+
+        Commands.getCommandSubparserAttachers().forEach((key, value) -> {
+            var subparser = subparsers.addParser(key);
+            value.attachToSubparser(subparser);
+        });

 
         return parser;
     }
 
         return parser;
     }


@@ -83,184 +112,262 @@ public class App {
         this.ns = ns;
     }
 
         this.ns = ns;
     }
 

-    public int init() {
-        String commandKey = ns.getString("command");
-        Command command = Commands.getCommand(commandKey);
+    public void init() throws CommandException {
+        var commandKey = ns.getString("command");
+        var command = Commands.getCommand(commandKey);

         if (command == null) {
         if (command == null) {

-            logger.error("Command not implemented!");
-            return 1;
+            throw new UserErrorException("Command not implemented!");

         }
 
         }
 

-        OutputType outputType = ns.get("output");
-        if (!command.getSupportedOutputTypes().contains(outputType)) {
-            logger.error("Command doesn't support output type {}", outputType.toString());
-            return 1;
+        var outputTypeInput = ns.<OutputType>get("output");
+        var outputType = outputTypeInput == null
+                ? command.getSupportedOutputTypes().stream().findFirst().orElse(null)
+                : outputTypeInput;
+        var writer = new BufferedWriter(new OutputStreamWriter(System.out, Charset.defaultCharset()));
+        var outputWriter = outputType == null
+                ? null
+                : outputType == OutputType.JSON ? new JsonWriterImpl(writer) : new PlainTextWriterImpl(writer);
+
+        if (outputWriter != null && !command.getSupportedOutputTypes().contains(outputType)) {
+            throw new UserErrorException("Command doesn't support output type " + outputType);

         }
 
         }
 

-        String username = ns.getString("username");
+        var account = ns.getString("account");

 
 

-        final boolean useDbus = ns.getBoolean("dbus");
-        final boolean useDbusSystem = ns.getBoolean("dbus_system");
+        final var useDbus = Boolean.TRUE.equals(ns.getBoolean("global-dbus"));
+        final var useDbusSystem = Boolean.TRUE.equals(ns.getBoolean("global-dbus-system"));

         if (useDbus || useDbusSystem) {
         if (useDbus || useDbusSystem) {

-            // If username is null, it will connect to the default object path
-            return initDbusClient(command, username, useDbusSystem);
+            // If account is null, it will connect to the default object path
+            initDbusClient(command, account, useDbusSystem, outputWriter);
+            return;

         }
 
         }
 

-        final File dataPath;
-        String config = ns.getString("config");
+        if (!ServiceConfig.isSignalClientAvailable()) {
+            throw new UserErrorException("Missing required native library dependency: libsignal-client");
+        }
+
+        final File configPath;
+        var config = ns.getString("config");

         if (config != null) {
         if (config != null) {

-            dataPath = new File(config);
+            configPath = new File(config);

         } else {
         } else {

-            dataPath = getDefaultDataPath();
+            configPath = getDefaultConfigPath();

         }
 
         }
 

-        final SignalServiceConfiguration serviceConfiguration = ServiceConfig.createDefaultServiceConfiguration(
-                BaseConfig.USER_AGENT);
+        final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
+        final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
+                ? ServiceEnvironment.LIVE
+                : ServiceEnvironment.STAGING;

 
 

-        if (!ServiceConfig.getCapabilities().isGv2()) {
-            logger.warn("WARNING: Support for new group V2 is disabled,"
-                    + " because the required native library dependency is missing: libzkgroup");
-        }
+        final var trustNewIdentityCli = ns.<TrustNewIdentityCli>get("trust-new-identities");
+        final var trustNewIdentity = trustNewIdentityCli == TrustNewIdentityCli.ON_FIRST_USE
+                ? TrustNewIdentity.ON_FIRST_USE
+                : trustNewIdentityCli == TrustNewIdentityCli.ALWAYS ? TrustNewIdentity.ALWAYS : TrustNewIdentity.NEVER;

 
 

-        if (command instanceof ProvisioningCommand) {
-            if (username != null) {
-                System.err.println("You cannot specify a username (phone number) when linking");
-                return 1;
+        if (command instanceof ProvisioningCommand provisioningCommand) {
+            if (account != null) {
+                throw new UserErrorException("You cannot specify a account (phone number) when linking");

             }
 
             }
 

-            return handleProvisioningCommand((ProvisioningCommand) command, dataPath, serviceConfiguration);
+            handleProvisioningCommand(provisioningCommand, configPath, serviceEnvironment, outputWriter);
+            return;

         }
 
         }
 

-        if (username == null) {
-            List<String> usernames = Manager.getAllLocalUsernames(dataPath);
-            if (usernames.size() == 0) {
-                System.err.println("No local users found, you first need to register or link an account");
-                return 1;
-            }
-
-            if (command instanceof MultiLocalCommand) {
-                return handleMultiLocalCommand((MultiLocalCommand) command, dataPath, serviceConfiguration, usernames);
+        if (account == null) {
+            if (command instanceof MultiLocalCommand multiLocalCommand) {
+                handleMultiLocalCommand(multiLocalCommand,
+                        configPath,
+                        serviceEnvironment,
+                        outputWriter,
+                        trustNewIdentity);
+                return;

             }
 
             }
 

-            if (usernames.size() > 1) {
-                System.err.println("Multiple users found, you need to specify a username (phone number) with -u");
-                return 1;
+            var accounts = MultiAccountManager.getAllLocalAccountNumbers(configPath);
+            if (accounts.size() == 0) {
+                throw new UserErrorException("No local users found, you first need to register or link an account");
+            } else if (accounts.size() > 1) {
+                throw new UserErrorException(
+                        "Multiple users found, you need to specify an account (phone number) with -a");

             }
 
             }
 

-            username = usernames.get(0);
-        } else if (!PhoneNumberFormatter.isValidNumber(username, null)) {
-            System.err.println("Invalid username (phone number), make sure you include the country code.");
-            return 1;
+            account = accounts.get(0);
+        } else if (!Manager.isValidNumber(account, null)) {
+            throw new UserErrorException("Invalid account (phone number), make sure you include the country code.");

         }
 
         }
 

-        if (command instanceof RegistrationCommand) {
-            return handleRegistrationCommand((RegistrationCommand) command, username, dataPath, serviceConfiguration);
+        if (command instanceof RegistrationCommand registrationCommand) {
+            handleRegistrationCommand(registrationCommand, account, configPath, serviceEnvironment);
+            return;

         }
 
         if (!(command instanceof LocalCommand)) {
         }
 
         if (!(command instanceof LocalCommand)) {

-            System.err.println("Command only works via dbus");
-            return 1;
+            throw new UserErrorException("Command only works in multi-account mode");

         }
 
         }
 

-        return handleLocalCommand((LocalCommand) command, username, dataPath, serviceConfiguration);
+        handleLocalCommand((LocalCommand) command,
+                account,
+                configPath,
+                serviceEnvironment,
+                outputWriter,
+                trustNewIdentity);

     }
 
     }
 

-    private int handleProvisioningCommand(
+    private void handleProvisioningCommand(

             final ProvisioningCommand command,
             final ProvisioningCommand command,

-            final File dataPath,
-            final SignalServiceConfiguration serviceConfiguration
-    ) {
-        ProvisioningManager pm = new ProvisioningManager(dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
-        return command.handleCommand(ns, pm);
+            final File configPath,
+            final ServiceEnvironment serviceEnvironment,
+            final OutputWriter outputWriter
+    ) throws CommandException {
+        var pm = ProvisioningManager.init(configPath, serviceEnvironment, BaseConfig.USER_AGENT);
+        command.handleCommand(ns, pm, outputWriter);

     }
 
     }
 

-    private int handleRegistrationCommand(
+    private void handleProvisioningCommand(
+            final ProvisioningCommand c, final DBusConnection dBusConn, final OutputWriter outputWriter
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+                DbusConfig.getObjectPath(),
+                SignalControl.class);
+        final var provisioningManager = new DbusProvisioningManagerImpl(signalControl, dBusConn);
+        try {
+            c.handleCommand(ns, provisioningManager, outputWriter);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Command is not yet implemented via dbus", e);
+        } catch (DBusExecutionException e) {
+            throw new UnexpectedErrorException(e.getMessage(), e);
+        }
+    }
+
+    private void handleRegistrationCommand(

             final RegistrationCommand command,
             final RegistrationCommand command,

-            final String username,
-            final File dataPath,
-            final SignalServiceConfiguration serviceConfiguration
-    ) {
+            final String account,
+            final File configPath,
+            final ServiceEnvironment serviceEnvironment
+    ) throws CommandException {

         final RegistrationManager manager;
         try {
         final RegistrationManager manager;
         try {

-            manager = RegistrationManager.init(username, dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
+            manager = RegistrationManager.init(account, configPath, serviceEnvironment, BaseConfig.USER_AGENT);

         } catch (Throwable e) {
         } catch (Throwable e) {

-            logger.error("Error loading or creating state file: {}", e.getMessage());
-            return 2;
+            throw new UnexpectedErrorException("Error loading or creating state file: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);

         }
         }

-        try (RegistrationManager m = manager) {
-            return command.handleCommand(ns, m);
+        try (manager) {
+            command.handleCommand(ns, manager);

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

-            logger.error("Cleanup failed", e);
-            return 2;
+            logger.warn("Cleanup failed", e);

         }
     }
 
         }
     }
 

-    private int handleLocalCommand(
-            final LocalCommand command,
-            final String username,
-            final File dataPath,
-            final SignalServiceConfiguration serviceConfiguration
-    ) {
-        try (Manager m = loadManager(username, dataPath, serviceConfiguration)) {
-            if (m == null) {
-                return 2;
-            }
+    private void handleRegistrationCommand(
+            final RegistrationCommand c, String account, final DBusConnection dBusConn, final OutputWriter outputWriter
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+                DbusConfig.getObjectPath(),
+                SignalControl.class);
+        try (final var registrationManager = new DbusRegistrationManagerImpl(account, signalControl, dBusConn)) {
+            c.handleCommand(ns, registrationManager);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Command is not yet implemented via dbus", e);
+        } catch (DBusExecutionException e) {
+            throw new UnexpectedErrorException(e.getMessage(), e);
+        }
+    }

 
 

-            return command.handleCommand(ns, m);
+    private void handleLocalCommand(
+            final LocalCommand command,
+            final String account,
+            final File configPath,
+            final ServiceEnvironment serviceEnvironment,
+            final OutputWriter outputWriter,
+            final TrustNewIdentity trustNewIdentity
+    ) throws CommandException {
+        try (var m = loadManager(account, configPath, serviceEnvironment, trustNewIdentity)) {
+            command.handleCommand(ns, m, outputWriter);

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

-            logger.error("Cleanup failed", e);
-            return 2;
+            logger.warn("Cleanup failed", e);
+        }
+    }
+
+    private void handleLocalCommand(
+            final LocalCommand c,
+            String accountObjectPath,
+            final DBusConnection dBusConn,
+            final OutputWriter outputWriter
+    ) throws CommandException, DBusException {
+        var signal = dBusConn.getRemoteObject(DbusConfig.getBusname(), accountObjectPath, Signal.class);
+        try (final var m = new DbusManagerImpl(signal, dBusConn)) {
+            c.handleCommand(ns, m, outputWriter);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Command is not yet implemented via dbus", e);
+        } catch (DBusExecutionException e) {
+            throw new UnexpectedErrorException(e.getMessage(), e);

         }
     }
 
         }
     }
 

-    private int handleMultiLocalCommand(
+    private void handleMultiLocalCommand(

             final MultiLocalCommand command,
             final MultiLocalCommand command,

-            final File dataPath,
-            final SignalServiceConfiguration serviceConfiguration,
-            final List<String> usernames
-    ) {
-        final List<Manager> managers = usernames.stream()
-                .map(u -> loadManager(u, dataPath, serviceConfiguration))
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-
-        int result = command.handleCommand(ns, managers);
-
-        for (Manager m : managers) {
-            try {
-                m.close();
-            } catch (IOException e) {
-                logger.warn("Cleanup failed", e);
-            }
+            final File configPath,
+            final ServiceEnvironment serviceEnvironment,
+            final OutputWriter outputWriter,
+            final TrustNewIdentity trustNewIdentity
+    ) throws CommandException {
+        try (var multiAccountManager = MultiAccountManager.init(configPath,
+                serviceEnvironment,
+                BaseConfig.USER_AGENT,
+                trustNewIdentity)) {
+            command.handleCommand(ns, multiAccountManager, outputWriter);
+        }
+    }
+
+    private void handleMultiLocalCommand(
+            final MultiLocalCommand c, final DBusConnection dBusConn, final OutputWriter outputWriter
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+                DbusConfig.getObjectPath(),
+                SignalControl.class);
+        try (final var multiAccountManager = new DbusMultiAccountManagerImpl(signalControl, dBusConn)) {
+            c.handleCommand(ns, multiAccountManager, outputWriter);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Command is not yet implemented via dbus", e);

         }
         }

-        return result;

     }
 
     private Manager loadManager(
     }
 
     private Manager loadManager(

-            final String username, final File dataPath, final SignalServiceConfiguration serviceConfiguration
-    ) {
-        Manager manager;
+            final String account,
+            final File configPath,
+            final ServiceEnvironment serviceEnvironment,
+            final TrustNewIdentity trustNewIdentity
+    ) throws CommandException {
+        logger.trace("Loading account file for {}", account);

         try {
         try {

-            manager = Manager.init(username, dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
+            return Manager.init(account, configPath, serviceEnvironment, BaseConfig.USER_AGENT, trustNewIdentity);

         } catch (NotRegisteredException e) {
         } catch (NotRegisteredException e) {

-            logger.error("User " + username + " is not registered.");
-            return null;
+            throw new UserErrorException("User " + account + " is not registered.");
+        } catch (AccountCheckException ace) {
+            if (ace.getCause() instanceof IOException e) {
+                throw new IOErrorException("Error while checking account " + account + ": " + e.getMessage(), e);
+            } else {
+                throw new UnexpectedErrorException("Error while checking account " + account + ": " + ace.getMessage(),
+                        ace);
+            }

         } catch (Throwable e) {
         } catch (Throwable e) {

-            logger.error("Error loading state file for user " + username + ": {}", e.getMessage());
-            return null;
+            throw new UnexpectedErrorException("Error loading state file for user "
+                    + account
+                    + ": "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);

         }
         }

-
-        try {
-            manager.checkAccountState();
-        } catch (IOException e) {
-            logger.error("Error while checking account " + username + ": {}", e.getMessage());
-            return null;
-        }
-
-        return manager;

     }
 
     }
 

-    private int initDbusClient(final Command command, final String username, final boolean systemBus) {
+    private void initDbusClient(
+            final Command command, final String account, final boolean systemBus, final OutputWriter outputWriter
+    ) throws CommandException {

         try {
             DBusConnection.DBusBusType busType;
             if (systemBus) {
         try {
             DBusConnection.DBusBusType busType;
             if (systemBus) {


@@ -268,55 +375,68 @@ public class App {
             } else {
                 busType = DBusConnection.DBusBusType.SESSION;
             }
             } else {
                 busType = DBusConnection.DBusBusType.SESSION;
             }

-            try (DBusConnection dBusConn = DBusConnection.getConnection(busType)) {
-                Signal ts = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                        DbusConfig.getObjectPath(username),
-                        Signal.class);
-
-                return handleCommand(command, ts, dBusConn);
+            try (var dBusConn = DBusConnection.getConnection(busType)) {
+                if (command instanceof ProvisioningCommand c) {
+                    if (account != null) {
+                        throw new UserErrorException("You cannot specify a account (phone number) when linking");
+                    }
+
+                    handleProvisioningCommand(c, dBusConn, outputWriter);
+                    return;
+                }
+
+                if (account == null && command instanceof MultiLocalCommand c) {
+                    handleMultiLocalCommand(c, dBusConn, outputWriter);
+                    return;
+                }
+                if (account != null && command instanceof RegistrationCommand c) {
+                    handleRegistrationCommand(c, account, dBusConn, outputWriter);
+                    return;
+                }
+                if (!(command instanceof LocalCommand localCommand)) {
+                    throw new UserErrorException("Command only works in multi-account mode");
+                }
+
+                var accountObjectPath = account == null ? tryGetSingleAccountObjectPath(dBusConn) : null;
+                if (accountObjectPath == null) {
+                    accountObjectPath = DbusConfig.getObjectPath(account);
+                }
+                handleLocalCommand(localCommand, accountObjectPath, dBusConn, outputWriter);

             }
             }

-        } catch (DBusException | IOException e) {
-            logger.error("Dbus client failed", e);
-            return 2;
+        } catch (ServiceUnknown e) {
+            throw new UserErrorException("signal-cli DBus daemon not running on "
+                    + (systemBus ? "system" : "session")
+                    + " bus: "
+                    + e.getMessage(), e);
+        } catch (DBusExecutionException | DBusException | IOException e) {
+            throw new UnexpectedErrorException("Dbus client failed: " + e.getMessage(), e);

         }
     }
 
         }
     }
 

-    private int handleCommand(Command command, 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 String tryGetSingleAccountObjectPath(final DBusConnection dBusConn) throws DBusException, CommandException {
+        var control = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+                DbusConfig.getObjectPath(),
+                SignalControl.class);
+        try {
+            final var accounts = control.listAccounts();
+            if (accounts.size() == 0) {
+                throw new UserErrorException("No local users found, you first need to register or link an account");
+            } else if (accounts.size() > 1) {
+                throw new UserErrorException(
+                        "Multiple users found, you need to specify an account (phone number) with -a");
+            }
+
+            return accounts.get(0).getPath();
+        } catch (UnknownMethod e) {
+            // dbus daemon not running in multi-account mode
+            return null;

         }
     }
 
     /**
         }
     }
 
     /**

-     * 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.
+     * @return the default 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;
-        }
-
-        File configPath = new File(System.getProperty("user.home"), ".config");
-
-        File legacySettingsPath = new File(configPath, "signal");
-        if (legacySettingsPath.exists()) {
-            return legacySettingsPath;
-        }
-
-        legacySettingsPath = new File(configPath, "textsecure");
-        if (legacySettingsPath.exists()) {
-            return legacySettingsPath;
-        }
-
-        return dataPath;
+    private static File getDefaultConfigPath() {
+        return new File(IOUtils.getDataHomeDir(), "signal-cli");

     }
 }
     }
 }