Allow Java file upload to work with Camera Roll asset URLs in the same way that iOS does

Author: chrisbianca

android/src/main/java/io/fullstack/firestack/FirestackStorage.java

@@ -49,11 +49,8 @@ class FirestackStorageModule extends ReactContextBaseJavaModule {
   private static final String FileTypeRegular = "FILETYPE_REGULAR";
   private static final String FileTypeDirectory = "FILETYPE_DIRECTORY";
 
-  private ReactContext mReactContext;
-
   public FirestackStorageModule(ReactApplicationContext reactContext) {
     super(reactContext);
-    mReactContext = reactContext;
 
     Log.d(TAG, "New instance");
   }
@@ -142,7 +139,13 @@ public void uploadFile(final String urlStr, final String name, final String file
     Log.i(TAG, "From file: " + filepath + " to " + urlStr + " with name " + name);
 
     try {
-      Uri file = Uri.fromFile(new File(filepath));
+      Uri file;
+      if (filepath.startsWith("content://")) {
+          String realPath = getRealPathFromURI(filepath);
+          file = Uri.fromFile(new File(realPath));
+      } else {
+          file = Uri.fromFile(new File(filepath));
+      }
 
       StorageMetadata.Builder metadataBuilder = new StorageMetadata.Builder();
       Map<String, Object> m = FirestackUtils.recursivelyDeconstructReadableMap(metadata);
@@ -190,7 +193,7 @@ public void onProgress(UploadTask.TaskSnapshot taskSnapshot) {
                 WritableMap data = Arguments.createMap();
                 data.putString("eventName", "upload_progress");
                 data.putDouble("progress", progress);
-                FirestackUtils.sendEvent(mReactContext, "upload_progress", data);
+                FirestackUtils.sendEvent(getReactApplicationContext(), "upload_progress", data);
               }
             }
           })
@@ -203,7 +206,7 @@ public void onPaused(UploadTask.TaskSnapshot taskSnapshot) {
               WritableMap data = Arguments.createMap();
               data.putString("eventName", "upload_paused");
               data.putString("ref", bucket);
-              FirestackUtils.sendEvent(mReactContext, "upload_paused", data);
+              FirestackUtils.sendEvent(getReactApplicationContext(), "upload_paused", data);
             }
           });
     } catch (Exception ex) {
@@ -214,21 +217,29 @@ public void onPaused(UploadTask.TaskSnapshot taskSnapshot) {
   @ReactMethod
   public void getRealPathFromURI(final String uri, final Callback callback) {
     try {
-      Context context = getReactApplicationContext();
-      String[] proj = {MediaStore.Images.Media.DATA};
-      Cursor cursor = context.getContentResolver().query(Uri.parse(uri), proj, null, null, null);
-      int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
-      cursor.moveToFirst();
-      String path = cursor.getString(column_index);
-      cursor.close();
-
+      String path = getRealPathFromURI(uri);
       callback.invoke(null, path);
     } catch (Exception ex) {
       ex.printStackTrace();
       callback.invoke(makeErrorPayload(1, ex));
     }
   }
 
+  private String getRealPathFromURI(final String uri) {
+    Cursor cursor = null;
+    try {
+      String[] proj = {MediaStore.Images.Media.DATA};
+      cursor = getReactApplicationContext().getContentResolver().query(Uri.parse(uri), proj, null, null, null);
+      int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+      cursor.moveToFirst();
+      return cursor.getString(column_index);
+    } finally {
+      if (cursor != null) {
+        cursor.close();
+      }
+    }
+  }
+
   private WritableMap getDownloadData(final UploadTask.TaskSnapshot taskSnapshot) {
     Uri downloadUrl = taskSnapshot.getDownloadUrl();
     StorageMetadata d = taskSnapshot.getMetadata();