X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/96bd68e034516dc94113a4b635a56f0fb5aa81e6..2517919c49ccf3ed3c4bfa90782a4afa54fbf547:/src/main/java/cli/Main.java diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java index 9e142ff1..cac746d2 100644 --- a/src/main/java/cli/Main.java +++ b/src/main/java/cli/Main.java @@ -101,6 +101,7 @@ public class Main { messageText = IOUtils.toString(System.in); } catch (IOException e) { System.err.println("Failed to read message from stdin: " + e.getMessage()); + System.err.println("Aborting sending."); System.exit(1); } } @@ -123,9 +124,29 @@ public class Main { } } } + TextSecureGroup group = null; + List recipientStrings = null; + if (ns.getString("group") != null) { + try { + GroupInfo g = m.getGroupInfo(Base64.decode(ns.getString("group"))); + if (g == null) { + System.err.println("Failed to send to grup \"" + ns.getString("group") + "\": Unknown group"); + System.err.println("Aborting sending."); + System.exit(1); + } + group = new TextSecureGroup(g.groupId); + recipientStrings = g.members; + } catch (IOException e) { + System.err.println("Failed to send to grup \"" + ns.getString("group") + "\": " + e.getMessage()); + System.err.println("Aborting sending."); + System.exit(1); + } + } else { + recipientStrings = ns.getList("recipient"); + } List recipients = new ArrayList<>(ns.getList("recipient").size()); - for (String recipient : ns.getList("recipient")) { + for (String recipient : recipientStrings) { try { recipients.add(m.getPushAddress(recipient)); } catch (InvalidNumberException e) { @@ -134,18 +155,22 @@ public class Main { System.exit(1); } } - sendMessage(m, messageText, textSecureAttachments, recipients); + + sendMessage(m, messageText, textSecureAttachments, recipients, group); break; case "receive": if (!m.isRegistered()) { System.err.println("User is not registered."); System.exit(1); } - int timeout = ns.getInt("timeout"); + int timeout = 5; + if (ns.getInt("timeout") != null) { + timeout = ns.getInt("timeout"); + } boolean returnOnTimeout = true; if (timeout < 0) { returnOnTimeout = false; - timeout = 5; + timeout = 3600; } try { m.receiveMessages(timeout, returnOnTimeout, new ReceiveMessageHandler(m)); @@ -192,6 +217,8 @@ public class Main { .help("The verification code you received via sms or voice call."); Subparser parserSend = subparsers.addParser("send"); + parserSend.addArgument("-g", "--group") + .help("Specify the recipient group ID."); parserSend.addArgument("recipient") .help("Specify the recipients' phone number.") .nargs("*"); @@ -213,6 +240,10 @@ public class Main { System.err.println("You need to specify a username (phone number)"); System.exit(2); } + if (ns.getList("recipient") != null && !ns.getList("recipient").isEmpty() && ns.getString("group") != null) { + System.err.println("You cannot specify recipients by phone number and groups a the same time"); + System.exit(2); + } return ns; } catch (ArgumentParserException e) { parser.handleError(e); @@ -221,11 +252,14 @@ public class Main { } private static void sendMessage(Manager m, String messageText, List textSecureAttachments, - List recipients) { + List recipients, TextSecureGroup group) { final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText); if (textSecureAttachments != null) { messageBuilder.withAttachments(textSecureAttachments); } + if (group != null) { + messageBuilder.asGroupMessage(group); + } TextSecureDataMessage message = messageBuilder.build(); try { @@ -259,39 +293,55 @@ public class Main { } @Override - public void handleMessage(TextSecureEnvelope envelope) { + public void handleMessage(TextSecureEnvelope envelope, TextSecureContent content, GroupInfo group) { System.out.println("Envelope from: " + envelope.getSource()); System.out.println("Timestamp: " + envelope.getTimestamp()); if (envelope.isReceipt()) { System.out.println("Got receipt."); } else if (envelope.isWhisperMessage() | envelope.isPreKeyWhisperMessage()) { - TextSecureContent content = m.decryptMessage(envelope); - if (content == null) { System.out.println("Failed to decrypt message."); } else { if (content.getDataMessage().isPresent()) { TextSecureDataMessage message = content.getDataMessage().get(); - System.out.println("Body: " + message.getBody().get()); + System.out.println("Message timestamp: " + message.getTimestamp()); + + if (message.getBody().isPresent()) { + System.out.println("Body: " + message.getBody().get()); + } + if (message.getGroupInfo().isPresent()) { + TextSecureGroup groupInfo = message.getGroupInfo().get(); + System.out.println("Group info:"); + System.out.println(" Id: " + Base64.encodeBytes(groupInfo.getGroupId())); + if (groupInfo.getName().isPresent()) { + System.out.println(" Name: " + groupInfo.getName().get()); + } else if (group != null) { + System.out.println(" Name: " + group.name); + } else { + System.out.println(" Name: "); + } + System.out.println(" Type: " + groupInfo.getType()); + if (groupInfo.getMembers().isPresent()) { + for (String member : groupInfo.getMembers().get()) { + System.out.println(" Member: " + member); + } + } + if (groupInfo.getAvatar().isPresent()) { + System.out.println(" Avatar:"); + printAttachment(groupInfo.getAvatar().get()); + } + } if (message.isEndSession()) { + System.out.println("Is end session"); m.handleEndSession(envelope.getSource()); - } else if (message.getAttachments().isPresent()) { + } + + if (message.getAttachments().isPresent()) { System.out.println("Attachments: "); for (TextSecureAttachment attachment : message.getAttachments().get()) { - System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")"); - if (attachment.isPointer()) { - final TextSecureAttachmentPointer pointer = attachment.asPointer(); - System.out.println(" Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : "")); - System.out.println(" Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : "")); - try { - File file = m.retrieveAttachment(pointer); - System.out.println(" Stored plaintext in: " + file); - } catch (IOException | InvalidMessageException e) { - System.out.println("Failed to retrieve attachment: " + e.getMessage()); - } - } + printAttachment(attachment); } } } @@ -305,5 +355,20 @@ public class Main { } System.out.println(); } + + private void printAttachment(TextSecureAttachment attachment) { + System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")"); + if (attachment.isPointer()) { + final TextSecureAttachmentPointer pointer = attachment.asPointer(); + System.out.println(" Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : "")); + System.out.println(" Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : "")); + try { + File file = m.retrieveAttachment(pointer); + System.out.println(" Stored plaintext in: " + file); + } catch (IOException | InvalidMessageException e) { + System.out.println("Failed to retrieve attachment: " + e.getMessage()); + } + } + } } }