Make name optional for updateContact

[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 cf993e6de4b89d7064d790df40210043374200f1..df46f1a7a7dbcb7688312ac0cb6fe6d995dab756 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -16,14 +16,13 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 

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

 public class AddDeviceCommand implements LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 public class AddDeviceCommand implements LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
 
     @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.addArgument("--uri")
                 .required(true)
                 .help("Specify the uri contained in the QR code shown by the new device.");


@@ -37,13 +36,10 @@ public class AddDeviceCommand implements LocalCommand {
             logger.error("Add device link failed", e);
             throw new IOErrorException("Add device link failed");
         } catch (URISyntaxException e) {
             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());
+            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.");
         } catch (InvalidKeyException e) {
             logger.error("Add device link failed", e);
             throw new UnexpectedErrorException("Add device link failed.");

-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            throw e;

         }
     }
 }
         }
     }
 }