From fbaf000c90e46f6d3a20f7d34c0d597349ce3ee0 Mon Sep 17 00:00:00 2001 From: Majid Achhoud Date: Fri, 21 Jun 2024 15:58:41 +0200 Subject: [PATCH] Changed 'tokenStore' into 'tokenStorage' be more consistent and add 'withBackgroundSession' --- .../Common/CloudAccountList/AccountListViewModel.swift | 2 +- Cryptomator/Common/CloudAuthenticator.swift | 4 ++-- .../VaultDetail/VaultDetailInfoFooterViewModel.swift | 2 +- .../Manager/CloudProviderDBManager.swift | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cryptomator/Common/CloudAccountList/AccountListViewModel.swift b/Cryptomator/Common/CloudAccountList/AccountListViewModel.swift index 5850e2993..9532dcf74 100644 --- a/Cryptomator/Common/CloudAccountList/AccountListViewModel.swift +++ b/Cryptomator/Common/CloudAccountList/AccountListViewModel.swift @@ -71,7 +71,7 @@ class AccountListViewModel: AccountListViewModelProtocol { return all(accountInfos .map { accountInfo in let tokenStore = BoxTokenStore() - let credential = BoxCredential(tokenStore: tokenStore) + let credential = BoxCredential(tokenStorage: tokenStore) boxCredentials[accountInfo.accountUID] = credential // Workaround: Fixing lifecycle issue with Box credential/client return credential } diff --git a/Cryptomator/Common/CloudAuthenticator.swift b/Cryptomator/Common/CloudAuthenticator.swift index 46ce09bf2..dda59fb61 100644 --- a/Cryptomator/Common/CloudAuthenticator.swift +++ b/Cryptomator/Common/CloudAuthenticator.swift @@ -62,7 +62,7 @@ class CloudAuthenticator { func authenticateBox(from viewController: UIViewController) -> Promise { let tokenStore = BoxTokenStore() - let credential = BoxCredential(tokenStore: tokenStore) + let credential = BoxCredential(tokenStorage: tokenStore) return BoxAuthenticator.authenticate(from: viewController, tokenStorage: tokenStore).then { _ -> Promise in return credential.getUserId().then { userId in @@ -114,7 +114,7 @@ class CloudAuthenticator { switch account.cloudProviderType { case .box: let tokenStore = BoxTokenStore() - let credential = BoxCredential(tokenStore: tokenStore) + let credential = BoxCredential(tokenStorage: tokenStore) credential.deauthenticate() case .dropbox: let credential = DropboxCredential(tokenUID: account.accountUID) diff --git a/Cryptomator/VaultDetail/VaultDetailInfoFooterViewModel.swift b/Cryptomator/VaultDetail/VaultDetailInfoFooterViewModel.swift index cba64ff72..eade99e52 100644 --- a/Cryptomator/VaultDetail/VaultDetailInfoFooterViewModel.swift +++ b/Cryptomator/VaultDetail/VaultDetailInfoFooterViewModel.swift @@ -46,7 +46,7 @@ class VaultDetailInfoFooterViewModel: BindableAttributedTextHeaderFooterViewMode switch vault.cloudProviderType { case .box: let tokenStore = BoxTokenStore() - let credential = BoxCredential(tokenStore: tokenStore) + let credential = BoxCredential(tokenStorage: tokenStore) getUsername(for: credential) return "(…)" case .dropbox: diff --git a/CryptomatorCommon/Sources/CryptomatorCommonCore/Manager/CloudProviderDBManager.swift b/CryptomatorCommon/Sources/CryptomatorCommonCore/Manager/CloudProviderDBManager.swift index 467d8fba7..a2c0d51d3 100644 --- a/CryptomatorCommon/Sources/CryptomatorCommonCore/Manager/CloudProviderDBManager.swift +++ b/CryptomatorCommon/Sources/CryptomatorCommonCore/Manager/CloudProviderDBManager.swift @@ -77,7 +77,7 @@ public class CloudProviderDBManager: CloudProviderManager, CloudProviderUpdating provider = try PCloudCloudProvider(client: client) case .box: let tokenStore = BoxTokenStore() - let credential = BoxCredential(tokenStore: tokenStore) + let credential = BoxCredential(tokenStorage: tokenStore) provider = try BoxCloudProvider(credential: credential, maxPageSize: .max) case .webDAV: let credential = try getWebDAVCredential(for: accountUID) @@ -128,8 +128,8 @@ public class CloudProviderDBManager: CloudProviderManager, CloudProviderUpdating provider = try PCloudCloudProvider(client: client) case .box: let tokenStore = BoxTokenStore() - let credential = BoxCredential(tokenStore: tokenStore) - provider = try BoxCloudProvider(credential: credential, maxPageSize: maxPageSizeForFileProvider) + let credential = BoxCredential(tokenStorage: tokenStore) + provider = try BoxCloudProvider.withBackgroundSession(credential: credential, maxPageSize: maxPageSizeForFileProvider, sessionIdentifier: sessionIdentifier) case .webDAV: let credential = try getWebDAVCredential(for: accountUID) let client = WebDAVClient.withBackgroundSession(credential: credential, sessionIdentifier: sessionIdentifier, sharedContainerIdentifier: CryptomatorConstants.appGroupName)