Marino Faggiana 6 年之前
父节点
当前提交
c3c2338175
共有 3 个文件被更改,包括 2 次插入7 次删除
  1. 0 2
      iOSClient/Database/NCDatabase.swift
  2. 2 3
      iOSClient/Database/NCManageDatabase.swift
  3. 0 2
      iOSClient/Utility/CCUtility.m

+ 0 - 2
iOSClient/Database/NCDatabase.swift

@@ -210,7 +210,6 @@ class tableMetadata: Object {
     @objc dynamic var fileNameView = ""
     @objc dynamic var hasPreview: Int = -1
     @objc dynamic var iconName = ""
-    @objc dynamic var metadataID = ""
     @objc dynamic var permissions = ""
     @objc dynamic var serverUrl = ""
     @objc dynamic var session = ""
@@ -241,7 +240,6 @@ class tablePhotos: Object {
     @objc dynamic var fileNameView = ""
     @objc dynamic var hasPreview: Int = -1
     @objc dynamic var iconName = ""
-    @objc dynamic var metadataID = ""
     @objc dynamic var permissions = ""
     @objc dynamic var serverUrl = ""
     @objc dynamic var session = ""

+ 2 - 3
iOSClient/Database/NCManageDatabase.swift

@@ -57,7 +57,7 @@ class NCManageDatabase: NSObject {
         let config = Realm.Configuration(
         
             fileURL: dirGroup?.appendingPathComponent("\(k_appDatabaseNextcloud)/\(k_databaseDefault)"),
-            schemaVersion: 37,
+            schemaVersion: 38,
             
             // 10 : Version 2.18.0
             // 11 : Version 2.18.2
@@ -87,6 +87,7 @@ class NCManageDatabase: NSObject {
             // 35 : Version 2.22.8.14
             // 36 : Version 2.22.8.14
             // 37 : Version 2.22.8.14
+            // 38 : Version 2.22.8.20
 
             migrationBlock: { migration, oldSchemaVersion in
                 // We haven’t migrated anything yet, so oldSchemaVersion == 0
@@ -1574,7 +1575,6 @@ class NCManageDatabase: NSObject {
         
                 for result in results {
                     result.serverUrl = serverUrlTo
-                    result.metadataID = CCUtility.createMetadataID(fromAccount: result.account, serverUrl: serverUrlTo, fileNameView: result.fileNameView, directory: result.directory)
                 }
             }
         } catch let error {
@@ -1614,7 +1614,6 @@ class NCManageDatabase: NSObject {
                 if result != nil {
                     result!.fileName = fileNameTo
                     result!.fileNameView = fileNameTo
-                    result!.metadataID = CCUtility.createMetadataID(fromAccount: result!.account, serverUrl: result!.serverUrl, fileNameView: fileNameTo, directory: result!.directory)
                 }
             }
         } catch let error {

+ 0 - 2
iOSClient/Utility/CCUtility.m

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