From b6cebf16fb29e3533aeb1833274806a1bcb4a549 Mon Sep 17 00:00:00 2001 From: Manuel Jenny Date: Wed, 17 Mar 2021 15:33:31 +0100 Subject: [PATCH] fix: move decrypt() for accessToken --- .../data/cloud/pcloud/PCloudClientFactory.java | 9 ++++++++- .../org/cryptomator/data/cloud/pcloud/PCloudImpl.java | 8 +------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudClientFactory.java b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudClientFactory.java index 8c943367..019d8552 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudClientFactory.java +++ b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudClientFactory.java @@ -8,6 +8,7 @@ import com.pcloud.sdk.PCloudSdk; import org.cryptomator.data.cloud.okhttplogging.HttpLoggingInterceptor; import org.cryptomator.util.SharedPreferencesHandler; +import org.cryptomator.util.crypto.CredentialCryptor; import org.cryptomator.util.file.LruFileCacheUtil; import okhttp3.Cache; @@ -49,6 +50,12 @@ class PCloudClientFactory { OkHttpClient okHttpClient = okHttpClientBuilder.build(); - return PCloudSdk.newClientBuilder().authenticator(Authenticators.newOAuthAuthenticator(accessToken)).withClient(okHttpClient).apiHost(url).create(); + return PCloudSdk.newClientBuilder().authenticator(Authenticators.newOAuthAuthenticator(decrypt(accessToken, context))).withClient(okHttpClient).apiHost(url).create(); + } + + private String decrypt(String password, Context context) { + return CredentialCryptor // + .getInstance(context) // + .decrypt(password); } } diff --git a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java index a4ed013a..771da193 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java +++ b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java @@ -64,13 +64,7 @@ class PCloudImpl { } private ApiClient client() { - return clientFactory.getClient(decrypt(cloud.accessToken()), cloud.url(), context); - } - - private String decrypt(String password) { - return CredentialCryptor // - .getInstance(context) // - .decrypt(password); + return clientFactory.getClient(cloud.accessToken(), cloud.url(), context); } public PCloudFolder root() {