From a4f7632981526b8adc4c760a15c81fbe08023b58 Mon Sep 17 00:00:00 2001 From: AsamK Date: Fri, 27 Jan 2023 21:26:00 +0100 Subject: [PATCH] Update dependencies --- graalvm-config-dir/reflect-config.json | 11 +++++++++++ lib/build.gradle.kts | 4 ++-- .../java/org/asamk/signal/manager/ManagerImpl.java | 3 ++- .../org/asamk/signal/manager/config/LiveConfig.java | 3 ++- .../asamk/signal/manager/config/ServiceConfig.java | 1 + .../asamk/signal/manager/config/StagingConfig.java | 3 ++- .../signal/manager/util/NumberVerificationUtils.java | 6 ++++-- 7 files changed, 24 insertions(+), 7 deletions(-) diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index 61a3b144..a8573bf4 100644 --- a/graalvm-config-dir/reflect-config.json +++ b/graalvm-config-dir/reflect-config.json @@ -2756,6 +2756,16 @@ {"name":"width_"} ] }, +{ + "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$BodyRange", + "fields":[ + {"name":"associatedValueCase_"}, + {"name":"associatedValue_"}, + {"name":"bitField0_"}, + {"name":"length_"}, + {"name":"start_"} + ] +}, { "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage", "fields":[ @@ -3190,6 +3200,7 @@ "fields":[ {"name":"bitField0_"}, {"name":"blocked_"}, + {"name":"callEvent_"}, {"name":"configuration_"}, {"name":"contacts_"}, {"name":"fetchLatest_"}, diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 0f91ee7a..0602bc92 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_65") + implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_66") implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.1") implementation("com.google.protobuf", "protobuf-javalite", "3.21.12") implementation("org.bouncycastle", "bcprov-jdk15on", "1.70") @@ -22,7 +22,7 @@ dependencies { implementation("org.xerial", "sqlite-jdbc", "3.40.0.0") implementation("com.zaxxer", "HikariCP", "5.0.1") - testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.1") + testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.2") } tasks.named("test") { diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java index 5191e2d9..bb55746c 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java @@ -588,7 +588,8 @@ class ManagerImpl implements Manager { quote.message(), List.of(), resolveMentions(quote.mentions()), - SignalServiceDataMessage.Quote.Type.NORMAL)); + SignalServiceDataMessage.Quote.Type.NORMAL, + List.of())); } if (message.sticker().isPresent()) { final var sticker = message.sticker().get(); 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 977544f2..19fc8873 100644 --- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java +++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java @@ -71,7 +71,8 @@ class LiveConfig { interceptors, dns, proxy, - zkGroupServerPublicParams); + zkGroupServerPublicParams, + true); } static ECPublicKey getUnidentifiedSenderTrustRoot() { diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java index 72b089f9..1ee72051 100644 --- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java +++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java @@ -40,6 +40,7 @@ public class ServiceConfig { true, true, false, + false, false); try { 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 050726b6..75fda55a 100644 --- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java +++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java @@ -71,7 +71,8 @@ class StagingConfig { interceptors, dns, proxy, - zkGroupServerPublicParams); + zkGroupServerPublicParams, + true); } static ECPublicKey getUnidentifiedSenderTrustRoot() { 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 280c9fbc..a4c2ba24 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 @@ -25,13 +25,15 @@ public class NumberVerificationUtils { ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException { captcha = captcha == null ? null : captcha.replace("signalcaptcha://", ""); final ServiceResponse response; + final var locale = Utils.getDefaultLocale(Locale.US); if (voiceVerification) { - response = accountManager.requestVoiceVerificationCode(Utils.getDefaultLocale(Locale.US), + response = accountManager.requestVoiceVerificationCode(locale, Optional.ofNullable(captcha), Optional.empty(), Optional.empty()); } else { - response = accountManager.requestSmsVerificationCode(false, + response = accountManager.requestSmsVerificationCode(locale, + false, Optional.ofNullable(captcha), Optional.empty(), Optional.empty()); -- 2.50.1