From 4727e2be174ec905b804559edba61a6ae723dbd3 Mon Sep 17 00:00:00 2001 From: David Perez Date: Fri, 14 Jun 2024 15:07:10 -0500 Subject: [PATCH] Update the Bitwarden SDK (#1453) --- .../bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt | 4 ++-- .../data/vault/datasource/sdk/VaultSdkSourceImpl.kt | 4 ++-- .../bitwarden/data/vault/repository/VaultRepository.kt | 4 ++-- .../data/vault/repository/VaultRepositoryImpl.kt | 6 +++--- .../data/vault/repository/model/CreateSendResult.kt | 2 +- .../vault/repository/model/RemovePasswordSendResult.kt | 2 +- .../bitwarden/data/vault/repository/model/SendData.kt | 2 +- .../data/vault/repository/model/UpdateSendResult.kt | 2 +- .../bitwarden/data/vault/repository/model/VaultData.kt | 2 +- .../data/vault/repository/util/VaultSdkSendExtensions.kt | 8 ++++---- .../ui/platform/composition/LocalManagerProvider.kt | 2 +- .../feature/search/util/SearchTypeDataExtensions.kt | 4 ++-- .../ui/tools/feature/send/addsend/AddSendViewModel.kt | 2 +- .../feature/send/addsend/util/AddSendStateExtensions.kt | 8 ++++---- .../tools/feature/send/addsend/util/SendViewExtensions.kt | 4 ++-- .../ui/tools/feature/send/util/SendDataExtensions.kt | 4 ++-- .../ui/tools/feature/send/util/SendViewExtensions.kt | 2 +- .../itemlisting/util/VaultItemListingDataExtensions.kt | 4 ++-- .../data/vault/datasource/sdk/VaultSdkSourceTest.kt | 4 ++-- .../data/vault/datasource/sdk/model/SendViewUtil.kt | 8 ++++---- .../data/vault/datasource/sdk/model/VaultSdkSendUtil.kt | 8 ++++---- .../data/vault/repository/VaultRepositoryTest.kt | 4 ++-- .../feature/search/util/SearchTypeDataExtensionsTest.kt | 2 +- .../ui/platform/feature/search/util/SearchUtil.kt | 2 +- .../ui/tools/feature/send/addsend/AddSendViewModelTest.kt | 2 +- .../send/addsend/util/AddSendStateExtensionsTest.kt | 2 +- .../feature/send/addsend/util/SendViewExtensionsTest.kt | 2 +- .../ui/tools/feature/send/util/SendDataExtensionsTest.kt | 4 ++-- .../ui/vault/feature/addedit/VaultAddEditViewModelTest.kt | 2 +- .../feature/itemlisting/VaultItemListingScreenTest.kt | 2 +- .../util/VaultItemListingDataExtensionsTest.kt | 2 +- .../feature/itemlisting/util/VaultItemListingDataUtil.kt | 2 +- gradle/libs.versions.toml | 2 +- 33 files changed, 57 insertions(+), 57 deletions(-) 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 77f30e50a8..6c3230cba7 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 @@ -5,11 +5,11 @@ 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.crypto.TrustDeviceResponse +import com.bitwarden.send.Send +import com.bitwarden.send.SendView import com.bitwarden.vault.Attachment import com.bitwarden.vault.AttachmentEncryptResult import com.bitwarden.vault.AttachmentView 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 a5b78acec3..0c61bc21ee 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 @@ -4,14 +4,14 @@ 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.crypto.TrustDeviceResponse import com.bitwarden.sdk.BitwardenException import com.bitwarden.sdk.Client import com.bitwarden.sdk.ClientVault +import com.bitwarden.send.Send +import com.bitwarden.send.SendView import com.bitwarden.vault.Attachment import com.bitwarden.vault.AttachmentView import com.bitwarden.vault.Cipher 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 a238b945f9..d61a554cf9 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt @@ -2,10 +2,10 @@ package com.x8bit.bitwarden.data.vault.repository import android.net.Uri import com.bitwarden.bitwarden.ExportFormat -import com.bitwarden.bitwarden.SendType -import com.bitwarden.bitwarden.SendView import com.bitwarden.core.DateTime import com.bitwarden.crypto.Kdf +import com.bitwarden.send.SendType +import com.bitwarden.send.SendView import com.bitwarden.vault.CipherView import com.bitwarden.vault.CollectionView import com.bitwarden.vault.FolderView 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 3113458f52..a97d635c8e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt @@ -4,11 +4,11 @@ import android.net.Uri 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.crypto.Kdf +import com.bitwarden.send.Send +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 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 8728c23115..c4a321e028 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.bitwarden.SendView +import com.bitwarden.send.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 da447cc91c..5b96fe37b9 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.bitwarden.SendView +import com.bitwarden.send.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 372ce1c2e6..30a411d641 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.bitwarden.SendView +import com.bitwarden.send.SendView /** * Represents decrypted send data. 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 a3e90e2951..60ab1f8ce5 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.bitwarden.SendView +import com.bitwarden.send.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 9e8b2e2ab3..0f18bc52a4 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,6 +1,6 @@ package com.x8bit.bitwarden.data.vault.repository.model -import com.bitwarden.bitwarden.SendView +import com.bitwarden.send.SendView import com.bitwarden.vault.CipherView import com.bitwarden.vault.CollectionView import com.bitwarden.vault.FolderView 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 b37e47823c..bbd778b190 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.bitwarden.Send -import com.bitwarden.bitwarden.SendFile -import com.bitwarden.bitwarden.SendText -import com.bitwarden.bitwarden.SendType +import com.bitwarden.send.Send +import com.bitwarden.send.SendFile +import com.bitwarden.send.SendText +import com.bitwarden.send.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/composition/LocalManagerProvider.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt index 40ad2f2696..6d13b82b79 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt @@ -9,9 +9,9 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.ProvidableCompositionLocal import androidx.compose.runtime.compositionLocalOf import androidx.compose.ui.platform.LocalContext +import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.autofill.fido2.manager.Fido2CompletionManager import com.x8bit.bitwarden.ui.autofill.fido2.manager.Fido2CompletionManagerImpl -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManagerImpl import com.x8bit.bitwarden.ui.platform.manager.exit.ExitManager 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 1679c5633a..0ebc880b2d 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,8 +3,8 @@ package com.x8bit.bitwarden.ui.platform.feature.search.util import androidx.annotation.DrawableRes -import com.bitwarden.bitwarden.SendType -import com.bitwarden.bitwarden.SendView +import com.bitwarden.send.SendType +import com.bitwarden.send.SendView import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView 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 f03121b3d8..2132522e44 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.bitwarden.SendView +import com.bitwarden.send.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 d5740b88d6..f562cd66f6 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.bitwarden.SendFileView -import com.bitwarden.bitwarden.SendTextView -import com.bitwarden.bitwarden.SendType -import com.bitwarden.bitwarden.SendView +import com.bitwarden.send.SendFileView +import com.bitwarden.send.SendTextView +import com.bitwarden.send.SendType +import com.bitwarden.send.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 e05b1cf6c9..34ca9d6734 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.bitwarden.SendType -import com.bitwarden.bitwarden.SendView +import com.bitwarden.send.SendType +import com.bitwarden.send.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 493310bb3c..b4c5ed1f32 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.bitwarden.SendType -import com.bitwarden.bitwarden.SendView +import com.bitwarden.send.SendType +import com.bitwarden.send.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 6e5be8184f..7d5819c494 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.bitwarden.SendView +import com.bitwarden.send.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/itemlisting/util/VaultItemListingDataExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt index f4299b999e..fcf5690bac 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,8 +3,8 @@ package com.x8bit.bitwarden.ui.vault.feature.itemlisting.util import androidx.annotation.DrawableRes -import com.bitwarden.bitwarden.SendType -import com.bitwarden.bitwarden.SendView +import com.bitwarden.send.SendType +import com.bitwarden.send.SendView import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView 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 4c1be296a4..3ea6d088e5 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 @@ -4,8 +4,6 @@ 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.crypto.TrustDeviceResponse @@ -19,6 +17,8 @@ import com.bitwarden.sdk.ClientPasswordHistory import com.bitwarden.sdk.ClientPlatform import com.bitwarden.sdk.ClientSends import com.bitwarden.sdk.ClientVault +import com.bitwarden.send.Send +import com.bitwarden.send.SendView import com.bitwarden.vault.Attachment import com.bitwarden.vault.AttachmentView import com.bitwarden.vault.Cipher 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 140b9d668d..03caa39780 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.bitwarden.SendFileView -import com.bitwarden.bitwarden.SendTextView -import com.bitwarden.bitwarden.SendType -import com.bitwarden.bitwarden.SendView +import com.bitwarden.send.SendFileView +import com.bitwarden.send.SendTextView +import com.bitwarden.send.SendType +import com.bitwarden.send.SendView 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 009b57ac34..68a636f236 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.bitwarden.Send -import com.bitwarden.bitwarden.SendFile -import com.bitwarden.bitwarden.SendText -import com.bitwarden.bitwarden.SendType +import com.bitwarden.send.Send +import com.bitwarden.send.SendFile +import com.bitwarden.send.SendText +import com.bitwarden.send.SendType import java.time.ZonedDateTime /** 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 101e529797..baf21631ae 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 @@ -6,9 +6,9 @@ import app.cash.turbine.turbineScope 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.send.SendType +import com.bitwarden.send.SendView import com.bitwarden.vault.Cipher import com.bitwarden.vault.CipherView import com.bitwarden.vault.CollectionView 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 2e51467102..7786276153 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,7 +1,7 @@ package com.x8bit.bitwarden.ui.platform.feature.search.util import android.net.Uri -import com.bitwarden.bitwarden.SendView +import com.bitwarden.send.SendView import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView 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 889e2469b3..c094a56d82 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,6 +1,6 @@ package com.x8bit.bitwarden.ui.platform.feature.search.util -import com.bitwarden.bitwarden.SendType +import com.bitwarden.send.SendType import com.bitwarden.vault.CipherType import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.base.util.asText 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 f55e82248b..6ccb44dc98 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.bitwarden.SendView +import com.bitwarden.send.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 ac15531f2d..4f3bed88b8 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.bitwarden.SendType +import com.bitwarden.send.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 51ea238529..2917578005 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.bitwarden.SendType +import com.bitwarden.send.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 6030cef8af..008109a382 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.bitwarden.SendType -import com.bitwarden.bitwarden.SendView +import com.bitwarden.send.SendType +import com.bitwarden.send.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/VaultAddEditViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt index 26f64fd05c..fe4aefc238 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt @@ -4,7 +4,7 @@ import android.content.pm.SigningInfo import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import app.cash.turbine.turbineScope -import com.bitwarden.bitwarden.SendView +import com.bitwarden.send.SendView import com.bitwarden.vault.CipherView import com.bitwarden.vault.CollectionView import com.bitwarden.vault.FolderView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt index 7b29b97224..1655f3178e 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt @@ -16,12 +16,12 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextInput import androidx.core.net.toUri import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.ui.autofill.fido2.manager.Fido2CompletionManager import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow +import com.x8bit.bitwarden.ui.autofill.fido2.manager.Fido2CompletionManager import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.x8bit.bitwarden.ui.platform.base.util.asText import com.x8bit.bitwarden.ui.platform.base.util.toHostOrPathOrNull 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 a1a2b91538..890cf3219a 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,7 +1,7 @@ package com.x8bit.bitwarden.ui.vault.feature.itemlisting.util import android.net.Uri -import com.bitwarden.bitwarden.SendType +import com.bitwarden.send.SendType import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView 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 bf3a162e5e..8d59397a61 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,6 +1,6 @@ package com.x8bit.bitwarden.ui.vault.feature.itemlisting.util -import com.bitwarden.bitwarden.SendType +import com.bitwarden.send.SendType import com.bitwarden.vault.CipherType import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.base.util.asText diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9bd6ff0fe9..79dd0e192f 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-20240611.102449-85" +bitwardenSdk = "0.5.0-20240614.145848-99" crashlytics = "3.0.1" detekt = "1.23.6" firebaseBom = "33.1.0"