From 922a3ce82704466a80329930216c72a689e43663 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 17 Jun 2024 20:04:25 +0930 Subject: [PATCH] Move x25519KeyPair --- .../onboarding/pickname/PickDisplayNameViewModel.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameViewModel.kt index 3dff6e39e7..bf19d9937d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameViewModel.kt @@ -42,11 +42,6 @@ class PickDisplayNameViewModel( val displayName = state.value.displayName - val keyPairGenerationResult = KeyPairUtilities.generate() - val seed = keyPairGenerationResult.seed - val ed25519KeyPair = keyPairGenerationResult.ed25519KeyPair - val x25519KeyPair = keyPairGenerationResult.x25519KeyPair - when { displayName.isEmpty() -> { state.update { it.copy(error = R.string.displayNameErrorDescription) } } displayName.length > NAME_PADDED_LENGTH -> { state.update { it.copy(error = R.string.displayNameErrorDescriptionShorter) } } @@ -58,6 +53,11 @@ class PickDisplayNameViewModel( database.clearAllLastMessageHashes() database.clearReceivedMessageHashValues() + val keyPairGenerationResult = KeyPairUtilities.generate() + val seed = keyPairGenerationResult.seed + val ed25519KeyPair = keyPairGenerationResult.ed25519KeyPair + val x25519KeyPair = keyPairGenerationResult.x25519KeyPair + KeyPairUtilities.store(context, seed, ed25519KeyPair, x25519KeyPair) configFactory.keyPairChanged() val userHexEncodedPublicKey = x25519KeyPair.hexEncodedPublicKey