mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-03-16 03:08:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

PM-10140: Update the VaultSdkSource and VaultDiskSource to use parallelization when processing heavier loads (#3649)

Browse source
This commit is contained in:
David Perez 2024-07-29 15:10:38 -05:00 • committed by GitHub
parent 1daddbc905
commit 58a91c15aa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt
View file

@ -66,10 +66,16 @@ class VaultDiskSourceImpl(
ciphersDao
.getAllCiphers(userId = userId)
.map { entities ->
entities.map { entity ->
withContext(dispatcherManager.default) {
json.decodeFromString<SyncResponseJson.Cipher>(entity.cipherJson)
}
withContext(context = dispatcherManager.default) {
entities
.map { entity ->
async {
json.decodeFromString<SyncResponseJson.Cipher>(
string = entity.cipherJson,
)
}
}
.awaitAll()
}
},
)
@ -180,10 +186,14 @@ class VaultDiskSourceImpl(
sendsDao
.getAllSends(userId = userId)
.map { entities ->
entities.map { entity ->
withContext(dispatcherManager.default) {
json.decodeFromString<SyncResponseJson.Send>(entity.sendJson)
}
withContext(context = dispatcherManager.default) {
entities
.map { entity ->
async {
json.decodeFromString<SyncResponseJson.Send>(entity.sendJson)
}
}
.awaitAll()
}
},
)

13
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt
View file

@ -29,15 +29,19 @@ 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.manager.dispatcher.DispatcherManager
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.AuthenticateFido2CredentialRequest
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.Fido2CredentialAuthenticationUserInterfaceImpl
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.Fido2CredentialRegistrationUserInterfaceImpl
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.Fido2CredentialSearchUserInterfaceImpl
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.InitializeCryptoResult
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.RegisterFido2CredentialRequest
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.withContext
import java.io.File
/**
@ -47,6 +51,7 @@ import java.io.File
@Suppress("TooManyFunctions")
class VaultSdkSourceImpl(
private val sdkClientManager: SdkClientManager,
private val dispatcherManager: DispatcherManager,
) : VaultSdkSource {
override fun clearCrypto(userId: String) {
sdkClientManager.destroyClient(userId = userId)
@ -247,7 +252,9 @@ class VaultSdkSourceImpl(
): Result<List<CipherView>> =
runCatching {
val ciphers = getClient(userId = userId).vault().ciphers()
cipherList.map { ciphers.decrypt(cipher = it) }
withContext(context = dispatcherManager.default) {
cipherList.map { async { ciphers.decrypt(cipher = it) } }.awaitAll()
}
}
override suspend fun decryptCollection(
@ -288,7 +295,9 @@ class VaultSdkSourceImpl(
): Result<List<SendView>> =
runCatching {
val sends = getClient(userId = userId).sends()
sendList.map { sends.decrypt(send = it) }
withContext(dispatcherManager.default) {
sendList.map { async { sends.decrypt(send = it) } }.awaitAll()
}
}
override suspend fun encryptFolder(

3
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/di/VaultSdkModule.kt
View file

@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.di
import com.bitwarden.sdk.Fido2CredentialStore
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.platform.manager.SdkClientManager
import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager
import com.x8bit.bitwarden.data.vault.datasource.sdk.BitwardenFeatureFlagManager
import com.x8bit.bitwarden.data.vault.datasource.sdk.BitwardenFeatureFlagManagerImpl
import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource
@ -26,9 +27,11 @@ object VaultSdkModule {
@Singleton
fun providesVaultSdkSource(
sdkClientManager: SdkClientManager,
dispatcherManager: DispatcherManager,
): VaultSdkSource =
VaultSdkSourceImpl(
sdkClientManager = sdkClientManager,
dispatcherManager = dispatcherManager,
)
@Provides

3
app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt
View file

@ -39,6 +39,7 @@ 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.base.FakeDispatcherManager
import com.x8bit.bitwarden.data.platform.manager.SdkClientManager
import com.x8bit.bitwarden.data.platform.util.asFailure
import com.x8bit.bitwarden.data.platform.util.asSuccess
@ -100,8 +101,10 @@ class VaultSdkSourceTest {
every { destroyClient(any()) } just runs
}
private val mockFido2CredentialStore: Fido2CredentialStore = mockk()
private val fakeDispatcherManager = FakeDispatcherManager()
private val vaultSdkSource: VaultSdkSource = VaultSdkSourceImpl(
sdkClientManager = sdkClientManager,
dispatcherManager = fakeDispatcherManager,
)
@Test