Extract AccountHelper

[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 ada9c446699ebc6787ef612de11d13cff56d8585..59478c524cf39a27bded2cf8da516effa0f84c36 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -3,26 +3,38 @@ 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.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
+import org.asamk.signal.manager.NotMasterDeviceException;
+import org.asamk.signal.output.OutputWriter;

 
 import java.io.IOException;
 
 import java.io.IOException;

+import java.util.Optional;

 
 

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

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

+        subparser.help("Remove the registration lock pin.");

     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         try {
         try {

-            m.setRegistrationLockPin(Optional.absent());
-            return 0;
-        } catch (IOException | UnauthenticatedResponseException e) {
-            System.err.println("Remove pin error: " + e.getMessage());
-            return 3;
+            m.setRegistrationLockPin(Optional.empty());
+        } catch (IOException e) {
+            throw new IOErrorException("Remove pin error: " + e.getMessage(), e);
+        } catch (NotMasterDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");

         }
     }
 }
         }
     }
 }