Implement multi account commands for dbus client

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

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index cfd17610d33c6d88ffd2c40b3d6ed695f9b7bcff..aa3574449f3f1a281ccaadd1a963b7348c4bc153 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -15,6 +15,7 @@ import org.freedesktop.dbus.DBusPath;
 
 import java.io.IOException;
 import java.net.URI;
 
 import java.io.IOException;
 import java.net.URI;

+import java.net.URISyntaxException;

 import java.nio.channels.OverlappingFileLockException;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 import java.nio.channels.OverlappingFileLockException;
 import java.util.List;
 import java.util.concurrent.TimeoutException;


@@ -88,9 +89,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
     @Override
     public String link(final String newDeviceName) throws Error.Failure {
         try {
     @Override
     public String link(final String newDeviceName) throws Error.Failure {
         try {

-            final ProvisioningManager provisioningManager = c.getNewProvisioningManager();
-            final URI deviceLinkUri = provisioningManager.getDeviceLinkUri();
+            final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();

             new Thread(() -> {
             new Thread(() -> {

+                final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);

                 try {
                     provisioningManager.finishDeviceLink(newDeviceName);
                 } catch (IOException | TimeoutException | UserAlreadyExists e) {
                 try {
                     provisioningManager.finishDeviceLink(newDeviceName);
                 } catch (IOException | TimeoutException | UserAlreadyExists e) {


@@ -103,6 +104,26 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
         }
     }
 
         }
     }
 

+    @Override
+    public String startLink() throws Error.Failure {
+        try {
+            final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
+            return deviceLinkUri.toString();
+        } catch (TimeoutException | IOException e) {
+            throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
+        }
+    }
+
+    @Override
+    public String finishLink(String deviceLinkUri, final String newDeviceName) throws Error.Failure {
+        try {
+            final var provisioningManager = c.getProvisioningManagerFor(new URI(deviceLinkUri));
+            return provisioningManager.finishDeviceLink(newDeviceName);
+        } catch (TimeoutException | IOException | UserAlreadyExists | URISyntaxException e) {
+            throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
+        }
+    }
+

     @Override
     public String version() {
         return BaseConfig.PROJECT_VERSION;
     @Override
     public String version() {
         return BaseConfig.PROJECT_VERSION;


@@ -112,4 +133,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
     public List<DBusPath> listAccounts() {
         return c.getAccountNumbers().stream().map(u -> new DBusPath(DbusConfig.getObjectPath(u))).toList();
     }
     public List<DBusPath> listAccounts() {
         return c.getAccountNumbers().stream().map(u -> new DBusPath(DbusConfig.getObjectPath(u))).toList();
     }

+
+    @Override
+    public DBusPath getAccount(final String number) {
+        return new DBusPath(DbusConfig.getObjectPath(number));
+    }

 }
 }