Support sending attachments

[signal-cli] / src / main / java / cli / Main.java

diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java
index 34f07a559eb5ffaf44484ba1b8b7490e01525ccb..4ba09da3e818365a013c30fc108ba15cd59db518 100644 (file)
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/cli/Main.java
@@ -17,16 +17,28 @@
 package cli;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
+import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import org.apache.commons.io.IOUtils;
 import org.whispersystems.libaxolotl.InvalidVersionException;
 import org.whispersystems.textsecure.api.TextSecureMessageSender;
 import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
-import org.whispersystems.textsecure.api.messages.TextSecureMessage;
+import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
+import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream;
+import org.whispersystems.textsecure.api.messages.TextSecureContent;
+import org.whispersystems.textsecure.api.messages.TextSecureDataMessage;
+import org.whispersystems.textsecure.api.messages.multidevice.TextSecureSyncMessage;
 import org.whispersystems.textsecure.api.push.TextSecureAddress;
 
+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 {
 
@@ -43,15 +55,21 @@ public class Main {
                 .description("valid subcommands")
                 .help("additional help");
         Subparser parserRegister = subparsers.addParser("register");
+        parserRegister.addArgument("-v", "--voice")
+                .help("The verification should be done over voice, not sms.")
+                .action(Arguments.storeTrue());
         Subparser parserVerify = subparsers.addParser("verify");
         parserVerify.addArgument("verificationCode")
-                .help("The verification code you received via sms.");
+                .help("The verification code you received via sms or voice call.");
         Subparser parserSend = subparsers.addParser("send");
         parserSend.addArgument("recipient")
                 .help("Specify the recipients' phone number.")
                 .nargs("*");
         parserSend.addArgument("-m", "--message")
                 .help("Specify the message, if missing standard input is used.");
+        parserSend.addArgument("-a", "--attachment")
+                .nargs("*")
+                .help("Add file as attachment");
         Subparser parserReceive = subparsers.addParser("receive");
         parser.addArgument("-u", "--username")
                 .required(true)
@@ -80,7 +98,7 @@ public class Main {
                     m.createNewIdentity();
                 }
                 try {
-                    m.register();
+                    m.register(ns.getBoolean("voice"));
                 } catch (IOException e) {
                     System.out.println("Request verify error: " + e.getMessage());
                     System.exit(3);
@@ -117,7 +135,25 @@ public class Main {
                         System.exit(1);
                     }
                 }
-                TextSecureMessage message = TextSecureMessage.newBuilder().withBody(messageText).build();
+                final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText);
+                final List<String> attachments = ns.<String>getList("attachment");
+                if (attachments != null) {
+                    List<TextSecureAttachment> textSecureAttachments = new ArrayList<TextSecureAttachment>(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.out.println("Failed to add attachment \"" + attachment + "\": " + e.getMessage());
+                            System.exit(1);
+                        }
+                    }
+                    messageBuilder.withAttachments(textSecureAttachments);
+                }
+                TextSecureDataMessage message = messageBuilder.build();
                 for (String recipient : ns.<String>getList("recipient")) {
                     try {
                         messageSender.sendMessage(new TextSecureAddress(recipient), message);
@@ -132,11 +168,23 @@ public class Main {
                     System.exit(1);
                 }
                 try {
-                    message = m.receiveMessage();
-                    if (message == null) {
-                        System.exit(0);
-                    } else {
-                        System.out.println("Received message: " + message.getBody().get());
+                    TextSecureContent content = m.receiveMessage();
+                    if (content.getDataMessage().isPresent()) {
+                        message = content.getDataMessage().get();
+                        if (message == null) {
+                            System.exit(0);
+                        } else {
+                            System.out.println("Received message: " + message.getBody().get());
+                        }
+                    }
+                    if (content.getSyncMessage().isPresent()) {
+                        TextSecureSyncMessage syncMessage = content.getSyncMessage().get();
+
+                        if (syncMessage == null) {
+                            System.exit(0);
+                        } else {
+                            System.out.println("Received sync message");
+                        }
                     }
                 } catch (IOException | InvalidVersionException e) {
                     System.out.println("Receive message: " + e.getMessage());