coding

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

iOSClient/Networking/E2EE/NCEndToEndMetadata.swift

@@ -126,13 +126,24 @@ class NCEndToEndMetadata: NSObject {
         let filedropKey: String
     }
 
-
     // --------------------------------------------------------------------------------------------
-    // MARK: Encode JSON Metadata V2.0
+    // MARK: Encode JSON Metadata Bridge
     // --------------------------------------------------------------------------------------------
 
     func encoderMetadata(_ items: [tableE2eEncryption], account: String, serverUrl: String) -> String? {
 
+        let e2EEApiVersion = NCGlobal.shared.capabilityE2EEApiVersion
+
+        switch e2EEApiVersion {
+        case "1.2":
+            return encoderMetadataV12(items, account: account, serverUrl: serverUrl)
+        default:
+            return nil
+        }
+    }
+
+    func encoderMetadataV12(_ items: [tableE2eEncryption], account: String, serverUrl: String) -> String? {
+
         let encoder = JSONEncoder()
         var metadataKey: String = ""
         let metadataVersion = 1.2

iOSClient/Networking/E2EE/NCNetworkingE2EE.swift

@@ -31,15 +31,6 @@ class NCNetworkingE2EE: NSObject {
         return instance
     }()
 
-    func isE2EEVersionWriteable(account: String) -> NKError? {
-
-        if NCGlobal.shared.e2eeReadVersions.last == NCGlobal.shared.capabilityE2EEApiVersion {
-            return nil
-        }
-        
-        return NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_e2e_error_not_versionwriteable_")
-    }
-
     func generateRandomIdentifier() -> String {
 
         var UUID = NSUUID().uuidString

iOSClient/Networking/E2EE/NCNetworkingE2EECreateFolder.swift

@@ -34,10 +34,6 @@ class NCNetworkingE2EECreateFolder: NSObject {
 
     func createFolderAndMarkE2EE(fileName: String, serverUrl: String, account: String) async -> NKError {
 
-        if let error = NCNetworkingE2EE.shared.isE2EEVersionWriteable(account: account) {
-            return error
-        }
-
         let serverUrlFileName = serverUrl + "/" + fileName
         var error = NKError()
 
@@ -80,10 +76,6 @@ class NCNetworkingE2EECreateFolder: NSObject {
 
     func createFolder(fileName: String, serverUrl: String, account: String, urlBase: String, userId: String, withPush: Bool) async -> (NKError) {
 
-        if let error = NCNetworkingE2EE.shared.isE2EEVersionWriteable(account: account) {
-            return error
-        }
-        
         var fileNameFolder = CCUtility.removeForbiddenCharactersServer(fileName)!
         var serverUrlFileName = ""
         var fileNameIdentifier = ""

iOSClient/Networking/E2EE/NCNetworkingE2EEDelete.swift

@@ -34,10 +34,6 @@ class NCNetworkingE2EEDelete: NSObject {
 
     func delete(metadata: tableMetadata) async -> (NKError) {
 
-        if let error = NCNetworkingE2EE.shared.isE2EEVersionWriteable(account: metadata.account) {
-            return error
-        }
-
         var error = NKError()
 
         func sendE2EMetadata(e2eToken: String, fileId: String) async -> (NKError) {

iOSClient/Networking/E2EE/NCNetworkingE2EERename.swift

@@ -34,10 +34,6 @@ class NCNetworkingE2EERename: NSObject {
 
     func rename(metadata: tableMetadata, fileNameNew: String, indexPath: IndexPath) async -> (NKError) {
 
-        if let error = NCNetworkingE2EE.shared.isE2EEVersionWriteable(account: metadata.account) {
-            return error
-        }
-        
         var error = NKError()
 
         func sendE2EMetadata(e2eToken: String, fileId: String) async -> (NKError) {

iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift

@@ -44,12 +44,6 @@ class NCNetworkingE2EEUpload: NSObject {
 
     func upload(metadata: tableMetadata, uploadE2EEDelegate: uploadE2EEDelegate? = nil) async -> (NKError) {
 
-        if let error = NCNetworkingE2EE.shared.isE2EEVersionWriteable(account: metadata.account) {
-            NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
-            NCContentPresenter.shared.showError(error: error)
-            return error
-        }
-
         var metadata = tableMetadata.init(value: metadata)
         let ocIdTemp = metadata.ocId
         let errorCreateEncrypted = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_e2e_error_create_encrypted_")