coding

iOSClient/AutoUpload/NCAutoUpload.m

@@ -399,6 +399,7 @@
         if (assetMediaType == PHAssetMediaTypeVideo && tableAccount.autoUploadWWAnVideo == NO) session = NCNetworking.shared.sessionIdentifierBackground;
         if (assetMediaType == PHAssetMediaTypeImage && tableAccount.autoUploadWWAnPhoto) session = NCNetworking.shared.sessionIdentifierBackgroundWWan;
         if (assetMediaType == PHAssetMediaTypeVideo && tableAccount.autoUploadWWAnVideo) session = NCNetworking.shared.sessionIdentifierBackgroundWWan;
+        if ([selector isEqualToString:selectorUploadAutoUploadAll]) session = NCCommunicationCommon.shared.sessionIdentifierUpload;
         
         NSDateFormatter *formatter = [NSDateFormatter new];
         

iOSClient/Networking/NCNetworking.swift

@@ -311,7 +311,7 @@ import Queuer
         }
     }
     
-    @objc func upload(metadata: tableMetadata, background: Bool = true, completion: @escaping (_ errorCode: Int, _ errorDescription: String)->())  {
+    @objc func upload(metadata: tableMetadata, completion: @escaping (_ errorCode: Int, _ errorDescription: String)->())  {
            
         guard let account = NCManageDatabase.sharedInstance.getAccount(predicate: NSPredicate(format: "account == %@", metadata.account)) else {
             NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
@@ -348,10 +348,10 @@ import Queuer
                 #if !EXTENSION
                 NCNetworkingE2EE.shared.upload(metadata: metadata, account: account, completion: completion)
                 #endif
-            } else if background {
-                uploadFileInBackground(metadata: metadata, account: account, completion: completion)
-            } else {
+            } else if metadata.session == NCCommunicationCommon.shared.sessionIdentifierUpload {
                 uploadFile(metadata: metadata, account: account, completion: completion)
+            } else {
+                uploadFileInBackground(metadata: metadata, account: account, completion: completion)
             }
            
         } else {
@@ -374,10 +374,10 @@ import Queuer
                     #if !EXTENSION
                     NCNetworkingE2EE.shared.upload(metadata: extractMetadata, account: account, completion: completion)
                     #endif
-                } else if background {
-                    self.uploadFileInBackground(metadata: extractMetadata, account: account, completion: completion)
-                } else {
+                } else if metadata.session == NCCommunicationCommon.shared.sessionIdentifierUpload {
                     self.uploadFile(metadata: extractMetadata, account: account, completion: completion)
+                } else {
+                    self.uploadFileInBackground(metadata: extractMetadata, account: account, completion: completion)
                 }
             }
         }

iOSClient/Networking/NCNetworkingAutoUpload.swift

@@ -95,14 +95,14 @@ class NCNetworkingAutoUpload: NSObject {
                             maxConcurrentOperationUpload = 1
                             counterUpload += 1
                             if let metadata = NCManageDatabase.sharedInstance.setMetadataStatus(ocId: metadata.ocId, status: Int(k_metadataStatusInUpload)) {
-                                NCNetworking.shared.upload(metadata: metadata, background: true) { (_, _) in }
+                                NCNetworking.shared.upload(metadata: metadata) { (_, _) in }
                             }
                             self.startTimer()
                             return
                         } else {
                             counterUpload += 1
                             if let metadata = NCManageDatabase.sharedInstance.setMetadataStatus(ocId: metadata.ocId, status: Int(k_metadataStatusInUpload)) {
-                                NCNetworking.shared.upload(metadata: metadata, background: true) { (_, _) in }
+                                NCNetworking.shared.upload(metadata: metadata) { (_, _) in }
                             }
                             sizeUpload = sizeUpload + Int(metadata.size)
                             if sizeUpload > k_maxSizeOperationUpload {

iOSClient/Transfers/CCTransfers.m

@@ -253,7 +253,7 @@
         metadata.session = NCNetworking.shared.sessionIdentifierBackground;
        
         [[NCManageDatabase sharedInstance] addMetadata:metadata];
-        [[NCNetworking shared] uploadWithMetadata:metadata background:true completion:^(NSInteger errorCode, NSString *errorDescription) { }];
+        [[NCNetworking shared] uploadWithMetadata:metadata completion:^(NSInteger errorCode, NSString *errorDescription) { }];
     }
 }