Skip to content

Commit 4932353

Browse files
PM-15037 Add missing title to empty sync import logins error dialog (#4443)
1 parent 5997579 commit 4932353

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ class ImportLoginsViewModel @Inject constructor(
132132
it.copy(
133133
isVaultSyncing = false,
134134
dialogState = ImportLoginsState.DialogState.Error(
135-
R.string.no_logins_were_imported.asText(),
135+
message = R.string.no_logins_were_imported.asText(),
136+
title = R.string.import_error.asText(),
136137
),
137138
)
138139
}
@@ -259,9 +260,8 @@ data class ImportLoginsState(
259260
*/
260261
data class Error(
261262
override val message: Text = R.string.generic_error_message.asText(),
262-
) : DialogState() {
263-
override val title: Text? = null
264-
}
263+
override val title: Text? = null,
264+
) : DialogState()
265265
}
266266

267267
/**

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,6 +1074,7 @@ Do you want to switch to this account?</string>
10741074
<string name="bitwarden_tools">Bitwarden Tools</string>
10751075
<string name="got_it">Got it</string>
10761076
<string name="no_logins_were_imported">No logins were imported</string>
1077+
<string name="import_error">Import error</string>
10771078
<string name="verified_sso_domain_verified">Verified SSO Domain Endpoint</string>
10781079
<string name="logins_imported">Logins imported</string>
10791080
<string name="remember_to_delete_your_imported_password_file_from_your_computer">Remember to delete your imported password file from your computer</string>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,10 @@ class ImportLoginsViewModelTest : BaseViewModelTest() {
419419
)
420420
assertEquals(
421421
ImportLoginsState(
422-
dialogState = ImportLoginsState.DialogState.Error(R.string.no_logins_were_imported.asText()),
422+
dialogState = ImportLoginsState.DialogState.Error(
423+
message = R.string.no_logins_were_imported.asText(),
424+
title = R.string.import_error.asText(),
425+
),
423426
viewState = ImportLoginsState.ViewState.InitialContent,
424427
isVaultSyncing = false,
425428
showBottomSheet = false,

0 commit comments

Comments
 (0)