Update libsignal-service

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / config / ServiceEnvironmentConfig.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
index c2013eac242fa078395e64aa297ea221b76e9d58..8f9f8ce3a110c47a22824749bca87afd8a82edfb 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
@@ -1,59 +1,17 @@
 package org.asamk.signal.manager.config;
 
+import org.asamk.signal.manager.api.ServiceEnvironment;
+import org.signal.libsignal.net.Network;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 
-import java.util.Collection;
+import java.util.List;
 
-public class ServiceEnvironmentConfig {
-
-    private final ServiceEnvironment type;
-    private final SignalServiceConfiguration signalServiceConfiguration;
-
-    private final ECPublicKey unidentifiedSenderTrustRoot;
-
-    private final KeyBackupConfig keyBackupConfig;
-    private final Collection<KeyBackupConfig> fallbackKeyBackupConfigs;
-
-    private final String cdsMrenclave;
-
-    public ServiceEnvironmentConfig(
-            final ServiceEnvironment type,
-            final SignalServiceConfiguration signalServiceConfiguration,
-            final ECPublicKey unidentifiedSenderTrustRoot,
-            final KeyBackupConfig keyBackupConfig,
-            final Collection<KeyBackupConfig> fallbackKeyBackupConfigs,
-            final String cdsMrenclave
-    ) {
-        this.type = type;
-        this.signalServiceConfiguration = signalServiceConfiguration;
-        this.unidentifiedSenderTrustRoot = unidentifiedSenderTrustRoot;
-        this.keyBackupConfig = keyBackupConfig;
-        this.fallbackKeyBackupConfigs = fallbackKeyBackupConfigs;
-        this.cdsMrenclave = cdsMrenclave;
-    }
-
-    public ServiceEnvironment getType() {
-        return type;
-    }
-
-    public SignalServiceConfiguration getSignalServiceConfiguration() {
-        return signalServiceConfiguration;
-    }
-
-    public ECPublicKey getUnidentifiedSenderTrustRoot() {
-        return unidentifiedSenderTrustRoot;
-    }
-
-    public KeyBackupConfig getKeyBackupConfig() {
-        return keyBackupConfig;
-    }
-
-    public Collection<KeyBackupConfig> getFallbackKeyBackupConfigs() {
-        return fallbackKeyBackupConfigs;
-    }
-
-    public String getCdsMrenclave() {
-        return cdsMrenclave;
-    }
-}
+public record ServiceEnvironmentConfig(
+        ServiceEnvironment type,
+        Network.Environment netEnvironment,
+        SignalServiceConfiguration signalServiceConfiguration,
+        ECPublicKey unidentifiedSenderTrustRoot,
+        String cdsiMrenclave,
+        List<String> svr2Mrenclaves
+) {}