Refactor sticker upload

[signal-cli] / 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 308e564cbd453306b236b0062f63e7018bde8bb1..a795cdd850ea661eacbe508d1dafb4d0e6fc8368 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -3,6 +3,7 @@ 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;
@@ -18,7 +19,13 @@ 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.handleDBusExecutionException;
+import static org.asamk.signal.util.ErrorUtils.handleEncapsulatedExceptions;
+import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
+import static org.asamk.signal.util.ErrorUtils.handleGroupNotFoundException;
+import static org.asamk.signal.util.ErrorUtils.handleIOException;
+import static org.asamk.signal.util.ErrorUtils.handleNotAGroupMemberException;
 
 public class SendCommand implements DbusCommand {
 
@@ -46,7 +53,7 @@ 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,7 +61,7 @@ public class SendCommand implements DbusCommand {
 
         if (ns.getBoolean("endsession")) {
             try {
-                signal.sendEndSessionMessage(ns.<String>getList("recipient"));
+                signal.sendEndSessionMessage(ns.getList("recipient"));
                 return 0;
             } catch (IOException e) {
                 handleIOException(e);
@@ -91,7 +98,7 @@ public class SendCommand implements DbusCommand {
                 byte[] groupId = Util.decodeGroupId(ns.getString("group"));
                 signal.sendGroupMessage(messageText, attachments, groupId);
             } else {
-                signal.sendMessage(messageText, attachments, ns.<String>getList("recipient"));
+                signal.sendMessage(messageText, attachments, ns.getList("recipient"));
             }
             return 0;
         } catch (IOException e) {