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);
}
}
}
}
}
+ TextSecureGroup group = null;
+ List<String> 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.<String>getList("recipient");
+ }
List<TextSecureAddress> recipients = new ArrayList<>(ns.<String>getList("recipient").size());
- for (String recipient : ns.<String>getList("recipient")) {
+ for (String recipient : recipientStrings) {
try {
recipients.add(m.getPushAddress(recipient));
} catch (InvalidNumberException e) {
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 = 5;
+ if (ns.getInt("timeout") != null) {
+ timeout = ns.getInt("timeout");
+ }
+ boolean returnOnTimeout = true;
+ if (timeout < 0) {
+ returnOnTimeout = false;
+ timeout = 3600;
+ }
try {
- m.receiveMessages(5, true, new ReceiveMessageHandler(m));
+ m.receiveMessages(timeout, returnOnTimeout, new ReceiveMessageHandler(m));
} catch (IOException e) {
System.err.println("Error while receiving message: " + e.getMessage());
System.exit(3);
private static Namespace parseArgs(String[] args) {
ArgumentParser parser = ArgumentParsers.newArgumentParser("textsecure-cli")
.defaultHelp(true)
- .description("Commandline interface for TextSecure.");
+ .description("Commandline interface for TextSecure.")
+ .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
+
+ parser.addArgument("-u", "--username")
+ .help("Specify your phone number, that will be used for verification.");
+ parser.addArgument("-v", "--version")
+ .help("Show package version.")
+ .action(Arguments.version());
+
Subparsers subparsers = parser.addSubparsers()
.title("subcommands")
.dest("command")
.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("*");
.help("Add file as attachment");
Subparser parserReceive = subparsers.addParser("receive");
- parser.addArgument("-u", "--username")
- .required(true)
- .help("Specify your phone number, that will be used for verification.");
+ parserReceive.addArgument("-t", "--timeout")
+ .type(int.class)
+ .help("Number of seconds to wait for new messages (negative values disable timeout)");
try {
- return parser.parseArgs(args);
+ Namespace ns = parser.parseArgs(args);
+ if (ns.getString("username") == null) {
+ parser.printUsage();
+ 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);
return null;
}
private static void sendMessage(Manager m, String messageText, List<TextSecureAttachment> textSecureAttachments,
- List<TextSecureAddress> recipients) {
+ List<TextSecureAddress> 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 {
}
@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: <Unknown group>");
+ }
+ 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()) {
- System.out.println(" Id: " + attachment.asPointer().getId() + " Key length: " + attachment.asPointer().getKey().length + (attachment.asPointer().getRelay().isPresent() ? " Relay: " + attachment.asPointer().getRelay().get() : ""));
- try {
- File file = m.retrieveAttachment(attachment.asPointer());
- System.out.println(" Stored plaintext in: " + file);
- } catch (IOException | InvalidMessageException e) {
- System.out.println("Failed to retrieve attachment: " + e.getMessage());
- }
- }
+ printAttachment(attachment);
}
}
}
}
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" : "<unavailable>") + (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());
+ }
+ }
+ }
}
}
git.nmode.ca / signal-cli / blobdiff
