Marino Faggiana 6 rokov pred
rodič
commit
972f3714b2

+ 2 - 8
PickerFileProvider/FileProviderExtension.swift

@@ -359,8 +359,8 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
                 return
             }
             
-            // Upload ?
-            if metadata.fileID.contains(k_uploadSessionID) {
+            // is Upload
+            if metadata.sessionTaskIdentifier > 0 {
                 completionHandler(nil)
                 return
             }
@@ -575,12 +575,6 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
             downloadTask.cancel()
             outstandingDownloadTasks.removeValue(forKey: url)
         }
-        
-        // Upload task
-        if let uploadTask = outstandingUploadTasks[url] {
-            uploadTask.cancel()
-            outstandingUploadTasks.removeValue(forKey: url)
-        }
     }
     
     // --------------------------------------------------------------------------------------------

+ 3 - 5
PickerFileProvider/FileProviderItem.swift

@@ -35,7 +35,7 @@ class FileProviderItem: NSObject, NSFileProviderItem {
             return [ .allowsAddingSubItems, .allowsContentEnumerating, .allowsReading, .allowsDeleting, .allowsRenaming ]
         } else {
             if isUpload {
-                return [ .allowsReading ]
+                return [ ]
             } else {
                 return [ .allowsWriting, .allowsReading, .allowsDeleting, .allowsRenaming, .allowsReparenting ]
             }
@@ -72,8 +72,8 @@ class FileProviderItem: NSObject, NSFileProviderItem {
     var favoriteRank: NSNumber?                                     // Favorite
     
     var isDirectory = false
-    var isUpload = false
     var isDownload = false
+    var isUpload = false
 
     init(metadata: tableMetadata, parentItemIdentifier: NSFileProviderItemIdentifier, providerData: FileProviderData) {
         
@@ -112,10 +112,8 @@ class FileProviderItem: NSObject, NSFileProviderItem {
             }
             
             // Upload
-            if metadata.sessionID != "" {
+            if metadata.sessionTaskIdentifier > 0 {
                 isUpload = true
-            }
-            if isUpload {
                 self.isDownloaded = true
                 self.isMostRecentVersionDownloaded = true
                 self.isUploading = true