Merge branch 'master' into dbus_sendviewed

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

diff --git a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
index b729a9b99b9867e8165c275c3356d69dbc7484b0..d1ad276ab516d5861eaec633b0ba93a3ea186a5a 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -13,23 +13,28 @@ import org.whispersystems.signalservice.internal.contacts.crypto.Unauthenticated
 
 import java.io.IOException;
 
 
 import java.io.IOException;
 

-public class RemovePinCommand implements LocalCommand {
+public class RemovePinCommand implements JsonRpcLocalCommand {

 
 

-    public RemovePinCommand(final OutputWriter outputWriter) {
+    @Override
+    public String getName() {
+        return "removePin";

     }
 
     }
 

-    public static void attachToSubparser(final Subparser subparser) {
+    @Override
+    public void attachToSubparser(final Subparser subparser) {

         subparser.help("Remove the registration lock pin.");
     }
 
     @Override
         subparser.help("Remove the registration lock pin.");
     }
 
     @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 {
             m.setRegistrationLockPin(Optional.absent());
         } catch (UnauthenticatedResponseException e) {
         try {
             m.setRegistrationLockPin(Optional.absent());
         } catch (UnauthenticatedResponseException e) {

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

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

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

         }
     }
 }
         }
     }
 }