diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-11-06 11:48:29 +0100 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2018-11-06 12:25:37 +0100 |
commit | 9b78af5a4dc275a911bcbbd918c48d3a8e4a8ac5 (patch) | |
tree | 291e6cbf0a8f39d70b13b3728fdf2627e7aa4d8e | |
parent | 22a3e9f024e616f6b378328ae69255e03d77ed2f (diff) | |
download | qtlocation-mapboxgl-upstream/tvn-getmapasync.tar.gz |
[android] - handle null getMapAsync invocations, deliver onMapReady only onceupstream/tvn-getmapasync
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 10 |
1 files changed, 8 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 7cb8245301..25f1822e33 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 @@ -1143,13 +1143,18 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { } } + /** + * Notify listeners, clear when done + */ private void onMapReady() { if (onMapReadyCallbackList.size() > 0) { - // Notify listeners, clear when done Iterator<OnMapReadyCallback> iterator = onMapReadyCallbackList.iterator(); while (iterator.hasNext()) { OnMapReadyCallback callback = iterator.next(); - callback.onMapReady(mapboxMap); + if (callback != null) { + // null checking required for #13279 + callback.onMapReady(mapboxMap); + } iterator.remove(); } } @@ -1184,6 +1189,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { public void onDidFinishLoadingStyle() { if (mapboxMap != null) { if (initialLoad) { + initialLoad = false; mapboxMap.onPreMapReady(); onMapReady(); mapboxMap.onPostMapReady(); |