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

improved isTaskProcessing

Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com>
Marino Faggiana 1 жил өмнө
parent
commit
43543c9c59

+ 9 - 10
iOSClient/AppDelegate.swift

@@ -62,8 +62,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     let unifiedSearchQueue = Queuer(name: "unifiedSearchQueue", maxConcurrentOperationCount: 1, qualityOfService: .default)
     let unifiedSearchQueue = Queuer(name: "unifiedSearchQueue", maxConcurrentOperationCount: 1, qualityOfService: .default)
     let saveLivePhotoQueue = Queuer(name: "saveLivePhotoQueue", maxConcurrentOperationCount: 1, qualityOfService: .default)
     let saveLivePhotoQueue = Queuer(name: "saveLivePhotoQueue", maxConcurrentOperationCount: 1, qualityOfService: .default)
 
 
-    var isAppRefresh: Bool = false
-    var isAppProcessing: Bool = false
+    var isTaskProcessing: Bool = false
 
 
     var isUiTestingEnabled: Bool {
     var isUiTestingEnabled: Bool {
         return ProcessInfo.processInfo.arguments.contains("UI_TESTING")
         return ProcessInfo.processInfo.arguments.contains("UI_TESTING")
@@ -343,19 +342,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     func handleAppRefresh(_ task: BGTask) {
     func handleAppRefresh(_ task: BGTask) {
         scheduleAppRefresh()
         scheduleAppRefresh()
 
 
-        if isAppProcessing {
-            NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Processing task already in progress, abort.")
+        if isTaskProcessing {
+            NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Task already in progress, abort.")
             task.setTaskCompleted(success: true)
             task.setTaskCompleted(success: true)
             return
             return
         }
         }
-        isAppRefresh = true
+        isTaskProcessing = true
 
 
         NCAutoUpload.shared.initAutoUpload(viewController: nil) { items in
         NCAutoUpload.shared.initAutoUpload(viewController: nil) { items in
             NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Refresh task auto upload with \(items) uploads")
             NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Refresh task auto upload with \(items) uploads")
             NCNetworkingProcessUpload.shared.start { items in
             NCNetworkingProcessUpload.shared.start { items in
                 NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Refresh task upload process with \(items) uploads")
                 NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Refresh task upload process with \(items) uploads")
                 task.setTaskCompleted(success: true)
                 task.setTaskCompleted(success: true)
-                self.isAppRefresh = false
+                self.isTaskProcessing = false
             }
             }
         }
         }
     }
     }
@@ -363,19 +362,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     func handleProcessingTask(_ task: BGTask) {
     func handleProcessingTask(_ task: BGTask) {
         scheduleAppProcessing()
         scheduleAppProcessing()
 
 
-        if isAppRefresh {
-            NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Refresh task already in progress, abort.")
+        if isTaskProcessing {
+            NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Task already in progress, abort.")
             task.setTaskCompleted(success: true)
             task.setTaskCompleted(success: true)
             return
             return
         }
         }
-        isAppProcessing = true
+        isTaskProcessing = true
 
 
         NCAutoUpload.shared.initAutoUpload(viewController: nil) { items in
         NCAutoUpload.shared.initAutoUpload(viewController: nil) { items in
             NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Processing task auto upload with \(items) uploads")
             NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Processing task auto upload with \(items) uploads")
             NCNetworkingProcessUpload.shared.start { items in
             NCNetworkingProcessUpload.shared.start { items in
                 NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Processing task upload process with \(items) uploads")
                 NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Processing task upload process with \(items) uploads")
                 task.setTaskCompleted(success: true)
                 task.setTaskCompleted(success: true)
-                self.isAppProcessing = false
+                self.isTaskProcessing = false
             }
             }
         }
         }
     }
     }