4
0
mirror of https://github.com/apache/cordova-android.git synced 2025-03-17 01:11:02 +08:00

Guard against null pointer exception in ES File Explorer being used to get a picture

This commit is contained in:
Simon MacDonald 2012-09-26 15:52:37 -04:00
parent 54caa6e438
commit 1b4096b01d

@ -1048,10 +1048,16 @@ public class FileUtils extends Plugin {
*/ */
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected static String getRealPathFromURI(Uri contentUri, CordovaInterface cordova) { protected static String getRealPathFromURI(Uri contentUri, CordovaInterface cordova) {
String uri = contentUri.toString();
if (uri.startsWith("content:")) {
String[] proj = { _DATA }; String[] proj = { _DATA };
Cursor cursor = cordova.getActivity().managedQuery(contentUri, proj, null, null, null); Cursor cursor = cordova.getActivity().managedQuery(contentUri, proj, null, null, null);
int column_index = cursor.getColumnIndexOrThrow(_DATA); int column_index = cursor.getColumnIndexOrThrow(_DATA);
cursor.moveToFirst(); cursor.moveToFirst();
return cursor.getString(column_index); return cursor.getString(column_index);
} else {
return uri;
}
} }
} }