X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/af292d8f0ea897ea13470489d51c40acca50fc3e..fd92a96e1a1d8b5464772667579ee3387a46453b:/src/main/java/org/asamk/signal/commands/SetPinCommand.java diff --git a/src/main/java/org/asamk/signal/commands/SetPinCommand.java b/src/main/java/org/asamk/signal/commands/SetPinCommand.java index 3636a8b1..f6b5f7ad 100644 --- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java +++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.java @@ -3,15 +3,15 @@ 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.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 SetPinCommand implements JsonRpcLocalCommand { @@ -34,10 +34,10 @@ public class SetPinCommand implements JsonRpcLocalCommand { try { var registrationLockPin = ns.getString("pin"); m.setRegistrationLockPin(Optional.of(registrationLockPin)); - } catch (UnauthenticatedResponseException e) { - throw new UnexpectedErrorException("Set pin error failed with unauthenticated response: " + e.getMessage()); } catch (IOException e) { - throw new IOErrorException("Set pin error: " + e.getMessage()); + throw new IOErrorException("Set pin error: " + e.getMessage(), e); + } catch (NotPrimaryDeviceException e) { + throw new UserErrorException("This command doesn't work on linked devices."); } } }