From 78cd0b13dea508b80887c049fa240061b7aed7d4 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 18 Jan 2025 16:08:43 +0100 Subject: [PATCH] Update dependencies --- graalvm-config-dir/reflect-config.json | 2 -- gradle/libs.versions.toml | 6 +++--- .../signal/manager/util/NumberVerificationUtils.java | 11 ++++------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index a94d7ed6..84fba606 100644 --- a/graalvm-config-dir/reflect-config.json +++ b/graalvm-config-dir/reflect-config.json @@ -2941,7 +2941,6 @@ { "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord", "allDeclaredFields":true, - "fields":[{"name":"avatarUrlPath"}, {"name":"backupSubscriberData"}, {"name":"backupTier"}, {"name":"displayBadgesOnProfile"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hasBackup"}, {"name":"hasCompletedUsernameOnboarding"}, {"name":"hasSeenGroupStoryEducationSheet"}, {"name":"hasSetMyStoriesPrivacy"}, {"name":"hasViewedOnboardingStory"}, {"name":"keepMutedChatsArchived"}, {"name":"linkPreviews"}, {"name":"noteToSelfArchived"}, {"name":"noteToSelfMarkedUnread"}, {"name":"payments"}, {"name":"phoneNumberSharingMode"}, {"name":"pinnedConversations"}, {"name":"preferContactAvatars"}, {"name":"preferredReactionEmoji"}, {"name":"primarySendsSms"}, {"name":"profileKey"}, {"name":"readReceipts"}, {"name":"sealedSenderIndicators"}, {"name":"storiesDisabled"}, {"name":"storyViewReceiptsEnabled"}, {"name":"subscriberCurrencyCode"}, {"name":"subscriberId"}, {"name":"subscriptionManuallyCancelled"}, {"name":"typingIndicators"}, {"name":"universalExpireTimer"}, {"name":"unlistedPhoneNumber"}, {"name":"username"}, {"name":"usernameLink"}], "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }] }, { @@ -2971,7 +2970,6 @@ { "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord", "allDeclaredFields":true, - "fields":[{"name":"aci"}, {"name":"archived"}, {"name":"blocked"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hidden"}, {"name":"hideStory"}, {"name":"identityKey"}, {"name":"identityState"}, {"name":"markedUnread"}, {"name":"mutedUntilTimestamp"}, {"name":"nickname"}, {"name":"note"}, {"name":"pni"}, {"name":"pniSignatureVerified"}, {"name":"profileKey"}, {"name":"systemFamilyName"}, {"name":"systemGivenName"}, {"name":"systemNickname"}, {"name":"unregisteredAtTimestamp"}, {"name":"username"}, {"name":"whitelisted"}], "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }] }, { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9a5d4fee..14dc6066 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ slf4j = "2.0.16" [libraries] -bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.79" +bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.80" jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.2" argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0" dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0" @@ -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_115" -sqlite = "org.xerial:sqlite-jdbc:3.47.2.0" +signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_116" +sqlite = "org.xerial:sqlite-jdbc:3.48.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/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java index e0c4b619..388333ad 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 @@ -11,9 +11,9 @@ import org.asamk.signal.manager.helper.PinHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.signalservice.api.kbs.MasterKey; +import org.whispersystems.signalservice.api.push.exceptions.ChallengeRequiredException; import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException; import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; -import org.whispersystems.signalservice.api.push.exceptions.PushChallengeRequiredException; import org.whispersystems.signalservice.api.push.exceptions.TokenNotAcceptedException; import org.whispersystems.signalservice.api.registration.RegistrationApi; import org.whispersystems.signalservice.internal.push.LockedException; @@ -39,8 +39,7 @@ public class NumberVerificationUtils { RegistrationSessionMetadataResponse sessionResponse; try { sessionResponse = getValidSession(registrationApi, sessionId); - } catch (PushChallengeRequiredException | - org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException e) { + } catch (ChallengeRequiredException e) { if (captcha != null) { sessionResponse = submitCaptcha(registrationApi, sessionId, captcha); } else { @@ -99,7 +98,7 @@ public class NumberVerificationUtils { voiceVerification ? VerificationCodeTransport.VOICE : VerificationCodeTransport.SMS); try { Utils.handleResponseException(response); - } catch (org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException e) { + } catch (ChallengeRequiredException e) { throw new CaptchaRequiredException(e.getMessage(), e); } catch (org.whispersystems.signalservice.api.push.exceptions.NonNormalizedPhoneNumberException e) { throw new NonNormalizedPhoneNumberException("Phone number is not normalized (" @@ -179,9 +178,7 @@ public class NumberVerificationUtils { captcha = captcha == null ? null : captcha.replace("signalcaptcha://", ""); try { return Utils.handleResponseException(registrationApi.submitCaptchaToken(sessionId, captcha)); - } catch (PushChallengeRequiredException | - org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException | - TokenNotAcceptedException _e) { + } catch (ChallengeRequiredException | TokenNotAcceptedException _e) { throw new CaptchaRequiredException("Captcha not accepted"); } catch (NonSuccessfulResponseCodeException e) { if (e.code == 400) { -- 2.50.1