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

Crashfix for null location.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-06-22 12:53:21 +03:00 • committed by Alex Zolotarev
parent 258a706e19
commit 23e5564bf3
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/mapswithme/maps/location/AndroidNativeProvider.java
View file

@ -47,8 +47,6 @@ public class AndroidNativeProvider extends BaseLocationProvider implements andro
if (lastLocation != null && !LocationUtils.isExpired(lastLocation, LocationHelper.INSTANCE.getLastLocationTime(),
LocationUtils.LOCATION_EXPIRATION_TIME_MILLIS_SHORT))
LocationHelper.INSTANCE.setLastLocation(lastLocation);
else
LocationHelper.INSTANCE.setLastLocation(null);
}
}
}

6
android/src/com/mapswithme/maps/location/LocationHelper.java
View file

@ -11,6 +11,7 @@ import android.location.Location;
import android.os.Build;
import android.preference.PreferenceManager;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import com.google.android.gms.common.ConnectionResult;
@ -122,7 +123,7 @@ public enum LocationHelper implements SensorEventListener
public long getLastLocationTime() { return mLastLocationTime; }
public void setLastLocation(Location loc)
public void setLastLocation(@NonNull Location loc)
{
mLastLocation = loc;
mLastLocationTime = System.currentTimeMillis();
@ -131,6 +132,9 @@ public enum LocationHelper implements SensorEventListener
void notifyLocationUpdated()
{
if (mLastLocation == null)
return;
for (LocationListener listener : mListeners)
listener.onLocationUpdated(mLastLocation);
}