Improve receiving messages

[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 9a915dee0fe769688de96e11cae7bd6c4d546650..9a3e5b36654dfd713e846a38bb0a7807c95b2ebf 100644 (file)
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/cli/Main.java
@@ -20,16 +20,21 @@ import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import org.apache.commons.io.IOUtils;
 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.TextSecureMessageSender;
 import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;

-import org.whispersystems.textsecure.api.messages.TextSecureContent;
-import org.whispersystems.textsecure.api.messages.TextSecureDataMessage;
+import org.whispersystems.textsecure.api.messages.*;

 import org.whispersystems.textsecure.api.messages.multidevice.TextSecureSyncMessage;
 import org.whispersystems.textsecure.api.push.TextSecureAddress;
 
 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.IOException;

+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;

 import java.security.Security;
 import java.security.Security;

+import java.util.ArrayList;
+import java.util.List;

 
 public class Main {
 
 
 public class Main {
 


@@ -58,6 +63,9 @@ public class Main {
                 .nargs("*");
         parserSend.addArgument("-m", "--message")
                 .help("Specify the message, if missing standard input is used.");
                 .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)
         Subparser parserReceive = subparsers.addParser("receive");
         parser.addArgument("-u", "--username")
                 .required(true)


@@ -70,8 +78,8 @@ public class Main {
             System.exit(1);
         }
 
             System.exit(1);
         }
 

-        String username = ns.getString("username");
-        Manager m = new Manager(username);
+        final String username = ns.getString("username");
+        final Manager m = new Manager(username);

         if (m.userExists()) {
             try {
                 m.load();
         if (m.userExists()) {
             try {
                 m.load();


@@ -123,7 +131,25 @@ public class Main {
                         System.exit(1);
                     }
                 }
                         System.exit(1);
                     }
                 }

-                TextSecureDataMessage message = TextSecureDataMessage.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);
                 for (String recipient : ns.<String>getList("recipient")) {
                     try {
                         messageSender.sendMessage(new TextSecureAddress(recipient), message);


@@ -138,26 +164,47 @@ public class Main {
                     System.exit(1);
                 }
                 try {
                     System.exit(1);
                 }
                 try {

-                    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();
+                    m.receiveMessages(new Manager.ReceiveMessageHandler() {
+                        @Override
+                        public void handleMessage(TextSecureEnvelope envelope) {
+                            System.out.println("Envelope from: " + envelope.getSource());
+                            System.out.println("Timestamp: " + envelope.getTimestamp());

 
 

-                        if (syncMessage == null) {
-                            System.exit(0);
-                        } else {
-                            System.out.println("Received sync message");
+                            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());
+                                        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() : ""));
+                                                }
+                                            }
+                                        }
+                                    }
+                                    if (content.getSyncMessage().isPresent()) {
+                                        TextSecureSyncMessage syncMessage = content.getSyncMessage().get();
+                                        System.out.println("Received sync message");
+                                    }
+                                }
+                            } else {
+                                System.out.println("Unknown message received.");
+                            }
+                            System.out.println();

                         }
                         }

-                    }
-                } catch (IOException | InvalidVersionException e) {
-                    System.out.println("Receive message: " + e.getMessage());
+                    });
+                } catch (IOException e) {
+                    System.out.println("Error while receiving message: " + e.getMessage());

                 }
                 break;
         }
                 }
                 break;
         }