X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/8163a42d3afa269242537227be2a0fe87633ea1f..6d016bcfc97c49deb76fa2c3a07ce62aee4ca8d8:/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 f1323087..4ea41734 100644 --- a/src/main/java/org/asamk/signal/manager/ServiceConfig.java +++ b/src/main/java/org/asamk/signal/manager/ServiceConfig.java @@ -1,7 +1,7 @@ package org.asamk.signal.manager; 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; @@ -9,7 +9,9 @@ import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupSe import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration; import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl; import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl; +import org.whispersystems.util.Base64; +import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -24,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"; @@ -34,9 +38,9 @@ public class ServiceConfig { private final static Optional dns = Optional.absent(); - private final static byte[] zkGroupServerPublicParams = new byte[]{}; + private final static String zkGroupServerPublicParamsHex = "AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X0="; - static final SignalServiceProfile.Capabilities capabilities = new SignalServiceProfile.Capabilities(false, false, false); + static final AccountAttributes.Capabilities capabilities = new AccountAttributes.Capabilities(false, false, false, false); public static SignalServiceConfiguration createDefaultServiceConfiguration(String userAgent) { final Interceptor userAgentInterceptor = chain -> @@ -46,6 +50,13 @@ public class ServiceConfig { final List interceptors = Collections.singletonList(userAgentInterceptor); + final byte[] zkGroupServerPublicParams; + 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)}),