Эх сурвалжийг харах

remove timer + verifyUploadqueue

Marino Faggiana 6 жил өмнө
parent
commit
8dfe09426f

+ 5 - 12
PickerFileProvider/FileProviderExtension+Network.swift

@@ -269,6 +269,11 @@ extension FileProviderExtension {
             if (selectorPost == providerData.selectorPostImportDocument) {
                 
                 NCManageDatabase.sharedInstance.unlockQueueUpload(assetLocalIdentifier: assetLocalIdentifier)
+                
+                DispatchQueue.main.asyncAfter(deadline: .now() + Double(k_timerProcessAutoUploadExtension)) {
+                    
+                    self.uploadFileImportDocument()
+                }
             }
             
             // itemChanged
@@ -343,16 +348,4 @@ extension FileProviderExtension {
         
         CCNetworking.shared().uploadFileMetadata(metadataForUpload, taskStatus: Int(k_taskStatusResume), delegate: self)
     }
-    
-    func verifyUploadQueueInLock() {
-        
-        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.account, selectorUploadFile))
-            if records != nil && records!.count > 0 {
-                NCManageDatabase.sharedInstance.unlockAllQueueUploadWithPath()
-            }
-        }
-    }
-
 }

+ 2 - 17
PickerFileProvider/FileProviderExtension.swift

@@ -23,9 +23,6 @@
 
 import FileProvider
 
-// Timer for Upload (queue)
-var timerUpload: Timer?
-
 /* -----------------------------------------------------------------------------------------------------------------------------------------------
                                                             STRUCT item
    -----------------------------------------------------------------------------------------------------------------------------------------------
@@ -74,21 +71,9 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
         
         _ = providerData.setupActiveAccount()
         
-        verifyUploadQueueInLock()
-        
         if #available(iOSApplicationExtension 11.0, *) {
-                        
-            // Timer for upload
-            if timerUpload == nil {
-                
-                timerUpload = Timer.init(timeInterval: TimeInterval(k_timerProcessAutoUploadExtension), repeats: true, block: { (Timer) in
-                    
-                    // new upload
-                    self.uploadFileImportDocument()
-                })
-                
-                RunLoop.main.add(timerUpload!, forMode: .defaultRunLoopMode)
-            }
+            
+            self.uploadFileImportDocument()
             
         } else {