Rename sandbox to staging environment

To match the upstream name

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index ab9129e5f4aa770854ec36a319353e99251c34a3..8ecaa74152453507375c321c04cba60648e8d93d 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -74,10 +74,10 @@ public class ServiceConfig {
                     LiveConfig.getUnidentifiedSenderTrustRoot(),
                     LiveConfig.createKeyBackupConfig(),
                     LiveConfig.getCdsMrenclave());
                     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());

         };
     }
 }
         };
     }
 }

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironment.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironment.java
index 142a2dd48f3c2f81a283481e9c636c6b6091ed67..d83bf7d22dd67a647606cebd1b0e70094f474210 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironment.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironment.java
@@ -2,5 +2,5 @@ package org.asamk.signal.manager.config;
 
 public enum ServiceEnvironment {
     LIVE,
 
 public enum ServiceEnvironment {
     LIVE,

-    SANDBOX,
+    STAGING,

 }
 }

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
similarity index 98%
rename from lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java
rename to lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index f767a01975d4878f5a57bc3b5ef5be6e4b2ea553..71b63e71fa9ebd119529e60918cfe95cae94596e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -22,7 +22,7 @@ import java.util.Map;
 import okhttp3.Dns;
 import okhttp3.Interceptor;
 
 import okhttp3.Dns;
 import okhttp3.Interceptor;
 

-class SandboxConfig {
+class StagingConfig {

 
     private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
 
     private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");


@@ -83,6 +83,6 @@ class SandboxConfig {
         return CDS_MRENCLAVE;
     }
 
         return CDS_MRENCLAVE;
     }
 

-    private SandboxConfig() {
+    private StagingConfig() {

     }
 }
     }
 }

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 2104ffc5771041677d645bc8887a1f610d979a38..b71f549c5c72b8645cfc94e34e88cd4dcc863eef 100644 (file)
--- a/man/signal-cli.1.adoc
+++ b/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.
 
 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.
 
 *--dbus*::
 Make request via user dbus.
 

diff --git a/run_tests.sh b/run_tests.sh
index f3f33f05fa1724c48f9270041974fdca1b20da2c..277739cb6497bab05d5366af825c7d6a31faf7f7 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -30,7 +30,7 @@ fi
 
 run() {
   set -x
 
 run() {
   set -x

-  "$SIGNAL_CLI" --service-environment="sandbox" $@
+  "$SIGNAL_CLI" --service-environment="staging" $@

   set +x
 }
 
   set +x
 }
 

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 995da8d423dd5449293a305da1ec7d944f30eeff..6c4726d56e3e881de19b34388ee1fcc6bb7415e6 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -155,7 +155,7 @@ public class App {
         final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
         final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
                 ? ServiceEnvironment.LIVE
         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
 
         final var trustNewIdentityCli = ns.<TrustNewIdentityCli>get("trust-new-identities");
         final var trustNewIdentity = trustNewIdentityCli == TrustNewIdentityCli.ON_FIRST_USE

diff --git a/src/main/java/org/asamk/signal/ServiceEnvironmentCli.java b/src/main/java/org/asamk/signal/ServiceEnvironmentCli.java
index 6e8334b08cf41e49f7f704098934a4845dcfa541..6248067866d5e5149f70ffbd954074dc24f69c02 100644 (file)
--- a/src/main/java/org/asamk/signal/ServiceEnvironmentCli.java
+++ b/src/main/java/org/asamk/signal/ServiceEnvironmentCli.java
@@ -7,7 +7,13 @@ public enum ServiceEnvironmentCli {
             return "live";
         }
     },
             return "live";
         }
     },

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

         @Override
         public String toString() {
             return "sandbox";
         @Override
         public String toString() {
             return "sandbox";