From 9387523376fc6154dda58698fd743150c32858b4 Mon Sep 17 00:00:00 2001 From: Tobrun Van Nuland Date: Wed, 13 Jul 2016 11:05:05 +0200 Subject: [PATCH] [android] #5649 - fixes fragment null pointer when creating a SupportMapFragment without a OnMapReadyCallback --- .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 5 +++-- 1 file changed, 3 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 56c308798..f78fc50eb 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 @@ -1743,7 +1743,6 @@ public class MapView extends FrameLayout { // reset tracking modes if gesture occurs resetTrackingModesIfRequired(); - // Cancel any animation mNativeMapView.cancelTransitions(); @@ -2559,7 +2558,9 @@ public class MapView extends FrameLayout { if (!mInitialLoad) { callback.onMapReady(mMapboxMap); } else { - mOnMapReadyCallbackList.add(callback); + if(callback!=null) { + mOnMapReadyCallbackList.add(callback); + } } }