Null terminate Page on TabbedRenderer (dotnet#23290)

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
jonathanpeppers · Jun 27, 2024 · 51ad8f6 · 51ad8f6
1 parent 45a8686
commit 51ad8f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs
@@ -110,14 +110,14 @@ public override void DidRotate(UIInterfaceOrientation fromInterfaceOrientation)
 
 		public override void ViewDidAppear(bool animated)
 		{
-			Page.SendAppearing();
+			Page?.SendAppearing();
 			base.ViewDidAppear(animated);
 		}
 
 		public override void ViewDidDisappear(bool animated)
 		{
 			base.ViewDidDisappear(animated);
-			Page.SendDisappearing();
+			Page?.SendDisappearing();
 		}
 
 		public override void ViewDidLayoutSubviews()
@@ -158,7 +158,7 @@ protected virtual void OnElementChanged(VisualElementChangedEventArgs e)
 
 		UIViewController GetViewController(Page page)
 		{
-			if (page.Handler is not IPlatformViewHandler nvh)
+			if (page?.Handler is not IPlatformViewHandler nvh)
 				return null;
 
 			return nvh.ViewController;

diff --git a/src/TestUtils/src/DeviceTests/AssertionExtensions.Android.cs b/src/TestUtils/src/DeviceTests/AssertionExtensions.Android.cs
@@ -356,8 +356,16 @@ public static async Task<T> AttachAndRun<T>(this AView view, Func<Task<T>> actio
 				}
 				finally
 				{
-					rootView.RemoveView(layout);
-					layout.RemoveView(view);
+					if (rootView.IsAlive() && layout.IsAlive())
+					{
+						rootView.RemoveView(layout);
+					}
+
+					if (layout.IsAlive() && view.IsAlive())
+					{
+						layout.RemoveView(view);
+					}
+
 					_attachAndRunSemaphore.Release();
 				}
 			}