From 371580bf5e3ad77c6455546972e96be0dfda5e33 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Tue, 19 Jun 2018 20:34:52 +1000
Subject: [PATCH] Always return null if image has no EXIF data

---
 .../free/nrw/commons/upload/GPSExtractor.java | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
index 93eb729f6..50e7cb86e 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
@@ -121,28 +121,7 @@ public class GPSExtractor {
 
         //If image has no EXIF data and user has enabled GPS setting, get user's location
         if (exif == null || exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE) == null) {
-            if (useGPS) {
-                registerLocationManager();
-
-                imageCoordsExists = false;
-                Timber.d("EXIF data has no location info");
-
-                //Check what user's preference is for automatic location detection
-                boolean gpsPrefEnabled = gpsPreferenceEnabled();
-
-                //Check that currentLatitude and currentLongitude have been
-                // explicitly set by MyLocationListener
-                // and do not default to (0.0,0.0)
-                if (gpsPrefEnabled && currentLatitude != null && currentLongitude != null) {
-                    Timber.d("Current location values: Lat = %f Long = %f", currentLatitude, currentLongitude);
-                    return String.valueOf(currentLatitude) + "|" + String.valueOf(currentLongitude);
-                } else {
-                    // No coords found
-                    return null;
-                }
-            } else {
-                return null;
-            }
+            return null;
         } else {
             //If image has EXIF data, extract image coords
             imageCoordsExists = true;