From 11e291cb41fcc228e6014e55daa210533ca26d72 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Fri, 5 Feb 2016 18:31:46 +1300
Subject: [PATCH] If else block for gps prefs

---
 .../free/nrw/commons/upload/GPSExtractor.java | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
index 6528cadb7..16da36b6f 100644
--- a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
+++ b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
@@ -65,24 +65,29 @@ public class GPSExtractor {
             //Check what user's preference is for automatic location detection
             boolean gpsPrefEnabled = gpsPreferenceEnabled();
 
-            LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
-            Criteria criteria = new Criteria();
-            String provider = locationManager.getBestProvider(criteria, true);
+            if (gpsPrefEnabled) {
+                //If pref enabled, set up LocationListener to get current location
+                LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+                Criteria criteria = new Criteria();
+                String provider = locationManager.getBestProvider(criteria, true);
 
-            myLocationListener = new MyLocationListener();
-            locationManager.requestLocationUpdates(provider, 400, 1, myLocationListener);
-            Location location = locationManager.getLastKnownLocation(provider);
+                myLocationListener = new MyLocationListener();
+                locationManager.requestLocationUpdates(provider, 400, 1, myLocationListener);
+                Location location = locationManager.getLastKnownLocation(provider);
 
-            if (location != null) {
-                myLocationListener.onLocationChanged(location);
-            }
-            else {
-                //calling method is equipped to deal with null return value
+                if (location != null) {
+                    myLocationListener.onLocationChanged(location);
+                } else {
+                    //calling method is equipped to deal with null return value
+                    return null;
+                }
+                Log.d(TAG, "Current location values: Lat = " + currentLatitude + " Long = " + currentLongitude);
+                String currentCoords = String.valueOf(currentLatitude) + "|" + String.valueOf(currentLongitude);
+                return currentCoords;
+            } else {
+                //Otherwise treat as if no coords found
                 return null;
             }
-            Log.d(TAG, "Current location values: Lat = " + currentLatitude + " Long = " + currentLongitude);
-            String currentCoords = String.valueOf(currentLatitude) + "|" + String.valueOf(currentLongitude);
-            return currentCoords;
 
         } else {
             imageCoordsExists = true;