X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/36475bb632316d0333f1c44f6639c4f63007bdce..af292d8f0ea897ea13470489d51c40acca50fc3e:/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 ade7cbd3..462ba8d2 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -3,6 +3,7 @@ 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;
@@ -12,23 +13,26 @@ import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 
-public class UpdateContactCommand implements LocalCommand {
+public class UpdateContactCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "updateContact";
+    }
 
     @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)");
         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 void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
         var number = ns.getString("number");
-        var name = ns.getString("name");
 
         try {
             var expiration = ns.getInt("expiration");
@@ -36,7 +40,10 @@ public class UpdateContactCommand implements LocalCommand {
                 m.setExpirationTimer(number, expiration);
             }
 
-            m.setContactName(number, name);
+            var name = ns.getString("name");
+            if (name != null) {
+                m.setContactName(number, name);
+            }
         } catch (InvalidNumberException e) {
             throw new UserErrorException("Invalid contact number: " + e.getMessage());
         } catch (IOException e) {