Fix JsonRpcLocalCommand interface

[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 e0af992b8771b45547e3ec33f5c2c917fd125ae0..3c018cbc7db206d95ab10b933674d69c326130ca 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,19 +13,21 @@ 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 void attachToSubparser(final Subparser subparser) {
+    public SetPinCommand(final OutputWriter outputWriter) {
+    }
+
+    public static void attachToSubparser(final Subparser subparser) {

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

-        subparser.addArgument("registrationLockPin")
+        subparser.addArgument("pin")

                 .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 {
         try {
                 .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 {
         try {

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

             m.setRegistrationLockPin(Optional.of(registrationLockPin));
         } catch (UnauthenticatedResponseException e) {
             throw new UnexpectedErrorException("Set pin error failed with unauthenticated response: " + e.getMessage());
             m.setRegistrationLockPin(Optional.of(registrationLockPin));
         } catch (UnauthenticatedResponseException e) {
             throw new UnexpectedErrorException("Set pin error failed with unauthenticated response: " + e.getMessage());