marinofaggiana 4 жил өмнө
parent
commit
eeebf6a0f4

+ 0 - 1
iOSClient/Networking/NCNetworking.swift

@@ -297,7 +297,6 @@ import Queuer
 
     @objc func cancelUpload(ocId: String) {
         guard let metadata = NCManageDatabase.sharedInstance.getMetadataFromOcId(ocId) else { return }
-        
         guard let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView) else { return }
         
         if let request = uploadRequest[fileNameLocalPath] {

+ 5 - 9
iOSClient/Transfers/CCTransfers.m

@@ -245,16 +245,12 @@
 
 - (void)startTask:(id)sender
 {
-    if (metadataForRecognizer.status == k_metadataStatusUploading) {
-        [[NCMainCommon shared] cancelTransferMetadata:metadataForRecognizer uploadStatusForcedStart:true];
-    } else {
-        tableMetadata *metadata = [[NCManageDatabase sharedInstance] copyObjectWithMetadata:metadataForRecognizer];
-        metadata.status = k_metadataStatusInUpload;
-        metadata.session = NCNetworking.shared.sessionIdentifierBackground;
+    tableMetadata *metadata = [[NCManageDatabase sharedInstance] copyObjectWithMetadata:metadataForRecognizer];
+    metadata.status = k_metadataStatusInUpload;
+    metadata.session = NCCommunicationCommon.shared.sessionIdentifierUpload;
        
-        [[NCManageDatabase sharedInstance] addMetadata:metadata];
-        [[NCNetworking shared] uploadWithMetadata:metadata completion:^(NSInteger errorCode, NSString *errorDescription) { }];
-    }
+    [[NCManageDatabase sharedInstance] addMetadata:metadata];
+    [[NCNetworking shared] uploadWithMetadata:metadata completion:^(NSInteger errorCode, NSString *errorDescription) { }];
 }
 
 #pragma --------------------------------------------------------------------------------------------