X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/6af605f79091fb55f6af46677d11011dc63e244d..704f2d76ba3c24dceecabd3fd473d973c29f7699:/src/main/java/cli/Main.java

diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java
index 8a6cea53..4cdbb806 100644
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/cli/Main.java
@@ -21,10 +21,13 @@ import net.sourceforge.argparse4j.impl.Arguments;
 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.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.textsecure.api.push.exceptions.NetworkFailureException;
+import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
 import org.whispersystems.textsecure.api.util.InvalidNumberException;
 
 import java.io.File;
@@ -162,8 +165,19 @@ public class Main {
                 }
                 try {
                     messageSender.sendMessage(recipients, message);
-                } catch (IOException | EncapsulatedExceptions e) {
+                } catch (IOException e) {
                     System.out.println("Failed to send message: " + e.getMessage());
+                } catch (EncapsulatedExceptions e) {
+                    System.out.println("Failed to send (some) messages:");
+                    for (NetworkFailureException n : e.getNetworkExceptions()) {
+                        System.out.println("Network failure for \"" + n.getE164number() + "\": " + n.getMessage());
+                    }
+                    for (UnregisteredUserException n : e.getUnregisteredUserExceptions()) {
+                        System.out.println("Unregistered user \"" + n.getE164Number() + "\": " + n.getMessage());
+                    }
+                    for (UntrustedIdentityException n : e.getUntrustedIdentityExceptions()) {
+                        System.out.println("Untrusted Identity for \"" + n.getE164Number() + "\": " + n.getMessage());
+                    }
                 }
                 break;
             case "receive":
@@ -172,7 +186,7 @@ public class Main {
                     System.exit(1);
                 }
                 try {
-                    m.receiveMessages(new Manager.ReceiveMessageHandler() {
+                    m.receiveMessages(5, true, new Manager.ReceiveMessageHandler() {
                         @Override
                         public void handleMessage(TextSecureEnvelope envelope) {
                             System.out.println("Envelope from: " + envelope.getSource());
@@ -219,5 +233,6 @@ public class Main {
                 break;
         }
         m.save();
+        System.exit(0);
     }
 }