Refactor register and verify

[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 e1afca6948f6bb69b9e95afcf1cd3b37825efcc2..c4da94a2c834f7130aac36c3a5d840c79646c509 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -4,30 +4,42 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;

+import org.whispersystems.signalservice.api.util.InvalidNumberException;
+
+import java.io.IOException;

 
 public class UpdateContactCommand implements LocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
 public class UpdateContactCommand implements LocalCommand {
 
     @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("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");
     }
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
         subparser.help("Update the details of a given contact");
     }
 
     @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");
 
         String number = ns.getString("number");
         String name = ns.getString("name");
 

-        m.setContactName(number, name);
+        try {
+            m.setContactName(number, name);
+
+            Integer expiration = ns.getInt("expiration");
+            if (expiration != null) {
+                m.setExpirationTimer(number, expiration);
+            }
+        } catch (InvalidNumberException e) {
+            System.err.println("Invalid contact number: " + e.getMessage());
+            return 1;
+        } catch (IOException e) {
+            System.err.println("Update contact error: " + e.getMessage());
+            return 3;
+        }

 
         return 0;
     }
 
         return 0;
     }