X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/f60a10eb6e40921c32045c1e38843d6b87f3d274..9942d967a4a83230aadd21c86344c6f1ac246611:/src/main/java/org/asamk/signal/commands/SendCommand.java diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java index 308e564c..04b06434 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -3,37 +3,29 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; + import org.asamk.Signal; -import org.asamk.signal.AttachmentInvalidException; -import org.asamk.signal.GroupIdFormatException; -import org.asamk.signal.GroupNotFoundException; -import org.asamk.signal.NotAGroupMemberException; +import org.asamk.signal.manager.GroupIdFormatException; import org.asamk.signal.util.IOUtils; import org.asamk.signal.util.Util; import org.freedesktop.dbus.exceptions.DBusExecutionException; -import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions; import java.io.IOException; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; -import static org.asamk.signal.util.ErrorUtils.*; +import static org.asamk.signal.util.ErrorUtils.handleAssertionError; +import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException; public class SendCommand implements DbusCommand { @Override public void attachToSubparser(final Subparser subparser) { - subparser.addArgument("-g", "--group") - .help("Specify the recipient group ID."); - subparser.addArgument("recipient") - .help("Specify the recipients' phone number.") - .nargs("*"); - subparser.addArgument("-m", "--message") - .help("Specify the message, if missing standard input is used."); - subparser.addArgument("-a", "--attachment") - .nargs("*") - .help("Add file as attachment"); + subparser.addArgument("-g", "--group").help("Specify the recipient group ID."); + subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*"); + subparser.addArgument("-m", "--message").help("Specify the message, if missing standard input is used."); + subparser.addArgument("-a", "--attachment").nargs("*").help("Add file as attachment"); subparser.addArgument("-e", "--endsession") .help("Clear session state and send end session message.") .action(Arguments.storeTrue()); @@ -46,7 +38,9 @@ public class SendCommand implements DbusCommand { return 1; } - if (ns.getList("recipient") == null || ns.getList("recipient").size() == 0) { + if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && ( + ns.getBoolean("endsession") || ns.getString("group") == null + )) { System.err.println("No recipients given"); System.err.println("Aborting sending."); return 1; @@ -54,19 +48,13 @@ public class SendCommand implements DbusCommand { if (ns.getBoolean("endsession")) { try { - signal.sendEndSessionMessage(ns.getList("recipient")); + signal.sendEndSessionMessage(ns.getList("recipient")); return 0; - } catch (IOException e) { - handleIOException(e); - return 3; - } catch (EncapsulatedExceptions e) { - handleEncapsulatedExceptions(e); - return 3; } catch (AssertionError e) { handleAssertionError(e); return 1; } catch (DBusExecutionException e) { - handleDBusExecutionException(e); + System.err.println("Failed to send message: " + e.getMessage()); return 1; } } @@ -82,42 +70,42 @@ public class SendCommand implements DbusCommand { } } + List attachments = ns.getList("attachment"); + if (attachments == null) { + attachments = new ArrayList<>(); + } + try { - List attachments = ns.getList("attachment"); - if (attachments == null) { - attachments = new ArrayList<>(); - } if (ns.getString("group") != null) { - byte[] groupId = Util.decodeGroupId(ns.getString("group")); - signal.sendGroupMessage(messageText, attachments, groupId); - } else { - signal.sendMessage(messageText, attachments, ns.getList("recipient")); + byte[] groupId; + try { + groupId = Util.decodeGroupId(ns.getString("group")).serialize(); + } catch (GroupIdFormatException e) { + handleGroupIdFormatException(e); + return 1; + } + + long timestamp = signal.sendGroupMessage(messageText, attachments, groupId); + System.out.println(timestamp); + return 0; } - return 0; - } catch (IOException e) { - handleIOException(e); - return 3; - } catch (EncapsulatedExceptions e) { - handleEncapsulatedExceptions(e); - return 3; } catch (AssertionError e) { handleAssertionError(e); return 1; - } catch (GroupNotFoundException e) { - handleGroupNotFoundException(e); - return 1; - } catch (NotAGroupMemberException e) { - handleNotAGroupMemberException(e); + } catch (DBusExecutionException e) { + System.err.println("Failed to send message: " + e.getMessage()); return 1; - } catch (AttachmentInvalidException e) { - System.err.println("Failed to add attachment: " + e.getMessage()); - System.err.println("Aborting sending."); + } + + try { + long timestamp = signal.sendMessage(messageText, attachments, ns.getList("recipient")); + System.out.println(timestamp); + return 0; + } catch (AssertionError e) { + handleAssertionError(e); return 1; } catch (DBusExecutionException e) { - handleDBusExecutionException(e); - return 1; - } catch (GroupIdFormatException e) { - handleGroupIdFormatException(e); + System.err.println("Failed to send message: " + e.getMessage()); return 1; } }