mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-07-09 15:34:27 +01:00
Fix character swapping during backup restore.
This commit is contained in:
+3
-3
@@ -48,7 +48,7 @@ import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen
|
||||
|
||||
@Composable
|
||||
fun EnterLocalBackupKeyScreen(
|
||||
backupKey: String,
|
||||
enteredText: String,
|
||||
isRegistrationInProgress: Boolean,
|
||||
isBackupKeyValid: Boolean,
|
||||
aepValidationError: AccountEntropyPoolVerification.AEPValidationError?,
|
||||
@@ -95,7 +95,7 @@ fun EnterLocalBackupKeyScreen(
|
||||
}
|
||||
) {
|
||||
TextField(
|
||||
value = backupKey,
|
||||
value = enteredText,
|
||||
onValueChange = { value ->
|
||||
onBackupKeyChanged(value)
|
||||
autoFillHelper.onValueChanged(value)
|
||||
@@ -160,7 +160,7 @@ private fun ValidationErrorMessage(error: AccountEntropyPoolVerification.AEPVali
|
||||
private fun EnterLocalBackupKeyScreenPreview() {
|
||||
Previews.Preview {
|
||||
EnterLocalBackupKeyScreen(
|
||||
backupKey = "",
|
||||
enteredText = "",
|
||||
isRegistrationInProgress = false,
|
||||
isBackupKeyValid = false,
|
||||
aepValidationError = null,
|
||||
|
||||
+1
-1
@@ -107,7 +107,7 @@ class RestoreLocalBackupFragment : ComposeFragment() {
|
||||
callback = remember { RestoreBackupCallback() },
|
||||
isRegistrationInProgress = registrationState.inProgress,
|
||||
enterBackupKeyState = enterBackupKeyState,
|
||||
backupKey = enterBackupKeyViewModel.backupKey
|
||||
enteredText = enterBackupKeyViewModel.enteredText
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -42,7 +42,7 @@ fun RestoreLocalBackupNavDisplay(
|
||||
callback: RestoreLocalBackupCallback,
|
||||
isRegistrationInProgress: Boolean,
|
||||
enterBackupKeyState: EnterBackupKeyViewModel.EnterBackupKeyState,
|
||||
backupKey: String
|
||||
enteredText: String
|
||||
) {
|
||||
val backstack = rememberNavBackStack(RestoreLocalBackupNavKey.SelectLocalBackupTypeScreen)
|
||||
val bottomSheetStrategy = remember { BottomSheetSceneStrategy<NavKey>() }
|
||||
@@ -136,7 +136,7 @@ fun RestoreLocalBackupNavDisplay(
|
||||
|
||||
entry<RestoreLocalBackupNavKey.EnterLocalBackupKeyScreen> {
|
||||
EnterLocalBackupKeyScreen(
|
||||
backupKey = backupKey,
|
||||
enteredText = enteredText,
|
||||
isRegistrationInProgress = isRegistrationInProgress,
|
||||
isBackupKeyValid = enterBackupKeyState.backupKeyValid,
|
||||
aepValidationError = enterBackupKeyState.aepValidationError,
|
||||
|
||||
+1
-1
@@ -63,7 +63,7 @@ class PostRegistrationRestoreLocalBackupFragment : ComposeFragment() {
|
||||
callback = remember { Callbacks() },
|
||||
isRegistrationInProgress = false,
|
||||
enterBackupKeyState = enterBackupKeyState,
|
||||
backupKey = enterBackupKeyViewModel.backupKey
|
||||
enteredText = enterBackupKeyViewModel.enteredText
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user