Refactor identity key store

[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 491c26bd55bece78a90a9669302ea5d8e3f19434..03d8d7cba9fd689d89c42ad8cc6e016ed6484a29 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -2,8 +2,13 @@ package org.asamk.signal.commands;
 
 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.UnexpectedErrorException;
 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;
 
@@ -14,17 +19,13 @@ 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;
-        }
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
         try {
-            m.setRegistrationLockPin(Optional.<String>absent());
-            return 0;
+            m.setRegistrationLockPin(Optional.absent());
+        } catch (UnauthenticatedResponseException e) {
+            throw new UnexpectedErrorException("Remove pin failed with unauthenticated response: " + e.getMessage());
         } catch (IOException e) {
-            System.err.println("Remove pin error: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Remove pin error: " + e.getMessage());
         }
     }
 }