normalized code

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

iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -103,11 +103,9 @@ class NCNetworkingProcessUpload: NSObject {
 
             let metadatasUpload = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND (status == %d OR status == %d)", self.appDelegate.account, NCGlobal.shared.metadataStatusInUpload, NCGlobal.shared.metadataStatusUploading))
             let isWiFi = NCNetworking.shared.networkReachability == NKCommon.typeReachability.reachableEthernetOrWiFi
-            var counterUpload: Int = 0
+            var counterUpload = metadatasUpload.count
             let sessionSelectors = [NCGlobal.shared.selectorUploadFileNODelete, NCGlobal.shared.selectorUploadFile, NCGlobal.shared.selectorUploadAutoUpload, NCGlobal.shared.selectorUploadAutoUploadAll]
 
-            counterUpload = metadatasUpload.count
-
             // Update Badge
             let counterBadge = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND (status == %d OR status == %d OR status == %d)", self.appDelegate.account, NCGlobal.shared.metadataStatusWaitUpload, NCGlobal.shared.metadataStatusInUpload, NCGlobal.shared.metadataStatusUploading))
             NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUpdateBadgeNumber, userInfo: ["counter":counterBadge.count])
@@ -130,8 +128,18 @@ class NCNetworkingProcessUpload: NSObject {
                             continue
                         }
 
-                        // Chunk or E2EE ... only one ? skipped
-                        if metadatasUpload.filter({ $0.chunk || $0.e2eEncrypted }).count > 0 {
+                        // Chunk only one
+                        if metadatasUpload.filter({ $0.chunk }).count > 0 {
+                            continue
+                        }
+
+                        // E2EE only one
+                        let uniqueMetadatas = metadatasUpload.unique(map: { $0.serverUrl })
+                        var alreadyPresentE2EE: Bool = false
+                        for metadata in uniqueMetadatas where alreadyPresentE2EE == false {
+                            if NCUtility.shared.isDirectoryE2EE(metadata: metadata) {alreadyPresentE2EE = true }
+                        }
+                        if alreadyPresentE2EE {
                             continue
                         }
 
@@ -147,13 +155,14 @@ class NCNetworkingProcessUpload: NSObject {
                             }
                             for metadata in metadatas where counterUpload < maxConcurrentOperationUpload {
 
+                                // isE2EE
+                                let isDirectoryE2EE = NCUtility.shared.isDirectoryE2EE(metadata: metadata)
+
                                 // NO WiFi
                                 if !isWiFi && metadata.session == NCNetworking.shared.sessionIdentifierBackgroundWWan {
                                     continue
                                 }
 
-                                // NO E2EE, CHUCK in background
-                                let isDirectoryE2EE = NCUtility.shared.isDirectoryE2EE(metadata: metadata)
                                 if applicationState != .active && (isDirectoryE2EE || metadata.chunk) {
                                     continue
                                 }

iOSClient/Utility/NCUtility.swift

@@ -350,7 +350,6 @@ class NCUtility: NSObject {
                 metadataSource.date = date
             }
             metadataSource.chunk = chunckSize != 0 && metadata.size > chunckSize
-            metadataSource.e2eEncrypted = NCUtility.shared.isDirectoryE2EE(metadata: metadata)
             metadataSource.isExtractFile = true
             if let metadata = NCManageDatabase.shared.addMetadata(metadataSource) {
                 metadatas.append(metadata)
@@ -395,7 +394,6 @@ class NCUtility: NSObject {
                 var metadataReturn = metadata
                 if modifyMetadataForUpload {
                     metadata.chunk = chunckSize != 0 && metadata.size > chunckSize
-                    //metadata.e2eEncrypted = NCUtility.shared.isFolderEncrypted(serverUrl: metadata.serverUrl, e2eEncrypted: metadata.e2eEncrypted, account: metadata.account, urlBase: metadata.urlBase, userId: metadata.userId)
                     metadata.isExtractFile = true
                     if let metadata = NCManageDatabase.shared.addMetadata(metadata) {
                         metadataReturn = metadata
@@ -523,7 +521,6 @@ class NCUtility: NSObject {
         options.deliveryMode = PHImageRequestOptionsDeliveryMode.fastFormat
         options.isNetworkAccessAllowed = true
         let chunckSize = CCUtility.getChunkSize() * 1000000
-        let e2eEncrypted = NCUtility.shared.isDirectoryE2EE(metadata: metadata)
         let ocId = NSUUID().uuidString
         let fileName = (metadata.fileName as NSString).deletingPathExtension + ".mov"
         let fileNamePath = CCUtility.getDirectoryProviderStorageOcId(ocId, fileNameView: fileName)!
@@ -543,7 +540,6 @@ class NCUtility: NSObject {
                 if error != nil { return completion(nil) }
                 let metadataLivePhoto = NCManageDatabase.shared.createMetadata(account: metadata.account, user: metadata.user, userId: metadata.userId, fileName: fileName, fileNameView: fileName, ocId: ocId, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, url: "", contentType: "", isLivePhoto: true)
                 metadataLivePhoto.classFile = NKCommon.typeClassFile.video.rawValue
-                metadataLivePhoto.e2eEncrypted = e2eEncrypted
                 metadataLivePhoto.isExtractFile = true
                 metadataLivePhoto.session = metadata.session
                 metadataLivePhoto.sessionSelector = metadata.sessionSelector