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

[android] Nullpointer crash on resume fixed.

Browse source
This commit is contained in:
Dmitry Kunin 2013-05-14 17:21:55 +03:00 • committed by Alex Zolotarev
parent c4ffa26471
commit 91091c6b03
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -140,9 +140,10 @@ public class LocationService implements LocationListener, SensorEventListener, W
}
registerSensorListeners();
// Choose best location from available
List<Location> notExpiredLocations = getAllNotExpiredLocations(providers);
Location lastKnownLocation = null;
if (notExpiredLocations.size() > 0)
{
final Location newestLocation = LocationUtils.getNewestLocation(notExpiredLocations);
@ -152,11 +153,11 @@ public class LocationService implements LocationListener, SensorEventListener, W
lastKnownLocation = newestLocation;
else
lastKnownLocation = mostAccurateLocation;
}
if (!LocationUtils.isFirstOneBetterLocation(lastKnownLocation, m_lastLocation))
if (m_lastLocation != null && LocationUtils.isFirstOneBetterLocation(m_lastLocation, lastKnownLocation))
lastKnownLocation = m_lastLocation;
// ### location chosen
// Pass last known location only in the end of all registerListener
// in case, when we want to disconnect in listener.