Browse Source

coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana 2 years ago
parent
commit
42004d1d9a

+ 0 - 3
iOSClient/Networking/NCAutoUpload.swift

@@ -51,9 +51,6 @@ class NCAutoUpload: NSObject {
             }
 
             self.uploadAssetsNewAndFull(viewController: viewController, selector: NCGlobal.shared.selectorUploadAutoUpload, log: "Init Auto Upload") { items in
-                if items > 0 {
-                    self.appDelegate.networkingProcessUpload?.startProcess()
-                }
                 completion(items)
             }
         }

+ 0 - 9
iOSClient/Networking/NCNetworking.swift

@@ -579,15 +579,6 @@ import Photos
             NCManageDatabase.shared.addMetadata(metadata)
             NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", ocIdTemp))
 
-            #if !EXTENSION
-            self.getOcIdInBackgroundSession { listOcId in
-                if listOcId.count == 0 && self.uploadRequest.count == 0 {
-                    let appDelegate = UIApplication.shared.delegate as! AppDelegate
-                    appDelegate.networkingProcessUpload?.startProcess()
-                }
-            }
-            #endif
-
             NCCommunicationCommon.shared.writeLog("Upload complete " + serverUrl + "/" + fileName + ", result: success(\(size) bytes)")
             NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "ocIdTemp": ocIdTemp, "errorCode": errorCode, "errorDescription": ""])
         } else {

+ 3 - 3
iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -38,7 +38,7 @@ class NCNetworkingProcessUpload: NSObject {
         startTimer()
     }
 
-    @objc func startProcess() {
+    private func startProcess() {
         if timerProcess?.isValid ?? false {
             DispatchQueue.main.async { self.process() }
         }
@@ -56,6 +56,8 @@ class NCNetworkingProcessUpload: NSObject {
     @objc private func process() {
         guard !appDelegate.account.isEmpty else { return }
 
+        stopTimer()
+
         let queue = DispatchQueue.global(qos: .background)
         let applicationState = UIApplication.shared.applicationState
         var counterUpload: Int = 0
@@ -63,8 +65,6 @@ class NCNetworkingProcessUpload: NSObject {
         let metadatasUpload = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "status == %d OR status == %d", NCGlobal.shared.metadataStatusInUpload, NCGlobal.shared.metadataStatusUploading))
         counterUpload = metadatasUpload.count
 
-        stopTimer()
-
         print("[LOG] PROCESS-UPLOAD \(counterUpload)")
 
         NCNetworking.shared.getOcIdInBackgroundSession(queue: queue, completion: { listOcId in