Skip to content

[Android] [Candidate Fix] Shell: Fix handler disconnect timing to preserve WebView navigation and memory leak fix #35417

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 1 commit into from
May 13, 2026
Merged

[Android] [Candidate Fix] Shell: Fix handler disconnect timing to preserve WebView navigation and memory leak fix #35417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellFragmentContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ public override void OnDestroyView()
{
base.OnDestroyView();
((IShellContentController)ShellContentTab).RecyclePage(_page);
// Recursively disconnect handlers on the page and its child elements
// to prevent memory leaks when Shell items are cleared
_page?.DisconnectHandlers();
// Only disconnect when ShellContent is removed from the Shell hierarchy (e.g. Shell.Items.Clear()).
// During normal navigation the page is still cached and will be reused.
if (ShellContentTab?.FindParentOfType<Shell>() == null)
_page?.DisconnectHandlers();
_page = null;
}
}
Expand Down
Loading