Handle end session 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 4ba09da3e818365a013c30fc108ba15cd59db518..f6b6bb7093197a9d07a02e2a0e4e54860789b440 100644 (file)
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/cli/Main.java
@@ -20,15 +20,12 @@ 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;
+import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.textsecure.api.util.InvalidNumberException;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -82,8 +79,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();
@@ -154,13 +151,20 @@ public class Main {
                     messageBuilder.withAttachments(textSecureAttachments);
                 }
                 TextSecureDataMessage message = messageBuilder.build();
+
+                List<TextSecureAddress> recipients = new ArrayList<>(ns.<String>getList("recipient").size());
                 for (String recipient : ns.<String>getList("recipient")) {
                     try {
-                        messageSender.sendMessage(new TextSecureAddress(recipient), message);
-                    } catch (UntrustedIdentityException | IOException e) {
-                        System.out.println("Send message: " + e.getMessage());
+                        recipients.add(m.getPushAddress(recipient));
+                    } catch (InvalidNumberException e) {
+                        System.out.println("Failed to send message to \"" + recipient + "\": " + e.getMessage());
                     }
                 }
+                try {
+                    messageSender.sendMessage(recipients, message);
+                } catch (IOException | EncapsulatedExceptions e) {
+                    System.out.println("Failed to send message: " + e.getMessage());
+                }
                 break;
             case "receive":
                 if (!m.isRegistered()) {
@@ -168,26 +172,49 @@ 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 (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.isEndSession()) {
+                                            m.handleEndSession(envelope.getSource());
+                                        } else 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;
         }