Improve receiving messages

diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java
index 4ba09da3e818365a013c30fc108ba15cd59db518..9a3e5b36654dfd713e846a38bb0a7807c95b2ebf 100644 (file)
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/cli/Main.java
@@ -20,13 +20,9 @@ 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.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.*;
 import org.whispersystems.textsecure.api.messages.multidevice.TextSecureSyncMessage;
 import org.whispersystems.textsecure.api.push.TextSecureAddress;
 
@@ -82,8 +78,8 @@ public class Main {
             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();
@@ -168,26 +164,47 @@ public class Main {
                     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 (envelope.isReceipt()) {
+                                System.out.println("Got receipt.");
+                            } else if (envelope.isWhisperMessage() | envelope.isPreKeyWhisperMessage()) {
+                                TextSecureContent content = m.decryptMessage(envelope);
 
-                        if (syncMessage == null) {
-                            System.exit(0);
-                        } else {
-                            System.out.println("Received sync message");
+                                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;
         }

diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java
index b745988b5b1ee945c9ae223d10e30f75dc90f63a..cd5f6305aa6721ee4dcf10fdc0edaff2eaeba9d1 100644 (file)
--- a/src/main/java/cli/Manager.java
+++ b/src/main/java/cli/Manager.java
@@ -35,6 +35,8 @@ import org.whispersystems.textsecure.api.messages.TextSecureContent;
 import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
 import org.whispersystems.textsecure.api.push.TextSecureAddress;
 import org.whispersystems.textsecure.api.push.TrustStore;
+import org.whispersystems.textsecure.api.util.InvalidNumberException;
+import org.whispersystems.textsecure.api.util.PhoneNumberFormatter;
 
 import java.io.*;
 import java.util.List;
@@ -166,28 +168,39 @@ public class Manager {
                 axolotlStore, Optional.<TextSecureMessageSender.EventListener>absent());
     }
 
-    public TextSecureContent receiveMessage() throws IOException, InvalidVersionException {
+    public TextSecureContent decryptMessage(TextSecureEnvelope envelope) {
+        TextSecureCipher cipher = new TextSecureCipher(new TextSecureAddress(username), axolotlStore);
+        try {
+            return cipher.decrypt(envelope);
+        } catch (Exception e) {
+            // TODO handle all exceptions
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public interface ReceiveMessageHandler {
+        void handleMessage(TextSecureEnvelope envelope);
+    }
+
+    public void receiveMessages(ReceiveMessageHandler handler) throws IOException {
         TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey);
         TextSecureMessagePipe messagePipe = null;
 
         try {
             messagePipe = messageReceiver.createMessagePipe();
 
-            TextSecureEnvelope envelope;
-            try {
-                envelope = messagePipe.read(5, TimeUnit.SECONDS);
-            } catch (TimeoutException e) {
-                return null;
-            }
-            TextSecureCipher cipher = new TextSecureCipher(new TextSecureAddress(username), axolotlStore);
-            TextSecureContent message = null;
-            try {
-                message = cipher.decrypt(envelope);
-            } catch (Exception e) {
-                // TODO handle all exceptions
-                e.printStackTrace();
+            while (true) {
+                TextSecureEnvelope envelope;
+                try {
+                    envelope = messagePipe.read(1, TimeUnit.MINUTES);
+                    handler.handleMessage(envelope);
+                } catch (TimeoutException e) {
+                } catch (InvalidVersionException e) {
+                    System.out.println("Ignoring error: " + e.getMessage());
+                }
+                save();
             }
-            return message;
         } finally {
             if (messagePipe != null)
                 messagePipe.shutdown();