From 3587d1c3973a084ea779e34959c28c7814e0e5c9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 5 Jan 2022 23:41:17 +0100
Subject: [PATCH] Rename sandbox to staging environment

To match the upstream name
---
 .../org/asamk/signal/manager/config/ServiceConfig.java    | 8 ++++----
 .../asamk/signal/manager/config/ServiceEnvironment.java   | 2 +-
 .../config/{SandboxConfig.java => StagingConfig.java}     | 4 ++--
 man/signal-cli.1.adoc                                     | 5 +++++
 run_tests.sh                                              | 2 +-
 src/main/java/org/asamk/signal/App.java                   | 2 +-
 src/main/java/org/asamk/signal/ServiceEnvironmentCli.java | 8 +++++++-
 7 files changed, 21 insertions(+), 10 deletions(-)
 rename lib/src/main/java/org/asamk/signal/manager/config/{SandboxConfig.java => StagingConfig.java} (98%)

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 ab9129e5..8ecaa741 100644
--- 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());
-            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 142a2dd4..d83bf7d2 100644
--- 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,
-    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 f767a019..71b63e71 100644
--- 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;
 
-class SandboxConfig {
+class StagingConfig {
 
     private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
@@ -83,6 +83,6 @@ class SandboxConfig {
         return CDS_MRENCLAVE;
     }
 
-    private SandboxConfig() {
+    private StagingConfig() {
     }
 }
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 2104ffc5..b71f549c 100644
--- 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.
 
+*--service-environment* ENVIRONMENT
+Choose the server environment to use:
+- `live` (default)
+- `staging`
+
 *--dbus*::
 Make request via user dbus.
 
diff --git a/run_tests.sh b/run_tests.sh
index f3f33f05..277739cb 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -30,7 +30,7 @@ fi
 
 run() {
   set -x
-  "$SIGNAL_CLI" --service-environment="sandbox" $@
+  "$SIGNAL_CLI" --service-environment="staging" $@
   set +x
 }
 
diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 995da8d4..6c4726d5 100644
--- 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
-                : ServiceEnvironment.SANDBOX;
+                : ServiceEnvironment.STAGING;
 
         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 6e8334b0..62480678 100644
--- 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";
         }
     },
-    SANDBOX {
+    STAGING {
+        @Override
+        public String toString() {
+            return "staging";
+        }
+    },
+    @Deprecated SANDBOX {
         @Override
         public String toString() {
             return "sandbox";
-- 
2.50.1