X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/f60a10eb6e40921c32045c1e38843d6b87f3d274..8a0c6cae157bf92f752fe9b6cb76048dde989348:/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 de4e28ec..56b4b8a4 100644 --- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java +++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.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; @@ -16,18 +21,14 @@ public class SetPinCommand 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 { - String registrationLockPin = ns.getString("registrationLockPin"); + var registrationLockPin = ns.getString("registrationLockPin"); m.setRegistrationLockPin(Optional.of(registrationLockPin)); - return 0; + } catch (UnauthenticatedResponseException e) { + throw new UnexpectedErrorException("Set pin error failed with unauthenticated response: " + e.getMessage()); } catch (IOException e) { - System.err.println("Set pin error: " + e.getMessage()); - return 3; + throw new IOErrorException("Set pin error: " + e.getMessage()); } } }