fix

Picker/DocumentPickerViewController.swift

@@ -283,7 +283,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         self.present(alert, animated: true, completion: nil)
     }
     
-    func readFolderSuccess(_ metadataNet: CCMetadataNet!, permissions: String!, fileID: String!, metadatas: [Any]!) {
+    func readFolderSuccess(_ metadataNet: CCMetadataNet!, permissions: String!, etag: String!, metadatas: [Any]!) {
         
         // remove all record
         var predicate = NSPredicate(format: "account = %@ AND directoryID = %@ AND session = ''", activeAccount!, metadataNet.directoryID!)

iOSClient/Actions/CCActions.swift

@@ -293,7 +293,7 @@ class CCActions: NSObject {
             let directory = CCUtility.stringAppendServerUrl(metadataNet.serverUrl, addFileName: metadataNet.fileName)
             let directoryTo = CCUtility.stringAppendServerUrl(metadataNet.serverUrl, addFileName: metadataNet.fileNameTo)
 
-            NCManageDatabase.sharedInstance.setDirectory(serverUrl: directory!, serverUrlTo: directoryTo!, fileID: nil)
+            NCManageDatabase.sharedInstance.setDirectory(serverUrl: directory!, serverUrlTo: directoryTo!, etag: nil)
             
         } else {
             

iOSClient/Database/NCManageDatabase.swift

@@ -802,7 +802,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func setDirectory(serverUrl: String, serverUrlTo: String?, fileID: String?) {
+    func setDirectory(serverUrl: String, serverUrlTo: String?, etag: String?) {
         
         let tableAccount = self.getAccountActive()
         if tableAccount == nil {
@@ -812,6 +812,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
         
         try! realm.write {
+            
             let results = realm.objects(tableDirectory.self).filter("serverUrl = %@", serverUrl)
             
             if results.count > 0 {
@@ -819,8 +820,8 @@ class NCManageDatabase: NSObject {
                 if serverUrlTo != nil {
                     results[0].serverUrl = serverUrlTo!
                 }
-                if fileID != nil {
-                    results[0].fileID = fileID!
+                if etag != nil {
+                    results[0].etag = etag!
                 }
                 
             }

iOSClient/Favorites/CCSynchronize.m

@@ -195,17 +195,17 @@
 }
 
 // MULTI THREAD
-- (void)readFolderSuccess:(CCMetadataNet *)metadataNet permissions:(NSString *)permissions fileID:(NSString *)fileID metadatas:(NSArray *)metadatas
+- (void)readFolderSuccess:(CCMetadataNet *)metadataNet permissions:(NSString *)permissions etag:(NSString *)etag metadatas:(NSArray *)metadatas
 {
-    tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
-    
-    __block NSMutableArray *metadatasForVerifyChange = [NSMutableArray new];
-    
-    if ([recordAccount.account isEqualToString:metadataNet.account] == NO)
-        return;
-    
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
         
+        tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
+    
+        NSMutableArray *metadatasForVerifyChange = [NSMutableArray new];
+    
+        if ([recordAccount.account isEqualToString:metadataNet.account] == NO)
+            return;
+
         NSArray *recordsInSessions = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND directoryID = %@ AND session != ''", app.activeAccount, metadataNet.directoryID] sorted:nil ascending:NO];
         
         // ----- Test : (DELETE) -----
@@ -276,15 +276,14 @@
                 if (!result)
                     (void)[[NCManageDatabase sharedInstance] addMetadata:metadata activeUrl:app.activeUrl];
               
-                // Load if different fileID
-                
+                // Load if different etag
                 tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", metadataNet.account, serverUrl]];
                 
                 if (![tableDirectory.etag isEqualToString:metadata.etag]) {
                     
-                    [self readFolderServerUrl:serverUrl directoryID:directoryID selector:metadataNet.selector];
+                    [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:serverUrl serverUrlTo:nil etag:metadata.etag];
                     
-                    [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:serverUrl serverUrlTo:nil fileID:metadata.etag];
+                    [self readFolderServerUrl:serverUrl directoryID:directoryID selector:metadataNet.selector];
                 }
                 
             } else {

iOSClient/Main/CCMain.m

@@ -1832,7 +1832,7 @@
         [self changePasswordAccount];
 }
 
-- (void)readFolderSuccess:(CCMetadataNet *)metadataNet permissions:(NSString *)permissions fileID:(NSString *)fileID metadatas:(NSArray *)metadatas
+- (void)readFolderSuccess:(CCMetadataNet *)metadataNet permissions:(NSString *)permissions etag:(NSString *)etag metadatas:(NSArray *)metadatas
 {
     // verify active user
     tableAccount *record = [[NCManageDatabase sharedInstance] getAccountActive];
@@ -1852,7 +1852,7 @@
         
     } else {
         
-        [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil fileID:fileID];
+        [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil etag:etag];
         
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND directoryID = %@ AND session = ''", metadataNet.account, metadataNet.directoryID]];
         
@@ -2033,7 +2033,7 @@
             metadataNet.selector = selectorSearch;
             metadataNet.serverUrl = _serverUrl;
 
-            [self readFolderSuccess:metadataNet permissions:@"" fileID:@"" metadatas:_searchResultMetadatas];
+            [self readFolderSuccess:metadataNet permissions:@"" etag:@"" metadatas:_searchResultMetadatas];
         }
     }
     
@@ -2062,7 +2062,7 @@
 {
     _searchResultMetadatas = [[NSMutableArray alloc] initWithArray:metadatas];
     
-    [self readFolderSuccess:metadataNet permissions:nil fileID:nil metadatas:metadatas];
+    [self readFolderSuccess:metadataNet permissions:nil etag:nil metadatas:metadatas];
 }
 
 - (void)cancelSearchBar

iOSClient/Move/CCMove.m

@@ -278,7 +278,7 @@
     [self presentViewController:alertController animated:YES completion:nil];
 }
 
-- (void)readFolderSuccess:(CCMetadataNet *)metadataNet permissions:(NSString *)permissions fileID:(NSString *)fileID metadatas:(NSArray *)metadatas
+- (void)readFolderSuccess:(CCMetadataNet *)metadataNet permissions:(NSString *)permissions etag:(NSString *)etag metadatas:(NSArray *)metadatas
 {
     // remove all record
     [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND directoryID = %@ AND session = ''", activeAccount, metadataNet.directoryID]];

iOSClient/Networking/OCNetworking.h

@@ -63,7 +63,7 @@
 - (void)uploadFileSuccess:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost;
 - (void)uploadFileFailure:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode;
 
-- (void)readFolderSuccess:(CCMetadataNet *)metadataNet permissions:(NSString *)permissions fileID:(NSString *)fileID metadatas:(NSArray *)metadatas;
+- (void)readFolderSuccess:(CCMetadataNet *)metadataNet permissions:(NSString *)permissions etag:(NSString *)etag metadatas:(NSArray *)metadatas;
 - (void)readFolderFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode;
 
 - (void)createFolderSuccess:(CCMetadataNet *)metadataNet;

iOSClient/Networking/OCNetworking.m

@@ -315,8 +315,8 @@
 
             dispatch_async(dispatch_get_main_queue(), ^{
                 
-                if ([self.delegate respondsToSelector:@selector(readFolderSuccess:permissions:fileID:metadatas:)])
-                    [self.delegate readFolderSuccess:_metadataNet permissions:@"" fileID:@"" metadatas:metadatas];
+                if ([self.delegate respondsToSelector:@selector(readFolderSuccess:permissions:etag:metadatas:)])
+                    [self.delegate readFolderSuccess:_metadataNet permissions:@"" etag:@"" metadatas:metadatas];
             });
 
             [self complete];
@@ -327,7 +327,7 @@
         // directory [0]
         OCFileDto *itemDtoDirectory = [items objectAtIndex:0];
         NSString *permissions = itemDtoDirectory.permissions;
-        NSString *fileIDDirectory = itemDtoDirectory.etag;
+        NSString *etagDirectory = itemDtoDirectory.etag;
         //NSDate *date = [NSDate dateWithTimeIntervalSince1970:itemDtoDirectory.date];
         
         NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:_metadataNet.serverUrl permissions:permissions];
@@ -386,8 +386,8 @@
             
             dispatch_async(dispatch_get_main_queue(), ^{
                 
-                if ([self.delegate respondsToSelector:@selector(readFolderSuccess:permissions:fileID:metadatas:)])
-                    [self.delegate readFolderSuccess:_metadataNet permissions:permissions fileID:fileIDDirectory metadatas:metadatas];
+                if ([self.delegate respondsToSelector:@selector(readFolderSuccess:permissions:etag:metadatas:)])
+                    [self.delegate readFolderSuccess:_metadataNet permissions:permissions etag:etagDirectory metadatas:metadatas];
             });
         });