System.err.println("User is not registered.");
System.exit(1);
}
- String messageText = ns.getString("message");
- if (messageText == null) {
+
+ TextSecureGroup group = null;
+ List<String> recipients = null;
+ if (ns.getString("group") != null) {
try {
- messageText = IOUtils.toString(System.in);
+ 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);
+ recipients = g.members;
} catch (IOException e) {
- System.err.println("Failed to read message from stdin: " + e.getMessage());
+ System.err.println("Failed to send to grup \"" + ns.getString("group") + "\": " + e.getMessage());
+ System.err.println("Aborting sending.");
System.exit(1);
}
+ } else {
+ recipients = ns.<String>getList("recipient");
}
- final List<String> attachments = ns.getList("attachment");
- List<TextSecureAttachment> textSecureAttachments = null;
- if (attachments != null) {
- textSecureAttachments = new ArrayList<>(attachments.size());
- for (String attachment : attachments) {
+ if (ns.getBoolean("endsession")) {
+ sendEndSessionMessage(m, recipients);
+ } else {
+ final List<String> attachments = ns.getList("attachment");
+ List<TextSecureAttachment> textSecureAttachments = null;
+ if (attachments != null) {
+ textSecureAttachments = new ArrayList<>(attachments.size());
+ for (String attachment : attachments) {
+ try {
+ File attachmentFile = new File(attachment);
+ InputStream attachmentStream = new FileInputStream(attachmentFile);
+ final long attachmentSize = attachmentFile.length();
+ String mime = Files.probeContentType(Paths.get(attachment));
+ textSecureAttachments.add(new TextSecureAttachmentStream(attachmentStream, mime, attachmentSize, null));
+ } catch (IOException e) {
+ System.err.println("Failed to add attachment \"" + attachment + "\": " + e.getMessage());
+ System.err.println("Aborting sending.");
+ System.exit(1);
+ }
+ }
+ }
+
+ String messageText = ns.getString("message");
+ if (messageText == null) {
try {
- File attachmentFile = new File(attachment);
- InputStream attachmentStream = new FileInputStream(attachmentFile);
- final long attachmentSize = attachmentFile.length();
- String mime = Files.probeContentType(Paths.get(attachment));
- textSecureAttachments.add(new TextSecureAttachmentStream(attachmentStream, mime, attachmentSize, null));
+ messageText = IOUtils.toString(System.in);
} catch (IOException e) {
- System.err.println("Failed to add attachment \"" + attachment + "\": " + e.getMessage());
+ System.err.println("Failed to read message from stdin: " + e.getMessage());
System.err.println("Aborting sending.");
System.exit(1);
}
}
- }
- List<TextSecureAddress> recipients = new ArrayList<>(ns.<String>getList("recipient").size());
- for (String recipient : ns.<String>getList("recipient")) {
- try {
- recipients.add(m.getPushAddress(recipient));
- } catch (InvalidNumberException e) {
- System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
- System.err.println("Aborting sending.");
- System.exit(1);
- }
+ sendMessage(m, messageText, textSecureAttachments, recipients, group);
}
- sendMessage(m, messageText, textSecureAttachments, recipients);
+
break;
case "receive":
if (!m.isRegistered()) {
.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("*");
parserSend.addArgument("-a", "--attachment")
.nargs("*")
.help("Add file as attachment");
+ parserSend.addArgument("-e", "--endsession")
+ .help("Clear session state and send end session message.")
+ .action(Arguments.storeTrue());
Subparser parserReceive = subparsers.addParser("receive");
parserReceive.addArgument("-t", "--timeout")
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);
}
private static void sendMessage(Manager m, String messageText, List<TextSecureAttachment> textSecureAttachments,
- List<TextSecureAddress> recipients) {
+ List<String> 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();
+ sendMessage(m, message, recipients);
+ }
+
+ private static void sendEndSessionMessage(Manager m, List<String> recipients) {
+ final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().asEndSessionMessage();
+
+ TextSecureDataMessage message = messageBuilder.build();
+
+ sendMessage(m, message, recipients);
+ }
+
+ private static void sendMessage(Manager m, TextSecureDataMessage message, List<String> recipients) {
try {
m.sendMessage(recipients, message);
} catch (IOException e) {
}
@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 {
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: <Unknown group>");
}
System.out.println(" Type: " + groupInfo.getType());
if (groupInfo.getMembers().isPresent()) {
}
if (message.isEndSession()) {
System.out.println("Is end session");
- m.handleEndSession(envelope.getSource());
}
if (message.getAttachments().isPresent()) {
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" : "<unavailable>") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
- try {
- File file = m.retrieveAttachment(pointer);
+ File file = m.getAttachmentFile(pointer.getId());
+ if (file.exists()) {
System.out.println(" Stored plaintext in: " + file);
- } catch (IOException | InvalidMessageException e) {
- System.out.println("Failed to retrieve attachment: " + e.getMessage());
}
}
}
git.nmode.ca / signal-cli / blobdiff
