diff --git a/android/build.gradle b/android/build.gradle index 98c7ee9..b427a97 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.1" defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" ndk { @@ -19,6 +19,4 @@ dependencies { //noinspection GradleDynamicVersion provided 'com.facebook.react:react-native:+' compile "com.tonyodev.fetch2:fetch2:2.0.0-RC12" -} - - \ No newline at end of file +} \ No newline at end of file diff --git a/android/src/main/java/com/eko/RNBGDTaskConfig.java b/android/src/main/java/com/eko/RNBGDTaskConfig.java new file mode 100644 index 0000000..1fe3d23 --- /dev/null +++ b/android/src/main/java/com/eko/RNBGDTaskConfig.java @@ -0,0 +1,13 @@ +package com.eko; + +import java.io.Serializable; + +public class RNBGDTaskConfig implements Serializable { + public String id; + public boolean reportedBegin; + + public TaskConfig(String id) { + this.id = id; + this.reportedBegin = false; + } +} \ No newline at end of file diff --git a/android/src/main/java/com/eko/RNBackgroundDownloadModule.java b/android/src/main/java/com/eko/RNBackgroundDownloadModule.java index e6dffb8..6737d5b 100644 --- a/android/src/main/java/com/eko/RNBackgroundDownloadModule.java +++ b/android/src/main/java/com/eko/RNBackgroundDownloadModule.java @@ -59,12 +59,12 @@ public class RNBackgroundDownloadModule extends ReactContextBaseJavaModule { private Fetch fetch; private Map idToRequestId = new HashMap<>(); @SuppressLint("UseSparseArrays") - private Map requestIdToConfig = new HashMap<>(); + private Map requestIdToConfig = new HashMap<>(); private DeviceEventManagerModule.RCTDeviceEventEmitter ee; private Date lastProgressReport = new Date(); private WritableArray progressReports = Arguments.createArray(); - public RNFBGDModule(ReactApplicationContext reactContext) { + public RNBackgroundDownloadModule(ReactApplicationContext reactContext) { super(reactContext); loadConfigMap(); @@ -112,7 +112,7 @@ public class RNBackgroundDownloadModule extends ReactContextBaseJavaModule { } private void removeFromMaps(int requestId) { - TaskConfig config = requestIdToConfig.get(requestId); + RNBGDTaskConfig config = requestIdToConfig.get(requestId); if (config != null) { idToRequestId.remove(config.id); requestIdToConfig.remove(requestId); @@ -137,7 +137,7 @@ public class RNBackgroundDownloadModule extends ReactContextBaseJavaModule { File file = new File(this.getReactApplicationContext().getFilesDir(), "RNFileBackgroundDownload_configMap"); try { ObjectInputStream inputStream = new ObjectInputStream(new FileInputStream(file)); - requestIdToConfig = (Map) inputStream.readObject(); + requestIdToConfig = (Map) inputStream.readObject(); } catch (IOException | ClassNotFoundException e) { e.printStackTrace(); } @@ -155,7 +155,7 @@ public class RNBackgroundDownloadModule extends ReactContextBaseJavaModule { return; } - TaskConfig config = new TaskConfig(id); + RNBGDTaskConfig config = new RNBGDTaskConfig(id); Request request = new Request(url, destination); request.setPriority(options.hasKey("priority") ? Priority.valueOf(options.getInt("priority")) : Priority.NORMAL); request.setNetworkType(options.hasKey("network") ? NetworkType.valueOf(options.getInt("network")) : NetworkType.ALL); @@ -199,7 +199,7 @@ public class RNBackgroundDownloadModule extends ReactContextBaseJavaModule { for (Download download : downloads) { if (requestIdToConfig.containsKey(download.getId())) { - TaskConfig config = requestIdToConfig.get(download.getId()); + RNBGDTaskConfig config = requestIdToConfig.get(download.getId()); WritableMap params = Arguments.createMap(); params.putString("id", config.id); params.putInt("state", stateMap.get(download.getStatus())); @@ -258,7 +258,7 @@ public class RNBackgroundDownloadModule extends ReactContextBaseJavaModule { @Override public void onProgress(Download download, long l, long l1) { - TaskConfig config = requestIdToConfig.get(download.getId()); + RNBGDTaskConfig config = requestIdToConfig.get(download.getId()); WritableMap params = Arguments.createMap(); params.putString("id", config.id);