Merge release/2.8.0 into main

Author: tobihagemann

.gitignore

@@ -44,3 +44,9 @@ fastlane/Preview.html
 fastlane/screenshots/screenshots.html
 fastlane/screenshots/*/*.png
 fastlane/test_output
+
+# App Store Connect API keys
+*.p8
+
+# IAP pricing configs (contain actual prices)
+fastlane/config/iap-*.json

Cryptomator.xcodeproj/project.pbxproj

@@ -11,7 +11,7 @@ import CryptomatorCloudAccessCore
 import CryptomatorCommonCore
 import UIKit
 
-class CreateNewVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEditAccountBehavior, Coordinator {
+class CreateNewVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEditAccountBehavior, DefaultAccountSelectionBehavior, Coordinator {
 	var navigationController: UINavigationController
 	var childCoordinators = [Coordinator]()
 	weak var parentCoordinator: Coordinator?
@@ -55,9 +55,8 @@ class CreateNewVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEditA
 		}
 	}
 
-	func selectedAccont(_ account: AccountInfo) throws {
-		let provider = try CloudProviderDBManager.shared.getProvider(with: account.accountUID)
-		startFolderChooser(with: provider, account: account.cloudProviderAccount)
+	func proceedWithValidatedAccount(provider: CloudProvider, account: CloudProviderAccount) {
+		startFolderChooser(with: provider, account: account)
 	}
 
 	private func startFolderChooser(with provider: CloudProvider, account: CloudProviderAccount) {

Cryptomator/AddVault/CreateNewVault/CreateNewVaultCoordinator.swift

@@ -16,7 +16,13 @@ class CreateNewLocalVaultViewModel: LocalFileSystemAuthenticationViewModel, Loca
 
 	init(vaultName: String, selectedLocalFileSystemType: LocalFileSystemType, accountManager: CloudProviderAccountManager = CloudProviderAccountDBManager.shared) {
 		let documentPickerButtonText = LocalizedString.getValue("localFileSystemAuthentication.createNewVault.button")
-		let headerText = LocalizedString.getValue("localFileSystemAuthentication.createNewVault.header")
+		let headerText: String
+		switch selectedLocalFileSystemType {
+		case .iCloudDrive:
+			headerText = LocalizedString.getValue("localFileSystemAuthentication.createNewVault.iCloudDrive.header")
+		case .custom:
+			headerText = LocalizedString.getValue("localFileSystemAuthentication.createNewVault.otherFileProvider.header")
+		}
 		self.vaultName = vaultName
 		super.init(documentPickerButtonText: documentPickerButtonText, headerText: headerText, selectedLocalFileSystemType: selectedLocalFileSystemType, validationLogic: CreateNewLocalVaultValidationLogic(vaultName: vaultName), accountManager: accountManager)
 	}

Cryptomator/AddVault/CreateNewVault/LocalVault/CreateNewLocalVaultViewModel.swift

@@ -31,7 +31,6 @@ class LocalFileSystemAuthenticationViewController: SingleSectionStaticUITableVie
 		}
 		documentPicker.allowsMultipleSelection = false
 		documentPicker.delegate = self
-		documentPicker.directoryURL = viewModel.documentPickerStartDirectoryURL
 		present(documentPicker, animated: true)
 	}
 

Cryptomator/AddVault/LocalVault/LocalFileSystemAuthenticationViewController.swift

@@ -13,7 +13,6 @@ import Promises
 
 protocol LocalFileSystemAuthenticationViewModelProtocol: SingleSectionTableViewModel {
 	var headerText: String { get }
-	var documentPickerStartDirectoryURL: URL? { get }
 	func footerViewModel(for section: Int) -> HeaderFooterViewModel?
 	func userPicked(urls: [URL]) throws -> LocalFileSystemCredential
 }
@@ -31,16 +30,6 @@ class LocalFileSystemAuthenticationViewModel: SingleSectionTableViewModel, Local
 		return [openDocumentPickerCellViewModel]
 	}
 
-	var documentPickerStartDirectoryURL: URL? {
-		switch selectedLocalFileSystemType {
-		case .iCloudDrive:
-			return LocalFileSystemAuthenticationViewModel.iCloudDriveRootDirectory
-		case .custom:
-			return nil
-		}
-	}
-
-	static let iCloudDriveRootDirectory = URL(fileURLWithPath: "\(iCloudDrivePrefix)com~apple~CloudDocs/")
 	private static let iCloudDrivePrefix = "/private/var/mobile/Library/Mobile Documents/"
 	let documentPickerButtonText: String
 	let headerText: String

Cryptomator/AddVault/LocalVault/LocalFileSystemAuthenticationViewModel.swift

@@ -15,7 +15,13 @@ class OpenExistingLocalVaultViewModel: LocalFileSystemAuthenticationViewModel, L
 	private let validator: OpenExistingLocalVaultValidationLogic
 	init(selectedLocalFileSystemType: LocalFileSystemType, accountManager: CloudProviderAccountManager = CloudProviderAccountDBManager.shared) {
 		let documentPickerButtonText = LocalizedString.getValue("localFileSystemAuthentication.openExistingVault.button")
-		let headerText = LocalizedString.getValue("localFileSystemAuthentication.openExistingVault.header")
+		let headerText: String
+		switch selectedLocalFileSystemType {
+		case .iCloudDrive:
+			headerText = LocalizedString.getValue("localFileSystemAuthentication.openExistingVault.iCloudDrive.header")
+		case .custom:
+			headerText = LocalizedString.getValue("localFileSystemAuthentication.openExistingVault.otherFileProvider.header")
+		}
 		self.validator = OpenExistingLocalVaultValidationLogic()
 		super.init(documentPickerButtonText: documentPickerButtonText, headerText: headerText, selectedLocalFileSystemType: selectedLocalFileSystemType, validationLogic: validator, accountManager: accountManager)
 	}

Cryptomator/AddVault/OpenExistingVault/LocalVault/OpenExistingLocalVaultViewModel.swift

@@ -15,7 +15,7 @@ import Foundation
 import Promises
 import UIKit
 
-class OpenExistingVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEditAccountBehavior, Coordinator {
+class OpenExistingVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEditAccountBehavior, DefaultAccountSelectionBehavior, Coordinator {
 	var navigationController: UINavigationController
 	var childCoordinators = [Coordinator]()
 	weak var parentCoordinator: AddVaultCoordinator?
@@ -56,9 +56,8 @@ class OpenExistingVaultCoordinator: AccountListing, CloudChoosing, DefaultShowEd
 		}
 	}
 
-	func selectedAccont(_ account: AccountInfo) throws {
-		let provider = try CloudProviderDBManager.shared.getProvider(with: account.accountUID)
-		startFolderChooser(with: provider, account: account.cloudProviderAccount)
+	func proceedWithValidatedAccount(provider: CloudProvider, account: CloudProviderAccount) {
+		startFolderChooser(with: provider, account: account)
 	}
 
 	private func startFolderChooser(with provider: CloudProvider, account: CloudProviderAccount) {

Cryptomator/AddVault/OpenExistingVault/OpenExistingVaultCoordinator.swift

@@ -98,11 +98,7 @@ class AccountListViewController: ListViewController<AccountCellContent>, ASWebAu
 	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
 		tableView.deselectRow(at: indexPath, animated: true)
 		let accountInfo = viewModel.accountInfos[indexPath.row]
-		do {
-			try coordinator?.selectedAccont(accountInfo)
-		} catch {
-			coordinator?.handleError(error, for: self)
-		}
+		coordinator?.selectedAccount(accountInfo)
 	}
 
 	// MARK: - ASWebAuthenticationPresentationContextProviding
@@ -174,7 +170,10 @@ private class AccountListViewModelMock: AccountListViewModelProtocol {
 	let accountInfos = [AccountInfo]()
 	let title = "Google Drive"
 
-	func refreshItems() -> Promise<Void> { return Promise(()) }
+	func refreshItems() -> Promise<Void> {
+		return Promise(())
+	}
+
 	func moveRow(at sourceIndex: Int, to destinationIndex: Int) throws {}
 	func removeRow(at index: Int) throws {}
 	func startListenForChanges(onError: @escaping (Error) -> Void, onChange: @escaping () -> Void) {}

Cryptomator/Common/CloudAccountList/AccountListViewController.swift

@@ -11,6 +11,6 @@ import UIKit
 
 protocol AccountListing: AnyObject {
 	func showAddAccount(for cloudProviderType: CloudProviderType, from viewController: UIViewController)
-	func selectedAccont(_ account: AccountInfo) throws
+	func selectedAccount(_ account: AccountInfo)
 	func showEdit(for account: AccountInfo)
 }