status-im
/
react-native-firebase
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[android][storage] Fix for putFile with a content:// stream

This commit is contained in:
Chris Bianca 2017-11-02 11:20:24 +00:00
parent e6b8ce193c
commit 0391b2834d
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
android/src/main/java/io/invertase/firebase/storage/RNFirebaseStorage.java
View File

@ -12,8 +12,6 @@ import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import android.net.Uri; import android.net.Uri;
import android.database.Cursor;
import android.provider.MediaStore;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.Arguments;
@ -339,16 +337,17 @@ public class RNFirebaseStorage extends ReactContextBaseJavaModule {
Log.i(TAG, "putFile: " + localPath + " to " + path); Log.i(TAG, "putFile: " + localPath + " to " + path);
try { try {
Uri file;
if (localPath.startsWith("content://")) {
String realPath = getRealPathFromURI(localPath);
file = Uri.fromFile(new File(realPath));
} else {
file = Uri.fromFile(new File(localPath));
}
StorageMetadata md = buildMetadataFromMap(metadata); StorageMetadata md = buildMetadataFromMap(metadata);
UploadTask uploadTask = reference.putFile(file, md); UploadTask uploadTask;
Uri file = getURI(localPath);
if (localPath.startsWith("content://")) {
InputStream inputStream = getReactApplicationContext().getContentResolver()
.openInputStream(file);
uploadTask = reference.putStream(inputStream, md);
} else {
uploadTask = reference.putFile(file, md);
}
// register observers to listen for when the download is done or if it fails // register observers to listen for when the download is done or if it fails
uploadTask uploadTask
@ -415,24 +414,18 @@ public class RNFirebaseStorage extends ReactContextBaseJavaModule {
} }
/** /**
* Internal helper to convert content:// uri's to a real path * Create a Uri from the path, defaulting to file when there is no supplied scheme
* *
* @param uri * @param uri
* @return * @return
*/ */
private String getRealPathFromURI(final String uri) { private Uri getURI(final String uri) {
Cursor cursor = null; Uri parsed = Uri.parse(uri);
try {
String[] proj = {MediaStore.Images.Media.DATA}; if (parsed.getScheme() == null || parsed.getScheme().isEmpty()) {
cursor = getReactApplicationContext().getContentResolver().query(Uri.parse(uri), proj, null, null, null); return Uri.fromFile(new File(uri));
int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
cursor.moveToFirst();
return cursor.getString(column_index);
} finally {
if (cursor != null) {
cursor.close();
}
} }
return parsed;
} }
/** /**