X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/c5b884f62b3a52477cf3d9fd2ca6fce84f9fc805..c41ac8e7a32e0eaa3ab8786be14da46f4c20a08a:/src/main/java/cli/Main.java

diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java
index 07353a19..85ca227d 100644
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/cli/Main.java
@@ -141,11 +141,14 @@ public class Main {
                     System.err.println("User is not registered.");
                     System.exit(1);
                 }
-                int timeout = ns.getInt("timeout");
+                int timeout = 5;
+                if (ns.getInt("timeout") != null) {
+                    timeout = ns.getInt("timeout");
+                }
                 boolean returnOnTimeout = true;
                 if (timeout < 0) {
                     returnOnTimeout = false;
-                    timeout = 5;
+                    timeout = 3600;
                 }
                 try {
                     m.receiveMessages(timeout, returnOnTimeout, new ReceiveMessageHandler(m));
@@ -259,15 +262,13 @@ public class Main {
         }
 
         @Override
-        public void handleMessage(TextSecureEnvelope envelope) {
+        public void handleMessage(TextSecureEnvelope envelope, TextSecureContent content, GroupInfo group) {
             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 (content == null) {
                     System.out.println("Failed to decrypt message.");
                 } else {
@@ -285,6 +286,10 @@ public class Main {
                             System.out.println("  Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
                             if (groupInfo.getName().isPresent()) {
                                 System.out.println("  Name: " + groupInfo.getName().get());
+                            } else if (group != null) {
+                                System.out.println("  Name: " + group.name);
+                            } else {
+                                System.out.println("  Name: <Unknown group>");
                             }
                             System.out.println("  Type: " + groupInfo.getType());
                             if (groupInfo.getMembers().isPresent()) {