From 333a0e0510360f35aa101b00c2379305e3b20bb5 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Sat, 17 Sep 2016 17:37:42 +1200
Subject: [PATCH] Merge getFileMetadata() and getLocationData()

---
 .../nrw/commons/upload/ShareActivity.java     | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

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 a631e8e26..4d6c8bef4 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
@@ -350,26 +350,19 @@ public  class       ShareActivity
         }
     }
 
-    public void getFileMetadata() {
+    public void getFileMetadata(boolean gpsEnabled) {
         filePath = FileUtils.getPath(this, mediaUri);
         Log.d(TAG, "Filepath: " + filePath);
         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) {
             imageObj = new GPSExtractor(filePath, this);
         }
 
-        decimalCoords = imageObj.getCoords(true);
-        useImageCoords();
+        if (filePath != null && !filePath.equals("")) {
+            // Gets image coords from exif data
+            decimalCoords = imageObj.getCoords(gpsEnabled);
+            useImageCoords();
+        }
     }
 
     /**