From 57c35cb8cc5b0967b43eebb1a9ec5e73a2514548 Mon Sep 17 00:00:00 2001 From: Herohtar Date: Fri, 14 Dec 2018 10:22:36 -0600 Subject: [PATCH] Display error if trying to send `endsession` to a group --- .../java/org/asamk/signal/commands/SendCommand.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java index 84aeb1ff..1675a5c9 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -46,6 +46,12 @@ public class SendCommand implements DbusCommand { return 1; } + 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; + } + if (ns.getBoolean("endsession") && ns.getList("recipient") != null && ns.getList("recipient").size() > 0) { try { signal.sendEndSessionMessage(ns.getList("recipient")); @@ -65,12 +71,6 @@ public class SendCommand implements DbusCommand { } } - if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && ns.getString("group") == null) { - System.err.println("No recipients given"); - System.err.println("Aborting sending."); - return 1; - } - String messageText = ns.getString("message"); if (messageText == null) { try {