Marino Faggiana 7 vuotta sitten
vanhempi
commit
8ef6072767

+ 0 - 2
iOSClient/Networking/CCNetworking.h

@@ -76,11 +76,9 @@
 
 @optional - (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID selector:(NSString *)selector;
 
-@optional - (void)downloadTaskSave:(NSURLSessionDownloadTask *)downloadTask;
 @optional - (void)downloadFileSuccess:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost;
 @optional - (void)downloadFileFailure:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode;
 
-@optional - (void)uploadTaskSave:(NSURLSessionUploadTask *)uploadTask;
 @optional - (void)uploadFileSuccess:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost;
 @optional - (void)uploadFileFailure:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode;
 

+ 0 - 10
iOSClient/Networking/CCNetworking.m

@@ -586,11 +586,6 @@
         else if (taskStatus == k_taskStatusSuspend) [downloadTask suspend];
         else if (taskStatus == k_taskStatusResume) [downloadTask resume];
         
-        dispatch_async(dispatch_get_main_queue(), ^{
-            if ([[self getDelegate:fileID] respondsToSelector:@selector(downloadTaskSave:)])
-                [[self getDelegate:fileID] downloadTaskSave:downloadTask];
-        });
-
         NSLog(@"[LOG] downloadFileSession %@ - %@ Task [%lu %lu]", fileID, fileNamePrint, (unsigned long)sessionTaskIdentifier, (unsigned long)sessionTaskIdentifierPlist);
     }
     
@@ -1247,11 +1242,6 @@
         else if (taskStatus == k_taskStatusSuspend) [uploadTask suspend];
         else if (taskStatus == k_taskStatusResume) [uploadTask resume];
         
-        dispatch_async(dispatch_get_main_queue(), ^{
-            if ([[self getDelegate:sessionID] respondsToSelector:@selector(uploadTaskSave:)])
-                [[self getDelegate:sessionID] uploadTaskSave:uploadTask];
-        });
-
         NSLog(@"[LOG] Upload file %@ - %@ TaskIdentifier %lu", fileName,fileNamePrint, (unsigned long)uploadTask.taskIdentifier);
     }
 

+ 0 - 2
iOSClient/Networking/OCNetworking.h

@@ -52,14 +52,12 @@
 
 @optional
 
-- (void)downloadTaskSave:(NSURLSessionDownloadTask *)downloadTask;
 - (void)downloadFileSuccess:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost;
 - (void)downloadFileFailure:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode;
 
 - (void)downloadThumbnailSuccess:(CCMetadataNet *)metadataNet;
 - (void)downloadThumbnailFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode;
 
-- (void)uploadTaskSave:(NSURLSessionUploadTask *)uploadTask;
 - (void)uploadFileSuccess:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost;
 - (void)uploadFileFailure:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode;
 

+ 0 - 16
iOSClient/Networking/OCNetworking.m

@@ -148,14 +148,6 @@
     [[CCNetworking sharedNetworking] downloadFile:_metadataNet.fileID serverUrl:_metadataNet.serverUrl downloadData:_metadataNet.downloadData downloadPlist:_metadataNet.downloadPlist selector:_metadataNet.selector selectorPost:_metadataNet.selectorPost session:_metadataNet.session taskStatus:_metadataNet.taskStatus delegate:self];
 }
 
-- (void)downloadTaskSave:(NSURLSessionDownloadTask *)downloadTask
-{
-    _downloadTask= downloadTask;
-    
-    if ([self.delegate respondsToSelector:@selector(downloadTaskSave:)])
-        [self.delegate downloadTaskSave:downloadTask];
-}
-
 - (void)downloadFileSuccess:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
 {
     [self complete];
@@ -196,14 +188,6 @@
     [[CCNetworking sharedNetworking] uploadTemplate:_metadataNet.fileNamePrint fileNameCrypto:_metadataNet.fileName serverUrl:_metadataNet.serverUrl session:_metadataNet.session taskStatus:_metadataNet.taskStatus selector:_metadataNet.selector selectorPost:_metadataNet.selectorPost errorCode:_metadataNet.errorCode delegate:self];
 }
 
-- (void)uploadTaskSave:(NSURLSessionUploadTask *)uploadTask
-{
-    _uploadTask = uploadTask;
-    
-    if ([self.delegate respondsToSelector:@selector(uploadTaskSave:)])
-        [self.delegate uploadTaskSave:uploadTask];
-}
-
 - (void)uploadFileSuccess:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
 {
     [self complete];