Fix JsonRpcLocalCommand interface

[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 6192af67b1edb65c98f08a3726020585b80829c3..687619b02c777539d0aff475ea4fb6c565f524dd 100644 (file)
--- 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 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.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;


@@ -12,23 +13,21 @@ import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 
 
 import java.io.IOException;
 

-public class UpdateContactCommand implements LocalCommand {
+public class UpdateContactCommand implements JsonRpcLocalCommand {

 
 

-    @Override
-    public void attachToSubparser(final Subparser subparser) {
+    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.help("Update the details of a given contact");
         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.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 {
         var number = ns.getString("number");
     }
 
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
         var number = ns.getString("number");

-        var name = ns.getString("name");

 
         try {
             var expiration = ns.getInt("expiration");
 
         try {
             var expiration = ns.getInt("expiration");


@@ -36,7 +35,10 @@ public class UpdateContactCommand implements LocalCommand {
                 m.setExpirationTimer(number, expiration);
             }
 
                 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) {
         } catch (InvalidNumberException e) {
             throw new UserErrorException("Invalid contact number: " + e.getMessage());
         } catch (IOException e) {