From 9995fa92f13a012ca817a37d923a4456c1c43de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Gon=C3=A7alves?= Date: Thu, 17 Jul 2025 19:39:55 +0100 Subject: [PATCH] [PM-23871] Update Bitwarden SDK (#5537) --- .../AuthenticatorBridgeRepositoryImpl.kt | 1 + .../vault/manager/VaultLockManagerImpl.kt | 1 + .../AuthenticatorBridgeRepositoryTest.kt | 8 ++++++++ .../vault/manager/VaultLockManagerTest.kt | 19 +++++++++++++++++++ gradle/libs.versions.toml | 2 +- 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryImpl.kt index fcb5bf2bd4..82518ded52 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryImpl.kt @@ -141,6 +141,7 @@ class AuthenticatorBridgeRepositoryImpl( decryptedUserKey = decryptedUserKey, ), signingKey = null, + securityState = null, ), ) .flatMap { result -> diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt index 54d7fee5b7..1938450278 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt @@ -183,6 +183,7 @@ class VaultLockManagerImpl( method = initUserCryptoMethod, userId = userId, signingKey = null, + securityState = null, ), ) .flatMap { result -> diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt index 3368c8ee24..99a0ff2a34 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt @@ -94,6 +94,7 @@ class AuthenticatorBridgeRepositoryTest { decryptedUserKey = USER_1_UNLOCK_KEY, ), signingKey = null, + securityState = null, ), ) } returns InitializeCryptoResult.Success.asSuccess() @@ -109,6 +110,7 @@ class AuthenticatorBridgeRepositoryTest { decryptedUserKey = USER_2_UNLOCK_KEY, ), signingKey = null, + securityState = null, ), ) } returns InitializeCryptoResult.Success.asSuccess() @@ -206,6 +208,7 @@ class AuthenticatorBridgeRepositoryTest { decryptedUserKey = USER_2_UNLOCK_KEY, ), signingKey = null, + securityState = null, ), ) scopedVaultSdkSource.initializeOrganizationCrypto( @@ -244,6 +247,7 @@ class AuthenticatorBridgeRepositoryTest { decryptedUserKey = USER_1_UNLOCK_KEY, ), signingKey = null, + securityState = null, ), ) scopedVaultSdkSource.initializeOrganizationCrypto( @@ -266,6 +270,7 @@ class AuthenticatorBridgeRepositoryTest { decryptedUserKey = USER_2_UNLOCK_KEY, ), signingKey = null, + securityState = null, ), ) scopedVaultSdkSource.initializeOrganizationCrypto( @@ -300,6 +305,7 @@ class AuthenticatorBridgeRepositoryTest { decryptedUserKey = USER_1_UNLOCK_KEY, ), signingKey = null, + securityState = null, ), ) } returns InitializeCryptoResult.AuthenticationError(error = Throwable()).asSuccess() @@ -321,6 +327,7 @@ class AuthenticatorBridgeRepositoryTest { decryptedUserKey = USER_1_UNLOCK_KEY, ), signingKey = null, + securityState = null, ), ) scopedVaultSdkSource.initializeCrypto( @@ -334,6 +341,7 @@ class AuthenticatorBridgeRepositoryTest { decryptedUserKey = USER_2_UNLOCK_KEY, ), signingKey = null, + securityState = null, ), ) scopedVaultSdkSource.initializeOrganizationCrypto( diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt index 8005c480a4..62dabc134f 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt @@ -749,6 +749,7 @@ class VaultLockManagerTest { decryptedUserKey = userAutoUnlockKey, ), signingKey = null, + securityState = null, ), ) } returns InitializeCryptoResult.Success.asSuccess() @@ -774,6 +775,7 @@ class VaultLockManagerTest { decryptedUserKey = userAutoUnlockKey, ), signingKey = null, + securityState = null, ), ) trustedDeviceManager.trustThisDeviceIfNecessary(userId = USER_ID) @@ -907,6 +909,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } returns InitializeCryptoResult.Success.asSuccess() @@ -973,6 +976,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) vaultSdkSource.initializeOrganizationCrypto( @@ -1007,6 +1011,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } returns InitializeCryptoResult.Success.asSuccess() @@ -1084,6 +1089,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) vaultSdkSource.initializeOrganizationCrypto( @@ -1119,6 +1125,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } returns InitializeCryptoResult.AuthenticationError(error = error).asSuccess() @@ -1166,6 +1173,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } @@ -1194,6 +1202,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } returns InitializeCryptoResult.Success.asSuccess() @@ -1248,6 +1257,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } @@ -1283,6 +1293,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } returns error.asFailure() @@ -1329,6 +1340,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } @@ -1357,6 +1369,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } returns InitializeCryptoResult.Success.asSuccess() @@ -1410,6 +1423,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } @@ -1444,6 +1458,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } returns InitializeCryptoResult.Success.asSuccess() @@ -1504,6 +1519,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } @@ -1630,6 +1646,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } coAnswers { @@ -1677,6 +1694,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } returns InitializeCryptoResult.Success.asSuccess() @@ -1713,6 +1731,7 @@ class VaultLockManagerTest { userKey = userKey, ), signingKey = null, + securityState = null, ), ) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d70b287455..823a92a093 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ androidxRoom = "2.7.2" androidxSecurityCrypto = "1.1.0-beta01" androidxSplash = "1.1.0-rc01" androidxWork = "2.10.2" -bitwardenSdk = "1.0.0-20250708.105256-238" +bitwardenSdk = "1.0.0-20250715.111352-243" crashlytics = "3.0.4" detekt = "1.23.8" firebaseBom = "33.16.0"