update loadAutomaticUpload

iOSClient/AppDelegate.h

@@ -158,7 +158,7 @@
 
 - (NSMutableArray *)verifyExistsInQueuesDownloadSelector:(NSString *)selector;
 
-- (void)loadAutomaticUpload;
+- (void)loadAutomaticUpload:(NSNumber *)maxConcurrent;
 
 - (BOOL)createFolderSubFolderAutomaticUploadFolderPhotos:(NSString *)folderPhotos useSubFolder:(BOOL)useSubFolder assets:(NSArray *)assets selector:(NSString *)selector;
 

iOSClient/AppDelegate.m

@@ -379,7 +379,7 @@
 
         // ONLY FOREFROUND
         
-        [app performSelectorOnMainThread:@selector(loadAutomaticUpload) withObject:nil waitUntilDone:NO];
+        [app performSelectorOnMainThread:@selector(loadAutomaticUpload:) withObject:[NSNumber numberWithInt:k_maxConcurrentOperationDownloadUpload] waitUntilDone:NO];
     
     }
 }
@@ -1336,10 +1336,11 @@
     return queueNumUploadWWan;
 }
 
-- (void)loadAutomaticUpload
+- (void)loadAutomaticUpload:(NSNumber *)maxConcurrent
 {
     CCMetadataNet *metadataNet;
     NSInteger counterUpload = 0;
+    NSInteger maxConcurrentOperationDownloadUpload = [maxConcurrent integerValue];
     
     NSArray *uploadInQueue = [[NCManageDatabase sharedInstance] getTableMetadataUpload];
     
@@ -1362,7 +1363,7 @@
     
     metadataNet = [[NCManageDatabase sharedInstance] getAutomaticUploadWithSelector:selectorUploadAutomatic];
     counterUpload = [self getNumberUploadInQueues] + [self getNumberUploadInQueuesWWan];
-    while (metadataNet && counterUpload < k_maxConcurrentOperationDownloadUpload) {
+    while (metadataNet && counterUpload < maxConcurrentOperationDownloadUpload) {
         
         [[CCNetworking sharedNetworking] uploadFileFromAssetLocalIdentifier:metadataNet.assetLocalIdentifier fileName:metadataNet.fileName serverUrl:metadataNet.serverUrl cryptated:metadataNet.cryptated session:metadataNet.session taskStatus:metadataNet.taskStatus selector:metadataNet.selector selectorPost:metadataNet.selectorPost errorCode:metadataNet.errorCode delegate:app.activeMain];
         
@@ -1385,7 +1386,7 @@
     
     metadataNet =  [[NCManageDatabase sharedInstance] getAutomaticUploadWithSelector:selectorUploadAutomaticAll];
     counterUpload = [self getNumberUploadInQueues] + [self getNumberUploadInQueuesWWan];
-    while (metadataNet && counterUpload < k_maxConcurrentOperationDownloadUpload) {
+    while (metadataNet && counterUpload < maxConcurrentOperationDownloadUpload) {
         
         PHFetchResult *result = [PHAsset fetchAssetsWithLocalIdentifiers:@[metadataNet.assetLocalIdentifier] options:nil];
         

iOSClient/CCGlobal.h

@@ -132,8 +132,9 @@ extern NSString *const urlBaseUploadDB;
 #define k_timerProcess                                  7
 #define k_timerUpdateApplicationIconBadgeNumber         2
 
-#define k_maxConcurrentOperation                        10
-#define k_maxConcurrentOperationDownloadUpload          10
+#define k_maxConcurrentOperation                         10
+#define k_maxConcurrentOperationDownloadUpload           10
+#define k_maxConcurrentOperationDownloadUploadBackground 1
 
 // Error
 #define k_CCErrorTaskNil                                -9999

iOSClient/Main/CCMain.m

@@ -1628,7 +1628,7 @@
 {
     // Automatic upload All
     if([selector isEqualToString:selectorUploadAutomaticAll])
-        [app performSelectorOnMainThread:@selector(loadAutomaticUpload) withObject:nil waitUntilDone:NO];
+        [app performSelectorOnMainThread:@selector(loadAutomaticUpload:) withObject:[NSNumber numberWithInt:k_maxConcurrentOperationDownloadUpload] waitUntilDone:NO];
     
     // Read File test do not exists
     if (errorCode == k_CCErrorFileUploadNotFound && fileID) {
@@ -1653,7 +1653,7 @@
 {
     // Automatic upload All
     if([selector isEqualToString:selectorUploadAutomaticAll])
-        [app performSelectorOnMainThread:@selector(loadAutomaticUpload) withObject:nil waitUntilDone:NO];
+        [app performSelectorOnMainThread:@selector(loadAutomaticUpload:) withObject:[NSNumber numberWithInt:k_maxConcurrentOperationDownloadUpload] waitUntilDone:NO];
     
     if ([selectorPost isEqualToString:selectorReadFolderForced] ) {