diff options
author | Marino Faggiana <marino@marinofaggiana.com> | 2022-10-03 11:17:26 +0300 |
---|---|---|
committer | Marino Faggiana <marino@marinofaggiana.com> | 2022-10-03 11:17:26 +0300 |
commit | 80109caec6bb321c7017d3d4a63b7445191ae6a4 (patch) | |
tree | 5dac755b106368f1f3ed6fb076756dd9f682a4cf | |
parent | 282787a33c5c6760ef7aa39113e5c0dd92a659d7 (diff) |
coding
Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
-rw-r--r-- | iOSClient/Networking/NCNetworking.swift | 20 | ||||
-rw-r--r-- | iOSClient/Networking/NCNetworkingProcessUpload.swift | 3 |
2 files changed, 7 insertions, 16 deletions
diff --git a/iOSClient/Networking/NCNetworking.swift b/iOSClient/Networking/NCNetworking.swift index f6500a74e..8faefcfc7 100644 --- a/iOSClient/Networking/NCNetworking.swift +++ b/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) } } } diff --git a/iOSClient/Networking/NCNetworkingProcessUpload.swift b/iOSClient/Networking/NCNetworkingProcessUpload.swift index 460f31674..c551243cb 100644 --- a/iOSClient/Networking/NCNetworkingProcessUpload.swift +++ b/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 } |