Add UnregisteredRecipientException

[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..d951ece984327f4dbaaf51f74ce0e9ba65d2f759 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -8,40 +8,50 @@ 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.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.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.util.CommandUtil;

 
 import java.io.IOException;
 
 
 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.help("Update the details of a given contact");
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Update the details of a given contact");

-        subparser.addArgument("number").help("Contact number");
+        subparser.addArgument("recipient").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
         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");
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        var recipientString = ns.getString("recipient");
+        var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());

 
         try {
             var expiration = ns.getInt("expiration");
             if (expiration != null) {
 
         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) {
             }
 
             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) {
         } catch (IOException e) {

-            throw new IOErrorException("Update contact error: " + e.getMessage());
+            throw new IOErrorException("Update contact error: " + e.getMessage(), e);

         } catch (NotMasterDeviceException e) {
             throw new UserErrorException("This command doesn't work on linked devices.");
         } catch (NotMasterDeviceException e) {
             throw new UserErrorException("This command doesn't work on linked devices.");

+        } catch (UnregisteredRecipientException e) {
+            throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");

         }
     }
 }
         }
     }
 }