From d9306dde2e2ca608023e83fef8697cccd4d655e9 Mon Sep 17 00:00:00 2001
From: Antonio Zugaldia <antonio@mapbox.com>
Date: Tue, 13 Sep 2016 15:44:03 -0400
Subject: [PATCH] [android] #6317 - avoids NullPointerException when checking
 mMapboxMap.getUiSettings() (#6318)

---
 .../java/com/mapbox/mapboxsdk/maps/MapView.java     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index bf803de5b..1708a21db 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -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);
+            }
         }
     }