X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/1e87240db8a7d476d66e296701202413d94061c9..04cf54263eaf9a70ec4070f3ea1cbb40aa486994:/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 aea5e3be..8085bc65 100644
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -3,12 +3,12 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.OutputWriter;
 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.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;
@@ -31,10 +31,10 @@ public class RemovePinCommand implements JsonRpcLocalCommand {
     ) throws CommandException {
         try {
             m.setRegistrationLockPin(Optional.empty());
-        } catch (UnauthenticatedResponseException e) {
-            throw new UnexpectedErrorException("Remove pin failed with unauthenticated response: " + e.getMessage(), e);
         } catch (IOException e) {
             throw new IOErrorException("Remove pin error: " + e.getMessage(), e);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
         }
     }
 }