X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/4f1ee8347564d4c26a36df6b959ea69f6406abe1..48b2c7ff8ad7b653c3a0cb42775a5850f593d0a0:/src/main/java/org/asamk/signal/commands/SendContactsCommand.java diff --git a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java index 20e81a60..6abf9c6f 100644 --- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java @@ -3,6 +3,10 @@ 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.UntrustedKeyErrorException; import org.asamk.signal.manager.Manager; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; @@ -10,23 +14,21 @@ import java.io.IOException; public class SendContactsCommand implements LocalCommand { - @Override - public void attachToSubparser(final Subparser subparser) { + public SendContactsCommand(final OutputWriter outputWriter) { + } + + public static void attachToSubparser(final Subparser subparser) { subparser.help("Send a synchronization message with the local contacts list to all linked devices."); } @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 { m.sendContacts(); - return 0; - } catch (IOException | UntrustedIdentityException e) { - System.err.println("SendContacts error: " + e.getMessage()); - return 3; + } catch (UntrustedIdentityException e) { + throw new UntrustedKeyErrorException("SendContacts error: " + e.getMessage()); + } catch (IOException e) { + throw new IOErrorException("SendContacts error: " + e.getMessage()); } } }