CODING

iOSClient/Data/NCManageDatabase+E2EE.swift

@@ -142,25 +142,19 @@ extension NCManageDatabase {
         return nil
     }
 
-    @objc func getE2eEncryptions(predicate: NSPredicate) -> [tableE2eEncryption]? {
-
-        guard self.getActiveAccount() != nil else { return nil }
+    @objc func getE2eEncryptions(predicate: NSPredicate) -> [tableE2eEncryption] {
 
         do {
             let realm = try Realm()
             realm.refresh()
             let results: Results<tableE2eEncryption>
             results = realm.objects(tableE2eEncryption.self).filter(predicate)
-            if results.isEmpty {
-                return nil
-            } else {
-                return Array(results.map { tableE2eEncryption.init(value: $0) })
-            }
+            return Array(results.map { tableE2eEncryption.init(value: $0) })
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("Could not access database: \(error)")
         }
 
-        return nil
+        return []
     }
 
     @objc func renameFileE2eEncryption(serverUrl: String, fileNameIdentifier: String, newFileName: String, newFileNamePath: String) {

iOSClient/Networking/E2EE/NCEndToEndMetadata.swift

@@ -122,15 +122,15 @@ class NCEndToEndMetadata: NSObject {
     // MARK: Encode JSON Metadata Bridge
     // --------------------------------------------------------------------------------------------
 
-    func encoderMetadata(_ items: [tableE2eEncryption], account: String, serverUrl: String, userId: String) -> (metadata: String?, signature: String?) {
+    func encoderMetadata(account: String, serverUrl: String, userId: String) -> (metadata: String?, signature: String?) {
 
         let e2EEApiVersion = NCGlobal.shared.capabilityE2EEApiVersion
 
         switch e2EEApiVersion {
         case "1.2":
-            return encoderMetadataV12(items, account: account, serverUrl: serverUrl)
+            return encoderMetadataV12(account: account, serverUrl: serverUrl)
         case "2.0":
-            return encoderMetadataV20(items, account: account, serverUrl: serverUrl, userId: userId)
+            return encoderMetadataV20(account: account, serverUrl: serverUrl, userId: userId)
         default:
             return (nil, nil)
         }

iOSClient/Networking/E2EE/NCEndToEndMetadataV1.swift

@@ -28,7 +28,7 @@ extension NCEndToEndMetadata {
     // MARK: Ecode JSON Metadata V1.2
     // --------------------------------------------------------------------------------------------
 
-    func encoderMetadataV12(_ items: [tableE2eEncryption], account: String, serverUrl: String) -> (metadata: String?, signature: String?) {
+    func encoderMetadataV12(account: String, serverUrl: String) -> (metadata: String?, signature: String?) {
 
         let encoder = JSONEncoder()
         var metadataKey: String = ""
@@ -40,9 +40,7 @@ extension NCEndToEndMetadata {
         let privateKey = CCUtility.getEndToEndPrivateKey(account)
         var fileNameIdentifiers: [String] = []
 
-        // let shortVersion: String = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? ""
-        // var filesCodable: [String: E2eeV12.Files] = [String: E2eeV12.Files]()
-        // var filedropCodable: [String: E2eeV12.Filedrop] = [String: E2eeV12.Filedrop]()
+        let items = NCManageDatabase.shared.getE2eEncryptions(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", account, serverUrl))
 
         //
         // metadata

iOSClient/Networking/E2EE/NCEndToEndMetadataV20.swift

@@ -31,7 +31,7 @@ extension NCEndToEndMetadata {
     // MARK: Ecode JSON Metadata V2.0
     // --------------------------------------------------------------------------------------------
 
-    func encoderMetadataV20(_ items: [tableE2eEncryption], account: String, serverUrl: String, userId: String) -> (metadata: String?, signature: String?) {
+    func encoderMetadataV20(account: String, serverUrl: String, userId: String) -> (metadata: String?, signature: String?) {
 
         var signature: String?
 

iOSClient/Networking/E2EE/NCNetworkingE2EECreateFolder.swift

@@ -63,7 +63,7 @@ class NCNetworkingE2EECreateFolder: NSObject {
             let lockResults = await NCNetworkingE2EE.shared.lock(account: account, serverUrl: serverUrlFileName)
             if lockResults.error != .success { return lockResults.error }
 
-            let resultEncoder = NCEndToEndMetadata().encoderMetadata([], account: account, serverUrl: serverUrlFileName, userId: userId)
+            let resultEncoder = NCEndToEndMetadata().encoderMetadata(account: account, serverUrl: serverUrlFileName, userId: userId)
             if resultEncoder.metadata == nil {
                 return errorEncodeMetadata
             }
@@ -156,12 +156,7 @@ class NCNetworkingE2EECreateFolder: NSObject {
         object.serverUrl = serverUrl
         NCManageDatabase.shared.addE2eEncryption(object)
 
-        // Rebuild metadata for send it
-        guard let tableE2eEncryption = NCManageDatabase.shared.getE2eEncryptions(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", account, serverUrl)) else {
-            return errorEncodeMetadata
-        }
-
-        let resultEncoder = NCEndToEndMetadata().encoderMetadata(tableE2eEncryption, account: account, serverUrl: serverUrl, userId: userId)
+        let resultEncoder = NCEndToEndMetadata().encoderMetadata(account: account, serverUrl: serverUrl, userId: userId)
         if resultEncoder.metadata == nil {
             return errorEncodeMetadata
         }
@@ -184,7 +179,7 @@ class NCNetworkingE2EECreateFolder: NSObject {
         let lockResults = await NCNetworkingE2EE.shared.lock(account: account, serverUrl: serverUrl)
         if lockResults.error != .success { return lockResults.error }
 
-        let resultEncoder = NCEndToEndMetadata().encoderMetadata([], account: account, serverUrl: serverUrl, userId: userId)
+        let resultEncoder = NCEndToEndMetadata().encoderMetadata(account: account, serverUrl: serverUrl, userId: userId)
         if resultEncoder.metadata == nil {
             return errorEncodeMetadata
         }

iOSClient/Networking/E2EE/NCNetworkingE2EEDelete.swift

@@ -40,8 +40,6 @@ class NCNetworkingE2EEDelete: NSObject {
 
         func sendE2EMetadata(e2eToken: String, fileId: String) async -> (NKError) {
 
-            var resultEncoder: (metadata: String?, signature: String?)
-
             // Get last metadata
             let getE2EEMetadataResults = await NextcloudKit.shared.getE2EEMetadata(fileId: fileId, e2eToken: e2eToken)
 
@@ -55,13 +53,7 @@ class NCNetworkingE2EEDelete: NSObject {
             // delete
             NCManageDatabase.shared.deleteE2eEncryption(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameIdentifier == %@", metadata.account, metadata.serverUrl, metadata.fileName))
 
-            // Rebuild metadata
-            if let tableE2eEncryption = NCManageDatabase.shared.getE2eEncryptions(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) {
-                resultEncoder = NCEndToEndMetadata().encoderMetadata(tableE2eEncryption, account: metadata.account, serverUrl: metadata.serverUrl, userId: metadata.userId)
-            } else {
-                resultEncoder = NCEndToEndMetadata().encoderMetadata([], account: metadata.account, serverUrl: metadata.serverUrl, userId: metadata.userId)
-            }
-
+            let resultEncoder = NCEndToEndMetadata().encoderMetadata(account: metadata.account, serverUrl: metadata.serverUrl, userId: metadata.userId)
             if resultEncoder.metadata == nil {
                 return errorEncodeMetadata
             }

iOSClient/Networking/E2EE/NCNetworkingE2EERename.swift

@@ -53,12 +53,7 @@ class NCNetworkingE2EERename: NSObject {
             // rename
             NCManageDatabase.shared.renameFileE2eEncryption(serverUrl: metadata.serverUrl, fileNameIdentifier: metadata.fileName, newFileName: fileNameNew, newFileNamePath: CCUtility.returnFileNamePath(fromFileName: fileNameNew, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId, account: metadata.account))
 
-            // Rebuild metadata
-            guard let tableE2eEncryption = NCManageDatabase.shared.getE2eEncryptions(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) else {
-                return errorEncodeMetadata
-            }
-
-            let resultEncoder = NCEndToEndMetadata().encoderMetadata(tableE2eEncryption, account: metadata.account, serverUrl: metadata.serverUrl, userId: metadata.userId)
+            let resultEncoder = NCEndToEndMetadata().encoderMetadata(account: metadata.account, serverUrl: metadata.serverUrl, userId: metadata.userId)
             if resultEncoder.metadata == nil {
                 return errorEncodeMetadata
             }

iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift

@@ -164,12 +164,7 @@ class NCNetworkingE2EEUpload: NSObject {
         objectE2eEncryption.serverUrl = metadata.serverUrl
         NCManageDatabase.shared.addE2eEncryption(objectE2eEncryption)
 
-        // Rebuild metadata
-        guard let tableE2eEncryption = NCManageDatabase.shared.getE2eEncryptions(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) else {
-            return errorEncodeMetadata
-        }
-
-        let resultEncoder = NCEndToEndMetadata().encoderMetadata(tableE2eEncryption, account: metadata.account, serverUrl: metadata.serverUrl, userId: metadata.userId)
+        let resultEncoder = NCEndToEndMetadata().encoderMetadata(account: metadata.account, serverUrl: metadata.serverUrl, userId: metadata.userId)
         if resultEncoder.metadata == nil {
             return errorEncodeMetadata
         }