github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-07-10 11:51:05 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

PM-15037 Add missing title to empty sync import logins error dialog (#4443)

Browse Source
This commit is contained in:
Dave Severns
2024-12-09 14:31:38 -05:00
committed by GitHub
parent 5997579330
commit 4932353003
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModel.kt
View File

@@ -132,7 +132,8 @@ class ImportLoginsViewModel @Inject constructor(
it.copy( it.copy(
isVaultSyncing = false, isVaultSyncing = false,
dialogState = ImportLoginsState.DialogState.Error( 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( data class Error(
override val message: Text = R.string.generic_error_message.asText(), override val message: Text = R.string.generic_error_message.asText(),
) : DialogState() { override val title: Text? = null,
override val title: Text? = null ) : DialogState()
}
} }
/** /**

1
app/src/main/res/values/strings.xml
View File

@@ -1074,6 +1074,7 @@ Do you want to switch to this account?</string>
<string name="bitwarden_tools">Bitwarden Tools</string> <string name="bitwarden_tools">Bitwarden Tools</string>
<string name="got_it">Got it</string> <string name="got_it">Got it</string>
<string name="no_logins_were_imported">No logins were imported</string> <string name="no_logins_were_imported">No logins were imported</string>
<string name="import_error">Import error</string>
<string name="verified_sso_domain_verified">Verified SSO Domain Endpoint</string> <string name="verified_sso_domain_verified">Verified SSO Domain Endpoint</string>
<string name="logins_imported">Logins imported</string> <string name="logins_imported">Logins imported</string>
<string name="remember_to_delete_your_imported_password_file_from_your_computer">Remember to delete your imported password file from your computer</string> <string name="remember_to_delete_your_imported_password_file_from_your_computer">Remember to delete your imported password file from your computer</string>

5
app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt
View File

@@ -419,7 +419,10 @@ class ImportLoginsViewModelTest : BaseViewModelTest() {
) )
assertEquals( assertEquals(
ImportLoginsState( 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, viewState = ImportLoginsState.ViewState.InitialContent,
isVaultSyncing = false, isVaultSyncing = false,
showBottomSheet = false, showBottomSheet = false,