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

Pass the GPSExtractor created in FileProcessor.java back into ShareActivity

Browse source
This commit is contained in:
misaochan 2018-05-29 19:16:52 +10:00
parent a082f509e7
commit dac6a15e60
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java
View file

@ -99,7 +99,7 @@ public class FileProcessor implements SimilarImageDialogFragment.onResponse{
* Gets coordinates for category suggestions, either from EXIF data or user location * Gets coordinates for category suggestions, either from EXIF data or user location
* @param gpsEnabled if true use GPS * @param gpsEnabled if true use GPS
*/ */
void getFileCoordinates(boolean gpsEnabled) { GPSExtractor getFileCoordinates(boolean gpsEnabled) {
Timber.d("Calling GPSExtractor"); Timber.d("Calling GPSExtractor");
try { try {
ParcelFileDescriptor descriptor = contentResolver.openFileDescriptor(mediaUri, "r"); ParcelFileDescriptor descriptor = contentResolver.openFileDescriptor(mediaUri, "r");
@ -127,6 +127,7 @@ public class FileProcessor implements SimilarImageDialogFragment.onResponse{
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
Timber.w("File not found: " + mediaUri, e); Timber.w("File not found: " + mediaUri, e);
} }
return imageObj;
} }
/** /**

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

@ -306,7 +306,7 @@ public class ShareActivity
ContentResolver contentResolver = this.getContentResolver(); ContentResolver contentResolver = this.getContentResolver();
fileObj = new FileProcessor(mediaUri, contentResolver, this); fileObj = new FileProcessor(mediaUri, contentResolver, this);
checkIfFileExists(); checkIfFileExists();
fileObj.getFileCoordinates(locationPermitted); imageObj = fileObj.getFileCoordinates(locationPermitted);
} }
/** /**