@kesha-antonov/react-native-background-downloader 3.0.3 → 3.1.1

package/android/build.gradle

@@ -24,4 +24,6 @@ android {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
+    implementation 'com.tencent:mmkv:+'
+    implementation 'com.google.code.gson:gson:+'
 }

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.eko">
 
+  <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
+
 </manifest>

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

@@ -23,36 +23,29 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.nio.channels.FileChannel;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Scanner;
 
 import javax.annotation.Nullable;
 
-import java.util.Set;
-import java.net.URL;
-import java.net.URLConnection;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.util.LongSparseArray;
-
-import com.facebook.react.bridge.Callback;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import android.net.Uri;
 import android.webkit.MimeTypeMap;
 import android.database.Cursor;
 import android.os.Build;
-import android.os.Environment;
+// TOREMOVE
+// import android.os.Environment;
+
+import com.tencent.mmkv.MMKV;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
 public class RNBackgroundDownloaderModule extends ReactContextBaseJavaModule {
 
@@ -90,11 +83,12 @@ public class RNBackgroundDownloaderModule extends ReactContextBaseJavaModule {
 
   private static Object sharedLock = new Object();
 
-  private static void copyFile(File src, File dst) throws IOException {
+  private static void moveFile(File src, File dst) throws IOException {
     FileChannel inChannel = new FileInputStream(src).getChannel();
     FileChannel outChannel = new FileOutputStream(dst).getChannel();
     try {
       inChannel.transferTo(0, inChannel.size(), outChannel);
+      src.delete();
     } finally {
       if (inChannel != null)
         inChannel.close();
@@ -103,6 +97,8 @@ public class RNBackgroundDownloaderModule extends ReactContextBaseJavaModule {
     }
   }
 
+  private static MMKV mmkv;
+
   BroadcastReceiver downloadReceiver = new BroadcastReceiver() {
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -137,7 +133,7 @@ public class RNBackgroundDownloaderModule extends ReactContextBaseJavaModule {
                 }
 
                 // MOVE FILE
-                copyFile(file, dest);
+                moveFile(file, dest);
                 file.delete();
 
                 WritableMap params = Arguments.createMap();
@@ -173,6 +169,10 @@ public class RNBackgroundDownloaderModule extends ReactContextBaseJavaModule {
   public RNBackgroundDownloaderModule(ReactApplicationContext reactContext) {
     super(reactContext);
 
+    MMKV.initialize(reactContext);
+
+    mmkv = MMKV.mmkvWithID(getName());
+
     loadDownloadIdToConfigMap();
     loadConfigMap();
 
@@ -269,25 +269,26 @@ public class RNBackgroundDownloaderModule extends ReactContextBaseJavaModule {
 
   private void saveDownloadIdToConfigMap() {
     synchronized (sharedLock) {
-      File file = new File(this.getReactApplicationContext().getFilesDir(), getName() + "_downloadIdToConfig");
-      try {
-        ObjectOutputStream outputStream = new ObjectOutputStream(new FileOutputStream(file));
-        outputStream.writeObject(downloadIdToConfig);
-        outputStream.flush();
-        outputStream.close();
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
+      Gson gson = new Gson();
+      String str = gson.toJson(downloadIdToConfig);
+
+      mmkv.encode(getName() + "_downloadIdToConfig", str);
     }
   }
 
   private void loadDownloadIdToConfigMap() {
-    File file = new File(this.getReactApplicationContext().getFilesDir(), getName() + "_downloadIdToConfig");
-    if (file.exists()) {
+    synchronized (sharedLock) {
       try {
-        ObjectInputStream inputStream = new ObjectInputStream(new FileInputStream(file));
-        downloadIdToConfig = (Map<Long, RNBGDTaskConfig>) inputStream.readObject();
-      } catch (IOException | ClassNotFoundException e) {
+        String str = mmkv.decodeString(getName() + "_downloadIdToConfig");
+        if (str != null) {
+          Gson gson = new Gson();
+
+          TypeToken<Map<Long, RNBGDTaskConfig>> mapType = new TypeToken<Map<Long, RNBGDTaskConfig>>() {
+          };
+
+          downloadIdToConfig = (Map<Long, RNBGDTaskConfig>) gson.fromJson(str, mapType);
+        }
+      } catch (Exception e) {
         e.printStackTrace();
       }
     }
@@ -295,52 +296,15 @@ public class RNBackgroundDownloaderModule extends ReactContextBaseJavaModule {
 
   private void saveConfigMap() {
     synchronized (sharedLock) {
-      File file = new File(this.getReactApplicationContext().getFilesDir(), getName() + "_config");
-      try {
-        ObjectOutputStream outputStream = new ObjectOutputStream(new FileOutputStream(file));
-
-        Map<String, String> config = new HashMap<>();
-        config.put("progressInterval", Integer.toString(progressInterval));
-        outputStream.writeObject(config);
-        outputStream.flush();
-        outputStream.close();
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
+      mmkv.encode(getName() + "_progressInterval", progressInterval);
     }
   }
 
   private void loadConfigMap() {
-    File file = new File(this.getReactApplicationContext().getFilesDir(), getName() + "_config");
-    if (file.exists()) {
-      try {
-        ObjectInputStream inputStream = new ObjectInputStream(new FileInputStream(file));
-        Map<String, Object> config = (HashMap<String, Object>) inputStream.readObject();
-        // iterate over config
-        for (Map.Entry<String, Object> entry : config.entrySet()) {
-          String key = entry.getKey();
-
-          Object valueObj = entry.getValue();
-          String value = null;
-          if (valueObj instanceof Long) {
-            value = Long.toString((Long) valueObj);
-          } else if (valueObj instanceof String) {
-            value = (String) valueObj;
-          }
-
-          if (key.equals("progressInterval") && value != null) {
-            try {
-              int _progressInterval = Integer.parseInt(value);
-              if (_progressInterval > 0) {
-                progressInterval = _progressInterval;
-              }
-            } catch (NumberFormatException e) {
-              e.printStackTrace();
-            }
-          }
-        }
-      } catch (IOException | ClassNotFoundException e) {
-        e.printStackTrace();
+    synchronized (sharedLock) {
+      int _progressInterval = mmkv.decodeInt(getName() + "_progressInterval");
+      if (_progressInterval > 0) {
+        progressInterval = _progressInterval;
       }
     }
   }

package/ios/RNBGDTaskConfig.h

@@ -8,22 +8,24 @@
 
 #import <Foundation/Foundation.h>
 
-@interface RNBGDTaskConfig : NSObject <NSCoding>
+@interface RNBGDTaskConfig : NSObject <NSCoding, NSSecureCoding>
 
-@property NSString * _Nonnull id;
-@property NSString * _Nonnull destination;
-@property NSString * _Nonnull metadata;
+@property NSString *_Nonnull id;
+@property NSString *_Nonnull destination;
+@property NSString *_Nonnull metadata;
 @property BOOL reportedBegin;
 
-- (id _Nullable )initWithDictionary: (NSDictionary *_Nonnull)dict;
+- (id _Nullable)initWithDictionary:(NSDictionary *_Nonnull)dict;
 
 @end
 
 @implementation RNBGDTaskConfig
 
-- (id _Nullable )initWithDictionary: (NSDictionary *_Nonnull)dict {
+- (id _Nullable)initWithDictionary:(NSDictionary *_Nonnull)dict
+{
     self = [super init];
-    if (self) {
+    if (self)
+    {
         self.id = dict[@"id"];
         self.destination = dict[@"destination"];
         self.metadata = dict[@"metadata"];
@@ -33,21 +35,24 @@
     return self;
 }
 
-- (void)encodeWithCoder:(nonnull NSCoder *)aCoder {
+- (void)encodeWithCoder:(nonnull NSCoder *)aCoder
+{
     [aCoder encodeObject:self.id forKey:@"id"];
     [aCoder encodeObject:self.destination forKey:@"destination"];
     [aCoder encodeObject:self.metadata forKey:@"metadata"];
     [aCoder encodeBool:self.reportedBegin forKey:@"reportedBegin"];
 }
 
-- (nullable instancetype)initWithCoder:(nonnull NSCoder *)aDecoder {
+- (nullable instancetype)initWithCoder:(nonnull NSCoder *)aDecoder
+{
     self = [super init];
-    if (self) {
+    if (self)
+    {
         self.id = [aDecoder decodeObjectForKey:@"id"];
         self.destination = [aDecoder decodeObjectForKey:@"destination"];
 
         // metadata CAN BE nil AFTER UPGRADE FROM VERSION WHERE WAS NO PROP "metadata"
-        NSString * metadata = [aDecoder decodeObjectForKey:@"metadata"];
+        NSString *metadata = [aDecoder decodeObjectForKey:@"metadata"];
         if (metadata == nil)
             metadata = @"{}";
         self.metadata = metadata;
@@ -58,4 +63,9 @@
     return self;
 }
 
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
 @end

package/ios/RNBackgroundDownloader.m

@@ -8,9 +8,10 @@
 //
 #import "RNBackgroundDownloader.h"
 #import "RNBGDTaskConfig.h"
+#import <MMKV/MMKV.h>
 
 #define ID_TO_CONFIG_MAP_KEY @"com.eko.bgdownloadidmap"
-#define CONFIG_MAP_KEY @"com.eko.config_map"
+#define PROGRESS_INTERVAL_KEY @"progressInterval"
 
 static CompletionHandler storedCompletionHandler;
 
@@ -26,6 +27,8 @@ static CompletionHandler storedCompletionHandler;
     NSNumber *sharedLock;
     float progressInterval; // IN SECONDS
     BOOL isNotificationCenterInited;
+
+    MMKV *mmkv;
 }
 
 RCT_EXPORT_MODULE();
@@ -64,18 +67,24 @@ RCT_EXPORT_MODULE();
     NSLog(@"[RNBackgroundDownloader] - [init]");
     self = [super init];
     if (self) {
-        taskToConfigMap = [self deserialize:[[NSUserDefaults standardUserDefaults] objectForKey:ID_TO_CONFIG_MAP_KEY]];
+        [MMKV initializeMMKV:nil];
+
+        mmkv = [MMKV mmkvWithID:@"RNBackgroundDownloader"];
+
+        NSData *taskToConfigMapData = [mmkv getDataForKey:ID_TO_CONFIG_MAP_KEY];
+        if (taskToConfigMapData != nil) {
+            NSMutableDictionary *_taskToConfigMap = [self deserialize:taskToConfigMapData];
+            if (_taskToConfigMap != nil) {
+                taskToConfigMap = _taskToConfigMap;
+            }
+        }
         if (taskToConfigMap == nil) {
             taskToConfigMap = [[NSMutableDictionary alloc] init];
         }
 
-        NSDictionary *configMap = [self deserialize:[[NSUserDefaults standardUserDefaults] objectForKey:CONFIG_MAP_KEY]];
-        if (configMap != nil) {
-            for (NSString *key in configMap) {
-                if ([key isEqual: @"progressInterval"]) {
-                    progressInterval = [configMap[key] intValue];
-                }
-            }
+        float _progressInterval = [mmkv getFloatForKey:PROGRESS_INTERVAL_KEY];
+        if (_progressInterval) {
+            progressInterval = _progressInterval;
         }
         if (isnan(progressInterval)) {
             progressInterval = 1.0;
@@ -165,7 +174,7 @@ RCT_EXPORT_MODULE();
         RNBGDTaskConfig *taskConfig = taskToConfigMap[taskId];
 
         [taskToConfigMap removeObjectForKey:taskId];
-        [[NSUserDefaults standardUserDefaults] setObject:[self serialize: taskToConfigMap] forKey:ID_TO_CONFIG_MAP_KEY];
+        [mmkv setData:[self serialize: taskToConfigMap] forKey:ID_TO_CONFIG_MAP_KEY];
 
         if (taskConfig) {
             [self->idToTaskMap removeObjectForKey:taskConfig.id];
@@ -224,8 +233,7 @@ RCT_EXPORT_METHOD(download: (NSDictionary *) options) {
     if (_progressInterval) {
         progressInterval = [_progressInterval intValue] / 1000; // progressInterval IN options SUPPLIED IN MILLISECONDS
 
-        NSDictionary *configMap = @{@"progressInterval": [NSNumber numberWithFloat:progressInterval]};
-        [[NSUserDefaults standardUserDefaults] setObject:[self serialize: configMap] forKey:CONFIG_MAP_KEY];
+        [mmkv setFloat:progressInterval forKey:PROGRESS_INTERVAL_KEY];
     }
 
 
@@ -253,7 +261,7 @@ RCT_EXPORT_METHOD(download: (NSDictionary *) options) {
         RNBGDTaskConfig *taskConfig = [[RNBGDTaskConfig alloc] initWithDictionary: @{@"id": identifier, @"destination": destination, @"metadata": metadata}];
 
         taskToConfigMap[@(task.taskIdentifier)] = taskConfig;
-        [[NSUserDefaults standardUserDefaults] setObject:[self serialize: taskToConfigMap] forKey:ID_TO_CONFIG_MAP_KEY];
+        [mmkv setData:[self serialize: taskToConfigMap] forKey:ID_TO_CONFIG_MAP_KEY];
 
         self->idToTaskMap[identifier] = task;
         idToPercentMap[identifier] = @0.0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kesha-antonov/react-native-background-downloader",
-  "version": "3.0.3",
+  "version": "3.1.1",
   "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.",
   "keywords": [
     "react-native",

package/react-native-background-downloader.podspec

@@ -14,4 +14,5 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency 'React-Core'
+  s.dependency 'MMKV'
 end