X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/2c5a70cc47301bf0f049eb2633976460d3ced1b7..28f735741a26c571da59323f0faceee95b055e3b:/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 d7fa3893..687619b0 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -3,52 +3,48 @@ package org.asamk.signal.commands;
 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.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.NotMasterDeviceException;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 
-public class UpdateContactCommand implements LocalCommand {
+public class UpdateContactCommand implements JsonRpcLocalCommand {
 
-    @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("-e", "--expiration")
-                .required(false)
-                .type(int.class)
-                .help("Set expiration time of messages (seconds)");
+    public UpdateContactCommand(final OutputWriter outputWriter) {
+    }
+
+    public static void attachToSubparser(final Subparser subparser) {
         subparser.help("Update the details of a given contact");
+        subparser.addArgument("number").help("Contact number");
+        subparser.addArgument("-n", "--name").help("New contact name");
+        subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)");
     }
 
     @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");
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        var number = ns.getString("number");
 
         try {
-            m.setContactName(number, name);
-
-            Integer expiration = ns.getInt("expiration");
+            var expiration = ns.getInt("expiration");
             if (expiration != null) {
                 m.setExpirationTimer(number, expiration);
             }
+
+            var name = ns.getString("name");
+            if (name != null) {
+                m.setContactName(number, name);
+            }
         } catch (InvalidNumberException e) {
-            System.err.println("Invalid contact number: " + e.getMessage());
-            return 1;
+            throw new UserErrorException("Invalid contact number: " + e.getMessage());
         } catch (IOException e) {
-            System.err.println("Update contact error: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Update contact error: " + e.getMessage());
+        } catch (NotMasterDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
         }
-
-        return 0;
     }
 }