[android] #5649 - fixes fragment null pointer when creating a SupportMapFragment without a OnMapReadyCallback

2016-07-13 11:05:05 +02:00
parent 566c6cf618
commit 9387523376
1 changed files with 3 additions and 2 deletions
--- 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);
+            }
        }
    }