diff options
author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-11-05 16:47:59 +0100 |
---|---|---|
committer | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-11-05 16:49:28 +0100 |
commit | d16ed9024c4c9b6b70ee9b7cd4d4ccd5c0824e08 (patch) | |
tree | 85181f6a6d95624420d92236265027e66df932ce /platform/android/MapboxGLAndroidSDK | |
parent | 947af3059c5d2dec3dfdd8b8a6002679a6ccc055 (diff) | |
download | qtlocation-mapboxgl-d16ed9024c4c9b6b70ee9b7cd4d4ccd5c0824e08.tar.gz |
[android] null-check nativeMapView in case it's destroyedupstream/lp-transitions-npe
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 8 |
1 files 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 3d56e134f6..7cb8245301 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 @@ -505,7 +505,10 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { * @see Style */ public void setStyleUrl(@NonNull String url) { - nativeMapView.setStyleUrl(url); + if (nativeMapView != null) { + // null-checking the nativeMapView as it can be mistakenly called after it's been destroyed + nativeMapView.setStyleUrl(url); + } } /** @@ -541,7 +544,8 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { @Override protected void onSizeChanged(int width, int height, int oldw, int oldh) { - if (!isInEditMode()) { + if (!isInEditMode() && nativeMapView != null) { + // null-checking the nativeMapView, see #13277 nativeMapView.resizeView(width, height); } } |