marinofaggiana 3 年 前
コミット
7bde2b74e3

+ 5 - 1
iOSClient/Networking/NCNetworkingChunkedUpload.swift

@@ -46,15 +46,19 @@ extension NCNetworking {
                 filesNames = chunkedFilesNames
                 NCManageDatabase.shared.addChunks(account: metadata.account, ocId: metadata.ocId, chunkFolder: chunkFolder, fileNames: filesNames)
                 
+                completion(uploadErrorCode, uploadErrorDescription)
+
             } else {
                 
                 NCContentPresenter.shared.messageNotification("_error_", description: "_err_file_not_found_", delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error, errorCode:NCGlobal.shared.errorReadFile, forced: true)
                 
                 NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
+                
+                completion(uploadErrorCode, uploadErrorDescription)
                 return
             }
         }
-        
+
         NCContentPresenter.shared.messageNotification("_info_", description: "_upload_chunk_", delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info, errorCode:0, forced: false)
         
         createChunkedFolder(chunkFolderPath: chunkFolderPath, account: metadata.account) { (errorCode, errorDescription) in

+ 6 - 3
iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -83,7 +83,7 @@ class NCNetworkingProcessUpload: NSObject {
                     
                     for metadata in metadatas {
                         
-                        // Is already in upload ? skipped
+                        // Is already in upload background? skipped
                         if listOcId.contains(metadata.ocId) {
                             NCCommunicationCommon.shared.writeLog("Process auto upload skipped file: \(metadata.serverUrl)/\(metadata.fileNameView), because is already in session.")
                             continue
@@ -105,9 +105,12 @@ class NCNetworkingProcessUpload: NSObject {
                         // Chunk 
                         if metadata.chunk && UIApplication.shared.applicationState == .active {
                             if let metadata = NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusInUpload) {
-                                NCNetworking.shared.upload(metadata: metadata) { (_, _) in }
+                                NCNetworking.shared.upload(metadata: metadata) { (_, _) in
+                                    self.startTimer()
+                                }
+                            } else {
+                                self.startTimer()
                             }
-                            self.startTimer()
                             return
                         }