update change log

Author: tonyofrancis

CHANGELOG

@@ -1,3 +1,6 @@
+Version 2.2.0-RC16
+- Enqueue Action bug fixes
+
 Version 2.2.0-RC15
 - Network state check improvements.
 - Fetch.getHasActiveDownloads() should now report accurately.

README.md

@@ -1,6 +1,6 @@
 
 [![Build Status](https://travis-ci.org/tonyofrancis/Fetch.svg?branch=v2)](https://travis-ci.org/tonyofrancis/Fetch)
-[ ![Download](https://api.bintray.com/packages/tonyofrancis/maven/fetch2/images/download.svg?version=2.2.0-RC15) ](https://bintray.com/tonyofrancis/maven/fetch2/2.2.0-RC15/link)
+[ ![Download](https://api.bintray.com/packages/tonyofrancis/maven/fetch2/images/download.svg?version=2.2.0-RC16) ](https://bintray.com/tonyofrancis/maven/fetch2/2.2.0-RC16/link)
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Android%20Networking-blue.svg?style=flat)](https://android-arsenal.com/details/1/5196)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/tonyofrancis/Fetch/blob/master/LICENSE)
 
@@ -48,7 +48,7 @@ How to use Fetch
 Using Fetch is easy! Just add the Gradle dependency to your application's build.gradle file.
 
 ```java
-implementation "com.tonyodev.fetch2:fetch2:2.2.0-RC15"
+implementation "com.tonyodev.fetch2:fetch2:2.2.0-RC16"
 ```
 
 Next, get an instance of Fetch and request a download.
@@ -214,7 +214,7 @@ to use the OkHttp Downloader instead. You can create your own custom downloaders
 if necessary. See the Java docs for details.
 
 ```java
-implementation "com.tonyodev.fetch2okhttp:fetch2okhttp:2.2.0-RC15"
+implementation "com.tonyodev.fetch2okhttp:fetch2okhttp:2.2.0-RC16"
 ```
 Set the OkHttp Downloader for Fetch to use.
 ```java
@@ -235,7 +235,7 @@ If you would like to take advantage of RxJava2 features when using Fetch,
 add the following gradle dependency to your application's build.gradle file.
 
 ```java
-implementation "com.tonyodev.fetch2rx:fetch2rx:2.2.0-RC15"
+implementation "com.tonyodev.fetch2rx:fetch2rx:2.2.0-RC16"
 ```
 
 RxFetch makes it super easy to enqueue download requests and query downloads using rxJava2 functional methods.
@@ -271,7 +271,7 @@ added in the coming days.
 
 Start using FetchFileServer by adding the gradle dependency to your application's build.gradle file.
 ```java
-implementation "com.tonyodev.fetch2fileserver:fetch2fileserver:2.2.0-RC15"
+implementation "com.tonyodev.fetch2fileserver:fetch2fileserver:2.2.0-RC16"
 ```
 
 Start a FetchFileServer instance and add resource files that it can server to connected clients.
@@ -380,7 +380,7 @@ Fetch1 Migration
 
 Migrate downloads from Fetch1 to Fetch2 using the migration assistant. Add the following gradle dependency to your application's build.gradle file.
 ```java
-implementation "com.tonyodev.fetchmigrator:fetchmigrator:2.2.0-RC15"
+implementation "com.tonyodev.fetchmigrator:fetchmigrator:2.2.0-RC16"
 ```
 
 Then run the Migrator.

fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchHandlerImpl.kt

@@ -78,15 +78,19 @@ class FetchHandlerImpl(private val namespace: String,
 
     private fun prepareDownloadInfoForEnqueue(downloadInfo: DownloadInfo): Boolean {
         cancelDownloadsIfDownloading(listOf(downloadInfo.id))
-        val existingDownload = databaseManager.getByFile(downloadInfo.file)
+        var existingDownload = databaseManager.getByFile(downloadInfo.file)
         if (existingDownload == null) {
             createFileIfPossible(File(downloadInfo.file))
-        } else if (existingDownload.status == Status.DOWNLOADING) {
-            existingDownload.status = Status.QUEUED
-            try {
-                databaseManager.update(existingDownload)
-            } catch (e: Exception) {
+        } else {
+            cancelDownloadsIfDownloading(listOf(existingDownload.id))
+            existingDownload = databaseManager.getByFile(downloadInfo.file)
+            if (existingDownload != null && existingDownload.status == Status.DOWNLOADING) {
+                existingDownload.status = Status.QUEUED
+                try {
+                    databaseManager.update(existingDownload)
+                } catch (e: Exception) {
 
+                }
             }
         }
         return when (downloadInfo.enqueueAction) {
@@ -106,6 +110,9 @@ class FetchHandlerImpl(private val namespace: String,
                 throw FetchException(REQUEST_WITH_FILE_PATH_ALREADY_EXIST)
             }
             EnqueueAction.REPLACE_EXISTING -> {
+                if (existingDownload != null) {
+                    deleteDownloads(listOf(existingDownload.id))
+                }
                 deleteDownloads(listOf(downloadInfo.id))
                 return false
             }

versions.gradle

@@ -16,6 +16,6 @@ ext {
     rxAndroid2_version = "2.1.0"
     timber_version = "4.7.1"
     novoda_bintray_version = "0.8.1"
-    library_version = "2.2.0-RC15"
-    library_version_code = 53
+    library_version = "2.2.0-RC16"
+    library_version_code = 54
 }