Merge branch 'master' into dbus_sendviewed

[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 56b4b8a4d61ca3a99dd734d931351f1aa405144c..ec4a0e3b13f07a9f875b7ffa1347639928c9b362 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.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.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;


@@ -12,23 +13,32 @@ import org.whispersystems.signalservice.internal.contacts.crypto.Unauthenticated
 
 import java.io.IOException;
 
 
 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 void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         try {
         try {

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

             m.setRegistrationLockPin(Optional.of(registrationLockPin));
         } catch (UnauthenticatedResponseException e) {
             m.setRegistrationLockPin(Optional.of(registrationLockPin));
         } catch (UnauthenticatedResponseException e) {

-            throw new UnexpectedErrorException("Set pin error failed with unauthenticated response: " + e.getMessage());
+            throw new UnexpectedErrorException("Set pin error failed with unauthenticated response: " + e.getMessage(),
+                    e);

         } catch (IOException e) {
         } catch (IOException e) {

-            throw new IOErrorException("Set pin error: " + e.getMessage());
+            throw new IOErrorException("Set pin error: " + e.getMessage(), e);

         }
     }
 }
         }
     }
 }