From: AsamK Date: Thu, 4 Jun 2020 15:07:03 +0000 (+0200) Subject: Update dependencies X-Git-Tag: v0.6.9~28 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/22336460cc4a1f65b6b8cce96831862c7679e19a?ds=sidebyside Update dependencies --- diff --git a/build.gradle b/build.gradle index 6fb89015..5de0b6c9 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ repositories { } dependencies { - implementation 'com.github.turasa:signal-service-java:2.15.3_unofficial_10' + implementation 'com.github.turasa:signal-service-java:2.15.3_unofficial_11' implementation 'org.bouncycastle:bcprov-jdk15on:1.65' implementation 'net.sourceforge.argparse4j:argparse4j:0.8.1' implementation 'com.github.hypfvieh:dbus-java:3.2.1' diff --git a/src/main/java/org/asamk/signal/manager/ServiceConfig.java b/src/main/java/org/asamk/signal/manager/ServiceConfig.java index f1323087..f8394ada 100644 --- a/src/main/java/org/asamk/signal/manager/ServiceConfig.java +++ b/src/main/java/org/asamk/signal/manager/ServiceConfig.java @@ -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; @@ -34,7 +36,7 @@ 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); @@ -46,6 +48,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)}),