Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

[android] - don't leak selected markers when removing #9047

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ void removeAnnotation(@NonNull Annotation annotation) {
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);
}
Expand All @@ -118,6 +122,10 @@ void removeAnnotations(@NonNull List<? extends Annotation> annotationList) {
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);
}
Expand All @@ -138,6 +146,7 @@ void removeAnnotations() {
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]);
Expand Down