From 01b786fcf9224be617fb9a2a5d54aeb347706ff5 Mon Sep 17 00:00:00 2001 From: David Perez Date: Mon, 8 Jul 2024 17:25:57 -0500 Subject: [PATCH] Update to the latest Bitwarden SDK (#3419) --- .../data/auth/datasource/sdk/AuthSdkSource.kt | 8 ++++---- .../data/auth/datasource/sdk/AuthSdkSourceImpl.kt | 10 +++++----- .../data/auth/manager/AuthRequestManagerImpl.kt | 2 +- .../auth/manager/model/CreateAuthRequestResult.kt | 2 +- .../data/auth/repository/AuthRepositoryImpl.kt | 4 ++-- .../data/vault/datasource/sdk/VaultSdkSource.kt | 12 ++++++------ .../data/vault/datasource/sdk/VaultSdkSourceImpl.kt | 10 +++++----- ...Fido2CredentialAuthenticationUserInterfaceImpl.kt | 3 ++- .../Fido2CredentialRegistrationUserInterfaceImpl.kt | 3 ++- .../bitwarden/data/vault/manager/VaultLockManager.kt | 2 +- .../data/vault/manager/VaultLockManagerImpl.kt | 6 +++--- .../data/vault/repository/VaultRepository.kt | 2 +- .../data/vault/repository/VaultRepositoryImpl.kt | 6 +++--- .../settings/exportvault/model/ExportVaultFormat.kt | 2 +- .../data/auth/datasource/sdk/AuthSdkSourceTest.kt | 10 +++++----- .../data/auth/manager/AuthRequestManagerTest.kt | 2 +- .../data/auth/repository/AuthRepositoryTest.kt | 12 ++++++------ .../platform/repository/SettingsRepositoryTest.kt | 2 +- .../data/vault/datasource/sdk/VaultSdkSourceTest.kt | 10 +++++----- .../data/vault/manager/VaultLockManagerTest.kt | 6 +++--- .../data/vault/repository/VaultRepositoryTest.kt | 6 +++--- .../loginwithdevice/LoginWithDeviceViewModelTest.kt | 2 +- .../settings/exportvault/ExportVaultViewModelTest.kt | 2 +- gradle/libs.versions.toml | 2 +- 24 files changed, 64 insertions(+), 62 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSource.kt index c54933e74b5..445bf507690 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSource.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSource.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.auth.datasource.sdk -import com.bitwarden.bitwarden.AuthRequestResponse -import com.bitwarden.bitwarden.MasterPasswordPolicyOptions -import com.bitwarden.bitwarden.RegisterKeyResponse -import com.bitwarden.bitwarden.RegisterTdeKeyResponse +import com.bitwarden.core.AuthRequestResponse +import com.bitwarden.core.MasterPasswordPolicyOptions +import com.bitwarden.core.RegisterKeyResponse +import com.bitwarden.core.RegisterTdeKeyResponse import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceImpl.kt index 09d61ca2257..5a3ea944db3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceImpl.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.auth.datasource.sdk -import com.bitwarden.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.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.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.bitwarden.sdk.Client diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt index e8cc8e182c6..732a63e146f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.auth.manager -import com.bitwarden.bitwarden.AuthRequestResponse +import com.bitwarden.core.AuthRequestResponse import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestTypeJson diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/model/CreateAuthRequestResult.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/model/CreateAuthRequestResult.kt index 6926e77bb63..c424bea1ddf 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/model/CreateAuthRequestResult.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/model/CreateAuthRequestResult.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.auth.manager.model -import com.bitwarden.bitwarden.AuthRequestResponse +import com.bitwarden.core.AuthRequestResponse /** * Models result of creating a new login approval request. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt index 0b6f8be86e4..8b10de7fd10 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.auth.repository import android.os.SystemClock -import com.bitwarden.bitwarden.AuthRequestMethod -import com.bitwarden.bitwarden.InitUserCryptoMethod +import com.bitwarden.core.AuthRequestMethod +import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt index 263d819b440..179b3a8bc61 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt @@ -1,13 +1,13 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk -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.UpdatePasswordResponse import com.bitwarden.core.DateTime +import com.bitwarden.core.DerivePinKeyResponse +import com.bitwarden.core.InitOrgCryptoRequest +import com.bitwarden.core.InitUserCryptoMethod +import com.bitwarden.core.InitUserCryptoRequest +import com.bitwarden.core.UpdatePasswordResponse import com.bitwarden.crypto.TrustDeviceResponse +import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.CheckUserOptions import com.bitwarden.fido.ClientData import com.bitwarden.fido.Fido2CredentialAutofillView 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 f2eda517643..c7439986951 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk -import com.bitwarden.bitwarden.DerivePinKeyResponse -import com.bitwarden.bitwarden.ExportFormat -import com.bitwarden.bitwarden.InitOrgCryptoRequest -import com.bitwarden.bitwarden.InitUserCryptoRequest -import com.bitwarden.bitwarden.UpdatePasswordResponse import com.bitwarden.core.DateTime +import com.bitwarden.core.DerivePinKeyResponse +import com.bitwarden.core.InitOrgCryptoRequest +import com.bitwarden.core.InitUserCryptoRequest +import com.bitwarden.core.UpdatePasswordResponse import com.bitwarden.crypto.TrustDeviceResponse +import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.CheckUserOptions import com.bitwarden.fido.ClientData import com.bitwarden.fido.Fido2CredentialAutofillView diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt index a42f3350ab5..0cbe02f037b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.model import com.bitwarden.fido.CheckUserOptions +import com.bitwarden.sdk.CheckUserAndPickCredentialForCreationResult import com.bitwarden.sdk.CheckUserResult import com.bitwarden.sdk.CipherViewWrapper import com.bitwarden.sdk.Fido2UserInterface @@ -26,7 +27,7 @@ class Fido2CredentialAuthenticationUserInterfaceImpl( override suspend fun checkUserAndPickCredentialForCreation( options: CheckUserOptions, newCredential: Fido2CredentialNewView, - ): CipherViewWrapper = throw IllegalStateException() + ): CheckUserAndPickCredentialForCreationResult = throw IllegalStateException() override suspend fun isVerificationEnabled(): Boolean = isVerificationSupported diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt index 55940172659..6a4eef7da01 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.model import com.bitwarden.fido.CheckUserOptions +import com.bitwarden.sdk.CheckUserAndPickCredentialForCreationResult import com.bitwarden.sdk.CheckUserResult import com.bitwarden.sdk.CipherViewWrapper import com.bitwarden.sdk.Fido2UserInterface @@ -30,7 +31,7 @@ class Fido2CredentialRegistrationUserInterfaceImpl( override suspend fun checkUserAndPickCredentialForCreation( options: CheckUserOptions, newCredential: Fido2CredentialNewView, - ): CipherViewWrapper = checkUserAndPickCredentialForCreation.invoke(options, newCredential) + ): CheckUserAndPickCredentialForCreationResult = throw IllegalStateException() override suspend fun isVerificationEnabled(): Boolean = isVerificationSupported diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManager.kt index 8240ad73c41..0e82f237c9c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManager.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManager.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.vault.manager -import com.bitwarden.bitwarden.InitUserCryptoMethod +import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.crypto.Kdf import com.bitwarden.sdk.ClientAuth import com.x8bit.bitwarden.data.vault.manager.model.VaultStateEvent diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt index f257bcf652c..a9c1be5596d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.vault.manager import android.os.SystemClock -import com.bitwarden.bitwarden.InitOrgCryptoRequest -import com.bitwarden.bitwarden.InitUserCryptoMethod -import com.bitwarden.bitwarden.InitUserCryptoRequest +import com.bitwarden.core.InitOrgCryptoRequest +import com.bitwarden.core.InitUserCryptoMethod +import com.bitwarden.core.InitUserCryptoRequest import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt index 764904ce94c..01be99c4f06 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.vault.repository import android.net.Uri -import com.bitwarden.bitwarden.ExportFormat import com.bitwarden.core.DateTime import com.bitwarden.crypto.Kdf +import com.bitwarden.exporters.ExportFormat import com.bitwarden.send.SendType import com.bitwarden.send.SendView import com.bitwarden.vault.CipherView 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 dcbec373c40..d84f82bf9e4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.data.vault.repository import android.net.Uri -import com.bitwarden.bitwarden.ExportFormat -import com.bitwarden.bitwarden.InitOrgCryptoRequest -import com.bitwarden.bitwarden.InitUserCryptoMethod import com.bitwarden.core.DateTime +import com.bitwarden.core.InitOrgCryptoRequest +import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.crypto.Kdf +import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.send.Send import com.bitwarden.send.SendType diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/model/ExportVaultFormat.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/model/ExportVaultFormat.kt index 462c72793ef..29ce138291f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/model/ExportVaultFormat.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/model/ExportVaultFormat.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.exportvault.model -import com.bitwarden.bitwarden.ExportFormat +import com.bitwarden.exporters.ExportFormat /** * Represents the file formats a user can select to export the vault. diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt index b9b94c2434e..40357a7ee8c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.auth.datasource.sdk -import com.bitwarden.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.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.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.bitwarden.sdk.Client diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt index 269df49a29c..3afd85cba54 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.auth.manager import app.cash.turbine.test -import com.bitwarden.bitwarden.AuthRequestResponse +import com.bitwarden.core.AuthRequestResponse import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt index df812ec54a5..1444a656075 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.auth.repository import app.cash.turbine.test -import com.bitwarden.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.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.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.bitwarden.crypto.RsaKeyPair diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt index 1219a633bdb..03c052c6716 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.platform.repository import android.view.autofill.AutofillManager import app.cash.turbine.test -import com.bitwarden.bitwarden.DerivePinKeyResponse +import com.bitwarden.core.DerivePinKeyResponse import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt index 6bd3d67d242..dc684fb6f25 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk -import com.bitwarden.bitwarden.DerivePinKeyResponse -import com.bitwarden.bitwarden.ExportFormat -import com.bitwarden.bitwarden.InitOrgCryptoRequest -import com.bitwarden.bitwarden.InitUserCryptoRequest -import com.bitwarden.bitwarden.UpdatePasswordResponse import com.bitwarden.core.DateTime +import com.bitwarden.core.DerivePinKeyResponse +import com.bitwarden.core.InitOrgCryptoRequest +import com.bitwarden.core.InitUserCryptoRequest +import com.bitwarden.core.UpdatePasswordResponse import com.bitwarden.crypto.TrustDeviceResponse +import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.CheckUserOptions import com.bitwarden.fido.ClientData import com.bitwarden.fido.PublicKeyCredentialAuthenticatorAssertionResponse diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt index d280e94d801..1b50552d9fd 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.vault.manager import app.cash.turbine.test -import com.bitwarden.bitwarden.InitOrgCryptoRequest -import com.bitwarden.bitwarden.InitUserCryptoMethod -import com.bitwarden.bitwarden.InitUserCryptoRequest +import com.bitwarden.core.InitOrgCryptoRequest +import com.bitwarden.core.InitUserCryptoMethod +import com.bitwarden.core.InitUserCryptoRequest import com.bitwarden.crypto.HashPurpose import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt index 0452a43fbc8..95c3126b1af 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 @@ -4,10 +4,10 @@ import android.net.Uri import android.util.Base64 import app.cash.turbine.test import app.cash.turbine.turbineScope -import com.bitwarden.bitwarden.ExportFormat -import com.bitwarden.bitwarden.InitOrgCryptoRequest -import com.bitwarden.bitwarden.InitUserCryptoMethod import com.bitwarden.core.DateTime +import com.bitwarden.core.InitOrgCryptoRequest +import com.bitwarden.core.InitUserCryptoMethod +import com.bitwarden.exporters.ExportFormat import com.bitwarden.send.SendType import com.bitwarden.send.SendView import com.bitwarden.vault.CipherView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModelTest.kt index 704590b72f7..51e6f4cdeba 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModelTest.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.ui.auth.feature.loginwithdevice import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test -import com.bitwarden.bitwarden.AuthRequestResponse +import com.bitwarden.core.AuthRequestResponse import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.manager.model.AuthRequest import com.x8bit.bitwarden.data.auth.manager.model.AuthRequestType diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt index b9e1507cd54..5860224b03d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.exportvault import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test -import com.bitwarden.bitwarden.ExportFormat +import com.bitwarden.exporters.ExportFormat import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength import com.x8bit.bitwarden.data.auth.repository.AuthRepository diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 148b75af8e4..a2fc9ccaa5a 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-20240618.092031-102" +bitwardenSdk = "0.5.0-20240708.194113-132" crashlytics = "3.0.2" detekt = "1.23.6" firebaseBom = "33.1.1"