remove actionDownloadFile

Picker/DocumentPickerViewController.swift

@@ -319,19 +319,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             // if plist do not exists, download it
             if CCUtility.isCryptoPlistString(fileName) && FileManager.default.fileExists(atPath: "\(directoryUser)/\(fileName)") == false {
                 
-                let metadataNet = CCMetadataNet.init(account: activeAccount)!
-                
-                metadataNet.action = actionDownloadFile
-                metadataNet.downloadData = false
-                metadataNet.downloadPlist = true
-                metadataNet.fileID = fileID
-                metadataNet.selector = selectorLoadPlist
-                metadataNet.serverUrl = self.serverUrl
-                metadataNet.session = k_download_session_foreground
-                metadataNet.taskStatus = Int(k_taskStatusResume)
-                
-                let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, isCryptoCloudMode: isCryptoCloudMode)
-                networkingOperationQueue.addOperation(ocNetworking)
+                CCNetworking.shared().downloadFile(fileID, serverUrl: self.serverUrl, downloadData: false, downloadPlist: true, selector: selectorLoadPlist, selectorPost: nil, session: k_download_session_foreground, taskStatus: Int(k_taskStatusResume), delegate: self)
             }
         }
         
@@ -807,21 +795,8 @@ extension DocumentPickerViewController: UITableViewDataSource {
                 
             } else {
             
-                // Download file
-                let metadataNet = CCMetadataNet.init(account: activeAccount)!
-            
-                metadataNet.action = actionDownloadFile
-                metadataNet.downloadData = true
-                metadataNet.downloadPlist = false
-                metadataNet.fileID = metadata?.fileID
-                metadataNet.selector = selectorLoadFileView
-                metadataNet.serverUrl = self.serverUrl
-                metadataNet.session = k_download_session_foreground
-                metadataNet.taskStatus = Int(k_taskStatusResume)
-            
-                let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, isCryptoCloudMode: self.isCryptoCloudMode)
-                networkingOperationQueue.addOperation(ocNetworking)
-                
+                CCNetworking.shared().downloadFile(metadata?.fileID, serverUrl: self.serverUrl, downloadData: true, downloadPlist: false, selector: selectorLoadFileView, selectorPost: nil, session: k_download_session_foreground, taskStatus: Int(k_taskStatusResume), delegate: self)
+
                 hud.visibleHudTitle(NSLocalizedString("_loading_", comment: ""), mode: MBProgressHUDMode.determinate, color: NCBrandColor.sharedInstance.brand)
             }
             

iOSClient/CCGlobal.h

@@ -195,7 +195,6 @@ extern NSString *const urlBaseUploadDB;
 // Metadata.Net ACTION
 #define actionCreateFolder                              @"createFolder"
 #define actionDeleteFileDirectory                       @"deleteFileOrFolder"
-#define actionDownloadFile                              @"downloadFile"
 #define actionDownloadThumbnail                         @"downloadThumbnail"
 #define actionGetActivityServer                         @"getActivityServer"
 #define actionGetCapabilities                           @"getCapabilitiesOfServer"

iOSClient/Main/CCMain.m

@@ -1577,20 +1577,7 @@
             
         if ([CCUtility isCryptoPlistString:metadata.fileName] && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileName]] == NO && [metadata.session length] == 0) {
         
-            CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-                
-            metadataNet.action = actionDownloadFile;
-            metadataNet.downloadData = NO;
-            metadataNet.downloadPlist = YES;
-            metadataNet.fileID = metadata.fileID;
-            metadataNet.selector = selectorLoadPlist;
-            metadataNet.serverUrl = serverUrl;
-            metadataNet.session = k_download_session_foreground;
-            metadataNet.taskStatus = k_taskStatusResume;
-            
-            [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-            
-            //[[CCNetworking sharedNetworking] downloadFile:metadata.fileID serverUrl:serverUrl downloadData:NO downloadPlist:YES selector:selectorLoadPlist selectorPost:nil session:k_download_session_foreground taskStatus:k_taskStatusResume delegate:self];
+            [[CCNetworking sharedNetworking] downloadFile:metadata.fileID serverUrl:serverUrl downloadData:NO downloadPlist:YES selector:selectorLoadPlist selectorPost:nil session:k_download_session_foreground taskStatus:k_taskStatusResume delegate:self];
         }
     }
 }

iOSClient/Move/CCMove.m

@@ -394,18 +394,7 @@
         
             if ([CCUtility isCryptoPlistString:metadata.fileName] && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", directoryUser, metadata.fileName]] == NO) {
                 
-                CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:activeAccount];
-                    
-                metadataNet.action = actionDownloadFile;
-                metadataNet.downloadData = NO;
-                metadataNet.downloadPlist = YES;
-                metadataNet.fileID = metadata.fileID;
-                metadataNet.selector = selectorLoadPlist;
-                metadataNet.serverUrl = _serverUrl;
-                metadataNet.session = k_download_session_foreground;
-                metadataNet.taskStatus = k_taskStatusResume;
-                    
-                [self addNetworkingQueue:metadataNet];
+                [[CCNetworking sharedNetworking] downloadFile:metadata.fileID serverUrl:_serverUrl downloadData:NO downloadPlist:YES selector:selectorLoadPlist selectorPost:nil session:k_download_session_foreground taskStatus:k_taskStatusResume delegate:self];
             }
         }
     });