From b5c8e219383747874ccba99ca7a2e8a792615d98 Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Fri, 17 May 2024 16:42:04 +0200
Subject: [PATCH 1/3] Fix #22443 & UITest

---
 .../Issues/Issue22443.xaml                    |  7 ++
 .../Issues/Issue22443.xaml.cs                 | 81 +++++++++++++++++++
 .../tests/UITests/Tests/Issues/Issue22443.cs  | 25 ++++++
 .../ScrollView/ScrollViewHandler.Android.cs   |  2 +-
 4 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml.cs
 create mode 100644 src/Controls/tests/UITests/Tests/Issues/Issue22443.cs

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml
new file mode 100644
index 000000000000..9cff11b15304
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue22443"
+             Title="Issue22443">
+    <Button Text="Navigate to next page" AutomationId="button" Clicked="Button_Clicked"/>
+</ContentPage>
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml.cs
new file mode 100644
index 000000000000..e09878a82e88
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml.cs
@@ -0,0 +1,81 @@
+using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+using Microsoft.Maui.Graphics;
+using System;
+using System.Threading.Tasks;
+
+namespace Maui.Controls.Sample.Issues;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+[Issue(IssueTracker.Github, 22443, "App Crash on Scroll Animation while navigating away from Page", PlatformAffected.Android)]
+public partial class Issue22443NavPage : NavigationPage
+{
+	public Issue22443NavPage() : base(new Issue22443())
+	{
+
+	}
+}
+
+public partial class Issue22443 : ContentPage
+{
+	public Issue22443()
+	{
+		InitializeComponent();
+	}
+
+	void Button_Clicked(object sender, EventArgs e)
+	{
+		Navigation.PushAsync(new Issue22443ScrollPage());
+	}
+}
+
+public class Issue22443ScrollPage : ContentPage
+{
+	private ScrollView _scrollView;
+
+	public Issue22443ScrollPage()
+	{
+		_scrollView = new ScrollView
+		{
+			Content = new VerticalStackLayout
+			{
+				Children =
+				{
+					new BoxView
+					{
+						HeightRequest = 10000,
+						Background = new LinearGradientBrush(
+							new GradientStopCollection
+							{
+								new GradientStop(Colors.White, .1f),
+								new GradientStop(Colors.Black, .9f)
+							})
+					},
+					new Label
+					{
+						FontSize = 40,
+						Text = "End of Second Page",
+						HorizontalOptions = LayoutOptions.Center,
+					},
+				}
+			}
+		};
+
+		Content = _scrollView;
+	}
+
+	protected override async void OnAppearing()
+	{
+		MainThread.BeginInvokeOnMainThread(() =>_scrollView!.ScrollToAsync(0, 10000, true));
+
+		await Task.Delay(200);
+		await Navigation.PopAsync();
+	}
+
+	protected override void OnDisappearing()
+	{
+		base.OnDisappearing();
+		_scrollView?.Handler?.DisconnectHandler();
+	}
+}
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue22443.cs b/src/Controls/tests/UITests/Tests/Issues/Issue22443.cs
new file mode 100644
index 000000000000..41fc0a828e14
--- /dev/null
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue22443.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.AppiumTests.Issues;
+
+public class Issue22443 : _IssuesUITest
+{
+    public Issue22443(TestDevice device)
+		: base(device)
+	{ }
+
+    public override string Issue => "App Crash on Scroll Animation while navigating away from Page";
+
+    [Test]
+	public void NoExceptionShouldBeThrown()
+	{
+		App.WaitForElement("button");
+		App.Click("button");
+		App.WaitForElement("button");
+		App.Back();
+
+		//The test passes if no exception is thrown
+	}
+}
diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
index e15f25766b38..4bcc98ae4c89 100644
--- a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
+++ b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
@@ -147,7 +147,7 @@ public static void MapRequestScrollTo(IScrollViewHandler handler, IScrollView sc
 			var verticalOffsetDevice = (int)context.ToPixels(request.VerticalOffset);
 
 			handler.PlatformView.ScrollTo(horizontalOffsetDevice, verticalOffsetDevice,
-				request.Instant, () => handler.VirtualView.ScrollFinished());
+				request.Instant, () => scrollView?.ScrollFinished());
 		}
 
 		/*

From 8f3f143444066fe0672eff1baaff7e4132f24f0a Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Fri, 17 May 2024 19:54:55 +0200
Subject: [PATCH 2/3] Update ScrollViewHandler.Android.cs & move tests

---
 .../Tests/Issues/Issue22443.cs                            | 2 +-
 .../TestCases}/Issues/Issue22443.xaml                     | 0
 .../TestCases}/Issues/Issue22443.xaml.cs                  | 0
 .../src/Handlers/ScrollView/ScrollViewHandler.Android.cs  | 8 +++++++-
 4 files changed, 8 insertions(+), 2 deletions(-)
 rename src/Controls/tests/{UITests => TestCases.Shared.Tests}/Tests/Issues/Issue22443.cs (90%)
 rename src/Controls/{samples/Controls.Sample.UITests => tests/TestCases}/Issues/Issue22443.xaml (100%)
 rename src/Controls/{samples/Controls.Sample.UITests => tests/TestCases}/Issues/Issue22443.xaml.cs (100%)

diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue22443.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22443.cs
similarity index 90%
rename from src/Controls/tests/UITests/Tests/Issues/Issue22443.cs
rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22443.cs
index 41fc0a828e14..473ce40a02e1 100644
--- a/src/Controls/tests/UITests/Tests/Issues/Issue22443.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22443.cs
@@ -2,7 +2,7 @@
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.AppiumTests.Issues;
+namespace Microsoft.Maui.TestCases.Tests.Issues;
 
 public class Issue22443 : _IssuesUITest
 {
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml b/src/Controls/tests/TestCases/Issues/Issue22443.xaml
similarity index 100%
rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml
rename to src/Controls/tests/TestCases/Issues/Issue22443.xaml
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue22443.xaml.cs
similarity index 100%
rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue22443.xaml.cs
rename to src/Controls/tests/TestCases/Issues/Issue22443.xaml.cs
diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
index 4bcc98ae4c89..f724a68109ff 100644
--- a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
+++ b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
@@ -147,7 +147,13 @@ public static void MapRequestScrollTo(IScrollViewHandler handler, IScrollView sc
 			var verticalOffsetDevice = (int)context.ToPixels(request.VerticalOffset);
 
 			handler.PlatformView.ScrollTo(horizontalOffsetDevice, verticalOffsetDevice,
-				request.Instant, () => scrollView?.ScrollFinished());
+				request.Instant, () =>
+				{
+					if (handler.IsConnected())
+					{
+						handler.VirtualView.ScrollFinished();
+					}
+				});
 		}
 
 		/*

From ba6e32a6d4f7f01b1a60217911db2a6542911a56 Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Sat, 18 May 2024 19:50:50 +0200
Subject: [PATCH 3/3] Fixed the UI test

---
 .../tests/TestCases.Shared.Tests/Tests/Issues/Issue22443.cs      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22443.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22443.cs
index 473ce40a02e1..0c464dff9a1e 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22443.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22443.cs
@@ -18,7 +18,6 @@ public void NoExceptionShouldBeThrown()
 		App.WaitForElement("button");
 		App.Click("button");
 		App.WaitForElement("button");
-		App.Back();
 
 		//The test passes if no exception is thrown
 	}