remove actionUploadOnlyPlist

iOSClient/Actions/CCActions.swift

@@ -238,16 +238,7 @@ class CCActions: NSObject {
                 }
             }
             
-            metadataNet.action = actionUploadOnlyPlist
-            metadataNet.delegate = delegate
-            metadataNet.fileID = metadata.fileID
-            metadataNet.fileName = metadata.fileName
-            metadataNet.selectorPost = selectorReadFolderForced
-            metadataNet.serverUrl = serverUrl
-            metadataNet.session = k_upload_session_foreground
-            metadataNet.taskStatus = Int(k_taskStatusResume)
-            
-            appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
+            CCNetworking.shared().uploadFile(metadata.fileName, serverUrl: serverUrl, cryptated: true, onlyPlist: true, session: k_upload_session_foreground, taskStatus: Int(k_taskStatusResume), selector: "", selectorPost: selectorReadFolderForced, errorCode: 0, delegate: delegate)
             
             // delete file in filesystem
             self.deleteFile(metadata: metadata, serverUrl: serverUrl)

iOSClient/CCGlobal.h

@@ -216,7 +216,6 @@ extern NSString *const urlBaseUploadDB;
 #define actionSubscribingNextcloudServer                @"subscribingNextcloudServer"
 #define actionUnShare                                   @"unShare"
 #define actionUpdateShare                               @"updateShare"
-#define actionUploadOnlyPlist                           @"uploadOnlyPlist"
 
 // Metadata : FileType
 #define k_metadataTypeFile_audio                        @"audio"

iOSClient/Main/CCMain.m

@@ -2544,18 +2544,7 @@
     
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
     
-    // upload plist file
-    metadataNet.action = actionUploadOnlyPlist;
-    metadataNet.cryptated = YES;
-    metadataNet.fileID = [[NSUUID UUID] UUIDString];
-    metadataNet.fileName = [fileNamePlist stringByAppendingString:@".plist"];
-    metadataNet.priority = NSOperationQueuePriorityVeryLow;
-    metadataNet.selectorPost = selectorReadFolderForced;
-    metadataNet.serverUrl = _serverUrl;
-    metadataNet.session = k_upload_session_foreground;
-    metadataNet.taskStatus = k_taskStatusResume;
-    
-    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+    [[CCNetworking sharedNetworking] uploadFile:[fileNamePlist stringByAppendingString:@".plist"] serverUrl:_serverUrl cryptated:YES onlyPlist:YES session:k_upload_session_foreground taskStatus:k_taskStatusResume selector:@"" selectorPost:selectorReadFolderForced errorCode:0 delegate:self];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -2624,15 +2613,7 @@
         
         //-------------------------- UPLOAD -------------------------------------------//
         
-        metadataNet.action = actionUploadOnlyPlist;
-        metadataNet.fileName = [fileNameCrypto stringByAppendingString:@".plist"];
-        metadataNet.priority = NSOperationQueuePriorityVeryLow;
-        metadataNet.selectorPost = selectorReadFolderForced;
-        metadataNet.serverUrl = serverUrl;
-        metadataNet.session = k_upload_session_foreground;
-        metadataNet.taskStatus = k_taskStatusResume;
-        
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+        [[CCNetworking sharedNetworking] uploadFile:[fileNameCrypto stringByAppendingString:@".plist"] serverUrl:serverUrl cryptated:YES onlyPlist:YES session:k_upload_session_foreground taskStatus:k_taskStatusResume selector:@"" selectorPost:selectorReadFolderForced errorCode:0 delegate:self];
     }
 }
 

iOSClient/Networking/OCNetworking.m

@@ -139,31 +139,6 @@
 #endif
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== uploadFile =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)uploadOnlyPlist
-{
-    [[CCNetworking sharedNetworking] uploadFile:_metadataNet.fileName serverUrl:_metadataNet.serverUrl cryptated:YES onlyPlist:YES 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];
-    
-    if ([self.delegate respondsToSelector:@selector(uploadFileSuccess:fileID:serverUrl:selector:selectorPost:)])
-        [self.delegate uploadFileSuccess:_metadataNet fileID:fileID serverUrl:serverUrl selector:selector selectorPost:selectorPost];
-}
-
-- (void)uploadFileFailure:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode
-{
-    [self complete];
-    
-    if ([self.delegate respondsToSelector:@selector(uploadFileFailure:fileID:serverUrl:selector:message:errorCode:)])
-        [self.delegate uploadFileFailure:_metadataNet fileID:fileID serverUrl:serverUrl selector:selector message:message errorCode:errorCode];
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== downloadThumbnail =====
 #pragma --------------------------------------------------------------------------------------------