mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "Revert "Revert "Added try catch for getRealPath"""

Browse source 
This reverts commit f09cab8356.
This commit is contained in:
misaochan 2016-01-12 15:49:10 +13:00
parent f09cab8356
commit 3caed68c28
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -167,21 +167,14 @@ public class ShareActivity
}
private String getRealPathFromURI(Uri contentUri) {
Cursor cursor = null;
try {
String[] proj = {MediaStore.Images.Media.DATA};
cursor = getContentResolver().query(contentUri, proj, null, null, null);
int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
cursor.moveToFirst();
return cursor.getString(column_index);
} catch (Exception e) {
Log.w(TAG, e);
return "";
} finally {
if (cursor != null) {
cursor.close();
}
}
String[] proj = { MediaStore.Images.Media.DATA };
Cursor cursor = getContentResolver().query(contentUri, proj, null, null, null);
int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
cursor.moveToFirst();
String cursorString = cursor.getString(column_index);
cursor.close();
return cursorString;
}
@Override
@ -215,12 +208,14 @@ public class ShareActivity
String filePath = getRealPathFromURI(mediaUri);
Log.d(TAG, "Filepath: " + filePath);
if (filePath != null && !filePath.equals("")) {
if (filePath != null) {
//extract the coordinates of image in decimal degrees
Log.d(TAG, "Calling GPSExtractor");
GPSExtractor imageObj = new GPSExtractor(filePath);
String decimalCoords = imageObj.getCoords();
if (decimalCoords != null) {
double decLongitude = imageObj.getDecLongitude();
double decLatitude = imageObj.getDecLatitude();
@ -244,12 +239,16 @@ public class ShareActivity
Log.d(TAG, "Cache found, setting categoryList in MwVolleyApi to " + displayCatList.toString());
MwVolleyApi.setGpsCat(displayCatList);
}
}
}
if(savedInstanceState != null) {
contribution = savedInstanceState.getParcelable("contribution");
}
requestAuthToken();
}