X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/b8a0901fbd9071f54d97e8d61fdabdfc0d4f0a7d..90ec01bfbfee85acc1b3a26e741e439895781cd7:/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 ebf3cf07..8085bc65 100644
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -5,14 +5,20 @@ 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.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 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.api.NotPrimaryDeviceException;
+import org.asamk.signal.output.OutputWriter;
 
 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) {
@@ -20,13 +26,15 @@ public class RemovePinCommand implements LocalCommand {
     }
 
     @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) {
-            throw new UnexpectedErrorException("Remove pin failed with unauthenticated response: " + e.getMessage());
+            m.setRegistrationLockPin(Optional.empty());
         } catch (IOException e) {
-            throw new IOErrorException("Remove pin error: " + e.getMessage());
+            throw new IOErrorException("Remove pin error: " + e.getMessage(), e);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
         }
     }
 }