remove old readFileSync

iOSClient/Actions/CCActions.swift

@@ -164,35 +164,41 @@ class CCActions: NSObject {
             return
         }
         
-        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: appDelegate.activeUser, withUserID: appDelegate.activeUserID, withPassword: appDelegate.activePassword, withUrl: appDelegate.activeUrl);
-
-        // Verify if exists the fileName TO
-        guard (ocNetworking?.readFileSync("\(String(describing: serverUrl))/\(fileName)")) != nil else {
+        DispatchQueue.global(qos: .userInitiated).async {
+        
+            // Verify if exists the fileName TO
+            var items: NSArray?
+        
+            guard NCNetworkingSync.sharedManager().readFile("\(String(describing: serverUrl))/\(fileName)", user: self.appDelegate.activeUser, userID: self.appDelegate.activeUserID, password: self.appDelegate.activePassword, items: &items) != nil else {
                 
-            let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: NSLocalizedString("_file_already_exists_", comment: ""), preferredStyle: UIAlertControllerStyle.alert)
+                DispatchQueue.main.async {
+                    
+                    let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: NSLocalizedString("_file_already_exists_", comment: ""), preferredStyle: UIAlertControllerStyle.alert)
                 
-            let okAction = UIAlertAction(title: "OK", style: UIAlertActionStyle.default) {
-                (result : UIAlertAction) -> Void in
-            }
+                    let okAction = UIAlertAction(title: "OK", style: UIAlertActionStyle.default) {
+                        (result : UIAlertAction) -> Void in
+                    }
                 
-            alertController.addAction(okAction)
+                    alertController.addAction(okAction)
                 
-            delegate.present(alertController, animated: true, completion: nil)
+                    delegate.present(alertController, animated: true, completion: nil)
+                }
                 
-            return;
-        }
+                return;
+            }
         
-        metadataNet.action = actionMoveFileOrFolder
-        metadataNet.delegate = delegate
-        metadataNet.fileID = metadata.fileID
-        metadataNet.fileName = metadata.fileName
-        metadataNet.fileNameTo = fileName
-        metadataNet.fileNameView = metadata.fileNameView
-        metadataNet.selector = selectorRename
-        metadataNet.serverUrl = serverUrl
-        metadataNet.serverUrlTo = serverUrl
+            metadataNet.action = actionMoveFileOrFolder
+            metadataNet.delegate = delegate
+            metadataNet.fileID = metadata.fileID
+            metadataNet.fileName = metadata.fileName
+            metadataNet.fileNameTo = fileName
+            metadataNet.fileNameView = metadata.fileNameView
+            metadataNet.selector = selectorRename
+            metadataNet.serverUrl = serverUrl
+            metadataNet.serverUrlTo = serverUrl
             
-        appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
+            self.appDelegate.addNetworkingOperationQueue(self.appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
+        }
     }
     
     @objc func renameSuccess(_ metadataNet: CCMetadataNet) {

iOSClient/Main/CCMain.m

@@ -2197,50 +2197,55 @@
     NSString *directoryIDTo = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrlTo];
     if (!directoryIDTo) return;
     
-    OCnetworking *ocNetworking = [[OCnetworking alloc] initWithDelegate:nil metadataNet:nil withUser:app.activeUser withUserID:app.activeUserID withPassword:app.activePassword withUrl:app.activeUrl];
-            
-    NSError *error = [ocNetworking readFileSync:[NSString stringWithFormat:@"%@/%@", serverUrlTo, metadata.fileName]];
-            
-    if(!error) {
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+        
+        NSArray *items;
+
+        NSError *error = [[NCNetworkingSync sharedManager] readFile:[NSString stringWithFormat:@"%@/%@", serverUrlTo, metadata.fileName] user:app.activeUser userID:app.activeUserID password:app.activePassword items:&items];
+    
+        if(!error) {
                 
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
                     
-            UIAlertController * alert= [UIAlertController alertControllerWithTitle:NSLocalizedString(@"_error_", nil) message:NSLocalizedString(@"_file_already_exists_", nil) preferredStyle:UIAlertControllerStyleAlert];
-            UIAlertAction* ok = [UIAlertAction actionWithTitle:NSLocalizedString(@"_ok_", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
-            }];
-            [alert addAction:ok];
-            [self presentViewController:alert animated:YES completion:nil];
-        });
+                UIAlertController * alert= [UIAlertController alertControllerWithTitle:NSLocalizedString(@"_error_", nil) message:NSLocalizedString(@"_file_already_exists_", nil) preferredStyle:UIAlertControllerStyleAlert];
+                UIAlertAction* ok = [UIAlertAction actionWithTitle:NSLocalizedString(@"_ok_", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                }];
+                [alert addAction:ok];
+                [self presentViewController:alert animated:YES completion:nil];
             
-        // End Select Table View
-        [self tableViewSelect:NO];
+                // End Select Table View
+                [self tableViewSelect:NO];
             
-        // reload Datasource
-        [self readFileReloadFolder];
+                // reload Datasource
+                [self readFileReloadFolder];
+            });
             
-        return;
-    }
+            return;
+        }
             
-    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
+        CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
         
-    metadataNet.action = actionMoveFileOrFolder;
-    metadataNet.directory = metadata.directory;
-    metadataNet.fileID = metadata.fileID;
-    metadataNet.directoryID = metadata.directoryID;
-    metadataNet.directoryIDTo = directoryIDTo;
-    metadataNet.fileName = metadata.fileName;
-    metadataNet.fileNameView = metadata.fileNameView;
-    metadataNet.fileNameTo = metadata.fileName;
-    metadataNet.etag = metadata.etag;
-    metadataNet.selector = selectorMove;
-    metadataNet.serverUrl = serverUrl;
-    metadataNet.serverUrlTo = serverUrlTo;
+        metadataNet.action = actionMoveFileOrFolder;
+        metadataNet.directory = metadata.directory;
+        metadataNet.fileID = metadata.fileID;
+        metadataNet.directoryID = metadata.directoryID;
+        metadataNet.directoryIDTo = directoryIDTo;
+        metadataNet.fileName = metadata.fileName;
+        metadataNet.fileNameView = metadata.fileNameView;
+        metadataNet.fileNameTo = metadata.fileName;
+        metadataNet.etag = metadata.etag;
+        metadataNet.selector = selectorMove;
+        metadataNet.serverUrl = serverUrl;
+        metadataNet.serverUrlTo = serverUrlTo;
             
-    [_queueSelector addObject:metadataNet.selector];
+        [_queueSelector addObject:metadataNet.selector];
             
-    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
     
-    [_hud visibleHudTitle:[NSString stringWithFormat:NSLocalizedString(@"_move_file_n_", nil), ofFile - numFile + 1, ofFile] mode:MBProgressHUDModeIndeterminate color:nil];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [_hud visibleHudTitle:[NSString stringWithFormat:NSLocalizedString(@"_move_file_n_", nil), ofFile - numFile + 1, ofFile] mode:MBProgressHUDModeIndeterminate color:nil];
+        });
+    });
 }
 
 // DELEGATE : Move

iOSClient/Networking/OCNetworking.h

@@ -42,8 +42,6 @@
 @property (nonatomic, assign) BOOL isExecuting;
 @property (nonatomic, assign) BOOL isFinished;
 
-- (NSError *)readFileSync:(NSString *)filePathName;
-
 @end
 
 @protocol OCNetworkingDelegate <NSObject>

iOSClient/Networking/OCNetworking.m

@@ -905,37 +905,6 @@
     }];
 }
 
-- (NSError *)readFileSync:(NSString *)filePathName
-{
-    OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
-    __block NSError *returnError;
-    
-    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-
-    [communication setCredentialsWithUser:_activeUser andUserID:_activeUserID andPassword:_activePassword];
-    [communication setUserAgent:[CCUtility getUserAgent]];
-    
-    [communication readFile:filePathName onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *items, NSString *redirectedServer) {
-        
-        returnError = nil;
-        dispatch_semaphore_signal(semaphore);
-
-    } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
-        
-        // Request trusted certificated
-        if ([error code] == NSURLErrorServerCertificateUntrusted)
-            [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
-        
-        returnError = error;
-        dispatch_semaphore_signal(semaphore);
-    }];
-    
-    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_NOW))
-        [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:k_timeout_webdav]];
-    
-    return returnError;
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Shared =====
 #pragma --------------------------------------------------------------------------------------------