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

Merge pull request #573 from divvito/v3.0.x 

Issue #572 - Fix for Storage.putFile() with content:// paths
This commit is contained in:
chrisbianca 2017-11-03 08:02:52 +00:00 committed by GitHub
parent 270279551a cf934908a3
commit 8b54d964f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
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 android.net.Uri;
import android.database.Cursor;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import com.facebook.react.bridge.Arguments;
@ -339,14 +337,7 @@ public class RNFirebaseStorage extends ReactContextBaseJavaModule {
Log.i(TAG, "putFile: " + localPath + " to " + path);
try {
Uri file;
if (localPath.startsWith("content://")) {
String realPath = getRealPathFromURI(localPath);
file = Uri.fromFile(new File(realPath));
} else {
file = Uri.fromFile(new File(localPath));
}
Uri file = getURI(localPath);
StorageMetadata md = buildMetadataFromMap(metadata);
UploadTask uploadTask = reference.putFile(file, md);
@ -415,24 +406,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
* @return
*/
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 Uri getURI(final String uri) {
Uri parsed = Uri.parse(uri);
if (parsed.getScheme() == null || parsed.getScheme().isEmpty()) {
return Uri.fromFile(new File(uri));
}
return parsed;
}
/**