Update dependencies

diff --git a/build.gradle b/build.gradle
index 6fb890155378eeb23b24a5ef4a25e4698c699cbb..5de0b6c99f8354314bdb7cfcc5226975f07a26d9 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
 }
 
 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'
     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 f1323087d260cca70ce7f6206a77b139f9bd1edc..f8394adaf1f8fec19ad4a1b599efffd55b887a76 100644 (file)
--- 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.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;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;


@@ -34,7 +36,7 @@ public class ServiceConfig {
 
     private final static Optional<Dns> dns = Optional.absent();
 
 
     private final static Optional<Dns> 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 SignalServiceProfile.Capabilities capabilities = new SignalServiceProfile.Capabilities(false, false, false);
 


@@ -46,6 +48,13 @@ public class ServiceConfig {
 
         final List<Interceptor> interceptors = Collections.singletonList(userAgentInterceptor);
 
 
         final List<Interceptor> 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)}),
         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)}),