coding

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

Brand/Database.swift

@@ -26,4 +26,4 @@ import Foundation
 // Database Realm
 //
 let databaseName                    = "nextcloud.realm"
-let databaseSchemaVersion: UInt64   = 266
+let databaseSchemaVersion: UInt64   = 267

iOSClient/Data/NCManageDatabase+E2EE.swift

@@ -38,10 +38,10 @@ class tableE2eEncryption: Object {
     @objc dynamic var initializationVector = ""
     @objc dynamic var metadataKey = ""
     @objc dynamic var metadataKeyIndex: Int = 0
-    @objc dynamic var metadataVersion: Int = 1
+    @objc dynamic var metadataVersion: Double = 0
     @objc dynamic var mimeType = ""
     @objc dynamic var serverUrl = ""
-    @objc dynamic var version: Int = 1
+    @objc dynamic var version: Double = 1.2
 
     override static func primaryKey() -> String {
         return "fileNamePath"

iOSClient/NCGlobal.swift

@@ -127,8 +127,8 @@ class NCGlobal: NSObject {
     //
     let e2eeMaxFileSize: UInt64                     = 500000000     // 500 MB
     let e2eePassphraseTest                          = "more over television factory tendency independence international intellectual impress interest sentence pony"
-    @objc let e2eeVersion                           = "2"
-    
+    @objc let e2eeVersion                           = "1.1"
+
     // Video
     //
     let maxHTTPCache: Int64                         = 10000000000   // 10 GB

iOSClient/Networking/E2EE/NCEndToEndMetadata.swift

@@ -30,14 +30,14 @@ class NCEndToEndMetadata: NSObject {
 
         struct Metadata: Codable {
             let metadataKeys: [String: String]
-            let version: Int
+            let version: Double
         }
 
         struct Encrypted: Codable {
             let key: String
             let filename: String
             let mimetype: String
-            let version: Int
+            let version: Double
         }
 
         struct Files: Codable {
@@ -55,14 +55,14 @@ class NCEndToEndMetadata: NSObject {
 
         struct Metadata: Codable {
             let metadataKey: String
-            let version: Int
+            let version: Double
         }
 
         struct Encrypted: Codable {
             let key: String
             let filename: String
             let mimetype: String
-            let version: Int
+            let version: Double
         }
 
         struct Files: Codable {
@@ -90,7 +90,7 @@ class NCEndToEndMetadata: NSObject {
 
         let encoder = JSONEncoder()
         var metadataKey: String = ""
-        let metadataVersion: Int = Int(1.2)
+        let metadataVersion = 1.2
         var files: [String: E2eeV12.Files] = [:]
         var filesCodable: [String: E2eeV12.Files]?
         var filedrop: [String: E2eeV12.Filedrop] = [:]
@@ -200,7 +200,7 @@ class NCEndToEndMetadata: NSObject {
             let metadata = json.metadata
             let files = json.files
             var metadataKeys: [String: String] = [:]
-            let metadataVersion: Int = metadata.version
+            let metadataVersion = metadata.version
 
             //
             // metadata
@@ -304,6 +304,7 @@ class NCEndToEndMetadata: NSObject {
             let files = json.files
             let filedrop = json.filedrop
             var metadataKey = ""
+            let metadataVersion = metadata.version
 
             //
             // metadata
@@ -349,11 +350,10 @@ class NCEndToEndMetadata: NSObject {
                                 object.key = encrypted.key
                                 object.initializationVector = initializationVector
                                 object.metadataKey = metadataKey
-                                object.metadataKeyIndex = 0
-                                object.metadataVersion = 0
+                                object.metadataVersion = metadataVersion
                                 object.mimeType = encrypted.mimetype
                                 object.serverUrl = serverUrl
-                                object.version = 0 // encrypted.version
+                                object.version = encrypted.version
 
                                 // If exists remove records
                                 NCManageDatabase.shared.deleteE2eEncryption(predicate: NSPredicate(format: "account == %@ AND fileNamePath == %@", object.account, object.fileNamePath))
@@ -421,8 +421,7 @@ class NCEndToEndMetadata: NSObject {
                                 object.key = encrypted.key
                                 object.initializationVector = initializationVector
                                 object.metadataKey = metadataKey
-                                object.metadataKeyIndex = 0
-                                object.metadataVersion = 0
+                                object.metadataVersion = metadataVersion
                                 object.mimeType = encrypted.mimetype
                                 object.serverUrl = serverUrl
                                 object.version = encrypted.version

iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift

@@ -167,7 +167,6 @@ class NCNetworkingE2EEUpload: NSObject {
         objectE2eEncryption.initializationVector = initializationVector! as String
         objectE2eEncryption.mimeType = metadata.contentType
         objectE2eEncryption.serverUrl = metadata.serverUrl
-        objectE2eEncryption.version = 1
         NCManageDatabase.shared.addE2eEncryption(objectE2eEncryption)
 
         // Rebuild metadata