X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/22336460cc4a1f65b6b8cce96831862c7679e19a..c10910e4660e96c24dce35455c31ec8056d9088c:/src/main/java/org/asamk/signal/manager/ServiceConfig.java

diff --git a/src/main/java/org/asamk/signal/manager/ServiceConfig.java b/src/main/java/org/asamk/signal/manager/ServiceConfig.java
index f8394ada..7f7d5570 100644
--- a/src/main/java/org/asamk/signal/manager/ServiceConfig.java
+++ b/src/main/java/org/asamk/signal/manager/ServiceConfig.java
@@ -1,7 +1,8 @@
 package org.asamk.signal.manager;
 
+import org.signal.zkgroup.ServerPublicParams;
 import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
+import org.whispersystems.signalservice.api.account.AccountAttributes;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
@@ -13,7 +14,6 @@ import org.whispersystems.util.Base64;
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -26,6 +26,8 @@ public class ServiceConfig {
     final static int PREKEY_MINIMUM_COUNT = 20;
     final static int PREKEY_BATCH_SIZE = 100;
     final static int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
+    final static int MAX_ENVELOPE_SIZE = 0;
+    final static long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
 
     private final static String URL = "https://textsecure-service.whispersystems.org";
     private final static String CDN_URL = "https://cdn.signal.org";
@@ -37,41 +39,50 @@ public class ServiceConfig {
     private final static Optional<Dns> dns = Optional.absent();
 
     private final static String zkGroupServerPublicParamsHex = "AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X0=";
+    private final static byte[] zkGroupServerPublicParams;
 
-    static final SignalServiceProfile.Capabilities capabilities = new SignalServiceProfile.Capabilities(false, false, false);
+    static final AccountAttributes.Capabilities capabilities;
 
-    public static SignalServiceConfiguration createDefaultServiceConfiguration(String userAgent) {
-        final Interceptor userAgentInterceptor = chain ->
-                chain.proceed(chain.request().newBuilder()
-                        .header("User-Agent", userAgent)
-                        .build());
-
-        final List<Interceptor> interceptors = Collections.singletonList(userAgentInterceptor);
-
-        final byte[] zkGroupServerPublicParams;
+    static {
         try {
             zkGroupServerPublicParams = Base64.decode(zkGroupServerPublicParamsHex);
         } catch (IOException e) {
             throw new AssertionError(e);
         }
 
-        return new SignalServiceConfiguration(
-                new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)},
-                makeSignalCdnUrlMapFor(new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)}, new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
+        boolean zkGroupAvailable;
+        try {
+            new ServerPublicParams(zkGroupServerPublicParams);
+            zkGroupAvailable = true;
+        } catch (Throwable ignored) {
+            zkGroupAvailable = false;
+        }
+        capabilities = new AccountAttributes.Capabilities(false, zkGroupAvailable, false, zkGroupAvailable);
+    }
+
+    public static SignalServiceConfiguration createDefaultServiceConfiguration(String userAgent) {
+        final Interceptor userAgentInterceptor = chain -> chain.proceed(chain.request()
+                .newBuilder()
+                .header("User-Agent", userAgent)
+                .build());
+
+        final List<Interceptor> interceptors = Collections.singletonList(userAgentInterceptor);
+
+        return new SignalServiceConfiguration(new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)},
+                makeSignalCdnUrlMapFor(new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
+                        new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
                 new SignalContactDiscoveryUrl[0],
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 interceptors,
                 dns,
-                zkGroupServerPublicParams
-        );
+                zkGroupServerPublicParams);
     }
 
-    private static Map<Integer, SignalCdnUrl[]> makeSignalCdnUrlMapFor(SignalCdnUrl[] cdn0Urls, SignalCdnUrl[] cdn2Urls) {
-        Map<Integer, SignalCdnUrl[]> result = new HashMap<>();
-        result.put(0, cdn0Urls);
-        result.put(2, cdn2Urls);
-        return Collections.unmodifiableMap(result);
+    private static Map<Integer, SignalCdnUrl[]> makeSignalCdnUrlMapFor(
+            SignalCdnUrl[] cdn0Urls, SignalCdnUrl[] cdn2Urls
+    ) {
+        return Map.of(0, cdn0Urls, 2, cdn2Urls);
     }
 
     private ServiceConfig() {