diff options
| author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-07-24 11:05:29 +0200 |
|---|---|---|
| committer | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-07-24 11:05:55 +0200 |
| commit | 9fa829a1db01a3c92a4c45c951a69f1138db0f9c (patch) | |
| tree | e368c8087323c18143bea3d529324bec405ef43a | |
| parent | f053feb6d4aba1eaa44a35d050522b641c011b33 (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-invalid-marker-infowindow.tar.gz | |
[android] - validate Marker before opening InfoWindowupstream/tvn-invalid-marker-infowindow
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java index 0b461d1227..e235db10d7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java @@ -55,8 +55,8 @@ class InfoWindowManager { return allowConcurrentMultipleInfoWindows; } - boolean isInfoWindowValidForMarker(@NonNull Marker marker) { - return !TextUtils.isEmpty(marker.getTitle()) || !TextUtils.isEmpty(marker.getSnippet()); + boolean isInfoWindowValidForMarker(Marker marker) { + return marker != null && (!TextUtils.isEmpty(marker.getTitle()) || !TextUtils.isEmpty(marker.getSnippet())); } void setOnInfoWindowClickListener(@Nullable MapboxMap.OnInfoWindowClickListener listener) { |