Skip to content

[Android] Fix MapHandler leaks when removed Pin instances are retained by app code #35686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubaflo merged 6 commits into from
Jun 5, 2026
+12 −9
Merged

[Android] Fix MapHandler leaks when removed Pin instances are retained by app code #35686

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c67e74b
Fix CollectionView grid spacing updates for first row and column (#34…
KarthikRajaKalaimani Mar 23, 2026
674dd42
Revert [Android, iOS] - Flyout icon should remain visible when a page…
praveenkumarkarunanithi May 25, 2026
96d4229
[Android] Fix: MapHandler leaks removed pin
SubhikshaSf4851 May 22, 2026
7395568
Modified review suggestion
SubhikshaSf4851 May 29, 2026
0c3a552
resolve unwanted commits
SubhikshaSf4851 Jun 4, 2026
4afe1e0
Added suggestion
SubhikshaSf4851 Jun 5, 2026
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
21 changes: 12 additions & 9 deletions src/Core/maps/src/Handlers/Map/MapHandler.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public partial class MapHandler : ViewHandler<IMap, MapView>
List<APolygon>? _polygons;
List<ACircle>? _circles;
Dictionary<string, IMapElement>? _trackedMapElements;
HashSet<IMapPin>? _subscribedPins;

public GoogleMap? Map { get; private set; }

Expand Down Expand Up @@ -503,7 +504,8 @@ void AddPins(IList pins)
_markers.Add(marker!);
}

if (pin is INotifyPropertyChanged observable)
_subscribedPins ??= new HashSet<IMapPin>();
if (_subscribedPins.Add(pin) && pin is INotifyPropertyChanged observable)
Comment thread
SubhikshaSf4851 marked this conversation as resolved.
{
observable.PropertyChanged += PinOnPropertyChanged;
}
Expand Down Expand Up @@ -556,17 +558,18 @@ void PinOnPropertyChanged(object? sender, PropertyChangedEventArgs e)

void DisconnectPins()
{
if (VirtualView == null)
return;

for (int i = 0; i < VirtualView.Pins.Count; i++)
if (_subscribedPins is not null)
{
var pin = VirtualView.Pins[i];
if (pin is INotifyPropertyChanged observable)
foreach (var pin in _subscribedPins)
{
observable.PropertyChanged -= PinOnPropertyChanged;
if (pin is INotifyPropertyChanged observable)
{
observable.PropertyChanged -= PinOnPropertyChanged;
}

pin?.Handler?.DisconnectHandler();
}
pin?.Handler?.DisconnectHandler();
_subscribedPins = null;
}
}

Expand Down
Loading