Merge branch 'release/2.0.2'

tobihagemann · tobihagemann · commit 8d451f098864 · 2021-12-20T16:50:42.000+01:00
diff --git a/Cryptomator.xcodeproj/project.pbxproj b/Cryptomator.xcodeproj/project.pbxproj
@@ -2629,7 +2629,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.0.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -2691,7 +2691,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.0.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";
diff --git a/Cryptomator/Common/HeaderFooter/BaseHeaderFooterView.swift b/Cryptomator/Common/HeaderFooter/BaseHeaderFooterView.swift
@@ -16,6 +16,12 @@ class BaseHeaderFooterView: UITableViewHeaderFooterView, HeaderFooterViewModelCo
 
 	func configure(with viewModel: HeaderFooterViewModel) {
 		textLabel?.numberOfLines = 0
-		subscriber = viewModel.title.$value.assign(to: \.text, on: textLabel)
+		subscriber = viewModel.title.$value.sink(receiveValue: { [weak self] text in
+			UIView.setAnimationsEnabled(false)
+			self?.tableView?.performBatchUpdates({
+				self?.textLabel?.text = text
+			})
+			UIView.setAnimationsEnabled(true)
+		})
 	}
 }
diff --git a/Cryptomator/Settings/SettingsCoordinator.swift b/Cryptomator/Settings/SettingsCoordinator.swift
@@ -63,7 +63,7 @@ class SettingsCoordinator: Coordinator {
 	}
 
 	func openRateApp() {
-		if let rateAppURL = URL(string: "https://apps.apple.com/app/cryptomator/id953086535?action=write-review") {
+		if let rateAppURL = URL(string: "https://apps.apple.com/app/cryptomator-2/id1560822163?action=write-review") {
 			UIApplication.shared.open(rateAppURL)
 		}
 	}
diff --git a/Cryptomator/Snapshots/SnapshotCoordinator.swift b/Cryptomator/Snapshots/SnapshotCoordinator.swift
@@ -26,9 +26,9 @@ class SnapshotCoordinator: MainCoordinator {
 	}
 
 	override func showVaultDetail(for vaultInfo: VaultInfo) {
-		let snapshotFileProviderConnectorMock = SnapshotFileProviderConntectorMock()
+		let snapshotFileProviderConnectorMock = SnapshotFileProviderConnectorMock()
 		snapshotFileProviderConnectorMock.proxy = SnapshotVaultLockingMock()
-		let viewModel = VaultDetailViewModel(vaultInfo: vaultInfo, vaultManager: VaultDBManager.shared, fileProviderConnector: SnapshotFileProviderConntectorMock(), passwordManager: VaultPasswordKeychainManager(), dbManager: DatabaseManager.shared)
+		let viewModel = VaultDetailViewModel(vaultInfo: vaultInfo, vaultManager: VaultDBManager.shared, fileProviderConnector: snapshotFileProviderConnectorMock, passwordManager: VaultPasswordKeychainManager(), dbManager: DatabaseManager.shared)
 		let vaultDetailViewController = VaultDetailViewController(viewModel: viewModel)
 		navigationController.pushViewController(vaultDetailViewController, animated: true)
 	}
@@ -52,7 +52,7 @@ class SnapshotCoordinator: MainCoordinator {
 	}
 }
 
-private class SnapshotFileProviderConntectorMock: FileProviderConnector {
+private class SnapshotFileProviderConnectorMock: FileProviderConnector {
 	var proxy: Any?
 	func getProxy<T>(serviceName: NSFileProviderServiceName, domainIdentifier: NSFileProviderDomainIdentifier) -> Promise<T> {
 		return getCastedProxy()
diff --git a/Cryptomator/Snapshots/SnapshotVaultListViewModel.swift b/Cryptomator/Snapshots/SnapshotVaultListViewModel.swift
@@ -60,7 +60,11 @@ class SnapshotVaultListViewModel: VaultListViewModelProtocol {
 		let vaults = cloudProviderAccounts.enumerated().map { index, cloudProviderAccount -> VaultInfo in
 			let vaultAccount = VaultAccount(vaultUID: UUID().uuidString, delegateAccountUID: cloudProviderAccount.accountUID, vaultPath: vaultPaths[index], vaultName: vaultPaths[index].lastPathComponent)
 			let vaultListPosition = VaultListPosition(id: nil, position: index, vaultUID: vaultAccount.vaultUID)
-			return VaultInfo(vaultAccount: vaultAccount, cloudProviderAccount: cloudProviderAccount, vaultListPosition: vaultListPosition)
+			let vaultInfo = VaultInfo(vaultAccount: vaultAccount, cloudProviderAccount: cloudProviderAccount, vaultListPosition: vaultListPosition)
+			if index == 0 {
+				vaultInfo.vaultIsUnlocked = true
+			}
+			return vaultInfo
 		}
 		return vaults.map { VaultCellViewModel(vault: $0) }
 	}
diff --git a/README.md b/README.md
@@ -8,11 +8,7 @@
 
 Cryptomator offers multi-platform transparent client-side encryption of your files in the cloud.
 
-This is the repository for the new iOS app of Cryptomator, which has been rewritten from the ground up and is currently in a beta phase.
-
-Try it out for free via TestFlight: https://testflight.apple.com/join/WMtYSrzD
-
-If you're looking for the current App Store version and would like to report an issue, check out the other repository: https://github.com/cryptomator/cryptomator-ios
+Download on the App Store: https://apps.apple.com/app/cryptomator-2/id1560822163
 
 ## Building
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,12 @@ class BaseHeaderFooterView: UITableViewHeaderFooterView, HeaderFooterViewModelCo`
`16`	`16`
`17`	`17`	`func configure(with viewModel: HeaderFooterViewModel) {`
`18`	`18`	`textLabel?.numberOfLines = 0`
`19`		`- subscriber = viewModel.title.$value.assign(to: \.text, on: textLabel)`
	`19`	`+ subscriber = viewModel.title.$value.sink(receiveValue: { [weak self] text in`
	`20`	`+ UIView.setAnimationsEnabled(false)`
	`21`	`+ self?.tableView?.performBatchUpdates({`
	`22`	`+ self?.textLabel?.text = text`
	`23`	`+ })`
	`24`	`+ UIView.setAnimationsEnabled(true)`
	`25`	`+ })`
`20`	`26`	`}`
`21`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class SettingsCoordinator: Coordinator {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`func openRateApp() {`
`66`		`- if let rateAppURL = URL(string: "https://apps.apple.com/app/cryptomator/id953086535?action=write-review") {`
	`66`	`+ if let rateAppURL = URL(string: "https://apps.apple.com/app/cryptomator-2/id1560822163?action=write-review") {`
`67`	`67`	`UIApplication.shared.open(rateAppURL)`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ class SnapshotCoordinator: MainCoordinator {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`override func showVaultDetail(for vaultInfo: VaultInfo) {`
`29`		`- let snapshotFileProviderConnectorMock = SnapshotFileProviderConntectorMock()`
	`29`	`+ let snapshotFileProviderConnectorMock = SnapshotFileProviderConnectorMock()`
`30`	`30`	`snapshotFileProviderConnectorMock.proxy = SnapshotVaultLockingMock()`
`31`		`- let viewModel = VaultDetailViewModel(vaultInfo: vaultInfo, vaultManager: VaultDBManager.shared, fileProviderConnector: SnapshotFileProviderConntectorMock(), passwordManager: VaultPasswordKeychainManager(), dbManager: DatabaseManager.shared)`
	`31`	`+ let viewModel = VaultDetailViewModel(vaultInfo: vaultInfo, vaultManager: VaultDBManager.shared, fileProviderConnector: snapshotFileProviderConnectorMock, passwordManager: VaultPasswordKeychainManager(), dbManager: DatabaseManager.shared)`
`32`	`32`	`let vaultDetailViewController = VaultDetailViewController(viewModel: viewModel)`
`33`	`33`	`navigationController.pushViewController(vaultDetailViewController, animated: true)`
`34`	`34`	`}`
`@@ -52,7 +52,7 @@ class SnapshotCoordinator: MainCoordinator {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`-private class SnapshotFileProviderConntectorMock: FileProviderConnector {`
	`55`	`+private class SnapshotFileProviderConnectorMock: FileProviderConnector {`
`56`	`56`	`var proxy: Any?`
`57`	`57`	`func getProxy<T>(serviceName: NSFileProviderServiceName, domainIdentifier: NSFileProviderDomainIdentifier) -> Promise<T> {`
`58`	`58`	`return getCastedProxy()`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,11 @@ class SnapshotVaultListViewModel: VaultListViewModelProtocol {`
`60`	`60`	`let vaults = cloudProviderAccounts.enumerated().map { index, cloudProviderAccount -> VaultInfo in`
`61`	`61`	`let vaultAccount = VaultAccount(vaultUID: UUID().uuidString, delegateAccountUID: cloudProviderAccount.accountUID, vaultPath: vaultPaths[index], vaultName: vaultPaths[index].lastPathComponent)`
`62`	`62`	`let vaultListPosition = VaultListPosition(id: nil, position: index, vaultUID: vaultAccount.vaultUID)`
`63`		`- return VaultInfo(vaultAccount: vaultAccount, cloudProviderAccount: cloudProviderAccount, vaultListPosition: vaultListPosition)`
	`63`	`+ let vaultInfo = VaultInfo(vaultAccount: vaultAccount, cloudProviderAccount: cloudProviderAccount, vaultListPosition: vaultListPosition)`
	`64`	`+ if index == 0 {`
	`65`	`+ vaultInfo.vaultIsUnlocked = true`
	`66`	`+ }`
	`67`	`+ return vaultInfo`
`64`	`68`	`}`
`65`	`69`	`return vaults.map { VaultCellViewModel(vault: $0) }`
`66`	`70`	`}`