import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions;
import org.whispersystems.textsecure.api.push.exceptions.NetworkFailureException;
import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
+import org.whispersystems.textsecure.api.util.PhoneNumberFormatter;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.security.Security;
-import java.util.ArrayList;
-import java.util.List;
public class Main {
System.exit(1);
}
- byte[] groupId = null;
- List<String> recipients = 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);
- }
- groupId = g.groupId;
- recipients = g.members;
- } catch (IOException e) {
- System.err.println("Failed to send to grup \"" + ns.getString("group") + "\": " + e.getMessage());
+ if (ns.getBoolean("endsession")) {
+ if (ns.getList("recipient") == null) {
+ System.err.println("No recipients given");
System.err.println("Aborting sending.");
System.exit(1);
}
- } else {
- recipients = ns.<String>getList("recipient");
- }
-
- 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);
- }
- }
+ try {
+ m.sendEndSessionMessage(ns.<String>getList("recipient"));
+ } catch (IOException e) {
+ handleIOException(e);
+ } catch (EncapsulatedExceptions e) {
+ handleEncapsulatedExceptions(e);
+ } catch (AssertionError e) {
+ handleAssertionError(e);
}
-
+ } else {
String messageText = ns.getString("message");
if (messageText == null) {
try {
}
}
- sendMessage(m, messageText, textSecureAttachments, recipients, groupId);
+ try {
+ if (ns.getString("group") != null) {
+ byte[] groupId = decodeGroupId(ns.getString("group"));
+ m.sendGroupMessage(messageText, ns.<String>getList("attachment"), groupId);
+ } else {
+ m.sendMessage(messageText, ns.<String>getList("attachment"), ns.<String>getList("recipient"));
+ }
+ } catch (IOException e) {
+ handleIOException(e);
+ } catch (EncapsulatedExceptions e) {
+ handleEncapsulatedExceptions(e);
+ } catch (AssertionError e) {
+ handleAssertionError(e);
+ } catch (GroupNotFoundException e) {
+ handleGroupNotFoundException(e);
+ } catch (AttachmentInvalidException e) {
+ System.err.println("Failed to add attachment (\"" + e.getAttachment() + "\"): " + e.getMessage());
+ System.err.println("Aborting sending.");
+ System.exit(1);
+ }
}
break;
}
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);
- }
+ m.sendQuitGroupMessage(decodeGroupId(ns.getString("group")));
+ } catch (IOException e) {
+ handleIOException(e);
+ } catch (EncapsulatedExceptions e) {
+ handleEncapsulatedExceptions(e);
+ } catch (AssertionError e) {
+ handleAssertionError(e);
+ } catch (GroupNotFoundException e) {
+ handleGroupNotFoundException(e);
+ }
- sendQuitGroupMessage(m, g.members, g.groupId);
+ break;
+ case "updateGroup":
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ System.exit(1);
+ }
+
+ try {
+ byte[] groupId = null;
+ if (ns.getString("group") != null) {
+ groupId = decodeGroupId(ns.getString("group"));
+ }
+ byte[] newGroupId = m.sendUpdateGroupMessage(groupId, ns.getString("name"), ns.<String>getList("member"), ns.getString("avatar"));
+ if (groupId == null) {
+ System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …");
+ }
} catch (IOException e) {
- System.err.println("Failed to send to grup \"" + ns.getString("group") + "\": " + e.getMessage());
+ handleIOException(e);
+ } catch (AttachmentInvalidException e) {
+ System.err.println("Failed to add avatar attachment (\"" + e.getAttachment() + ") for group\": " + e.getMessage());
System.err.println("Aborting sending.");
System.exit(1);
+ } catch (GroupNotFoundException e) {
+ handleGroupNotFoundException(e);
+ } catch (EncapsulatedExceptions e) {
+ handleEncapsulatedExceptions(e);
}
break;
System.exit(0);
}
+ private static void handleGroupNotFoundException(GroupNotFoundException e) {
+ System.err.println("Failed to send to group \"" + Base64.encodeBytes(e.getGroupId()) + "\": Unknown group");
+ System.err.println("Aborting sending.");
+ System.exit(1);
+ }
+
+ private static byte[] decodeGroupId(String groupId) {
+ try {
+ return Base64.decode(groupId);
+ } catch (IOException e) {
+ System.err.println("Failed to decode groupId (must be base64) \"" + groupId + "\": " + e.getMessage());
+ System.err.println("Aborting sending.");
+ System.exit(1);
+ return null;
+ }
+ }
+
private static Namespace parseArgs(String[] args) {
ArgumentParser parser = ArgumentParsers.newArgumentParser("textsecure-cli")
.defaultHelp(true)
.required(true)
.help("Specify the recipient group ID.");
+ Subparser parserUpdateGroup = subparsers.addParser("updateGroup");
+ parserUpdateGroup.addArgument("-g", "--group")
+ .help("Specify the recipient group ID.");
+ parserUpdateGroup.addArgument("-n", "--name")
+ .help("Specify the new group name.");
+ parserUpdateGroup.addArgument("-a", "--avatar")
+ .help("Specify a new group avatar image file");
+ parserUpdateGroup.addArgument("-m", "--member")
+ .nargs("*")
+ .help("Specify one or more members to add to the group");
+
Subparser parserReceive = subparsers.addParser("receive");
parserReceive.addArgument("-t", "--timeout")
.type(int.class)
System.err.println("You need to specify a username (phone number)");
System.exit(2);
}
+ if (!PhoneNumberFormatter.isValidNumber(ns.getString("username"))) {
+ System.err.println("Invalid username (phone number), make sure you include the country code.");
+ 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);
}
}
- private static void sendMessage(Manager m, String messageText, List<TextSecureAttachment> textSecureAttachments,
- List<String> recipients, byte[] groupId) {
- final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText);
- if (textSecureAttachments != null) {
- messageBuilder.withAttachments(textSecureAttachments);
- }
- if (groupId != null) {
- messageBuilder.asGroupMessage(new TextSecureGroup(groupId));
- }
- 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 handleAssertionError(AssertionError e) {
+ System.err.println("Failed to send message (Assertion): " + e.getMessage());
+ System.err.println(e.getStackTrace());
+ System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");
+ System.exit(1);
}
- private static void sendQuitGroupMessage(Manager m, List<String> recipients, byte[] groupId) {
- final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder();
- TextSecureGroup group = TextSecureGroup.newBuilder(TextSecureGroup.Type.QUIT).withId(groupId).build();
- messageBuilder.asGroupMessage(group);
-
- TextSecureDataMessage message = messageBuilder.build();
-
- sendMessage(m, message, recipients);
+ private static void handleEncapsulatedExceptions(EncapsulatedExceptions e) {
+ System.err.println("Failed to send (some) messages:");
+ for (NetworkFailureException n : e.getNetworkExceptions()) {
+ System.err.println("Network failure for \"" + n.getE164number() + "\": " + n.getMessage());
+ }
+ for (UnregisteredUserException n : e.getUnregisteredUserExceptions()) {
+ System.err.println("Unregistered user \"" + n.getE164Number() + "\": " + n.getMessage());
+ }
+ for (UntrustedIdentityException n : e.getUntrustedIdentityExceptions()) {
+ System.err.println("Untrusted Identity for \"" + n.getE164Number() + "\": " + n.getMessage());
+ }
}
- private static void sendMessage(Manager m, TextSecureDataMessage message, List<String> recipients) {
- try {
- m.sendMessage(recipients, message);
- } catch (IOException e) {
- System.err.println("Failed to send message: " + e.getMessage());
- } catch (EncapsulatedExceptions e) {
- System.err.println("Failed to send (some) messages:");
- for (NetworkFailureException n : e.getNetworkExceptions()) {
- System.err.println("Network failure for \"" + n.getE164number() + "\": " + n.getMessage());
- }
- for (UnregisteredUserException n : e.getUnregisteredUserExceptions()) {
- System.err.println("Unregistered user \"" + n.getE164Number() + "\": " + n.getMessage());
- }
- for (UntrustedIdentityException n : e.getUntrustedIdentityExceptions()) {
- System.err.println("Untrusted Identity for \"" + n.getE164Number() + "\": " + n.getMessage());
- }
- } catch (AssertionError e) {
- System.err.println("Failed to send message (Assertion): " + e.getMessage());
- System.err.println(e.getStackTrace());
- System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");
- System.exit(1);
- }
+ private static void handleIOException(IOException e) {
+ System.err.println("Failed to send message: " + e.getMessage());
}
private static class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
git.nmode.ca / signal-cli / blobdiff
