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

fix possible npe

Browse source
This commit is contained in:
Chumva 2018-05-14 14:06:55 +03:00
parent acc1a910a6
commit fdd41b9929
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
View file

@ -322,11 +322,13 @@ public class MenuBuilder {
} }
private boolean showLocalTransportRoutes() { private boolean showLocalTransportRoutes() {
return mapContextMenu.getLocalTransportStopRoutes().size() > 0; List<TransportStopRoute> localTransportRoutes = mapContextMenu.getLocalTransportStopRoutes();
return localTransportRoutes != null && localTransportRoutes.size() > 0;
} }
private boolean showNearbyTransportRoutes() { private boolean showNearbyTransportRoutes() {
return mapContextMenu.getNearbyTransportStopRoutes().size() > 0; List<TransportStopRoute> nearbyTransportRoutes = mapContextMenu.getNearbyTransportStopRoutes();
return nearbyTransportRoutes != null && nearbyTransportRoutes.size() > 0;
} }
void onHide() { void onHide() {
@ -756,7 +758,7 @@ public class MenuBuilder {
} }
} }
private String getAdjustedRouteRef(String ref) { private String adjustRouteRef(String ref) {
if (ref != null) { if (ref != null) {
int charPos = ref.lastIndexOf(':'); int charPos = ref.lastIndexOf(':');
if (charPos != -1) { if (charPos != -1) {
@ -807,7 +809,7 @@ public class MenuBuilder {
shape.setColor(route.getColor(mapActivity.getMyApplication(), !light)); shape.setColor(route.getColor(mapActivity.getMyApplication(), !light));
transportRect.setBackgroundDrawable(shape); transportRect.setBackgroundDrawable(shape);
transportRect.setText(getAdjustedRouteRef(route.route.getRef())); transportRect.setText(adjustRouteRef(route.route.getRef()));
baseView.addView(transportRect); baseView.addView(transportRect);
LinearLayout infoView = new LinearLayout(view.getContext()); LinearLayout infoView = new LinearLayout(view.getContext());