coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>

iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -112,9 +112,7 @@ class NCNetworkingProcessUpload: NSObject {
                             for metadata in metadatas {
                                 if (metadata.e2eEncrypted || metadata.chunk) && applicationState != .active {  continue }
                                 let isWiFi = NCNetworking.shared.networkReachability == NCCommunicationCommon.typeReachability.reachableEthernetOrWiFi
-                                let account = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", metadata.account))
-                                if !isWiFi, let account = account, account.autoUploadWWAnPhoto, metadata.isAutoupload, metadata.classFile == NCCommunicationCommon.typeClassFile.image.rawValue { continue }
-                                if !isWiFi, let account = account, account.autoUploadWWAnVideo, metadata.isAutoupload, metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue { continue }
+                                if metadata.session == NCNetworking.shared.sessionIdentifierBackgroundWWan && !isWiFi { continue }
                                 if let metadata = NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusInUpload) {
                                     NCNetworking.shared.upload(metadata: metadata)
                                 }
@@ -201,7 +199,6 @@ class NCNetworkingProcessUpload: NSObject {
             // DETECT IF CHUNCK
             if chunckSize > 0 && metadataSource.size > chunckSize {
                 metadataSource.chunk = true
-                metadataSource.session = NCCommunicationCommon.shared.sessionIdentifierUpload
             }
             // DETECT IF E2EE
             if CCUtility.isFolderEncrypted(metadataSource.serverUrl, e2eEncrypted: metadataSource.e2eEncrypted, account: metadataSource.account, urlBase: metadataSource.urlBase) {

iOSClient/Transfers/NCTransfers.swift

@@ -273,7 +273,8 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate {
         if self.appDelegate.account != metadata.account {
             cell.labelInfo.text = NSLocalizedString("_waiting_for_", comment: "") + " " + NSLocalizedString("_user_", comment: "").lowercased() + " \(metadata.userId) " + NSLocalizedString("_in_", comment: "") + " \(metadata.urlBase)"
         }
-        if metadata.session == NCNetworking.shared.sessionIdentifierBackgroundWWan && NCNetworking.shared.networkReachability != NCCommunicationCommon.typeReachability.reachableEthernetOrWiFi {
+        let isWiFi = NCNetworking.shared.networkReachability == NCCommunicationCommon.typeReachability.reachableEthernetOrWiFi
+        if metadata.session == NCNetworking.shared.sessionIdentifierBackgroundWWan && !isWiFi {
             cell.labelInfo.text = NSLocalizedString("_waiting_for_", comment: "") + " " + NSLocalizedString("_reachable_wifi_", comment: "")
         }
         

iOSClient/Utility/NCUtility.swift

@@ -417,7 +417,6 @@ class NCUtility: NSObject {
                     // DETECT IF CHUNCK
                     if chunckSize > 0 && metadata.size > chunckSize {
                         metadata.chunk = true
-                        metadata.session = NCCommunicationCommon.shared.sessionIdentifierUpload
                     }
                     // DETECT IF E2EE
                     if CCUtility.isFolderEncrypted(metadata.serverUrl, e2eEncrypted: metadata.e2eEncrypted, account: metadata.account, urlBase: metadata.urlBase) {
@@ -548,7 +547,6 @@ class NCUtility: NSObject {
                 metadataLivePhoto.status = metadata.status
                 if chunckSize > 0 && metadataLivePhoto.size > chunckSize {
                     metadataLivePhoto.chunk = true
-                    metadataLivePhoto.session = NCCommunicationCommon.shared.sessionIdentifierUpload
                 }
                 return completion(NCManageDatabase.shared.addMetadata(metadataLivePhoto))
             }