Increase timeout

[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 059fb46b7ec5c97f3e1647432f7b21ea53e01805..44a89505bd03a31fe3cbf21ac121179af6585a5b 100644 (file)
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/cli/Main.java
@@ -141,8 +141,14 @@ public class Main {
                     System.err.println("User is not registered.");
                     System.exit(1);
                 }
+                int timeout = ns.getInt("timeout");
+                boolean returnOnTimeout = true;
+                if (timeout < 0) {
+                    returnOnTimeout = false;
+                    timeout = 3600;
+                }
                 try {
-                    m.receiveMessages(5, true, new ReceiveMessageHandler(m));
+                    m.receiveMessages(timeout, returnOnTimeout, new ReceiveMessageHandler(m));
                 } catch (IOException e) {
                     System.err.println("Error while receiving message: " + e.getMessage());
                     System.exit(3);
@@ -196,6 +202,9 @@ public class Main {
                 .help("Add file as attachment");
 
         Subparser parserReceive = subparsers.addParser("receive");
+        parserReceive.addArgument("-t", "--timeout")
+                .type(int.class)
+                .help("Number of seconds to wait for new messages (negative values disable timeout)");
 
         try {
             Namespace ns = parser.parseArgs(args);
@@ -264,25 +273,39 @@ public class Main {
                 } else {
                     if (content.getDataMessage().isPresent()) {
                         TextSecureDataMessage message = content.getDataMessage().get();
-                        System.out.println("Body: " + message.getBody().get());
 
+                        System.out.println("Message timestamp: " + message.getTimestamp());
+
+                        if (message.getBody().isPresent()) {
+                            System.out.println("Body: " + message.getBody().get());
+                        }
+                        if (message.getGroupInfo().isPresent()) {
+                            TextSecureGroup groupInfo = message.getGroupInfo().get();
+                            System.out.println("Group info:");
+                            System.out.println("  Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
+                            if (groupInfo.getName().isPresent()) {
+                                System.out.println("  Name: " + groupInfo.getName().get());
+                            }
+                            System.out.println("  Type: " + groupInfo.getType());
+                            if (groupInfo.getMembers().isPresent()) {
+                                for (String member : groupInfo.getMembers().get()) {
+                                    System.out.println("  Member: " + member);
+                                }
+                            }
+                            if (groupInfo.getAvatar().isPresent()) {
+                                System.out.println("  Avatar:");
+                                printAttachment(groupInfo.getAvatar().get());
+                            }
+                        }
                         if (message.isEndSession()) {
+                            System.out.println("Is end session");
                             m.handleEndSession(envelope.getSource());
-                        } else if (message.getAttachments().isPresent()) {
+                        }
+
+                        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()) {
-                                    final TextSecureAttachmentPointer pointer = attachment.asPointer();
-                                    System.out.println("  Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));
-                                    System.out.println((pointer.getSize().isPresent() ? " Size: " + pointer.getSize().get() : " bytes") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
-                                    try {
-                                        File file = m.retrieveAttachment(pointer);
-                                        System.out.println("  Stored plaintext in: " + file);
-                                    } catch (IOException | InvalidMessageException e) {
-                                        System.out.println("Failed to retrieve attachment: " + e.getMessage());
-                                    }
-                                }
+                                printAttachment(attachment);
                             }
                         }
                     }
@@ -296,5 +319,20 @@ public class Main {
             }
             System.out.println();
         }
+
+        private void printAttachment(TextSecureAttachment attachment) {
+            System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")");
+            if (attachment.isPointer()) {
+                final TextSecureAttachmentPointer pointer = attachment.asPointer();
+                System.out.println("  Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));
+                System.out.println("  Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
+                try {
+                    File file = m.retrieveAttachment(pointer);
+                    System.out.println("  Stored plaintext in: " + file);
+                } catch (IOException | InvalidMessageException e) {
+                    System.out.println("Failed to retrieve attachment: " + e.getMessage());
+                }
+            }
+        }
     }
 }