From 7e6ca6793a3fe508d4111a11a5887362707ddd26 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun@mapbox.com>
Date: Thu, 30 Nov 2017 11:45:40 +0100
Subject: [android] - handle destroying activity programmatically as part of
 theme switching (#10589)

---
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 beb51d7b68..c468ecbc8c 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
@@ -416,8 +416,12 @@ public class MapView extends FrameLayout {
   public void onDestroy() {
     destroyed = true;
     mapCallback.clearOnMapReadyCallbacks();
-    nativeMapView.destroy();
-    nativeMapView = null;
+
+    if (nativeMapView != null) {
+      // null when destroying an activity programmatically mapbox-navigation-android/issues/503
+      nativeMapView.destroy();
+      nativeMapView = null;
+    }
 
     if (mapRenderer != null) {
       mapRenderer.onDestroy();
-- 
cgit v1.2.1