X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/f60a10eb6e40921c32045c1e38843d6b87f3d274..06404667a1539a9107099a52aabf21edbfb0a066:/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 491c26bd..52b111ea 100644
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -2,8 +2,10 @@ package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
+
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 
 import java.io.IOException;
 
@@ -15,13 +17,12 @@ public class RemovePinCommand implements LocalCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
         try {
-            m.setRegistrationLockPin(Optional.<String>absent());
+            m.setRegistrationLockPin(Optional.absent());
             return 0;
+        } catch (UnauthenticatedResponseException e) {
+            System.err.println("Remove pin error: " + e.getMessage());
+            return 2;
         } catch (IOException e) {
             System.err.println("Remove pin error: " + e.getMessage());
             return 3;