summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun@mapbox.com>2016-02-02 17:23:50 +0100
committerTobrun <tobrun@mapbox.com>2016-02-02 18:08:14 +0100
commitce8c6e26d58f91bba46576080caf48e4765c176f (patch)
tree89e1a2fbee4eb606b4d0858f68ca8964e823eead
parent6dff169f2b2085f1de2b6c568f61b3d506b9374b (diff)
downloadqtlocation-mapboxgl-ce8c6e26d58f91bba46576080caf48e4765c176f.tar.gz
[android] #3736 - clicks should ignore marker validation when an InfoWindowAdapter is supplied by end developer.
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 54b81229c6..d1075454e8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -628,7 +628,7 @@ public class MapboxMap {
}
if (!handledDefaultClick) {
- if (isInfoWindowValidForMarker(marker)) {
+ if (isInfoWindowValidForMarker(marker) || getInfoWindowAdapter() != null) {
mInfoWindows.add(marker.showInfoWindow(this, mMapView));
}
}