From e8ad7b6a49d12a1f414e0242007a671c4514d85a Mon Sep 17 00:00:00 2001 From: Tobrun Van Nuland Date: Mon, 24 Jul 2017 11:05:29 +0200 Subject: [android] - validate Marker before opening InfoWindow --- .../src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'platform') 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..af207204d9 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; @@ -55,8 +54,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) { -- cgit v1.2.1