From: AsamK Date: Fri, 7 Feb 2025 16:31:29 +0000 (+0100) Subject: Update dependencies X-Git-Tag: v0.13.13~14 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/dfa886fae938f126a845b62f1c8b5d64888160f9 Update dependencies --- diff --git a/build.gradle.kts b/build.gradle.kts index f51d9f1c..3f728938 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { application eclipse `check-lib-versions` - id("org.graalvm.buildtools.native") version "0.10.4" + id("org.graalvm.buildtools.native") version "0.10.5" } allprojects { diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json index fc76b7f9..7c68c6d6 100644 --- a/graalvm-config-dir/jni-config.json +++ b/graalvm-config-dir/jni-config.json @@ -88,7 +88,7 @@ }, { "name":"org.signal.libsignal.internal.CompletableFuture", - "methods":[{"name":"","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }] + "methods":[{"name":"","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }, {"name":"completeExceptionally","parameterTypes":["java.lang.Throwable"] }] }, { "name":"org.signal.libsignal.net.CdsiLookupResponse", @@ -110,6 +110,10 @@ { "name":"org.signal.libsignal.net.ChatService$ResponseAndDebugInfo" }, +{ + "name":"org.signal.libsignal.net.NetworkException", + "methods":[{"name":"","parameterTypes":["java.lang.String"] }] +}, { "name":"org.signal.libsignal.protocol.DuplicateMessageException", "methods":[{"name":"","parameterTypes":["java.lang.String"] }] diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json index 8bd8a7af..b9ead797 100644 --- 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_testing_amd64.so\\E" }, { "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E" }, { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 14dc6066..be95c8bb 100644 --- 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" -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" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b..cea7a793 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ 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 diff --git a/gradlew b/gradlew index f5feea6d..f3b75f3b 100755 --- 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) -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 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 388333ad..921d7fc1 100644 --- 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); - if (sessionResponse.getBody().getVerified()) { + if (sessionResponse.getMetadata().getVerified()) { return sessionId; } - if (sessionResponse.getBody().getAllowedToRequestCode()) { + if (sessionResponse.getMetadata().getAllowedToRequestCode()) { 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) { - final var timestamp = sessionResponse.getHeaders().getTimestamp() + nextAttempt * 1000; + final var timestamp = sessionResponse.getClientReceivedAtMilliseconds() + nextAttempt * 1000; throw new RateLimitException(timestamp); } - final var nextVerificationAttempt = sessionResponse.getBody().getNextVerificationAttempt(); + final var nextVerificationAttempt = sessionResponse.getMetadata().getNextVerificationAttempt(); if (nextVerificationAttempt != null && nextVerificationAttempt > 0) { - final var timestamp = sessionResponse.getHeaders().getTimestamp() + nextVerificationAttempt * 1000; + final var timestamp = sessionResponse.getClientReceivedAtMilliseconds() + nextVerificationAttempt * 1000; 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 (!sessionResponse.getBody().getAllowedToRequestCode()) { + if (!sessionResponse.getMetadata().getAllowedToRequestCode()) { throw new CaptchaRequiredException("Captcha Required"); } }