From e08d1aaf18ebbf8b29a34b62bf243924ef49d344 Mon Sep 17 00:00:00 2001
From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com>
Date: Wed, 12 Jun 2024 11:45:21 -0400
Subject: [PATCH] Update Bitwarden SDK (#1444)
---
.../bitwarden/AutofillTotpCopyViewModel.kt | 2 +-
.../java/com/x8bit/bitwarden/MainViewModel.kt | 2 +-
.../data/auth/datasource/sdk/AuthSdkSource.kt | 8 ++--
.../auth/datasource/sdk/AuthSdkSourceImpl.kt | 10 ++---
.../auth/manager/AuthRequestManagerImpl.kt | 2 +-
.../manager/model/CreateAuthRequestResult.kt | 2 +-
.../auth/repository/AuthRepositoryImpl.kt | 4 +-
.../fido2/manager/Fido2CredentialManager.kt | 2 +-
.../manager/Fido2CredentialManagerImpl.kt | 2 +-
.../manager/AutofillCompletionManager.kt | 2 +-
.../manager/AutofillCompletionManagerImpl.kt | 2 +-
.../manager/AutofillSelectionManager.kt | 2 +-
.../manager/AutofillSelectionManagerImpl.kt | 2 +-
.../provider/AutofillCipherProviderImpl.kt | 6 +--
.../autofill/util/CipherViewExtensions.kt | 2 +-
.../ciphermatching/CipherMatchingManager.kt | 2 +-
.../CipherMatchingManagerImpl.kt | 6 +--
.../platform/util/CipherViewExtensions.kt | 6 +--
.../disk/entity/PasswordHistoryEntity.kt | 2 +-
.../repository/GeneratorRepository.kt | 2 +-
.../repository/GeneratorRepositoryImpl.kt | 2 +-
.../vault/datasource/sdk/VaultSdkSource.kt | 42 +++++++++----------
.../datasource/sdk/VaultSdkSourceImpl.kt | 38 ++++++++---------
.../data/vault/manager/CipherManager.kt | 2 +-
.../data/vault/manager/CipherManagerImpl.kt | 6 +--
.../data/vault/manager/TotpCodeManager.kt | 2 +-
.../data/vault/manager/TotpCodeManagerImpl.kt | 4 +-
.../data/vault/manager/VaultLockManager.kt | 2 +-
.../vault/manager/VaultLockManagerImpl.kt | 6 +--
.../manager/model/VerificationCodeItem.kt | 2 +-
.../data/vault/repository/VaultRepository.kt | 12 +++---
.../vault/repository/VaultRepositoryImpl.kt | 20 ++++-----
.../model/CreateAttachmentResult.kt | 2 +-
.../repository/model/CreateFolderResult.kt | 2 +-
.../repository/model/CreateSendResult.kt | 2 +-
.../model/RemovePasswordSendResult.kt | 2 +-
.../data/vault/repository/model/SendData.kt | 2 +-
.../repository/model/UpdateFolderResult.kt | 2 +-
.../repository/model/UpdateSendResult.kt | 2 +-
.../data/vault/repository/model/VaultData.kt | 8 ++--
.../util/VaultSdkCipherExtensions.kt | 32 +++++++-------
.../util/VaultSdkCollectionExtensions.kt | 4 +-
.../util/VaultSdkFolderExtensions.kt | 4 +-
.../repository/util/VaultSdkSendExtensions.kt | 8 ++--
.../feature/search/SearchViewModel.kt | 2 +-
.../search/util/SearchTypeDataExtensions.kt | 14 +++----
.../autofill/util/UriMatchTypeExtensions.kt | 14 +++----
.../exportvault/model/ExportVaultFormat.kt | 2 +-
.../settings/folders/FoldersViewModel.kt | 2 +-
.../folders/addedit/FolderAddEditViewModel.kt | 2 +-
.../PasswordHistoryViewModel.kt | 4 +-
.../feature/send/addsend/AddSendViewModel.kt | 2 +-
.../addsend/util/AddSendStateExtensions.kt | 8 ++--
.../send/addsend/util/SendViewExtensions.kt | 4 +-
.../feature/send/util/SendDataExtensions.kt | 4 +-
.../feature/send/util/SendViewExtensions.kt | 2 +-
.../feature/addedit/VaultAddEditViewModel.kt | 2 +-
.../ui/vault/feature/addedit/model/UriItem.kt | 2 +-
.../addedit/util/CipherViewExtensions.kt | 18 ++++----
.../addedit/util/UriMatchDisplayTypeUtil.kt | 2 +-
.../attachments/AttachmentsViewModel.kt | 2 +-
.../attachments/util/CipherViewExtensions.kt | 2 +-
.../vault/feature/item/VaultItemViewModel.kt | 2 +-
.../feature/item/model/VaultItemStateData.kt | 2 +-
.../feature/item/util/CipherViewExtensions.kt | 18 ++++----
.../util/VaultItemListingDataExtensions.kt | 14 +++----
.../VaultMoveToOrganizationViewModel.kt | 4 +-
.../VaultMoveToOrganizationViewExtensions.kt | 4 +-
.../feature/util/CipherViewExtensions.kt | 4 +-
.../feature/util/CollectionViewExtensions.kt | 2 +-
.../feature/util/FolderViewExtensions.kt | 2 +-
.../vault/util/VaultAddItemStateExtensions.kt | 24 +++++------
.../feature/vault/util/VaultDataExtensions.kt | 12 +++---
.../AutofillTotpCopyViewModelTest.kt | 2 +-
.../com/x8bit/bitwarden/MainViewModelTest.kt | 2 +-
.../auth/datasource/sdk/AuthSdkSourceTest.kt | 10 ++---
.../auth/manager/AuthRequestManagerTest.kt | 2 +-
.../auth/repository/AuthRepositoryTest.kt | 12 +++---
.../manager/AutofillCompletionManagerTest.kt | 2 +-
.../manager/AutofillSelectionManagerTest.kt | 2 +-
.../processor/AutofillCipherProviderTest.kt | 10 ++---
.../autofill/util/CipherViewExtensionsTest.kt | 2 +-
.../CipherMatchingManagerTest.kt | 8 ++--
.../repository/SettingsRepositoryTest.kt | 2 +-
.../disk/entity/PasswordHistoryEntityTest.kt | 2 +-
.../repository/GeneratorRepositoryTest.kt | 4 +-
.../util/FakeGeneratorRepository.kt | 2 +-
.../data/util/CipherViewExtensionsTest.kt | 8 ++--
.../datasource/sdk/VaultSdkSourceTest.kt | 38 ++++++++---------
.../sdk/model/CipherListViewUtil.kt | 6 +--
.../datasource/sdk/model/CipherViewUtil.kt | 30 ++++++-------
.../sdk/model/CollectionViewUtil.kt | 2 +-
.../datasource/sdk/model/FolderViewUtil.kt | 2 +-
.../datasource/sdk/model/SendViewUtil.kt | 8 ++--
.../sdk/model/VaultSdkCipherUtil.kt | 28 ++++++-------
.../sdk/model/VaultSdkCollectionUtil.kt | 2 +-
.../sdk/model/VaultSdkFolderUtil.kt | 2 +-
.../datasource/sdk/model/VaultSdkSendUtil.kt | 8 ++--
.../data/vault/manager/CipherManagerTest.kt | 4 +-
.../data/vault/manager/TotpCodeManagerTest.kt | 4 +-
.../vault/manager/VaultLockManagerTest.kt | 6 +--
.../vault/repository/VaultRepositoryTest.kt | 22 +++++-----
.../util/VaultSdkCipherExtensionsTest.kt | 8 ++--
.../util/VaultSdkCollectionExtensionsTest.kt | 2 +-
.../LoginWithDeviceViewModelTest.kt | 2 +-
.../feature/search/SearchViewModelTest.kt | 4 +-
.../util/SearchTypeDataExtensionsTest.kt | 12 +++---
.../feature/search/util/SearchUtil.kt | 4 +-
.../util/UriMatchTypeExtensionsTest.kt | 12 +++---
.../exportvault/ExportVaultViewModelTest.kt | 2 +-
.../settings/folders/FoldersViewModelTest.kt | 2 +-
.../addedit/FolderAddEditViewModelTest.kt | 2 +-
.../PasswordHistoryViewModelTest.kt | 4 +-
.../send/addsend/AddSendViewModelTest.kt | 2 +-
.../util/AddSendStateExtensionsTest.kt | 2 +-
.../addsend/util/SendViewExtensionsTest.kt | 2 +-
.../send/util/SendDataExtensionsTest.kt | 4 +-
.../feature/addedit/VaultAddEditScreenTest.kt | 2 +-
.../addedit/VaultAddEditViewModelTest.kt | 10 ++---
.../addedit/util/CipherViewExtensionsTest.kt | 25 ++++++-----
.../addedit/util/UriMatchDisplayUtilTest.kt | 2 +-
.../attachments/AttachmentsViewModelTest.kt | 2 +-
.../feature/item/VaultItemViewModelTest.kt | 2 +-
.../item/util/CipherViewExtensionsTest.kt | 2 +-
.../feature/item/util/VaultItemTestUtil.kt | 20 ++++-----
.../VaultItemListingViewModelTest.kt | 2 +-
.../VaultItemListingDataExtensionsTest.kt | 10 ++---
.../util/VaultItemListingDataUtil.kt | 4 +-
.../VaultMoveToOrganizationViewModelTest.kt | 4 +-
.../feature/util/CipherViewExtensionsTest.kt | 2 +-
.../util/CollectionViewExtensionsTest.kt | 2 +-
.../feature/util/FolderViewExtensionsTest.kt | 2 +-
.../util/VaultAddItemStateExtensionsTest.kt | 26 ++++++------
.../vault/util/VaultDataExtensionsTest.kt | 8 ++--
.../VerificationCodeViewModelTest.kt | 2 +-
gradle/libs.versions.toml | 2 +-
136 files changed, 438 insertions(+), 439 deletions(-)
diff --git a/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyViewModel.kt
index ddc5d2b4c..49fd019e9 100644
--- a/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyViewModel.kt
@@ -2,7 +2,7 @@ package com.x8bit.bitwarden
import android.content.Intent
import androidx.lifecycle.viewModelScope
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.autofill.util.getTotpCopyIntentOrNull
import com.x8bit.bitwarden.data.platform.util.launchWithTimeout
diff --git a/app/src/main/java/com/x8bit/bitwarden/MainViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/MainViewModel.kt
index b1fb494d9..bc4c59b56 100644
--- a/app/src/main/java/com/x8bit/bitwarden/MainViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/MainViewModel.kt
@@ -4,7 +4,7 @@ import android.content.Intent
import android.os.Parcelable
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.util.getPasswordlessRequestDataIntentOrNull
import com.x8bit.bitwarden.data.autofill.fido2.util.getFido2CredentialRequestOrNull
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSource.kt
index 445bf5076..c54933e74 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSource.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSource.kt
@@ -1,9 +1,9 @@
package com.x8bit.bitwarden.data.auth.datasource.sdk
-import com.bitwarden.core.AuthRequestResponse
-import com.bitwarden.core.MasterPasswordPolicyOptions
-import com.bitwarden.core.RegisterKeyResponse
-import com.bitwarden.core.RegisterTdeKeyResponse
+import com.bitwarden.bitwarden.AuthRequestResponse
+import com.bitwarden.bitwarden.MasterPasswordPolicyOptions
+import com.bitwarden.bitwarden.RegisterKeyResponse
+import com.bitwarden.bitwarden.RegisterTdeKeyResponse
import com.bitwarden.crypto.HashPurpose
import com.bitwarden.crypto.Kdf
import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceImpl.kt
index 5a3ea944d..09d61ca22 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceImpl.kt
@@ -1,10 +1,10 @@
package com.x8bit.bitwarden.data.auth.datasource.sdk
-import com.bitwarden.core.AuthRequestResponse
-import com.bitwarden.core.FingerprintRequest
-import com.bitwarden.core.MasterPasswordPolicyOptions
-import com.bitwarden.core.RegisterKeyResponse
-import com.bitwarden.core.RegisterTdeKeyResponse
+import com.bitwarden.bitwarden.AuthRequestResponse
+import com.bitwarden.bitwarden.FingerprintRequest
+import com.bitwarden.bitwarden.MasterPasswordPolicyOptions
+import com.bitwarden.bitwarden.RegisterKeyResponse
+import com.bitwarden.bitwarden.RegisterTdeKeyResponse
import com.bitwarden.crypto.HashPurpose
import com.bitwarden.crypto.Kdf
import com.bitwarden.sdk.Client
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt
index 732a63e14..e8cc8e182 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.auth.manager
-import com.bitwarden.core.AuthRequestResponse
+import com.bitwarden.bitwarden.AuthRequestResponse
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestTypeJson
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/model/CreateAuthRequestResult.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/model/CreateAuthRequestResult.kt
index c424bea1d..6926e77bb 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/model/CreateAuthRequestResult.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/model/CreateAuthRequestResult.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.auth.manager.model
-import com.bitwarden.core.AuthRequestResponse
+import com.bitwarden.bitwarden.AuthRequestResponse
/**
* Models result of creating a new login approval request.
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 7153fbf06..1c34b9092 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
@@ -1,8 +1,8 @@
package com.x8bit.bitwarden.data.auth.repository
import android.os.SystemClock
-import com.bitwarden.core.AuthRequestMethod
-import com.bitwarden.core.InitUserCryptoMethod
+import com.bitwarden.bitwarden.AuthRequestMethod
+import com.bitwarden.bitwarden.InitUserCryptoMethod
import com.bitwarden.crypto.HashPurpose
import com.bitwarden.crypto.Kdf
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManager.kt
index 305e4f26e..4dd3525dc 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManager.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManager.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.autofill.fido2.manager
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialResult
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialRequest
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2ValidateOriginResult
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerImpl.kt
index 39a079ccd..5043097cc 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerImpl.kt
@@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.autofill.fido2.manager
import androidx.credentials.exceptions.CreateCredentialUnknownException
import androidx.credentials.provider.CallingAppInfo
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.model.DigitalAssetLinkResponseJson
import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.model.PublicKeyCredentialCreationOptions
import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.service.DigitalAssetLinkService
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManager.kt
index 8cf45601f..7f2fb4b2c 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManager.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManager.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.data.autofill.manager
import android.app.Activity
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
/**
* A manager for completing the autofill process after the user has made a selection.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerImpl.kt
index c2b4ab802..e7ff46bbf 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerImpl.kt
@@ -3,8 +3,8 @@ package com.x8bit.bitwarden.data.autofill.manager
import android.app.Activity
import android.content.Intent
import android.widget.Toast
-import com.bitwarden.core.CipherView
import com.bitwarden.core.DateTime
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.autofill.builder.FilledDataBuilder
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManager.kt
index 874c91c58..e38a227be 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManager.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManager.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.autofill.manager
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import kotlinx.coroutines.flow.Flow
/**
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManagerImpl.kt
index 09b2130ec..dec7c1551 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManagerImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManagerImpl.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.autofill.manager
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.receiveAsFlow
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/provider/AutofillCipherProviderImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/provider/AutofillCipherProviderImpl.kt
index 24d9fc5bf..01265cb95 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/provider/AutofillCipherProviderImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/provider/AutofillCipherProviderImpl.kt
@@ -1,8 +1,8 @@
package com.x8bit.bitwarden.data.autofill.provider
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.autofill.model.AutofillCipher
import com.x8bit.bitwarden.data.platform.manager.ciphermatching.CipherMatchingManager
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/CipherViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/CipherViewExtensions.kt
index 747b36df8..ff74b8f84 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/CipherViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/CipherViewExtensions.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.autofill.util
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.autofill.model.AutofillCipher
import com.x8bit.bitwarden.data.autofill.provider.AutofillCipherProvider
import com.x8bit.bitwarden.data.platform.util.subtitle
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManager.kt
index 10a9f8c28..94bb5d15e 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManager.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManager.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.platform.manager.ciphermatching
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
/**
* A manager for matching ciphers based on special criteria.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerImpl.kt
index 2f647f823..488e42de4 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerImpl.kt
@@ -1,9 +1,9 @@
package com.x8bit.bitwarden.data.platform.manager.ciphermatching
import android.content.Context
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.LoginUriView
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.LoginUriView
+import com.bitwarden.vault.UriMatchType
import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
import com.x8bit.bitwarden.data.platform.util.getDomainOrNull
import com.x8bit.bitwarden.data.platform.util.getHostWithPortOrNull
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/CipherViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/CipherViewExtensions.kt
index f0c7c6e88..71abdba5b 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/CipherViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/CipherViewExtensions.kt
@@ -1,8 +1,8 @@
package com.x8bit.bitwarden.data.platform.util
-import com.bitwarden.core.CardView
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CardView
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
/**
* If someone has multiple AMEX cards, they tend to have the same last 4 digits. So we provide a
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/entity/PasswordHistoryEntity.kt b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/entity/PasswordHistoryEntity.kt
index 02a4fcb79..2864e514f 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/entity/PasswordHistoryEntity.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/entity/PasswordHistoryEntity.kt
@@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.tools.generator.datasource.disk.entity
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
-import com.bitwarden.core.PasswordHistory
+import com.bitwarden.vault.PasswordHistory
import java.time.Instant
/**
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepository.kt
index d38c9b404..e1b119729 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepository.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepository.kt
@@ -2,10 +2,10 @@
package com.x8bit.bitwarden.data.tools.generator.repository
-import com.bitwarden.core.PasswordHistoryView
import com.bitwarden.generators.PassphraseGeneratorRequest
import com.bitwarden.generators.PasswordGeneratorRequest
import com.bitwarden.generators.UsernameGeneratorRequest
+import com.bitwarden.vault.PasswordHistoryView
import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation
import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState
import com.x8bit.bitwarden.data.tools.generator.repository.model.GeneratedCatchAllUsernameResult
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryImpl.kt
index 92b2d07e8..a5466f379 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryImpl.kt
@@ -2,10 +2,10 @@
package com.x8bit.bitwarden.data.tools.generator.repository
-import com.bitwarden.core.PasswordHistoryView
import com.bitwarden.generators.PassphraseGeneratorRequest
import com.bitwarden.generators.PasswordGeneratorRequest
import com.bitwarden.generators.UsernameGeneratorRequest
+import com.bitwarden.vault.PasswordHistoryView
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation
import com.x8bit.bitwarden.data.platform.manager.PolicyManager
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt
index 016e6b9ff..77f30e50a 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt
@@ -1,28 +1,28 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk
-import com.bitwarden.core.Attachment
-import com.bitwarden.core.AttachmentEncryptResult
-import com.bitwarden.core.AttachmentView
-import com.bitwarden.core.Cipher
-import com.bitwarden.core.CipherListView
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.Collection
-import com.bitwarden.core.CollectionView
+import com.bitwarden.bitwarden.DerivePinKeyResponse
+import com.bitwarden.bitwarden.ExportFormat
+import com.bitwarden.bitwarden.InitOrgCryptoRequest
+import com.bitwarden.bitwarden.InitUserCryptoMethod
+import com.bitwarden.bitwarden.InitUserCryptoRequest
+import com.bitwarden.bitwarden.Send
+import com.bitwarden.bitwarden.SendView
+import com.bitwarden.bitwarden.UpdatePasswordResponse
import com.bitwarden.core.DateTime
-import com.bitwarden.core.DerivePinKeyResponse
-import com.bitwarden.core.ExportFormat
-import com.bitwarden.core.Folder
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.InitOrgCryptoRequest
-import com.bitwarden.core.InitUserCryptoMethod
-import com.bitwarden.core.InitUserCryptoRequest
-import com.bitwarden.core.PasswordHistory
-import com.bitwarden.core.PasswordHistoryView
-import com.bitwarden.core.Send
-import com.bitwarden.core.SendView
-import com.bitwarden.core.TotpResponse
-import com.bitwarden.core.UpdatePasswordResponse
import com.bitwarden.crypto.TrustDeviceResponse
+import com.bitwarden.vault.Attachment
+import com.bitwarden.vault.AttachmentEncryptResult
+import com.bitwarden.vault.AttachmentView
+import com.bitwarden.vault.Cipher
+import com.bitwarden.vault.CipherListView
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.Collection
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.Folder
+import com.bitwarden.vault.FolderView
+import com.bitwarden.vault.PasswordHistory
+import com.bitwarden.vault.PasswordHistoryView
+import com.bitwarden.vault.TotpResponse
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.InitializeCryptoResult
import java.io.File
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt
index 700bd52db..a5b78acec 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt
@@ -1,29 +1,29 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk
-import com.bitwarden.core.Attachment
-import com.bitwarden.core.AttachmentView
-import com.bitwarden.core.Cipher
-import com.bitwarden.core.CipherListView
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.Collection
-import com.bitwarden.core.CollectionView
+import com.bitwarden.bitwarden.DerivePinKeyResponse
+import com.bitwarden.bitwarden.ExportFormat
+import com.bitwarden.bitwarden.InitOrgCryptoRequest
+import com.bitwarden.bitwarden.InitUserCryptoRequest
+import com.bitwarden.bitwarden.Send
+import com.bitwarden.bitwarden.SendView
+import com.bitwarden.bitwarden.UpdatePasswordResponse
import com.bitwarden.core.DateTime
-import com.bitwarden.core.DerivePinKeyResponse
-import com.bitwarden.core.ExportFormat
-import com.bitwarden.core.Folder
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.InitOrgCryptoRequest
-import com.bitwarden.core.InitUserCryptoRequest
-import com.bitwarden.core.PasswordHistory
-import com.bitwarden.core.PasswordHistoryView
-import com.bitwarden.core.Send
-import com.bitwarden.core.SendView
-import com.bitwarden.core.TotpResponse
-import com.bitwarden.core.UpdatePasswordResponse
import com.bitwarden.crypto.TrustDeviceResponse
import com.bitwarden.sdk.BitwardenException
import com.bitwarden.sdk.Client
import com.bitwarden.sdk.ClientVault
+import com.bitwarden.vault.Attachment
+import com.bitwarden.vault.AttachmentView
+import com.bitwarden.vault.Cipher
+import com.bitwarden.vault.CipherListView
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.Collection
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.Folder
+import com.bitwarden.vault.FolderView
+import com.bitwarden.vault.PasswordHistory
+import com.bitwarden.vault.PasswordHistoryView
+import com.bitwarden.vault.TotpResponse
import com.x8bit.bitwarden.data.platform.manager.SdkClientManager
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.InitializeCryptoResult
import java.io.File
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManager.kt
index 867cbd815..c7b551202 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManager.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManager.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.data.vault.manager
import android.net.Uri
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.vault.repository.model.CreateAttachmentResult
import com.x8bit.bitwarden.data.vault.repository.model.CreateCipherResult
import com.x8bit.bitwarden.data.vault.repository.model.DeleteAttachmentResult
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 f1288ab3b..6c79b2628 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
@@ -2,9 +2,9 @@ package com.x8bit.bitwarden.data.vault.manager
import android.net.Uri
import androidx.core.net.toUri
-import com.bitwarden.core.AttachmentView
-import com.bitwarden.core.Cipher
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.AttachmentView
+import com.bitwarden.vault.Cipher
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
import com.x8bit.bitwarden.data.platform.util.asFailure
import com.x8bit.bitwarden.data.platform.util.asSuccess
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManager.kt
index 61c1bf803..25d9313ba 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManager.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManager.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.manager
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.platform.repository.model.DataState
import com.x8bit.bitwarden.data.vault.manager.model.VerificationCodeItem
import kotlinx.coroutines.flow.StateFlow
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt
index 66bf97076..f7a308693 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt
@@ -1,8 +1,8 @@
package com.x8bit.bitwarden.data.vault.manager
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherView
import com.bitwarden.core.DateTime
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager
import com.x8bit.bitwarden.data.platform.repository.model.DataState
import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManager.kt
index 0e82f237c..8240ad73c 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManager.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManager.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.manager
-import com.bitwarden.core.InitUserCryptoMethod
+import com.bitwarden.bitwarden.InitUserCryptoMethod
import com.bitwarden.crypto.Kdf
import com.bitwarden.sdk.ClientAuth
import com.x8bit.bitwarden.data.vault.manager.model.VaultStateEvent
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt
index b1a195e30..0f7aee2b3 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt
@@ -1,9 +1,9 @@
package com.x8bit.bitwarden.data.vault.manager
import android.os.SystemClock
-import com.bitwarden.core.InitOrgCryptoRequest
-import com.bitwarden.core.InitUserCryptoMethod
-import com.bitwarden.core.InitUserCryptoRequest
+import com.bitwarden.bitwarden.InitOrgCryptoRequest
+import com.bitwarden.bitwarden.InitUserCryptoMethod
+import com.bitwarden.bitwarden.InitUserCryptoRequest
import com.bitwarden.crypto.HashPurpose
import com.bitwarden.crypto.Kdf
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/model/VerificationCodeItem.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/model/VerificationCodeItem.kt
index e961d1c52..7be2dd29b 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/model/VerificationCodeItem.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/model/VerificationCodeItem.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.manager.model
-import com.bitwarden.core.LoginUriView
+import com.bitwarden.vault.LoginUriView
/**
* Models the items returned by the TotpCodeManager.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt
index 7f5da09af..a238b945f 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt
@@ -1,14 +1,14 @@
package com.x8bit.bitwarden.data.vault.repository
import android.net.Uri
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
+import com.bitwarden.bitwarden.ExportFormat
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.bitwarden.SendView
import com.bitwarden.core.DateTime
-import com.bitwarden.core.ExportFormat
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.SendType
-import com.bitwarden.core.SendView
import com.bitwarden.crypto.Kdf
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.FolderView
import com.x8bit.bitwarden.data.platform.repository.model.DataState
import com.x8bit.bitwarden.data.vault.manager.CipherManager
import com.x8bit.bitwarden.data.vault.manager.VaultLockManager
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 db5ef1ba1..3113458f5 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
@@ -1,18 +1,18 @@
package com.x8bit.bitwarden.data.vault.repository
import android.net.Uri
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
+import com.bitwarden.bitwarden.ExportFormat
+import com.bitwarden.bitwarden.InitOrgCryptoRequest
+import com.bitwarden.bitwarden.InitUserCryptoMethod
+import com.bitwarden.bitwarden.Send
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.bitwarden.SendView
import com.bitwarden.core.DateTime
-import com.bitwarden.core.ExportFormat
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.InitOrgCryptoRequest
-import com.bitwarden.core.InitUserCryptoMethod
-import com.bitwarden.core.Send
-import com.bitwarden.core.SendType
-import com.bitwarden.core.SendView
import com.bitwarden.crypto.Kdf
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.FolderView
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
import com.x8bit.bitwarden.data.auth.manager.UserLogoutManager
import com.x8bit.bitwarden.data.auth.repository.util.toSdkParams
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateAttachmentResult.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateAttachmentResult.kt
index 91b5ac48b..be7c18174 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateAttachmentResult.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateAttachmentResult.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.repository.model
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
/**
* Models result of creating an attachment.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateFolderResult.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateFolderResult.kt
index 2d9969974..df69d8ad9 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateFolderResult.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateFolderResult.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.repository.model
-import com.bitwarden.core.FolderView
+import com.bitwarden.vault.FolderView
/**
* Models result of creating a folder.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateSendResult.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateSendResult.kt
index d1ccb9b45..8728c2311 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateSendResult.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/CreateSendResult.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.repository.model
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendView
/**
* Models result of creating a send.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/RemovePasswordSendResult.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/RemovePasswordSendResult.kt
index 8e2d6c072..da447cc91 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/RemovePasswordSendResult.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/RemovePasswordSendResult.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.repository.model
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendView
/**
* Models result of removing the password protection from a send.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/SendData.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/SendData.kt
index 2c48b8984..372ce1c2e 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/SendData.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/SendData.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.repository.model
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendView
/**
* Represents decrypted send data.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/UpdateFolderResult.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/UpdateFolderResult.kt
index 68a4d90c6..b2b386724 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/UpdateFolderResult.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/UpdateFolderResult.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.repository.model
-import com.bitwarden.core.FolderView
+import com.bitwarden.vault.FolderView
/**
* Models result of updating a folder.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/UpdateSendResult.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/UpdateSendResult.kt
index caafbe14e..a3e90e295 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/UpdateSendResult.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/UpdateSendResult.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.repository.model
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendView
/**
* Models result of updating a send.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/VaultData.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/VaultData.kt
index 83b517702..9e8b2e2ab 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/VaultData.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/VaultData.kt
@@ -1,9 +1,9 @@
package com.x8bit.bitwarden.data.vault.repository.model
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendView
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.FolderView
/**
* Represents decrypted vault data.
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 a1f60683e..184bba9c1 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
@@ -2,22 +2,22 @@
package com.x8bit.bitwarden.data.vault.repository.util
-import com.bitwarden.core.Attachment
-import com.bitwarden.core.Card
-import com.bitwarden.core.Cipher
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.Fido2Credential
-import com.bitwarden.core.Field
-import com.bitwarden.core.FieldType
-import com.bitwarden.core.Identity
-import com.bitwarden.core.Login
-import com.bitwarden.core.LoginUri
-import com.bitwarden.core.PasswordHistory
-import com.bitwarden.core.SecureNote
-import com.bitwarden.core.SecureNoteType
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.vault.Attachment
+import com.bitwarden.vault.Card
+import com.bitwarden.vault.Cipher
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.Fido2Credential
+import com.bitwarden.vault.Field
+import com.bitwarden.vault.FieldType
+import com.bitwarden.vault.Identity
+import com.bitwarden.vault.Login
+import com.bitwarden.vault.LoginUri
+import com.bitwarden.vault.PasswordHistory
+import com.bitwarden.vault.SecureNote
+import com.bitwarden.vault.SecureNoteType
+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
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 6444ec95b..e27e9071f 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,7 +1,7 @@
package com.x8bit.bitwarden.data.vault.repository.util
-import com.bitwarden.core.Collection
-import com.bitwarden.core.CollectionView
+import com.bitwarden.vault.Collection
+import com.bitwarden.vault.CollectionView
import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson
import java.util.Locale
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 664effd8b..5cada62fc 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,7 +1,7 @@
package com.x8bit.bitwarden.data.vault.repository.util
-import com.bitwarden.core.Folder
-import com.bitwarden.core.FolderView
+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
import java.util.Locale
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 d99982d77..b37e47823 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,9 +1,9 @@
package com.x8bit.bitwarden.data.vault.repository.util
-import com.bitwarden.core.Send
-import com.bitwarden.core.SendFile
-import com.bitwarden.core.SendText
-import com.bitwarden.core.SendType
+import com.bitwarden.bitwarden.Send
+import com.bitwarden.bitwarden.SendFile
+import com.bitwarden.bitwarden.SendText
+import com.bitwarden.bitwarden.SendType
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
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 1ed04faea..55997c8d1 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
@@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.platform.feature.search
import android.os.Parcelable
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
-import com.bitwarden.core.LoginUriView
+import com.bitwarden.vault.LoginUriView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.ValidatePasswordResult
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt
index 1ee715a34..1679c5633 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt
@@ -3,13 +3,13 @@
package com.x8bit.bitwarden.ui.platform.feature.search.util
import androidx.annotation.DrawableRes
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.SendType
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.bitwarden.SendView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.FolderView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.platform.util.subtitle
import com.x8bit.bitwarden.ui.platform.base.util.asText
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/util/UriMatchTypeExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/util/UriMatchTypeExtensions.kt
index 25a28cc80..aabeaf89a 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/util/UriMatchTypeExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/util/UriMatchTypeExtensions.kt
@@ -22,12 +22,12 @@ val UriMatchType.displayLabel: Text
/**
* Convert this internal [UriMatchType] to the sdk model.
*/
-fun UriMatchType.toSdkUriMatchType(): com.bitwarden.core.UriMatchType =
+fun UriMatchType.toSdkUriMatchType(): com.bitwarden.vault.UriMatchType =
when (this) {
- UriMatchType.DOMAIN -> com.bitwarden.core.UriMatchType.DOMAIN
- UriMatchType.EXACT -> com.bitwarden.core.UriMatchType.EXACT
- UriMatchType.HOST -> com.bitwarden.core.UriMatchType.HOST
- UriMatchType.NEVER -> com.bitwarden.core.UriMatchType.NEVER
- UriMatchType.REGULAR_EXPRESSION -> com.bitwarden.core.UriMatchType.REGULAR_EXPRESSION
- UriMatchType.STARTS_WITH -> com.bitwarden.core.UriMatchType.STARTS_WITH
+ UriMatchType.DOMAIN -> com.bitwarden.vault.UriMatchType.DOMAIN
+ UriMatchType.EXACT -> com.bitwarden.vault.UriMatchType.EXACT
+ UriMatchType.HOST -> com.bitwarden.vault.UriMatchType.HOST
+ UriMatchType.NEVER -> com.bitwarden.vault.UriMatchType.NEVER
+ UriMatchType.REGULAR_EXPRESSION -> com.bitwarden.vault.UriMatchType.REGULAR_EXPRESSION
+ UriMatchType.STARTS_WITH -> com.bitwarden.vault.UriMatchType.STARTS_WITH
}
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/model/ExportVaultFormat.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/model/ExportVaultFormat.kt
index bf02c1813..462c72793 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/model/ExportVaultFormat.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/model/ExportVaultFormat.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.platform.feature.settings.exportvault.model
-import com.bitwarden.core.ExportFormat
+import com.bitwarden.bitwarden.ExportFormat
/**
* Represents the file formats a user can select to export the vault.
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModel.kt
index 7cd030dcf..9db3b238b 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModel.kt
@@ -2,7 +2,7 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.folders
import android.os.Parcelable
import androidx.lifecycle.viewModelScope
-import com.bitwarden.core.FolderView
+import com.bitwarden.vault.FolderView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.platform.repository.model.DataState
import com.x8bit.bitwarden.data.vault.repository.VaultRepository
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt
index b969cfc36..f0e9cf4ce 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt
@@ -4,7 +4,7 @@ import android.os.Parcelable
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
import com.bitwarden.core.DateTime
-import com.bitwarden.core.FolderView
+import com.bitwarden.vault.FolderView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.platform.repository.model.DataState
import com.x8bit.bitwarden.data.vault.repository.VaultRepository
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt
index 222efb0ac..4f2b1c90b 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt
@@ -3,8 +3,8 @@ package com.x8bit.bitwarden.ui.tools.feature.generator.passwordhistory
import android.os.Parcelable
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.PasswordHistoryView
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.PasswordHistoryView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager
import com.x8bit.bitwarden.data.platform.repository.model.DataState
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 43c26a792..f03121b3d 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt
@@ -4,7 +4,7 @@ import android.net.Uri
import android.os.Parcelable
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/AddSendStateExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/AddSendStateExtensions.kt
index 9cce5b6f8..d5740b88d 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/AddSendStateExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/AddSendStateExtensions.kt
@@ -1,9 +1,9 @@
package com.x8bit.bitwarden.ui.tools.feature.send.addsend.util
-import com.bitwarden.core.SendFileView
-import com.bitwarden.core.SendTextView
-import com.bitwarden.core.SendType
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendFileView
+import com.bitwarden.bitwarden.SendTextView
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.bitwarden.SendView
import com.x8bit.bitwarden.ui.platform.base.util.orNullIfBlank
import com.x8bit.bitwarden.ui.tools.feature.send.addsend.AddSendState
import java.time.Clock
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/SendViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/SendViewExtensions.kt
index b9e16eb42..e05b1cf6c 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/SendViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/SendViewExtensions.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.ui.tools.feature.send.addsend.util
-import com.bitwarden.core.SendType
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.bitwarden.SendView
import com.x8bit.bitwarden.ui.tools.feature.send.addsend.AddSendState
import com.x8bit.bitwarden.ui.tools.feature.send.util.toSendUrl
import java.time.Clock
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt
index 43db5a148..493310bb3 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.ui.tools.feature.send.util
-import com.bitwarden.core.SendType
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.bitwarden.SendView
import com.x8bit.bitwarden.data.vault.repository.model.SendData
import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern
import com.x8bit.bitwarden.ui.tools.feature.send.SendState
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendViewExtensions.kt
index 4ddcfe225..6e5be8184 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendViewExtensions.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.tools.feature.send.util
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendView
import com.x8bit.bitwarden.ui.platform.components.model.IconRes
import com.x8bit.bitwarden.ui.tools.feature.send.model.SendStatusIcon
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.model.ListingItemOverflowAction
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 13f2ced56..0c5e8f72e 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
@@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.addedit
import android.os.Parcelable
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.BreachCountResult
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/model/UriItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/model/UriItem.kt
index 2822d356e..223fe1864 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/model/UriItem.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/model/UriItem.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.ui.vault.feature.addedit.model
import android.os.Parcelable
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.vault.UriMatchType
import kotlinx.parcelize.Parcelize
/**
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
index b74e340c2..481ae9c8c 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
@@ -2,15 +2,15 @@
package com.x8bit.bitwarden.ui.vault.feature.addedit.util
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
-import com.bitwarden.core.Fido2Credential
-import com.bitwarden.core.FieldType
-import com.bitwarden.core.FieldView
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.LoginUriView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.Fido2Credential
+import com.bitwarden.vault.FieldType
+import com.bitwarden.vault.FieldView
+import com.bitwarden.vault.FolderView
+import com.bitwarden.vault.LoginUriView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.model.UserState
import com.x8bit.bitwarden.ui.platform.base.util.asText
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/UriMatchDisplayTypeUtil.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/UriMatchDisplayTypeUtil.kt
index 7720357f4..178aa025b 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/UriMatchDisplayTypeUtil.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/UriMatchDisplayTypeUtil.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.addedit.util
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.vault.UriMatchType
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.UriMatchDisplayType
/**
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModel.kt
index 0ed7832a0..9d1456f71 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModel.kt
@@ -4,7 +4,7 @@ import android.net.Uri
import android.os.Parcelable
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.UserState
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/util/CipherViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/util/CipherViewExtensions.kt
index 13b96e8c5..a668c0398 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/util/CipherViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/util/CipherViewExtensions.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.attachments.util
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.ui.vault.feature.attachments.AttachmentsState
/**
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt
index 6f45be411..1d1c9c595 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt
@@ -4,7 +4,7 @@ import android.net.Uri
import android.os.Parcelable
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.BreachCountResult
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/model/VaultItemStateData.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/model/VaultItemStateData.kt
index b5e6eb7ee..91d3ba2a5 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/model/VaultItemStateData.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/model/VaultItemStateData.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.item.model
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
/**
* The state containing totp code item information and the cipher for the item.
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensions.kt
index 8873bde03..d7d750920 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensions.kt
@@ -1,14 +1,14 @@
package com.x8bit.bitwarden.ui.vault.feature.item.util
-import com.bitwarden.core.CardView
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.Fido2Credential
-import com.bitwarden.core.FieldType
-import com.bitwarden.core.FieldView
-import com.bitwarden.core.IdentityView
-import com.bitwarden.core.LoginUriView
+import com.bitwarden.vault.CardView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.Fido2Credential
+import com.bitwarden.vault.FieldType
+import com.bitwarden.vault.FieldView
+import com.bitwarden.vault.IdentityView
+import com.bitwarden.vault.LoginUriView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.vault.repository.model.VaultData
import com.x8bit.bitwarden.ui.platform.base.util.Text
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt
index 3aeabcf8e..f4299b999 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt
@@ -3,13 +3,13 @@
package com.x8bit.bitwarden.ui.vault.feature.itemlisting.util
import androidx.annotation.DrawableRes
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.SendType
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.bitwarden.SendView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.FolderView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialRequest
import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt
index 7068b60d1..eee59f1fd 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt
@@ -3,8 +3,8 @@ package com.x8bit.bitwarden.ui.vault.feature.movetoorganization
import android.os.Parcelable
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.UserState
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationViewExtensions.kt
index d7dc645f9..191ee5e1c 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationViewExtensions.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.ui.vault.feature.movetoorganization.util
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.model.UserState
import com.x8bit.bitwarden.ui.platform.base.util.asText
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/CipherViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/CipherViewExtensions.kt
index 885cc30c0..f27a56cc2 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/CipherViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/CipherViewExtensions.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.ui.vault.feature.util
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.ui.platform.components.model.IconRes
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.model.ListingItemOverflowAction
import com.x8bit.bitwarden.ui.vault.model.VaultTrailingIcon
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensions.kt
index 019fa31ea..319cb34ad 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensions.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.util
-import com.bitwarden.core.CollectionView
+import com.bitwarden.vault.CollectionView
private const val COLLECTION_DIVIDER: String = "/"
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/FolderViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/FolderViewExtensions.kt
index 9d12cb008..8004be080 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/FolderViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/FolderViewExtensions.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.util
-import com.bitwarden.core.FolderView
+import com.bitwarden.vault.FolderView
private const val FOLDER_DIVIDER: String = "/"
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt
index 83f109e89..622c9ac00 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt
@@ -1,17 +1,17 @@
package com.x8bit.bitwarden.ui.vault.feature.vault.util
-import com.bitwarden.core.CardView
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.FieldType
-import com.bitwarden.core.FieldView
-import com.bitwarden.core.IdentityView
-import com.bitwarden.core.LoginUriView
-import com.bitwarden.core.LoginView
-import com.bitwarden.core.PasswordHistoryView
-import com.bitwarden.core.SecureNoteType
-import com.bitwarden.core.SecureNoteView
+import com.bitwarden.vault.CardView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.FieldType
+import com.bitwarden.vault.FieldView
+import com.bitwarden.vault.IdentityView
+import com.bitwarden.vault.LoginUriView
+import com.bitwarden.vault.LoginView
+import com.bitwarden.vault.PasswordHistoryView
+import com.bitwarden.vault.SecureNoteType
+import com.bitwarden.vault.SecureNoteView
import com.x8bit.bitwarden.ui.platform.base.util.orNullIfBlank
import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditState
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.UriItem
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt
index 8a2826c8f..dab0d2aec 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt
@@ -1,12 +1,12 @@
package com.x8bit.bitwarden.ui.vault.feature.vault.util
import android.net.Uri
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.LoginUriView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.FolderView
+import com.bitwarden.vault.LoginUriView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.vault.repository.model.VaultData
import com.x8bit.bitwarden.ui.platform.base.util.asText
diff --git a/app/src/test/java/com/x8bit/bitwarden/AutofillTotpCopyViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/AutofillTotpCopyViewModelTest.kt
index cee9ceaa9..70cfd2c08 100644
--- a/app/src/test/java/com/x8bit/bitwarden/AutofillTotpCopyViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/AutofillTotpCopyViewModelTest.kt
@@ -2,7 +2,7 @@ package com.x8bit.bitwarden
import android.content.Intent
import app.cash.turbine.test
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.autofill.model.AutofillTotpCopyData
import com.x8bit.bitwarden.data.autofill.util.getTotpCopyIntentOrNull
diff --git a/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt
index f202eed06..edbf11c08 100644
--- a/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt
@@ -4,7 +4,7 @@ import android.content.Intent
import android.content.pm.SigningInfo
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.SwitchAccountResult
import com.x8bit.bitwarden.data.auth.repository.model.UserState
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt
index 40357a7ee..b9b94c243 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt
@@ -1,10 +1,10 @@
package com.x8bit.bitwarden.data.auth.datasource.sdk
-import com.bitwarden.core.AuthRequestResponse
-import com.bitwarden.core.FingerprintRequest
-import com.bitwarden.core.MasterPasswordPolicyOptions
-import com.bitwarden.core.RegisterKeyResponse
-import com.bitwarden.core.RegisterTdeKeyResponse
+import com.bitwarden.bitwarden.AuthRequestResponse
+import com.bitwarden.bitwarden.FingerprintRequest
+import com.bitwarden.bitwarden.MasterPasswordPolicyOptions
+import com.bitwarden.bitwarden.RegisterKeyResponse
+import com.bitwarden.bitwarden.RegisterTdeKeyResponse
import com.bitwarden.crypto.HashPurpose
import com.bitwarden.crypto.Kdf
import com.bitwarden.sdk.Client
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt
index 3afd85cba..269df49a2 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.data.auth.manager
import app.cash.turbine.test
-import com.bitwarden.core.AuthRequestResponse
+import com.bitwarden.bitwarden.AuthRequestResponse
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.PendingAuthRequestJson
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 4b15c7a4e..dc4abf2e2 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
@@ -1,12 +1,12 @@
package com.x8bit.bitwarden.data.auth.repository
import app.cash.turbine.test
-import com.bitwarden.core.AuthRequestMethod
-import com.bitwarden.core.AuthRequestResponse
-import com.bitwarden.core.InitUserCryptoMethod
-import com.bitwarden.core.RegisterKeyResponse
-import com.bitwarden.core.RegisterTdeKeyResponse
-import com.bitwarden.core.UpdatePasswordResponse
+import com.bitwarden.bitwarden.AuthRequestMethod
+import com.bitwarden.bitwarden.AuthRequestResponse
+import com.bitwarden.bitwarden.InitUserCryptoMethod
+import com.bitwarden.bitwarden.RegisterKeyResponse
+import com.bitwarden.bitwarden.RegisterTdeKeyResponse
+import com.bitwarden.bitwarden.UpdatePasswordResponse
import com.bitwarden.crypto.HashPurpose
import com.bitwarden.crypto.Kdf
import com.bitwarden.crypto.RsaKeyPair
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerTest.kt
index d6882e94c..678f34fee 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerTest.kt
@@ -6,7 +6,7 @@ import android.content.Context
import android.content.Intent
import android.service.autofill.Dataset
import android.widget.Toast
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.UserState
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManagerTest.kt
index a5e739e1c..fe1c731e1 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManagerTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillSelectionManagerTest.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.data.autofill.manager
import app.cash.turbine.test
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import io.mockk.mockk
import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillCipherProviderTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillCipherProviderTest.kt
index 576b94794..22cb56003 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillCipherProviderTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillCipherProviderTest.kt
@@ -1,10 +1,10 @@
package com.x8bit.bitwarden.data.autofill.processor
-import com.bitwarden.core.CardView
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.LoginView
+import com.bitwarden.vault.CardView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.LoginView
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.autofill.model.AutofillCipher
import com.x8bit.bitwarden.data.autofill.provider.AutofillCipherProvider
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/util/CipherViewExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/util/CipherViewExtensionsTest.kt
index 5d85b2632..ecff2180b 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/util/CipherViewExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/util/CipherViewExtensionsTest.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.autofill.util
-import com.bitwarden.core.CipherType
+import com.bitwarden.vault.CipherType
import com.x8bit.bitwarden.data.autofill.model.AutofillCipher
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView
import kotlinx.coroutines.test.runTest
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerTest.kt
index 4b7439a19..c4b4190ac 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/ciphermatching/CipherMatchingManagerTest.kt
@@ -1,10 +1,10 @@
package com.x8bit.bitwarden.data.platform.manager.ciphermatching
import android.content.Context
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.LoginUriView
-import com.bitwarden.core.LoginView
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.LoginUriView
+import com.bitwarden.vault.LoginView
+import com.bitwarden.vault.UriMatchType
import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
import com.x8bit.bitwarden.data.platform.repository.model.DataState
import com.x8bit.bitwarden.data.platform.util.getDomainOrNull
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 03c052c67..1219a633b 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
@@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.platform.repository
import android.view.autofill.AutofillManager
import app.cash.turbine.test
-import com.bitwarden.core.DerivePinKeyResponse
+import com.bitwarden.bitwarden.DerivePinKeyResponse
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson
import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/entity/PasswordHistoryEntityTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/entity/PasswordHistoryEntityTest.kt
index d8e6d50c2..6a40e98c3 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/entity/PasswordHistoryEntityTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/entity/PasswordHistoryEntityTest.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.tools.generator.datasource.disk.entity
-import com.bitwarden.core.PasswordHistory
+import com.bitwarden.vault.PasswordHistory
import org.junit.Test
import org.junit.jupiter.api.Assertions.assertEquals
import java.time.Instant
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt
index ddb577459..6036684c6 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt
@@ -1,13 +1,13 @@
package com.x8bit.bitwarden.data.tools.generator.repository
import app.cash.turbine.test
-import com.bitwarden.core.PasswordHistory
-import com.bitwarden.core.PasswordHistoryView
import com.bitwarden.generators.AppendType
import com.bitwarden.generators.ForwarderServiceType
import com.bitwarden.generators.PassphraseGeneratorRequest
import com.bitwarden.generators.PasswordGeneratorRequest
import com.bitwarden.generators.UsernameGeneratorRequest
+import com.bitwarden.vault.PasswordHistory
+import com.bitwarden.vault.PasswordHistoryView
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
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/util/FakeGeneratorRepository.kt b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/util/FakeGeneratorRepository.kt
index e4ed61f65..ea80bf487 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/util/FakeGeneratorRepository.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/util/FakeGeneratorRepository.kt
@@ -1,9 +1,9 @@
package com.x8bit.bitwarden.data.tools.generator.repository.util
-import com.bitwarden.core.PasswordHistoryView
import com.bitwarden.generators.PassphraseGeneratorRequest
import com.bitwarden.generators.PasswordGeneratorRequest
import com.bitwarden.generators.UsernameGeneratorRequest
+import com.bitwarden.vault.PasswordHistoryView
import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation
import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState
import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/util/CipherViewExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/util/CipherViewExtensionsTest.kt
index 7709739ff..66474e3ec 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/util/CipherViewExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/util/CipherViewExtensionsTest.kt
@@ -1,9 +1,9 @@
package com.x8bit.bitwarden.data.util
-import com.bitwarden.core.CardView
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.IdentityView
+import com.bitwarden.vault.CardView
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.IdentityView
import com.x8bit.bitwarden.data.platform.util.subtitle
import io.mockk.every
import io.mockk.mockk
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt
index edb6194c6..4c1be296a 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt
@@ -1,25 +1,13 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk
-import com.bitwarden.core.Attachment
-import com.bitwarden.core.AttachmentView
-import com.bitwarden.core.Cipher
-import com.bitwarden.core.CipherListView
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.Collection
-import com.bitwarden.core.CollectionView
+import com.bitwarden.bitwarden.DerivePinKeyResponse
+import com.bitwarden.bitwarden.ExportFormat
+import com.bitwarden.bitwarden.InitOrgCryptoRequest
+import com.bitwarden.bitwarden.InitUserCryptoRequest
+import com.bitwarden.bitwarden.Send
+import com.bitwarden.bitwarden.SendView
+import com.bitwarden.bitwarden.UpdatePasswordResponse
import com.bitwarden.core.DateTime
-import com.bitwarden.core.DerivePinKeyResponse
-import com.bitwarden.core.ExportFormat
-import com.bitwarden.core.Folder
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.InitOrgCryptoRequest
-import com.bitwarden.core.InitUserCryptoRequest
-import com.bitwarden.core.PasswordHistory
-import com.bitwarden.core.PasswordHistoryView
-import com.bitwarden.core.Send
-import com.bitwarden.core.SendView
-import com.bitwarden.core.TotpResponse
-import com.bitwarden.core.UpdatePasswordResponse
import com.bitwarden.crypto.TrustDeviceResponse
import com.bitwarden.sdk.BitwardenException
import com.bitwarden.sdk.Client
@@ -31,6 +19,18 @@ import com.bitwarden.sdk.ClientPasswordHistory
import com.bitwarden.sdk.ClientPlatform
import com.bitwarden.sdk.ClientSends
import com.bitwarden.sdk.ClientVault
+import com.bitwarden.vault.Attachment
+import com.bitwarden.vault.AttachmentView
+import com.bitwarden.vault.Cipher
+import com.bitwarden.vault.CipherListView
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.Collection
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.Folder
+import com.bitwarden.vault.FolderView
+import com.bitwarden.vault.PasswordHistory
+import com.bitwarden.vault.PasswordHistoryView
+import com.bitwarden.vault.TotpResponse
import com.x8bit.bitwarden.data.platform.manager.SdkClientManager
import com.x8bit.bitwarden.data.platform.util.asFailure
import com.x8bit.bitwarden.data.platform.util.asSuccess
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherListViewUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherListViewUtil.kt
index b4beb688e..ae59d1671 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherListViewUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherListViewUtil.kt
@@ -1,8 +1,8 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk.model
-import com.bitwarden.core.CipherListView
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
+import com.bitwarden.vault.CipherListView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
import java.time.ZonedDateTime
/**
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt
index fff5c50ec..5ead20252 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt
@@ -1,20 +1,20 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk.model
-import com.bitwarden.core.AttachmentView
-import com.bitwarden.core.CardView
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.Fido2Credential
-import com.bitwarden.core.FieldType
-import com.bitwarden.core.FieldView
-import com.bitwarden.core.IdentityView
-import com.bitwarden.core.LoginUriView
-import com.bitwarden.core.LoginView
-import com.bitwarden.core.PasswordHistoryView
-import com.bitwarden.core.SecureNoteType
-import com.bitwarden.core.SecureNoteView
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.vault.AttachmentView
+import com.bitwarden.vault.CardView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.Fido2Credential
+import com.bitwarden.vault.FieldType
+import com.bitwarden.vault.FieldView
+import com.bitwarden.vault.IdentityView
+import com.bitwarden.vault.LoginUriView
+import com.bitwarden.vault.LoginView
+import com.bitwarden.vault.PasswordHistoryView
+import com.bitwarden.vault.SecureNoteType
+import com.bitwarden.vault.SecureNoteView
+import com.bitwarden.vault.UriMatchType
import java.time.Clock
import java.time.Instant
import java.time.ZoneOffset
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CollectionViewUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CollectionViewUtil.kt
index eef5d8728..91a4b85b8 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CollectionViewUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CollectionViewUtil.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk.model
-import com.bitwarden.core.CollectionView
+import com.bitwarden.vault.CollectionView
/**
* Create a mock [CollectionView] with a given [number].
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/FolderViewUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/FolderViewUtil.kt
index a7363820a..23ecfe236 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/FolderViewUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/FolderViewUtil.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk.model
-import com.bitwarden.core.FolderView
+import com.bitwarden.vault.FolderView
import java.time.ZonedDateTime
/**
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/SendViewUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/SendViewUtil.kt
index 6590be7db..140b9d668 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/SendViewUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/SendViewUtil.kt
@@ -1,9 +1,9 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk.model
-import com.bitwarden.core.SendFileView
-import com.bitwarden.core.SendTextView
-import com.bitwarden.core.SendType
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendFileView
+import com.bitwarden.bitwarden.SendTextView
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.bitwarden.SendView
import java.time.ZonedDateTime
/**
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCipherUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCipherUtil.kt
index e0e691f01..a6c279798 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCipherUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCipherUtil.kt
@@ -1,19 +1,19 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk.model
-import com.bitwarden.core.Attachment
-import com.bitwarden.core.Card
-import com.bitwarden.core.Cipher
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.Field
-import com.bitwarden.core.FieldType
-import com.bitwarden.core.Identity
-import com.bitwarden.core.Login
-import com.bitwarden.core.LoginUri
-import com.bitwarden.core.PasswordHistory
-import com.bitwarden.core.SecureNote
-import com.bitwarden.core.SecureNoteType
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.vault.Attachment
+import com.bitwarden.vault.Card
+import com.bitwarden.vault.Cipher
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.Field
+import com.bitwarden.vault.FieldType
+import com.bitwarden.vault.Identity
+import com.bitwarden.vault.Login
+import com.bitwarden.vault.LoginUri
+import com.bitwarden.vault.PasswordHistory
+import com.bitwarden.vault.SecureNote
+import com.bitwarden.vault.SecureNoteType
+import com.bitwarden.vault.UriMatchType
import java.time.Clock
import java.time.Instant
import java.time.ZoneOffset
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCollectionUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCollectionUtil.kt
index e9f008100..faa8f122d 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCollectionUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCollectionUtil.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk.model
-import com.bitwarden.core.Collection
+import com.bitwarden.vault.Collection
/**
* Create a mock [Collection] with a given [number].
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkFolderUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkFolderUtil.kt
index f3f8aa96b..9a5e61a53 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkFolderUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkFolderUtil.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk.model
-import com.bitwarden.core.Folder
+import com.bitwarden.vault.Folder
import java.time.ZonedDateTime
/**
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkSendUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkSendUtil.kt
index 5171cd35a..009b57ac3 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkSendUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkSendUtil.kt
@@ -1,9 +1,9 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk.model
-import com.bitwarden.core.Send
-import com.bitwarden.core.SendFile
-import com.bitwarden.core.SendText
-import com.bitwarden.core.SendType
+import com.bitwarden.bitwarden.Send
+import com.bitwarden.bitwarden.SendFile
+import com.bitwarden.bitwarden.SendText
+import com.bitwarden.bitwarden.SendType
import java.time.ZonedDateTime
/**
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 8b21d45eb..f4350ff61 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
@@ -1,8 +1,8 @@
package com.x8bit.bitwarden.data.vault.manager
import android.net.Uri
-import com.bitwarden.core.Attachment
-import com.bitwarden.core.Cipher
+import com.bitwarden.vault.Attachment
+import com.bitwarden.vault.Cipher
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.UserStateJson
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt
index d38fa1fb1..0865ba667 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt
@@ -1,8 +1,8 @@
package com.x8bit.bitwarden.data.vault.manager
import app.cash.turbine.test
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.TotpResponse
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.TotpResponse
import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager
import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager
import com.x8bit.bitwarden.data.platform.repository.model.DataState
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt
index 1b50552d9..d280e94d8 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt
@@ -1,9 +1,9 @@
package com.x8bit.bitwarden.data.vault.manager
import app.cash.turbine.test
-import com.bitwarden.core.InitOrgCryptoRequest
-import com.bitwarden.core.InitUserCryptoMethod
-import com.bitwarden.core.InitUserCryptoRequest
+import com.bitwarden.bitwarden.InitOrgCryptoRequest
+import com.bitwarden.bitwarden.InitUserCryptoMethod
+import com.bitwarden.bitwarden.InitUserCryptoRequest
import com.bitwarden.crypto.HashPurpose
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson
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 ae771e173..101e52979 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
@@ -3,18 +3,18 @@ package com.x8bit.bitwarden.data.vault.repository
import android.net.Uri
import app.cash.turbine.test
import app.cash.turbine.turbineScope
-import com.bitwarden.core.Cipher
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
+import com.bitwarden.bitwarden.ExportFormat
+import com.bitwarden.bitwarden.InitOrgCryptoRequest
+import com.bitwarden.bitwarden.InitUserCryptoMethod
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.bitwarden.SendView
import com.bitwarden.core.DateTime
-import com.bitwarden.core.ExportFormat
-import com.bitwarden.core.Folder
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.InitOrgCryptoRequest
-import com.bitwarden.core.InitUserCryptoMethod
-import com.bitwarden.core.SendType
-import com.bitwarden.core.SendView
-import com.bitwarden.core.TotpResponse
+import com.bitwarden.vault.Cipher
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.Folder
+import com.bitwarden.vault.FolderView
+import com.bitwarden.vault.TotpResponse
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.UserStateJson
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 2063b7c08..54fc5bdf3 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,9 +1,9 @@
package com.x8bit.bitwarden.data.vault.repository.util
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.FieldType
-import com.bitwarden.core.UriMatchType
+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
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 411e99c60..f65a2d086 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,6 +1,6 @@
package com.x8bit.bitwarden.data.vault.repository.util
-import com.bitwarden.core.Collection
+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
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModelTest.kt
index 51e6f4cde..704590b72 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModelTest.kt
@@ -2,7 +2,7 @@ package com.x8bit.bitwarden.ui.auth.feature.loginwithdevice
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
-import com.bitwarden.core.AuthRequestResponse
+import com.bitwarden.bitwarden.AuthRequestResponse
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.manager.model.AuthRequest
import com.x8bit.bitwarden.data.auth.manager.model.AuthRequestType
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 ee96a9841..1a5d80ba3 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt
@@ -4,8 +4,8 @@ import android.net.Uri
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
import app.cash.turbine.turbineScope
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.LoginUriView
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.LoginUriView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.UserState
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensionsTest.kt
index 8dd6521b6..2e5146710 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensionsTest.kt
@@ -1,12 +1,12 @@
package com.x8bit.bitwarden.ui.platform.feature.search.util
import android.net.Uri
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.FolderView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchUtil.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchUtil.kt
index 49a202867..889e2469b 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchUtil.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.ui.platform.feature.search.util
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.SendType
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.vault.CipherType
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.components.model.IconData
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/util/UriMatchTypeExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/util/UriMatchTypeExtensionsTest.kt
index 50a53f24e..ab2b36ccb 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/util/UriMatchTypeExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/util/UriMatchTypeExtensionsTest.kt
@@ -28,27 +28,27 @@ class UriMatchTypeExtensionsTest {
@Test
fun `toSdkUriMatchType should return the correct value for each type`() {
assertEquals(
- com.bitwarden.core.UriMatchType.DOMAIN,
+ com.bitwarden.vault.UriMatchType.DOMAIN,
UriMatchType.DOMAIN.toSdkUriMatchType(),
)
assertEquals(
- com.bitwarden.core.UriMatchType.EXACT,
+ com.bitwarden.vault.UriMatchType.EXACT,
UriMatchType.EXACT.toSdkUriMatchType(),
)
assertEquals(
- com.bitwarden.core.UriMatchType.HOST,
+ com.bitwarden.vault.UriMatchType.HOST,
UriMatchType.HOST.toSdkUriMatchType(),
)
assertEquals(
- com.bitwarden.core.UriMatchType.NEVER,
+ com.bitwarden.vault.UriMatchType.NEVER,
UriMatchType.NEVER.toSdkUriMatchType(),
)
assertEquals(
- com.bitwarden.core.UriMatchType.REGULAR_EXPRESSION,
+ com.bitwarden.vault.UriMatchType.REGULAR_EXPRESSION,
UriMatchType.REGULAR_EXPRESSION.toSdkUriMatchType(),
)
assertEquals(
- com.bitwarden.core.UriMatchType.STARTS_WITH,
+ com.bitwarden.vault.UriMatchType.STARTS_WITH,
UriMatchType.STARTS_WITH.toSdkUriMatchType(),
)
}
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 444e04a8d..b9e1507cd 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
@@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.exportvault
import android.net.Uri
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
-import com.bitwarden.core.ExportFormat
+import com.bitwarden.bitwarden.ExportFormat
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModelTest.kt
index f3510c90f..b8df77c2b 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersViewModelTest.kt
@@ -2,7 +2,7 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.folders
import app.cash.turbine.test
import com.bitwarden.core.DateTime
-import com.bitwarden.core.FolderView
+import com.bitwarden.vault.FolderView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.platform.repository.model.DataState
import com.x8bit.bitwarden.data.vault.repository.VaultRepository
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt
index 40b79750f..d32fc9af1 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt
@@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.folders.addedit
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
import com.bitwarden.core.DateTime
-import com.bitwarden.core.FolderView
+import com.bitwarden.vault.FolderView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.platform.repository.model.DataState
import com.x8bit.bitwarden.data.vault.repository.VaultRepository
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt
index 062b9145f..ab2270dbb 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt
@@ -2,8 +2,8 @@ package com.x8bit.bitwarden.ui.tools.feature.generator.passwordhistory
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.PasswordHistoryView
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.PasswordHistoryView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager
import com.x8bit.bitwarden.data.platform.repository.model.DataState
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 9d2eb928c..f55e82248 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt
@@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.tools.feature.send.addsend
import android.net.Uri
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/AddSendStateExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/AddSendStateExtensionsTest.kt
index f8959536e..ac15531f2 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/AddSendStateExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/AddSendStateExtensionsTest.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.tools.feature.send.addsend.util
-import com.bitwarden.core.SendType
+import com.bitwarden.bitwarden.SendType
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFileView
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView
import com.x8bit.bitwarden.ui.tools.feature.send.addsend.AddSendState
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/SendViewExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/SendViewExtensionsTest.kt
index 200fa25e3..51ea23852 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/SendViewExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/util/SendViewExtensionsTest.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.tools.feature.send.addsend.util
-import com.bitwarden.core.SendType
+import com.bitwarden.bitwarden.SendType
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView
import com.x8bit.bitwarden.ui.tools.feature.send.addsend.AddSendState
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensionsTest.kt
index 90900f745..6030cef8a 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensionsTest.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.ui.tools.feature.send.util
-import com.bitwarden.core.SendType
-import com.bitwarden.core.SendView
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.bitwarden.SendView
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView
import com.x8bit.bitwarden.data.vault.repository.model.SendData
import com.x8bit.bitwarden.ui.platform.components.model.IconRes
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt
index 5cbe5bf9a..4818fac88 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.test.performTextClearance
import androidx.compose.ui.test.performTextInput
import androidx.compose.ui.test.performTouchInput
import androidx.core.net.toUri
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.vault.UriMatchType
import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView
import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
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 e867a14df..ab1315856 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
@@ -3,11 +3,11 @@ package com.x8bit.bitwarden.ui.vault.feature.addedit
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
import app.cash.turbine.turbineScope
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.SendView
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.bitwarden.SendView
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
+import com.bitwarden.vault.FolderView
+import com.bitwarden.vault.UriMatchType
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.BreachCountResult
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 5f026ab23..b03f7e0c9 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,18 +1,17 @@
package com.x8bit.bitwarden.ui.vault.feature.addedit.util
-import com.bitwarden.core.CardView
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.Fido2Credential
-import com.bitwarden.core.FieldType
-import com.bitwarden.core.FieldView
-import com.bitwarden.core.IdentityView
-import com.bitwarden.core.LoginUriView
-import com.bitwarden.core.LoginView
-import com.bitwarden.core.PasswordHistoryView
-import com.bitwarden.core.SecureNoteType
-import com.bitwarden.core.SecureNoteView
+import com.bitwarden.vault.CardView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.FieldType
+import com.bitwarden.vault.FieldView
+import com.bitwarden.vault.IdentityView
+import com.bitwarden.vault.LoginUriView
+import com.bitwarden.vault.LoginView
+import com.bitwarden.vault.PasswordHistoryView
+import com.bitwarden.vault.SecureNoteType
+import com.bitwarden.vault.SecureNoteView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.model.Organization
import com.x8bit.bitwarden.data.auth.repository.model.UserState
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/UriMatchDisplayUtilTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/UriMatchDisplayUtilTest.kt
index 62e0c9b2f..8d14e704b 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/UriMatchDisplayUtilTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/UriMatchDisplayUtilTest.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.addedit.util
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.vault.UriMatchType
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.UriMatchDisplayType
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/attachments/AttachmentsViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt
index 45691d6d2..cfbcaa76d 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt
@@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.attachments
import android.net.Uri
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.UserState
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 c356b051e..e4405b750 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
@@ -4,7 +4,7 @@ import android.net.Uri
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
import app.cash.turbine.turbineScope
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.BreachCountResult
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensionsTest.kt
index ac5a17798..4f775530f 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensionsTest.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.item.util
-import com.bitwarden.core.CipherType
+import com.bitwarden.vault.CipherType
import com.x8bit.bitwarden.ui.vault.feature.item.VaultItemState
import com.x8bit.bitwarden.ui.vault.feature.item.model.TotpCodeItemData
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt
index 115eb59d2..3dfdc94a0 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt
@@ -1,15 +1,15 @@
package com.x8bit.bitwarden.ui.vault.feature.item.util
-import com.bitwarden.core.AttachmentView
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.FieldType
-import com.bitwarden.core.FieldView
-import com.bitwarden.core.IdentityView
-import com.bitwarden.core.LoginUriView
-import com.bitwarden.core.LoginView
-import com.bitwarden.core.PasswordHistoryView
+import com.bitwarden.vault.AttachmentView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.FieldType
+import com.bitwarden.vault.FieldView
+import com.bitwarden.vault.IdentityView
+import com.bitwarden.vault.LoginUriView
+import com.bitwarden.vault.LoginView
+import com.bitwarden.vault.PasswordHistoryView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSdkFido2CredentialList
import com.x8bit.bitwarden.ui.platform.base.util.asText
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 39ec8f2fe..491af4672 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
@@ -4,7 +4,7 @@ import android.content.pm.SigningInfo
import android.net.Uri
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
-import com.bitwarden.core.CipherView
+import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.SwitchAccountResult
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt
index a42f940e1..a1a2b9153 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt
@@ -1,11 +1,11 @@
package com.x8bit.bitwarden.ui.vault.feature.itemlisting.util
import android.net.Uri
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.SendType
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.FolderView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData
import com.x8bit.bitwarden.data.platform.repository.model.Environment
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt
index ae40f9d6c..bf3a162e5 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt
@@ -1,7 +1,7 @@
package com.x8bit.bitwarden.ui.vault.feature.itemlisting.util
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.SendType
+import com.bitwarden.bitwarden.SendType
+import com.bitwarden.vault.CipherType
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.components.model.IconData
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 ee0fb8751..5597aa454 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,8 +2,8 @@ package com.x8bit.bitwarden.ui.vault.feature.movetoorganization
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.CollectionView
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.CollectionView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.Organization
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/util/CipherViewExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/util/CipherViewExtensionsTest.kt
index 76e3f4046..a8f10a241 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/util/CipherViewExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/util/CipherViewExtensionsTest.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.util
-import com.bitwarden.core.CipherType
+import com.bitwarden.vault.CipherType
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCardView
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockIdentityView
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensionsTest.kt
index 0cfbc06e0..acbf4f18f 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensionsTest.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.util
-import com.bitwarden.core.CollectionView
+import com.bitwarden.vault.CollectionView
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView
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/util/FolderViewExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/util/FolderViewExtensionsTest.kt
index cb9827d98..8475352df 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/util/FolderViewExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/util/FolderViewExtensionsTest.kt
@@ -1,6 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.util
-import com.bitwarden.core.FolderView
+import com.bitwarden.vault.FolderView
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import java.time.Clock
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt
index 324e7f66b..7bd6a0e4d 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt
@@ -1,18 +1,18 @@
package com.x8bit.bitwarden.ui.vault.feature.vault.util
-import com.bitwarden.core.CardView
-import com.bitwarden.core.CipherRepromptType
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.CipherView
-import com.bitwarden.core.FieldType
-import com.bitwarden.core.FieldView
-import com.bitwarden.core.IdentityView
-import com.bitwarden.core.LoginUriView
-import com.bitwarden.core.LoginView
-import com.bitwarden.core.PasswordHistoryView
-import com.bitwarden.core.SecureNoteType
-import com.bitwarden.core.SecureNoteView
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.vault.CardView
+import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.CipherView
+import com.bitwarden.vault.FieldType
+import com.bitwarden.vault.FieldView
+import com.bitwarden.vault.IdentityView
+import com.bitwarden.vault.LoginUriView
+import com.bitwarden.vault.LoginView
+import com.bitwarden.vault.PasswordHistoryView
+import com.bitwarden.vault.SecureNoteType
+import com.bitwarden.vault.SecureNoteView
+import com.bitwarden.vault.UriMatchType
import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditState
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.UriItem
import com.x8bit.bitwarden.ui.vault.model.VaultCardBrand
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt
index 09e0b9017..101bf0609 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt
@@ -1,10 +1,10 @@
package com.x8bit.bitwarden.ui.vault.feature.vault.util
import android.net.Uri
-import com.bitwarden.core.CipherType
-import com.bitwarden.core.FolderView
-import com.bitwarden.core.LoginUriView
-import com.bitwarden.core.UriMatchType
+import com.bitwarden.vault.CipherType
+import com.bitwarden.vault.FolderView
+import com.bitwarden.vault.LoginUriView
+import com.bitwarden.vault.UriMatchType
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.platform.repository.model.Environment
import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt
index e9fcbc590..325665a8d 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt
@@ -2,7 +2,7 @@ package com.x8bit.bitwarden.ui.vault.feature.verificationcode
import android.net.Uri
import app.cash.turbine.test
-import com.bitwarden.core.CipherRepromptType
+import com.bitwarden.vault.CipherRepromptType
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager
import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a0332d246..c5d0a4d50 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ androidxSplash = "1.1.0-rc01"
androidXAppCompat = "1.7.0"
androdixAutofill = "1.1.0"
androidxWork = "2.9.0"
-bitwardenSdk = "0.5.0-20240607.161329-78"
+bitwardenSdk = "0.5.0-20240611.102449-85"
crashlytics = "3.0.1"
detekt = "1.23.6"
firebaseBom = "33.1.0"