Refactor DaemonCommand

[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 166dfcef9cc6661648602480fdd58585d9f89f64..0f1343f922c07ac7e055c5f9c039f09f9cea0e32 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -9,7 +9,6 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
-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;
@@ -20,6 +19,8 @@ import java.io.InputStreamReader;
 import java.util.List;
 import java.util.function.Supplier;
 
+import static org.asamk.signal.util.CommandUtil.getReceiveConfig;
+
 public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);
@@ -87,13 +88,6 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand
         handler.handleConnection(c);
     }
 
-    private static ReceiveConfig getReceiveConfig(final Namespace ns) {
-        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
-        final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
-        return new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts);
-    }
-
     private static Supplier<String> getLineSupplier() {
         return IOUtils.getLineSupplier(new InputStreamReader(System.in, IOUtils.getConsoleCharset()));
     }