filter

iOSClient/Actions/CCActions.swift

@@ -325,36 +325,18 @@ class CCActions: NSObject {
     
     func search(_ serverUrl : String, fileName : String, depth : String, delegate: AnyObject) {
         
-        let versionServer = CCCoreData.getServerVersionMajorActiveAccount(appDelegate.activeAccount)
-        
-        if (versionServer < 12) {
-            
-            let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
-
-            metadataNet.action = actionReadFolder;
-            metadataNet.directoryID = CCCoreData.getDirectoryID(fromServerUrl: serverUrl, activeAccount: appDelegate.activeUser)
-            metadataNet.delegate = delegate
-            metadataNet.fileName = fileName
-            metadataNet.selector = selectorSearch
-            metadataNet.serverUrl = serverUrl
-
-            appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
-            
-        } else {
+        // Search DAV API
             
-            // Search DAV API
-            
-            let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
+        let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
             
-            metadataNet.action = actionSearch
-            metadataNet.delegate = delegate
-            metadataNet.fileName = fileName
-            metadataNet.options = depth
-            metadataNet.selector = selectorSearch
-            metadataNet.serverUrl = serverUrl
+        metadataNet.action = actionSearch
+        metadataNet.delegate = delegate
+        metadataNet.fileName = fileName
+        metadataNet.options = depth
+        metadataNet.selector = selectorSearch
+        metadataNet.serverUrl = serverUrl
 
-            appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
-        }
+        appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
     }
     
     func searchSuccess(_ metadataNet: CCMetadataNet, metadatas: [CCMetadata]) {

iOSClient/Main/CCMain.m

@@ -1939,6 +1939,12 @@
             
         } else {
             
+            NSMutableArray *metadatas = [NSMutableArray new];
+            NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount];
+            NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(directoryID == %@) AND (account == %@) AND (fileNamePrint CONTAINS[cd] %@)", directoryID, app.activeAccount, fileName];
+            
+            NSArray *records = [CCCoreData getTableMetadataWithPredicate:predicate context:nil];
+            
             [self readFolderSuccess:nil permissions:@"" etag:@"" metadatas:nil];
         }
     }

iOSClient/Networking/OCNetworking.m

@@ -378,8 +378,8 @@
                 OCFileDto *itemDto = [itemsSortedArray objectAtIndex:i];
                 itemDto.fileName = [itemDto.fileName stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
                 
-                // Not in Crypto Cloud Mode OR Search skip File Crypto
-                if (_isCryptoCloudMode == NO || [_metadataNet.selector isEqualToString:selectorSearch]) {
+                // Not in Crypto Cloud Mode skip File Crypto
+                if (_isCryptoCloudMode == NO) {
                     
                     NSString *fileName = itemDto.fileName;
                     
@@ -403,26 +403,13 @@
                 }
                 // ------------------------
                 
-                // Starting with [itemDto.fileName.lowercaseString hasPrefix:_metadataNet.fileName.lowercaseString]
-                if ([_metadataNet.selector isEqualToString:selectorSearch] && [itemDto.fileName.lowercaseString containsString:_metadataNet.fileName.lowercaseString]) {
-                    
-                    [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
-                }
-                
-                if ([_metadataNet.selector containsString:selectorReadFolder]) {
-                    
-                    [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
-                }
+                [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
             }
             
             dispatch_async(dispatch_get_main_queue(), ^{
                 
-                if ([_metadataNet.selector containsString:selectorReadFolder] && [self.delegate respondsToSelector:@selector(readFolderSuccess:permissions:etag:metadatas:)])
+                if ([self.delegate respondsToSelector:@selector(readFolderSuccess:permissions:etag:metadatas:)])
                     [self.delegate readFolderSuccess:_metadataNet permissions:permissions etag:etagDirectory metadatas:metadatas];
-
-                if ([_metadataNet.selector isEqualToString:selectorSearch] && [self.delegate respondsToSelector:@selector(searchSuccess:metadatas:)])
-                    [self.delegate searchSuccess:_metadataNet metadatas:metadatas];
-        
             });
         });
         
@@ -434,12 +421,9 @@
         if (errorCode == 0)
             errorCode = error.code;
         
-        if ([_metadataNet.selector containsString:selectorReadFolder] && [self.delegate respondsToSelector:@selector(readFolderFailure:message:errorCode:)])
+        if ([self.delegate respondsToSelector:@selector(readFolderFailure:message:errorCode:)])
             [self.delegate readFolderFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
-        
-        if ([_metadataNet.selector isEqualToString:selectorSearch] && [self.delegate respondsToSelector:@selector(searchFailure:message:errorCode:)])
-            [self.delegate searchFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
-
+    
         // Request trusted certificated
         if ([error code] == NSURLErrorServerCertificateUntrusted)
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];