webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-01 20:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed potential error if user tries to send endsession to a group

Browse source
This commit is contained in:
Herohtar 2018-12-14 09:14:05 -06:00
parent 25a137987b
commit 47b3c86f0e
No known key found for this signature in database
GPG key ID: 5C362C8125768A2B
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/asamk/signal/commands/SendCommand.java
View file

@ -46,13 +46,7 @@ public class SendCommand implements DbusCommand {
return 1; return 1;
} }
if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && ns.getString("group") == null) { if (ns.getBoolean("endsession") && ns.getList("recipient") != null && ns.getList("recipient").size() > 0) {
System.err.println("No recipients given");
System.err.println("Aborting sending.");
return 1;
}
if (ns.getBoolean("endsession")) {
try { try {
signal.sendEndSessionMessage(ns.<String>getList("recipient")); signal.sendEndSessionMessage(ns.<String>getList("recipient"));
return 0; return 0;
@ -71,6 +65,12 @@ 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"); String messageText = ns.getString("message");
if (messageText == null) { if (messageText == null) {
try { try {