Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add npe checks

Browse source
This commit is contained in:
MadWasp79 2020-01-29 10:19:23 +02:00
parent 315e1c38a7
commit 5404f626ec
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
View file

@ -445,7 +445,9 @@ public class TargetPointsHelper {
Location lastKnownLocation = ctx.getLocationProvider().getLastKnownLocation(); Location lastKnownLocation = ctx.getLocationProvider().getLastKnownLocation();
LatLon latLon = lastKnownLocation != null ? LatLon latLon = lastKnownLocation != null ?
new LatLon(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude()) : null; new LatLon(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude()) : null;
routingHelper.checkAndUpdateStartLocation(latLon); if (latLon != null) {
routingHelper.checkAndUpdateStartLocation(latLon);
}
setMyLocationPoint(latLon, false, null); setMyLocationPoint(latLon, false, null);
} }
} }

4
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -174,7 +174,9 @@ public class RoutingHelper {
} }
public synchronized void setFinalAndCurrentLocation(LatLon finalLocation, List<LatLon> intermediatePoints, Location currentLocation){ public synchronized void setFinalAndCurrentLocation(LatLon finalLocation, List<LatLon> intermediatePoints, Location currentLocation){
checkAndUpdateStartLocation(currentLocation); if (currentLocation != null) {
checkAndUpdateStartLocation(currentLocation);
}
RouteCalculationResult previousRoute = route; RouteCalculationResult previousRoute = route;
clearCurrentRoute(finalLocation, intermediatePoints); clearCurrentRoute(finalLocation, intermediatePoints);
// to update route // to update route