浏览代码

coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana 2 年之前
父节点
当前提交
c91959a728
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 3 1
      iOSClient/Networking/NCNetworking.swift
  2. 2 4
      iOSClient/Networking/NCNetworkingProcessUpload.swift

+ 3 - 1
iOSClient/Networking/NCNetworking.swift

@@ -418,7 +418,9 @@ import Photos
 
     // MARK: - Upload
 
-    @objc func upload(metadata: tableMetadata, start: @escaping () -> Void, completion: @escaping (_ errorCode: Int, _ errorDescription: String) -> Void) {
+    @objc func upload(metadata: tableMetadata,
+                      start: @escaping () -> () = { },
+                      completion: @escaping (_ errorCode: Int, _ errorDescription: String) -> () = { errorCode, errorDescription in }) {
         let metadata = tableMetadata.init(value: metadata)
 
         NCCommunicationCommon.shared.writeLog("Upload file \(metadata.fileNameView) with Identifier \(metadata.assetLocalIdentifier) with size \(metadata.size) [CHUNCK \(metadata.chunk), E2EE \(metadata.e2eEncrypted)]")

+ 2 - 4
iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -110,8 +110,7 @@ class NCNetworkingProcessUpload: NSObject {
                         if let metadata = metadataForUpload {
                             if (metadata.e2eEncrypted || metadata.chunk) && UIApplication.shared.applicationState != .active { continue }
                             if let metadata = NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusInUpload) {
-                                NCNetworking.shared.upload(metadata: metadata) {
-                                } completion: { _, _ in }
+                                NCNetworking.shared.upload(metadata: metadata)
                             }
                             if metadata.e2eEncrypted || metadata.chunk {
                                 counterUpload = self.maxConcurrentOperationUpload
@@ -124,8 +123,7 @@ class NCNetworkingProcessUpload: NSObject {
                         if let metadata = metadataLivePhotoForUpload {
                             if (metadata.e2eEncrypted || metadata.chunk) && UIApplication.shared.applicationState != .active { continue }
                             if let metadata = NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusInUpload) {
-                                NCNetworking.shared.upload(metadata: metadata) {
-                                } completion: { _, _ in }
+                                NCNetworking.shared.upload(metadata: metadata)
                             }
                             if metadata.e2eEncrypted || metadata.chunk {
                                 counterUpload = self.maxConcurrentOperationUpload