Improve dbus error handling

[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 67ba5b89d8518a111b49a9c2f9435a9dda487f37..e609ec1e074b73935f7c5b168c2e6d2565aeb9ae 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -17,32 +17,37 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 

-public class AddDeviceCommand implements LocalCommand {
+public class AddDeviceCommand implements JsonRpcLocalCommand {

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

-    public static void attachToSubparser(final Subparser subparser) {
+    @Override
+    public String getName() {
+        return "addDevice";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {

         subparser.help("Link another device to this device. Only works, if this is the master device.");
         subparser.addArgument("--uri")
                 .required(true)
                 .help("Specify the uri contained in the QR code shown by the new device.");
     }
 
         subparser.help("Link another device to this device. Only works, if this is the master device.");
         subparser.addArgument("--uri")
                 .required(true)
                 .help("Specify the uri contained in the QR code shown by the new device.");
     }
 

-    public AddDeviceCommand(final OutputWriter outputWriter) {
-    }
-

     @Override
     @Override

-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         try {
             m.addDeviceLink(new URI(ns.getString("uri")));
         } catch (IOException e) {
             logger.error("Add device link failed", e);
         try {
             m.addDeviceLink(new URI(ns.getString("uri")));
         } catch (IOException e) {
             logger.error("Add device link failed", e);

-            throw new IOErrorException("Add device link failed");
+            throw new IOErrorException("Add device link failed", e);

         } catch (URISyntaxException e) {
             throw new UserErrorException("Device link uri has invalid format: " + e.getMessage());
         } catch (InvalidKeyException e) {
             logger.error("Add device link failed", e);
         } catch (URISyntaxException e) {
             throw new UserErrorException("Device link uri has invalid format: " + e.getMessage());
         } catch (InvalidKeyException e) {
             logger.error("Add device link failed", e);

-            throw new UnexpectedErrorException("Add device link failed.");
+            throw new UnexpectedErrorException("Add device link failed.", e);

         }
     }
 }
         }
     }
 }