X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/593cd7d8ca6e8e0ab654accfd7e3c9d2ee01b001..62dd2ee49ebcc182fb3892648c3f3f3840d38652:/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 1cd2e674..e22d307b 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -58,7 +58,7 @@ public class SendCommand implements JsonRpcLocalCommand { public void handleCommand( final Namespace ns, final Manager m, final OutputWriter outputWriter ) throws CommandException { - final var isNoteToSelf = ns.getBoolean("note-to-self"); + final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self")); final var recipientStrings = ns.getList("recipient"); final var groupIdStrings = ns.getList("group-id"); @@ -67,7 +67,7 @@ public class SendCommand implements JsonRpcLocalCommand { recipientStrings, groupIdStrings); - final var isEndSession = ns.getBoolean("end-session"); + final var isEndSession = Boolean.TRUE.equals(ns.getBoolean("end-session")); if (isEndSession) { final var singleRecipients = recipientIdentifiers.stream() .filter(r -> r instanceof RecipientIdentifier.Single) @@ -102,8 +102,8 @@ public class SendCommand implements JsonRpcLocalCommand { try { var results = m.sendMessage(new Message(messageText, attachments), recipientIdentifiers); - outputResult(outputWriter, results.getTimestamp()); - ErrorUtils.handleSendMessageResults(results.getResults()); + outputResult(outputWriter, results.timestamp()); + ErrorUtils.handleSendMessageResults(results.results()); } catch (AttachmentInvalidException | IOException e) { throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass() .getSimpleName() + ")", e); @@ -113,8 +113,7 @@ public class SendCommand implements JsonRpcLocalCommand { } private void outputResult(final OutputWriter outputWriter, final long timestamp) { - if (outputWriter instanceof PlainTextWriter) { - final var writer = (PlainTextWriter) outputWriter; + if (outputWriter instanceof PlainTextWriter writer) { writer.println("{}", timestamp); } else { final var writer = (JsonWriter) outputWriter;