react-native-blob-util 0.16.0 → 0.16.1

package/README.md

@@ -165,7 +165,7 @@ If you are going to use the `wifiOnly` flag, you need to add this to `AndroidMan
 
 **Grant Access Permission for Android 6.0**
 
-Beginning in Android 6.0 (API level 23), users grant permissions to apps while the app is running, not when they install the app. So adding permissions in `AndroidManifest.xml` won't work for Android 6.0+ devices. To grant permissions in runtime, you might use [PermissionAndroid API](https://facebook.github.io/react-native/docs/permissionsandroid.html).
+Beginning in Android 6.0 (API level 23), users grant permissions to apps while the app is running, not when they install the app. So adding permissions in `AndroidManifest.xml` won't work for Android 6.0+ devices. To grant permissions in runtime, you might use [PermissionAndroid API](https://facebook.github.io/react-native/docs/permissionsandroid).
 
 ## Usage
 

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

@@ -185,6 +185,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         DownloadManager downloadManager = (DownloadManager) appCtx.getSystemService(Context.DOWNLOAD_SERVICE);
 
                         DownloadManager.Query query = new DownloadManager.Query();
+                        query.setFilterById(downloadManagerId);
 
                         Cursor cursor = downloadManager.query(query);
 
@@ -197,7 +198,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                             cursor.close();
 
                             ReactNativeBlobUtilProgressConfig reportConfig = getReportProgress(taskId);
-                            float progress = (total != -1) ? written / total : 0;
+                            float progress = (total > 0) ? written / total : 0;
 
                             if (reportConfig != null && reportConfig.shouldReport(progress /* progress */)) {
                                 WritableMap args = Arguments.createMap();

package/index.js

@@ -56,9 +56,9 @@ if (!ReactNativeBlobUtil || !ReactNativeBlobUtil.fetchBlobForm || !ReactNativeBl
 }
 
 export {ReactNativeBlobUtilConfig, ReactNativeBlobUtilResponseInfo, ReactNativeBlobUtilStream} from './types';
-export URIUtil from './utils/uri';
+export { URIUtil } from './utils/uri';
 export {FetchBlobResponse} from './class/ReactNativeBlobUtilBlobResponse';
-export getUUID from './utils/uuid';
+export { getUUID } from './utils/uuid';
 export default {
     fetch,
     base64,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-blob-util",
-    "version": "0.16.0",
+    "version": "0.16.1",
     "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
     "main": "index.js",
     "scripts": {
@@ -35,11 +35,16 @@
         "wkh237 <xeiyan@gmail.com>"
     ],
     "devDependencies": {
-        "react-native": "^0.64.2",
+        "react": "16.13.1",
+        "react-native": "^0.68.2",
         "@typescript-eslint/parser": "^3.4.0",
         "@react-native-community/eslint-config": "^3.0.0",
         "eslint-config-defaults": "^9.0.0",
         "eslint-plugin-react": "^7.24.0",
         "eslint": "^6.8.0"
+    },
+    "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
     }
 }

package/polyfill/XMLHttpRequest.js

@@ -170,6 +170,12 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget {
         log.verbose('sending request with args', _method, _url, _headers, body);
         log.verbose(typeof body, body instanceof FormData);
 
+        if (body instanceof FormData) {
+            log.debug('creating blob and setting header from FormData instance');
+            body = new Blob(body);
+            this._headers['Content-Type'] = `multipart/form-data; boundary=${body.multipartBoundary}`;
+        }
+
         if (body instanceof Blob) {
             log.debug('sending blob body', body._blobCreated);
             promise = new Promise((resolve, reject) => {

package/react-native.config.js

@@ -1,7 +0,0 @@
-module.exports = {
-    dependency: {
-        hooks: {
-            prelink: 'node ./node_modules/react-native-blob-util/scripts/prelink.js',
-        },
-    },
-};

package/scripts/prelink.js

@@ -1,71 +0,0 @@
-try {
-  var fs = require('fs');
-  var glob = require('glob');
-  var addAndroidPermissions = process.env.RNFB_ANDROID_PERMISSIONS == 'true';
-  var MANIFEST_PATH = glob.sync(process.cwd() + '/android/app/src/main/**/AndroidManifest.xml')[0];
-  var PACKAGE_JSON = process.cwd() + '/package.json';
-  var package = JSON.parse(fs.readFileSync(PACKAGE_JSON));
-  var APP_NAME = package.name;
-  var PACKAGE_GRADLE = process.cwd() + '/node_modules/react-native-blob-util/android/build.gradle'
-  var VERSION = checkVersion();
-
-  console.log('ReactNativeBlobUtil detected app version => ' + VERSION);
-
-  if(VERSION < 0.28) {
-    console.log('You project version is '+ VERSION + ' which may not compatible to react-native-blob-util 7.0+, please consider upgrade your application template to react-native 0.27+.')
-    // add OkHttp3 dependency fo pre 0.28 project
-    var main = fs.readFileSync(PACKAGE_GRADLE);
-    console.log('adding OkHttp3 dependency to pre 0.28 project .. ')
-    main = String(main).replace('//{ReactNativeBlobUtil_PRE_0.28_DEPDENDENCY}', "compile 'com.squareup.okhttp3:okhttp:3.4.1'");
-    fs.writeFileSync(PACKAGE_GRADLE, main);
-    console.log('adding OkHttp3 dependency to pre 0.28 project .. ok')
-  }
-
-  console.log('Add Android permissions => ' + (addAndroidPermissions == "true"))
-
-  if(addAndroidPermissions) {
-
-    // set file access permission for Android < 6.0
-    fs.readFile(MANIFEST_PATH, function(err, data) {
-
-      if(err)
-        console.log('failed to locate AndroidManifest.xml file, you may have to add file access permission manually.');
-      else {
-
-        console.log('ReactNativeBlobUtil patching AndroidManifest.xml .. ');
-        // append fs permission
-        data = String(data).replace(
-          '<uses-permission android:name="android.permission.INTERNET" />',
-          '<uses-permission android:name="android.permission.INTERNET" />\n    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> '
-        )
-        // append DOWNLOAD_COMPLETE intent permission
-        data = String(data).replace(
-          '<category android:name="android.intent.category.LAUNCHER" />',
-          '<category android:name="android.intent.category.LAUNCHER" />\n     <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>'
-        )
-        fs.writeFileSync(MANIFEST_PATH, data);
-        console.log('ReactNativeBlobUtil patching AndroidManifest.xml .. ok');
-
-      }
-
-    })
-  }
-  else {
-    console.log(
-      '\033[95mreact-native-blob-util \033[97mwill not automatically add Android permissions after \033[92m0.9.4 '+
-      '\033[97mplease run the following command if you want to add default permissions :\n\n' +
-      '\033[96m\tRNFB_ANDROID_PERMISSIONS=true react-native link \n')
-  }
-
-  function checkVersion() {
-    console.log('ReactNativeBlobUtil checking app version ..');
-    return parseFloat(/\d\.\d+(?=\.)/.exec(package.dependencies['react-native']));
-  }
-
-} catch(err) {
-  console.log(
-    '\033[95mreact-native-blob-util\033[97m link \033[91mFAILED \033[97m\nCould not automatically link package :'+
-    err.stack +
-    'please follow the instructions to manually link the library : ' +
-    '\033[4mhttps://github.com/RonRadtke/react-native-blob-util/wiki/Manually-Link-Package\n')
-}