Update ModalNavigationManager.Android.cs

Author: kubaflo

src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Android.cs

@@ -174,8 +174,7 @@ async Task PresentModal(Page modal, bool animated)
 			var dialogFragment = new ModalFragment(WindowMauiContext, modal)
 			{
 				Cancelable = false,
-				IsAnimated = animated,
-				modalNavigationManager = this
+				IsAnimated = animated
 			};
 
 			var fragmentManager = WindowMauiContext.GetFragmentManager();
@@ -211,7 +210,6 @@ internal class ModalFragment : DialogFragment
 
 			public event EventHandler? AnimationEnded;
 
-			public ModalNavigationManager? modalNavigationManager { get; internal set; }
 
 			public bool IsAnimated { get; internal set; }
 
@@ -225,7 +223,7 @@ public ModalFragment(IMauiContext mauiContext, Page modal)
 
 			public override global::Android.App.Dialog OnCreateDialog(Bundle? savedInstanceState)
 			{
-				var dialog = new CustomComponentDialog(RequireContext(), Theme, modalNavigationManager);
+				var dialog = new CustomComponentDialog(RequireContext(), Theme);
 
 				if (dialog is null || dialog.Window is null)
 					throw new InvalidOperationException($"{dialog} or {dialog?.Window} is null, and it's invalid");
@@ -395,21 +393,18 @@ void FireAnimationEnded()
 
 			sealed class CustomComponentDialog : ComponentDialog
 			{
-				public CustomComponentDialog(Context context, int themeResId, ModalNavigationManager? modalNavigationManager) : base(context, themeResId)
+				public CustomComponentDialog(Context context, int themeResId) : base(context, themeResId)
 				{
-					this.OnBackPressedDispatcher.AddCallback(new CallBack(true, this, modalNavigationManager));
+					this.OnBackPressedDispatcher.AddCallback(new CallBack(true, this));
 				}
 
 				sealed class CallBack : OnBackPressedCallback
 				{
 					WeakReference<CustomComponentDialog> _customComponentDialog;
 
-					private WeakReference<ModalNavigationManager?> _modalNavigationManager;
-
-					public CallBack(bool enabled, CustomComponentDialog customComponentDialog, ModalNavigationManager? modalNavigationManager) : base(enabled)
+					public CallBack(bool enabled, CustomComponentDialog customComponentDialog) : base(enabled)
 					{
 						_customComponentDialog = new(customComponentDialog);
-						_modalNavigationManager = new(modalNavigationManager);
 					}
 
 					public override void HandleOnBackPressed()
@@ -445,13 +440,6 @@ public override void HandleOnBackPressed()
 							}
 						}
 
-						if (!preventBackPropagation && _modalNavigationManager.TryGetTarget(out var mnm))
-						{
-							{
-								_ = mnm.PopModalAsync(true);
-							}
-						}
-
 						eventHandler = null;
 						void OnPopCanceled(object? sender, EventArgs e)
 						{

src/Controls/tests/TestCases.HostApp/Issues/Issue28811.cs

@@ -25,6 +25,7 @@ public Issue28811DetailPage()
 
 		protected override bool OnBackButtonPressed()
 		{
+			Navigation.PopModalAsync();
 			return false;
 		}
 	}