Implement SignalServiceAccountDataStore for PNI

[signal-cli] / src / main / java / org / asamk / signal / commands / ReceiveCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 0a38ad4e60db096de10ddd79a6a5f70ed2090842..68292557e381c27679452215f96acf28e75a57e0 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -10,6 +10,7 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.api.ReceiveConfig;

 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;


@@ -17,8 +18,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;

+import java.time.Duration;

 import java.util.List;
 import java.util.List;

-import java.util.concurrent.TimeUnit;

 
 public class ReceiveCommand implements LocalCommand {
 
 
 public class ReceiveCommand implements LocalCommand {
 


@@ -39,6 +40,9 @@ public class ReceiveCommand implements LocalCommand {
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());

+        subparser.addArgument("--send-read-receipts")
+                .help("Send read receipts for all incoming data messages (in addition to the default delivery receipts)")
+                .action(Arguments.storeTrue());

     }
 
     @Override
     }
 
     @Override


@@ -52,14 +56,15 @@ public class ReceiveCommand implements LocalCommand {
     ) throws CommandException {
         double timeout = ns.getDouble("timeout");
         boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
     ) throws CommandException {
         double timeout = ns.getDouble("timeout");
         boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));

-        m.setIgnoreAttachments(ignoreAttachments);
+        boolean sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
+        m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, sendReadReceipts));

         try {
             final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
                     (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
             if (timeout < 0) {
                 m.receiveMessages(handler);
             } else {
         try {
             final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
                     (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
             if (timeout < 0) {
                 m.receiveMessages(handler);
             } else {

-                m.receiveMessages((long) (timeout * 1000), TimeUnit.MILLISECONDS, handler);
+                m.receiveMessages(Duration.ofMillis((long) (timeout * 1000)), handler);

             }
         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
             }
         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);