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

Merge getFileMetadata() and getLocationData()

Browse source
This commit is contained in:
misaochan 2016-09-17 17:37:42 +12:00
parent f0ba51a923
commit 333a0e0510
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -350,27 +350,20 @@ public class ShareActivity
} }
} }
public void getFileMetadata() { public void getFileMetadata(boolean gpsEnabled) {
filePath = FileUtils.getPath(this, mediaUri); filePath = FileUtils.getPath(this, mediaUri);
Log.d(TAG, "Filepath: " + filePath); Log.d(TAG, "Filepath: " + filePath);
Log.d(TAG, "Calling GPSExtractor"); Log.d(TAG, "Calling GPSExtractor");
imageObj = new GPSExtractor(filePath, this);
if (filePath != null && !filePath.equals("")) {
// Gets image coords from exif data
decimalCoords = imageObj.getCoords(false);
useImageCoords();
}
}
public void getLocationData() {
if(imageObj == null) { if(imageObj == null) {
imageObj = new GPSExtractor(filePath, this); imageObj = new GPSExtractor(filePath, this);
} }
decimalCoords = imageObj.getCoords(true); if (filePath != null && !filePath.equals("")) {
// Gets image coords from exif data
decimalCoords = imageObj.getCoords(gpsEnabled);
useImageCoords(); useImageCoords();
} }
}
/** /**
* Initiates retrieval of image coordinates or user coordinates, and caching of coordinates. * Initiates retrieval of image coordinates or user coordinates, and caching of coordinates.