From 1fcedca0f1dfabb41da1c5d6c6ae0764a96796c7 Mon Sep 17 00:00:00 2001 From: AsamK Date: Fri, 24 Oct 2025 10:09:27 +0200 Subject: [PATCH] Improve error message for missing verification session Fixes #1854 --- .../java/org/asamk/signal/manager/helper/AccountHelper.java | 3 +++ .../signal/manager/internal/RegistrationManagerImpl.java | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java index de3e2402..7e9f90eb 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java @@ -285,6 +285,9 @@ public class AccountHelper { } final var sessionId = account.getSessionId(newNumber); + if (sessionId == null) { + throw new IOException("No change number verification session active"); + } final var result = NumberVerificationUtils.verifyNumber(sessionId, verificationCode, pin, diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java index 72c4b63f..1c162044 100644 --- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java @@ -161,7 +161,11 @@ public class RegistrationManagerImpl implements RegistrationManager { final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI)); final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI)); - final var result = NumberVerificationUtils.verifyNumber(account.getSessionId(account.getNumber()), + final var sessionId = account.getSessionId(account.getNumber()); + if (sessionId == null) { + throw new IOException("No registration verification session active"); + } + final var result = NumberVerificationUtils.verifyNumber(sessionId, verificationCode, pin, pinHelper,