Implement dbus support for listIdentities

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

diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index eb218c7003d6881a8af9b837c3ce82f40f006eb8..2813f4af59f5a74f72b84966a355183df0fe14a0 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -7,7 +7,9 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.api.DeviceLinkUrl;

 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;

+import org.asamk.signal.manager.api.NotPrimaryDeviceException;

 import org.asamk.signal.output.OutputWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.asamk.signal.output.OutputWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;


@@ -18,7 +20,7 @@ import java.net.URISyntaxException;
 
 public class AddDeviceCommand implements JsonRpcLocalCommand {
 
 
 public class AddDeviceCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {


@@ -45,13 +47,16 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
         }
 
         try {
         }
 
         try {

-            m.addDeviceLink(linkUri);
+            var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(linkUri);
+            m.addDeviceLink(deviceLinkUrl);

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

-            logger.error("Add device link failed", e);
+            logger.error("Add device link failed: {}", e.getMessage());

             throw new IOErrorException("Add device link failed", e);
         } catch (InvalidDeviceLinkException e) {
             throw new IOErrorException("Add device link failed", e);
         } catch (InvalidDeviceLinkException e) {

-            logger.error("Add device link failed", e);
-            throw new UserErrorException("Add device link failed.", e);
+            logger.error("Invalid device link");
+            throw new UserErrorException("Invalid device link", e);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");

         }
     }
 }
         }
     }
 }