[android] - remove marker from selected markers when removing marker from annotation manager. (#9047)

1 files changed, 9 insertions, 0 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
index e811470d64..3694668a7e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
@@ -92,6 +92,10 @@ class AnnotationManager {
     if (annotation instanceof Marker) {
       Marker marker = (Marker) annotation;
       marker.hideInfoWindow();
+      if (selectedMarkers.contains(marker)) {
+        selectedMarkers.remove(marker);
+      }
+
       if (marker instanceof MarkerView) {
         markerViewManager.removeMarkerView((MarkerView) marker);
       }
@@ -118,6 +122,10 @@ class AnnotationManager {
       if (annotation instanceof Marker) {
         Marker marker = (Marker) annotation;
         marker.hideInfoWindow();
+        if (selectedMarkers.contains(marker)) {
+          selectedMarkers.remove(marker);
+        }
+
         if (marker instanceof MarkerView) {
           markerViewManager.removeMarkerView((MarkerView) marker);
         }
@@ -138,6 +146,7 @@ class AnnotationManager {
     Annotation annotation;
     int count = annotations.size();
     long[] ids = new long[count];
+    selectedMarkers.clear();
     for (int i = 0; i < count; i++) {
       ids[i] = annotations.keyAt(i);
       annotation = annotations.get(ids[i]);