Modify loadAutoDownloadUpload

iOSClient/AppDelegate.m

@@ -1435,7 +1435,8 @@
     
     NSInteger counterDownloadInSession = [[[NCManageDatabase sharedInstance] getTableMetadataDownload] count] + [[[NCManageDatabase sharedInstance] getTableMetadataDownloadWWan] count];
     NSInteger counterUploadInSessionAndInLock = [[[NCManageDatabase sharedInstance] getTableMetadataUpload] count] + [[[NCManageDatabase sharedInstance] getTableMetadataUploadWWan] count] + [[[NCManageDatabase sharedInstance] getLockQueueUpload] count];
-    
+    NSInteger counterUploadInLock = [[[NCManageDatabase sharedInstance] getQueueUploadWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND lock = true", self.activeAccount]] count];
+
     NSInteger counterNewUpload = 0;
     
     // ------------------------- <selector Auto Download> -------------------------
@@ -1509,30 +1510,15 @@
     
     // ------------------------- <selector Upload File> -------------------------
     
-    while (counterUploadInSessionAndInLock < maxConcurrentDownloadUpload) {
-        
-        // For encrypted ONLY 1 LOCK
-        NSArray *recordsUploadInLock = [[NCManageDatabase sharedInstance] getQueueUploadWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND lock = true", self.activeAccount]];
-        for (tableQueueUpload *upload in recordsUploadInLock) {
-            if ([CCUtility isFolderEncrypted:upload.serverUrl account:self.activeAccount]) {
-                break;
-        }
+    if (counterUploadInSessionAndInLock < maxConcurrentDownloadUpload && counterUploadInLock < 1) {
         
         metadataNet = [[NCManageDatabase sharedInstance] getQueueUploadLockWithSelector:selectorUploadFile];
         if (metadataNet) {
             
-            // Priority Error only in Foreground
-            if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground && metadataNet.priority <= k_priorityAutoUploadError)
-                continue;
-                
             [[CCNetworking sharedNetworking] uploadFileFromAssetLocalIdentifier:metadataNet delegate:_activeMain];
-                
-            counterNewUpload++;
             
-        } else
-            break;
-        
-        counterUploadInSessionAndInLock = [[[NCManageDatabase sharedInstance] getTableMetadataUpload] count] + [[[NCManageDatabase sharedInstance] getTableMetadataUploadWWan] count] + [[[NCManageDatabase sharedInstance] getLockQueueUpload] count];
+            counterNewUpload++;
+        }
     }
     
     // Verify Lock

iOSClient/Networking/CCNetworking.m

@@ -1140,20 +1140,19 @@
                         
                         [[NCManageDatabase sharedInstance] setMetadataSession:session sessionError:@"" sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:uploadTask.taskIdentifier predicate:[NSPredicate predicateWithFormat:@"sessionID = %@ AND account = %@", sessionID, _activeAccount]];
                         
-                        // OOOOOOKKKK remove record on Table Auto Upload
+                        // OOOOOOKKKK remove record on Table Auto Upload and next
                         [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier selector:selector];
+#ifndef EXTENSION
+                        [app loadAutoDownloadUpload:[NSNumber numberWithInt:k_maxConcurrentOperationDownloadUpload]];
+#endif
                         
                         // Manage uploadTask cancel,suspend,resume
                         if (taskStatus == k_taskStatusCancel) [uploadTask cancel];
                         else if (taskStatus == k_taskStatusSuspend) [uploadTask suspend];
                         else if (taskStatus == k_taskStatusResume) [uploadTask resume];
                         
+
                         NSLog(@"[LOG] Upload file %@ TaskIdentifier %lu", fileName, (unsigned long)uploadTask.taskIdentifier);
-                        
-#ifndef EXTENSION
-                        // Force Next
-                        [app loadAutoDownloadUpload:[NSNumber numberWithInt:10]];
-#endif
 
                     } else {
                         dispatch_async(dispatch_get_main_queue(), ^{
@@ -1172,14 +1171,19 @@
              
              [[NCManageDatabase sharedInstance] setMetadataSession:session sessionError:@"" sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:uploadTask.taskIdentifier predicate:[NSPredicate predicateWithFormat:@"sessionID = %@ AND account = %@", sessionID, _activeAccount]];
              
-             // OOOOOOKKKK remove record on Table Auto Upload
+             // OOOOOOKKKK remove record on Table Auto Upload and next
              [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier selector:selector];
+#ifndef EXTENSION
+             [app loadAutoDownloadUpload:[NSNumber numberWithInt:k_maxConcurrentOperationDownloadUpload]];
+#endif
              
              // Manage uploadTask cancel,suspend,resume
              if (taskStatus == k_taskStatusCancel) [uploadTask cancel];
              else if (taskStatus == k_taskStatusSuspend) [uploadTask suspend];
              else if (taskStatus == k_taskStatusResume) [uploadTask resume];
              
+
+             
              NSLog(@"[LOG] Upload file %@ TaskIdentifier %lu", fileName, (unsigned long)uploadTask.taskIdentifier);
          }
     }