Merge release/2.8.1 into main

Author: tobihagemann

.gitignore

@@ -48,5 +48,5 @@ fastlane/test_output
 # App Store Connect API keys
 *.p8
 
-# IAP pricing configs (contain actual prices)
-fastlane/config/iap-*.json
+# Pricing configs (contain actual prices)
+fastlane/config/*.json

.swiftformat

@@ -1,4 +1,4 @@
---minversion 0.58.3
+--minversion 0.60.1
 --exclude DerivedData
 
 # format options

Cryptomator.xcodeproj/project.pbxproj

@@ -35,8 +35,8 @@ class SetVaultNameViewModel: SingleSectionTableViewModel, SetVaultNameViewModelP
 
 	private lazy var subscribers = Set<AnyCancellable>()
 
-	// disallowed characters \ / : * ? " < > |
-	// cannot end with .
+	/// disallowed characters \ / : * ? " < > |
+	/// cannot end with .
 	func getValidatedVaultName() throws -> String {
 		guard !trimmedVaultName.isEmpty else {
 			throw SetVaultNameViewModelError.emptyVaultName

Cryptomator/AddVault/CreateNewVault/SetVaultNameViewModel.swift

@@ -60,8 +60,7 @@ class LocalFileSystemAuthenticationViewModel: SingleSectionTableViewModel, Local
 		guard let rootURL = urls.first else {
 			throw LocalFileSystemAuthenticationViewModelError.invalidURL
 		}
-		let credential = LocalFileSystemCredential(rootURL: rootURL, identifier: UUID().uuidString)
-		return credential
+		return LocalFileSystemCredential(rootURL: rootURL, identifier: UUID().uuidString)
 	}
 
 	func validateAndSave(credential: LocalFileSystemCredential) -> Promise<CloudProviderAccount> {

Cryptomator/AddVault/LocalVault/LocalFileSystemAuthenticationViewModel.swift

@@ -70,6 +70,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	}
 
 	func application(_: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+		if url.scheme == "cryptomator" {
+			if url.host == "purchase" {
+				coordinator?.showPurchase()
+			}
+			return true
+		}
 		if url.scheme == CloudAccessSecrets.dropboxURLScheme {
 			return DBClientsManager.handleRedirectURL(url) { authResult in
 				guard let authResult = authResult else {

Cryptomator/AppDelegate.swift

@@ -10,7 +10,10 @@ import UIKit
 
 class ButtonCellViewModel<T>: BindableTableViewCellViewModel {
 	private let preferredCellStyle: UITableViewCell.CellStyle
-	override var cellStyle: UITableViewCell.CellStyle { preferredCellStyle }
+	override var cellStyle: UITableViewCell.CellStyle {
+		preferredCellStyle
+	}
+
 	let action: T
 	init(action: T, title: String, titleTextColor: UIColor? = .cryptomatorPrimary, detailTitle: String? = nil, image: UIImage? = nil, isEnabled: Bool = true, selectionStyle: UITableViewCell.SelectionStyle = .default, accessoryType: UITableViewCell.AccessoryType = .none, cellStyle: UITableViewCell.CellStyle = .value1) {
 		self.action = action

Cryptomator/Common/Cells/ButtonCellViewModel.swift

@@ -9,7 +9,10 @@
 import Foundation
 
 class LoadingButtonCellViewModel<T>: ButtonCellViewModel<T>, LoadingIndicatorSupport {
-	override var type: ConfigurableTableViewCell.Type { LoadingButtonCell.self }
+	override var type: ConfigurableTableViewCell.Type {
+		LoadingButtonCell.self
+	}
+
 	let isLoading: Bindable<Bool>
 
 	init(action: T, title: String, isLoading: Bool = false) {

Cryptomator/Common/Cells/LoadingButtonCellViewModel.swift

@@ -14,11 +14,6 @@ public struct AccountInfo: Decodable, FetchableRecord {
 	let cloudProviderAccount: CloudProviderAccount
 	private(set) var accountListPosition: AccountListPosition
 
-	init(cloudProviderAccount: CloudProviderAccount, accountListPosition: AccountListPosition) {
-		self.cloudProviderAccount = cloudProviderAccount
-		self.accountListPosition = accountListPosition
-	}
-
 	var cloudProviderType: CloudProviderType {
 		return cloudProviderAccount.cloudProviderType
 	}

Cryptomator/Common/CloudAccountList/AccountInfo.swift

@@ -66,35 +66,31 @@ class AccountListViewModel: AccountListViewModelProtocol {
 	func refreshDropboxItems() -> Promise<Void> {
 		return all(accountInfos
 			.map { DropboxCredential(tokenUID: $0.accountUID) }
-			.map { self.createAccountCellContent(for: $0) }
-		).then { accounts in
+			.map { self.createAccountCellContent(for: $0) }).then { accounts in
 			self.accounts = accounts
 		}
 	}
 
 	func refreshMicrosoftGraphItems() -> Promise<Void> {
 		return all(accountInfos
 			.compactMap { try? MicrosoftGraphAccountDBManager.shared.getAccount(for: $0.accountUID) }
-			.compactMap { try? self.createAccountCellContent(for: $0) }
-		).then { accounts in
+			.compactMap { try? self.createAccountCellContent(for: $0) }).then { accounts in
 			self.accounts = accounts
 		}
 	}
 
 	func refreshPCloudItems() -> Promise<Void> {
 		return all(accountInfos
 			.compactMap { try? PCloudCredential(userID: $0.accountUID) }
-			.map { self.createAccountCellContent(for: $0) }
-		).then { accounts in
+			.map { self.createAccountCellContent(for: $0) }).then { accounts in
 			self.accounts = accounts
 		}
 	}
 
 	func refreshBoxItems() -> Promise<Void> {
 		return all(accountInfos
 			.map { BoxCredential(tokenStorage: BoxTokenStorage(userID: $0.accountUID)) }
-			.map { self.createAccountCellContent(for: $0) }
-		).then { accounts in
+			.map { self.createAccountCellContent(for: $0) }).then { accounts in
 			self.accounts = accounts
 		}
 	}