dev table directory

iOSClient/FileSystem/CCCoreData.m

@@ -1185,7 +1185,7 @@
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Offline =====
 #pragma --------------------------------------------------------------------------------------------
-
+/*
 + (NSArray *)getHomeOfflineActiveAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser fieldOrder:(NSString *)fieldOrder ascending:(BOOL)ascending
 {
     NSMutableArray *tableMetadatas = [NSMutableArray new];
@@ -1244,6 +1244,7 @@
 
     return [tableMetadatas sortedArrayUsingDescriptors:[NSArray arrayWithObjects:descriptor, nil]];//[NSArray arrayWithArray:tableMetadatas];
 }
+*/
 
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== File System =====

iOSClient/FileSystem/NCDatabase.swift

@@ -110,7 +110,7 @@ class tableCertificates: Object {
 class tableDirectory: Object {
     
     dynamic var account = ""
-    dynamic var dateReadDirectory = NSDate()
+    dynamic var dateReadDirectory: NSDate? = nil
     dynamic var directoryID = ""
     dynamic var favorite: Bool = false
     dynamic var fileID = ""

iOSClient/FileSystem/NCManageDatabase.swift

@@ -1562,6 +1562,40 @@ class NCManageDatabase: NSObject {
             realm.delete(results)
         }
     }
+    
+    func clearDateRead(_ serverUrl: String?, directoryID: String?) {
+        
+        let tableAccount = self.getAccountActive()
+        if tableAccount == nil {
+            return
+        }
+        
+        let realm = try! Realm()
+        
+        try! realm.write {
+            
+            var results : Results<tableDirectory>?
+            
+            if serverUrl != nil {
+                results = realm.objects(tableDirectory.self).filter("serverUrl = %@", serverUrl!)
+            }
+        
+            if directoryID != nil {
+                results = realm.objects(tableDirectory.self).filter("directoryID = %@", directoryID!)
+            }
+        
+            if results != nil {
+                
+                if results!.count > 0 {
+                
+                    results![0].dateReadDirectory = nil
+                    results![0].rev = ""
+                    realm.add(results!, update: true)
+                }
+            }
+        }
+    }
+
 
     func getTableDirectoryWithPreficate(_ predicate: NSPredicate) -> tableDirectory? {
         

iOSClient/Main/CCMain.m

@@ -2235,8 +2235,7 @@
             
             // Add new directory
             NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", serverUrlTo, fileName];
-                    
-            [CCCoreData addDirectory:newDirectory permissions:nil activeAccount:app.activeAccount];
+            NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectory:newDirectory permissions:@""];
             
             // Check Offline
             if ([CCCoreData isOfflineDirectoryServerUrl:serverUrlTo activeAccount:app.activeAccount])
@@ -2384,9 +2383,8 @@
 {
     [_hud hideHud];
     
-    NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName];
-    
-    [CCCoreData addDirectory:newDirectory permissions:nil activeAccount:app.activeAccount];
+    NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName];    
+    (void)[[NCManageDatabase sharedInstance] addDirectory:newDirectory permissions:@""];
     
     // Check Offline
     if ([CCCoreData isOfflineDirectoryServerUrl:_serverUrl activeAccount:app.activeAccount])

iOSClient/Move/CCMove.m

@@ -358,7 +358,7 @@
 {
     [_hud hideHud];
     
-    [CCCoreData addDirectory:[NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName] permissions:nil activeAccount:activeAccount];
+    (void)[[NCManageDatabase sharedInstance] addDirectory:[NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName] permissions:@""];
     
     // Load Folder or the Datasource
     [self readFolder];

iOSClient/Networking/OCNetworking.m

@@ -330,8 +330,8 @@
         NSString *fileIDDirectory = itemDtoDirectory.etag;
         //NSDate *date = [NSDate dateWithTimeIntervalSince1970:itemDtoDirectory.date];
         
-        NSString *directoryID = [CCCoreData addDirectory:_metadataNet.serverUrl permissions:permissions activeAccount:_metadataNet.account];
-                
+        NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectory:_metadataNet.serverUrl permissions:permissions];
+        
         NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
         NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPath:_activeUrl];
         
@@ -365,7 +365,7 @@
                         NSString *serverUrl = [CCUtility stringAppendServerUrl:_metadataNet.serverUrl addFileName:fileName];
                         
                         dispatch_async(dispatch_get_main_queue(), ^{
-                            [CCCoreData addDirectory:serverUrl permissions:nil activeAccount:_metadataNet.account];
+                            (void)[[NCManageDatabase sharedInstance] addDirectory:serverUrl permissions:permissions];
                         });
                     }
                     
@@ -475,7 +475,7 @@
             
             serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
             
-            NSString *directoryID = [CCCoreData addDirectory:serverUrl permissions:itemDto.permissions activeAccount:_metadataNet.account];
+            NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectory:serverUrl permissions:itemDto.permissions];
 
             [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
         }
@@ -621,7 +621,7 @@
             
             serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
             
-            NSString *directoryID = [CCCoreData addDirectory:serverUrl permissions:itemDto.permissions activeAccount:_metadataNet.account];
+            NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectory:serverUrl permissions:itemDto.permissions];
             
             [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
         }
@@ -741,11 +741,9 @@
         
     } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
         
-        tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
-
         [communication createFolder:folderPathName onCommunication:communication withForbiddenCharactersSupported:YES successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
             
-            [CCCoreData clearDateReadAccount:recordAccount.account serverUrl:[CCUtility deletingLastPathComponentFromServerUrl:folderPathName] directoryID:nil];
+            [[NCManageDatabase sharedInstance] clearDateRead:[CCUtility deletingLastPathComponentFromServerUrl:folderPathName] directoryID:nil];
             
             dispatch_semaphore_signal(semaphore);