From 4932353003c6801f8a8233cd4a9fbf6fcf3e333d Mon Sep 17 00:00:00 2001 From: Dave Severns <149429124+dseverns-livefront@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:31:38 -0500 Subject: [PATCH] PM-15037 Add missing title to empty sync import logins error dialog (#4443) --- .../vault/feature/importlogins/ImportLoginsViewModel.kt | 8 ++++---- app/src/main/res/values/strings.xml | 1 + .../feature/importlogins/ImportLoginsViewModelTest.kt | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModel.kt index 1f92a504a9..4317882fba 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModel.kt @@ -132,7 +132,8 @@ class ImportLoginsViewModel @Inject constructor( it.copy( isVaultSyncing = false, dialogState = ImportLoginsState.DialogState.Error( - R.string.no_logins_were_imported.asText(), + message = R.string.no_logins_were_imported.asText(), + title = R.string.import_error.asText(), ), ) } @@ -259,9 +260,8 @@ data class ImportLoginsState( */ data class Error( override val message: Text = R.string.generic_error_message.asText(), - ) : DialogState() { - override val title: Text? = null - } + override val title: Text? = null, + ) : DialogState() } /** diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7186b8ab73..26bfb6792c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1074,6 +1074,7 @@ Do you want to switch to this account? Bitwarden Tools Got it No logins were imported + Import error Verified SSO Domain Endpoint Logins imported Remember to delete your imported password file from your computer diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt index 6a03790c6f..7d6ca24c33 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt @@ -419,7 +419,10 @@ class ImportLoginsViewModelTest : BaseViewModelTest() { ) assertEquals( ImportLoginsState( - dialogState = ImportLoginsState.DialogState.Error(R.string.no_logins_were_imported.asText()), + dialogState = ImportLoginsState.DialogState.Error( + message = R.string.no_logins_were_imported.asText(), + title = R.string.import_error.asText(), + ), viewState = ImportLoginsState.ViewState.InitialContent, isVaultSyncing = false, showBottomSheet = false,