rollback

PickerFileProvider/FileProviderData.swift

@@ -25,56 +25,13 @@ import FileProvider
 
 class FileProviderData: NSObject {
     
-    private var account = ""
-    private var accountUser = ""
-    private var accountUserID = ""
-    private var accountPassword = ""
-    private var accountUrl = ""
-    private var homeServerUrl = ""
-    private var directoryUser = ""
-    
-    // Return var in trade-safe
-    func getAccount() -> String {
-        var returnString = ""
-        queueTradeSafe.sync { returnString = self.account }
-        return returnString
-    }
-    
-    func getAccountUser() -> String {
-        var returnString = ""
-        queueTradeSafe.sync { returnString = self.accountUser }
-        return returnString
-    }
-    
-    func getAccountUserID() -> String {
-        var returnString = ""
-        queueTradeSafe.sync { returnString = self.accountUserID }
-        return returnString
-    }
-    
-    func getAccountPassword() -> String {
-        var returnString = ""
-        queueTradeSafe.sync { returnString = self.accountPassword }
-        return returnString
-    }
-    
-    func getAccountUrl() -> String {
-        var returnString = ""
-        queueTradeSafe.sync { returnString = self.accountUrl }
-        return returnString
-    }
-    
-    func getHomeServerUrl() -> String {
-        var returnString = ""
-        queueTradeSafe.sync { returnString = self.homeServerUrl }
-        return returnString
-    }
-    
-    func getDirectoryUser() -> String {
-        var returnString = ""
-        queueTradeSafe.sync { returnString = self.directoryUser }
-        return returnString
-    }
+    var account = ""
+    var accountUser = ""
+    var accountUserID = ""
+    var accountPassword = ""
+    var accountUrl = ""
+    var homeServerUrl = ""
+    var directoryUser = ""
     
     // Directory
     var groupURL: URL?

PickerFileProvider/FileProviderEnumerator.swift

@@ -39,12 +39,12 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
         if #available(iOSApplicationExtension 11.0, *) {
 
             if (enumeratedItemIdentifier == .rootContainer) {
-                serverUrl = providerData.getHomeServerUrl()
+                serverUrl = providerData.homeServerUrl
             } else {
                 
                 let metadata = providerData.getTableMetadataFromItemIdentifier(enumeratedItemIdentifier)
                 if metadata != nil  {
-                    if let directorySource = NCManageDatabase.sharedInstance.getTableDirectory(predicate: NSPredicate(format: "account = %@ AND directoryID = %@", providerData.getAccount(), metadata!.directoryID))  {
+                    if let directorySource = NCManageDatabase.sharedInstance.getTableDirectory(predicate: NSPredicate(format: "account = %@ AND directoryID = %@", providerData.account, metadata!.directoryID))  {
                         serverUrl = directorySource.serverUrl + "/" + metadata!.fileName
                     }
                 }
@@ -74,10 +74,10 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             var itemIdentifierMetadata = [NSFileProviderItemIdentifier:tableMetadata]()
             
             // ***** Tags *****
-            let tags = NCManageDatabase.sharedInstance.getTags(predicate: NSPredicate(format: "account = %@", providerData.getAccount()))
+            let tags = NCManageDatabase.sharedInstance.getTags(predicate: NSPredicate(format: "account = %@", providerData.account))
             for tag in tags {
                 
-                guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", providerData.getAccount(), tag.fileID))  else {
+                guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", providerData.account, tag.fileID))  else {
                     continue
                 }
                 
@@ -90,7 +90,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             listFavoriteIdentifierRank = NCManageDatabase.sharedInstance.getTableMetadatasDirectoryFavoriteIdentifierRank()
             for (identifier, _) in listFavoriteIdentifierRank {
              
-                guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", providerData.getAccount(), identifier)) else {
+                guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", providerData.account, identifier)) else {
                     continue
                 }
                
@@ -117,8 +117,8 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
         }
             
         // Select items from database
-        if let directory = NCManageDatabase.sharedInstance.getTableDirectory(predicate: NSPredicate(format: "account = %@ AND serverUrl = %@", providerData.getAccount(), serverUrl))  {
-            metadatas = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account = %@ AND directoryID = %@", providerData.getAccount(), directory.directoryID), sorted: "fileName", ascending: true)
+        if let directory = NCManageDatabase.sharedInstance.getTableDirectory(predicate: NSPredicate(format: "account = %@ AND serverUrl = %@", providerData.account, serverUrl))  {
+            metadatas = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account = %@ AND directoryID = %@", providerData.account, directory.directoryID), sorted: "fileName", ascending: true)
         }
             
         // Calculate current page
@@ -127,7 +127,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             var numPage = Int(String(data: page.rawValue, encoding: .utf8)!)!
                 
             if (metadatas != nil) {
-                items = self.selectItems(numPage: numPage, account: providerData.getAccount(), metadatas: metadatas!)
+                items = self.selectItems(numPage: numPage, account: providerData.account, metadatas: metadatas!)
                 observer.didEnumerate(items)
             }
             if (items.count == self.recordForPage) {
@@ -140,14 +140,14 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             return
         }
             
-        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.getAccountUser(), withUserID: providerData.getAccountUserID(), withPassword: providerData.getAccountPassword(), withUrl: providerData.getAccountUrl())
-        ocNetworking?.readFolder(serverUrl, depth: "1", account: providerData.getAccount(), success: { (metadatas, metadataFolder, directoryID) in
-                
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
+        ocNetworking?.readFolder(serverUrl, depth: "1", account: providerData.account, success: { (metadatas, metadataFolder, directoryID) in
+            
             if (metadatas != nil) {
-                NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "account = %@ AND directoryID = %@ AND session = ''", self.providerData.getAccount(), directoryID!), clearDateReadDirectoryID: directoryID!)
+                NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "account = %@ AND directoryID = %@ AND session = ''", self.providerData.account, directoryID!), clearDateReadDirectoryID: directoryID!)
                 _ = NCManageDatabase.sharedInstance.addMetadatas(metadatas as! [tableMetadata], serverUrl: serverUrl)
-                if let metadataDB = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account = %@ AND directoryID = %@", self.providerData.getAccount(), directoryID!), sorted: "fileName", ascending: true) {
-                    items = self.selectItems(numPage: 0, account: self.providerData.getAccount(), metadatas: metadataDB)
+                if let metadataDB = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account = %@ AND directoryID = %@", self.providerData.account, directoryID!), sorted: "fileName", ascending: true) {
+                    items = self.selectItems(numPage: 0, account: self.providerData.account, metadatas: metadataDB)
                     if (items.count > 0) {
                         observer.didEnumerate(items)
                     }
@@ -165,7 +165,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
                 
             // select item from database
             if (metadatas != nil) {
-                items = self.selectItems(numPage: 0, account: self.providerData.getAccount(), metadatas: metadatas!)
+                items = self.selectItems(numPage: 0, account: self.providerData.account, metadatas: metadatas!)
                 observer.didEnumerate(items)
             }
             if (items.count == self.recordForPage) {
@@ -183,7 +183,6 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
     
         var itemsDelete = [NSFileProviderItemIdentifier]()
         var itemsUpdate = [FileProviderItem]()
-        let activeAccount = providerData.getAccount()
         
         // Report the deleted items
         //
@@ -213,7 +212,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             queueTradeSafe.sync() {
                 for (itemIdentifier, item) in fileProviderSignalUpdateWorkingSetItem {
                     let account = providerData.getAccountFromItemIdentifier(itemIdentifier)
-                    if account != nil && account == activeAccount {
+                    if account != nil && account == providerData.account {
                         itemsUpdate.append(item)
                     } else {
                         itemsDelete.append(itemIdentifier)
@@ -227,7 +226,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             queueTradeSafe.sync(flags: .barrier) {
                 for (itemIdentifier, item) in fileProviderSignalUpdateContainerItem {
                     let account = providerData.getAccountFromItemIdentifier(itemIdentifier)
-                    if account != nil && account == activeAccount {
+                    if account != nil && account == providerData.account {
                         itemsUpdate.append(item)
                     } else {
                         itemsDelete.append(itemIdentifier)

PickerFileProvider/FileProviderExtension+Actions.swift

@@ -43,12 +43,12 @@ extension FileProviderExtension {
         
         let serverUrl = tableDirectory.serverUrl
         
-        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.getAccountUser(), withUserID: providerData.getAccountUserID(), withPassword: providerData.getAccountPassword(), withUrl: providerData.getAccountUrl())
-        ocNetworking?.createFolder(directoryName, serverUrl: serverUrl, account: providerData.getAccount(), success: { (fileID, date) in
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
+        ocNetworking?.createFolder(directoryName, serverUrl: serverUrl, account: providerData.account, success: { (fileID, date) in
             
             let metadata = tableMetadata()
             
-            metadata.account = self.providerData.getAccount()
+            metadata.account = self.providerData.account
             metadata.directory = true
             metadata.directoryID = NCManageDatabase.sharedInstance.getDirectoryID(serverUrl)!
             metadata.fileID = fileID!
@@ -171,7 +171,7 @@ extension FileProviderExtension {
         let directoryIDTo = NCManageDatabase.sharedInstance.getDirectoryID(serverUrlTo)!
         let fileNameTo = serverUrlTo + "/" + itemFrom.filename
         
-        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.getAccountUser(), withUserID: providerData.getAccountUserID(), withPassword: providerData.getAccountPassword(), withUrl: providerData.getAccountUrl())
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
         ocNetworking?.moveFileOrFolder(fileNameFrom, fileNameTo: fileNameTo, success: {
             
             if metadataFrom.directory {
@@ -184,7 +184,7 @@ extension FileProviderExtension {
                 NCManageDatabase.sharedInstance.moveMetadata(fileName: metadataFrom.fileName, directoryID: metadataFrom.directoryID, directoryIDTo: directoryIDTo)
             }
             
-            guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", self.providerData.getAccount(), fileIDFrom)) else {
+            guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", self.providerData.account, fileIDFrom)) else {
                 completionHandler(nil, NSFileProviderError(.noSuchItem))
                 return
             }
@@ -235,7 +235,7 @@ extension FileProviderExtension {
         let fileNamePathFrom = serverUrl + "/" + fileNameFrom
         let fileNamePathTo = serverUrl + "/" + itemName
         
-        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.getAccountUser(), withUserID: providerData.getAccountUserID(), withPassword: providerData.getAccountPassword(), withUrl: providerData.getAccountUrl())
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
         ocNetworking?.moveFileOrFolder(fileNamePathFrom, fileNameTo: fileNamePathTo, success: {
             
             // Rename metadata
@@ -430,7 +430,7 @@ extension FileProviderExtension {
         // ---------------------------------------------------------------------------------
             
         // Metadata TEMP
-        metadata.account = self.providerData.getAccount()
+        metadata.account = self.providerData.account
         metadata.assetLocalIdentifier = providerData.FILEID_IMPORT_METADATA_TEMP + tableDirectory.directoryID + fileName
         metadata.date = NSDate()
         metadata.directory = false
@@ -447,7 +447,7 @@ extension FileProviderExtension {
                 
             let metadataNet = CCMetadataNet()
                 
-            metadataNet.account = self.providerData.getAccount()
+            metadataNet.account = self.providerData.account
             metadataNet.assetLocalIdentifier = providerData.FILEID_IMPORT_METADATA_TEMP + tableDirectory.directoryID + fileName
             metadataNet.fileName = fileName
             metadataNet.path = fileNamePathDirectory + "/" + fileName
@@ -486,7 +486,7 @@ extension FileProviderExtension {
             
             while exitLoop == false {
                 
-                if NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileNameView = %@ AND directoryID = %@", providerData.getAccount(), resultFileName, directoryID)) != nil {
+                if NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileNameView = %@ AND directoryID = %@", providerData.account, resultFileName, directoryID)) != nil {
                     
                     var name = NSString(string: resultFileName).deletingPathExtension
                     let ext = NSString(string: resultFileName).pathExtension

PickerFileProvider/FileProviderExtension+Network.swift

@@ -34,7 +34,7 @@ extension FileProviderExtension {
         /* ONLY iOS 11*/
         guard #available(iOS 11, *) else { return }
         
-        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.getAccountUser(), withUserID: providerData.getAccountUserID(), withPassword: providerData.getAccountPassword(), withUrl: providerData.getAccountUrl())
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
         ocNetworking?.deleteFileOrFolder(metadata.fileName, serverUrl: serverUrl, success: {
             
             self.deleteFileSystem(for: metadata, serverUrl: serverUrl, itemIdentifier: itemIdentifier)
@@ -53,7 +53,7 @@ extension FileProviderExtension {
     
     func deleteFileSystem(for metadata: tableMetadata, serverUrl: String, itemIdentifier: NSFileProviderItemIdentifier) {
         
-        let fileNamePath = self.providerData.getDirectoryUser() + "/" + metadata.fileID
+        let fileNamePath = self.providerData.directoryUser + "/" + metadata.fileID
         do {
             try self.fileManager.removeItem(atPath: fileNamePath)
         } catch let error {
@@ -92,9 +92,9 @@ extension FileProviderExtension {
             return
         }
         
-        let fileNamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: serverUrl, activeUrl: self.providerData.getAccountUrl())
+        let fileNamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: serverUrl, activeUrl: self.providerData.accountUrl)
 
-        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.getAccountUser(), withUserID: providerData.getAccountUserID(), withPassword: providerData.getAccountPassword(), withUrl: providerData.getAccountUrl())
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
         ocNetworking?.settingFavorite(fileNamePath, favorite: favorite, success: {
                     
             // Change DB
@@ -151,7 +151,7 @@ extension FileProviderExtension {
         /* ONLY iOS 11*/
         guard #available(iOS 11, *) else { return }
         
-        guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", providerData.getAccount(), fileID)) else {
+        guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", providerData.account, fileID)) else {
             return
         }
         
@@ -184,7 +184,7 @@ extension FileProviderExtension {
             if (selectorPost == providerData.selectorPostItemChanged) {
                 
                 let filePathItemIdentifier = providerData.fileProviderStorageURL!.path + "/" + providerData.getItemIdentifier(metadata: metadata).rawValue + "/" + metadata.fileName
-                _ = self.copyFile(filePathItemIdentifier, toPath: providerData.getDirectoryUser() + "/" + metadata.fileID)
+                _ = self.copyFile(filePathItemIdentifier, toPath: providerData.directoryUser + "/" + metadata.fileID)
             }
             
             NCManageDatabase.sharedInstance.setLocalFile(fileID: fileID, date: nil, exifDate: nil, exifLatitude: nil, exifLongitude: nil, fileName: nil, etag: metadata.etag, etagFPE: metadata.etag)
@@ -254,7 +254,7 @@ extension FileProviderExtension {
             let metadataNetQueue = NCManageDatabase.sharedInstance.lockQueueUpload(selector: selectorUploadFile, withPath: true)
             if  metadataNetQueue != nil {
                 
-                if self.copyFile(metadataNetQueue!.path, toPath: providerData.getDirectoryUser() + "/" + metadataNetQueue!.fileName) == nil {
+                if self.copyFile(metadataNetQueue!.path, toPath: providerData.directoryUser + "/" + metadataNetQueue!.fileName) == nil {
                     
                     CCNetworking.shared().uploadFile(metadataNetQueue!.fileName, serverUrl: metadataNetQueue!.serverUrl, fileID: metadataNetQueue!.assetLocalIdentifier, assetLocalIdentifier: metadataNetQueue!.assetLocalIdentifier, session: metadataNetQueue!.session, taskStatus: metadataNetQueue!.taskStatus, selector: metadataNetQueue!.selector, selectorPost: metadataNetQueue!.selectorPost, errorCode: 0, delegate: self)
                     
@@ -282,7 +282,7 @@ extension FileProviderExtension {
             return
         }
         
-        _ = self.copyFile(url.path, toPath: providerData.getDirectoryUser() + "/" + metadata.fileID)
+        _ = self.copyFile(url.path, toPath: providerData.directoryUser + "/" + metadata.fileID)
         
         CCNetworking.shared().uploadFileMetadata(metadataForUpload, taskStatus: Int(k_taskStatusResume), delegate: self)
     }
@@ -291,7 +291,7 @@ extension FileProviderExtension {
         
         let tasks = CCNetworking.shared().getUploadTasksExtensionSession()
         if tasks!.count == 0 {
-            let records = NCManageDatabase.sharedInstance.getQueueUpload(predicate: NSPredicate(format: "account = %@ AND selector = %@ AND lock == true AND path != nil", providerData.getAccount(), selectorUploadFile))
+            let records = NCManageDatabase.sharedInstance.getQueueUpload(predicate: NSPredicate(format: "account = %@ AND selector = %@ AND lock == true AND path != nil", providerData.account, selectorUploadFile))
             if records != nil && records!.count > 0 {
                 NCManageDatabase.sharedInstance.unlockAllQueueUploadWithPath()
             }

PickerFileProvider/FileProviderExtension+Thumbnail.swift

@@ -32,14 +32,14 @@ extension FileProviderExtension {
                 if (metadata!.typeFile == k_metadataTypeFile_image || metadata!.typeFile == k_metadataTypeFile_video) {
                     
                     let serverUrl = NCManageDatabase.sharedInstance.getServerUrl(metadata!.directoryID)
-                    let fileName = CCUtility.returnFileNamePath(fromFileName: metadata!.fileName, serverUrl: serverUrl, activeUrl: providerData.getAccountUrl())
+                    let fileName = CCUtility.returnFileNamePath(fromFileName: metadata!.fileName, serverUrl: serverUrl, activeUrl: providerData.accountUrl)
                     let fileNameLocal = metadata!.fileID
                     
-                    let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.getAccountUser(), withUserID: providerData.getAccountUserID(), withPassword: providerData.getAccountPassword(), withUrl: providerData.getAccountUrl())
+                    let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
                     ocNetworking?.downloadThumbnail(withDimOfThumbnail: "m", fileName: fileName, fileNameLocal: fileNameLocal, success: {
                         
                         do {
-                            let url = URL.init(fileURLWithPath: self.providerData.getDirectoryUser()+"/"+metadata!.fileID+".ico")
+                            let url = URL.init(fileURLWithPath: self.providerData.directoryUser+"/"+metadata!.fileID+".ico")
                             let data = try Data.init(contentsOf: url)
                             perThumbnailCompletionHandler(itemIdentifier, data, nil)
                         } catch let error {

PickerFileProvider/FileProviderExtension.swift

@@ -181,7 +181,7 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
         // (ADD)
         for (identifier, _) in listFavoriteIdentifierRank {
             
-            guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", providerData.getAccount(), identifier)) else {
+            guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", providerData.account, identifier)) else {
                 continue
             }
             
@@ -197,7 +197,7 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
         }
         
         // (REMOVE)
-        let metadatas = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account = %@ AND directory = true AND favorite = false", providerData.getAccount()), sorted: "fileName", ascending: true)
+        let metadatas = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account = %@ AND directory = true AND favorite = false", providerData.account), sorted: "fileName", ascending: true)
         if (metadatas != nil && metadatas!.count > 0) {
             for metadata in metadatas! {
                 guard let parentItemIdentifier = providerData.getParentItemIdentifier(metadata: metadata) else {
@@ -227,11 +227,11 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
         
         if identifier == .rootContainer {
             
-            if let directory = NCManageDatabase.sharedInstance.getTableDirectory(predicate: NSPredicate(format: "account = %@ AND serverUrl = %@", providerData.getAccount(), providerData.getHomeServerUrl())) {
+            if let directory = NCManageDatabase.sharedInstance.getTableDirectory(predicate: NSPredicate(format: "account = %@ AND serverUrl = %@", providerData.account, providerData.homeServerUrl)) {
                     
                 let metadata = tableMetadata()
                     
-                metadata.account = providerData.getAccount()
+                metadata.account = providerData.account
                 metadata.directory = true
                 metadata.directoryID = directory.directoryID
                 metadata.fileID = NSFileProviderItemIdentifier.rootContainer.rawValue
@@ -359,7 +359,7 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
                 return
             }
             
-            let tableLocalFile = NCManageDatabase.sharedInstance.getTableLocalFile(predicate: NSPredicate(format: "account = %@ AND fileID = %@", providerData.getAccount(), metadata.fileID))
+            let tableLocalFile = NCManageDatabase.sharedInstance.getTableLocalFile(predicate: NSPredicate(format: "account = %@ AND fileID = %@", providerData.account, metadata.fileID))
             if tableLocalFile != nil {
                 localEtag = tableLocalFile!.etag
                 localEtagFPE = tableLocalFile!.etagFPE
@@ -369,7 +369,7 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
                 
                 // Verify last version on "Local Table"
                 if localEtag != localEtagFPE {
-                    if self.copyFile(providerData.getDirectoryUser()+"/"+metadata.fileID, toPath: url.path) == nil {
+                    if self.copyFile(providerData.directoryUser+"/"+metadata.fileID, toPath: url.path) == nil {
                         NCManageDatabase.sharedInstance.setLocalFile(fileID: metadata.fileID, date: nil, exifDate: nil, exifLatitude: nil, exifLongitude: nil, fileName: nil, etag: nil, etagFPE: localEtag)
                     }
                 }
@@ -393,17 +393,17 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
             }
             
             // delete prev file + ico on Directory User
-            _ = self.deleteFile("\(providerData.getDirectoryUser())/\(metadata.fileID)")
-            _ = self.deleteFile("\(providerData.getDirectoryUser())/\(metadata.fileID).ico")
+            _ = self.deleteFile("\(providerData.directoryUser)/\(metadata.fileID)")
+            _ = self.deleteFile("\(providerData.directoryUser)/\(metadata.fileID).ico")
 
-            let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.getAccountUser(), withUserID: providerData.getAccountUserID(), withPassword: providerData.getAccountPassword(), withUrl: providerData.getAccountUrl())
-            let task = ocNetworking?.downloadFileNameServerUrl("\(serverUrl)/\(metadata.fileName)", fileNameLocalPath: "\(providerData.getDirectoryUser())/\(metadata.fileID)", communication: CCNetworking.shared().sharedOCCommunicationExtensionDownload(), success: { (lenght, etag, date) in
+            let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
+            let task = ocNetworking?.downloadFileNameServerUrl("\(serverUrl)/\(metadata.fileName)", fileNameLocalPath: "\(providerData.directoryUser)/\(metadata.fileID)", communication: CCNetworking.shared().sharedOCCommunicationExtensionDownload(), success: { (lenght, etag, date) in
                 
                 // remove Task
                 self.outstandingDownloadTasks.removeValue(forKey: url)
 
                 // copy download file to url
-                _ = self.copyFile("\(self.providerData.getDirectoryUser())/\(metadata.fileID)", toPath: url.path)
+                _ = self.copyFile("\(self.providerData.directoryUser)/\(metadata.fileID)", toPath: url.path)
             
                 // update DB Local
                 metadata.date = date! as NSDate