Extend json output with number and uuid fields

[signal-cli] / src / main / java / org / asamk / signal / commands / SetPinCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/SetPinCommand.java b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
index c68ea3a989817279b29be217dabd5b88d8d436b7..3636a8b1e97ec64f6afdc1240183d3d0ded876b9 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
@@ -3,33 +3,41 @@ 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.UnexpectedErrorException;

 import org.asamk.signal.manager.Manager;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 
 import java.io.IOException;
 
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 
 import java.io.IOException;
 

-public class SetPinCommand implements LocalCommand {
+public class SetPinCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "setPin";
+    }

 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.addArgument("registrationLockPin")
+        subparser.help("Set a registration lock pin, to prevent others from registering this number.");
+        subparser.addArgument("pin")

                 .help("The registration lock PIN, that will be required for new registrations (resets after 7 days of inactivity)");
     }
 
     @Override
                 .help("The registration lock PIN, that will be required for new registrations (resets after 7 days of inactivity)");
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         try {
         try {

-            String registrationLockPin = ns.getString("registrationLockPin");
+            var registrationLockPin = ns.getString("pin");

             m.setRegistrationLockPin(Optional.of(registrationLockPin));
             m.setRegistrationLockPin(Optional.of(registrationLockPin));

-            return 0;
-        } catch (IOException | UnauthenticatedResponseException e) {
-            System.err.println("Set pin error: " + e.getMessage());
-            return 3;
+        } catch (UnauthenticatedResponseException e) {
+            throw new UnexpectedErrorException("Set pin error failed with unauthenticated response: " + e.getMessage());
+        } catch (IOException e) {
+            throw new IOErrorException("Set pin error: " + e.getMessage());

         }
     }
 }
         }
     }
 }