diff options
author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-07-24 11:05:29 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2017-07-28 12:06:53 +0200 |
commit | beaee9349f0608246547d9092b6690a80d633e6e (patch) | |
tree | 8502fa58779cb55f15b487a6d2a5bea7592d4a45 /platform/android | |
parent | 0eee31e212a9936bcfe0c61a3bf3635a8778a434 (diff) | |
download | qtlocation-mapboxgl-beaee9349f0608246547d9092b6690a80d633e6e.tar.gz |
[android] - validate Marker before opening InfoWindow
Diffstat (limited to 'platform/android')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java | 9 |
1 files changed, 2 insertions, 7 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 7599b6afa6..11100d6f17 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 @@ -1,6 +1,5 @@ package com.mapbox.mapboxsdk.maps; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; @@ -56,12 +55,8 @@ class InfoWindowManager { return allowConcurrentMultipleInfoWindows; } - List<InfoWindow> getInfoWindows() { - return infoWindows; - } - - 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) { |