marinofaggiana 4 years ago
parent
commit
35dc348578

+ 9 - 5
File Provider Extension/FileProviderExtension+Actions.swift

@@ -59,7 +59,7 @@ extension FileProviderExtension {
                     return
                 }
                 
-                let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier)
+                let item = FileProviderItem(metadata: metadata.freeze(), parentItemIdentifier: parentItemIdentifier)
                 completionHandler(item, nil)
                 
             } else {
@@ -75,7 +75,11 @@ extension FileProviderExtension {
             return
         }
         
+        let ocId = metadata.ocId
         let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
+        let isDirectory = metadata.directory
+        let serverUrl = metadata.serverUrl;
+        let fileName = metadata.fileName;
         
         NCCommunication.shared.deleteFileOrFolder(serverUrlFileName) { (account, errorCode, errorDescription) in
             
@@ -88,13 +92,13 @@ extension FileProviderExtension {
                     print("error: \(error)")
                 }
                 
-                if metadata.directory {
-                    let dirForDelete = CCUtility.stringAppendServerUrl(metadata.serverUrl, addFileName: metadata.fileName)
+                if isDirectory {
+                    let dirForDelete = CCUtility.stringAppendServerUrl(serverUrl, addFileName: fileName)
                     NCManageDatabase.sharedInstance.deleteDirectoryAndSubDirectory(serverUrl: dirForDelete!, account: account)
                 }
                 
-                NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
-                NCManageDatabase.sharedInstance.deleteLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
+                NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", ocId))
+                NCManageDatabase.sharedInstance.deleteLocalFile(predicate: NSPredicate(format: "ocId == %@", ocId))
                 
                 completionHandler(nil)
 

+ 0 - 3
File Provider Extension/FileProviderItem.swift

@@ -147,9 +147,6 @@ class FileProviderItem: NSObject, NSFileProviderItem {
     }
 
     init(metadata: tableMetadata, parentItemIdentifier: NSFileProviderItemIdentifier) {
-        if metadata.isFrozen {
-            print("Frozen")
-        }
         self.metadata = metadata
         self.parentItemIdentifier = parentItemIdentifier
     }