Add RecipientIdentifier as external Manager 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 c8f4addecf039f84ca593e4b42d89150224a1225..2b7d5b4b5612e683d515cccd680398883f702347 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -3,16 +3,22 @@ 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 org.asamk.signal.util.CommandUtil;
 
 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) {
@@ -23,21 +29,22 @@ public class UpdateContactCommand implements LocalCommand {
     }
 
     @Override
-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
-        var number = ns.getString("number");
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        var recipientString = ns.getString("number");
+        var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getUsername());
 
         try {
             var expiration = ns.getInt("expiration");
             if (expiration != null) {
-                m.setExpirationTimer(number, expiration);
+                m.setExpirationTimer(recipient, expiration);
             }
 
             var name = ns.getString("name");
             if (name != null) {
-                m.setContactName(number, name);
+                m.setContactName(recipient, name);
             }
-        } catch (InvalidNumberException e) {
-            throw new UserErrorException("Invalid contact number: " + e.getMessage());
         } catch (IOException e) {
             throw new IOErrorException("Update contact error: " + e.getMessage());
         } catch (NotMasterDeviceException e) {