From dac6a15e60a36474cfa6798de7acc45bc0e17254 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 29 May 2018 19:16:52 +1000 Subject: [PATCH] Pass the GPSExtractor created in FileProcessor.java back into ShareActivity --- .../main/java/fr/free/nrw/commons/upload/FileProcessor.java | 3 ++- .../main/java/fr/free/nrw/commons/upload/ShareActivity.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java b/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java index 2d14b70ce..0f83b5026 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java @@ -99,7 +99,7 @@ public class FileProcessor implements SimilarImageDialogFragment.onResponse{ * Gets coordinates for category suggestions, either from EXIF data or user location * @param gpsEnabled if true use GPS */ - void getFileCoordinates(boolean gpsEnabled) { + GPSExtractor getFileCoordinates(boolean gpsEnabled) { Timber.d("Calling GPSExtractor"); try { ParcelFileDescriptor descriptor = contentResolver.openFileDescriptor(mediaUri, "r"); @@ -127,6 +127,7 @@ public class FileProcessor implements SimilarImageDialogFragment.onResponse{ } catch (FileNotFoundException e) { Timber.w("File not found: " + mediaUri, e); } + return imageObj; } /** diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index 9b54daa68..ffb33f545 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -306,7 +306,7 @@ public class ShareActivity ContentResolver contentResolver = this.getContentResolver(); fileObj = new FileProcessor(mediaUri, contentResolver, this); checkIfFileExists(); - fileObj.getFileCoordinates(locationPermitted); + imageObj = fileObj.getFileCoordinates(locationPermitted); } /**