Update dependencies

diff --git a/build.gradle.kts b/build.gradle.kts
index f51d9f1ce870eb47a68a928516e77bbf64060ee6..3f728938d95ef81723742cb9b9a8acdb97caba37 100644 (file)
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
     application
     eclipse
     `check-lib-versions`

-    id("org.graalvm.buildtools.native") version "0.10.4"
+    id("org.graalvm.buildtools.native") version "0.10.5"

 }
 
 allprojects {
 }
 
 allprojects {

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index fc76b7f95222e3275ff3c6430e9adf71e579533d..7c68c6d6b6b1d8c4408c05cedbc508a16530f80d 100644 (file)
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -88,7 +88,7 @@
 },
 {
   "name":"org.signal.libsignal.internal.CompletableFuture",
 },
 {
   "name":"org.signal.libsignal.internal.CompletableFuture",

-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }, {"name":"completeExceptionally","parameterTypes":["java.lang.Throwable"] }]

 },
 {
   "name":"org.signal.libsignal.net.CdsiLookupResponse",
 },
 {
   "name":"org.signal.libsignal.net.CdsiLookupResponse",


@@ -110,6 +110,10 @@
 {
   "name":"org.signal.libsignal.net.ChatService$ResponseAndDebugInfo"
 },
 {
   "name":"org.signal.libsignal.net.ChatService$ResponseAndDebugInfo"
 },

+{
+  "name":"org.signal.libsignal.net.NetworkException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},

 {
   "name":"org.signal.libsignal.protocol.DuplicateMessageException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 {
   "name":"org.signal.libsignal.protocol.DuplicateMessageException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]

diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 8bd8a7aff7ad0e1c4327674aae5ac76ab1d1f3fe..b9ead797f4e22f997b1762f483971435878da553 100644 (file)
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -188,6 +188,8 @@
     "pattern":"\\Qlibsignal_jni_amd64.dylib\\E"
   }, {
     "pattern":"\\Qlibsignal_jni_amd64.so\\E"
     "pattern":"\\Qlibsignal_jni_amd64.dylib\\E"
   }, {
     "pattern":"\\Qlibsignal_jni_amd64.so\\E"

+  }, {
+    "pattern":"\\Qlibsignal_jni_testing_amd64.so\\E"

   }, {
     "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
   }, {
   }, {
     "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
   }, {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 14dc6066ca3603bcb6eccc36a79bf46fa813013d..be95c8bb6ae65df182660520d4939c3d27d68fad 100644 (file)
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,8 +10,8 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.16"
 
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.16"
 

-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_116"
-sqlite = "org.xerial:sqlite-jdbc:3.48.0.0"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_117"
+sqlite = "org.xerial:sqlite-jdbc:3.49.0.0"

 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.4"
 junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.4"
 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.4"
 junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.4"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index df97d72b8b91fa0e088ae27b1c84a6063481fe22..cea7a793a84b44ca4cfb911a13deaab8ea20589f 100644 (file)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists

-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip

 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
index f5feea6d6b116baaca5a2642d4d9fa1f47d574a7..f3b75f3b0d4faeb4b1c8a02b5c47007e6efb7dcd 100755 (executable)
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)

-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 388333adb7b9f84dd7beded5fb2d03d6c8ac398a..921d7fc176e1563d325be43c7b1309eaee73d124 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -47,38 +47,38 @@ public class NumberVerificationUtils {
             }
         }
 
             }
         }
 

-        sessionId = sessionResponse.getBody().getId();
+        sessionId = sessionResponse.getMetadata().getId();

         sessionIdSaver.accept(sessionId);
 
         sessionIdSaver.accept(sessionId);
 

-        if (sessionResponse.getBody().getVerified()) {
+        if (sessionResponse.getMetadata().getVerified()) {

             return sessionId;
         }
 
             return sessionId;
         }
 

-        if (sessionResponse.getBody().getAllowedToRequestCode()) {
+        if (sessionResponse.getMetadata().getAllowedToRequestCode()) {

             return sessionId;
         }
 
         final var nextAttempt = voiceVerification
             return sessionId;
         }
 
         final var nextAttempt = voiceVerification

-                ? sessionResponse.getBody().getNextCall()
-                : sessionResponse.getBody().getNextSms();
+                ? sessionResponse.getMetadata().getNextCall()
+                : sessionResponse.getMetadata().getNextSms();

         if (nextAttempt == null) {
             throw new VerificationMethodNotAvailableException();
         } else if (nextAttempt > 0) {
         if (nextAttempt == null) {
             throw new VerificationMethodNotAvailableException();
         } else if (nextAttempt > 0) {

-            final var timestamp = sessionResponse.getHeaders().getTimestamp() + nextAttempt * 1000;
+            final var timestamp = sessionResponse.getClientReceivedAtMilliseconds() + nextAttempt * 1000;

             throw new RateLimitException(timestamp);
         }
 
             throw new RateLimitException(timestamp);
         }
 

-        final var nextVerificationAttempt = sessionResponse.getBody().getNextVerificationAttempt();
+        final var nextVerificationAttempt = sessionResponse.getMetadata().getNextVerificationAttempt();

         if (nextVerificationAttempt != null && nextVerificationAttempt > 0) {
         if (nextVerificationAttempt != null && nextVerificationAttempt > 0) {

-            final var timestamp = sessionResponse.getHeaders().getTimestamp() + nextVerificationAttempt * 1000;
+            final var timestamp = sessionResponse.getClientReceivedAtMilliseconds() + nextVerificationAttempt * 1000;

             throw new CaptchaRequiredException(timestamp);
         }
 
             throw new CaptchaRequiredException(timestamp);
         }
 

-        if (sessionResponse.getBody().getRequestedInformation().contains("captcha")) {
+        if (sessionResponse.getMetadata().getRequestedInformation().contains("captcha")) {

             if (captcha != null) {
                 sessionResponse = submitCaptcha(registrationApi, sessionId, captcha);
             }
             if (captcha != null) {
                 sessionResponse = submitCaptcha(registrationApi, sessionId, captcha);
             }

-            if (!sessionResponse.getBody().getAllowedToRequestCode()) {
+            if (!sessionResponse.getMetadata().getAllowedToRequestCode()) {

                 throw new CaptchaRequiredException("Captcha Required");
             }
         }
                 throw new CaptchaRequiredException("Captcha Required");
             }
         }