Make version command work on the command line

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

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index b61916a1950df78136ced5fe12be0db9c926b1be..ef33a6e8857f47e0d16a99ba016971708cc4b2c2 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -4,17 +4,17 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.JsonWriter;

 import org.asamk.signal.OutputType;
 import org.asamk.signal.OutputType;

-import org.asamk.signal.OutputWriter;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 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.util.IOUtils;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

-import java.io.BufferedReader;
-import java.io.IOException;

 import java.io.InputStreamReader;
 import java.util.List;
 import java.util.function.Supplier;
 import java.io.InputStreamReader;
 import java.util.List;
 import java.util.function.Supplier;


@@ -34,6 +34,9 @@ public class JsonRpcDispatcherCommand 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


@@ -46,19 +49,14 @@ public class JsonRpcDispatcherCommand implements LocalCommand {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         final boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         final boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));

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

 
         final var jsonOutputWriter = (JsonWriter) outputWriter;
 
         final var jsonOutputWriter = (JsonWriter) outputWriter;

-        final var reader = new BufferedReader(new InputStreamReader(System.in));
-        final Supplier<String> lineSupplier = () -> {
-            try {
-                return reader.readLine();
-            } catch (IOException e) {
-                throw new AssertionError(e);
-            }
-        };
+        final Supplier<String> lineSupplier = IOUtils.getLineSupplier(new InputStreamReader(System.in,
+                IOUtils.getConsoleCharset()));

 
 

-        final var handler = new SignalJsonRpcDispatcherHandler(m, jsonOutputWriter, lineSupplier);
-        handler.handleConnection();
+        final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter, lineSupplier, false);
+        handler.handleConnection(m);

     }
 }
     }
 }