refactoring

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Data/NCManageDatabase+E2EE.swift

@@ -30,7 +30,7 @@ class tableE2eEncryption: Object {
 
     @objc dynamic var account = ""
     @objc dynamic var authenticationTag: String = ""
-    @objc dynamic var blob = ""
+    @objc dynamic var blob = "files"
     @objc dynamic var fileName = ""
     @objc dynamic var fileNameIdentifier = ""
     @objc dynamic var fileNamePath = ""
@@ -41,7 +41,7 @@ class tableE2eEncryption: Object {
     @objc dynamic var metadataVersion: Int = 0
     @objc dynamic var mimeType = ""
     @objc dynamic var serverUrl = ""
-    @objc dynamic var version: Int = 0
+    @objc dynamic var version: Int = 1
 
     override static func primaryKey() -> String {
         return "fileNamePath"

iOSClient/NCGlobal.swift

@@ -114,7 +114,7 @@ class NCGlobal: NSObject {
     // Database Realm
     //
     let databaseDefault                             = "nextcloud.realm"
-    let databaseSchemaVersion: UInt64               = 265
+    let databaseSchemaVersion: UInt64               = 266
     let fileAccounts: String                        = "accounts.json"
 
     // Intro selector

iOSClient/Networking/E2EE/NCEndToEndMetadata.swift

@@ -74,7 +74,7 @@ class NCEndToEndMetadata: NSObject {
 
         let jsonEncoder = JSONEncoder()
         var metadataKeys: [String: String] = [:]
-        var metadataKeysVersion: Int = 0
+        var metadataVersion: Int = 1
         var files: [String: E2ee.Files] = [:]
         var filesCodable: [String: E2ee.Files]?
         var filedrop: [String: E2ee.Filedrop] = [:]
@@ -133,7 +133,7 @@ class NCEndToEndMetadata: NSObject {
         }
 
         // Create Json
-        let metadata = E2ee.Metadata(metadataKeys: metadataKeys, version: metadataKeysVersion)
+        let metadata = E2ee.Metadata(metadataKeys: metadataKeys, version: metadataVersion)
         if !files.isEmpty { filesCodable = files }
         if !filedrop.isEmpty { filedropCodable = filedrop }
         let e2ee = E2ee(metadata: metadata, files: filesCodable, filedrop: filedropCodable)