X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/1e87240db8a7d476d66e296701202413d94061c9..ed79e0b37717a51ff83114a07202c25fcc274206:/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 db900d6d..4d4a458f 100644 --- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java +++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.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; @@ -29,16 +29,17 @@ public class SetPinCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { 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(), - e); } catch (IOException e) { throw new IOErrorException("Set pin error: " + e.getMessage(), e); + } catch (NotPrimaryDeviceException e) { + throw new UserErrorException("This command doesn't work on linked devices."); } } }