react-native-blob-util 0.16.4 → 0.17.1

package/android/src/main/java/com/ReactNativeBlobUtil/{ReactNativeBlobUtil.java → ReactNativeBlobUtilImpl.java}

@@ -8,7 +8,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.util.SparseArray;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.FileProvider;
 
@@ -18,8 +17,6 @@ import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
@@ -28,8 +25,6 @@ import com.facebook.react.modules.network.ForwardingCookieHandler;
 import com.facebook.react.modules.network.OkHttpClientProvider;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -42,7 +37,9 @@ import okhttp3.OkHttpClient;
 import static android.app.Activity.RESULT_OK;
 import static com.ReactNativeBlobUtil.ReactNativeBlobUtilConst.GET_CONTENT_INTENT;
 
-public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
+class ReactNativeBlobUtilImpl {
+
+    public static final String NAME = "ReactNativeBlobUtil";
 
     private final OkHttpClient mClient;
 
@@ -54,10 +51,7 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
     private static boolean ActionViewVisible = false;
     private static final SparseArray<Promise> promiseTable = new SparseArray<>();
 
-    public ReactNativeBlobUtil(ReactApplicationContext reactContext) {
-
-        super(reactContext);
-
+    public ReactNativeBlobUtilImpl(ReactApplicationContext reactContext) {
         mClient = OkHttpClientProvider.getOkHttpClient();
         ForwardingCookieHandler mCookieHandler = new ForwardingCookieHandler(reactContext);
         CookieJarContainer mCookieJarContainer = (CookieJarContainer) mClient.cookieJar();
@@ -81,22 +75,6 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         });
     }
 
-    @NonNull
-    @Override
-    public String getName() {
-        return "ReactNativeBlobUtil";
-    }
-
-    @Override
-    public Map<String, Object> getConstants() {
-        Map<String, Object> res = new HashMap<>();
-        res.putAll(ReactNativeBlobUtilFS.getSystemfolders(this.getReactApplicationContext()));
-        res.putAll(ReactNativeBlobUtilFS.getLegacySystemfolders(this.getReactApplicationContext()));
-        System.out.println(res);
-        return res;
-    }
-
-    @ReactMethod
     public void createFile(final String path, final String content, final String encode, final Promise promise) {
         threadPool.execute(new Runnable() {
             @Override
@@ -106,7 +84,6 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
     public void createFileASCII(final String path, final ReadableArray dataArray, final Promise promise) {
         threadPool.execute(new Runnable() {
             @Override
@@ -116,13 +93,12 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
     public void actionViewIntent(String path, String mime, @Nullable String chooserTitle, final Promise promise) {
         try {
             Uri uriForFile = null;
             if (!ReactNativeBlobUtilUtils.isContentUri(path)) {
-                uriForFile = FileProvider.getUriForFile(this.getReactApplicationContext(),
-                        this.getReactApplicationContext().getPackageName() + ".provider", new File(path));
+                uriForFile = FileProvider.getUriForFile(RCTContext,
+                        RCTContext.getPackageName() + ".provider", new File(path));
             } else {
                 uriForFile = Uri.parse(path);
             }
@@ -144,7 +120,7 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
             }
 
             try {
-                this.getReactApplicationContext().startActivity(intent);
+                RCTContext.startActivity(intent);
                 promise.resolve(true);
             } catch (ActivityNotFoundException ex) {
                 promise.reject("ENOAPP", "No app installed for " + mime);
@@ -177,27 +153,22 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
     public void writeArrayChunk(final String streamId, final ReadableArray dataArray, final Callback callback) {
         ReactNativeBlobUtilStream.writeArrayChunk(streamId, dataArray, callback);
     }
 
-    @ReactMethod
     public void unlink(String path, Callback callback) {
         ReactNativeBlobUtilFS.unlink(path, callback);
     }
 
-    @ReactMethod
     public void mkdir(String path, Promise promise) {
         ReactNativeBlobUtilFS.mkdir(path, promise);
     }
 
-    @ReactMethod
     public void exists(String path, Callback callback) {
         ReactNativeBlobUtilFS.exists(path, callback);
     }
 
-    @ReactMethod
     public void cp(final String path, final String dest, final Callback callback) {
         threadPool.execute(new Runnable() {
             @Override
@@ -207,37 +178,30 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
     public void mv(String path, String dest, Callback callback) {
         ReactNativeBlobUtilFS.mv(path, dest, callback);
     }
 
-    @ReactMethod
     public void ls(String path, Promise promise) {
         ReactNativeBlobUtilFS.ls(path, promise);
     }
 
-    @ReactMethod
     public void writeStream(String path, String encode, boolean append, Callback callback) {
-        new ReactNativeBlobUtilStream(this.getReactApplicationContext()).writeStream(path, encode, append, callback);
+        new ReactNativeBlobUtilStream(RCTContext).writeStream(path, encode, append, callback);
     }
 
-    @ReactMethod
     public void writeChunk(String streamId, String data, Callback callback) {
         ReactNativeBlobUtilStream.writeChunk(streamId, data, callback);
     }
 
-    @ReactMethod
     public void closeStream(String streamId, Callback callback) {
         ReactNativeBlobUtilStream.closeStream(streamId, callback);
     }
 
-    @ReactMethod
     public void removeSession(ReadableArray paths, Callback callback) {
         ReactNativeBlobUtilFS.removeSession(paths, callback);
     }
 
-    @ReactMethod
     public void readFile(final String path, final String encoding, final boolean transformFile, final Promise promise) {
         threadPool.execute(new Runnable() {
             @Override
@@ -247,7 +211,6 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
     public void writeFileArray(final String path, final ReadableArray data, final boolean append, final Promise promise) {
         threadPool.execute(new Runnable() {
             @Override
@@ -257,7 +220,6 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
     public void writeFile(final String path, final String encoding, final String data, final boolean transformFile, final boolean append, final Promise promise) {
         threadPool.execute(new Runnable() {
             @Override
@@ -267,19 +229,16 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
     public void lstat(String path, Callback callback) {
         ReactNativeBlobUtilFS.lstat(path, callback);
     }
 
-    @ReactMethod
     public void stat(String path, Callback callback) {
         ReactNativeBlobUtilFS.stat(path, callback);
     }
 
-    @ReactMethod
     public void scanFile(final ReadableArray pairs, final Callback callback) {
-        final ReactApplicationContext ctx = this.getReactApplicationContext();
+        final ReactApplicationContext ctx = RCTContext;
         threadPool.execute(new Runnable() {
             @Override
             public void run() {
@@ -301,7 +260,6 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
     public void hash(final String path, final String algorithm, final Promise promise) {
         threadPool.execute(new Runnable() {
             @Override
@@ -316,19 +274,17 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
      * @param encoding   Stream encoding, should be one of `base64`, `ascii`, and `utf8`
      * @param bufferSize Stream buffer size, default to 4096 or 4095(base64).
      */
-    @ReactMethod
     public void readStream(final String path, final String encoding, final int bufferSize, final int tick, final String streamId) {
-        final ReactApplicationContext ctx = this.getReactApplicationContext();
+        final ReactApplicationContext ctx = RCTContext;
         fsThreadPool.execute(new Runnable() {
             @Override
             public void run() {
                 ReactNativeBlobUtilStream fs = new ReactNativeBlobUtilStream(ctx);
-                fs.readStream(path, encoding, bufferSize, tick, streamId);
+                fs.readStream(path, encoding, bufferSize, tick, streamId, RCTContext);
             }
         });
     }
 
-    @ReactMethod
     public void cancelRequest(String taskId, Callback callback) {
         try {
             ReactNativeBlobUtilReq.cancelTask(taskId);
@@ -338,45 +294,38 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
     public void slice(String src, String dest, int start, int end, Promise promise) {
         ReactNativeBlobUtilFS.slice(src, dest, start, end, "", promise);
     }
 
-    @ReactMethod
     public void enableProgressReport(String taskId, int interval, int count) {
         ReactNativeBlobUtilProgressConfig config = new ReactNativeBlobUtilProgressConfig(true, interval, count, ReactNativeBlobUtilProgressConfig.ReportType.Download);
         ReactNativeBlobUtilReq.progressReport.put(taskId, config);
     }
 
-    @ReactMethod
     public void df(final Callback callback) {
         fsThreadPool.execute(new Runnable() {
             @Override
             public void run() {
-                ReactNativeBlobUtilFS.df(callback, getReactApplicationContext());
+                ReactNativeBlobUtilFS.df(callback, RCTContext);
             }
         });
     }
 
 
-    @ReactMethod
     public void enableUploadProgressReport(String taskId, int interval, int count) {
         ReactNativeBlobUtilProgressConfig config = new ReactNativeBlobUtilProgressConfig(true, interval, count, ReactNativeBlobUtilProgressConfig.ReportType.Upload);
         ReactNativeBlobUtilReq.uploadProgressReport.put(taskId, config);
     }
 
-    @ReactMethod
     public void fetchBlob(ReadableMap options, String taskId, String method, String url, ReadableMap headers, String body, final Callback callback) {
         new ReactNativeBlobUtilReq(options, taskId, method, url, headers, body, null, mClient, callback).run();
     }
 
-    @ReactMethod
     public void fetchBlobForm(ReadableMap options, String taskId, String method, String url, ReadableMap headers, ReadableArray body, final Callback callback) {
         new ReactNativeBlobUtilReq(options, taskId, method, url, headers, null, body, mClient, callback).run();
     }
 
-    @ReactMethod
     public void getContentIntent(String mime, Promise promise) {
         Intent i = new Intent(Intent.ACTION_GET_CONTENT);
         if (mime != null)
@@ -384,11 +333,10 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         else
             i.setType("*/*");
         promiseTable.put(GET_CONTENT_INTENT, promise);
-        this.getReactApplicationContext().startActivityForResult(i, GET_CONTENT_INTENT, null);
+        RCTContext.startActivityForResult(i, GET_CONTENT_INTENT, null);
 
     }
 
-    @ReactMethod
     public void addCompleteDownload(ReadableMap config, Promise promise) {
         DownloadManager dm = (DownloadManager) RCTContext.getSystemService(RCTContext.DOWNLOAD_SERVICE);
         if (config == null || !config.hasKey("path")) {
@@ -418,17 +366,14 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
 
     }
 
-    @ReactMethod
     public void getSDCardDir(Promise promise) {
-        ReactNativeBlobUtilFS.getSDCardDir(this.getReactApplicationContext(), promise);
+        ReactNativeBlobUtilFS.getSDCardDir(RCTContext, promise);
     }
 
-    @ReactMethod
     public void getSDCardApplicationDir(Promise promise) {
-        ReactNativeBlobUtilFS.getSDCardApplicationDir(this.getReactApplicationContext(), promise);
+        ReactNativeBlobUtilFS.getSDCardApplicationDir(RCTContext, promise);
     }
 
-    @ReactMethod
     public void createMediaFile(ReadableMap filedata, String mt, Promise promise) {
         if (!(filedata.hasKey("name") && filedata.hasKey("parentFolder") && filedata.hasKey("mimeType"))) {
             promise.reject("ReactNativeBlobUtil.createMediaFile", "invalid filedata: " + filedata.toString());
@@ -437,30 +382,26 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         if (mt == null) promise.reject("ReactNativeBlobUtil.createMediaFile", "invalid mediatype");
 
         FileDescription file = new FileDescription(filedata.getString("name"), filedata.getString("mimeType"), filedata.getString("parentFolder"));
-        Uri res = ReactNativeBlobUtilMediaCollection.createNewMediaFile(file, ReactNativeBlobUtilMediaCollection.MediaType.valueOf(mt), this.getReactApplicationContext());
+        Uri res = ReactNativeBlobUtilMediaCollection.createNewMediaFile(file, ReactNativeBlobUtilMediaCollection.MediaType.valueOf(mt), RCTContext);
         if (res != null) promise.resolve(res.toString());
         else promise.reject("ReactNativeBlobUtil.createMediaFile", "File could not be created");
     }
 
-    @ReactMethod
     public void writeToMediaFile(String fileUri, String path, boolean transformFile, Promise promise) {
-        boolean res = ReactNativeBlobUtilMediaCollection.writeToMediaFile(Uri.parse(fileUri), path, transformFile, promise);
+        boolean res = ReactNativeBlobUtilMediaCollection.writeToMediaFile(Uri.parse(fileUri), path, transformFile, promise, RCTContext);
         if (res) promise.resolve("Success");
     }
 
     @RequiresApi(api = Build.VERSION_CODES.Q)
-    @ReactMethod
     public void copyToInternal(String contentUri, String destpath, Promise promise) {
         ReactNativeBlobUtilMediaCollection.copyToInternal(Uri.parse(contentUri), destpath, promise);
     }
 
     @RequiresApi(api = Build.VERSION_CODES.Q)
-    @ReactMethod
     public void getBlob(String contentUri, String encoding, Promise promise) {
         ReactNativeBlobUtilMediaCollection.getBlob(Uri.parse(contentUri), encoding, promise);
     }
 
-    @ReactMethod
     public void copyToMediaStore(ReadableMap filedata, String mt, String path, Promise promise) {
         if (!(filedata.hasKey("name") && filedata.hasKey("parentFolder") && filedata.hasKey("mimeType"))) {
             promise.reject("ReactNativeBlobUtil.createMediaFile", "invalid filedata: " + filedata.toString());
@@ -476,14 +417,14 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         }
 
         FileDescription file = new FileDescription(filedata.getString("name"), filedata.getString("mimeType"), filedata.getString("parentFolder"));
-        Uri fileuri = ReactNativeBlobUtilMediaCollection.createNewMediaFile(file, ReactNativeBlobUtilMediaCollection.MediaType.valueOf(mt), this.getReactApplicationContext());
+        Uri fileuri = ReactNativeBlobUtilMediaCollection.createNewMediaFile(file, ReactNativeBlobUtilMediaCollection.MediaType.valueOf(mt), RCTContext);
 
         if (fileuri == null) {
             promise.reject("ReactNativeBlobUtil.createMediaFile", "File could not be created");
             return;
         }
 
-        boolean res = ReactNativeBlobUtilMediaCollection.writeToMediaFile(fileuri, path, false, promise);
+        boolean res = ReactNativeBlobUtilMediaCollection.writeToMediaFile(fileuri, path, false, promise, RCTContext);
         if (res) promise.resolve(fileuri.toString());
     }
 

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilMediaCollection.java

@@ -79,7 +79,7 @@ public class ReactNativeBlobUtilMediaCollection {
 
     public static Uri createNewMediaFile(FileDescription file, MediaType mt, ReactApplicationContext ctx) {
         // Add a specific media item.
-        Context appCtx = ReactNativeBlobUtil.RCTContext.getApplicationContext();
+        Context appCtx = ReactNativeBlobUtilImpl.RCTContext.getApplicationContext();
         ContentResolver resolver = appCtx.getContentResolver();
 
         ContentValues fileDetails = new ContentValues();
@@ -124,10 +124,10 @@ public class ReactNativeBlobUtilMediaCollection {
         return null;
     }
 
-    public static boolean writeToMediaFile(Uri fileUri, String data, boolean transformFile, Promise promise) {
+    public static boolean writeToMediaFile(Uri fileUri, String data, boolean transformFile, Promise promise, ReactApplicationContext ctx) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             try {
-                Context appCtx = ReactNativeBlobUtil.RCTContext.getApplicationContext();
+                Context appCtx = ctx.getApplicationContext();
                 ContentResolver resolver = appCtx.getContentResolver();
 
                 // set pending doesn't work right now. We would have to requery for the item
@@ -220,7 +220,7 @@ public class ReactNativeBlobUtilMediaCollection {
     }
 
     public static void copyToInternal(Uri contenturi, String destpath, Promise promise) {
-        Context appCtx = ReactNativeBlobUtil.RCTContext.getApplicationContext();
+        Context appCtx = ReactNativeBlobUtilImpl.RCTContext.getApplicationContext();
         ContentResolver resolver = appCtx.getContentResolver();
 
         InputStream in = null;
@@ -277,7 +277,7 @@ public class ReactNativeBlobUtilMediaCollection {
     }
 
     public static void getBlob(Uri contentUri, String encoding, Promise promise) {
-        Context appCtx = ReactNativeBlobUtil.RCTContext.getApplicationContext();
+        Context appCtx = ReactNativeBlobUtilImpl.RCTContext.getApplicationContext();
         ContentResolver resolver = appCtx.getContentResolver();
         try {
             InputStream in = resolver.openInputStream(contentUri);

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilPackage.java

@@ -1,36 +1,46 @@
 package com.ReactNativeBlobUtil;
 
-import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.JavaScriptModule;
+import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
+public class ReactNativeBlobUtilPackage extends TurboReactPackage {
 
-public class ReactNativeBlobUtilPackage implements ReactPackage {
-
-    @NonNull
+    @Nullable
     @Override
-    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
-        List<NativeModule> modules = new ArrayList<>();
-        modules.add(new ReactNativeBlobUtil(reactContext));
-        return modules;
-    }
-
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
+    public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+        if (name.equals(ReactNativeBlobUtilImpl.NAME)) {
+            return new ReactNativeBlobUtil(reactContext);
+        } else {
+            return null;
+        }
     }
 
-    @NonNull
     @Override
-    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
-        return Collections.emptyList();
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return () -> {
+            final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+            boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+            moduleInfos.put(
+                    ReactNativeBlobUtilImpl.NAME,
+                    new ReactModuleInfo(
+                            ReactNativeBlobUtilImpl.NAME,
+                            ReactNativeBlobUtilImpl.NAME,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            isTurboModule // isTurboModule
+                    ));
+            return moduleInfos;
+        };
     }
 
 }

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilReq.java

@@ -95,8 +95,8 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
 
     private boolean shouldTransformFile() {
         return this.options.transformFile &&
-                // Can only process if it's written to a file
-                (this.options.fileCache || this.options.path != null);
+            // Can only process if it's written to a file
+            (this.options.fileCache || this.options.path != null);
     }
 
     public static HashMap<String, Call> taskTable = new HashMap<>();
@@ -114,7 +114,6 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
     ReadableArray rawRequestBodyArray;
     ReadableMap headers;
     Callback callback;
-    Boolean callbackfired = false;
     long contentLength;
     long downloadManagerId;
     ReactNativeBlobUtilBody requestBody;
@@ -125,6 +124,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
     boolean timeout = false;
     ArrayList<String> redirects = new ArrayList<>();
     OkHttpClient client;
+    boolean callbackfired;
 
     public ReactNativeBlobUtilReq(ReadableMap options, String taskId, String method, String url, ReadableMap headers, String body, ReadableArray arrayBody, OkHttpClient client, final Callback callback) {
         this.method = method.toUpperCase(Locale.ROOT);
@@ -136,10 +136,11 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
         this.rawRequestBody = body;
         this.rawRequestBodyArray = arrayBody;
         this.client = client;
+        this.callbackfired = false;
 
         // If transformFile is specified, we first want to get the response back in memory so we can
         // encrypt it wholesale and at that point, write it into the file storage.
-        if ((this.options.fileCache || this.options.path != null) && !this.shouldTransformFile())
+        if((this.options.fileCache || this.options.path != null) && !this.shouldTransformFile())
             responseType = ResponseType.FileStorage;
         else
             responseType = ResponseType.KeepInMemory;
@@ -162,7 +163,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
 
         if (androidDownloadManagerTaskTable.containsKey(taskId)) {
             long downloadManagerIdForTaskId = androidDownloadManagerTaskTable.get(taskId).longValue();
-            Context appCtx = ReactNativeBlobUtil.RCTContext.getApplicationContext();
+            Context appCtx = ReactNativeBlobUtilImpl.RCTContext.getApplicationContext();
             DownloadManager dm = (DownloadManager) appCtx.getSystemService(Context.DOWNLOAD_SERVICE);
             dm.remove(downloadManagerIdForTaskId);
         }
@@ -187,7 +188,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                     long id = data.getLong("downloadManagerId");
                     if (id == downloadManagerId) {
 
-                        Context appCtx = ReactNativeBlobUtil.RCTContext.getApplicationContext();
+                        Context appCtx = ReactNativeBlobUtilImpl.RCTContext.getApplicationContext();
 
                         DownloadManager downloadManager = (DownloadManager) appCtx.getSystemService(Context.DOWNLOAD_SERVICE);
 
@@ -213,7 +214,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                                 args.putString("written", String.valueOf(written));
                                 args.putString("total", String.valueOf(total));
                                 args.putString("chunk", "");
-                                ReactNativeBlobUtil.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                                ReactNativeBlobUtilImpl.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                                         .emit(ReactNativeBlobUtilConst.EVENT_PROGRESS, args);
 
                             }
@@ -274,7 +275,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                 } catch (MalformedURLException e) {
                     e.printStackTrace();
                 }
-                Context appCtx = ReactNativeBlobUtil.RCTContext.getApplicationContext();
+                Context appCtx = ReactNativeBlobUtilImpl.RCTContext.getApplicationContext();
                 DownloadManager dm = (DownloadManager) appCtx.getSystemService(Context.DOWNLOAD_SERVICE);
                 downloadManagerId = dm.enqueue(req);
                 androidDownloadManagerTaskTable.put(taskId, Long.valueOf(downloadManagerId));
@@ -336,7 +337,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                 boolean found = false;
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    ConnectivityManager connectivityManager = (ConnectivityManager) ReactNativeBlobUtil.RCTContext.getSystemService(ReactNativeBlobUtil.RCTContext.CONNECTIVITY_SERVICE);
+                    ConnectivityManager connectivityManager = (ConnectivityManager) ReactNativeBlobUtilImpl.RCTContext.getSystemService(ReactNativeBlobUtilImpl.RCTContext.CONNECTIVITY_SERVICE);
                     Network[] networks = connectivityManager.getAllNetworks();
 
                     for (Network network : networks) {
@@ -487,14 +488,14 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         switch (responseType) {
                             case KeepInMemory:
                                 extended = new ReactNativeBlobUtilDefaultResp(
-                                        ReactNativeBlobUtil.RCTContext,
+                                        ReactNativeBlobUtilImpl.RCTContext,
                                         taskId,
                                         originalResponse.body(),
                                         options.increment);
                                 break;
                             case FileStorage:
                                 extended = new ReactNativeBlobUtilFileResp(
-                                        ReactNativeBlobUtil.RCTContext,
+                                        ReactNativeBlobUtilImpl.RCTContext,
                                         taskId,
                                         originalResponse.body(),
                                         destPath,
@@ -502,7 +503,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                                 break;
                             default:
                                 extended = new ReactNativeBlobUtilDefaultResp(
-                                        ReactNativeBlobUtil.RCTContext,
+                                        ReactNativeBlobUtilImpl.RCTContext,
                                         taskId,
                                         originalResponse.body(),
                                         options.increment);
@@ -581,7 +582,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                             scannable = notifyConfig.getBoolean("mediaScannable");
                         if (notifyConfig.hasKey("notification"))
                             notification = notifyConfig.getBoolean("notification");
-                        DownloadManager dm = (DownloadManager) ReactNativeBlobUtil.RCTContext.getSystemService(ReactNativeBlobUtil.RCTContext.DOWNLOAD_SERVICE);
+                        DownloadManager dm = (DownloadManager) ReactNativeBlobUtilImpl.RCTContext.getSystemService(ReactNativeBlobUtilImpl.RCTContext.DOWNLOAD_SERVICE);
                         dm.addCompletedDownload(title, desc, scannable, mime, destPath, contentLength, notification);
                     }
 
@@ -843,7 +844,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
     }
 
     private void emitStateEvent(WritableMap args) {
-        ReactNativeBlobUtil.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+        ReactNativeBlobUtilImpl.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                 .emit(ReactNativeBlobUtilConst.EVENT_HTTP_STATE, args);
     }
 
@@ -851,7 +852,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
         if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
-            Context appCtx = ReactNativeBlobUtil.RCTContext.getApplicationContext();
+            Context appCtx = ReactNativeBlobUtilImpl.RCTContext.getApplicationContext();
             long id = intent.getExtras().getLong(DownloadManager.EXTRA_DOWNLOAD_ID);
             if (id == this.downloadManagerId) {
                 releaseTaskResource(); // remove task ID from task map
@@ -863,7 +864,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                 Cursor c = dm.query(query);
                 // #236 unhandled null check for DownloadManager.query() return value
                 if (c == null) {
-                    this.invoke_callback("Download manager failed to download from  " + this.url + ". Query was unsuccessful ", null, null);
+                    this.callback.invoke("Download manager failed to download from  " + this.url + ". Query was unsuccessful ", null, null);
                     return;
                 }
 
@@ -874,7 +875,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         // #297 handle failed request
                         int statusCode = c.getInt(c.getColumnIndex(DownloadManager.COLUMN_STATUS));
                         if (statusCode == DownloadManager.STATUS_FAILED) {
-                            this.invoke_callback("Download manager failed to download from  " + this.url + ". Status Code = " + statusCode, null, null);
+                            this.callback.invoke("Download manager failed to download from  " + this.url + ". Status Code = " + statusCode, null, null);
                             return;
                         }
                         String contentUri = c.getString(c.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI));
@@ -903,17 +904,17 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         if (!exists)
                             throw new Exception("Download manager download failed, the file does not downloaded to destination.");
                         else
-                            this.invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, customDest);
+                            this.callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, customDest);
 
                     } catch (Exception ex) {
                         ex.printStackTrace();
-                        this.invoke_callback(ex.getLocalizedMessage(), null);
+                        this.callback.invoke(ex.getLocalizedMessage(), null);
                     }
                 } else {
                     if (filePath == null)
-                        this.invoke_callback("Download manager could not resolve downloaded file path.", ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, null);
+                        this.callback.invoke("Download manager could not resolve downloaded file path.", ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, null);
                     else
-                        this.invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, filePath);
+                        this.callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, filePath);
                 }
 
             }