X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/591c0fe8a3744608575a6dcb1f6f4f9f818948d2..221d937eecca5c9b09a3bee7df812203b9927a56:/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java index da090209..c8ad613b 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java @@ -3,6 +3,9 @@ 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.UserErrorException; import org.asamk.signal.manager.Manager; import org.whispersystems.signalservice.api.util.InvalidNumberException; @@ -22,30 +25,21 @@ public class UpdateContactCommand implements LocalCommand { } @Override - public int handleCommand(final Namespace ns, final Manager m) { - if (!m.isRegistered()) { - System.err.println("User is not registered."); - return 1; - } - - String number = ns.getString("number"); - String name = ns.getString("name"); + public void handleCommand(final Namespace ns, final Manager m) throws CommandException { + var number = ns.getString("number"); + var name = ns.getString("name"); try { m.setContactName(number, name); - Integer expiration = ns.getInt("expiration"); + var expiration = ns.getInt("expiration"); if (expiration != null) { m.setExpirationTimer(number, expiration); } } catch (InvalidNumberException e) { - System.err.println("Invalid contact number: " + e.getMessage()); - return 1; + throw new UserErrorException("Invalid contact number: " + e.getMessage()); } catch (IOException e) { - System.err.println("Update contact error: " + e.getMessage()); - return 3; + throw new IOErrorException("Update contact error: " + e.getMessage()); } - - return 0; } }