clear code

iOSClient/Database/NCManageDatabase.swift

@@ -2275,25 +2275,6 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func countQueueUpload(session: String?) -> Int {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return 0
-        }
-        
-        let realm = try! Realm()
-
-        let results : Results<tableQueueUpload>
-        
-        if let session = session {
-            results = realm.objects(tableQueueUpload.self).filter("account = %@ AND session = %@", tableAccount.account, session)
-        } else {
-            results = realm.objects(tableQueueUpload.self).filter("account = %@", tableAccount.account)
-        }
-        
-        return results.count
-    }
-
     //MARK: -
     //MARK: Table Share
     

iOSClient/Networking/CCNetworking.m

@@ -1359,29 +1359,28 @@
     
     if (WWan) {
         
-        for (tableMetadata *record in [[NCManageDatabase sharedInstance] getTableMetadataUploadWWan]) {
-            [recordsInUpload addObject:[record.fileNameView stringByAppendingString:record.assetLocalIdentifier]];
-        }
         for (tableQueueUpload *record in [[NCManageDatabase sharedInstance] getQueueUploadWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND session = %@", _activeAccount, k_upload_session_wwan]]) {
-            if (![recordsInUpload containsObject:[record.fileName stringByAppendingString:record.assetLocalIdentifier]])
-                [recordsInUpload addObject:[record.fileName stringByAppendingString:record.assetLocalIdentifier]];
+            [recordsInUpload addObject:[record.fileName stringByAppendingString:record.assetLocalIdentifier]];
+        }
+        for (tableMetadata *record in [[NCManageDatabase sharedInstance] getTableMetadataUploadWWan]) {
+            if (![recordsInUpload containsObject:[record.fileNameView stringByAppendingString:record.assetLocalIdentifier]])
+                [recordsInUpload addObject:[record.fileNameView stringByAppendingString:record.assetLocalIdentifier]];
         }
         
     } else {
         
-        for (tableMetadata *record in [[NCManageDatabase sharedInstance] getTableMetadataUpload]) {
-            [recordsInUpload addObject:[record.fileNameView stringByAppendingString:record.assetLocalIdentifier]];
-        }
         for (tableQueueUpload *record in [[NCManageDatabase sharedInstance] getQueueUploadWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND (session = %@ OR session = %@)", _activeAccount, k_upload_session, k_upload_session_foreground]]) {
-            if (![recordsInUpload containsObject:[record.fileName stringByAppendingString:record.assetLocalIdentifier]])
-                [recordsInUpload addObject:[record.fileName stringByAppendingString:record.assetLocalIdentifier]];
+            [recordsInUpload addObject:[record.fileName stringByAppendingString:record.assetLocalIdentifier]];
+        }
+        for (tableMetadata *record in [[NCManageDatabase sharedInstance] getTableMetadataUpload]) {
+            if (![recordsInUpload containsObject:[record.fileNameView stringByAppendingString:record.assetLocalIdentifier]])
+                [recordsInUpload addObject:[record.fileNameView stringByAppendingString:record.assetLocalIdentifier]];
         }
     }
     
     return recordsInUpload.count;
 }
 
-
 @end
 
 #pragma --------------------------------------------------------------------------------------------