Pārlūkot izejas kodu

remove actionUploadTemplate

Marino Faggiana 7 gadi atpakaļ
vecāks
revīzija
23cbf034fd

+ 0 - 1
iOSClient/CCGlobal.h

@@ -218,7 +218,6 @@ extern NSString *const urlBaseUploadDB;
 #define actionUpdateShare                               @"updateShare"
 #define actionUploadFile                                @"uploadFile"
 #define actionUploadAsset                               @"uploadAsset"
-#define actionUploadTemplate                            @"uploadTemplate"
 #define actionUploadOnlyPlist                           @"uploadOnlyPlist"
 
 // Metadata : FileType

+ 1 - 11
iOSClient/Main/CCMain.m

@@ -2219,17 +2219,7 @@
     
     if (fileNameModel) {
         
-        CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-        
-        metadataNet.action = actionUploadTemplate;
-        metadataNet.fileName = [CCUtility trasformedFileNamePlistInCrypto:fileNameModel];
-        metadataNet.fileNamePrint = fileName;
-        metadataNet.etag = metadata.etag;
-        metadataNet.serverUrl = serverUrl;
-        metadataNet.session = k_upload_session_foreground;
-        metadataNet.taskStatus = k_taskStatusResume;
-        
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+        [[CCNetworking sharedNetworking] uploadTemplate:fileName fileNameCrypto:[CCUtility trasformedFileNamePlistInCrypto:fileNameModel] serverUrl:serverUrl session:k_upload_session_foreground taskStatus:k_taskStatusResume selector:nil selectorPost:nil errorCode:0 delegate:self];
     }
 }
 

+ 0 - 30
iOSClient/Networking/OCNetworking.m

@@ -139,31 +139,6 @@
 #endif
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== downloadFile =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)downloadFile
-{
-    [[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)downloadFileSuccess:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
-{
-    [self complete];
-    
-    if ([self.delegate respondsToSelector:@selector(downloadFileSuccess:serverUrl:selector:selectorPost:)])
-        [self.delegate downloadFileSuccess:fileID serverUrl:serverUrl selector:selector selectorPost:selectorPost];
-}
-
-- (void)downloadFileFailure:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode
-{
-    [self complete];
- 
-    if ([self.delegate respondsToSelector:@selector(downloadFileFailure:serverUrl:selector:message:errorCode:)])
-        [self.delegate downloadFileFailure:fileID serverUrl:serverUrl selector:selector message:message errorCode:errorCode];
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== uploadFile =====
 #pragma --------------------------------------------------------------------------------------------
@@ -183,11 +158,6 @@
     [[CCNetworking sharedNetworking] uploadFileFromAssetLocalIdentifier:_metadataNet delegate:self];
 }
 
-- (void)uploadTemplate
-{
-    [[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)uploadFileSuccess:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
 {
     [self complete];

+ 1 - 11
iOSClient/Templates/CCAccountWeb.m

@@ -173,17 +173,7 @@
         
         XLFormRowDescriptor *titolo = [self.form formRowWithTag:@"titolo"];
         
-        CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-        
-        metadataNet.action = actionUploadTemplate;
-        metadataNet.serverUrl = self.serverUrl;
-        metadataNet.fileName = [CCUtility trasformedFileNamePlistInCrypto:fileNameModel];
-        metadataNet.fileNamePrint = titolo.value;
-        metadataNet.pathFolder = NSTemporaryDirectory();
-        metadataNet.session = k_upload_session_foreground;
-        metadataNet.taskStatus = k_taskStatusResume;
-        
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+        [[CCNetworking sharedNetworking] uploadTemplate:titolo.value fileNameCrypto:[CCUtility trasformedFileNamePlistInCrypto:fileNameModel] serverUrl:self.serverUrl session:k_upload_session_foreground taskStatus:k_taskStatusResume selector:nil selectorPost:nil errorCode:0 delegate:self];
     }
 }
 

+ 1 - 11
iOSClient/Templates/CCBancomat.m

@@ -180,17 +180,7 @@
         
         XLFormRowDescriptor *titolo = [self.form formRowWithTag:@"titolo"];
         
-        CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-        
-        metadataNet.action = actionUploadTemplate;
-        metadataNet.serverUrl = self.serverUrl;
-        metadataNet.fileName = [CCUtility trasformedFileNamePlistInCrypto:fileNameModel];
-        metadataNet.fileNamePrint = titolo.value;
-        metadataNet.pathFolder = NSTemporaryDirectory();
-        metadataNet.session = k_upload_session_foreground;
-        metadataNet.taskStatus = k_taskStatusResume;
-        
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];        
+        [[CCNetworking sharedNetworking] uploadTemplate:titolo.value fileNameCrypto:[CCUtility trasformedFileNamePlistInCrypto:fileNameModel] serverUrl:self.serverUrl session:k_upload_session_foreground taskStatus:k_taskStatusResume selector:nil selectorPost:nil errorCode:0 delegate:self];
     }
 }
 

+ 1 - 11
iOSClient/Templates/CCCartaDiCredito.m

@@ -198,17 +198,7 @@
         
         XLFormRowDescriptor *titolo = [self.form formRowWithTag:@"titolo"];
         
-        CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-        
-        metadataNet.action = actionUploadTemplate;
-        metadataNet.serverUrl = self.serverUrl;
-        metadataNet.fileName = [CCUtility trasformedFileNamePlistInCrypto:fileNameModel];
-        metadataNet.fileNamePrint = titolo.value;
-        metadataNet.pathFolder = NSTemporaryDirectory();
-        metadataNet.session = k_upload_session_foreground;
-        metadataNet.taskStatus = k_taskStatusResume;
-        
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+        [[CCNetworking sharedNetworking] uploadTemplate:titolo.value fileNameCrypto:[CCUtility trasformedFileNamePlistInCrypto:fileNameModel] serverUrl:self.serverUrl session:k_upload_session_foreground taskStatus:k_taskStatusResume selector:nil selectorPost:nil errorCode:0 delegate:self];
     }
 }
 

+ 1 - 11
iOSClient/Templates/CCCartaIdentita.m

@@ -196,17 +196,7 @@
         
         XLFormRowDescriptor *titolo = [self.form formRowWithTag:@"titolo"];
         
-        CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-        
-        metadataNet.action = actionUploadTemplate;
-        metadataNet.serverUrl = self.serverUrl;
-        metadataNet.fileName = [CCUtility trasformedFileNamePlistInCrypto:fileNameModel];
-        metadataNet.fileNamePrint = titolo.value;
-        metadataNet.pathFolder = NSTemporaryDirectory();
-        metadataNet.session = k_upload_session_foreground;
-        metadataNet.taskStatus = k_taskStatusResume;
-        
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+        [[CCNetworking sharedNetworking] uploadTemplate:titolo.value fileNameCrypto:[CCUtility trasformedFileNamePlistInCrypto:fileNameModel] serverUrl:self.serverUrl session:k_upload_session_foreground taskStatus:k_taskStatusResume selector:nil selectorPost:nil errorCode:0 delegate:self];
     }
 }
 

+ 1 - 11
iOSClient/Templates/CCContoCorrente.m

@@ -196,17 +196,7 @@
         
         XLFormRowDescriptor *titolo = [self.form formRowWithTag:@"titolo"];
         
-        CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-        
-        metadataNet.action = actionUploadTemplate;
-        metadataNet.serverUrl = self.serverUrl;
-        metadataNet.fileName = [CCUtility trasformedFileNamePlistInCrypto:fileNameModel];
-        metadataNet.fileNamePrint = titolo.value;
-        metadataNet.pathFolder = NSTemporaryDirectory();
-        metadataNet.session = k_upload_session_foreground;
-        metadataNet.taskStatus = k_taskStatusResume;
-        
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+        [[CCNetworking sharedNetworking] uploadTemplate:titolo.value fileNameCrypto:[CCUtility trasformedFileNamePlistInCrypto:fileNameModel] serverUrl:self.serverUrl session:k_upload_session_foreground taskStatus:k_taskStatusResume selector:nil selectorPost:nil errorCode:0 delegate:self];
     }
 }
 

+ 1 - 11
iOSClient/Templates/CCNote.m

@@ -141,17 +141,7 @@
     
         if (fileNameModel) {
             
-            CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-            
-            metadataNet.action = actionUploadTemplate;
-            metadataNet.serverUrl = self.serverUrl;
-            metadataNet.fileName = [CCUtility trasformedFileNamePlistInCrypto:fileNameModel];
-            metadataNet.fileNamePrint = _titolo;
-            metadataNet.pathFolder = NSTemporaryDirectory();
-            metadataNet.session = k_upload_session_foreground;
-            metadataNet.taskStatus = k_taskStatusResume;
-            
-            [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+            [[CCNetworking sharedNetworking] uploadTemplate:_titolo fileNameCrypto:[CCUtility trasformedFileNamePlistInCrypto:fileNameModel] serverUrl:self.serverUrl session:k_upload_session_foreground taskStatus:k_taskStatusResume selector:nil selectorPost:nil errorCode:0 delegate:self];
         }
     }
 }

+ 1 - 11
iOSClient/Templates/CCPassaporto.m

@@ -196,17 +196,7 @@
         
         XLFormRowDescriptor *titolo = [self.form formRowWithTag:@"titolo"];
         
-        CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-        
-        metadataNet.action = actionUploadTemplate;
-        metadataNet.serverUrl = self.serverUrl;
-        metadataNet.fileName = [CCUtility trasformedFileNamePlistInCrypto:fileNameModel];
-        metadataNet.fileNamePrint = titolo.value;
-        metadataNet.pathFolder = NSTemporaryDirectory();
-        metadataNet.session = k_upload_session_foreground;
-        metadataNet.taskStatus = k_taskStatusResume;
-        
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+        [[CCNetworking sharedNetworking] uploadTemplate:titolo.value fileNameCrypto:[CCUtility trasformedFileNamePlistInCrypto:fileNameModel] serverUrl:self.serverUrl session:k_upload_session_foreground taskStatus:k_taskStatusResume selector:nil selectorPost:nil errorCode:0 delegate:self];
     }
 }
 

+ 1 - 11
iOSClient/Templates/CCPatenteGuida.m

@@ -190,17 +190,7 @@
         
         XLFormRowDescriptor *titolo = [self.form formRowWithTag:@"titolo"];
         
-        CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-        
-        metadataNet.action = actionUploadTemplate;
-        metadataNet.serverUrl = self.serverUrl;
-        metadataNet.fileName = [CCUtility trasformedFileNamePlistInCrypto:fileNameModel];
-        metadataNet.fileNamePrint = titolo.value;
-        metadataNet.pathFolder = NSTemporaryDirectory();
-        metadataNet.session = k_upload_session_foreground;
-        metadataNet.taskStatus = k_taskStatusResume;
-        
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+        [[CCNetworking sharedNetworking] uploadTemplate:titolo.value fileNameCrypto:[CCUtility trasformedFileNamePlistInCrypto:fileNameModel] serverUrl:self.serverUrl session:k_upload_session_foreground taskStatus:k_taskStatusResume selector:nil selectorPost:nil errorCode:0 delegate:self];
     }
 }