Added the option to use a foreground URLSession for the WebDAVProvider

cryptomator · Dec 8, 2020 · 403deac · 403deac
1 parent 639117c
commit 403deac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/Sources/CryptomatorCloudAccess/WebDAV/WebDAVClient.swift b/Sources/CryptomatorCloudAccess/WebDAV/WebDAVClient.swift
@@ -27,9 +27,9 @@ public class WebDAVClient {
 		self.webDAVSession = session
 	}
 
-	public convenience init(credential: WebDAVCredential, sharedContainerIdentifier: String) {
+	public convenience init(credential: WebDAVCredential, sharedContainerIdentifier: String, useBackgroundSession: Bool) {
 		let urlSessionDelegate = WebDAVClientURLSessionDelegate(credential: credential)
-		self.init(credential: credential, session: WebDAVSession(sharedContainerIdentifier: sharedContainerIdentifier, delegate: urlSessionDelegate))
+		self.init(credential: credential, session: WebDAVSession(sharedContainerIdentifier: sharedContainerIdentifier, delegate: urlSessionDelegate, useBackgroundSession: useBackgroundSession))
 	}
 
 	// MARK: - HTTP Methods for WebDAV

diff --git a/Sources/CryptomatorCloudAccess/WebDAV/WebDAVSession.swift b/Sources/CryptomatorCloudAccess/WebDAV/WebDAVSession.swift
@@ -147,9 +147,16 @@ class WebDAVSession {
 		self.delegate = delegate
 	}
 
-	convenience init(sharedContainerIdentifier: String, delegate: WebDAVClientURLSessionDelegate) {
-		let configuration = URLSessionConfiguration.background(withIdentifier: "CloudAccessWebDAVSession_\(delegate.credential.identifier)")
-		configuration.sharedContainerIdentifier = sharedContainerIdentifier
+	convenience init(sharedContainerIdentifier: String, delegate: WebDAVClientURLSessionDelegate, useBackgroundSession: Bool) {
+		let configuration: URLSessionConfiguration
+		if useBackgroundSession {
+			// Additionally use the bundleID to prevent the same background URLSession identifier for multiple targets (for example Main App and Extension).
+			let bundleId = Bundle.main.bundleIdentifier ?? ""
+			configuration = URLSessionConfiguration.background(withIdentifier: "CloudAccessWebDAVSession_\(delegate.credential.identifier)_\(bundleId)")
+			configuration.sharedContainerIdentifier = sharedContainerIdentifier
+		} else {
+			configuration = URLSessionConfiguration.default
+		}
 		configuration.httpCookieStorage = HTTPCookieStorage()
 		let session = URLSession(configuration: configuration, delegate: delegate, delegateQueue: nil)
 		self.init(urlSession: session, delegate: delegate)