Marino Faggiana há 6 anos atrás
pai
commit
0cb76cb4cd

+ 5 - 10
PickerFileProvider/FileProviderExtension+Actions.swift

@@ -115,17 +115,12 @@ extension FileProviderExtension {
             return
         }
         
-        if metadata.sessionSelectorPost != providerData.selectorPostImportDocument {
-            
-            deleteFile(withIdentifier: itemIdentifier, parentItemIdentifier: parentItemIdentifier, metadata: metadata, serverUrl: serverUrl)
-
-        } else {
-            
-            // Delete queue upload for ImportDocument
-            NCManageDatabase.sharedInstance.deleteQueueUpload(assetLocalIdentifier: metadata.assetLocalIdentifier, selector: metadata.sessionSelector)
-            deleteFileSystem(for: metadata, serverUrl: serverUrl, itemIdentifier: itemIdentifier)
-        }
+        // Delete queue upload for ImportDocument (if exists)
+        NCManageDatabase.sharedInstance.deleteQueueUpload(assetLocalIdentifier: metadata.assetLocalIdentifier, selector: metadata.sessionSelector)
         
+        //
+        deleteFile(withIdentifier: itemIdentifier, parentItemIdentifier: parentItemIdentifier, metadata: metadata, serverUrl: serverUrl)
+       
         // return immediately
         queueTradeSafe.sync(flags: .barrier) {
             fileProviderSignalDeleteContainerItemIdentifier[itemIdentifier] = itemIdentifier

+ 8 - 1
PickerFileProvider/FileProviderExtension+Network.swift

@@ -226,7 +226,14 @@ extension FileProviderExtension {
                 }
             }
             
-            let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier, providerData: providerData)
+            // remove session data
+            metadata.session = ""
+            metadata.sessionID = ""
+            metadata.sessionSelector = ""
+            metadata.sessionSelectorPost = ""
+            let metadata = NCManageDatabase.sharedInstance.addMetadata(metadata)
+            
+            let item = FileProviderItem(metadata: metadata!, parentItemIdentifier: parentItemIdentifier, providerData: providerData)
             
             queueTradeSafe.sync(flags: .barrier) {
                 fileProviderSignalUpdateContainerItem[item.itemIdentifier] = item

+ 1 - 1
PickerFileProvider/FileProviderItem.swift

@@ -120,7 +120,7 @@ class FileProviderItem: NSObject, NSFileProviderItem {
                 self.isUploaded = false
             }
             
-            // Upload error
+            // Error ?
             if metadata.sessionError != "" {
                 uploadingError = NSError(domain: NSCocoaErrorDomain, code: NSFeatureUnsupportedError, userInfo:[:])
             }