Browse Source

Improvements synchronize

Marino Faggiana 7 years ago
parent
commit
90613e16d7
2 changed files with 6 additions and 12 deletions
  1. 6 11
      iOSClient/Favorites/CCFavorites.m
  2. 0 1
      iOSClient/Synchronize/CCSynchronize.m

+ 6 - 11
iOSClient/Favorites/CCFavorites.m

@@ -249,23 +249,18 @@
         // insert for test NOT favorite
         [filesEtag addObject:metadata.fileID];
         
-        // Get ServerUrl
         NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
-        serverUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:metadata.fileNameData];
+        NSString *serverUrlSon = [CCUtility stringAppendServerUrl:serverUrl addFileName:metadata.fileNameData];
         
-        if (![serverUrl containsString:father]) {
+        if (![serverUrlSon containsString:father]) {
             
             if (metadata.directory) {
                 
-                NSString *selector;
-                
                 if ([CCUtility getFavoriteOffline])
-                    selector = selectorReadFolderWithDownload;
+                    [[CCSynchronize sharedSynchronize] synchronizedFile:metadata.fileNameData serverUrl:serverUrl selector:selectorReadFileFolderWithDownload];
                 else
-                    selector = selectorReadFolder;
-                
-                [[CCSynchronize sharedSynchronize] synchronizedFolder:serverUrl selector:selector];
-                
+                    [[CCSynchronize sharedSynchronize] synchronizedFile:metadata.fileNameData serverUrl:serverUrl selector:selectorReadFileFolder];
+
             } else {
                 
                 if ([CCUtility getFavoriteOffline])
@@ -274,7 +269,7 @@
                     [[CCSynchronize sharedSynchronize] synchronizedFile:metadata selector:selectorReadFile];
             }
             
-            father = serverUrl;
+            father = serverUrlSon;
         }
     }
     

+ 0 - 1
iOSClient/Synchronize/CCSynchronize.m

@@ -238,7 +238,6 @@
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     
     metadataNet.action = actionReadFile;
-    metadataNet.fileID = @"";
     metadataNet.fileName = fileName;
     metadataNet.priority = NSOperationQueuePriorityLow;
     metadataNet.selector = selector;