Merge remote-tracking branch 'upstream/master' into master_copy

# Conflicts:
#	android/build.gradle
#	android/src/main/java/com/eko/RNBackgroundDownloaderModule.java

Author: Tsirikoglou Yiannis

android/build.gradle

@@ -1,12 +1,15 @@
 apply plugin: 'com.android.library'
 
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion safeExtGet("compileSdkVersion", 28)
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        minSdkVersion safeExtGet('minSdkVersion', 16)
+        targetSdkVersion safeExtGet('targetSdkVersion', 28)
         versionCode 1
         versionName "1.0"
         ndk {
@@ -18,12 +21,11 @@ android {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
-    if (project.properties['android.useAndroidX'] == true) {
-        implementation "androidx.tonyodev.fetch2:xfetch2:3.1.4"
-        implementation "androidx.tonyodev.fetch2okhttp:xfetch2okhttp:3.1.4"
-
+    if (project.properties['android.useAndroidX'] == 'true' || project.properties['android.useAndroidX'] == true) {
+        api "androidx.tonyodev.fetch2:xfetch2:3.1.4"
+        api "androidx.tonyodev.fetch2okhttp:xfetch2okhttp:3.1.4"
     } else {
-        implementation "com.tonyodev.fetch2:fetch2:3.0.10"
-        implementation "com.tonyodev.fetch2okhttp:fetch2okhttp:3.0.10"
+        api "com.tonyodev.fetch2:fetch2:3.0.10"
+        api "com.tonyodev.fetch2okhttp:fetch2okhttp:3.0.10"
     }
 }

android/src/main/java/com/eko/RNBackgroundDownloaderModule.java

@@ -319,7 +319,9 @@ public void onCompleted(Download download) {
       }
 
       removeFromMaps(download.getId());
-      fetch.remove(download.getId());
+      if (!fetch.isClosed()) {
+        fetch.remove(download.getId());
+      }
     }
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-background-downloader",
-  "version": "2.3.1",
+  "version": "2.3.4",
   "description": "A library for React-Native to help you download large files on iOS and Android both in the foreground and most importantly in the background.",
   "main": "index.js",
   "scripts": {