Merge branch 'release/1.7.2'

cryptomator · Feb 2, 2023 · e4618d8 · e4618d8
2 parents d7da92b + 3dcd20f
commit e4618d8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Sources/CryptomatorCloudAccess/GoogleDrive/GoogleDriveCloudProvider.swift b/Sources/CryptomatorCloudAccess/GoogleDrive/GoogleDriveCloudProvider.swift
@@ -394,7 +394,7 @@ public class GoogleDriveCloudProvider: CloudProvider {
 		let query = GTLRDriveQuery_FilesList.query()
 		query.supportsAllDrives = true
 		query.includeItemsFromAllDrives = true
-		query.q = "'\(resolvedParentItemIdentifier)' in parents and name contains '\(name)' and trashed = false"
+		query.q = "'\(resolvedParentItemIdentifier)' in parents and name contains '\(escapedQueryValue(name))' and trashed = false"
 		query.fields = "files(id,name,mimeType,shortcutDetails)"
 		return executeQuery(query).then { result -> GoogleDriveItem in
 			CloudAccessDDLogDebug("GoogleDriveCloudProvider: getGoogleDriveItem(name: \(name), parentItem: \(parentItem.identifier)) received result: \((result as? GTLRObject)?.jsonString() ?? result)")
@@ -603,4 +603,8 @@ public class GoogleDriveCloudProvider: CloudProvider {
 		let rhsWithoutItemName = rhs.deletingLastPathComponent()
 		return lhsWithoutItemName == rhsWithoutItemName
 	}
+
+	func escapedQueryValue(_ value: String) -> String {
+		return value.replacingOccurrences(of: "'", with: "\\'")
+	}
 }
diff --git a/Sources/CryptomatorCloudAccess/WebDAV/WebDAVSession.swift b/Sources/CryptomatorCloudAccess/WebDAV/WebDAVSession.swift
@@ -226,7 +226,9 @@ class WebDAVSession {
 		let pendingPromise = Promise<HTTPURLResponse>.pending()
 		let webDAVDownloadTask = WebDAVDownloadTask(promise: pendingPromise, localURL: localURL)
 		delegate?.addRunningDownloadTask(key: task, value: webDAVDownloadTask)
-		task.resume()
+		if onTaskCreation == nil {
+			task.resume()
+		}
 		return pendingPromise.then { response -> Promise<HTTPURLResponse> in
 			HTTPDebugLogger.logResponse(response, with: nil, or: localURL)
 			return Promise(response)
@@ -242,7 +244,9 @@ class WebDAVSession {
 		let pendingPromise = Promise<(HTTPURLResponse, Data?)>.pending()
 		let webDAVDataTask = WebDAVDataTask(promise: pendingPromise)
 		delegate?.addRunningDataTask(key: task, value: webDAVDataTask)
-		task.resume()
+		if onTaskCreation == nil {
+			task.resume()
+		}
 		return pendingPromise.then { response, data -> Promise<(HTTPURLResponse, Data?)> in
 			HTTPDebugLogger.logResponse(response, with: data, or: nil)
 			return Promise((response, data))