X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/faae998a7ee218b6134d0f773471e698d82bbf02..d8d859ab0200318faf37ba184ea55871f8d9d2da:/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 523292ab..a5128937 100644 --- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java @@ -2,12 +2,20 @@ 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.manager.Manager; -import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; +import org.asamk.signal.output.OutputWriter; import java.io.IOException; -public class SendContactsCommand implements LocalCommand { +public class SendContactsCommand implements JsonRpcLocalCommand { + + @Override + public String getName() { + return "sendContacts"; + } @Override public void attachToSubparser(final Subparser subparser) { @@ -15,17 +23,13 @@ public class SendContactsCommand 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, final OutputWriter outputWriter + ) throws CommandException { try { m.sendContacts(); - return 0; - } catch (IOException | UntrustedIdentityException e) { - System.err.println("SendContacts error: " + e.getMessage()); - return 3; + } catch (IOException e) { + throw new IOErrorException("SendContacts error: " + e.getMessage(), e); } } }