Marino Faggiana 8 år sedan
förälder
incheckning
b0c54d3066
2 ändrade filer med 9 tillägg och 4 borttagningar
  1. 4 3
      iOSClient/Actions/CCActions.swift
  2. 5 1
      iOSClient/Main/CCMain.m

+ 4 - 3
iOSClient/Actions/CCActions.swift

@@ -287,7 +287,7 @@ class CCActions: NSObject {
     // MARK: Search
     // --------------------------------------------------------------------------------------------
     
-    func search(_ serverUrl : String?, fileName : String, delegate: AnyObject) {
+    func search(_ serverUrl : String, fileName : String, depth : String, delegate: AnyObject) {
         
         let versionServer = CCCoreData.getServerVersionActiveAccount(appDelegate.activeAccount)
         
@@ -300,7 +300,7 @@ class CCActions: NSObject {
             metadataNet.delegate = delegate
             metadataNet.fileName = fileName
             metadataNet.selector = selectorSearch
-            metadataNet.serverUrl = serverUrl!
+            metadataNet.serverUrl = serverUrl
 
             appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
             
@@ -313,8 +313,9 @@ class CCActions: NSObject {
             metadataNet.action = actionSearch
             metadataNet.delegate = delegate
             metadataNet.fileName = fileName
+            metadataNet.options = depth
             metadataNet.selector = selectorSearch
-            metadataNet.serverUrl = serverUrl!
+            metadataNet.serverUrl = serverUrl
 
             appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
         }

+ 5 - 1
iOSClient/Main/CCMain.m

@@ -1883,8 +1883,12 @@
     if (fileName.length >= k_minCharsSearch && [fileName isEqualToString:_searchFileName] == NO) {
         
         _searchFileName = fileName;
+        NSString *depth = @"1";
         
-        [[CCActions sharedInstance] search:_serverUrl fileName:_searchFileName delegate:self];
+        if ([[CCUtility getHomeServerUrlActiveUrl:app.activeUrl] isEqualToString:_serverUrl])
+            depth = @"infinity";
+        
+        [[CCActions sharedInstance] search:_serverUrl fileName:_searchFileName depth:depth delegate:self];
     }
     
     if (_searchResultMetadatas.count == 0 && fileName.length == 0) {