normalized code

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

Share/NCShareExtension.swift

@@ -343,8 +343,6 @@ extension NCShareExtension {
         metadata.contentType = results.mimeType
         metadata.iconName = results.iconName
         metadata.classFile = results.classFile
-        // E2EE
-        metadata.e2eEncrypted = NCUtility.shared.isDirectoryE2EE(metadata: metadata)
         // CHUNCK
         metadata.chunk = chunckSize != 0 && metadata.size > chunckSize
 

iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift

@@ -51,7 +51,6 @@ class NCNetworkingE2EEUpload: NSObject {
         } else {
             metadata.fileName = NCNetworkingE2EE.shared.generateRandomIdentifier()
         }
-        metadata.e2eEncrypted = true
         metadata.session = NKCommon.shared.sessionIdentifierUpload
         metadata.sessionError = ""
         guard let result = NCManageDatabase.shared.addMetadata(metadata) else { return errorCreateEncrypted }

iOSClient/Networking/NCNetworking.swift

@@ -387,9 +387,10 @@ import Photos
                       completion: @escaping (_ error: NKError) -> () = { error in }) {
 
         let metadata = tableMetadata.init(value: metadata)
-        NKCommon.shared.writeLog("[INFO] Upload file \(metadata.fileNameView) with Identifier \(metadata.assetLocalIdentifier) with size \(metadata.size) [CHUNCK \(metadata.chunk), E2EE \(metadata.e2eEncrypted)]")
+        let isDirectoryE2EE = NCUtility.shared.isDirectoryE2EE(metadata: metadata)
+        NKCommon.shared.writeLog("[INFO] Upload file \(metadata.fileNameView) with Identifier \(metadata.assetLocalIdentifier) with size \(metadata.size) [CHUNCK \(metadata.chunk), E2EE \(isDirectoryE2EE)]")
 
-        if metadata.e2eEncrypted {
+        if isDirectoryE2EE {
             #if !EXTENSION_FILE_PROVIDER_EXTENSION && !EXTENSION_WIDGET
             Task {
                 start()

iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -153,7 +153,8 @@ class NCNetworkingProcessUpload: NSObject {
                                 }
 
                                 // NO E2EE, CHUCK in background
-                                if applicationState != .active && (metadata.e2eEncrypted || metadata.chunk) {
+                                let isDirectoryE2EE = NCUtility.shared.isDirectoryE2EE(metadata: metadata)
+                                if applicationState != .active && (isDirectoryE2EE || metadata.chunk) {
                                     continue
                                 }
 

iOSClient/Utility/NCUtility.swift

@@ -386,6 +386,7 @@ class NCUtility: NSObject {
         let metadata = tableMetadata.init(value: metadata)
         let chunckSize = CCUtility.getChunkSize() * 1000000
         var compatibilityFormat: Bool = false
+        let isDirectoryE2EE = NCUtility.shared.isDirectoryE2EE(metadata: metadata)
 
         func callCompletionWithError(_ error: Bool = true) {
             if error {
@@ -394,7 +395,6 @@ class NCUtility: NSObject {
                 var metadataReturn = metadata
                 if modifyMetadataForUpload {
                     metadata.chunk = chunckSize != 0 && metadata.size > chunckSize
-                    metadata.e2eEncrypted = NCUtility.shared.isDirectoryE2EE(metadata: metadata)
                     metadata.isExtractFile = true
                     if let metadata = NCManageDatabase.shared.addMetadata(metadata) {
                         metadataReturn = metadata
@@ -415,7 +415,7 @@ class NCUtility: NSObject {
             metadata.contentType = "image/jpeg"
             fileNamePath = NSTemporaryDirectory() + fileName
             metadata.fileNameView = fileName
-            if !metadata.e2eEncrypted {
+            if !isDirectoryE2EE {
                 metadata.fileName = fileName
             }
             compatibilityFormat = true