Rename sandbox to staging environment

To match the upstream name

lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java

@@ -74,10 +74,10 @@ public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
                     LiveConfig.getUnidentifiedSenderTrustRoot(),
                     LiveConfig.createKeyBackupConfig(),
                     LiveConfig.getCdsMrenclave());
-            case SANDBOX -> new ServiceEnvironmentConfig(SandboxConfig.createDefaultServiceConfiguration(interceptors),
-                    SandboxConfig.getUnidentifiedSenderTrustRoot(),
-                    SandboxConfig.createKeyBackupConfig(),
-                    SandboxConfig.getCdsMrenclave());
+            case STAGING -> new ServiceEnvironmentConfig(StagingConfig.createDefaultServiceConfiguration(interceptors),
+                    StagingConfig.getUnidentifiedSenderTrustRoot(),
+                    StagingConfig.createKeyBackupConfig(),
+                    StagingConfig.getCdsMrenclave());
         };
     }
 }

lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironment.java

@@ -2,5 +2,5 @@
 
 public enum ServiceEnvironment {
     LIVE,
-    SANDBOX,
+    STAGING,
 }

lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java → lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java

@@ -22,7 +22,7 @@
 import okhttp3.Dns;
 import okhttp3.Interceptor;
 
-class SandboxConfig {
+class StagingConfig {
 
     private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
@@ -83,6 +83,6 @@ static String getCdsMrenclave() {
         return CDS_MRENCLAVE;
     }
 
-    private SandboxConfig() {
+    private StagingConfig() {
     }
 }

man/signal-cli.1.adoc

@@ -50,6 +50,11 @@ This flag must not be given for the `link` command.
 It is optional for the `daemon` command.
 For all other commands it is only optional if there is exactly one local user in the config directory.
 
+*--service-environment* ENVIRONMENT
+Choose the server environment to use:
+- `live` (default)
+- `staging`
+
 *--dbus*::
 Make request via user dbus.
 

run_tests.sh

@@ -30,7 +30,7 @@ fi
 
 run() {
   set -x
-  "$SIGNAL_CLI" --service-environment="sandbox" $@
+  "$SIGNAL_CLI" --service-environment="staging" $@
   set +x
 }
 

src/main/java/org/asamk/signal/App.java

@@ -155,7 +155,7 @@ public void init() throws CommandException {
         final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
         final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
                 ? ServiceEnvironment.LIVE
-                : ServiceEnvironment.SANDBOX;
+                : ServiceEnvironment.STAGING;
 
         final var trustNewIdentityCli = ns.<TrustNewIdentityCli>get("trust-new-identities");
         final var trustNewIdentity = trustNewIdentityCli == TrustNewIdentityCli.ON_FIRST_USE

src/main/java/org/asamk/signal/ServiceEnvironmentCli.java

@@ -7,7 +7,13 @@ public String toString() {
             return "live";
         }
     },
-    SANDBOX {
+    STAGING {
+        @Override
+        public String toString() {
+            return "staging";
+        }
+    },
+    @Deprecated SANDBOX {
         @Override
         public String toString() {
             return "sandbox";