Align dbus handling of no account parameter with normal mode

diff --git a/graalvm-config-dir/proxy-config.json b/graalvm-config-dir/proxy-config.json
index 77ae83b1532f36a9aad57715eaaa6be34289c2f2..426606183cfd479c178489c08052731d6f17df65 100644 (file)
--- a/graalvm-config-dir/proxy-config.json
+++ b/graalvm-config-dir/proxy-config.json
@@ -11,6 +11,9 @@
   {
     "interfaces":["org.asamk.Signal$Group"]}
   ,
   {
     "interfaces":["org.asamk.Signal$Group"]}
   ,

+  {
+    "interfaces":["org.asamk.SignalControl"]}
+  ,

   {
     "interfaces":["org.freedesktop.dbus.interfaces.DBus"]}
   
   {
     "interfaces":["org.freedesktop.dbus.interfaces.DBus"]}
   

diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index b2447ab9b503a4cd86f58d41fad5cbf1671ba4c4..0cb05d848c15d9c087533b320e1fc24d121c9f5a 100644 (file)
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -103,6 +103,12 @@
     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP\\E"
     }, 
     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP\\E"
     }, 

+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM\\E"
+    }, 

     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO\\E"
     }, 
     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO\\E"
     }, 

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index e9f4d79f622ad74ffaee1a85400fe47fab9985ef..f807e8fdfb5dfa6ef7622b4bad4e003be733ecec 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -6,6 +6,7 @@ import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.Namespace;
 
 import org.asamk.Signal;
 import net.sourceforge.argparse4j.inf.Namespace;
 
 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.LocalCommand;
 import org.asamk.signal.commands.Command;
 import org.asamk.signal.commands.Commands;
 import org.asamk.signal.commands.LocalCommand;


@@ -30,6 +31,8 @@ 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.output.PlainTextWriterImpl;
 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.DBusExecutionException;
 import org.slf4j.Logger;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.slf4j.Logger;


@@ -326,15 +329,41 @@ public class App {
                 busType = DBusConnection.DBusBusType.SESSION;
             }
             try (var dBusConn = DBusConnection.getConnection(busType)) {
                 busType = DBusConnection.DBusBusType.SESSION;
             }
             try (var dBusConn = DBusConnection.getConnection(busType)) {

-                var ts = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                        DbusConfig.getObjectPath(account),
-                        Signal.class);
+                var accountObjectPath = account == null ? tryGetSingleAccountObjectPath(dBusConn) : null;
+                if (accountObjectPath == null) {
+                    accountObjectPath = DbusConfig.getObjectPath(account);
+                }
+                var ts = dBusConn.getRemoteObject(DbusConfig.getBusname(), accountObjectPath, Signal.class);

 
                 handleCommand(command, ts, dBusConn, outputWriter);
             }
 
                 handleCommand(command, ts, dBusConn, outputWriter);
             }

-        } catch (DBusException | IOException e) {
-            logger.error("Dbus client failed", e);
-            throw new UnexpectedErrorException("Dbus client failed", e);
+        } 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 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;

         }
     }
 
         }
     }