diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt index 73ecb364dc..517f6fcd29 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.auth.datasource.disk +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import kotlinx.coroutines.flow.Flow import java.time.Instant diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt index 9243bb8124..1c39dde2c5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt @@ -4,12 +4,12 @@ import android.content.SharedPreferences import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.decodeFromStringOrNull import com.bitwarden.data.datasource.disk.BaseEncryptedDiskSource +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacySecureStorageMigrator -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.onSubscription diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt index dc71396574..c1faf21f6c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.data.auth.repository import com.bitwarden.network.model.GetTokenResponseJson +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel @@ -37,7 +38,6 @@ import com.x8bit.bitwarden.data.auth.repository.util.SsoCallbackResult import com.x8bit.bitwarden.data.auth.repository.util.WebAuthResult import com.x8bit.bitwarden.data.auth.util.YubiKeyResult import com.x8bit.bitwarden.data.platform.datasource.network.authenticator.AuthenticatorProvider -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt index 578ae47e7b..0f8a8b94d8 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt @@ -11,6 +11,8 @@ import com.bitwarden.crypto.Kdf import com.bitwarden.data.datasource.disk.ConfigDiskSource import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.model.GetTokenResponseJson +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.PrevalidateSsoResponseJson import com.bitwarden.network.model.RefreshTokenResponseJson import com.bitwarden.network.model.RegisterFinishRequestJson @@ -21,6 +23,7 @@ import com.bitwarden.network.model.ResendNewDeviceOtpRequestJson import com.bitwarden.network.model.ResetPasswordRequestJson import com.bitwarden.network.model.SendVerificationEmailRequestJson import com.bitwarden.network.model.SetPasswordRequestJson +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.TwoFactorAuthMethod import com.bitwarden.network.model.VerifyEmailTokenRequestJson @@ -116,9 +119,6 @@ import com.x8bit.bitwarden.data.platform.manager.util.getActivePolicies import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrls -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.VaultUnlockData diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt index ced0336bf0..21c517c782 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.auth.repository.model -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType +import com.bitwarden.network.model.OrganizationType /** * Represents an organization a user may be a member of. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt index dcb4c5f83d..5f8a6cc410 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.auth.repository.util import com.bitwarden.core.data.util.decodeFromStringOrNull +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.auth.repository.model.Organization import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import kotlinx.serialization.json.Json private val JSON = Json { diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt index a48f58dac1..d8a4e72191 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt @@ -1,5 +1,7 @@ package com.x8bit.bitwarden.data.auth.repository.util +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.UserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson @@ -10,8 +12,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrlsOrDefault -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.repository.model.VaultUnlockData import com.x8bit.bitwarden.data.vault.repository.util.statusFor import com.x8bit.bitwarden.ui.platform.base.util.toHexColorRepresentation diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt index cc0aafb67b..e4209705d0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt @@ -6,6 +6,7 @@ import android.service.autofill.FillRequest import android.service.autofill.SaveCallback import android.service.autofill.SaveRequest import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.autofill.builder.FillResponseBuilder import com.x8bit.bitwarden.data.autofill.builder.FilledDataBuilder import com.x8bit.bitwarden.data.autofill.builder.SaveInfoBuilder @@ -16,7 +17,6 @@ import com.x8bit.bitwarden.data.autofill.util.createAutofillSavedItemIntentSende import com.x8bit.bitwarden.data.autofill.util.toAutofillSaveItem import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PolicyManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PolicyManager.kt index 19749c57b1..2408e72408 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PolicyManager.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PolicyManager.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.platform.manager -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson import kotlinx.coroutines.flow.Flow /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PolicyManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PolicyManagerImpl.kt index 75b714fdac..257ad0ea48 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PolicyManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PolicyManagerImpl.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.data.platform.manager +import com.bitwarden.network.model.OrganizationStatusType +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.repository.util.activeUserIdChangesFlow -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationStatusType -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/util/PolicyManagerExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/util/PolicyManagerExtensions.kt index 1a30422d76..78aad05c59 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/util/PolicyManagerExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/util/PolicyManagerExtensions.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.platform.manager.util +import com.bitwarden.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation import com.x8bit.bitwarden.data.auth.repository.util.policyInformation import com.x8bit.bitwarden.data.platform.manager.PolicyManager -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt index fa77ea9ef7..fda58f0945 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt @@ -3,6 +3,8 @@ package com.x8bit.bitwarden.data.platform.repository import android.view.autofill.AutofillManager import com.bitwarden.authenticatorbridge.util.generateSecretKey import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation @@ -18,8 +20,6 @@ import com.x8bit.bitwarden.data.platform.repository.model.ClearClipboardFrequenc import com.x8bit.bitwarden.data.platform.repository.model.UriMatchType import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.ui.platform.feature.settings.appearance.model.AppLanguage import com.x8bit.bitwarden.ui.platform.feature.settings.appearance.model.AppTheme diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSource.kt index 13cb5a3fe4..b2f81c275f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSource.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSource.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.disk -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson +import com.bitwarden.network.model.SyncResponseJson import kotlinx.coroutines.flow.Flow /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt index 0adeb0a09f..b3f6536245 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.vault.datasource.disk import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.decodeFromStringWithErrorCallback import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.disk.dao.CiphersDao import com.x8bit.bitwarden.data.vault.datasource.disk.dao.CollectionsDao import com.x8bit.bitwarden.data.vault.datasource.disk.dao.DomainsDao @@ -13,7 +14,6 @@ import com.x8bit.bitwarden.data.vault.datasource.disk.entity.CollectionEntity import com.x8bit.bitwarden.data.vault.datasource.disk.entity.DomainsEntity import com.x8bit.bitwarden.data.vault.datasource.disk.entity.FolderEntity import com.x8bit.bitwarden.data.vault.datasource.disk.entity.SendEntity -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll import kotlinx.coroutines.coroutineScope diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/FoldersApi.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/FoldersApi.kt index 5cfa73bf8b..42d736a908 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/FoldersApi.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/FoldersApi.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.vault.datasource.network.api import com.bitwarden.network.model.NetworkResult +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import retrofit2.http.Body import retrofit2.http.DELETE import retrofit2.http.GET diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SendsApi.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SendsApi.kt index 38266bb2ad..020aff6d6f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SendsApi.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SendsApi.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.vault.datasource.network.api import androidx.annotation.Keep +import com.bitwarden.network.model.CreateFileSendResponseJson import com.bitwarden.network.model.NetworkResult -import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SendJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson +import com.bitwarden.network.model.SendJsonRequest +import com.bitwarden.network.model.SyncResponseJson import okhttp3.MultipartBody import retrofit2.http.Body import retrofit2.http.DELETE diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SyncApi.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SyncApi.kt index 2402c6a9a1..c47ee7893d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SyncApi.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SyncApi.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.datasource.network.api import com.bitwarden.network.model.NetworkResult -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson +import com.bitwarden.network.model.SyncResponseJson import retrofit2.http.GET /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateFileSendResponse.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateFileSendResponse.kt index e37b4c1bee..0c7dd1997f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateFileSendResponse.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateFileSendResponse.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.network.model +import com.bitwarden.network.model.CreateFileSendResponseJson import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateSendJsonResponse.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateSendJsonResponse.kt index b686967e9c..8a1432f3f6 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateSendJsonResponse.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateSendJsonResponse.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.network.model +import com.bitwarden.network.model.SyncResponseJson import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateCipherResponseJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateCipherResponseJson.kt index 32cd41b5a0..6948060d9b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateCipherResponseJson.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateCipherResponseJson.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.network.model +import com.bitwarden.network.model.SyncResponseJson import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateFolderResponseJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateFolderResponseJson.kt index 0833efef0b..a6f6d9a9c7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateFolderResponseJson.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateFolderResponseJson.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.network.model +import com.bitwarden.network.model.SyncResponseJson import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateSendResponseJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateSendResponseJson.kt index e30bcd8b54..45a5d44b40 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateSendResponseJson.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateSendResponseJson.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.network.model +import com.bitwarden.network.model.SyncResponseJson import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersService.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersService.kt index 4c89eb748c..e12b46b347 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersService.kt @@ -1,15 +1,15 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service +import com.bitwarden.network.model.AttachmentJsonRequest +import com.bitwarden.network.model.AttachmentJsonResponse +import com.bitwarden.network.model.CipherJsonRequest +import com.bitwarden.network.model.CreateCipherInOrganizationJsonRequest +import com.bitwarden.network.model.ImportCiphersJsonRequest +import com.bitwarden.network.model.ShareCipherJsonRequest +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.UpdateCipherCollectionsJsonRequest import com.bitwarden.vault.Attachment -import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateCipherInOrganizationJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.ImportCiphersJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.ImportCiphersResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.ShareCipherJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherCollectionsJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherResponseJson import java.io.File diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt index 8b59dcfc20..928580c068 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt @@ -3,22 +3,22 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service import androidx.core.net.toUri import com.bitwarden.core.data.util.asFailure import com.bitwarden.network.api.AzureApi +import com.bitwarden.network.api.CiphersApi +import com.bitwarden.network.model.AttachmentJsonRequest +import com.bitwarden.network.model.AttachmentJsonResponse +import com.bitwarden.network.model.CipherJsonRequest +import com.bitwarden.network.model.CreateCipherInOrganizationJsonRequest +import com.bitwarden.network.model.FileUploadType +import com.bitwarden.network.model.ImportCiphersJsonRequest +import com.bitwarden.network.model.ShareCipherJsonRequest +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.UpdateCipherCollectionsJsonRequest import com.bitwarden.network.model.toBitwardenError import com.bitwarden.network.util.NetworkErrorCode import com.bitwarden.network.util.parseErrorBodyOrNull import com.bitwarden.network.util.toResult import com.bitwarden.vault.Attachment -import com.x8bit.bitwarden.data.vault.datasource.network.api.CiphersApi -import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateCipherInOrganizationJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.FileUploadType -import com.x8bit.bitwarden.data.vault.datasource.network.model.ImportCiphersJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.ImportCiphersResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.ShareCipherJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherCollectionsJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherResponseJson import kotlinx.serialization.json.Json import okhttp3.MediaType.Companion.toMediaType diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt index 0358cbc398..52ec4c92fb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt index 621a42ce18..efa404b40e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.toBitwardenError import com.bitwarden.network.util.NetworkErrorCode import com.bitwarden.network.util.parseErrorBodyOrNull import com.bitwarden.network.util.toResult import com.x8bit.bitwarden.data.vault.datasource.network.api.FoldersApi import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson import kotlinx.serialization.json.Json diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsService.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsService.kt index 6cce0b1e61..0cb3d5f2a9 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsService.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service +import com.bitwarden.network.model.CreateFileSendResponseJson +import com.bitwarden.network.model.SendJsonRequest +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateSendJsonResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.SendJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateSendResponseJson import java.io.File diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceImpl.kt index 9d4e71574b..be96512e01 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceImpl.kt @@ -2,17 +2,17 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service import androidx.core.net.toUri import com.bitwarden.network.api.AzureApi +import com.bitwarden.network.model.CreateFileSendResponseJson +import com.bitwarden.network.model.FileUploadType +import com.bitwarden.network.model.SendJsonRequest +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.toBitwardenError import com.bitwarden.network.util.NetworkErrorCode import com.bitwarden.network.util.parseErrorBodyOrNull import com.bitwarden.network.util.toResult import com.x8bit.bitwarden.data.vault.datasource.network.api.SendsApi import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateSendJsonResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.FileUploadType -import com.x8bit.bitwarden.data.vault.datasource.network.model.SendJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateSendResponseJson import kotlinx.serialization.json.Json import okhttp3.MediaType.Companion.toMediaType diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncService.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncService.kt index 003512b22f..558c6ea627 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncService.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson +import com.bitwarden.network.model.SyncResponseJson /** * Provides an API for querying sync endpoints. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceImpl.kt index 6a12adb289..2cd03d3d12 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceImpl.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.util.toResult import com.x8bit.bitwarden.data.vault.datasource.network.api.SyncApi -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson class SyncServiceImpl( private val syncApi: SyncApi, diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerImpl.kt index b9bedf6527..8d9b49437c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerImpl.kt @@ -5,6 +5,9 @@ import androidx.core.net.toUri import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess import com.bitwarden.core.data.util.flatMap +import com.bitwarden.network.model.CreateCipherInOrganizationJsonRequest +import com.bitwarden.network.model.ShareCipherJsonRequest +import com.bitwarden.network.model.UpdateCipherCollectionsJsonRequest import com.bitwarden.vault.AttachmentView import com.bitwarden.vault.Cipher import com.bitwarden.vault.CipherView @@ -12,9 +15,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource -import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateCipherInOrganizationJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.ShareCipherJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherCollectionsJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.service.CiphersService import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource 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 d6a989b5c3..ff4c79f4f0 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 @@ -16,6 +16,7 @@ import com.bitwarden.core.data.util.flatMap import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.util.isNoConnectionError import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.send.Send @@ -48,7 +49,6 @@ import com.x8bit.bitwarden.data.platform.repository.util.observeWhenSubscribedAn import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateSendJsonResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateSendResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.service.CiphersService diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/DomainsExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/DomainsExtensions.kt index 1b8ecc087a..63d5a56aeb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/DomainsExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/DomainsExtensions.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.vault.repository.util -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson.Domains +import com.bitwarden.network.model.SyncResponseJson.Domains import com.x8bit.bitwarden.data.vault.repository.model.DomainsData /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt index d87b7d1d4a..e0cb740834 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt @@ -3,6 +3,15 @@ package com.x8bit.bitwarden.data.vault.repository.util import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparator +import com.bitwarden.network.model.AttachmentJsonRequest +import com.bitwarden.network.model.CipherJsonRequest +import com.bitwarden.network.model.CipherRepromptTypeJson +import com.bitwarden.network.model.CipherTypeJson +import com.bitwarden.network.model.FieldTypeJson +import com.bitwarden.network.model.LinkedIdTypeJson +import com.bitwarden.network.model.SecureNoteTypeJson +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.UriMatchTypeJson import com.bitwarden.vault.Attachment import com.bitwarden.vault.Card import com.bitwarden.vault.Cipher @@ -20,15 +29,6 @@ import com.bitwarden.vault.SecureNote import com.bitwarden.vault.SecureNoteType import com.bitwarden.vault.SshKey import com.bitwarden.vault.UriMatchType -import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherRepromptTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.FieldTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.LinkedIdTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SecureNoteTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.UriMatchTypeJson import java.time.ZoneOffset import java.time.ZonedDateTime diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt index 082f105876..270bb4bac1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.vault.repository.util import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparator +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.vault.Collection import com.bitwarden.vault.CollectionView -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson /** * Converts a [SyncResponseJson.Collection] object to a corresponding Bitwarden SDK [Collection] diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensions.kt index 1f741ed7e3..14f526fe50 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensions.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.vault.repository.util import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparator +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.vault.Folder import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson /** * Converts a list of [SyncResponseJson.Folder] objects to a list of corresponding diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt index d261dd1f63..6b252b2fae 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt @@ -1,14 +1,14 @@ package com.x8bit.bitwarden.data.vault.repository.util import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparator +import com.bitwarden.network.model.SendJsonRequest +import com.bitwarden.network.model.SendTypeJson +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.send.Send import com.bitwarden.send.SendFile import com.bitwarden.send.SendText import com.bitwarden.send.SendType import com.bitwarden.send.SendView -import com.x8bit.bitwarden.data.vault.datasource.network.model.SendJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SendTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import java.time.ZoneOffset import java.time.ZonedDateTime diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt index 1c99264b8b..22378c17cb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.platform.feature.rootnav import android.os.Parcelable import androidx.lifecycle.viewModelScope +import com.bitwarden.network.model.OrganizationType import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState @@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType import com.x8bit.bitwarden.ui.platform.base.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.combine 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 2ddea234a5..83ab00b6e7 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 @@ -5,6 +5,10 @@ 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.network.model.PolicyTypeJson +import com.bitwarden.ui.util.Text +import com.bitwarden.ui.util.asText +import com.bitwarden.ui.util.concat import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView import com.bitwarden.vault.LoginUriView @@ -26,7 +30,6 @@ import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository 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 import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult import com.x8bit.bitwarden.data.vault.repository.model.GenerateTotpResult @@ -34,9 +37,6 @@ import com.x8bit.bitwarden.data.vault.repository.model.RemovePasswordSendResult import com.x8bit.bitwarden.data.vault.repository.model.UpdateCipherResult import com.x8bit.bitwarden.data.vault.repository.model.VaultData import com.x8bit.bitwarden.ui.platform.base.BaseViewModel -import com.bitwarden.ui.util.Text -import com.bitwarden.ui.util.asText -import com.bitwarden.ui.util.concat import com.x8bit.bitwarden.ui.platform.components.model.IconData import com.x8bit.bitwarden.ui.platform.feature.search.model.AutofillSelectionOption import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModel.kt index 7ed4a9d246..8a005493ea 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModel.kt @@ -4,6 +4,7 @@ import android.os.Build import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R @@ -24,7 +25,6 @@ import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction import com.x8bit.bitwarden.data.platform.repository.util.baseWebVaultUrlOrDefault import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.ui.platform.base.BaseViewModel import com.x8bit.bitwarden.ui.platform.components.toggle.UnlockWithPinState diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModel.kt index 8c7d437e8a..c1fb5dab14 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModel.kt @@ -4,6 +4,7 @@ import android.net.Uri import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R @@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.RequestOtpResult import com.x8bit.bitwarden.data.auth.repository.model.ValidatePasswordResult import com.x8bit.bitwarden.data.auth.repository.model.VerifyOtpResult import com.x8bit.bitwarden.data.platform.manager.PolicyManager -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.manager.FileManager import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.ExportVaultDataResult 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 e63dc06369..8edefff23a 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 @@ -5,6 +5,7 @@ import androidx.annotation.DrawableRes import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R @@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManage import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository 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 import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult import com.x8bit.bitwarden.data.vault.repository.model.RemovePasswordSendResult 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 9cf32482fa..25e97a539b 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 @@ -6,6 +6,7 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.takeUntilLoaded +import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.send.SendView import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -21,7 +22,6 @@ import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManage import com.x8bit.bitwarden.data.platform.manager.util.getActivePolicies import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository 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 import com.x8bit.bitwarden.data.vault.repository.model.CreateSendResult import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult 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 3c471fa1d8..bd0ffc23eb 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 @@ -9,6 +9,7 @@ import androidx.lifecycle.viewModelScope import com.bitwarden.core.DateTime import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.takeUntilLoaded +import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.bitwarden.vault.CipherView @@ -40,7 +41,6 @@ import com.x8bit.bitwarden.data.platform.manager.util.toTotpDataOrNull import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.tools.generator.repository.GeneratorRepository import com.x8bit.bitwarden.data.tools.generator.repository.model.GeneratorResult -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.CreateCipherResult import com.x8bit.bitwarden.data.vault.repository.model.CreateFolderResult 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 bfe993f959..de1ed9224e 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 @@ -10,6 +10,7 @@ import androidx.lifecycle.viewModelScope import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.map import com.bitwarden.fido.Fido2CredentialAutofillView +import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.bitwarden.ui.util.concat @@ -51,7 +52,6 @@ import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository 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 import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.DecryptFido2CredentialAutofillViewResult import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult 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 75c34f5035..45179f835a 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 @@ -4,6 +4,7 @@ import android.os.Parcelable import androidx.compose.ui.graphics.Color import androidx.lifecycle.viewModelScope import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.bitwarden.ui.util.concat @@ -26,7 +27,6 @@ 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.util.baseIconUrl -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.GenerateTotpResult import com.x8bit.bitwarden.data.vault.repository.model.VaultData diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt index f8505ab0f4..803b92ca9c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt @@ -9,6 +9,8 @@ import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.KeyConnectorUserDecryptionOptionsJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.UserDecryptionOptionsJson +import com.bitwarden.network.model.createMockOrganization +import com.bitwarden.network.model.createMockPolicy import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson @@ -17,8 +19,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacySecureStorageMigrator -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockOrganization -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockPolicy import io.mockk.every import io.mockk.just import io.mockk.mockk diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt index caef0a97d0..84d5877f04 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.auth.datasource.disk.util import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.onSubscription diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt index fafecf01a7..1021dad770 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt @@ -26,6 +26,8 @@ import com.bitwarden.network.model.KeyConnectorMasterKeyResponseJson import com.bitwarden.network.model.OrganizationAutoEnrollStatusResponseJson import com.bitwarden.network.model.OrganizationDomainSsoDetailsResponseJson import com.bitwarden.network.model.OrganizationKeysResponseJson +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.PreLoginResponseJson import com.bitwarden.network.model.PrevalidateSsoResponseJson import com.bitwarden.network.model.RefreshTokenResponseJson @@ -36,11 +38,14 @@ import com.bitwarden.network.model.ResendEmailRequestJson import com.bitwarden.network.model.ResetPasswordRequestJson import com.bitwarden.network.model.SendVerificationEmailRequestJson import com.bitwarden.network.model.SetPasswordRequestJson +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.TwoFactorAuthMethod import com.bitwarden.network.model.UserDecryptionOptionsJson import com.bitwarden.network.model.VerifiedOrganizationDomainSsoDetailsResponse import com.bitwarden.network.model.VerifyEmailTokenRequestJson +import com.bitwarden.network.model.createMockOrganization +import com.bitwarden.network.model.createMockPolicy import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson @@ -121,11 +126,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.NotificationLogoutData import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockOrganization -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockPolicy import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource 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/auth/repository/util/AuthDiskSourceExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/AuthDiskSourceExtensionsTest.kt index 5c2057461e..f889084843 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/AuthDiskSourceExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/AuthDiskSourceExtensionsTest.kt @@ -1,6 +1,8 @@ package com.x8bit.bitwarden.data.auth.repository.util import app.cash.turbine.test +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.network.model.createMockOrganization import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson @@ -12,8 +14,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserAccountTokens import com.x8bit.bitwarden.data.auth.repository.model.UserKeyConnectorState import com.x8bit.bitwarden.data.auth.repository.model.UserOrganizations import com.x8bit.bitwarden.data.auth.repository.model.UserSwitchingData -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockOrganization import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensionsTest.kt index 4eed0b800b..7576b035a7 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensionsTest.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.data.auth.repository.util +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.createMockOrganization +import com.bitwarden.network.model.createMockPolicy import com.x8bit.bitwarden.data.auth.repository.model.Organization import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockOrganization -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockPolicy import kotlinx.serialization.json.Json import kotlinx.serialization.json.encodeToJsonElement import kotlinx.serialization.json.jsonObject diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt index a8ead115db..ccb96c5bec 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.auth.repository.util import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.KeyConnectorUserDecryptionOptionsJson +import com.bitwarden.network.model.OrganizationType import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.UserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson @@ -18,7 +19,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState 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.repository.model.VaultUnlockData import io.mockk.every import io.mockk.mockk diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorTest.kt index 399f2b1886..525e3f60c4 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorTest.kt @@ -11,6 +11,8 @@ import android.service.autofill.SaveCallback import android.service.autofill.SaveInfo import android.service.autofill.SaveRequest import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.autofill.builder.FillResponseBuilder import com.x8bit.bitwarden.data.autofill.builder.FilledDataBuilder import com.x8bit.bitwarden.data.autofill.builder.SaveInfoBuilder @@ -24,8 +26,6 @@ import com.x8bit.bitwarden.data.autofill.util.createAutofillSavedItemIntentSende import com.x8bit.bitwarden.data.autofill.util.toAutofillSaveItem import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import io.mockk.clearMocks import io.mockk.coEvery import io.mockk.coVerify diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt index 5c7826651f..e95a12d58b 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.platform.manager import app.cash.turbine.test import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.network.model.KdfTypeJson +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.UserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson @@ -15,7 +16,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.CoachMarkTourType import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PolicyManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PolicyManagerTest.kt index e1be944806..73128b9156 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PolicyManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PolicyManagerTest.kt @@ -1,13 +1,13 @@ package com.x8bit.bitwarden.data.platform.manager import app.cash.turbine.test +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.createMockOrganization +import com.bitwarden.network.model.createMockPolicy import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockOrganization -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockPolicy import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.flow.MutableStateFlow 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 cb9c6f1b7d..e2a8227bcf 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 @@ -5,6 +5,7 @@ import com.bitwarden.core.data.util.asSuccess import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.network.model.OrganizationEventJson import com.bitwarden.network.model.OrganizationEventType +import com.bitwarden.network.model.createMockOrganization import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState @@ -13,7 +14,6 @@ import com.x8bit.bitwarden.data.platform.datasource.network.service.EventService import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.util.FakeLifecycleOwner import com.x8bit.bitwarden.data.util.advanceTimeByAndRunCurrent -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockOrganization import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.repository.VaultRepository import io.mockk.coEvery diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/util/PolicyManagerExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/util/PolicyManagerExtensionsTest.kt index deeba97c23..bf75bf43bb 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/util/PolicyManagerExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/util/PolicyManagerExtensionsTest.kt @@ -2,10 +2,10 @@ package com.x8bit.bitwarden.data.platform.manager.util import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation import com.x8bit.bitwarden.data.platform.manager.PolicyManager -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt index 2436196699..6b9f02887a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt @@ -4,6 +4,7 @@ import com.bitwarden.authenticatorbridge.model.SharedAccountData import com.bitwarden.authenticatorbridge.util.generateSecretKey import com.bitwarden.authenticatorbridge.util.toSymmetricEncryptionKeyData import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.vault.Cipher import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource @@ -11,7 +12,6 @@ import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.repository.util.sanitizeTotpUri import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource 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/repository/SettingsRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt index 6a3dee1ad0..702f4220d8 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt @@ -9,6 +9,8 @@ import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.network.model.KdfTypeJson +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.UserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson @@ -27,8 +29,6 @@ import com.x8bit.bitwarden.data.platform.repository.model.ClearClipboardFrequenc import com.x8bit.bitwarden.data.platform.repository.model.UriMatchType import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.ui.platform.feature.settings.appearance.model.AppLanguage import com.x8bit.bitwarden.ui.platform.feature.settings.appearance.model.AppTheme diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt index afd3a7f815..a3313d796d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt @@ -3,6 +3,12 @@ package com.x8bit.bitwarden.data.vault.datasource.disk import app.cash.turbine.test import com.bitwarden.core.di.CoreModule import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.createMockCipher +import com.bitwarden.network.model.createMockCollection +import com.bitwarden.network.model.createMockDomains +import com.bitwarden.network.model.createMockFolder +import com.bitwarden.network.model.createMockSend import com.x8bit.bitwarden.data.util.assertJsonEquals import com.x8bit.bitwarden.data.vault.datasource.disk.dao.FakeCiphersDao import com.x8bit.bitwarden.data.vault.datasource.disk.dao.FakeCollectionsDao @@ -14,12 +20,6 @@ import com.x8bit.bitwarden.data.vault.datasource.disk.entity.CollectionEntity import com.x8bit.bitwarden.data.vault.datasource.disk.entity.DomainsEntity import com.x8bit.bitwarden.data.vault.datasource.disk.entity.FolderEntity import com.x8bit.bitwarden.data.vault.datasource.disk.entity.SendEntity -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockCipher -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockCollection -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockDomains -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockFolder -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockSend import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceTest.kt index 002194a7e5..0527ed50d2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceTest.kt @@ -2,20 +2,20 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service import android.net.Uri import com.bitwarden.network.api.AzureApi +import com.bitwarden.network.api.CiphersApi import com.bitwarden.network.base.BaseServiceTest -import com.x8bit.bitwarden.data.vault.datasource.network.api.CiphersApi -import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateCipherInOrganizationJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.FileUploadType -import com.x8bit.bitwarden.data.vault.datasource.network.model.ImportCiphersJsonRequest +import com.bitwarden.network.model.CreateCipherInOrganizationJsonRequest +import com.bitwarden.network.model.FileUploadType +import com.bitwarden.network.model.ImportCiphersJsonRequest +import com.bitwarden.network.model.ShareCipherJsonRequest +import com.bitwarden.network.model.UpdateCipherCollectionsJsonRequest +import com.bitwarden.network.model.createMockAttachment +import com.bitwarden.network.model.createMockAttachmentJsonRequest +import com.bitwarden.network.model.createMockAttachmentJsonResponse +import com.bitwarden.network.model.createMockCipher +import com.bitwarden.network.model.createMockCipherJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.ImportCiphersResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.ShareCipherJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherCollectionsJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockAttachment -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockAttachmentJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockAttachmentJsonResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockCipher -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockCipherJsonRequest import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSdkAttachment import io.mockk.every import io.mockk.mockk diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt index 107dd0258d..b7a55352e2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service import com.bitwarden.network.base.BaseServiceTest +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.api.FoldersApi import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson import kotlinx.coroutines.test.runTest import okhttp3.mockwebserver.MockResponse diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceTest.kt index 51b65faffe..7b3be0f29d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceTest.kt @@ -3,14 +3,14 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service import android.net.Uri import com.bitwarden.network.api.AzureApi import com.bitwarden.network.base.BaseServiceTest +import com.bitwarden.network.model.SendTypeJson +import com.bitwarden.network.model.createMockFileSendResponseJson +import com.bitwarden.network.model.createMockSend +import com.bitwarden.network.model.createMockSendJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.api.SendsApi import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateSendJsonResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.SendTypeJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateSendResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockFileSendResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockSend -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockSendJsonRequest import io.mockk.every import io.mockk.mockk import io.mockk.mockkStatic diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceTest.kt index f17848acd9..3d2ffa7137 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceTest.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service import com.bitwarden.network.base.BaseServiceTest +import com.bitwarden.network.model.createMockSyncResponse import com.x8bit.bitwarden.data.vault.datasource.network.api.SyncApi -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockSyncResponse import kotlinx.coroutines.test.runTest import okhttp3.mockwebserver.MockResponse import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerTest.kt index e870ab721d..bc7cd41a89 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerTest.kt @@ -4,6 +4,15 @@ import android.net.Uri import androidx.core.net.toUri import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.network.model.AttachmentJsonRequest +import com.bitwarden.network.model.CreateCipherInOrganizationJsonRequest +import com.bitwarden.network.model.ShareCipherJsonRequest +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.UpdateCipherCollectionsJsonRequest +import com.bitwarden.network.model.createMockAttachment +import com.bitwarden.network.model.createMockAttachmentJsonResponse +import com.bitwarden.network.model.createMockCipher +import com.bitwarden.network.model.createMockCipherJsonRequest import com.bitwarden.vault.Attachment import com.bitwarden.vault.AttachmentView import com.bitwarden.vault.Cipher @@ -14,16 +23,7 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource -import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateCipherInOrganizationJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.ShareCipherJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherCollectionsJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockAttachment -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockAttachmentJsonResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockCipher -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockCipherJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.service.CiphersService import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockAttachmentView 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 45e6563b6f..ea9ff6a982 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 @@ -15,6 +15,20 @@ import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView +import com.bitwarden.network.model.SendTypeJson +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.createMockCipher +import com.bitwarden.network.model.createMockCollection +import com.bitwarden.network.model.createMockDomains +import com.bitwarden.network.model.createMockFileSendResponseJson +import com.bitwarden.network.model.createMockFolder +import com.bitwarden.network.model.createMockOrganization +import com.bitwarden.network.model.createMockOrganizationKeys +import com.bitwarden.network.model.createMockPolicy +import com.bitwarden.network.model.createMockProfile +import com.bitwarden.network.model.createMockSend +import com.bitwarden.network.model.createMockSendJsonRequest +import com.bitwarden.network.model.createMockSyncResponse import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.send.SendType import com.bitwarden.send.SendView @@ -46,22 +60,8 @@ import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateSendJsonResponse import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SendTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateSendResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockCipher -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockCollection -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockDomains -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockFileSendResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockFolder -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockOrganization -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockOrganizationKeys -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockPolicy -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockProfile -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockSend -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockSendJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockSyncResponse import com.x8bit.bitwarden.data.vault.datasource.network.service.CiphersService import com.x8bit.bitwarden.data.vault.datasource.network.service.FolderService import com.x8bit.bitwarden.data.vault.datasource.network.service.SendsService diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/DomainsExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/DomainsExtensionsTest.kt index b75cda521b..4ac6465cf0 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/DomainsExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/DomainsExtensionsTest.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.vault.repository.util -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson +import com.bitwarden.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.repository.model.DomainsData import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensionsTest.kt index 702afa8cc3..6c3c26bb2e 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensionsTest.kt @@ -1,25 +1,25 @@ package com.x8bit.bitwarden.data.vault.repository.util +import com.bitwarden.network.model.CipherRepromptTypeJson +import com.bitwarden.network.model.CipherTypeJson +import com.bitwarden.network.model.FieldTypeJson +import com.bitwarden.network.model.UriMatchTypeJson +import com.bitwarden.network.model.createMockAttachment +import com.bitwarden.network.model.createMockAttachmentJsonRequest +import com.bitwarden.network.model.createMockCard +import com.bitwarden.network.model.createMockCipher +import com.bitwarden.network.model.createMockCipherJsonRequest +import com.bitwarden.network.model.createMockField +import com.bitwarden.network.model.createMockIdentity +import com.bitwarden.network.model.createMockLogin +import com.bitwarden.network.model.createMockPasswordHistory +import com.bitwarden.network.model.createMockSecureNote +import com.bitwarden.network.model.createMockSshKey +import com.bitwarden.network.model.createMockUri import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType import com.bitwarden.vault.FieldType import com.bitwarden.vault.UriMatchType -import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherRepromptTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.FieldTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.UriMatchTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockAttachment -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockAttachmentJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockCard -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockCipher -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockCipherJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockField -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockIdentity -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockLogin -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockPasswordHistory -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockSecureNote -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockSshKey -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockUri import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSdkAttachment import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSdkCard diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensionsTest.kt index 90d4796d57..57ff0e419e 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensionsTest.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.repository.util +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.vault.Collection -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import org.junit.Test import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensionsTest.kt index 7792bef22f..9fb0e15b46 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensionsTest.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.repository.util +import com.bitwarden.network.model.createMockFolder import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockFolder import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSdkFolder import org.junit.Assert.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensionsTest.kt index b17f388767..df8852d7d0 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensionsTest.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.repository.util -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockSend -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockSendJsonRequest +import com.bitwarden.network.model.createMockSend +import com.bitwarden.network.model.createMockSendJsonRequest import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSdkSend import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordgenerator/MasterPasswordGeneratorViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordgenerator/MasterPasswordGeneratorViewModelTest.kt index 0d3b374c43..2645526b6e 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordgenerator/MasterPasswordGeneratorViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordgenerator/MasterPasswordGeneratorViewModelTest.kt @@ -2,12 +2,12 @@ package com.x8bit.bitwarden.ui.auth.feature.masterpasswordgenerator import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.tools.generator.repository.model.GeneratedPassphraseResult import com.x8bit.bitwarden.data.tools.generator.repository.util.FakeGeneratorRepository -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest import io.mockk.every import io.mockk.mockk diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordViewModelTest.kt index c3d7992aa5..d892f12cc1 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordViewModelTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.auth.feature.removepassword import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.network.model.OrganizationType import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -11,7 +12,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.RemovePasswordResult 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.Environment -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest import io.mockk.coEvery import io.mockk.every diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt index b9fefd9fa9..62064ba5eb 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.platform.feature.rootnav import androidx.core.os.bundleOf import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.network.model.OrganizationType import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState @@ -20,7 +21,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.CompleteRegistrationData import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest import io.mockk.every import io.mockk.mockk 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 c73515e249..2dae6a9b57 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 @@ -6,6 +6,11 @@ import app.cash.turbine.test import app.cash.turbine.turbineScope import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.ui.util.Text +import com.bitwarden.ui.util.asText +import com.bitwarden.ui.util.concat import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView import com.bitwarden.vault.LoginUriView @@ -30,8 +35,6 @@ 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.Environment -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView @@ -46,9 +49,6 @@ import com.x8bit.bitwarden.data.vault.repository.model.RemovePasswordSendResult import com.x8bit.bitwarden.data.vault.repository.model.UpdateCipherResult import com.x8bit.bitwarden.data.vault.repository.model.VaultData import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.Text -import com.bitwarden.ui.util.asText -import com.bitwarden.ui.util.concat import com.x8bit.bitwarden.ui.platform.feature.search.util.createMockDisplayItemForCipher import com.x8bit.bitwarden.ui.platform.feature.search.util.filterAndOrganize import com.x8bit.bitwarden.ui.platform.feature.search.util.toViewState diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModelTest.kt index 01c76b87e1..49b340b574 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModelTest.kt @@ -4,6 +4,11 @@ import android.os.Build import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson.Policy +import com.bitwarden.network.model.createMockPolicy +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -27,13 +32,8 @@ import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson.Policy -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockPolicy import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.components.toggle.UnlockWithPinState import com.x8bit.bitwarden.ui.platform.feature.settings.accountsecurity.AccountSecurityAction.AuthenticatorSyncToggle import io.mockk.coEvery diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt index d110261134..90e921614d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt @@ -4,6 +4,9 @@ import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.exporters.ExportFormat +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.createMockPolicy +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength @@ -16,14 +19,11 @@ import com.x8bit.bitwarden.data.auth.repository.model.VerifyOtpResult import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState 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.createMockPolicy import com.x8bit.bitwarden.data.vault.manager.FileManager import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.ExportVaultDataResult import com.x8bit.bitwarden.ui.auth.feature.completeregistration.PasswordStrengthState import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.feature.settings.exportvault.model.ExportVaultFormat import io.mockk.coEvery import io.mockk.coVerify diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt index 2c80094a1d..b3c9813e6b 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt @@ -5,6 +5,10 @@ import app.cash.turbine.test import app.cash.turbine.turbineScope import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.generators.PasswordGeneratorRequest +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.createMockPolicy +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -27,11 +31,7 @@ import com.x8bit.bitwarden.data.tools.generator.repository.model.GeneratorResult import com.x8bit.bitwarden.data.tools.generator.repository.model.PasscodeGenerationOptions import com.x8bit.bitwarden.data.tools.generator.repository.model.UsernameGenerationOptions import com.x8bit.bitwarden.data.tools.generator.repository.util.FakeGeneratorRepository -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockPolicy import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.tools.feature.generator.GeneratorState.MainType.Username.UsernameType.ForwardedEmailAlias.ServiceType import com.x8bit.bitwarden.ui.tools.feature.generator.GeneratorState.MainType.Username.UsernameType.ForwardedEmailAlias.ServiceTypeOption import com.x8bit.bitwarden.ui.tools.feature.generator.model.GeneratorMode 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 e271f472fc..cf5e012f94 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 @@ -3,6 +3,9 @@ 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.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.ui.util.Text +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager @@ -11,14 +14,11 @@ import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository 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 import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult import com.x8bit.bitwarden.data.vault.repository.model.RemovePasswordSendResult import com.x8bit.bitwarden.data.vault.repository.model.SendData import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.Text -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.tools.feature.send.util.toViewState import io.mockk.coEvery import io.mockk.every 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 8b917863ed..39b4b11385 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 @@ -4,7 +4,12 @@ import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.createMockPolicy import com.bitwarden.send.SendView +import com.bitwarden.ui.util.Text +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -17,9 +22,6 @@ 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.Environment -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockPolicy import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.CreateSendResult @@ -27,8 +29,6 @@ import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult import com.x8bit.bitwarden.data.vault.repository.model.RemovePasswordSendResult import com.x8bit.bitwarden.data.vault.repository.model.UpdateSendResult import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.Text -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import com.x8bit.bitwarden.ui.tools.feature.send.addsend.model.AddSendType import com.x8bit.bitwarden.ui.tools.feature.send.addsend.util.toSendView 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 faf89b5d1c..bafa3041f0 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 @@ -11,6 +11,9 @@ import com.bitwarden.core.DateTime import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.send.SendView import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -49,9 +52,6 @@ import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.tools.generator.repository.GeneratorRepository import com.x8bit.bitwarden.data.tools.generator.repository.util.FakeGeneratorRepository -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createEditCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createEditExceptPasswordsCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createManageCollectionView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt index ab8b66ca51..448d4348b9 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt @@ -1,5 +1,7 @@ package com.x8bit.bitwarden.ui.vault.feature.addedit.util +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.ui.util.asText import com.bitwarden.vault.CardView import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType @@ -20,12 +22,10 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState 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 import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSdkFido2CredentialList -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.manager.resource.ResourceManager import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditState import com.x8bit.bitwarden.ui.vault.feature.addedit.model.UriItem 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 146d6a6d44..8658dce16f 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 @@ -3,6 +3,11 @@ package com.x8bit.bitwarden.ui.vault.feature.item import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.ui.util.Text +import com.bitwarden.ui.util.asText +import com.bitwarden.ui.util.concat import com.bitwarden.vault.CipherView import com.bitwarden.vault.CollectionView import com.bitwarden.vault.FolderView @@ -19,11 +24,9 @@ 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.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 -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView @@ -34,9 +37,6 @@ import com.x8bit.bitwarden.data.vault.repository.model.DeleteCipherResult import com.x8bit.bitwarden.data.vault.repository.model.DownloadAttachmentResult import com.x8bit.bitwarden.data.vault.repository.model.RestoreCipherResult import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.Text -import com.bitwarden.ui.util.asText -import com.bitwarden.ui.util.concat import com.x8bit.bitwarden.ui.platform.components.model.IconData import com.x8bit.bitwarden.ui.vault.feature.item.model.TotpCodeItemData import com.x8bit.bitwarden.ui.vault.feature.item.model.VaultItemLocation 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 e9fc93ae25..b08b03cd35 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 @@ -10,6 +10,7 @@ import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.bitwarden.ui.util.concat @@ -55,7 +56,6 @@ import com.x8bit.bitwarden.data.platform.repository.SettingsRepository 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 -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView 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 4fe9195783..38a71f7044 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 @@ -2,6 +2,10 @@ package com.x8bit.bitwarden.ui.vault.feature.movetoorganization import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.ui.util.asText +import com.bitwarden.ui.util.concat import com.bitwarden.vault.CipherView import com.bitwarden.vault.CollectionView import com.x8bit.bitwarden.R @@ -10,16 +14,12 @@ 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.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 import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.ShareCipherResult import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.asText -import com.bitwarden.ui.util.concat import com.x8bit.bitwarden.ui.vault.feature.movetoorganization.util.createMockOrganizationList import com.x8bit.bitwarden.ui.vault.model.VaultCollection import io.mockk.coEvery diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationExtensionsTest.kt index 810a9313c4..b8ee3258f7 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationExtensionsTest.kt @@ -1,15 +1,15 @@ package com.x8bit.bitwarden.ui.vault.feature.movetoorganization.util +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus 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.Environment -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.vault.feature.movetoorganization.VaultMoveToOrganizationState import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test 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 609337b153..784225301a 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 @@ -2,6 +2,11 @@ package com.x8bit.bitwarden.ui.vault.feature.vault import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.network.model.OrganizationType +import com.bitwarden.network.model.PolicyTypeJson +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.ui.util.Text +import com.bitwarden.ui.util.asText import com.bitwarden.vault.CipherType import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -26,9 +31,6 @@ import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManage import com.x8bit.bitwarden.data.platform.repository.SettingsRepository 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 -import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView @@ -37,8 +39,6 @@ import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.GenerateTotpResult import com.x8bit.bitwarden.data.vault.repository.model.VaultData import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.Text -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelay diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt index 4f26816094..e204b4103b 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.ui.vault.feature.vault.util +import com.bitwarden.network.model.OrganizationType import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus 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.Environment -import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterData import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/CiphersApi.kt b/network/src/main/kotlin/com/bitwarden/network/api/CiphersApi.kt similarity index 84% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/CiphersApi.kt rename to network/src/main/kotlin/com/bitwarden/network/api/CiphersApi.kt index 07c8302a33..4eed35314b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/CiphersApi.kt +++ b/network/src/main/kotlin/com/bitwarden/network/api/CiphersApi.kt @@ -1,14 +1,14 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.api +package com.bitwarden.network.api +import com.bitwarden.network.model.AttachmentJsonRequest +import com.bitwarden.network.model.AttachmentJsonResponse +import com.bitwarden.network.model.CipherJsonRequest +import com.bitwarden.network.model.CreateCipherInOrganizationJsonRequest +import com.bitwarden.network.model.ImportCiphersJsonRequest import com.bitwarden.network.model.NetworkResult -import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateCipherInOrganizationJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.ImportCiphersJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.ShareCipherJsonRequest -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherCollectionsJsonRequest +import com.bitwarden.network.model.ShareCipherJsonRequest +import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.UpdateCipherCollectionsJsonRequest import okhttp3.MultipartBody import retrofit2.http.Body import retrofit2.http.DELETE diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonRequest.kt b/network/src/main/kotlin/com/bitwarden/network/model/AttachmentJsonRequest.kt similarity index 84% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonRequest.kt rename to network/src/main/kotlin/com/bitwarden/network/model/AttachmentJsonRequest.kt index 5988792934..1e50b71c04 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonRequest.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/AttachmentJsonRequest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonResponse.kt b/network/src/main/kotlin/com/bitwarden/network/model/AttachmentJsonResponse.kt similarity index 88% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonResponse.kt rename to network/src/main/kotlin/com/bitwarden/network/model/AttachmentJsonResponse.kt index 85370071dc..5ae426a0b3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonResponse.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/AttachmentJsonResponse.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequest.kt b/network/src/main/kotlin/com/bitwarden/network/model/CipherJsonRequest.kt similarity index 97% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequest.kt rename to network/src/main/kotlin/com/bitwarden/network/model/CipherJsonRequest.kt index dbf4266f49..281ffa8565 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequest.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/CipherJsonRequest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.Contextual import kotlinx.serialization.SerialName diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherRepromptTypeJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/CipherRepromptTypeJson.kt similarity index 92% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherRepromptTypeJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/CipherRepromptTypeJson.kt index a4cd742c0f..579a7f2955 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherRepromptTypeJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/CipherRepromptTypeJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherTypeJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/CipherTypeJson.kt similarity index 93% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherTypeJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/CipherTypeJson.kt index c4efbfff6a..0a03a0cc33 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherTypeJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/CipherTypeJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateCipherInOrganizationJsonRequest.kt b/network/src/main/kotlin/com/bitwarden/network/model/CreateCipherInOrganizationJsonRequest.kt similarity index 88% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateCipherInOrganizationJsonRequest.kt rename to network/src/main/kotlin/com/bitwarden/network/model/CreateCipherInOrganizationJsonRequest.kt index b0d4cade06..0d3b9475a7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateCipherInOrganizationJsonRequest.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/CreateCipherInOrganizationJsonRequest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateFileSendResponseJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/CreateFileSendResponseJson.kt similarity index 86% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateFileSendResponseJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/CreateFileSendResponseJson.kt index 2baa666020..f7bc9f75a8 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CreateFileSendResponseJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/CreateFileSendResponseJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FieldTypeJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/FieldTypeJson.kt similarity index 93% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FieldTypeJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/FieldTypeJson.kt index 07ed4ecc67..0a2581025f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FieldTypeJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/FieldTypeJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FileUploadType.kt b/network/src/main/kotlin/com/bitwarden/network/model/FileUploadType.kt similarity index 90% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FileUploadType.kt rename to network/src/main/kotlin/com/bitwarden/network/model/FileUploadType.kt index 04b26209ba..c5534c9fb5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FileUploadType.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/FileUploadType.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/ImportCiphersJsonRequest.kt b/network/src/main/kotlin/com/bitwarden/network/model/ImportCiphersJsonRequest.kt similarity index 94% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/ImportCiphersJsonRequest.kt rename to network/src/main/kotlin/com/bitwarden/network/model/ImportCiphersJsonRequest.kt index 509ba21d3d..95446be687 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/ImportCiphersJsonRequest.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/ImportCiphersJsonRequest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/LinkedIdTypeJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/LinkedIdTypeJson.kt similarity index 98% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/LinkedIdTypeJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/LinkedIdTypeJson.kt index 5819919266..629485ed96 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/LinkedIdTypeJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/LinkedIdTypeJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/OrganizationStatusType.kt b/network/src/main/kotlin/com/bitwarden/network/model/OrganizationStatusType.kt similarity index 93% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/OrganizationStatusType.kt rename to network/src/main/kotlin/com/bitwarden/network/model/OrganizationStatusType.kt index 79bc4b137d..8e5b991460 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/OrganizationStatusType.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/OrganizationStatusType.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/OrganizationType.kt b/network/src/main/kotlin/com/bitwarden/network/model/OrganizationType.kt similarity index 94% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/OrganizationType.kt rename to network/src/main/kotlin/com/bitwarden/network/model/OrganizationType.kt index fb60a42d5e..b4b0f92d7c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/OrganizationType.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/OrganizationType.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/PolicyTypeJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/PolicyTypeJson.kt similarity index 97% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/PolicyTypeJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/PolicyTypeJson.kt index 185f56a0b0..84c87982d5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/PolicyTypeJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/PolicyTypeJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SecureNoteTypeJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/SecureNoteTypeJson.kt similarity index 90% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SecureNoteTypeJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/SecureNoteTypeJson.kt index 6b78826631..0292be7ac5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SecureNoteTypeJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/SecureNoteTypeJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendJsonRequest.kt b/network/src/main/kotlin/com/bitwarden/network/model/SendJsonRequest.kt similarity index 96% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendJsonRequest.kt rename to network/src/main/kotlin/com/bitwarden/network/model/SendJsonRequest.kt index e041cae77a..4647c26808 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendJsonRequest.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/SendJsonRequest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.Contextual import kotlinx.serialization.SerialName diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendTypeJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/SendTypeJson.kt similarity index 90% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendTypeJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/SendTypeJson.kt index 1ed7c69ee5..ed0cb6ff2f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendTypeJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/SendTypeJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/ShareCipherJsonRequest.kt b/network/src/main/kotlin/com/bitwarden/network/model/ShareCipherJsonRequest.kt similarity index 87% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/ShareCipherJsonRequest.kt rename to network/src/main/kotlin/com/bitwarden/network/model/ShareCipherJsonRequest.kt index 05a6bf4019..be2d9cca50 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/ShareCipherJsonRequest.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/ShareCipherJsonRequest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/SyncResponseJson.kt similarity index 99% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/SyncResponseJson.kt index d455dd70e3..2295ba2a7b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/SyncResponseJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.Contextual import kotlinx.serialization.ExperimentalSerializationApi diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateCipherCollectionsJsonRequest.kt b/network/src/main/kotlin/com/bitwarden/network/model/UpdateCipherCollectionsJsonRequest.kt similarity index 84% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateCipherCollectionsJsonRequest.kt rename to network/src/main/kotlin/com/bitwarden/network/model/UpdateCipherCollectionsJsonRequest.kt index 6e652226b1..459da42b7d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateCipherCollectionsJsonRequest.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/UpdateCipherCollectionsJsonRequest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UriMatchTypeJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/UriMatchTypeJson.kt similarity index 94% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UriMatchTypeJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/UriMatchTypeJson.kt index 0ec7e4ec5a..d7b3e4adb9 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UriMatchTypeJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/UriMatchTypeJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonRequestUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/AttachmentJsonRequestUtil.kt similarity index 81% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonRequestUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/AttachmentJsonRequestUtil.kt index 748ecdc389..71a5ad08a0 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonRequestUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/AttachmentJsonRequestUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model /** * Create a mock [CipherJsonRequest] with a given [number]. diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonResponseUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/AttachmentJsonResponseUtil.kt similarity index 87% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonResponseUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/AttachmentJsonResponseUtil.kt index f154b90f10..426b552cda 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/AttachmentJsonResponseUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/AttachmentJsonResponseUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model /** * Create a mock [AttachmentJsonResponse] with a given [number]. diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequestUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/CipherJsonRequestUtil.kt similarity index 95% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequestUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/CipherJsonRequestUtil.kt index dcff50d18e..a528e0a5aa 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequestUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/CipherJsonRequestUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import java.time.ZonedDateTime diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendJsonRequestUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SendJsonRequestUtil.kt similarity index 92% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendJsonRequestUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/SendJsonRequestUtil.kt index 4ff166c5d1..f2f9cb4c37 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendJsonRequestUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SendJsonRequestUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import java.time.ZonedDateTime diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseCipherUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseCipherUtil.kt similarity index 99% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseCipherUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseCipherUtil.kt index 1ac03e59ea..62bb9b3867 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseCipherUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseCipherUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import java.time.ZonedDateTime diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseCollectionUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseCollectionUtil.kt similarity index 87% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseCollectionUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseCollectionUtil.kt index dfa9c40e0b..9a634a7fba 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseCollectionUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseCollectionUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model /** * Create a mock [SyncResponseJson.Collection] with a given [number]. diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseDomainsUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseDomainsUtil.kt similarity index 90% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseDomainsUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseDomainsUtil.kt index 5524a741d0..c7b10ecd03 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseDomainsUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseDomainsUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model /** * Create a mock [SyncResponseJson.Domains] with a given [number]. diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseFolderUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseFolderUtil.kt similarity index 84% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseFolderUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseFolderUtil.kt index 8bfa9a87bd..3440184039 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseFolderUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseFolderUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import java.time.ZonedDateTime diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponsePolicyUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponsePolicyUtil.kt similarity index 89% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponsePolicyUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponsePolicyUtil.kt index 06fa393479..0d3f2f1f28 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponsePolicyUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponsePolicyUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.json.JsonObject diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseProfileUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseProfileUtil.kt similarity index 98% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseProfileUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseProfileUtil.kt index d0972438b2..75a0b8b067 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseProfileUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseProfileUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import java.time.ZonedDateTime diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseSendUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseSendUtil.kt similarity index 95% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseSendUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseSendUtil.kt index eb529c39a1..3f02399097 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseSendUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseSendUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import java.time.ZonedDateTime diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseUtil.kt b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseUtil.kt similarity index 88% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseUtil.kt rename to network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseUtil.kt index eb7b21c57d..6b96aa71ea 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseUtil.kt +++ b/network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseUtil.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model fun createMockSyncResponse(number: Int): SyncResponseJson = SyncResponseJson(