Update libsignal-service-java

diff --git a/build.gradle.kts b/build.gradle.kts
index d0ef32f68f6239cb34907ce337da9a81fb00075c..926ae182ad4a87ac5f9f2c7c3cb290bcd82bbb67 100644 (file)
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,7 +21,6 @@ graalvmNative {
     binaries {
         this["main"].run {
             configurationFileDirectories.from(file("graalvm-config-dir"))
     binaries {
         this["main"].run {
             configurationFileDirectories.from(file("graalvm-config-dir"))

-            buildArgs.add("--allow-incomplete-classpath")

             buildArgs.add("--report-unsupported-elements-at-runtime")
         }
     }
             buildArgs.add("--report-unsupported-elements-at-runtime")
         }
     }


@@ -34,7 +33,7 @@ repositories {
 
 dependencies {
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
 
 dependencies {
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")

-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.2.2")
+    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3")

     implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
     implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.0.0")
     implementation("org.slf4j", "slf4j-api", "1.7.36")
     implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
     implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.0.0")
     implementation("org.slf4j", "slf4j-api", "1.7.36")

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index e1590dc20dc63543fb691ac532137868ae4cc558..cad9ca8b510b926b3fd9091ee6fc1584a7d75cc2 100644 (file)
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -14,8 +14,8 @@ repositories {
 }
 
 dependencies {
 }
 
 dependencies {

-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_48")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.2.2")
+    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_49")
+    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3")

     implementation("com.google.protobuf", "protobuf-javalite", "3.11.4")
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
     implementation("org.slf4j", "slf4j-api", "1.7.36")
     implementation("com.google.protobuf", "protobuf-javalite", "3.11.4")
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
     implementation("org.slf4j", "slf4j-api", "1.7.36")

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 9c15bc710a3ef1facdda4c2e43c08fccc9eb808c..98e1f026d03f27a03028aade1aec0a3fe7c0063e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -6,7 +6,7 @@ import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;

-import org.whispersystems.signalservice.internal.configuration.SignalCdshUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;

 import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;


@@ -39,7 +39,7 @@ class LiveConfig {
     private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api.directory.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 String SIGNAL_CONTACT_DISCOVERY_URL = "https://api.directory.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 String SIGNAL_CDSH_URL = "";
+    private final static String SIGNAL_CDSI_URL = "";

     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
     private final static Optional<Dns> dns = Optional.empty();
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
     private final static Optional<Dns> dns = Optional.empty();


@@ -60,7 +60,7 @@ class LiveConfig {
                         TRUST_STORE)},
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                         TRUST_STORE)},
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},

-                new SignalCdshUrl[]{new SignalCdshUrl(SIGNAL_CDSH_URL, TRUST_STORE)},
+                new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},

                 interceptors,
                 dns,
                 proxy,
                 interceptors,
                 dns,
                 proxy,

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index bba5b333b2de45d1baf2c1611f301fb54bf1dd9a..8faec0eb6dfd5fbaecd3652203ca52a8d6f0fef5 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -6,7 +6,7 @@ import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;

-import org.whispersystems.signalservice.internal.configuration.SignalCdshUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;

 import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;


@@ -39,7 +39,7 @@ class StagingConfig {
     private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api-staging.directory.signal.org";
     private final static String SIGNAL_KEY_BACKUP_URL = "https://api-staging.backup.signal.org";
     private final static String STORAGE_URL = "https://storage-staging.signal.org";
     private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api-staging.directory.signal.org";
     private final static String SIGNAL_KEY_BACKUP_URL = "https://api-staging.backup.signal.org";
     private final static String STORAGE_URL = "https://storage-staging.signal.org";

-    private final static String SIGNAL_CDSH_URL = "https://cdsh.staging.signal.org";
+    private final static String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org";

     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
     private final static Optional<Dns> dns = Optional.empty();
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
     private final static Optional<Dns> dns = Optional.empty();


@@ -60,7 +60,7 @@ class StagingConfig {
                         TRUST_STORE)},
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                         TRUST_STORE)},
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},

-                new SignalCdshUrl[]{new SignalCdshUrl(SIGNAL_CDSH_URL, TRUST_STORE)},
+                new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},

                 interceptors,
                 dns,
                 proxy,
                 interceptors,
                 dns,
                 proxy,