Bug fix for priority queue

tonyofrancis · Apr 30, 2018 · 8e6f7b9 · 8e6f7b9
1 parent c692c0e
commit 8e6f7b9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/helper/PriorityListProcessorImpl.kt b/fetch2/src/main/java/com/tonyodev/fetch2/helper/PriorityListProcessorImpl.kt
@@ -29,17 +29,18 @@ class PriorityListProcessorImpl constructor(private val handler: Handler,
 
     private val priorityIteratorRunnable = Runnable {
         if (canContinueToProcess()) {
-            if (networkInfoProvider.isNetworkAvailable) {
+            if (networkInfoProvider.isNetworkAvailable && downloadManager.canAccommodateNewDownload()) {
                 val priorityList = getPriorityList()
                 for (index in 0..priorityList.lastIndex) {
-                    if (downloadManager.canAccommodateNewDownload() && canContinueToProcess()) {
+                    if (canContinueToProcess()) {
                         val download = priorityList[index]
                         val networkType = when {
                             globalNetworkType != NetworkType.GLOBAL_OFF -> globalNetworkType
                             download.networkType == NetworkType.GLOBAL_OFF -> NetworkType.ALL
                             else -> download.networkType
                         }
-                        if (networkInfoProvider.isOnAllowedNetwork(networkType) && canContinueToProcess()) {
+                        if (networkInfoProvider.isOnAllowedNetwork(networkType) && canContinueToProcess()
+                                && !downloadManager.contains(download.id)) {
                             downloadManager.start(download)
                         }
                     } else {