From d62e3164dc18282610c647df3b664e6a234acf31 Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Fri, 28 Mar 2025 09:29:39 -0400 Subject: [PATCH] [PM-19624] Migrate DataState to core module (#4930) --- .../processor/Fido2ProviderProcessorImpl.kt | 2 +- .../repository/util/DataStateExtensions.kt | 2 +- .../data/vault/manager/TotpCodeManager.kt | 2 +- .../data/vault/manager/TotpCodeManagerImpl.kt | 2 +- .../data/vault/repository/VaultRepository.kt | 2 +- .../vault/repository/VaultRepositoryImpl.kt | 2 +- .../feature/search/SearchViewModel.kt | 2 +- .../settings/folders/FoldersViewModel.kt | 2 +- .../folders/addedit/FolderAddEditViewModel.kt | 2 +- .../PasswordHistoryViewModel.kt | 2 +- .../ui/tools/feature/send/SendViewModel.kt | 3 +- .../feature/send/addsend/AddSendViewModel.kt | 2 +- .../feature/addedit/VaultAddEditViewModel.kt | 2 +- .../attachments/AttachmentsViewModel.kt | 2 +- .../vault/feature/item/VaultItemViewModel.kt | 2 +- .../itemlisting/VaultItemListingViewModel.kt | 12 +++-- .../VaultMoveToOrganizationViewModel.kt | 12 +++-- .../ui/vault/feature/vault/VaultViewModel.kt | 2 +- .../VerificationCodeViewModel.kt | 12 +++-- .../AutofillTotpCopyViewModelTest.kt | 2 +- .../processor/Fido2ProviderProcessorTest.kt | 2 +- .../processor/AutofillCipherProviderTest.kt | 2 +- .../CipherMatchingManagerTest.kt | 2 +- .../event/OrganizationEventManagerTest.kt | 2 +- .../util/DataStateExtensionsTest.kt | 2 +- .../data/vault/manager/TotpCodeManagerTest.kt | 2 +- .../vault/repository/VaultRepositoryTest.kt | 2 +- .../feature/search/SearchViewModelTest.kt | 2 +- .../settings/folders/FoldersViewModelTest.kt | 2 +- .../addedit/FolderAddEditViewModelTest.kt | 2 +- .../PasswordHistoryViewModelTest.kt | 2 +- .../tools/feature/send/SendViewModelTest.kt | 2 +- .../send/addsend/AddSendViewModelTest.kt | 2 +- .../addedit/VaultAddEditViewModelTest.kt | 2 +- .../attachments/AttachmentsViewModelTest.kt | 2 +- .../feature/item/VaultItemViewModelTest.kt | 2 +- .../VaultItemListingViewModelTest.kt | 2 +- .../VaultMoveToOrganizationViewModelTest.kt | 2 +- .../vault/feature/vault/VaultViewModelTest.kt | 2 +- .../VerificationCodeViewModelTest.kt | 2 +- .../repository/AuthenticatorRepository.kt | 2 +- .../repository/AuthenticatorRepositoryImpl.kt | 2 +- .../platform/repository/model/DataState.kt | 48 ------------------- .../repository/util/DataStateExtensions.kt | 2 +- .../feature/edititem/EditItemViewModel.kt | 2 +- .../itemlisting/ItemListingViewModel.kt | 2 +- .../feature/search/ItemSearchViewModel.kt | 2 +- .../repository/AuthenticatorRepositoryTest.kt | 2 +- .../itemlisting/ItemListingViewModelTest.kt | 2 +- .../feature/search/ItemSearchViewModelTest.kt | 2 +- .../core/data}/repository/model/DataState.kt | 2 +- 51 files changed, 68 insertions(+), 111 deletions(-) delete mode 100644 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/model/DataState.kt rename {app/src/main/java/com/x8bit/bitwarden/data/platform => core/src/main/kotlin/com/bitwarden/core/data}/repository/model/DataState.kt (94%) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorImpl.kt index aca3f989c5..1e3998de88 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorImpl.kt @@ -29,6 +29,7 @@ import androidx.credentials.provider.CreateEntry import androidx.credentials.provider.CredentialEntry import androidx.credentials.provider.ProviderClearCredentialStateRequest import androidx.credentials.provider.PublicKeyCredentialEntry +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.vault.CipherView @@ -41,7 +42,6 @@ import com.x8bit.bitwarden.data.platform.manager.BiometricsEncryptionManager import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.takeUntilLoaded import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.data.vault.repository.VaultRepository diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensions.kt index 90049e71bd..3710b7af92 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensions.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.platform.repository.util import com.bitwarden.core.annotation.OmitFromCoverage -import com.x8bit.bitwarden.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.transformWhile diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManager.kt index 25d9313ba8..2f3ead330b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManager.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManager.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.manager +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherView -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.vault.manager.model.VerificationCodeItem import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt index 3869c3d7d5..fdd01dde42 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.vault.manager import com.bitwarden.core.DateTime +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.manager.model.VerificationCodeItem import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt index 14d3ee0ade..c4a8f8df5e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.vault.repository import android.net.Uri import com.bitwarden.core.DateTime +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.sdk.Fido2CredentialStore @@ -10,7 +11,6 @@ import com.bitwarden.send.SendView import com.bitwarden.vault.CipherView import com.bitwarden.vault.CollectionView import com.bitwarden.vault.FolderView -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.vault.manager.CipherManager import com.x8bit.bitwarden.data.vault.manager.VaultLockManager import com.x8bit.bitwarden.data.vault.manager.model.VerificationCodeItem diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt index f93b045de3..ab6aedf185 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt @@ -4,6 +4,7 @@ import android.net.Uri import com.bitwarden.core.DateTime import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.InitUserCryptoMethod +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.sdk.Fido2CredentialStore @@ -33,7 +34,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.SyncFolderDeleteData import com.x8bit.bitwarden.data.platform.manager.model.SyncFolderUpsertData import com.x8bit.bitwarden.data.platform.manager.model.SyncSendDeleteData import com.x8bit.bitwarden.data.platform.manager.model.SyncSendUpsertData -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow import com.x8bit.bitwarden.data.platform.repository.util.combineDataStates import com.x8bit.bitwarden.data.platform.repository.util.map diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt index 137fe2622a..21d65ac330 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt @@ -4,6 +4,7 @@ import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView import com.bitwarden.vault.LoginUriView @@ -23,7 +24,6 @@ import com.x8bit.bitwarden.data.platform.manager.util.toAutofillSelectionDataOrN import com.x8bit.bitwarden.data.platform.manager.util.toTotpDataOrNull import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModel.kt index dcddd0c3fa..22e392bdfb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModel.kt @@ -2,9 +2,9 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.folders import android.os.Parcelable import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.ui.platform.base.BaseViewModel import com.x8bit.bitwarden.ui.platform.base.util.Text diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt index e4fee85b42..d91b088fa4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt @@ -4,9 +4,9 @@ import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.core.DateTime +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.CreateFolderResult import com.x8bit.bitwarden.data.vault.repository.model.DeleteFolderResult diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt index 4305731ca7..2959f26b11 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt @@ -3,11 +3,11 @@ package com.x8bit.bitwarden.ui.tools.feature.generator.passwordhistory import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherView import com.bitwarden.vault.PasswordHistoryView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState import com.x8bit.bitwarden.data.tools.generator.repository.GeneratorRepository import com.x8bit.bitwarden.data.vault.repository.VaultRepository diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt index 741bfe2987..ec6917303f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt @@ -4,13 +4,13 @@ import android.os.Parcelable import androidx.annotation.DrawableRes import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.repository.model.DataState import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.repository.VaultRepository @@ -23,7 +23,6 @@ import com.x8bit.bitwarden.ui.platform.base.util.asText import com.x8bit.bitwarden.ui.platform.components.model.IconRes import com.x8bit.bitwarden.ui.tools.feature.send.util.toViewState import com.x8bit.bitwarden.ui.vault.feature.item.VaultItemScreen -import com.x8bit.bitwarden.ui.vault.feature.itemlisting.VaultItemListingsAction.Internal import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.delay import kotlinx.coroutines.flow.launchIn diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt index e5573bf07a..853b12e302 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt @@ -4,6 +4,7 @@ import android.net.Uri import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.send.SendView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -15,7 +16,6 @@ import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardMan import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.manager.util.getActivePolicies import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.platform.repository.util.takeUntilLoaded import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt index 0b52c579f9..a2744c01ab 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt @@ -4,6 +4,7 @@ import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.core.DateTime +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherView import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.R @@ -30,7 +31,6 @@ import com.x8bit.bitwarden.data.platform.manager.util.toAutofillSelectionDataOrN import com.x8bit.bitwarden.data.platform.manager.util.toFido2CreateRequestOrNull import com.x8bit.bitwarden.data.platform.manager.util.toTotpDataOrNull import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.takeUntilLoaded import com.x8bit.bitwarden.data.tools.generator.repository.GeneratorRepository import com.x8bit.bitwarden.data.tools.generator.repository.model.GeneratorResult diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModel.kt index d0d0755449..78f28000ae 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModel.kt @@ -4,11 +4,11 @@ import android.net.Uri import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.UserState -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.CreateAttachmentResult import com.x8bit.bitwarden.data.vault.repository.model.DeleteAttachmentResult diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt index 62263aea8c..1fa2db1ff2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt @@ -4,6 +4,7 @@ import android.net.Uri import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -15,7 +16,6 @@ import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.platform.repository.util.combineDataStates import com.x8bit.bitwarden.data.platform.repository.util.mapNullable diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt index 36669464c4..20837df99b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt @@ -4,6 +4,7 @@ import android.os.Parcelable import androidx.annotation.DrawableRes import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType @@ -40,7 +41,6 @@ import com.x8bit.bitwarden.data.platform.manager.util.toFido2GetCredentialsReque import com.x8bit.bitwarden.data.platform.manager.util.toTotpDataOrNull import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.platform.repository.util.map @@ -1497,8 +1497,9 @@ class VaultItemListingViewModel @Inject constructor( //endregion VaultItemListing Handlers private fun vaultErrorReceive(vaultData: DataState.Error) { - if (vaultData.data != null) { - updateStateWithVaultData(vaultData = vaultData.data, clearDialogState = true) + val data = vaultData.data + if (data != null) { + updateStateWithVaultData(vaultData = data, clearDialogState = true) } else { mutableStateFlow.update { it.copy( @@ -1558,8 +1559,9 @@ class VaultItemListingViewModel @Inject constructor( } private fun vaultNoNetworkReceive(vaultData: DataState.NoNetwork) { - if (vaultData.data != null) { - updateStateWithVaultData(vaultData = vaultData.data, clearDialogState = true) + val data = vaultData.data + if (data != null) { + updateStateWithVaultData(vaultData = data, clearDialogState = true) } else { mutableStateFlow.update { currentState -> currentState.copy( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt index fe6d69c0c5..f2bf46f087 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt @@ -3,12 +3,12 @@ package com.x8bit.bitwarden.ui.vault.feature.movetoorganization import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherView import com.bitwarden.vault.CollectionView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.UserState -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.combineDataStates import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.ShareCipherResult @@ -174,9 +174,10 @@ class VaultMoveToOrganizationViewModel @Inject constructor( vaultData: DataState.Error, UserState?>>, ) { mutableStateFlow.update { - if (vaultData.data != null) { + val data = vaultData.data + if (data != null) { it.copy( - viewState = vaultData.data.toViewState(), + viewState = data.toViewState(), dialogState = VaultMoveToOrganizationState.DialogState.Error( message = R.string.generic_error_message.asText(), ), @@ -216,9 +217,10 @@ class VaultMoveToOrganizationViewModel @Inject constructor( vaultData: DataState.NoNetwork, UserState?>>, ) { mutableStateFlow.update { - if (vaultData.data != null) { + val data = vaultData.data + if (data != null) { it.copy( - viewState = vaultData.data.toViewState(), + viewState = data.toViewState(), dialogState = VaultMoveToOrganizationState.DialogState.Error( message = R.string.internet_connection_required_title .asText() diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt index 12eb8cc093..3d8331ee40 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.vault import android.os.Parcelable import androidx.compose.ui.graphics.Color import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.repository.model.DataState import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.SwitchAccountResult @@ -20,7 +21,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.repository.VaultRepository diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt index d85ab4422c..3d2899cab4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt @@ -2,13 +2,13 @@ package com.x8bit.bitwarden.ui.vault.feature.verificationcode import android.os.Parcelable import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.repository.model.DataState import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.vault.manager.model.VerificationCodeItem import com.x8bit.bitwarden.data.vault.repository.VaultRepository @@ -213,9 +213,10 @@ class VerificationCodeViewModel @Inject constructor( verificationCodeData: DataState.NoNetwork>, ) { - if (verificationCodeData.data != null) { + val data = verificationCodeData.data + if (data != null) { updateStateWithVerificationCodeData( - verificationCodeData = verificationCodeData.data, + verificationCodeData = data, clearDialogState = true, ) } else { @@ -261,9 +262,10 @@ class VerificationCodeViewModel @Inject constructor( } private fun vaultErrorReceive(vaultData: DataState.Error>) { - if (vaultData.data != null) { + val data = vaultData.data + if (data != null) { updateStateWithVerificationCodeData( - verificationCodeData = vaultData.data, + verificationCodeData = data, clearDialogState = true, ) } else { diff --git a/app/src/test/java/com/x8bit/bitwarden/AutofillTotpCopyViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/AutofillTotpCopyViewModelTest.kt index 70cfd2c08e..c35641c1a7 100644 --- a/app/src/test/java/com/x8bit/bitwarden/AutofillTotpCopyViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/AutofillTotpCopyViewModelTest.kt @@ -6,7 +6,7 @@ import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.autofill.model.AutofillTotpCopyData import com.x8bit.bitwarden.data.autofill.util.getTotpCopyIntentOrNull -import com.x8bit.bitwarden.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.VaultUnlockData import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt index 884e8fdd4b..552411a988 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt @@ -24,6 +24,7 @@ import androidx.credentials.provider.BeginGetPasswordOption import androidx.credentials.provider.BeginGetPublicKeyCredentialOption import androidx.credentials.provider.CallingAppInfo import androidx.credentials.provider.PublicKeyCredentialEntry +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -38,7 +39,6 @@ import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.FlagKey -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.util.asFailure import com.x8bit.bitwarden.data.platform.util.asSuccess diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillCipherProviderTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillCipherProviderTest.kt index 1a74e9e315..044aab9844 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillCipherProviderTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillCipherProviderTest.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.autofill.processor +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CardView import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType @@ -10,7 +11,6 @@ import com.x8bit.bitwarden.data.autofill.model.AutofillCipher import com.x8bit.bitwarden.data.autofill.provider.AutofillCipherProvider import com.x8bit.bitwarden.data.autofill.provider.AutofillCipherProviderImpl import com.x8bit.bitwarden.data.platform.manager.ciphermatching.CipherMatchingManager -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.util.subtitle import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.VaultUnlockData diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerTest.kt index 08c3348b6d..13cda704f4 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerTest.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.platform.manager.ciphermatching +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherView import com.bitwarden.vault.LoginUriView import com.bitwarden.vault.LoginView import com.bitwarden.vault.UriMatchType import com.x8bit.bitwarden.data.platform.manager.ResourceCacheManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.util.getDomainOrNull import com.x8bit.bitwarden.data.platform.util.getHostOrNull import com.x8bit.bitwarden.data.platform.util.getHostWithPortOrNull diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt index dbc844f844..fb422b14eb 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.platform.manager.event +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState @@ -9,7 +10,6 @@ import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEv import com.x8bit.bitwarden.data.platform.datasource.network.service.EventService import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEventType -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.util.FakeLifecycleOwner import com.x8bit.bitwarden.data.util.advanceTimeByAndRunCurrent diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensionsTest.kt index 162f9aa7c1..5a83860c56 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensionsTest.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.platform.repository.util import app.cash.turbine.test -import com.x8bit.bitwarden.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt index 0865ba6676..d36b59c264 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.data.vault.manager import app.cash.turbine.test +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.TotpResponse import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.util.asFailure import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt index 0879d2828d..55d38ec8fa 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt @@ -7,6 +7,7 @@ import app.cash.turbine.turbineScope import com.bitwarden.core.DateTime import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.InitUserCryptoMethod +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.sdk.Fido2CredentialStore @@ -37,7 +38,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.SyncFolderDeleteData import com.x8bit.bitwarden.data.platform.manager.model.SyncFolderUpsertData import com.x8bit.bitwarden.data.platform.manager.model.SyncSendDeleteData import com.x8bit.bitwarden.data.platform.manager.model.SyncSendUpsertData -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow import com.x8bit.bitwarden.data.platform.util.asFailure import com.x8bit.bitwarden.data.platform.util.asSuccess diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt index 53969c7374..2c8ebfba2f 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt @@ -4,6 +4,7 @@ import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import app.cash.turbine.turbineScope +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView import com.bitwarden.vault.LoginUriView @@ -28,7 +29,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModelTest.kt index 5b3f93d873..c58dc48b89 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModelTest.kt @@ -2,9 +2,9 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.folders import app.cash.turbine.test import com.bitwarden.core.DateTime +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest import com.x8bit.bitwarden.ui.platform.base.util.asText diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt index 9a4fb203f3..322abb1d83 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt @@ -3,9 +3,9 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.folders.addedit import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.DateTime +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.CreateFolderResult import com.x8bit.bitwarden.data.vault.repository.model.DeleteFolderResult diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt index a8882097dd..e9971ee4a2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt @@ -2,11 +2,11 @@ package com.x8bit.bitwarden.ui.tools.feature.generator.passwordhistory import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherView import com.bitwarden.vault.PasswordHistoryView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState import com.x8bit.bitwarden.data.tools.generator.repository.util.FakeGeneratorRepository import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt index 52de57e649..9e2f2b6420 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt @@ -2,13 +2,13 @@ package com.x8bit.bitwarden.ui.tools.feature.send import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.core.data.repository.model.DataState import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt index 324ce9afa1..04b7cd194f 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.tools.feature.send.addsend import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.send.SendView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -15,7 +16,6 @@ import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardMan import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt index b3f171db03..07156a70dc 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt @@ -4,6 +4,7 @@ import android.content.pm.SigningInfo import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.DateTime +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.send.SendView import com.bitwarden.vault.CipherView import com.bitwarden.vault.CollectionView @@ -38,7 +39,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow import com.x8bit.bitwarden.data.tools.generator.repository.GeneratorRepository diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt index 8e6d6e6b47..a8d7f8442a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.attachments import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -10,7 +11,6 @@ import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.repository.VaultRepository diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt index 2626eff14e..47884dc726 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt @@ -19,7 +19,7 @@ import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt index 75086154fc..a818e3895c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt @@ -45,7 +45,7 @@ import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt index dbfdf6e45e..156146c83f 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt @@ -10,7 +10,7 @@ import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.Organization import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt index 4849519829..4e76f03616 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt @@ -22,7 +22,7 @@ import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt index df569826a3..531f892510 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt @@ -9,7 +9,7 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepository.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepository.kt index 80db0f401c..84fa9419e2 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepository.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepository.kt @@ -10,7 +10,7 @@ import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVer import com.bitwarden.authenticator.data.authenticator.repository.model.TotpCodeResult import com.bitwarden.authenticator.data.platform.manager.imports.model.ImportDataResult import com.bitwarden.authenticator.data.platform.manager.imports.model.ImportFileFormat -import com.bitwarden.authenticator.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.authenticator.ui.platform.feature.settings.export.model.ExportVaultFormat import com.bitwarden.authenticator.ui.platform.manager.intent.IntentManager import kotlinx.coroutines.flow.Flow diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryImpl.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryImpl.kt index 1003119f7d..a2023662d2 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryImpl.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryImpl.kt @@ -23,7 +23,7 @@ import com.bitwarden.authenticator.data.platform.manager.imports.model.ImportDat import com.bitwarden.authenticator.data.platform.manager.imports.model.ImportFileFormat import com.bitwarden.authenticator.data.platform.manager.model.FlagKey import com.bitwarden.authenticator.data.platform.repository.SettingsRepository -import com.bitwarden.authenticator.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.authenticator.data.platform.repository.util.bufferedMutableSharedFlow import com.bitwarden.authenticator.data.platform.repository.util.map import com.bitwarden.authenticator.ui.platform.feature.settings.export.model.ExportVaultFormat diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/model/DataState.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/model/DataState.kt deleted file mode 100644 index 3692a09e5c..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/model/DataState.kt +++ /dev/null @@ -1,48 +0,0 @@ -package com.bitwarden.authenticator.data.platform.repository.model - -/** - * A data state that can be used as a template for data in the repository layer. - */ -sealed class DataState { - - /** - * Data that is being wrapped by [DataState]. - */ - abstract val data: T? - - /** - * Loading state that has no data is available. - */ - data object Loading : DataState() { - override val data: Nothing? get() = null - } - - /** - * Loaded state that has data available. - */ - data class Loaded( - override val data: T, - ) : DataState() - - /** - * Pending state that has data available. - */ - data class Pending( - override val data: T, - ) : DataState() - - /** - * Error state that may have data available. - */ - data class Error( - val error: Throwable, - override val data: T? = null, - ) : DataState() - - /** - * No network state that may have data is available. - */ - data class NoNetwork( - override val data: T? = null, - ) : DataState() -} diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/util/DataStateExtensions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/util/DataStateExtensions.kt index bc23a7855c..fe2baaac98 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/util/DataStateExtensions.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/util/DataStateExtensions.kt @@ -1,6 +1,6 @@ package com.bitwarden.authenticator.data.platform.repository.util -import com.bitwarden.authenticator.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.transformWhile diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/edititem/EditItemViewModel.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/edititem/EditItemViewModel.kt index 40a33fb693..7f2fdab628 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/edititem/EditItemViewModel.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/edititem/EditItemViewModel.kt @@ -11,7 +11,7 @@ import com.bitwarden.authenticator.data.authenticator.datasource.disk.entity.Aut import com.bitwarden.authenticator.data.authenticator.datasource.disk.entity.AuthenticatorItemType import com.bitwarden.authenticator.data.authenticator.repository.AuthenticatorRepository import com.bitwarden.authenticator.data.authenticator.repository.model.CreateItemResult -import com.bitwarden.authenticator.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.authenticator.data.platform.repository.util.takeUntilLoaded import com.bitwarden.authenticator.ui.authenticator.feature.edititem.AuthenticatorRefreshPeriodOption.entries import com.bitwarden.authenticator.ui.authenticator.feature.edititem.EditItemState.Companion.MAX_ALLOWED_CODE_DIGITS diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt index 905abd5e8d..2b8f183e31 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt @@ -19,7 +19,7 @@ import com.bitwarden.authenticator.data.platform.manager.BitwardenEncodingManage import com.bitwarden.authenticator.data.platform.manager.clipboard.BitwardenClipboardManager import com.bitwarden.authenticator.data.platform.manager.imports.model.GoogleAuthenticatorProtos import com.bitwarden.authenticator.data.platform.repository.SettingsRepository -import com.bitwarden.authenticator.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.SharedCodesDisplayState import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VaultDropdownMenuAction import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VerificationCodeDisplayItem diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModel.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModel.kt index 5ddae3bdc1..88ec27faf9 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModel.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModel.kt @@ -9,7 +9,7 @@ import com.bitwarden.authenticator.data.authenticator.repository.AuthenticatorRe import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVerificationCodesState import com.bitwarden.authenticator.data.authenticator.repository.util.itemsOrEmpty import com.bitwarden.authenticator.data.platform.manager.clipboard.BitwardenClipboardManager -import com.bitwarden.authenticator.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.authenticator.data.platform.util.SpecialCharWithPrecedenceComparator import com.bitwarden.authenticator.ui.platform.base.BaseViewModel import com.bitwarden.authenticator.ui.platform.base.util.Text diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryTest.kt index 27a91eeaab..930afd14d3 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryTest.kt @@ -14,7 +14,7 @@ import com.bitwarden.authenticator.data.platform.manager.FeatureFlagManager import com.bitwarden.authenticator.data.platform.manager.imports.ImportManager import com.bitwarden.authenticator.data.platform.manager.model.FlagKey import com.bitwarden.authenticator.data.platform.repository.SettingsRepository -import com.bitwarden.authenticator.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.authenticatorbridge.manager.AuthenticatorBridgeManager import com.bitwarden.authenticatorbridge.manager.model.AccountSyncState import com.bitwarden.authenticatorbridge.model.SharedAccountData diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModelTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModelTest.kt index 318224bad7..c8db54f7a7 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModelTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModelTest.kt @@ -10,7 +10,7 @@ import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVer import com.bitwarden.authenticator.data.platform.manager.BitwardenEncodingManager import com.bitwarden.authenticator.data.platform.manager.clipboard.BitwardenClipboardManager import com.bitwarden.authenticator.data.platform.repository.SettingsRepository -import com.bitwarden.authenticator.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.SharedCodesDisplayState import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VaultDropdownMenuAction import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VerificationCodeDisplayItem diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModelTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModelTest.kt index a18d508afd..f6bd2646d7 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModelTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModelTest.kt @@ -9,7 +9,7 @@ import com.bitwarden.authenticator.data.authenticator.repository.model.Authentic import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVerificationCodesState import com.bitwarden.authenticator.data.authenticator.repository.util.itemsOrEmpty import com.bitwarden.authenticator.data.platform.manager.clipboard.BitwardenClipboardManager -import com.bitwarden.authenticator.data.platform.repository.model.DataState +import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.authenticator.ui.platform.base.BaseViewModelTest import com.bitwarden.authenticator.ui.platform.components.model.IconData import io.mockk.every diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/model/DataState.kt b/core/src/main/kotlin/com/bitwarden/core/data/repository/model/DataState.kt similarity index 94% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/repository/model/DataState.kt rename to core/src/main/kotlin/com/bitwarden/core/data/repository/model/DataState.kt index 5f3867eca3..2dde0ca6cb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/model/DataState.kt +++ b/core/src/main/kotlin/com/bitwarden/core/data/repository/model/DataState.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.platform.repository.model +package com.bitwarden.core.data.repository.model /** * A data state that can be used as a template for data in the repository layer.