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

Tidying up code

Browse source
This commit is contained in:
misaochan 2016-01-12 20:07:01 +13:00
parent 5dcfd0964d
commit 87ad638b56
1 changed files with 1 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -166,25 +166,6 @@ public class ShareActivity
finish(); finish();
} }
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();
}
}
}
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -213,10 +194,9 @@ public class ShareActivity
Log.d(TAG, "Ext storage dir: " + Environment.getExternalStorageDirectory()); Log.d(TAG, "Ext storage dir: " + Environment.getExternalStorageDirectory());
//convert image Uri to file path //convert image Uri to file path
String filePath = getRealPathFromURI(mediaUri); String filePath = FileUtils.getPath(this, mediaUri);
Log.d(TAG, "Filepath: " + filePath); Log.d(TAG, "Filepath: " + filePath);
if (filePath != null && !filePath.equals("")) { if (filePath != null && !filePath.equals("")) {
//extract the coordinates of image in decimal degrees //extract the coordinates of image in decimal degrees
Log.d(TAG, "Calling GPSExtractor"); Log.d(TAG, "Calling GPSExtractor");
@ -247,16 +227,12 @@ public class ShareActivity
Log.d(TAG, "Cache found, setting categoryList in MwVolleyApi to " + displayCatList.toString()); Log.d(TAG, "Cache found, setting categoryList in MwVolleyApi to " + displayCatList.toString());
MwVolleyApi.setGpsCat(displayCatList); MwVolleyApi.setGpsCat(displayCatList);
} }
} }
} }
if(savedInstanceState != null) { if(savedInstanceState != null) {
contribution = savedInstanceState.getParcelable("contribution"); contribution = savedInstanceState.getParcelable("contribution");
} }
requestAuthToken(); requestAuthToken();
} }