X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/76a1e8ec2f3ef857285ed9df775cf1a174557f8b..6208eb72d823a5b4937c2a30f3219fec3a3b3a59:/src/main/java/cli/Main.java?ds=sidebyside

diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java
index 31979d8c..44a89505 100644
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/cli/Main.java
@@ -105,10 +105,10 @@ public class Main {
                     }
                 }
 
-                final List<String> attachments = ns.<String>getList("attachment");
+                final List<String> attachments = ns.getList("attachment");
                 List<TextSecureAttachment> textSecureAttachments = null;
                 if (attachments != null) {
-                    textSecureAttachments = new ArrayList<TextSecureAttachment>(attachments.size());
+                    textSecureAttachments = new ArrayList<>(attachments.size());
                     for (String attachment : attachments) {
                         try {
                             File attachmentFile = new File(attachment);
@@ -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);
@@ -161,7 +167,15 @@ public class Main {
     private static Namespace parseArgs(String[] args) {
         ArgumentParser parser = ArgumentParsers.newArgumentParser("textsecure-cli")
                 .defaultHelp(true)
-                .description("Commandline interface for TextSecure.");
+                .description("Commandline interface for TextSecure.")
+                .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
+
+        parser.addArgument("-u", "--username")
+                .help("Specify your phone number, that will be used for verification.");
+        parser.addArgument("-v", "--version")
+                .help("Show package version.")
+                .action(Arguments.version());
+
         Subparsers subparsers = parser.addSubparsers()
                 .title("subcommands")
                 .dest("command")
@@ -188,12 +202,18 @@ public class Main {
                 .help("Add file as attachment");
 
         Subparser parserReceive = subparsers.addParser("receive");
-        parser.addArgument("-u", "--username")
-                .required(true)
-                .help("Specify your phone number, that will be used for verification.");
+        parserReceive.addArgument("-t", "--timeout")
+                .type(int.class)
+                .help("Number of seconds to wait for new messages (negative values disable timeout)");
 
         try {
-            return parser.parseArgs(args);
+            Namespace ns = parser.parseArgs(args);
+            if (ns.getString("username") == null) {
+                parser.printUsage();
+                System.err.println("You need to specify a username (phone number)");
+                System.exit(2);
+            }
+            return ns;
         } catch (ArgumentParserException e) {
             parser.handleError(e);
             return null;
@@ -253,23 +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()) {
-                                    System.out.println("  Id: " + attachment.asPointer().getId() + " Key length: " + attachment.asPointer().getKey().length + (attachment.asPointer().getRelay().isPresent() ? " Relay: " + attachment.asPointer().getRelay().get() : ""));
-                                    try {
-                                        File file = m.retrieveAttachment(attachment.asPointer());
-                                        System.out.println("  Stored plaintext in: " + file);
-                                    } catch (IOException | InvalidMessageException e) {
-                                        System.out.println("Failed to retrieve attachment: " + e.getMessage());
-                                    }
-                                }
+                                printAttachment(attachment);
                             }
                         }
                     }
@@ -283,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());
+                }
+            }
+        }
     }
 }