Update libsignal-service

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

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 5cafbdc2d4d90d0fe177ea57185671fd8832e9be..e827e3f559de34f4873358eb44346a1d155a182d 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
@@ -11,23 +11,35 @@ import okhttp3.Interceptor;
 
 public class ServiceConfig {
 
-    public final static int PREKEY_MINIMUM_COUNT = 10;
-    public final static int PREKEY_BATCH_SIZE = 100;
-    public final static int PREKEY_MAXIMUM_ID = Medium.MAX_VALUE;
+    public static final int PREKEY_MINIMUM_COUNT = 10;
+    public static final int PREKEY_BATCH_SIZE = 100;
+    public static final int PREKEY_MAXIMUM_ID = Medium.MAX_VALUE;
     public static final long PREKEY_ARCHIVE_AGE = TimeUnit.DAYS.toMillis(30);
     public static final long PREKEY_STALE_AGE = TimeUnit.DAYS.toMillis(90);
     public static final long SIGNED_PREKEY_ROTATE_AGE = TimeUnit.DAYS.toMillis(2);
 
-    public final static int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
-    public final static long MAX_ENVELOPE_SIZE = 0;
-    public final static long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
-    public final static boolean AUTOMATIC_NETWORK_RETRY = true;
-    public final static int GROUP_MAX_SIZE = 1001;
-    public final static int MAXIMUM_ONE_OFF_REQUEST_SIZE = 3;
+    public static final int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
+    public static final long MAX_ENVELOPE_SIZE = 0;
+    public static final long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
+    public static final boolean AUTOMATIC_NETWORK_RETRY = true;
+    public static final int GROUP_MAX_SIZE = 1001;
+    public static final int MAXIMUM_ONE_OFF_REQUEST_SIZE = 3;
+    public static final long UNREGISTERED_LIFESPAN = TimeUnit.DAYS.toMillis(30);
 
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var giftBadges = !isPrimaryDevice;
-        return new AccountAttributes.Capabilities(false, true, true, true, true, giftBadges, false, false);
+        final var pni = !isPrimaryDevice;
+        final var paymentActivation = !isPrimaryDevice;
+        final var deleteSync = !isPrimaryDevice;
+        return new AccountAttributes.Capabilities(true,
+                true,
+                true,
+                true,
+                true,
+                giftBadges,
+                pni,
+                paymentActivation,
+                deleteSync);
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
@@ -41,16 +53,8 @@ public class ServiceConfig {
         final var interceptors = List.of(userAgentInterceptor);
 
         return switch (serviceEnvironment) {
-            case LIVE -> new ServiceEnvironmentConfig(serviceEnvironment,
-                    LiveConfig.createDefaultServiceConfiguration(interceptors),
-                    LiveConfig.getUnidentifiedSenderTrustRoot(),
-                    LiveConfig.getCdsiMrenclave(),
-                    LiveConfig.getSvr2Mrenclave());
-            case STAGING -> new ServiceEnvironmentConfig(serviceEnvironment,
-                    StagingConfig.createDefaultServiceConfiguration(interceptors),
-                    StagingConfig.getUnidentifiedSenderTrustRoot(),
-                    StagingConfig.getCdsiMrenclave(),
-                    StagingConfig.getSvr2Mrenclave());
+            case LIVE -> LiveConfig.getServiceEnvironmentConfig(interceptors);
+            case STAGING -> StagingConfig.getServiceEnvironmentConfig(interceptors);
         };
     }
 }