cleaning

iOSClient/Data/NCManageDatabase+E2EE.swift

@@ -85,7 +85,7 @@ class tableE2eMetadataV2: Object {
     @Persisted var keyChecksums = List<String>()
     @Persisted var ocIdServerUrl: String = ""
     @Persisted var serverUrl: String = ""
-    @Persisted var version: String = NCGlobal.shared.e2eeVersion20
+    @Persisted var version: String = NCGlobal.shared.e2eeVersionV20
 
     convenience init(account: String, ocIdServerUrl: String) {
         self.init()

iOSClient/NCGlobal.swift

@@ -122,8 +122,8 @@ class NCGlobal: NSObject {
     //
     let e2eePassphraseTest                          = "more over television factory tendency independence international intellectual impress interest sentence pony"
     @objc let e2eeVersions                          = ["1.1", "1.2", "2.0"]
-    let e2eeVersion12                               = "1.2"
-    let e2eeVersion20                               = "2.0"
+    let e2eeVersionV12                              = "1.2"
+    let e2eeVersionV20                              = "2.0"
 
     // CHUNK
     let chunkSizeMBCellular                         = 10000000

iOSClient/Networking/E2EE/NCEndToEndMetadata.swift

@@ -146,9 +146,9 @@ class NCEndToEndMetadata: NSObject {
         }
 
         switch e2EEApiVersion {
-        case NCGlobal.shared.e2eeVersion12:
+        case NCGlobal.shared.e2eeVersionV12:
             return encoderMetadataV12(account: account, serverUrl: serverUrl, ocIdServerUrl: directory.ocId)
-        case NCGlobal.shared.e2eeVersion20:
+        case NCGlobal.shared.e2eeVersionV20:
             return encoderMetadataV20(account: account, serverUrl: serverUrl, ocIdServerUrl: directory.ocId, userId: userId, addUserId: addUserId, addCertificate: addCertificate)
         default:
             return (nil, nil)

iOSClient/Networking/E2EE/NCEndToEndMetadataV20.swift

@@ -91,7 +91,7 @@ extension NCEndToEndMetadata {
         }
 
         // tableE2eMetadataV2
-        guard let e2eMetadataV2 = NCManageDatabase.shared.incrementCounterE2eMetadataV2(account: account, serverUrl: serverUrl, ocIdServerUrl: ocIdServerUrl, version: NCGlobal.shared.e2eeVersion20) else {
+        guard let e2eMetadataV2 = NCManageDatabase.shared.incrementCounterE2eMetadataV2(account: account, serverUrl: serverUrl, ocIdServerUrl: ocIdServerUrl, version: NCGlobal.shared.e2eeVersionV20) else {
             return (nil, nil)
         }
 
@@ -129,7 +129,7 @@ extension NCEndToEndMetadata {
 
             let metadataCodable = E2eeV20.Metadata(ciphertext: ciphertext, nonce: initializationVector, authenticationTag: authenticationTag)
 
-            let e2eeCodable = E2eeV20(metadata: metadataCodable, users: usersCodable, filedrop: filedropCodable, version: NCGlobal.shared.e2eeVersion20)
+            let e2eeCodable = E2eeV20(metadata: metadataCodable, users: usersCodable, filedrop: filedropCodable, version: NCGlobal.shared.e2eeVersionV20)
             let e2eeData = try JSONEncoder().encode(e2eeCodable)
             e2eeData.printJson()
             e2eeJson = String(data: e2eeData, encoding: .utf8)

iOSClient/Networking/E2EE/NCNetworkingE2EE.swift

@@ -86,7 +86,7 @@ class NCNetworkingE2EE: NSObject {
             e2eToken = tableLock.e2eToken
         }
 
-        if e2EEApiVersion == NCGlobal.shared.e2eeVersion20, let result = NCManageDatabase.shared.getE2eMetadataV2(account: account, ocIdServerUrl: directory.ocId) {
+        if e2EEApiVersion == NCGlobal.shared.e2eeVersionV20, let result = NCManageDatabase.shared.getE2eMetadataV2(account: account, ocIdServerUrl: directory.ocId) {
             e2eCounter = "\(result.counter)"
         }