[android] Get last GPS location from parent LocationService.

2 files changed, 8 insertions, 7 deletions

diff --git a/android/src/com/mapswithme/maps/location/LocationService.java b/android/src/com/mapswithme/maps/location/LocationService.java
index 1300d25709..d9259ad4d8 100644
--- a/android/src/com/mapswithme/maps/location/LocationService.java
+++ b/android/src/com/mapswithme/maps/location/LocationService.java
@@ -523,4 +523,10 @@ public class LocationService implements LocationListener, SensorEventListener, W
     if (l != null)
       onLocationChanged(l);
   }
+
+  @Override
+  public Location getLastGPSLocation()
+  {
+    return mLocationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+  }
 }
diff --git a/android/src/com/mapswithme/maps/location/WifiLocation.java b/android/src/com/mapswithme/maps/location/WifiLocation.java
index 18a307fc31..4406d07117 100644
--- a/android/src/com/mapswithme/maps/location/WifiLocation.java
+++ b/android/src/com/mapswithme/maps/location/WifiLocation.java
@@ -16,7 +16,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.location.Location;
-import android.location.LocationManager;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
@@ -38,14 +37,13 @@ public class WifiLocation extends BroadcastReceiver
   public interface Listener
   {
     public void onWifiLocationUpdated(Location l);
+    public Location getLastGPSLocation();
   }
 
   private Listener mObserver = null;
 
   private WifiManager mWifi = null;
 
-  private LocationManager mLocationManager = null;
-
   public WifiLocation()
   {
   }
@@ -144,10 +142,7 @@ public class WifiLocation extends BroadcastReceiver
 
     if (Statistics.INSTANCE.isStatisticsEnabled(context))
     {
-      if (mLocationManager == null)
-        mLocationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
-
-      final Location l = mLocationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+      final Location l = mObserver.getLastGPSLocation();
       if (l != null)
       {
         if (wifiHeaderAdded)