[android] #6317 - avoids NullPointerException when checking mMapboxMap.getUiSettings() (#6318)

This commit is contained in:
Antonio Zugaldia
2016-09-13 15:44:03 -04:00
committed by GitHub
parent ed4e37ba9f
commit d9306dde2e

View File

@@ -1514,11 +1514,14 @@ public class MapView extends FrameLayout {
}
// Required by ZoomButtonController (from Android SDK documentation)
if (mMapboxMap.getUiSettings().isZoomControlsEnabled() && (visibility != View.VISIBLE)) {
mZoomButtonsController.setVisible(false);
}
if (mMapboxMap.getUiSettings().isZoomControlsEnabled() && (visibility == View.VISIBLE)) {
mZoomButtonsController.setVisible(true);
if (visibility == View.VISIBLE) {
if (mMapboxMap != null && mMapboxMap.getUiSettings().isZoomControlsEnabled()) {
mZoomButtonsController.setVisible(true);
}
} else {
if (mMapboxMap != null && mMapboxMap.getUiSettings().isZoomControlsEnabled()) {
mZoomButtonsController.setVisible(false);
}
}
}