diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt index 722ac10922..348dadaebb 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt @@ -1,5 +1,7 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk +import com.bitwarden.collections.Collection +import com.bitwarden.collections.CollectionView import com.bitwarden.core.DerivePinKeyResponse import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.InitUserCryptoMethod @@ -20,8 +22,6 @@ 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.DecryptCipherListResult import com.bitwarden.vault.EncryptionContext import com.bitwarden.vault.Folder diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt index 0d75d8cab7..43c26b9a6f 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt @@ -1,5 +1,7 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk +import com.bitwarden.collections.Collection +import com.bitwarden.collections.CollectionView import com.bitwarden.core.DeriveKeyConnectorRequest import com.bitwarden.core.DerivePinKeyResponse import com.bitwarden.core.InitOrgCryptoRequest @@ -22,8 +24,6 @@ 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.DecryptCipherListResult import com.bitwarden.vault.EncryptionContext import com.bitwarden.vault.Folder @@ -97,6 +97,7 @@ class VaultSdkSourceImpl( exception.message == "Wrong password" -> { DeriveKeyConnectorResult.WrongPasswordError } + else -> DeriveKeyConnectorResult.Error(exception) } } diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt index 289eaea3b6..0a01adc505 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.data.vault.repository import android.net.Uri +import com.bitwarden.collections.CollectionView import com.bitwarden.core.DateTime import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.exporters.ExportFormat @@ -11,7 +12,6 @@ import com.bitwarden.send.SendView import com.bitwarden.vault.CipherListView import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView -import com.bitwarden.vault.CollectionView import com.bitwarden.vault.DecryptCipherListResult import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.data.vault.manager.CipherManager diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt index a6474e41ce..f167edbfc3 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.data.vault.repository import android.net.Uri +import com.bitwarden.collections.CollectionView import com.bitwarden.core.DateTime import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.InitUserCryptoMethod @@ -34,7 +35,6 @@ import com.bitwarden.vault.CipherListView import com.bitwarden.vault.CipherListViewType import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView -import com.bitwarden.vault.CollectionView import com.bitwarden.vault.DecryptCipherListResult import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/VaultData.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/VaultData.kt index c21c68795a..f7d778a285 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/VaultData.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/VaultData.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.repository.model +import com.bitwarden.collections.CollectionView import com.bitwarden.send.SendView -import com.bitwarden.vault.CollectionView import com.bitwarden.vault.DecryptCipherListResult import com.bitwarden.vault.FolderView diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt index 270bb4bac1..69eeae2f11 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.vault.repository.util +import com.bitwarden.collections.Collection +import com.bitwarden.collections.CollectionView import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparator import com.bitwarden.network.model.SyncResponseJson -import com.bitwarden.vault.Collection -import com.bitwarden.vault.CollectionView /** * Converts a [SyncResponseJson.Collection] object to a corresponding Bitwarden SDK [Collection] diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt index 78d56b487d..c04bec8e31 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.platform.feature.search.util import androidx.annotation.DrawableRes +import com.bitwarden.collections.CollectionView import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparator import com.bitwarden.core.data.util.toFormattedDateTimeStyle import com.bitwarden.send.SendType @@ -16,7 +17,6 @@ import com.bitwarden.vault.CipherListView import com.bitwarden.vault.CipherListViewType import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherView -import com.bitwarden.vault.CollectionView import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.data.autofill.util.isActiveWithFido2Credentials import com.x8bit.bitwarden.data.autofill.util.login diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt index d56d2ca703..8ddf5710cd 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt @@ -2,13 +2,13 @@ package com.x8bit.bitwarden.ui.vault.feature.addedit.util +import com.bitwarden.collections.CollectionView import com.bitwarden.core.data.util.toFormattedDateTimeStyle import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.asText 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 diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt index d62352bd3f..331544e2fb 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.itemlisting.util import androidx.annotation.DrawableRes +import com.bitwarden.collections.CollectionView import com.bitwarden.core.data.util.toFormattedDateTimeStyle import com.bitwarden.send.SendType import com.bitwarden.send.SendView @@ -15,7 +16,6 @@ import com.bitwarden.vault.CipherListView import com.bitwarden.vault.CipherListViewType import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherView -import com.bitwarden.vault.CollectionView import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData import com.x8bit.bitwarden.data.autofill.util.isActiveWithFido2Credentials diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt index 2aed1c54b5..8c85a32ca1 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.movetoorganization import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.collections.CollectionView import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.combineDataStates import com.bitwarden.ui.platform.base.BaseViewModel @@ -11,7 +12,6 @@ import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.bitwarden.ui.util.concat import com.bitwarden.vault.CipherView -import com.bitwarden.vault.CollectionView import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.vault.repository.VaultRepository diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationViewExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationViewExtensions.kt index fb375f2290..147686e3bb 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationViewExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationViewExtensions.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.ui.vault.feature.movetoorganization.util +import com.bitwarden.collections.CollectionView import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.asText import com.bitwarden.vault.CipherView -import com.bitwarden.vault.CollectionView import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.ui.vault.feature.movetoorganization.VaultMoveToOrganizationState import com.x8bit.bitwarden.ui.vault.model.VaultCollection diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensions.kt index 9e4c18374d..f4577b7428 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensions.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.ui.vault.feature.util -import com.bitwarden.vault.CollectionView +import com.bitwarden.collections.CollectionView import com.x8bit.bitwarden.ui.vault.feature.util.model.CollectionPermission private const val COLLECTION_DIVIDER: String = "/" diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt index f3ae92769e..1743131c72 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.ui.vault.feature.vault.util import android.net.Uri +import com.bitwarden.collections.CollectionView import com.bitwarden.ui.platform.components.icon.model.IconData import com.bitwarden.ui.platform.resource.BitwardenDrawable import com.bitwarden.ui.platform.resource.BitwardenString @@ -9,7 +10,6 @@ import com.bitwarden.vault.CipherListView import com.bitwarden.vault.CipherListViewType import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType -import com.bitwarden.vault.CollectionView import com.bitwarden.vault.FolderView import com.bitwarden.vault.LoginUriView import com.x8bit.bitwarden.data.autofill.util.card diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt index 23b50fa7f9..579cfc4d80 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt @@ -1,5 +1,7 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk +import com.bitwarden.collections.Collection +import com.bitwarden.collections.CollectionView import com.bitwarden.core.DeriveKeyConnectorRequest import com.bitwarden.core.DerivePinKeyResponse import com.bitwarden.core.InitOrgCryptoRequest @@ -37,8 +39,6 @@ import com.bitwarden.vault.Attachment import com.bitwarden.vault.AttachmentView import com.bitwarden.vault.Cipher import com.bitwarden.vault.CipherView -import com.bitwarden.vault.Collection -import com.bitwarden.vault.CollectionView import com.bitwarden.vault.DecryptCipherListResult import com.bitwarden.vault.EncryptionContext import com.bitwarden.vault.Folder diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CollectionViewUtil.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CollectionViewUtil.kt index 3131d8c328..87186bf9df 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CollectionViewUtil.kt +++ b/app/src/test/kotlin/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.vault.CollectionView +import com.bitwarden.collections.CollectionView /** * Create a mock [CollectionView] with a given [number]. diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCollectionUtil.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCollectionUtil.kt index 75b66fd577..a4bc2174c1 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCollectionUtil.kt +++ b/app/src/test/kotlin/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.vault.Collection +import com.bitwarden.collections.Collection /** * Create a mock [Collection] with a given [number]. diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt index 207b27bfd6..7ce16a5f1d 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt @@ -4,6 +4,7 @@ import android.net.Uri import android.util.Base64 import app.cash.turbine.test import app.cash.turbine.turbineScope +import com.bitwarden.collections.CollectionView import com.bitwarden.core.DateTime import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.InitUserCryptoMethod @@ -44,7 +45,6 @@ import com.bitwarden.send.SendType import com.bitwarden.send.SendView import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView -import com.bitwarden.vault.CollectionView import com.bitwarden.vault.DecryptCipherListResult import com.bitwarden.vault.Folder import com.bitwarden.vault.FolderView diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensionsTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensionsTest.kt index 57ff0e419e..2eddcf658c 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensionsTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensionsTest.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.repository.util +import com.bitwarden.collections.Collection import com.bitwarden.network.model.SyncResponseJson -import com.bitwarden.vault.Collection import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import org.junit.Test import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensionsTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensionsTest.kt index bdd6ae201d..077200d5d0 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensionsTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensionsTest.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.ui.platform.feature.search.util import android.net.Uri +import com.bitwarden.collections.CollectionView import com.bitwarden.core.data.util.toFormattedDateTimeStyle import com.bitwarden.send.SendView import com.bitwarden.ui.platform.resource.BitwardenDrawable @@ -10,7 +11,6 @@ import com.bitwarden.vault.CipherListView import com.bitwarden.vault.CipherListViewType import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType -import com.bitwarden.vault.CollectionView import com.bitwarden.vault.CopyableCipherFields import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCardListView diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt index 343bc4260c..0feacae232 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt @@ -7,6 +7,7 @@ import androidx.credentials.provider.CallingAppInfo import androidx.credentials.provider.ProviderCreateCredentialRequest import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.collections.CollectionView import com.bitwarden.core.DateTime import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow @@ -22,7 +23,6 @@ import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.bitwarden.vault.CipherListView import com.bitwarden.vault.CipherView -import com.bitwarden.vault.CollectionView import com.bitwarden.vault.FolderView import com.bitwarden.vault.UriMatchType import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt index 873a80a3ae..27a849b453 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.item import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.collections.CollectionView import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.data.repository.model.Environment @@ -16,7 +17,6 @@ import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.bitwarden.ui.util.concat import com.bitwarden.vault.CipherView -import com.bitwarden.vault.CollectionView import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt index 994e59d695..bd5ad95d89 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.vault.feature.movetoorganization import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.collections.CollectionView import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.OrganizationType @@ -10,7 +11,6 @@ import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.asText import com.bitwarden.ui.util.concat import com.bitwarden.vault.CipherView -import com.bitwarden.vault.CollectionView import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.Organization diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensionsTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensionsTest.kt index afc405ab39..a1bdd951a9 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensionsTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/util/CollectionViewExtensionsTest.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.ui.vault.feature.util -import com.bitwarden.vault.CollectionView +import com.bitwarden.collections.CollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createEditCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createEditExceptPasswordsCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createManageCollectionView diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c780ded9cf..f09f7ec7dc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ androidxRoom = "2.7.2" androidxSecurityCrypto = "1.1.0" androidxSplash = "1.1.0-rc01" androidxWork = "2.10.3" -bitwardenSdk = "1.0.0-20250728.143558-250" +bitwardenSdk = "1.0.0-2450-9fe3aeda" crashlytics = "3.0.5" detekt = "1.23.8" firebaseBom = "34.0.0" @@ -94,7 +94,7 @@ androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = " androidx-security-crypto = { module = "androidx.security:security-crypto", version.ref = "androidxSecurityCrypto" } androidx-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidxSplash" } androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "androidxWork" } -bitwarden-sdk = { module = "com.bitwarden:sdk-android-temp", version.ref = "bitwardenSdk" } +bitwarden-sdk = { module = "com.bitwarden:sdk-android", version.ref = "bitwardenSdk" } bumptech-glide = { module = "com.github.bumptech.glide:compose", version.ref = "glide" } detekt-detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" } detekt-detekt-rules = { module = "io.gitlab.arturbosch.detekt:detekt-rules-libraries", version.ref = "detekt" }