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

-import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;

 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.*;
 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;
 
 import java.io.File;
 import java.io.FileInputStream;


@@ -150,13 +151,20 @@ public class Main {
                     messageBuilder.withAttachments(textSecureAttachments);
                 }
                 TextSecureDataMessage message = messageBuilder.build();
                     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 {
                 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()) {
                 break;
             case "receive":
                 if (!m.isRegistered()) {


@@ -180,9 +188,11 @@ public class Main {
                                 } else {
                                     if (content.getDataMessage().isPresent()) {
                                         TextSecureDataMessage message = content.getDataMessage().get();
                                 } else {
                                     if (content.getDataMessage().isPresent()) {
                                         TextSecureDataMessage message = content.getDataMessage().get();

-

                                         System.out.println("Body: " + message.getBody().get());
                                         System.out.println("Body: " + message.getBody().get());

-                                        if (message.getAttachments().isPresent()) {
+
+                                        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" : "") + ")");
                                             System.out.println("Attachments: ");
                                             for (TextSecureAttachment attachment : message.getAttachments().get()) {
                                                 System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")");