fix

[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 c440269697bc47d85a172e58ee349d2dcd88dd08..67ba5b89d8518a111b49a9c2f9435a9dda487f37 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -2,42 +2,47 @@ package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;

+
+import org.asamk.signal.OutputWriter;
+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.manager.Manager;
 import org.asamk.signal.manager.Manager;

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

 import org.whispersystems.libsignal.InvalidKeyException;
 
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.whispersystems.libsignal.InvalidKeyException;
 
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 

-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-

 public class AddDeviceCommand implements LocalCommand {
 
 public class AddDeviceCommand implements LocalCommand {
 

-    @Override
-    public void attachToSubparser(final Subparser subparser) {
+    private final static Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
+
+    public static 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.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 int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {

         try {
             m.addDeviceLink(new URI(ns.getString("uri")));
         try {
             m.addDeviceLink(new URI(ns.getString("uri")));

-            return 0;

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

-            e.printStackTrace();
-            return 3;
-        } catch (InvalidKeyException | URISyntaxException e) {
-            e.printStackTrace();
-            return 2;
-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            return 1;
+            logger.error("Add device link failed", e);
+            throw new IOErrorException("Add device link failed");
+        } 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.");

         }
     }
 }
         }
     }
 }