Add --service-environment to allow testing against sandbox environment

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 5c19a4034b8a0ae9be1c6b1b4a43b5d440ab675a..521e453a3e58692c5bc3e092e0e89f42d8330825 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -55,7 +55,7 @@ public class App {
         parser.addArgument("--config")
                 .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).");
 
         parser.addArgument("--config")
                 .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).");
 

-        parser.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification.");
+        parser.addArgument("-u", "--username").help("Specify your phone number, that will be your identifier.");

 
         var mut = parser.addMutuallyExclusiveGroup();
         mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
 
         var mut = parser.addMutuallyExclusiveGroup();
         mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue());


@@ -66,6 +66,11 @@ public class App {
                 .type(Arguments.enumStringType(OutputType.class))
                 .setDefault(OutputType.PLAIN_TEXT);
 
                 .type(Arguments.enumStringType(OutputType.class))
                 .setDefault(OutputType.PLAIN_TEXT);
 

+        parser.addArgument("--service-environment")
+                .help("Choose the server environment to use, SANDBOX or LIVE.")
+                .type(Arguments.enumStringType(ServiceEnvironmentCli.class))
+                .setDefault(ServiceEnvironmentCli.LIVE);
+

         var subparsers = parser.addSubparsers().title("subcommands").dest("command");
 
         final var commands = Commands.getCommands();
         var subparsers = parser.addSubparsers().title("subcommands").dest("command");
 
         final var commands = Commands.getCommands();


@@ -88,15 +93,15 @@ public class App {
             throw new UserErrorException("Command not implemented!");
         }
 
             throw new UserErrorException("Command not implemented!");
         }
 

-        OutputType outputType = ns.get("output");
+        var outputType = ns.<OutputType>get("output");

         if (!command.getSupportedOutputTypes().contains(outputType)) {
             throw new UserErrorException("Command doesn't support output type " + outputType.toString());
         }
 
         var username = ns.getString("username");
 
         if (!command.getSupportedOutputTypes().contains(outputType)) {
             throw new UserErrorException("Command doesn't support output type " + outputType.toString());
         }
 
         var username = ns.getString("username");
 

-        final boolean useDbus = ns.getBoolean("dbus");
-        final boolean useDbusSystem = ns.getBoolean("dbus_system");
+        final var useDbus = ns.getBoolean("dbus");
+        final var useDbusSystem = ns.getBoolean("dbus_system");

         if (useDbus || useDbusSystem) {
             // If username is null, it will connect to the default object path
             initDbusClient(command, username, useDbusSystem);
         if (useDbus || useDbusSystem) {
             // If username is null, it will connect to the default object path
             initDbusClient(command, username, useDbusSystem);


@@ -111,7 +116,10 @@ public class App {
             dataPath = getDefaultDataPath();
         }
 
             dataPath = getDefaultDataPath();
         }
 

-        final var serviceEnvironment = ServiceEnvironment.LIVE;
+        final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service_environment");
+        final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
+                ? ServiceEnvironment.LIVE
+                : ServiceEnvironment.SANDBOX;

 
         if (!ServiceConfig.getCapabilities().isGv2()) {
             logger.warn("WARNING: Support for new group V2 is disabled,"
 
         if (!ServiceConfig.getCapabilities().isGv2()) {
             logger.warn("WARNING: Support for new group V2 is disabled,"

diff --git a/src/main/java/org/asamk/signal/ServiceEnvironmentCli.java b/src/main/java/org/asamk/signal/ServiceEnvironmentCli.java
new file mode 100644 (file)
index 0000000..6e8334b
--- /dev/null
+++ b/src/main/java/org/asamk/signal/ServiceEnvironmentCli.java
@@ -0,0 +1,16 @@
+package org.asamk.signal;
+
+public enum ServiceEnvironmentCli {
+    LIVE {
+        @Override
+        public String toString() {
+            return "live";
+        }
+    },
+    SANDBOX {
+        @Override
+        public String toString() {
+            return "sandbox";
+        }
+    },
+}