From 6a4affaecfe025b054896239fb2f06eeade29e7a Mon Sep 17 00:00:00 2001
From: pkar70 <pkar@ieee.org>
Date: Tue, 5 Nov 2019 17:07:59 +0000
Subject: [PATCH 1/3] Uri too long remediation

---
 doc/ReleaseNotes/_ReleaseNotes.md             |  2 +-
 .../UnoSamples_Test_NavigateToString.cs       | 45 ++++++++++++++
 .../UITests.Shared/UITests.Shared.projitems   |  7 +++
 .../WebView/WebView_NavigateToString2.xaml    | 31 ++++++++++
 .../WebView/WebView_NavigateToString2.xaml.cs | 60 +++++++++++++++++++
 .../Xaml/Controls/WebView/WebView.Android.cs  | 20 ++++---
 6 files changed, 157 insertions(+), 8 deletions(-)
 create mode 100644 src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/WebViewTests/UnoSamples_Test_NavigateToString.cs
 create mode 100644 src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/WebView/WebView_NavigateToString2.xaml
 create mode 100644 src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/WebView/WebView_NavigateToString2.xaml.cs

diff --git a/doc/ReleaseNotes/_ReleaseNotes.md b/doc/ReleaseNotes/_ReleaseNotes.md
index 0e1eedeb1526..af8e68f61fc3 100644
--- a/doc/ReleaseNotes/_ReleaseNotes.md
+++ b/doc/ReleaseNotes/_ReleaseNotes.md
@@ -100,7 +100,7 @@
     > This change might break the compilation for projects that define duplicate resources in other globally accessible resource dictionaries. Adjustments to remove duplicate resources may be necessary.
 
 ### Bug fixes
-
+* Android WebView.NavigateToString doesn't throw exception even when string is very long.
 * [#1987](https://github.com/unoplatform/uno/pull/1987) Missing XML comment warnings are disabled on generated code
 * [#1939](https://github.com/unoplatform/uno/pull/1939) Handles nullables types in XAML file generator
 * [#1741](https://github.com/unoplatform/uno/issues/1741) On Android, `ApplicationData.Current.[LocalFolder|RoamingFolder]` can now be used in the ctor of App.xaml.cs
diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/WebViewTests/UnoSamples_Test_NavigateToString.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/WebViewTests/UnoSamples_Test_NavigateToString.cs
new file mode 100644
index 000000000000..6081dd2f089a
--- /dev/null
+++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/WebViewTests/UnoSamples_Test_NavigateToString.cs
@@ -0,0 +1,45 @@
+using NUnit.Framework;
+using SamplesApp.UITests.TestFramework;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Uno.UITest.Helpers;
+using Uno.UITest.Helpers.Queries;
+
+namespace SamplesApp.UITests.Windows_UI_Xaml_Controls.WebViewTests
+{
+	[TestFixture]
+	public partial class WebView_Tests : SampleControlUITestBase
+	{
+		[Test]
+		[AutoRetry]
+		public void WebView_NavigateToLongString()
+		{
+			Run("UITests.Shared.Windows_UI_Xaml_Controls.WebView.WebView_NavigateToString2");
+
+			_app.WaitForElement(_app.Marked("startButton"));
+
+			TakeScreenshot("Initial");
+
+			var startButton = _app.Marked("startButton");
+			var clickResult = _app.Marked("WebView_NavigateToStringResult");
+
+			// step 1: generate long string
+			_app.Tap(startButton);
+
+			// _app.Wait(TimeSpan.FromSeconds(300)); // Android: 20 is sufficient
+			_app.WaitForText(clickResult, "string ready");  // timeout here means: add wait
+
+			// step 2: NavigateTo
+			_app.Tap(startButton);
+			_app.WaitForText(clickResult, "success");   // timeout here means: bug reappear
+
+			TakeScreenshot("AfterSuccess");
+
+		}
+
+	}
+}
diff --git a/src/SamplesApp/UITests.Shared/UITests.Shared.projitems b/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
index 0b2f2d98a986..536c729615ef 100644
--- a/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
+++ b/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
@@ -1753,6 +1753,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\WebView\WebView_NavigateToString2.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\WebView\WebView_NavigateToUri.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -3537,6 +3541,9 @@
       <DependentUpon>UndefinedHeightListView.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\WebView\WebViewViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\WebView\WebView_NavigateToString2.xaml.cs">
+      <DependentUpon>WebView_NavigateToString2.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Input\CopyToClipboard\CopyToClipboard.xaml.cs">
       <DependentUpon>CopyToClipboard.xaml</DependentUpon>
     </Compile>
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/WebView/WebView_NavigateToString2.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/WebView/WebView_NavigateToString2.xaml
new file mode 100644
index 000000000000..7356642c1726
--- /dev/null
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/WebView/WebView_NavigateToString2.xaml
@@ -0,0 +1,31 @@
+<UserControl
+	x:Class="UITests.Shared.Windows_UI_Xaml_Controls.WebView.WebView_NavigateToString2"
+	xmlns:controls="using:Uno.UI.Samples.Controls"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:u="using:Uno.UI.Samples.Controls"
+	xmlns:uBehaviors="using:Uno.UI.Samples.Behaviors"
+	xmlns:ios="http://nventive.com/ios"
+	xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:android="http://nventive.com/android"
+	mc:Ignorable="d ios android"
+	d:DesignHeight="2000"
+	d:DesignWidth="400">
+
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="*" />
+		</Grid.RowDefinitions>
+
+		<StackPanel Background="Honeydew">
+			<TextBox Header="Size of (big) string, in thousands of lines" Text="1000" x:Name="WebView_NavigateToStringSize" InputScope="Number" />
+			<Button Content="generate long string" Click="generateLong_Click" x:Name="startButton" />
+			<TextBlock Text="waiting for NavigationCompleted" x:Name="WebView_NavigateToStringResult" />
+		</StackPanel>
+
+		<WebView Grid.Row="1" Name="webViewControl" />
+	</Grid>
+</UserControl>
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/WebView/WebView_NavigateToString2.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/WebView/WebView_NavigateToString2.xaml.cs
new file mode 100644
index 000000000000..ec4802f5b035
--- /dev/null
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/WebView/WebView_NavigateToString2.xaml.cs
@@ -0,0 +1,60 @@
+
+using SamplesApp.Windows_UI_Xaml_Controls.WebView;
+using Uno.UI.Samples.Controls;
+using Windows.UI.Xaml.Controls;
+
+namespace UITests.Shared.Windows_UI_Xaml_Controls.WebView
+{
+	[Uno.UI.Samples.Controls.SampleControlInfo("WebView", "WebView_NavigateToString2", description: "Testing a NavigateToString with a very long string")]
+	public sealed partial class WebView_NavigateToString2 : UserControl
+	{
+		public WebView_NavigateToString2()
+		{
+			this.InitializeComponent();
+		}
+
+		string longString = "";
+
+		private void generateLong_Click(object sender, object e)
+		{
+
+			if (longString.Length < 10)
+			{
+				// generate string
+				WebView_NavigateToStringResult.Text = "generating string";
+
+
+				int linesCount = 0;
+				if (!int.TryParse(WebView_NavigateToStringSize.Text, out linesCount))
+				{
+					return;
+				}
+
+				longString = "<html><body>";
+				for (int i = 0; i < linesCount; i++)
+				{
+					string line = "Linia " + i.ToString() + " ";
+					line = line.PadRight(1000, 'x');
+					longString = longString + "<p>" + line;
+					WebView_NavigateToStringResult.Text = ((int)(i * 100 / linesCount)).ToString();  // percentage, as generating string takes loooong
+				}
+				longString += "</body></html>";
+
+				WebView_NavigateToStringResult.Text = "string ready";
+				startButton.Content = "NavigateTo";
+			}
+			else
+			{
+				// NavigateTo
+				WebView_NavigateToStringResult.Text = "waiting for NavigationCompleted";
+				webViewControl.NavigationCompleted += webViewControl_NavigationCompleted;
+				webViewControl.NavigateToString(longString);
+			}
+		}
+		private void webViewControl_NavigationCompleted(object sender, object args)
+		{
+			WebView_NavigateToStringResult.Text = "success";
+		}
+
+	}
+}
diff --git a/src/Uno.UI/UI/Xaml/Controls/WebView/WebView.Android.cs b/src/Uno.UI/UI/Xaml/Controls/WebView/WebView.Android.cs
index 85aec9f3d427..691d89526754 100644
--- a/src/Uno.UI/UI/Xaml/Controls/WebView/WebView.Android.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/WebView/WebView.Android.cs
@@ -25,8 +25,8 @@ namespace Windows.UI.Xaml.Controls
 	public partial class WebView : Control
 	{
 		private Android.Webkit.WebView _webView;
-
-		protected override void OnApplyTemplate()
+        private bool _afterToString;
+        protected override void OnApplyTemplate()
 		{
 			base.OnApplyTemplate();
 
@@ -70,7 +70,8 @@ partial void NavigatePartial(Uri uri)
 				return;
 			}
 
-			if (uri.Scheme.Equals("local", StringComparison.OrdinalIgnoreCase))
+            _afterToString = false;
+            if (uri.Scheme.Equals("local", StringComparison.OrdinalIgnoreCase))
 			{
 				var path = $"file:///android_asset/{uri.PathAndQuery}";
 				_webView.LoadUrl(path);
@@ -119,7 +120,8 @@ partial void NavigateWithHttpRequestMessagePartial(HttpRequestMessage requestMes
 					element => element.Value.JoinBy(", ")
 				);
 
-			_webView.LoadUrl(uri.AbsoluteUri, headers);
+            _afterToString = false;
+            _webView.LoadUrl(uri.AbsoluteUri, headers);
 		}
 
 		partial void NavigateToStringPartial(string text)
@@ -129,7 +131,8 @@ partial void NavigateToStringPartial(string text)
 				return;
 			}
 
-			_webView.LoadData(text, "text/html; charset=utf-8", "utf-8");
+            _afterToString = true;
+            _webView.LoadData(text, "text/html; charset=utf-8", "utf-8");
 		}
 
 		//This should be IAsyncOperation<string> instead of Task<string> but we use an extension method to enable the same signature in Win.
@@ -299,11 +302,14 @@ public override void OnPageFinished(Android.Webkit.WebView view, string url)
 				var args = new WebViewNavigationCompletedEventArgs()
 				{
 					IsSuccess = _webViewSuccess,
-					Uri = new Uri(url),
 					WebErrorStatus = _webErrorStatus
 				};
+                if (!_webView._afterToString && !string.IsNullOrEmpty(url))
+                {
+                    args.Uri = new Uri(url);
+                }
 
-				_webView.NavigationCompleted?.Invoke(_webView, args);
+                _webView.NavigationCompleted?.Invoke(_webView, args);
 				base.OnPageFinished(view, url);
 			}
 

From 47703b9441e88b54a960276fba5a919104622f02 Mon Sep 17 00:00:00 2001
From: Piotr Karocki <pkar@ieee.org>
Date: Wed, 6 Nov 2019 16:49:58 +0100
Subject: [PATCH 2/3] Update UnoSamples_Test_NavigateToString.cs

---
 .../WebViewTests/UnoSamples_Test_NavigateToString.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/WebViewTests/UnoSamples_Test_NavigateToString.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/WebViewTests/UnoSamples_Test_NavigateToString.cs
index 6081dd2f089a..74f30f705a15 100644
--- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/WebViewTests/UnoSamples_Test_NavigateToString.cs
+++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/WebViewTests/UnoSamples_Test_NavigateToString.cs
@@ -16,6 +16,7 @@ public partial class WebView_Tests : SampleControlUITestBase
 	{
 		[Test]
 		[AutoRetry]
+		[ActivePlatforms(Platform.Android, Platform.iOS)]
 		public void WebView_NavigateToLongString()
 		{
 			Run("UITests.Shared.Windows_UI_Xaml_Controls.WebView.WebView_NavigateToString2");
@@ -30,7 +31,6 @@ public void WebView_NavigateToLongString()
 			// step 1: generate long string
 			_app.Tap(startButton);
 
-			// _app.Wait(TimeSpan.FromSeconds(300)); // Android: 20 is sufficient
 			_app.WaitForText(clickResult, "string ready");  // timeout here means: add wait
 
 			// step 2: NavigateTo

From 57c8562f016728b2b82e78fa846ac64c94060ecf Mon Sep 17 00:00:00 2001
From: Piotr Karocki <pkar@ieee.org>
Date: Wed, 6 Nov 2019 16:53:02 +0100
Subject: [PATCH 3/3] Update WebView.Android.cs

Changed variable name from _afterToString to _wasLoadedFromString
---
 .../UI/Xaml/Controls/WebView/WebView.Android.cs       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Uno.UI/UI/Xaml/Controls/WebView/WebView.Android.cs b/src/Uno.UI/UI/Xaml/Controls/WebView/WebView.Android.cs
index 691d89526754..a55ade7d8890 100644
--- a/src/Uno.UI/UI/Xaml/Controls/WebView/WebView.Android.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/WebView/WebView.Android.cs
@@ -25,7 +25,8 @@ namespace Windows.UI.Xaml.Controls
 	public partial class WebView : Control
 	{
 		private Android.Webkit.WebView _webView;
-        private bool _afterToString;
+        private bool _wasLoadedFromString;
+		
         protected override void OnApplyTemplate()
 		{
 			base.OnApplyTemplate();
@@ -70,7 +71,7 @@ partial void NavigatePartial(Uri uri)
 				return;
 			}
 
-            _afterToString = false;
+            _wasLoadedFromString = false;
             if (uri.Scheme.Equals("local", StringComparison.OrdinalIgnoreCase))
 			{
 				var path = $"file:///android_asset/{uri.PathAndQuery}";
@@ -120,7 +121,7 @@ partial void NavigateWithHttpRequestMessagePartial(HttpRequestMessage requestMes
 					element => element.Value.JoinBy(", ")
 				);
 
-            _afterToString = false;
+            _wasLoadedFromString = false;
             _webView.LoadUrl(uri.AbsoluteUri, headers);
 		}
 
@@ -131,7 +132,7 @@ partial void NavigateToStringPartial(string text)
 				return;
 			}
 
-            _afterToString = true;
+            _wasLoadedFromString = true;
             _webView.LoadData(text, "text/html; charset=utf-8", "utf-8");
 		}
 
@@ -304,7 +305,7 @@ public override void OnPageFinished(Android.Webkit.WebView view, string url)
 					IsSuccess = _webViewSuccess,
 					WebErrorStatus = _webErrorStatus
 				};
-                if (!_webView._afterToString && !string.IsNullOrEmpty(url))
+                if (!_webView._wasLoadedFromString && !string.IsNullOrEmpty(url))
                 {
                     args.Uri = new Uri(url);
                 }