coding

File Provider Extension/FileProviderData.swift

@@ -59,7 +59,7 @@ class fileProviderData: NSObject {
     
     // MARK: - 
     
-    func setupAccount(domain: String?, providerExtension: NSFileProviderExtension) -> tableAccount? {
+    func setupAccount(domain: NSFileProviderDomain?, providerExtension: NSFileProviderExtension) -> tableAccount? {
                 
         if CCUtility.getDisableFilesApp() || NCBrandOptions.sharedInstance.disable_openin_file {
             return nil
@@ -90,7 +90,7 @@ class fileProviderData: NSObject {
             guard let url = NSURL(string: accountActive.urlBase) else { continue }
             guard let host = url.host else { continue }
             let accountDomain = accountActive.userID + " (" + host + ")"
-            if accountDomain == domain {
+            if accountDomain == domain!.identifier.rawValue {
                 
                 let serverVersionMajor = NCManageDatabase.sharedInstance.getCapabilitiesServerInt(account: accountActive.account, elements: NCElementsJSON.shared.capabilitiesVersionMajor)
                 let webDav = NCUtility.shared.getWebDAV(account: accountActive.account)

File Provider Extension/FileProviderExtension+Actions.swift

@@ -37,7 +37,7 @@ extension FileProviderExtension {
         let serverUrlFileName = tableDirectory.serverUrl + "/" + directoryName
         
         // NCCommunication
-        if fileProviderData.sharedInstance.setupAccount(domain: domain?.identifier.rawValue, providerExtension: self) == nil {
+        if fileProviderData.sharedInstance.setupAccount(domain: domain, providerExtension: self) == nil {
             completionHandler(nil, NSFileProviderError(.noSuchItem))
             return
         }
@@ -93,7 +93,7 @@ extension FileProviderExtension {
         let fileName = metadata.fileName;
         
         // NCCommunication
-        if fileProviderData.sharedInstance.setupAccount(domain: domain?.identifier.rawValue, providerExtension: self) == nil {
+        if fileProviderData.sharedInstance.setupAccount(domain: domain, providerExtension: self) == nil {
             completionHandler(NSFileProviderError(.noSuchItem))
             return
         }
@@ -148,7 +148,7 @@ extension FileProviderExtension {
         let fileNameTo = serverUrlTo + "/" + itemFrom.filename
         
         // NCCommunication
-        if fileProviderData.sharedInstance.setupAccount(domain: domain?.identifier.rawValue, providerExtension: self) == nil {
+        if fileProviderData.sharedInstance.setupAccount(domain: domain, providerExtension: self) == nil {
             completionHandler(nil, NSFileProviderError(.noSuchItem))
             return
         }
@@ -195,7 +195,7 @@ extension FileProviderExtension {
         let ocId = metadata.ocId
         
         // NCCommunication
-        if fileProviderData.sharedInstance.setupAccount(domain: domain?.identifier.rawValue, providerExtension: self) == nil {
+        if fileProviderData.sharedInstance.setupAccount(domain: domain, providerExtension: self) == nil {
             completionHandler(nil, NSFileProviderError(.noSuchItem))
             return
         }
@@ -267,7 +267,7 @@ extension FileProviderExtension {
             let fileNamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, account: metadata.account)!
             
             // NCCommunication
-            if fileProviderData.sharedInstance.setupAccount(domain: domain?.identifier.rawValue, providerExtension: self) == nil {
+            if fileProviderData.sharedInstance.setupAccount(domain: domain, providerExtension: self) == nil {
                 completionHandler(nil, NSFileProviderError(.noSuchItem))
                 return
             }

File Provider Extension/FileProviderExtension+Thumbnail.swift

@@ -45,7 +45,7 @@ extension FileProviderExtension {
                 let fileNameIconLocalPath = CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)!
                     
                 // NCCommunication
-                if fileProviderData.sharedInstance.setupAccount(domain: domain?.identifier.rawValue, providerExtension: self) == nil {
+                if fileProviderData.sharedInstance.setupAccount(domain: domain, providerExtension: self) == nil {
                     completionHandler(nil)
                 }
                 NCCommunication.shared.getPreview(fileNamePath: fileNamePath, widthPreview: Int(k_sizeIcon), heightPreview: Int(k_sizeIcon)) { (account, data, errorCode, errorDescription) in

File Provider Extension/FileProviderExtension.swift

@@ -71,7 +71,7 @@ class FileProviderExtension: NSFileProviderExtension {
         var maybeEnumerator: NSFileProviderEnumerator? = nil
         
         if (containerItemIdentifier != NSFileProviderItemIdentifier.workingSet) {
-            if fileProviderData.sharedInstance.setupAccount(domain: domain?.identifier.rawValue, providerExtension: self) == nil {
+            if fileProviderData.sharedInstance.setupAccount(domain: domain, providerExtension: self) == nil {
                 throw NSError(domain: NSFileProviderErrorDomain, code: NSFileProviderError.notAuthenticated.rawValue, userInfo:[:])
             }
         }
@@ -213,7 +213,7 @@ class FileProviderExtension: NSFileProviderExtension {
         fileProviderData.sharedInstance.signalEnumerator(ocId: metadata.ocId, update: true)
         
         // NCCommunication
-        if fileProviderData.sharedInstance.setupAccount(domain: domain?.identifier.rawValue, providerExtension: self) == nil {
+        if fileProviderData.sharedInstance.setupAccount(domain: domain, providerExtension: self) == nil {
             completionHandler(NSFileProviderError(.noSuchItem))
             return
         }
@@ -329,7 +329,7 @@ class FileProviderExtension: NSFileProviderExtension {
                 var error: NSError?
                 
                 // NCCommunication
-                let account = fileProviderData.sharedInstance.setupAccount(domain: self.domain?.identifier.rawValue, providerExtension: self)
+                let account = fileProviderData.sharedInstance.setupAccount(domain: self.domain, providerExtension: self)
                 if account == nil {
                     completionHandler(nil, NSFileProviderError(.noSuchItem))
                     return

iOSClient/CCGlobal.h

@@ -346,5 +346,5 @@
 // INTERNAL
 // -----------------------------------------------------------------------------------------------------------
 
-#define k_fileProvider_domain                           0
+#define k_fileProvider_domain                           1