fix

iOSClient/AutoUpload/NCAutoUpload.m

@@ -485,7 +485,7 @@
         
         tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", appDelegate.activeAccount, folderPhotos]];
         if (!tableDirectory)
-            (void)[[NCManageDatabase sharedInstance] addDirectoryWithDateReadDirectory:nil encrypted:encrypted etag:nil favorite:false fileID:fileID permissions:nil serverUrl:folderPhotos];
+            (void)[[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:encrypted favorite:false fileID:fileID permissions:nil serverUrl:folderPhotos];
         
     } else {
         
@@ -509,7 +509,7 @@
             
             if ( error == nil) {
                 
-                (void)[[NCManageDatabase sharedInstance] addDirectoryWithDateReadDirectory:nil encrypted:encrypted etag:nil favorite:false fileID:fileID permissions:nil serverUrl:folderPathName];
+                (void)[[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:encrypted favorite:false fileID:fileID permissions:nil serverUrl:folderPathName];
                 
             } else {
                 

iOSClient/Database/NCManageDatabase.swift

@@ -701,7 +701,7 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Directory
     
-    @objc func addDirectory(dateReadDirectory: NSDate?, encrypted: Bool, etag: String?, favorite: Bool, fileID: String?, permissions: String?, serverUrl: String) -> tableDirectory? {
+    @objc func addDirectory(encrypted: Bool, favorite: Bool, fileID: String?, permissions: String?, serverUrl: String) -> tableDirectory? {
         
         guard let tableAccount = self.getAccountActive() else {
             return nil
@@ -720,14 +720,8 @@ class NCManageDatabase: NSObject {
                     result = tableDirectory()
                     result!.account = tableAccount.account
                 
-                    if let dateReadDirectory = dateReadDirectory {
-                        result!.dateReadDirectory = dateReadDirectory
-                    }
                     result!.directoryID = NSUUID().uuidString.replacingOccurrences(of: "-", with: "").lowercased()
                     result!.e2eEncrypted = encrypted
-                    if let etag = etag {
-                        result!.etag = etag
-                    }
                     result!.favorite = favorite
                     if let fileID = fileID {
                         result!.fileID = fileID
@@ -740,13 +734,7 @@ class NCManageDatabase: NSObject {
                 
                 } else {
                 
-                    if let dateReadDirectory = dateReadDirectory {
-                        result!.dateReadDirectory = dateReadDirectory
-                    }
                     result!.e2eEncrypted = encrypted
-                    if let etag = etag {
-                        result!.etag = etag
-                    }
                     result!.favorite = favorite
                     if let fileID = fileID {
                         result!.fileID = fileID
@@ -904,7 +892,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
         
         guard let result = realm.objects(tableDirectory.self).filter("account = %@ AND serverUrl = %@", tableAccount.account,serverUrl).first else {
-            return self.addDirectory(dateReadDirectory: nil, encrypted: false, etag: nil, favorite: false, fileID: nil, permissions: nil, serverUrl: serverUrl)?.directoryID
+            return self.addDirectory(encrypted: false, favorite: false, fileID: nil, permissions: nil, serverUrl: serverUrl)?.directoryID
         }
         
         return result.directoryID

iOSClient/Main/CCMain.m

@@ -2212,7 +2212,7 @@
             
             // Add new directory
             NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", serverUrlTo, fileName];
-            (void) [[NCManageDatabase sharedInstance] addDirectoryWithDateReadDirectory:nil encrypted:false etag:nil favorite:false fileID:nil permissions:nil serverUrl:newDirectory];
+            (void) [[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:false favorite:false fileID:nil permissions:nil serverUrl:newDirectory];
         }
     
         // next

iOSClient/Networking/OCNetworking.m

@@ -242,7 +242,7 @@
             OCFileDto *itemDtoFolder = [items objectAtIndex:0];
             //NSDate *date = [NSDate dateWithTimeIntervalSince1970:itemDtoDirectory.date];
         
-            NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithDateReadDirectory:nil encrypted:itemDtoFolder.isEncrypted etag:itemDtoFolder.etag favorite:itemDtoFolder.isFavorite fileID:itemDtoFolder.ocId permissions:itemDtoFolder.permissions serverUrl:_metadataNet.serverUrl].directoryID;
+            NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:itemDtoFolder.isEncrypted favorite:itemDtoFolder.isFavorite fileID:itemDtoFolder.ocId permissions:itemDtoFolder.permissions serverUrl:_metadataNet.serverUrl].directoryID;
             
             _metadataNet.directoryID = directoryID;
 
@@ -303,7 +303,7 @@
                         
                     serverUrl = [CCUtility stringAppendServerUrl:_metadataNet.serverUrl addFileName:fileName];
                         
-                    (void)[[NCManageDatabase sharedInstance] addDirectoryWithDateReadDirectory:nil encrypted:itemDto.isEncrypted etag:itemDto.etag favorite:itemDto.isFavorite fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:serverUrl];
+                    (void)[[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:itemDto.isEncrypted favorite:itemDto.isFavorite fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:serverUrl];
                 }
                 
                 // ----- BUG #942 ---------
@@ -432,7 +432,7 @@
             
                 serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
 
-                NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithDateReadDirectory:nil encrypted:itemDto.isEncrypted etag:itemDto.etag favorite:itemDto.isFavorite fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:serverUrl].directoryID;
+                NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:itemDto.isEncrypted favorite:itemDto.isFavorite fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:serverUrl].directoryID;
                 
                 BOOL isFolderEncrypted = [CCUtility isFolderEncrypted:serverUrl account:_metadataNet.account];
 
@@ -575,30 +575,6 @@
             }
             // ------------------------
             
-            /*
-             NSRange firstInstance = [itemDto.filePath rangeOfString:[NSString stringWithFormat:@"%@/files/%@", dav, _activeUserID]];
-             NSRange finalRange = NSMakeRange(firstInstance.location + firstInstance.length, itemDto.filePath.length-(firstInstance.location + firstInstance.length));
-             
-             if (finalRange.location != NSNotFound && finalRange.location + finalRange.length <= itemDto.filePath.length) {
-             // It's safe to use range on str
-             serverUrl = [itemDto.filePath substringWithRange:finalRange];
-             } else {
-             continue;
-             }
-             
-            if ([serverUrl hasPrefix:@"/"])
-                serverUrl = [serverUrl substringFromIndex:1];
-            if ([serverUrl hasSuffix:@"/"])
-                serverUrl = [serverUrl substringToIndex:[serverUrl length] - 1];
-            
-            serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
-
-            NSString *directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:serverUrl fileID:itemDto.ocId permissions:itemDto.permissions encrypted:itemDto.isEncrypted];
-            BOOL isFolderEncrypted = [CCUtility isFolderEncrypted:serverUrl account:_metadataNet.account];
-            
-            [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileName:itemDto.fileName serverUrl:serverUrl directoryID:directoryID autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory activeAccount:_metadataNet.account directoryUser:directoryUser isFolderEncrypted:isFolderEncrypted]];
-            */
-            
             serverUrl = [itemDto.filePath stringByReplacingOccurrencesOfString:[NSString stringWithFormat:@"%@/files/%@", dav, _activeUserID] withString:@""];
             if ([serverUrl hasPrefix:@"/"])
                 serverUrl = [serverUrl substringFromIndex:1];
@@ -607,14 +583,13 @@
             serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
             
             if (itemDto.isDirectory) {
-                //serverUrl = [NSString stringWithFormat:@"%@/%@", serverUrl, fileName];
-                directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithDateReadDirectory:[NSDate date] encrypted:itemDto.isEncrypted etag:itemDto.etag favorite:itemDto.etag fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:serverUrl].directoryID;
                 isFolderEncrypted = itemDto.isEncrypted;
+                directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:isFolderEncrypted favorite:true fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:serverUrl].directoryID;
             } else {
-                directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrl];
                 isFolderEncrypted = [CCUtility isFolderEncrypted:serverUrl account:_metadataNet.account];
+                directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrl];
             }
-
+            
             [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileName:itemDto.fileName serverUrl:serverUrl directoryID:directoryID autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory activeAccount:_metadataNet.account directoryUser:directoryUser isFolderEncrypted:isFolderEncrypted]];
         }
         

iOSClient/Synchronize/CCSynchronize.m

@@ -310,7 +310,7 @@
             tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", metadataNet.account, serverUrl]];
             
             if (!tableDirectory) {
-                tableDirectory = [[NCManageDatabase sharedInstance] addDirectoryWithDateReadDirectory:[NSDate date] encrypted:metadata.e2eEncrypted etag:metadata.etag favorite:metadata.favorite fileID:metadata.fileID permissions:metadata.permissions serverUrl:serverUrl];
+                tableDirectory = [[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:metadata.e2eEncrypted  favorite:metadata.favorite fileID:metadata.fileID permissions:metadata.permissions serverUrl:serverUrl];
             }
             
             // Verify changed etag