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

Fix backup restore after captcha navigation bug.

Browse Source
This commit is contained in:
Cody Henthorne
2025-11-20 12:03:24 -05:00
parent cc3919244b
commit 25481b7408
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
View File

@@ -248,6 +248,18 @@ class RegistrationViewModel : ViewModel() {
}
}
fun clearPreviousRegistrationState() {
store.update {
it.copy(
sessionId = null,
captchaToken = null,
challengesRequested = emptyList(),
challengeInProgress = false,
fcmToken = null
)
}
}
fun onBackupSuccessfullyRestored() {
val recoveryPassword = SignalStore.svr.recoveryPassword
store.update {

1
app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectManualRestoreMethodFragment.kt
View File

@@ -81,6 +81,7 @@ class SelectManualRestoreMethodFragment : ComposeFragment() {
private fun startRestoreMethod(method: RestoreMethod) {
when (method) {
RestoreMethod.FROM_SIGNAL_BACKUPS -> {
sharedViewModel.clearPreviousRegistrationState()
sharedViewModel.intendToRestore(hasOldDevice = false, fromRemote = true)
findNavController().safeNavigate(SelectManualRestoreMethodFragmentDirections.goToEnterPhoneNumber(EnterPhoneNumberMode.COLLECT_FOR_MANUAL_SIGNAL_BACKUPS_RESTORE))
}