From 47f7ee6849d5b6bc8711956ef6cb09af8d1ab761 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Sat, 26 May 2018 00:34:43 +1000
Subject: [PATCH] Copy onPositiveResponse() etc to FileProcessor

---
 .../free/nrw/commons/upload/FileProcessor.java | 18 ++++++++++++++++--
 .../free/nrw/commons/upload/ShareActivity.java | 16 +---------------
 2 files changed, 17 insertions(+), 17 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 5007fe8c4..859cd2c9e 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
@@ -26,7 +26,7 @@ import timber.log.Timber;
 
 import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
 
-public class FileProcessor {
+public class FileProcessor implements SimilarImageDialogFragment.onResponse{
 
     private Uri mediaUri;
     private ContentResolver contentResolver;
@@ -38,6 +38,7 @@ public class FileProcessor {
     private String filePath;
     private boolean useExtStorage;
     private boolean cacheFound;
+    private GPSExtractor tempImageObj;
 
     @Inject
     CacheController cacheController;
@@ -123,7 +124,7 @@ public class FileProcessor {
         File folder = new File(filePath.substring(0,filePath.lastIndexOf('/')));
         File[] files = folder.listFiles();
         Timber.d("folderTime Number:"+files.length);
-        GPSExtractor tempImageObj;
+
 
         for(File file : files){
             if(file.lastModified()-timeOfCreation<=(120*1000) && file.lastModified()-timeOfCreation>=-(120*1000)){
@@ -217,4 +218,17 @@ public class FileProcessor {
         detectUnwantedPicturesAsync.execute();
     }
 
+    @Override
+    public void onPositiveResponse() {
+        imageObj = tempImageObj;
+        decimalCoords = imageObj.getCoords(false);// Not necessary to use gps as image already ha EXIF data
+        Timber.d("EXIF from tempImageObj");
+        useImageCoords();
+    }
+
+    @Override
+    public void onNegativeResponse() {
+        Timber.d("EXIF from imageObj");
+        useImageCoords();
+    }
 }
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 b741783e0..c3ba939e9 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
@@ -78,7 +78,7 @@ import static fr.free.nrw.commons.upload.FileUtils.getSHA1;
 public class ShareActivity
         extends AuthenticatedActivity
         implements SingleUploadFragment.OnUploadActionInitiated,
-        OnCategoriesSaveHandler,SimilarImageDialogFragment.onResponse {
+        OnCategoriesSaveHandler {
 
     private static final int REQUEST_PERM_ON_CREATE_STORAGE = 1;
     private static final int REQUEST_PERM_ON_CREATE_LOCATION = 2;
@@ -462,20 +462,6 @@ public class ShareActivity
     }
 
 
-    //I might not be supposed to change it, but still, I saw it
-    @Override
-    public void onPositiveResponse() {
-        imageObj = tempImageObj;
-        decimalCoords = imageObj.getCoords(false);// Not necessary to use gps as image already ha EXIF data
-        Timber.d("EXIF from tempImageObj");
-        fileObj.useImageCoords();
-    }
-
-    @Override
-    public void onNegativeResponse() {
-        Timber.d("EXIF from imageObj");
-        fileObj.useImageCoords();
-    }
 
     @Override
     public void onPause() {