AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Request wifi location every time

Browse source
This commit is contained in:
Darafei Praliaskouski 2013-09-02 11:24:09 +03:00 • committed by Alex Zolotarev
parent 355e49a99d
commit a052f0d667
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
android/src/com/mapswithme/maps/location/LocationService.java
View file

@ -132,8 +132,10 @@ public class LocationService implements LocationListener, SensorEventListener, W
List<String> providers = getFilteredProviders();
Log.d(TAG, "Enabled providers count = " + providers.size());
if (providers.size() == 0)
handleEmptyProvidersList(observer);
startWifiLocationUpdate();
if ((providers.size() == 0) && (m_wifiScanner == null))
observer.onLocationError(ERROR_DENIED);
else
{
m_isActive = true;
@ -181,6 +183,17 @@ public class LocationService implements LocationListener, SensorEventListener, W
}
}
private void startWifiLocationUpdate()
{
if (ConnectionState.isConnected(m_application) &&
((WifiManager)m_application.getSystemService(Context.WIFI_SERVICE)).isWifiEnabled())
{
if (m_wifiScanner == null)
m_wifiScanner = new WifiLocation();
m_wifiScanner.StartScan(m_application, this);
}
}
private List<String> getFilteredProviders()
{
List<String> allProviders = m_locationManager.getProviders(false);
@ -214,19 +227,6 @@ public class LocationService implements LocationListener, SensorEventListener, W
}
}
private void handleEmptyProvidersList(Listener observer)
{
if (ConnectionState.isConnected(m_application) &&
((WifiManager)m_application.getSystemService(Context.WIFI_SERVICE)).isWifiEnabled())
{
if (m_wifiScanner == null)
m_wifiScanner = new WifiLocation();
m_wifiScanner.StartScan(m_application, this);
}
else
observer.onLocationError(ERROR_DENIED);
}
public void stopUpdate(Listener observer)
{
mLogger.d("Stop update", observer);
@ -298,7 +298,7 @@ public class LocationService implements LocationListener, SensorEventListener, W
// Completely ignore locations without lat and lon
if (l.getAccuracy() <= 0.)
return;
// hack to avoid time zone troubles
l.setTime(System.currentTimeMillis());
if (LocationUtils.isFirstOneBetterLocation(l, m_lastLocation))