Skip to content

Revert - Fix Android stale ContainerView root leak #35372 #36152

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
Jun 30, 2026
Merged

Revert - Fix Android stale ContainerView root leak #35372 #36152

Show file tree
Hide file tree
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
50 changes: 0 additions & 50 deletions src/Controls/tests/DeviceTests/Elements/Window/WindowTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,56 +175,6 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(window, async (handler) =>
});
}

#if ANDROID
[Fact(DisplayName = "Replaced FlyoutPage Root Clears Old ContainerView")]
public async Task ReplacedFlyoutPageRootClearsOldContainerView()
{
SetupBuilder();

var rootPage = CreateFlyoutRoot();
var window = new Window(rootPage);

await CreateHandlerAndAddToWindow<WindowHandlerStub>(window, async handler =>
{
var rootManager = handler.MauiContext.GetNavigationRootManager();
var oldRootView = Assert.IsType<ContainerView>(rootManager.RootView);

Assert.Same(rootPage, oldRootView.CurrentView);
Assert.NotNull(oldRootView.MainView);

var replacementPage = new ContentPage
{
Content = new Label { Text = "Replacement page" }
};

window.Page = replacementPage;
await OnLoadedAsync(replacementPage);

Assert.Null(oldRootView.CurrentView);
Assert.Null(oldRootView.MainView);
Assert.NotSame(oldRootView, rootManager.RootView);
});
}

static FlyoutPage CreateFlyoutRoot()
{
var flyoutPage = new ContentPage { Title = "Flyout" };
var detailPage = new ContentPage
{
Title = "Detail",
Content = new Label { Text = "Detail page" }
};
var detailNavigationPage = new NavigationPage(detailPage) { Title = "Detail" };
var rootPage = new FlyoutPage
{
Flyout = flyoutPage,
Detail = detailNavigationPage
};

return rootPage;
}
#endif

#if !IOS && !MACCATALYST
// Automated Shell tests are currently broken via xharness
[Fact(DisplayName = "Toolbar Items Update when swapping out Main Page on Handler")]
Expand Down
3 changes: 0 additions & 3 deletions src/Core/src/Platform/Android/Navigation/NavigationRootManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,6 @@ void ClearPlatformParts()
{
_pendingFragment?.Dispose();
_pendingFragment = null;
if (_rootView is ContainerView containerView)
containerView.CurrentView = null;

DrawerLayout = null;
_rootView = null;
_toolbarElement = null;
Expand Down
Loading