Fix content URI loading issue #49

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java

@@ -1,6 +1,8 @@
 package com.RNFetchBlob;
 
+import android.net.Uri;
 import android.util.Base64;
+import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -12,6 +14,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -88,7 +91,7 @@ public class RNFetchBlobBody extends RequestBody{
                                     InputStream in = ctx.getAssets().open(assetName);
                                     pipeStreamToSink(in, sink);
                                 } catch (IOException e) {
-
+                                    Log.e("RNFetchBlob", "Failed to create form data asset :" + orgPath + ", " + e.getLocalizedMessage() );
                                 }
                             }
                             // data from normal files
@@ -98,6 +101,9 @@ public class RNFetchBlobBody extends RequestBody{
                                     FileInputStream fs = new FileInputStream(file);
                                     pipeStreamToSink(fs, sink);
                                 }
+                                else {
+                                    Log.e("RNFetchBlob", "Failed to create form data from path :" + orgPath + "file not exists.");
+                                }
                             }
                         }
                         // base64 embedded file content
@@ -127,20 +133,6 @@ public class RNFetchBlobBody extends RequestBody{
                 break;
             case SingleFile:
                 pipeStreamToSink(requestStream, sink);
-//                byte [] chunk = new byte[10240];
-//                int read = requestStream.read(chunk, 0, 10240);
-//                sink.write(chunk, 0, read);
-//                bytesWritten += read;
-//                while(read > 0) {
-//                    read = requestStream.read(chunk, 0, 10240);
-//                    if(read > 0) {
-//                        sink.write(chunk, 0, read);
-//                        bytesWritten += read;
-//                        emitUploadProgress(bytesWritten, contentLength);
-//                    }
-//
-//                }
-//                requestStream.close();
                 break;
         }
         buffer.flush();
@@ -149,7 +141,9 @@ public class RNFetchBlobBody extends RequestBody{
     private void pipeStreamToSink(InputStream stream, BufferedSink sink) throws IOException {
         byte [] chunk = new byte[10240];
         int read = stream.read(chunk, 0, 10240);
-        sink.write(chunk, 0, read);
+        if(read > 0) {
+            sink.write(chunk, 0, read);
+        }
         bytesWritten += read;
         while(read > 0) {
             read = stream.read(chunk, 0, 10240);
@@ -174,6 +168,8 @@ public class RNFetchBlobBody extends RequestBody{
                 .emit(RNFetchBlobConst.EVENT_UPLOAD_PROGRESS, args);
     }
 
+
+
     /**
      * Compute a proximate content length for form data
      * @return
@@ -191,16 +187,18 @@ public class RNFetchBlobBody extends RequestBody{
                 if (data.startsWith(RNFetchBlobConst.FILE_PREFIX)) {
                     String orgPath = data.substring(RNFetchBlobConst.FILE_PREFIX.length());
                     orgPath = RNFetchBlobFS.normalizePath(orgPath);
-                    // path starts with content://
+                    // path starts with asset://
                     if (RNFetchBlobFS.isAsset(orgPath)) {
                         try {
                             String assetName = orgPath.replace(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET, "");
-                            long length = ctx.getAssets().openFd(assetName).getLength();
+                            long length = ctx.getAssets().open(assetName).available();
                             total += length;
                         } catch (IOException e) {
 
                         }
-                    } else {
+                    }
+                    // general files
+                    else {
                         File file = new File(RNFetchBlobFS.normalizePath(orgPath));
                         total += file.length();
                     }

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java

@@ -1,5 +1,7 @@
 package com.RNFetchBlob;
 
+import android.app.LoaderManager;
+import android.content.ContentResolver;
 import android.content.CursorLoader;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
@@ -7,6 +9,7 @@ import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Environment;
+import android.os.Looper;
 import android.provider.MediaStore;
 import android.util.Base64;
 
@@ -779,15 +782,18 @@ public class RNFetchBlobFS {
             return path;
         }
         else if (path.startsWith(RNFetchBlobConst.FILE_PREFIX_CONTENT)) {
-            String[] proj = { MediaStore.Images.Media.DATA };
-            Uri contentUri = Uri.parse(path);
-            CursorLoader loader = new CursorLoader(RNFetchBlob.RCTContext, contentUri, proj, null, null, null);
-            Cursor cursor = loader.loadInBackground();
-            int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
-            cursor.moveToFirst();
-            String result = cursor.getString(column_index);
-            cursor.close();
-            return result;
+            String filePath = null;
+            Uri uri = Uri.parse(path);
+            if (uri != null && "content".equals(uri.getScheme())) {
+                ContentResolver resolver = RNFetchBlob.RCTContext.getContentResolver();
+                Cursor cursor = resolver.query(uri, new String[] { MediaStore.Images.ImageColumns.DATA }, null, null, null);
+                cursor.moveToFirst();
+                filePath = cursor.getString(0);
+                cursor.close();
+            } else {
+                filePath = uri.getPath();
+            }
+            return filePath;
         }
         return path;
     }

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java

@@ -2,6 +2,7 @@ package com.RNFetchBlob;
 
 import android.app.DownloadManager;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -116,9 +117,10 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
                     String key = it.nextKey();
                     req.addRequestHeader(key, headers.getString(key));
                 }
-                DownloadManager dm = (DownloadManager) ctx.getSystemService(Context.DOWNLOAD_SERVICE);
+                Context appCtx = RNFetchBlob.RCTContext.getApplicationContext();
+                DownloadManager dm = (DownloadManager) appCtx.getSystemService(Context.DOWNLOAD_SERVICE);
                 downloadManagerId = dm.enqueue(req);
-                ctx.registerReceiver(this, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+                appCtx.registerReceiver(this, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
                 return;
             }
 
@@ -146,7 +148,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
 
         OkHttpClient.Builder client;
 
-//        try {
+        try {
             // use trusty SSL socket
             if (this.options.trusty) {
                 client = RNFetchBlobUtils.getUnsafeOkHttpClient();
@@ -173,7 +175,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
             // set request body
             switch (requestType) {
                 case SingleFile:
-                    InputStream dataStream= buildOctetBody(rawRequestBody);
+                    InputStream dataStream = buildOctetBody(rawRequestBody);
                     builder.method(method, new RNFetchBlobBody(
                             taskId,
                             RequestType.SingleFile,
@@ -200,7 +202,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
 
             final Request req = builder.build();
 
-//             create response handler
+//          create response handler
             client.addInterceptor(new Interceptor() {
                 @Override
                 public Response intercept(Chain chain) throws IOException {
@@ -262,10 +264,10 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
             });
 
 
-//        } catch (Exception error) {
-//            error.printStackTrace();
-//            callback.invoke("RNFetchBlob request error: " + error.getMessage() + error.getCause());
-//        }
+        } catch (Exception error) {
+            error.printStackTrace();
+            callback.invoke("RNFetchBlob request error: " + error.getMessage() + error.getCause());
+        }
     }
 
     /**
@@ -283,11 +285,10 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
                 }
                 break;
             case FileStorage:
-                // write chunk
-                try {
+                try{
                     resp.body().bytes();
-                } catch (IOException e) {
-                    e.printStackTrace();
+                } catch (Exception ignored) {
+
                 }
                 callback.invoke(null, this.destPath);
                 break;
@@ -364,17 +365,18 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
         if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
+            Context appCtx = RNFetchBlob.RCTContext.getApplicationContext();
             long id = intent.getExtras().getLong(DownloadManager.EXTRA_DOWNLOAD_ID);
             if (id == this.downloadManagerId) {
                 DownloadManager.Query query = new DownloadManager.Query();
                 query.setFilterById(downloadManagerId);
-                DownloadManager dm = (DownloadManager) ctx.getSystemService(Context.DOWNLOAD_SERVICE);
+                DownloadManager dm = (DownloadManager) appCtx.getSystemService(Context.DOWNLOAD_SERVICE);
                 dm.query(query);
                 Cursor c = dm.query(query);
                 if (c.moveToFirst()) {
                     String contentUri = c.getString(c.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI));
                     Uri uri = Uri.parse(contentUri);
-                    Cursor cursor = ctx.getContentResolver().query(uri, new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null);
+                    Cursor cursor = appCtx.getContentResolver().query(uri, new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null);
                     if (cursor != null) {
                         cursor.moveToFirst();
                         String filePath = cursor.getString(0);