Add an enum for output types

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

diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index ae84893d9c542a7e1552a67ffd152b939084c63d..c4da94a2c834f7130aac36c3a5d840c79646c509 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -3,20 +3,17 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import java.io.IOException;
-
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
+import java.io.IOException;
+
 public class UpdateContactCommand implements LocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("number")
-                .help("Contact number");
-        subparser.addArgument("-n", "--name")
-                .required(true)
-                .help("New contact name");
+        subparser.addArgument("number").help("Contact number");
+        subparser.addArgument("-n", "--name").required(true).help("New contact name");
         subparser.addArgument("-e", "--expiration")
                 .required(false)
                 .type(int.class)
@@ -26,11 +23,6 @@ public class UpdateContactCommand implements LocalCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
-
         String number = ns.getString("number");
         String name = ns.getString("name");
 
@@ -42,7 +34,8 @@ public class UpdateContactCommand implements LocalCommand {
                 m.setExpirationTimer(number, expiration);
             }
         } catch (InvalidNumberException e) {
-            System.out.println("Invalid contact number: " + e.getMessage());
+            System.err.println("Invalid contact number: " + e.getMessage());
+            return 1;
         } catch (IOException e) {
             System.err.println("Update contact error: " + e.getMessage());
             return 3;