Update Bitwarden SDK (#1444)

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

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

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

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

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

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.

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

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

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

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.

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

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
 
 /**

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

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

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

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.

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

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

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
 
 /**

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

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

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
 

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

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

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

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

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

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

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

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.

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

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

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.

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.

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.

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.

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.

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.

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.

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.

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

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
 

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

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

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

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

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
     }

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.

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

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

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

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

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

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

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

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

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

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
 
 /**

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

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
 
 /**

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

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
 
 /**

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

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.

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

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

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

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

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

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 = "/"
 

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 = "/"
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 
 /**

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

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].

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
 
 /**

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
 
 /**

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

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].

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
 
 /**

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
 
 /**

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

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