coding

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

iOSClient/Networking/E2EE/NCNetworkingE2EECreateFolder.swift

@@ -47,6 +47,8 @@ class NCNetworkingE2EECreateFolder: NSObject {
 
         // Lock
         let lockResults = await NCNetworkingE2EE.shared.lock(account: account, serverUrl: serverUrl)
+        //
+
         error = lockResults.error
         if error == .success, let e2eToken = lockResults.e2eToken {
 
@@ -61,11 +63,12 @@ class NCNetworkingE2EECreateFolder: NSObject {
                     error = await createE2Ee(account: account, fileNameFolder: fileNameFolder, fileNameIdentifier: fileNameIdentifier, serverUrl: serverUrl, e2eToken: e2eToken, fileId: fileId ,urlBase: urlBase, userId: userId)
                 }
             }
-
-            // Unlock
-            await NCNetworkingE2EE.shared.unlock(account: account, serverUrl: serverUrl)
         }
 
+        // Unlock
+        await NCNetworkingE2EE.shared.unlock(account: account, serverUrl: serverUrl)
+        //
+        
         if error == .success, let ocId = ocId {
             NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterCreateFolder, userInfo: ["ocId": ocId, "serverUrl": serverUrl, "account": account, "e2ee": true])
         }

iOSClient/Networking/E2EE/NCNetworkingE2EEDelete.swift

@@ -65,6 +65,8 @@ class NCNetworkingE2EEDelete: NSObject {
 
         // Lock
         let lockResults = await NCNetworkingE2EE.shared.lock(account: metadata.account, serverUrl: metadata.serverUrl)
+        //
+
         error = lockResults.error
         if error == .success, let e2eToken = lockResults.e2eToken, let fileId = lockResults.fileId {
 
@@ -74,10 +76,12 @@ class NCNetworkingE2EEDelete: NSObject {
                 let sendE2EMetadataError = await sendE2EMetadata(e2eToken: e2eToken, fileId: fileId)
                 error = sendE2EMetadataError
             }
-            // Unlock
-            await NCNetworkingE2EE.shared.unlock(account: metadata.account, serverUrl: metadata.serverUrl)
         }
 
+        // Unlock
+        await NCNetworkingE2EE.shared.unlock(account: metadata.account, serverUrl: metadata.serverUrl)
+        //
+        
         return error
     }
 }

iOSClient/Networking/E2EE/NCNetworkingE2EERename.swift

@@ -65,6 +65,8 @@ class NCNetworkingE2EERename: NSObject {
 
         // Lock
         let lockResults = await NCNetworkingE2EE.shared.lock(account: metadata.account, serverUrl: metadata.serverUrl)
+        //
+
         error = lockResults.error
         if error == .success, let e2eToken = lockResults.e2eToken, let fileId = lockResults.fileId {
 
@@ -79,11 +81,12 @@ class NCNetworkingE2EERename: NSObject {
                     try FileManager.default.moveItem(atPath: atPath, toPath: toPath)
                 } catch { }
             }
-
-            // Unlock
-            await NCNetworkingE2EE.shared.unlock(account: metadata.account, serverUrl: metadata.serverUrl)
         }
 
+        // Unlock
+        await NCNetworkingE2EE.shared.unlock(account: metadata.account, serverUrl: metadata.serverUrl)
+        //
+        
         if error == .success {
             NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterRenameFile, userInfo: ["ocId": metadata.ocId, "account": metadata.account])
         }

iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift

@@ -57,8 +57,14 @@ class NCNetworkingE2EEUpload: NSObject {
         guard let result = NCManageDatabase.shared.addMetadata(metadata) else { return errorCreateEncrypted }
         metadata = result
 
+        // Lock
         let lockResults = await NCNetworkingE2EE.shared.lock(account: metadata.account, serverUrl: metadata.serverUrl)
+        //
+
         guard let e2eToken = lockResults.e2eToken, let fileId = lockResults.fileId, lockResults.error == .success else {
+            // Unlock
+            await NCNetworkingE2EE.shared.unlock(account: metadata.account, serverUrl: metadata.serverUrl)
+            //
             NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", ocIdTemp))
             NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "ocIdTemp": ocIdTemp, "error": NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_e2e_error_create_encrypted_")])
             return errorCreateEncrypted
@@ -69,6 +75,7 @@ class NCNetworkingE2EEUpload: NSObject {
         guard createE2EeError == .success else {
             // Unlock
             await NCNetworkingE2EE.shared.unlock(account: metadata.account, serverUrl: metadata.serverUrl)
+            //
             NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", ocIdTemp))
             NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "ocIdTemp": ocIdTemp, "error": createE2EeError])
             return errorCreateEncrypted