浏览代码

change errata parameter

marinofaggiana 5 年之前
父节点
当前提交
94b9ecc719
共有 3 个文件被更改,包括 9 次插入5 次删除
  1. 1 1
      iOSClient/CCGlobal.h
  2. 2 2
      iOSClient/Database/NCDatabase.swift
  3. 6 2
      iOSClient/Database/NCManageDatabase.swift

+ 1 - 1
iOSClient/CCGlobal.h

@@ -84,7 +84,7 @@
 
 // Database Realm
 #define k_databaseDefault                               @"nextcloud.realm"
-#define k_databaseSchemaVersion                         93
+#define k_databaseSchemaVersion                         94
 
 // Intro selector
 #define k_intro_login                                   0

+ 2 - 2
iOSClient/Database/NCDatabase.swift

@@ -289,12 +289,12 @@ class tableE2eEncryptionLock: Object {
 
     @objc dynamic var account = ""
     @objc dynamic var date = NSDate()
-    @objc dynamic var ocId = ""
+    @objc dynamic var fileId = ""
     @objc dynamic var serverUrl = ""
     @objc dynamic var token = ""
     
     override static func primaryKey() -> String {
-        return "ocId"
+        return "fileId"
     }
 }
 

+ 6 - 2
iOSClient/Database/NCManageDatabase.swift

@@ -127,6 +127,10 @@ class NCManageDatabase: NSObject {
                         migration.deleteData(forType: tableMetadata.className())
                     }
                     
+                    if oldSchemaVersion < 94 {
+                        migration.deleteData(forType: tableE2eEncryptionLock.className())
+                    }
+                    
                 }, shouldCompactOnLaunch: { totalBytes, usedBytes in
                     
                     // totalBytes refers to the size of the file on disk in bytes (data + free space)
@@ -1619,7 +1623,7 @@ class NCManageDatabase: NSObject {
         return tableE2eEncryptionLock.init(value: result)
     }
     
-    @objc func setE2ETokenLock(serverUrl: String, ocId: String, token: String) {
+    @objc func setE2ETokenLock(serverUrl: String, fileId: String, token: String) {
         
         guard let tableAccount = self.getAccountActive() else {
             return
@@ -1632,7 +1636,7 @@ class NCManageDatabase: NSObject {
         let addObject = tableE2eEncryptionLock()
                 
         addObject.account = tableAccount.account
-        addObject.ocId = ocId
+        addObject.fileId = fileId
         addObject.serverUrl = serverUrl
         addObject.token = token