New class

iOSClient/AppDelegate.m

@@ -1395,7 +1395,7 @@
   
     NSLog(@"[LOG] -PROCESS-AUTO-UPLOAD-");
 
-    // ------------------------- <selector Auto Download> -------------------------
+    // ------------------------- <selector Download> -------------------------
     
     if (counterDownload < k_maxConcurrentOperationDownload) {
         
@@ -1410,6 +1410,25 @@
         }  
     }
   
+    // ------------------------- <selector Upload> -------------------------
+    
+    if (counterUpload < k_maxConcurrentOperationUpload) {
+        
+        metadataForUpload = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND sessionSelector == %@ AND status == %d", _activeAccount, selectorUploadFile, k_metadataStatusWaitUpload]];
+        if (metadataForUpload) {
+            
+            if ([metadataForUpload.session isEqualToString:k_upload_session_extension]) {
+                metadataForUpload.session = k_upload_session;
+            }
+            
+            metadataForUpload.status = k_metadataStatusInUpload;
+            tableMetadata *metadata = [[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
+            
+            [[CCNetworking sharedNetworking] uploadFile:metadata taskStatus:k_taskStatusResume delegate:_activeMain];
+            counterNewDownloadUpload++;
+        }
+    }
+    
     // ------------------------- <selector Auto Upload> -------------------------
     
     if (counterUpload < k_maxConcurrentOperationUpload) {
@@ -1454,25 +1473,6 @@
         }
     }
   
-    // ------------------------- <selector Upload File> -------------------------
-    
-    if (counterUpload < k_maxConcurrentOperationUpload) {
-        
-        metadataForUpload = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND sessionSelector == %@ AND status == %d", _activeAccount, selectorUploadFile, k_metadataStatusWaitUpload]];
-        if (metadataForUpload) {
-            
-            if ([metadataForUpload.session isEqualToString:k_upload_session_extension]) {
-                metadataForUpload.session = k_upload_session;
-            }
-            
-            metadataForUpload.status = k_metadataStatusInUpload;
-            tableMetadata *metadata = [[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
-
-            [[CCNetworking sharedNetworking] uploadFile:metadata taskStatus:k_taskStatusResume delegate:_activeMain];
-            counterNewDownloadUpload++;
-        }
-    }
-    
     // No Download/upload available ? --> remove errors for retry
     if (counterNewDownloadUpload == 0) {
         

iOSClient/Main/NCMainCommon.swift

@@ -188,26 +188,26 @@ class NCMainCommon: NSObject {
             
             // Write status on Label Info
             switch metadata.status {
-            case 2:
+            case Int(k_metadataStatusWaitDownload):
                 cell.labelInfoFile.text = CCUtility.transformedSize(metadata.size) + " " + NSLocalizedString("_status_wait_download_", comment: "")
                 break
-            case 3:
+            case Int(k_metadataStatusInDownload):
                 cell.labelInfoFile.text = CCUtility.transformedSize(metadata.size) + " " + NSLocalizedString("_status_in_download_", comment: "")
                 break
-            case 4:
+            case Int(k_metadataStatusDownloading):
                 if totalBytes > 0 {
                     cell.labelInfoFile.text = CCUtility.transformedSize(totalBytesExpected) + " - ↓" + CCUtility.transformedSize(totalBytes)
                 } else {
                     cell.labelInfoFile.text = CCUtility.transformedSize(metadata.size)
                 }
                 break
-            case 6:
+            case Int(k_metadataStatusWaitUpload):
                 cell.labelInfoFile.text = NSLocalizedString("_status_wait_upload_", comment: "")
                 break
-            case 7:
+            case Int(k_metadataStatusInUpload):
                 cell.labelInfoFile.text = NSLocalizedString("_status_in_upload_", comment: "")
                 break
-            case 8:
+            case Int(k_metadataStatusUploading):
                 if totalBytes > 0 {
                     cell.labelInfoFile.text = CCUtility.transformedSize(totalBytesExpected) + " - ↑" + CCUtility.transformedSize(totalBytes)
                 } else {