Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show correct dialog when validating AEP after registration.

Browse Source
This commit is contained in:
Cody Henthorne
2025-10-03 14:57:41 -04:00
committed by Michelle Tang
parent aa3a797e19
commit 8b19cbb603
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyFragment.kt
View File

@@ -24,6 +24,7 @@ import org.signal.core.ui.compose.Dialogs
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.compose.ComposeFragment
import org.thoughtcrime.securesms.registration.ui.restore.AccountEntropyPoolVerification
import org.thoughtcrime.securesms.registration.ui.restore.EnterBackupKeyScreen
import org.thoughtcrime.securesms.util.CommunicationActions
import org.thoughtcrime.securesms.util.navigation.safeNavigate
@@ -79,8 +80,8 @@ class PostRegistrationEnterBackupKeyFragment : ComposeFragment() {
) {
ErrorContent(
showBackupTierNotRestoreError = state.showBackupTierNotRestoreError,
onBackupTierRetry = { viewModel.restoreBackupTier() },
onCancel = { findNavController().popBackStack() },
aepError = state.aepValidationError,
onBackupKeyHelp = { CommunicationActions.openBrowserLink(requireContext(), LEARN_MORE_URL) },
onBackupTierNotRestoredDismiss = viewModel::hideRestoreBackupTierFailed
)
}
@@ -90,18 +91,18 @@ class PostRegistrationEnterBackupKeyFragment : ComposeFragment() {
@Composable
private fun ErrorContent(
showBackupTierNotRestoreError: Boolean,
onBackupTierRetry: () -> Unit = {},
onCancel: () -> Unit = {},
aepError: AccountEntropyPoolVerification.AEPValidationError?,
onBackupKeyHelp: () -> Unit = {},
onBackupTierNotRestoredDismiss: () -> Unit = {}
) {
if (showBackupTierNotRestoreError) {
if (aepError == AccountEntropyPoolVerification.AEPValidationError.Incorrect && showBackupTierNotRestoreError) {
Dialogs.SimpleAlertDialog(
title = stringResource(R.string.EnterBackupKey_backup_not_found),
body = stringResource(R.string.EnterBackupKey_backup_key_you_entered_is_correct_but_no_backup),
title = stringResource(R.string.EnterBackupKey_incorrect_backup_key_title),
body = stringResource(R.string.EnterBackupKey_incorrect_backup_key_message),
confirm = stringResource(R.string.EnterBackupKey_try_again),
dismiss = stringResource(R.string.EnterBackupKey_skip_restore),
onConfirm = onBackupTierRetry,
onDeny = onCancel,
dismiss = stringResource(R.string.EnterBackupKey_backup_key_help),
onConfirm = {},
onDeny = onBackupKeyHelp,
onDismiss = onBackupTierNotRestoredDismiss
)
}

2
app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyViewModel.kt
View File

@@ -70,7 +70,7 @@ class PostRegistrationEnterBackupKeyViewModel : ViewModel() {
store.update { it.copy(restoreBackupTierSuccessful = true) }
} else {
Log.w(TAG, "Unable to validate AEP against currently registered account")
store.update { it.copy(showBackupTierNotRestoreError = true) }
store.update { it.copy(aepValidationError = AEPValidationError.Incorrect, showBackupTierNotRestoreError = true) }
}
}
}