AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases1 Wiki Activity

Remove parallelism

Browse Source
This commit is contained in:
Julian Raufelder 2021-11-16 12:07:06 +01:00
parent 0d9643f8fe
commit b5c1170d4b
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
4 changed files with 2 additions and 8 deletions
data/src/main/java/org/cryptomator/data/cloud
crypto
CryptoImplVaultFormat7.ktCryptoImplVaultFormatPre7.kt
dropbox
DropboxImpl.kt
pcloud
PCloudImpl.kt

2
data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormat7.kt

@ -37,7 +37,6 @@ import java.nio.charset.StandardCharsets
import java.util.UUID
import java.util.function.Supplier
import java.util.regex.Pattern
import kotlin.streams.toList
import timber.log.Timber
open class CryptoImplVaultFormat7 : CryptoImplDecorator {
@ -156,7 +155,6 @@ open class CryptoImplVaultFormat7 : CryptoImplDecorator {
}
return ciphertextNodes
.parallelStream()
.map { node ->
ciphertextToCleartextNode(cryptoFolder, dirId, node)
}

1
data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormatPre7.kt

@ -126,7 +126,6 @@ internal class CryptoImplVaultFormatPre7(
return cloudContentRepository
.list(lvl2Dir)
.filterIsInstance<CloudFile>()
.parallelStream()
.map { node ->
ciphertextToCleartextNode(cryptoFolder, dirId, node)
}

4
data/src/main/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.kt

@ -98,7 +98,7 @@ internal class DropboxImpl(cloud: DropboxCloud, context: Context) {
@Throws(AuthenticationException::class, DbxException::class)
fun list(folder: DropboxFolder): List<DropboxNode> {
val result: MutableList<DropboxNode> = ArrayList()
val result = ArrayList<DropboxNode>()
var listFolderResult: ListFolderResult? = null
do {
listFolderResult = if (listFolderResult == null) {
@ -106,7 +106,7 @@ internal class DropboxImpl(cloud: DropboxCloud, context: Context) {
} else {
client().files().listFolderContinue(listFolderResult.cursor)
}
listFolderResult.entries.parallelStream().forEach {
listFolderResult.entries.forEach {
result.add(from(folder, it))
}
} while (listFolderResult?.hasMore == true)

3
data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.kt

@ -39,7 +39,6 @@ import java.io.File
import java.io.IOException
import java.io.OutputStream
import java.util.Date
import java.util.stream.Collectors
import okio.BufferedSink
import okio.BufferedSource
import okio.source
@ -115,9 +114,7 @@ internal class PCloudImpl(context: Context, cloud: PCloud) {
.listFolder(path)
.execute()
.children()
.parallelStream()
.map { node -> PCloudNodeFactory.from(folder, node) }
.collect(Collectors.toList())
} catch (ex: ApiError) {
handleApiError(ex, folder.name)
throw FatalBackendException(ex)