Marino Faggiana 6 years ago
parent
commit
45b8c55eaa

+ 2 - 2
iOSClient/AppDelegate.m

@@ -1509,8 +1509,8 @@
     // VERSION == 2.22.8
     if ([actualVersion isEqualToString:@"2.22.8"]) {
         
-        // Build < 37
-        if (([actualBuild compare:@"37" options:NSNumericSearch] == NSOrderedAscending) || actualBuild == nil) {
+        // Build < 19
+        if (([actualBuild compare:@"19" options:NSNumericSearch] == NSOrderedAscending) || actualBuild == nil) {
             
             NSArray *directories = [[NCManageDatabase sharedInstance] getTablesDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"serverUrl != ''"] sorted:@"account" ascending:NO];
 

+ 0 - 2
iOSClient/Database/NCManageDatabase.swift

@@ -1489,7 +1489,6 @@ class NCManageDatabase: NSObject {
         
         let serverUrl = metadata.serverUrl
         let account = metadata.account
-        metadata.metadataID = CCUtility.createMetadataID(fromAccount: metadata.account, serverUrl: metadata.serverUrl, fileName: metadata.fileName, directory: metadata.directory)
         
         let realm = try! Realm()
 
@@ -1520,7 +1519,6 @@ class NCManageDatabase: NSObject {
         do {
             try realm.write {
                 for metadata in metadatas {
-                    metadata.metadataID = CCUtility.createMetadataID(fromAccount: metadata.account, serverUrl: metadata.serverUrl, fileName: metadata.fileName, directory: metadata.directory)
                     directoryToClearDate[metadata.serverUrl] = metadata.account
                     realm.add(metadata, update: true)
                 }

+ 2 - 0
iOSClient/Utility/CCUtility.m

@@ -1177,6 +1177,7 @@
     metadata.fileID = fileID;
     metadata.fileName = fileName;
     metadata.fileNameView = fileName;
+    metadata.metadataID = [self createMetadataIDFromAccount:account serverUrl:serverUrl fileName:fileName directory:directory];
     metadata.serverUrl = serverUrl;
     metadata.size = size;
     metadata.status = status;
@@ -1213,6 +1214,7 @@
     metadata.fileNameView = fileNameView;
     metadata.hasPreview = itemDto.hasPreview;
     metadata.iconName = @"";
+    metadata.metadataID = [self createMetadataIDFromAccount:activeAccount serverUrl:serverUrl fileName:fileName directory:itemDto.isDirectory];
     metadata.permissions = itemDto.permissions;
     metadata.serverUrl = serverUrl;
     metadata.sessionTaskIdentifier = k_taskIdentifierDone;