coding

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Networking/NCNetworking.swift

@@ -405,35 +405,25 @@ import Photos
         if metadata.e2eEncrypted {
             #if !EXTENSION_FILE_PROVIDER_EXTENSION && !EXTENSION_WIDGET
             NCNetworkingE2EE.shared.upload(metadata: metadata, start: start) { error in
-                DispatchQueue.main.async {
-                    completion(error)
-                }
+                completion(error)
             }
             #endif
         } else if metadata.chunk {
             uploadChunkedFile(metadata: metadata, start: start) { error in
-                DispatchQueue.main.async {
-                    completion(error)
-                }
+                completion(error)
             }
         } else if metadata.session == NKCommon.shared.sessionIdentifierUpload {
             uploadFile(metadata: metadata, start: start) { error in
-                DispatchQueue.main.async {
-                    completion(error)
-                }
+                completion(error)
             }
         } else {
             isInTaskUploadBackground(fileName: metadata.fileName) { exists in
                 if exists {
                     NKCommon.shared.writeLog("[INFO] Upload already in progress.")
-                    DispatchQueue.main.async {
-                        completion(NKError(errorCode: 0, errorDescription: ""))
-                    }
+                    completion(NKError(errorCode: 0, errorDescription: ""))
                 } else {
                     self.uploadFileInBackground(metadata: metadata, start: start) { error in
-                        DispatchQueue.main.async {
-                            completion(error)
-                        }
+                        completion(error)
                     }
                 }
             }

iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -60,6 +60,7 @@ class NCNetworkingProcessUpload: NSObject {
 
         stopTimer()
 
+        let applicationState = UIApplication.shared.applicationState
         var counterUpload: Int = 0
         let sessionSelectors = [NCGlobal.shared.selectorUploadFileNODelete, NCGlobal.shared.selectorUploadFile, NCGlobal.shared.selectorUploadAutoUpload, NCGlobal.shared.selectorUploadAutoUploadAll]
         let metadatasUpload = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "status == %d OR status == %d", NCGlobal.shared.metadataStatusInUpload, NCGlobal.shared.metadataStatusUploading))
@@ -115,7 +116,7 @@ class NCNetworkingProcessUpload: NSObject {
                                 NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
                             }
                             for metadata in metadatas {
-                                if (metadata.e2eEncrypted || metadata.chunk) && UIApplication.shared.applicationState != .active {  continue }
+                                if (metadata.e2eEncrypted || metadata.chunk) && applicationState != .active {  continue }
                                 let isWiFi = NCNetworking.shared.networkReachability == NKCommon.typeReachability.reachableEthernetOrWiFi
                                 if metadata.session == NCNetworking.shared.sessionIdentifierBackgroundWWan && !isWiFi { continue }
                                 guard let metadata = NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusInUpload) else { continue }