Merge branch 'release/1.6.0-alpha2' into main

Author: tobihagemann

.github/workflows/build.yml

@@ -7,6 +7,7 @@ jobs:
   build:
     name: Build and test
     runs-on: macos-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2

.swiftformat

@@ -1,10 +1,7 @@
-# file options
-
---exclude Pods
-
 # format options
 
 --commas inline
+--ifdef no-indent
 --importgrouping testable-bottom
 --indent tab
 --self init-only

CloudAccessPrivate/Sources/CloudAccessPrivate/GoogleDrive/GoogleDriveCloudAuthenticator.swift

@@ -16,7 +16,7 @@ public enum GoogleDriveAuthenticationError: Error {
 	case userCanceled
 }
 
-public class GoogleDriveCloudAuthenticator {
+public enum GoogleDriveCloudAuthenticator {
 	private static let scopes = [kGTLRAuthScopeDrive]
 	public static var currentAuthorizationFlow: OIDExternalUserAgentSession?
 

CloudAccessPrivate/Sources/CloudAccessPrivateCore/CryptomatorConstants.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-public struct CryptomatorConstants {
+public enum CryptomatorConstants {
 	public static let appGroupName = "group.com.setolabs.Cryptomator"
 	public static let mainAppBundleId = "com.setolabs.Cryptomator"
 }

CloudAccessPrivate/Sources/CloudAccessPrivateCore/Dropbox/DropboxClientSetup.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 import ObjectiveDropboxOfficial
-public class DropboxClientSetup {
+public enum DropboxClientSetup {
 	private static var firstTimeInit = true
 	public static func oneTimeSetup() {
 		if firstTimeInit {

CloudAccessPrivate/Sources/CloudAccessPrivateCore/Dropbox/DropboxCloudProvider.swift

@@ -57,9 +57,28 @@ public class DropboxCloudProvider: CloudProvider {
 		guard let authorizedClient = credential.authorizedClient else {
 			return Promise(CloudProviderError.unauthorized)
 		}
+		let progress = Progress(totalUnitCount: 1)
 		return retryWithExponentialBackoff({
-			self.downloadFile(from: cloudPath, to: localURL, with: authorizedClient)
-		}, condition: shouldRetryForError)
+			progress.becomeCurrent(withPendingUnitCount: 1)
+			let downloadPromise = self.downloadFile(from: cloudPath, to: localURL, with: authorizedClient)
+			progress.resignCurrent()
+			return downloadPromise
+		}, condition: shouldRetryForError).recover { error -> Promise<Void> in
+			// Currently we get a 409 (requestError) instead of a 404 (routeError) error when we download a file that does not exist.
+			// We also get this when a download was performed on a folder.
+			// Therefore, we currently need to check if there is a folder on the given CloudPath.
+
+			guard case CloudProviderError.itemNotFound = error else {
+				return Promise(error)
+			}
+			return self.checkForItemExistence(at: cloudPath).then { itemExists in
+				if itemExists {
+					return Promise(CloudProviderError.itemTypeMismatch)
+				} else {
+					return Promise(error)
+				}
+			}
+		}
 	}
 
 	/**
@@ -84,12 +103,23 @@ public class DropboxCloudProvider: CloudProvider {
 		guard localItemType == .file else {
 			return Promise(CloudProviderError.itemTypeMismatch)
 		}
+		let progress = Progress(totalUnitCount: 1)
 		let mode = replaceExisting ? DBFILESWriteMode(overwrite: ()) : nil
 		let fileSize = attributes[FileAttributeKey.size] as? Int ?? 157_286_400
 		if fileSize >= 157_286_400 {
-			return retryWithExponentialBackoff({ self.uploadBigFile(from: localURL, to: cloudPath, mode: mode, with: authorizedClient) }, condition: shouldRetryForError)
+			return retryWithExponentialBackoff({
+				progress.becomeCurrent(withPendingUnitCount: 1)
+				let uploadPromise = self.uploadBigFile(from: localURL, to: cloudPath, mode: mode, with: authorizedClient)
+				progress.resignCurrent()
+				return uploadPromise
+			}, condition: shouldRetryForError)
 		} else {
-			return retryWithExponentialBackoff({ self.uploadSmallFile(from: localURL, to: cloudPath, mode: mode, with: authorizedClient) }, condition: shouldRetryForError)
+			return retryWithExponentialBackoff({
+				progress.becomeCurrent(withPendingUnitCount: 1)
+				let uploadPromise = self.uploadSmallFile(from: localURL, to: cloudPath, mode: mode, with: authorizedClient)
+				progress.resignCurrent()
+				return uploadPromise
+			}, condition: shouldRetryForError)
 		}
 	}
 
@@ -302,7 +332,14 @@ public class DropboxCloudProvider: CloudProvider {
 							return
 						}
 					}
-					reject(self.convertRequestErrorToDropboxError(requestError))
+					let dropboxError = self.convertRequestErrorToDropboxError(requestError)
+					// Currently we get a 409 (requestError) instead of a 404 (routeError) error when we download a file that does not exist.
+					// Until this is fixed by Dropbox, this workaround is used.
+					if dropboxError == .httpError, requestError.statusCode == 409 {
+						reject(CloudProviderError.itemNotFound)
+						return
+					}
+					reject(dropboxError)
 					return
 				}
 				fulfill(())
@@ -313,8 +350,12 @@ public class DropboxCloudProvider: CloudProvider {
 	// uploadFile
 
 	private func uploadBigFile(from localURL: URL, to cloudPath: CloudPath, mode: DBFILESWriteMode?, with client: DBUserClient) -> Promise<CloudItemMetadata> {
+		let progress = Progress(totalUnitCount: 1)
 		return ensureParentFolderExists(for: cloudPath).then {
-			self.batchUploadSingleFile(from: localURL, to: cloudPath, mode: mode, with: client)
+			progress.becomeCurrent(withPendingUnitCount: 1)
+			let uploadPromise = self.batchUploadSingleFile(from: localURL, to: cloudPath, mode: mode, with: client)
+			progress.resignCurrent()
+			return uploadPromise
 		}
 	}
 
@@ -376,8 +417,12 @@ public class DropboxCloudProvider: CloudProvider {
 	}
 
 	private func uploadSmallFile(from localURL: URL, to cloudPath: CloudPath, mode: DBFILESWriteMode?, with client: DBUserClient) -> Promise<CloudItemMetadata> {
-		return ensureParentFolderExists(for: cloudPath).then {
-			self.uploadFileAfterParentCheck(from: localURL, to: cloudPath, mode: mode, with: client)
+		let progress = Progress(totalUnitCount: 1)
+		return ensureParentFolderExists(for: cloudPath).then { _ -> Promise<CloudItemMetadata> in
+			progress.becomeCurrent(withPendingUnitCount: 1)
+			let uploadPromise = self.uploadFileAfterParentCheck(from: localURL, to: cloudPath, mode: mode, with: client)
+			progress.resignCurrent()
+			return uploadPromise
 		}
 	}
 

CloudAccessPrivate/Sources/CloudAccessPrivateCore/GoogleDrive/GoogleDriveCloudProvider.swift

@@ -57,8 +57,12 @@ public class GoogleDriveCloudProvider: CloudProvider {
 		if FileManager.default.fileExists(atPath: localURL.path) {
 			return Promise(CloudProviderError.itemAlreadyExists)
 		}
-		return resolvePath(forFileAt: cloudPath).then { identifier in
-			self.downloadFile(withIdentifier: identifier, from: cloudPath, to: localURL)
+		let progress = Progress(totalUnitCount: 1)
+		return resolvePath(forFileAt: cloudPath).then { identifier -> Promise<Void> in
+			progress.becomeCurrent(withPendingUnitCount: 1)
+			let downloadPromise = self.downloadFile(withIdentifier: identifier, from: cloudPath, to: localURL)
+			progress.resignCurrent()
+			return downloadPromise
 		}
 	}
 
@@ -73,10 +77,10 @@ public class GoogleDriveCloudProvider: CloudProvider {
 		if isDirectory.boolValue {
 			return Promise(CloudProviderError.itemTypeMismatch)
 		}
+		let progress = Progress(totalUnitCount: -1)
 		return resolveParentPath(for: cloudPath).then { parentIdentfier in
 			self.createFileUploadQuery(from: localURL, to: cloudPath, parentIdentifier: parentIdentfier, replaceExisting: replaceExisting)
 		}.then { query -> Promise<Any> in
-			let progress = Progress(totalUnitCount: -1)
 			query.executionParameters.uploadProgressBlock = { _, totalBytesUploaded, totalBytesExpectedToUpload in
 				progress.totalUnitCount = Int64(totalBytesExpectedToUpload)
 				progress.completedUnitCount = Int64(totalBytesUploaded)
@@ -101,12 +105,12 @@ public class GoogleDriveCloudProvider: CloudProvider {
 	public func createFolder(at cloudPath: CloudPath) -> Promise<Void> {
 		let foldername = cloudPath.lastPathComponent
 		return Promise<Void>(on: .global()) { fulfill, reject in
-			let parentIdentifier = try await(self.resolveParentPath(for: cloudPath))
+			let parentIdentifier = try await (self.resolveParentPath(for: cloudPath))
 			do {
-				_ = try await(self.getFirstIdentifier(forItemWithName: foldername, itemType: .folder, inFolderWithId: parentIdentifier))
+				_ = try await (self.getFirstIdentifier(forItemWithName: foldername, itemType: .folder, inFolderWithId: parentIdentifier))
 				reject(CloudProviderError.itemAlreadyExists)
 			} catch CloudProviderError.itemNotFound {
-				_ = try await(self.createFolder(at: cloudPath, withParentIdentifier: parentIdentifier))
+				_ = try await (self.createFolder(at: cloudPath, withParentIdentifier: parentIdentifier))
 				fulfill(())
 			} catch CloudProviderError.itemTypeMismatch {
 				reject(CloudProviderError.itemAlreadyExists)
@@ -515,7 +519,7 @@ public class GoogleDriveCloudProvider: CloudProvider {
 			for i in startIndex ..< endIndex {
 				let itemName = endCloudPath.pathComponents[i]
 				currentURL = currentURL.appendingPathComponent(itemName)
-				parentIdentifier = try await(self.getFirstIdentifier(forItemWithName: itemName, itemType: .folder, inFolderWithId: parentIdentifier))
+				parentIdentifier = try await (self.getFirstIdentifier(forItemWithName: itemName, itemType: .folder, inFolderWithId: parentIdentifier))
 				try self.cloudIdentifierCache?.cacheIdentifier(parentIdentifier, for: currentURL)
 			}
 			fulfill(parentIdentifier)

CloudAccessPrivate/Sources/CloudAccessPrivateCore/GoogleDrive/GoogleDriveCredential.swift

@@ -36,13 +36,13 @@ public class GoogleDriveCredential {
 		driveService.isRetryEnabled = true
 		driveService.retryBlock = { _, suggestedWillRetry, fetchError in
 			if let fetchError = fetchError as NSError? {
-				if fetchError.domain == kGTMSessionFetcherStatusDomain || fetchError.code == GoogleDriveConstants.googleDriveErrorCodeForbidden {
+				if fetchError.domain != kGTMSessionFetcherStatusDomain || fetchError.code != GoogleDriveConstants.googleDriveErrorCodeForbidden {
 					return suggestedWillRetry
 				}
-				guard let data = fetchError.userInfo["data"] as? Data, let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any], let error = json["error"] else {
+				guard let data = fetchError.userInfo["data"] as? Data, let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any], let error = json["error"] as? [String: Any] else {
 					return suggestedWillRetry
 				}
-				let googleDriveError = GTLRErrorObject(json: ["error": error])
+				let googleDriveError = GTLRErrorObject(json: error)
 				guard let errorItem = googleDriveError.errors?.first else {
 					return suggestedWillRetry
 				}

CloudAccessPrivate/Sources/CloudAccessPrivateCore/LocalFileSystem/LocalFileSystemBookmarkManager.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-public class LocalFileSystemBookmarkManager {
+public enum LocalFileSystemBookmarkManager {
 	public static func getBookmarkedRootURL(for accountUID: String) throws -> URL? {
 		guard let bookmarkData = CryptomatorKeychain.localFileSystem.getAsData(accountUID) else {
 			return nil
@@ -31,7 +31,7 @@ public class LocalFileSystemBookmarkManager {
 		try CryptomatorKeychain.localFileSystem.set(accountUID, value: bookmarkData)
 	}
 
-	public static func removeBookmarkedRootURL(for accountUID: String) throws{
+	public static func removeBookmarkedRootURL(for accountUID: String) throws {
 		try CryptomatorKeychain.localFileSystem.delete(accountUID)
 	}
 }

CloudAccessPrivate/Sources/CloudAccessPrivateCore/Manager/VaultAccountManager.swift

@@ -70,12 +70,12 @@ public class VaultAccountManager {
 	}
 
 	public func getAllAccounts() throws -> [VaultAccount] {
-		try dbPool.read{ db in
+		try dbPool.read { db in
 			try VaultAccount.fetchAll(db)
 		}
 	}
-	
-	//only for prototype
+
+	// only for prototype
 	public func getAllVaultUIDs(with delegateAccountUID: String) throws -> [String] {
 		let accounts: [VaultAccount] = try dbPool.read { db in
 			return try VaultAccount