coding

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

iOSClient/Networking/E2EE/NCNetworkingE2EE.swift

@@ -43,7 +43,7 @@ class NCNetworkingE2EE: NSObject {
         var e2eToken: String?
 
         guard let directory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", account, serverUrl)) else {
-            return (nil, nil, NKError())
+            return (nil, nil, NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_e2e_error_lock_"))
         }
 
         if let tableLock = NCManageDatabase.shared.getE2ETokenLock(account: account, serverUrl: serverUrl) {

iOSClient/Networking/E2EE/NCNetworkingE2EECreateFolder.swift

@@ -45,9 +45,8 @@ class NCNetworkingE2EECreateFolder: NSObject {
         fileNameIdentifier = NCNetworkingE2EE.shared.generateRandomIdentifier()
         serverUrlFileName = serverUrl + "/" + fileNameIdentifier
 
-        // Lock
+        // ** Lock **
         let lockResults = await NCNetworkingE2EE.shared.lock(account: account, serverUrl: serverUrl)
-        //
 
         error = lockResults.error
         if error == .success, let e2eToken = lockResults.e2eToken {
@@ -65,9 +64,8 @@ class NCNetworkingE2EECreateFolder: NSObject {
             }
         }
 
-        // Unlock
+        // ** 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

@@ -63,9 +63,8 @@ class NCNetworkingE2EEDelete: NSObject {
             return putE2EEMetadataResults.error
         }
 
-        // Lock
+        // ** 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 {
@@ -78,9 +77,8 @@ class NCNetworkingE2EEDelete: NSObject {
             }
         }
 
-        // Unlock
+        // ** Unlock **
         await NCNetworkingE2EE.shared.unlock(account: metadata.account, serverUrl: metadata.serverUrl)
-        //
         
         return error
     }

iOSClient/Networking/E2EE/NCNetworkingE2EERename.swift

@@ -63,9 +63,8 @@ class NCNetworkingE2EERename: NSObject {
             return NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_file_already_exists_")
         }
 
-        // Lock
+        // ** 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 {
@@ -83,9 +82,8 @@ class NCNetworkingE2EERename: NSObject {
             }
         }
 
-        // Unlock
+        // ** 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,14 +57,10 @@ class NCNetworkingE2EEUpload: NSObject {
         guard let result = NCManageDatabase.shared.addMetadata(metadata) else { return errorCreateEncrypted }
         metadata = result
 
-        // Lock
+        // ** 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
@@ -73,9 +69,9 @@ class NCNetworkingE2EEUpload: NSObject {
         // Send e2e metadata
         let createE2EeError = await createE2Ee(metadata: metadata, e2eToken: e2eToken, fileId: fileId)
         guard createE2EeError == .success else {
-            // Unlock
+            // ** 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
@@ -84,7 +80,7 @@ class NCNetworkingE2EEUpload: NSObject {
         // Send file
         let sendFileResults = await sendFile(metadata: metadata, e2eToken: e2eToken)
 
-        // Unlock
+        // ** Unlock **
         await NCNetworkingE2EE.shared.unlock(account: metadata.account, serverUrl: metadata.serverUrl)
 
         if sendFileResults.afError?.isExplicitlyCancelledError ?? false {