[android] - validate Marker before opening InfoWindow

mapbox · Jul 24, 2017 · e8ad7b6 · e8ad7b6
1 parent c0efad5
commit e8ad7b6
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java b/...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 @@ boolean isAllowConcurrentMultipleOpenInfoWindows() {
     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) {