Update dependencies

[signal-cli] / src / main / java / org / asamk / signal / manager / BaseConfig.java

diff --git a/src/main/java/org/asamk/signal/manager/BaseConfig.java b/src/main/java/org/asamk/signal/manager/BaseConfig.java
index f204941c7d8d3378b5a473da8ad92426dc2017bb..ade0288d595d4b8ded13bf2edfa9e9ccc5e6baa7 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/manager/BaseConfig.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.manager;
 
 package org.asamk.signal.manager;
 

+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;

 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;


@@ -9,8 +11,11 @@ import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
 
 import java.util.Collections;
 import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
 
 import java.util.Collections;

+import java.util.HashMap;

 import java.util.List;
 import java.util.List;

+import java.util.Map;

 
 

+import okhttp3.Dns;

 import okhttp3.Interceptor;
 
 public class BaseConfig {
 import okhttp3.Interceptor;
 
 public class BaseConfig {


@@ -26,10 +31,13 @@ public class BaseConfig {
 
     private final static String URL = "https://textsecure-service.whispersystems.org";
     private final static String CDN_URL = "https://cdn.signal.org";
 
     private final static String URL = "https://textsecure-service.whispersystems.org";
     private final static String CDN_URL = "https://cdn.signal.org";

+    private final static String CDN2_URL = "https://cdn2.signal.org";

     private final static String SIGNAL_KEY_BACKUP_URL = "https://api.backup.signal.org";
     private final static String STORAGE_URL = "https://storage.signal.org";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
     private final static String SIGNAL_KEY_BACKUP_URL = "https://api.backup.signal.org";
     private final static String STORAGE_URL = "https://storage.signal.org";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 

+    private final static Optional<Dns> dns = Optional.absent();
+

     private final static Interceptor userAgentInterceptor = chain ->
             chain.proceed(chain.request().newBuilder()
                     .header("User-Agent", USER_AGENT)
     private final static Interceptor userAgentInterceptor = chain ->
             chain.proceed(chain.request().newBuilder()
                     .header("User-Agent", USER_AGENT)


@@ -37,15 +45,28 @@ public class BaseConfig {
 
     private final static List<Interceptor> interceptors = Collections.singletonList(userAgentInterceptor);
 
 
     private final static List<Interceptor> interceptors = Collections.singletonList(userAgentInterceptor);
 

+    private final static byte[] zkGroupServerPublicParams = new byte[]{};
+

     final static SignalServiceConfiguration serviceConfiguration = new SignalServiceConfiguration(
             new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)},
     final static SignalServiceConfiguration serviceConfiguration = new SignalServiceConfiguration(
             new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)},

-            new SignalCdnUrl[]{new SignalCdnUrl(CDN_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)},
             new SignalContactDiscoveryUrl[0],
             new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
             new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},

-            interceptors
+            interceptors,
+            dns,
+            zkGroupServerPublicParams

     );
 
     );
 

+    static final SignalServiceProfile.Capabilities capabilities = new SignalServiceProfile.Capabilities(false, false, false);
+

     private BaseConfig() {
     }
     private BaseConfig() {
     }

+
+    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);
+    }

 }
 }