Make NextcloudKit Swift 6 compatible

Sources/NextcloudKit/Extensions/NSLock+Extension.swift

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2025 Claudio Cambra <[email protected]>
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import Foundation
+
+extension NSLock {
+    @discardableResult
+    func perform<T>(_ block: () throws -> T) rethrows -> T {
+        lock()
+        defer { unlock() }
+        return try block()
+    }
+}

Sources/NextcloudKit/Models/NKDownloadLimit.swift

@@ -9,7 +9,7 @@
 ///
 /// Each relates to a share of a file and is optionally provided by the [Files Download Limit](https://github.com/nextcloud/files_downloadlimit) app for Nextcloud server.
 ///
-public class NKDownloadLimit: NSObject {
+public struct NKDownloadLimit: Sendable {
     ///
     /// The number of downloads which already happened.
     ///
@@ -25,7 +25,7 @@
     ///
     public let token: String
 
     init(count: Int, limit: Int, token: String) {
         self.count = count
         self.limit = limit
         self.token = token

Sources/NextcloudKit/Models/NKFile.swift

@@ -5,7 +5,7 @@
 
 import Foundation
 
-public class NKFile: NSObject {
+public struct NKFile: Sendable {
     public var account = ""
     public var classFile = ""
     public var commentsUnread: Bool = false

Sources/NextcloudKit/Models/NKFileProperty.swift

@@ -5,9 +5,18 @@
 
 import Foundation
 
+#if swift(<6.0)
 public class NKFileProperty: NSObject {
     public var classFile: String = ""
     public var iconName: String = ""
     public var name: String = ""
     public var ext: String = ""
 }
+#else
+public struct NKFileProperty: Sendable {
+    public var classFile: String = ""
+    public var iconName: String = ""
+    public var name: String = ""
+    public var ext: String = ""
+}
+#endif

Sources/NextcloudKit/NKCommon.swift

@@ -12,7 +12,7 @@
 import CoreServices
 #endif
 
-public protocol NextcloudKitDelegate {
+public protocol NextcloudKitDelegate: Sendable {
     func authenticationChallenge(_ session: URLSession, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
     func urlSessionDidFinishEvents(forBackgroundURLSession session: URLSession)
 
@@ -29,7 +29,7 @@
     func request<Value>(_ request: DataRequest, didParseResponse response: AFDataResponse<Value>)
 }
 
-public class NKCommon: NSObject {
+public struct NKCommon: Sendable {
     public var nksessions = ThreadSafeArray<NKSession>()
     public var delegate: NextcloudKitDelegate?
 
@@ -82,7 +82,7 @@
         case xls = "xls"
     }
 
-    public struct UTTypeConformsToServer {
+    public struct UTTypeConformsToServer: Sendable {
         var typeIdentifier: String
         var classFile: String
         var editor: String
@@ -91,9 +91,15 @@
         var account: String
     }
 
+#if swift(<6.0)
     internal var utiCache = NSCache<NSString, CFString>()
     internal var mimeTypeCache = NSCache<CFString, NSString>()
     internal var filePropertiesCache = NSCache<CFString, NKFileProperty>()
+#else
+    internal var utiCache = [String: String]()
+    internal var mimeTypeCache = [String: String]()
+    internal var filePropertiesCache = [String: NKFileProperty]()
+#endif
     internal var internalTypeIdentifiers = ThreadSafeArray<UTTypeConformsToServer>()
 
     public var filenamePathLog: String = ""
@@ -133,56 +139,77 @@
 
     // MARK: - Init
 
-    override init() {
-        super.init()
-
+    init() {
         filenamePathLog = internalPathLog + "/" + internalFilenameLog
     }
 
     // MARK: - Type Identifier
 
-    public func clearInternalTypeIdentifier(account: String) {
+    mutating public func clearInternalTypeIdentifier(account: String) {
         internalTypeIdentifiers = internalTypeIdentifiers.filter({ $0.account != account })
     }
 
-    public func addInternalTypeIdentifier(typeIdentifier: String, classFile: String, editor: String, iconName: String, name: String, account: String) {
+    mutating public func addInternalTypeIdentifier(typeIdentifier: String, classFile: String, editor: String, iconName: String, name: String, account: String) {
         if !internalTypeIdentifiers.contains(where: { $0.typeIdentifier == typeIdentifier && $0.editor == editor && $0.account == account}) {
             let newUTI = UTTypeConformsToServer(typeIdentifier: typeIdentifier, classFile: classFile, editor: editor, iconName: iconName, name: name, account: account)
             internalTypeIdentifiers.append(newUTI)
         }
     }
 
-    public func getInternalType(fileName: String, mimeType: String, directory: Bool, account: String) -> (mimeType: String, classFile: String, iconName: String, typeIdentifier: String, fileNameWithoutExt: String, ext: String) {
+    mutating public func getInternalType(fileName: String, mimeType: String, directory: Bool, account: String) -> (mimeType: String, classFile: String, iconName: String, typeIdentifier: String, fileNameWithoutExt: String, ext: String) {
         var ext = (fileName as NSString).pathExtension.lowercased()
         var mimeType = mimeType
         var classFile = "", iconName = "", typeIdentifier = "", fileNameWithoutExt = ""
         var inUTI: CFString?
 
+#if swift(<6.0)
         if let cachedUTI = utiCache.object(forKey: ext as NSString) {
             inUTI = cachedUTI
-        } else {
+        }
+#else
+        if let cachedUTI = utiCache[ext] {
+            inUTI = cachedUTI as CFString
+        }
+#endif
+        if inUTI == nil {
             if let unmanagedFileUTI = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, ext as CFString, nil) {
                 inUTI = unmanagedFileUTI.takeRetainedValue()
                 if let inUTI {
+#if swift(<6.0)
                     utiCache.setObject(inUTI, forKey: ext as NSString)
+#else
+                    utiCache[ext] = inUTI as String
+#endif
                 }
             }
         }
 
-        if let inUTI = inUTI {
+        if let inUTI {
             typeIdentifier = inUTI as String
             fileNameWithoutExt = (fileName as NSString).deletingPathExtension
 
             // contentType detect
             if mimeType.isEmpty {
+#if swift(<6.0)
                 if let cachedMimeUTI = mimeTypeCache.object(forKey: inUTI) {
                     mimeType = cachedMimeUTI as String
-                } else {
+                }
+#else
+                if let cachedMimeUTI = mimeTypeCache[inUTI as String] {
+                    mimeType = cachedMimeUTI
+                }
+#endif
+
+                if mimeType.isEmpty {
                     if let mimeUTI = UTTypeCopyPreferredTagWithClass(inUTI, kUTTagClassMIMEType) {
                         let mimeUTIString = mimeUTI.takeRetainedValue() as String
 
                         mimeType = mimeUTIString
+#if swift(<6.0)
                         mimeTypeCache.setObject(mimeUTIString as NSString, forKey: inUTI)
+#else
+                        mimeTypeCache[inUTI as String] = mimeUTIString as String
+#endif
                     }
                 }
             }
@@ -197,12 +224,21 @@
             } else {
                 var fileProperties: NKFileProperty
 
+#if swift(<6.0)
                 if let cachedFileProperties = filePropertiesCache.object(forKey: inUTI) {
                     fileProperties = cachedFileProperties
                 } else {
                     fileProperties = getFileProperties(inUTI: inUTI)
                     filePropertiesCache.setObject(fileProperties, forKey: inUTI)
                 }
+#else
+                if let cachedFileProperties = filePropertiesCache[inUTI as String] {
+                    fileProperties = cachedFileProperties
+                } else {
+                    fileProperties = getFileProperties(inUTI: inUTI)
+                    filePropertiesCache[inUTI as String] = fileProperties
+                }
+#endif
 
                 classFile = fileProperties.classFile
                 iconName = fileProperties.iconName
@@ -212,7 +248,7 @@
     }
 
     public func getFileProperties(inUTI: CFString) -> NKFileProperty {
-        let fileProperty = NKFileProperty()
+        var fileProperty = NKFileProperty()
         let typeIdentifier: String = inUTI as String
 
         if let fileExtension = UTTypeCopyPreferredTagWithClass(inUTI as CFString, kUTTagClassFilenameExtension) {

Sources/NextcloudKit/NKDataFileXML.swift

@@ -7,7 +7,7 @@
 import SwiftyXMLParser
 
 class NKDataFileXML: NSObject {
-    let nkCommonInstance: NKCommon
+    var nkCommonInstance: NKCommon
     let requestBodyComments =
     """
     <?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -297,7 +297,7 @@
         return xml["ocs", "data", "apppassword"].text
     }
 
     func convertDataFile(xmlData: Data, nkSession: NKSession, showHiddenFiles: Bool, includeHiddenFiles: [String]) -> [NKFile] {
         var files: [NKFile] = []
         let rootFiles = "/" + nkSession.dav + "/files/"
         guard let baseUrl = self.nkCommonInstance.getHostName(urlString: nkSession.urlBase) else {
@@ -307,7 +307,7 @@
         let elements = xml["d:multistatus", "d:response"]
 
         for element in elements {
-            let file = NKFile()
+            var file = NKFile()
             if let href = element["d:href"].text {
                 var fileNamePath = href
                 if href.last == "/" {
@@ -577,7 +577,7 @@
                 file.downloadLimits.append(NKDownloadLimit(count: count, limit: limit, token: token))
             }
 
-            let results = self.nkCommonInstance.getInternalType(fileName: file.fileName, mimeType: file.contentType, directory: file.directory, account: nkSession.account)
+            var results = self.nkCommonInstance.getInternalType(fileName: file.fileName, mimeType: file.contentType, directory: file.directory, account: nkSession.account)
 
             file.contentType = results.mimeType
             file.iconName = results.iconName

Sources/NextcloudKit/NKError.swift

@@ -32,7 +32,7 @@
     static var ocsXMLMsg: Self { ["d:error", "s:message"] }
 }
 
-public class NKError: NSObject {
+public struct NKError: Sendable, Equatable {
     static let internalError = -9999
     // Chunk error
     public static let chunkNoEnoughMemory = -9998
@@ -159,7 +159,7 @@
         self.responseData = responseData
     }
 
-    convenience init(httpResponse: HTTPURLResponse) {
+    init(httpResponse: HTTPURLResponse) {
         self.init(statusCode: httpResponse.statusCode, fallbackDescription: httpResponse.description)
     }
 
@@ -181,7 +181,7 @@
         self.error = NSError(domain: NSCocoaErrorDomain, code: self.errorCode, userInfo: [NSLocalizedDescriptionKey: self.errorDescription])
     }
 
-    public convenience init<T: AFResponse>(error: AFError?, afResponse: T, responseData: Data? = nil) {
+    public init<T: AFResponse>(error: AFError?, afResponse: T, responseData: Data? = nil) {
         if let errorCode = afResponse.response?.statusCode {
             guard let dataResponse = afResponse as? Alamofire.DataResponse<T.Success, T.Failure>,
                   let errorData = dataResponse.data
@@ -216,9 +216,13 @@
         }
     }
 
-    public override func isEqual(_ object: Any?) -> Bool {
-        if let object = object as? NKError {
-            return self.errorCode == object.errorCode && self.errorDescription == object.errorDescription
+    public static func == (lhs: NKError, rhs: NKError) -> Bool {
+        return lhs.errorCode == rhs.errorCode && lhs.errorDescription == rhs.errorDescription
+    }
+
+    public static func == (lhs: NKError, rhs: NKError?) -> Bool {
+        if let rhs {
+            return lhs == rhs;
         }
         return false
     }

Sources/NextcloudKit/NKSession.swift

@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import Foundation
-import Alamofire
+@preconcurrency import Alamofire
 
-public class NKSession {
+public struct NKSession: Sendable {
     public var urlBase: String
     public var user: String
     public var userId: String
@@ -26,7 +26,8 @@ public class NKSession {
     public let sessionUploadBackgroundWWan: URLSession
     public let sessionUploadBackgroundExt: URLSession
 
-    init(urlBase: String,
+    init(nkCommonInstance: NKCommon,
+         urlBase: String,
          user: String,
          userId: String,
          password: String,
@@ -51,7 +52,7 @@ public class NKSession {
         self.httpMaximumConnectionsPerHostInUpload = httpMaximumConnectionsPerHostInUpload
         self.requestCachePolicy = requestCachePolicy
 
-        let backgroundSessionDelegate = NKBackground(nkCommonInstance: NextcloudKit.shared.nkCommonInstance)
+        let backgroundSessionDelegate = NKBackground(nkCommonInstance: nkCommonInstance)
         /// Strange but works ?!?!
         let sharedCookieStorage = user + "@" + urlBase
 
@@ -66,11 +67,11 @@ public class NKSession {
 
         configuration.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: sharedCookieStorage)
         sessionData = Alamofire.Session(configuration: configuration,
-                                        delegate: NextcloudKitSessionDelegate(nkCommonInstance: NextcloudKit.shared.nkCommonInstance),
-                                        rootQueue: NextcloudKit.shared.nkCommonInstance.rootQueue,
-                                        requestQueue: NextcloudKit.shared.nkCommonInstance.requestQueue,
-                                        serializationQueue: NextcloudKit.shared.nkCommonInstance.serializationQueue,
-                                        eventMonitors: [NKLogger(nkCommonInstance: NextcloudKit.shared.nkCommonInstance)])
+                                        delegate: NextcloudKitSessionDelegate(nkCommonInstance: nkCommonInstance),
+                                        rootQueue: nkCommonInstance.rootQueue,
+                                        requestQueue: nkCommonInstance.requestQueue,
+                                        serializationQueue: nkCommonInstance.serializationQueue,
+                                        eventMonitors: [NKLogger(nkCommonInstance: nkCommonInstance)])
 
         /// Session Download Background
         let configurationDownloadBackground = URLSessionConfiguration.background(withIdentifier: NKCommon().identifierSessionDownloadBackground)

Sources/NextcloudKit/NextcloudKit+API.swift

@@ -379,7 +379,19 @@ public extension NextcloudKit {
                             #else
 
                             #if os(iOS)
-                            let screenScale = UIScreen.main.scale
+                            var screenScale = 1.0
+                            if #available(iOS 13.0, *) {
+                                let semaphore = DispatchSemaphore(value: 0)
+                                Task {
+                                    screenScale = await UIScreen.main.scale
+                                    semaphore.signal()
+                                }
+                                semaphore.wait()
+                            } else {
+                                #if swift(<6.0)
+                                screenScale = UIScreen.main.scale
+                                #endif
+                            }
                             #else
                             let screenScale = 1.0
                             #endif

Sources/NextcloudKit/NextcloudKit+Upload.swift

@@ -161,7 +161,7 @@ public extension NextcloudKit {
                 if error == .success {
                     completion(NKError())
                 } else if error.errorCode == 404 {
-                    NextcloudKit.shared.createFolder(serverUrlFileName: serverUrlChunkFolder, account: account, options: options) { _, _, _, _, error in
+                    self.createFolder(serverUrlFileName: serverUrlChunkFolder, account: account, options: options) { _, _, _, _, error in
                         completion(error)
                     }
                 } else {