From b5c1170d4b657a6a387977c8fcd3b2b67eb73f06 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Tue, 16 Nov 2021 12:07:06 +0100 Subject: [PATCH] Remove parallelism --- .../cryptomator/data/cloud/crypto/CryptoImplVaultFormat7.kt | 2 -- .../data/cloud/crypto/CryptoImplVaultFormatPre7.kt | 1 - .../java/org/cryptomator/data/cloud/dropbox/DropboxImpl.kt | 4 ++-- .../main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.kt | 3 --- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormat7.kt b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormat7.kt index 6b17040e..7576d1ea 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormat7.kt +++ b/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) } diff --git a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormatPre7.kt b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormatPre7.kt index bdac767f..c0f05464 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormatPre7.kt +++ b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormatPre7.kt @@ -126,7 +126,6 @@ internal class CryptoImplVaultFormatPre7( return cloudContentRepository .list(lvl2Dir) .filterIsInstance() - .parallelStream() .map { node -> ciphertextToCleartextNode(cryptoFolder, dirId, node) } diff --git a/data/src/main/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.kt b/data/src/main/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.kt index fb953649..bb6b6d5b 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.kt +++ b/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 { - val result: MutableList = ArrayList() + val result = ArrayList() 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) diff --git a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.kt b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.kt index 63ca8de8..637a3714 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.kt +++ b/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)