Refactor dbus client mode to improve maintainability

[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 6958b16ad2cd91c6e31223816ad77c0c43423256..ec4a0e3b13f07a9f875b7ffa1347639928c9b362 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
@@ -13,26 +13,32 @@ import org.whispersystems.signalservice.internal.contacts.crypto.Unauthenticated
 
 import java.io.IOException;
 
-public class SetPinCommand implements LocalCommand {
+public class SetPinCommand implements JsonRpcLocalCommand {
 
-    public SetPinCommand(final OutputWriter outputWriter) {
+    @Override
+    public String getName() {
+        return "setPin";
     }
 
-    public static void attachToSubparser(final Subparser subparser) {
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
         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 {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) 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());
+            throw new UnexpectedErrorException("Set pin error failed with unauthenticated response: " + e.getMessage(),
+                    e);
         } catch (IOException e) {
-            throw new IOErrorException("Set pin error: " + e.getMessage());
+            throw new IOErrorException("Set pin error: " + e.getMessage(), e);
         }
     }
 }