mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-24 10:25:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update no network errors to be consistent and have a space inbetween concatenated text (#3446)

Browse source
This commit is contained in:
David Perez 2024-07-11 15:00:30 -05:00 committed by GitHub
parent f6f28f6a58
commit c409132825
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 77 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt
View file

@ -610,7 +610,10 @@ class SearchViewModel @Inject constructor(
viewState = SearchState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
dialogState = null,
)

5
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModel.kt
View file

@ -97,7 +97,10 @@ class FoldersViewModel @Inject constructor(
viewState = FoldersState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
)
}

5
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt
View file

@ -208,7 +208,10 @@ class FolderAddEditViewModel @Inject constructor(
viewState = FolderAddEditState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
)
}

6
app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt
View file

@ -164,6 +164,7 @@ class SendViewModel @Inject constructor(
}
}
@Suppress("LongMethod")
private fun handleSendDataReceive(action: SendAction.Internal.SendDataReceive) {
when (val dataState = action.sendDataState) {
is DataState.Error -> {
@ -205,7 +206,10 @@ class SendViewModel @Inject constructor(
viewState = SendState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
dialogState = null,
)

5
app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt
View file

@ -343,7 +343,10 @@ class AddSendViewModel @Inject constructor(
viewState = AddSendState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
)
}

5
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt
View file

@ -1236,7 +1236,10 @@ class VaultAddEditViewModel @Inject constructor(
viewState = VaultAddEditState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
)
}

6
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModel.kt
View file

@ -239,8 +239,10 @@ class AttachmentsViewModel @Inject constructor(
viewState = AttachmentsState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat("\n".asText())
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
)
}

5
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
View file

@ -735,7 +735,10 @@ class VaultItemListingViewModel @Inject constructor(
viewState = VaultItemListingState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
dialogState = null,
)

10
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt
View file

@ -221,7 +221,10 @@ class VaultMoveToOrganizationViewModel @Inject constructor(
dialogState = VaultMoveToOrganizationState.DialogState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
)
} else {
@ -229,7 +232,10 @@ class VaultMoveToOrganizationViewModel @Inject constructor(
viewState = VaultMoveToOrganizationState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
dialogState = null,
)

5
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt
View file

@ -219,7 +219,10 @@ class VerificationCodeViewModel @Inject constructor(
viewState = VerificationCodeState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
dialogState = null,
)

5
app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt
View file

@ -1154,7 +1154,10 @@ class SearchViewModelTest : BaseViewModelTest() {
viewState = SearchState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
),
viewModel.stateFlow.value,

5
app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModelTest.kt
View file

@ -129,7 +129,10 @@ class FoldersViewModelTest : BaseViewModelTest() {
viewState = FoldersState.ViewState.Error(
R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
),
viewModel.stateFlow.value,

5
app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt
View file

@ -572,7 +572,10 @@ class FolderAddEditViewModelTest : BaseViewModelTest() {
viewState = FolderAddEditState.ViewState.Error(
R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
),
viewModel.stateFlow.value,

5
app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt
View file

@ -389,7 +389,10 @@ class SendViewModelTest : BaseViewModelTest() {
viewState = SendState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
dialogState = null,
),

6
app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt
View file

@ -480,8 +480,10 @@ class AttachmentsViewModelTest : BaseViewModelTest() {
viewState = AttachmentsState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat("\n".asText())
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
),
viewModel.stateFlow.value,

5
app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt
View file

@ -1333,7 +1333,10 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
viewState = VaultItemListingState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
),
viewModel.stateFlow.value,

5
app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt
View file

@ -224,7 +224,10 @@ class VaultMoveToOrganizationViewModelTest : BaseViewModelTest() {
viewState = VaultMoveToOrganizationState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
),
awaitItem(),

5
app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt
View file

@ -325,7 +325,10 @@ class VerificationCodeViewModelTest : BaseViewModelTest() {
viewState = VerificationCodeState.ViewState.Error(
message = R.string.internet_connection_required_title
.asText()
.concat(R.string.internet_connection_required_message.asText()),
.concat(
" ".asText(),
R.string.internet_connection_required_message.asText(),
),
),
),
viewModel.stateFlow.value,