[Android] Clean up a little bit WebView (#2431)

* [Android] Clean uo a little bit WebView

* [Android] Call mapper methods not static methods

* Fix order

* [Android] Check state before loading source

* Add ProcessSourceWhenReady

* Update WebViewHandler.Android.cs

Author: rmarinho

src/Core/src/Handlers/WebView/WebViewHandler.Android.cs

@@ -1,40 +1,67 @@
 using Android.Webkit;
-using Android.Widget;
 using static Android.Views.ViewGroup;
 using AWebView = Android.Webkit.WebView;
 
 namespace Microsoft.Maui.Handlers
 {
 	public partial class WebViewHandler : ViewHandler<IWebView, AWebView>
 	{
+		WebViewClient? _webViewClient;
+		WebChromeClient? _webChromeClient;
+		bool _firstRun = true;
+
 		protected override AWebView CreateNativeView()
 		{
-			var aWebView = new MauiWebView(Context!)
+			return new MauiWebView(Context!)
 			{
-#pragma warning disable 618 // This can probably be replaced with LinearLayout(LayoutParams.MatchParent, LayoutParams.MatchParent); just need to test that theory
-				LayoutParameters = new AbsoluteLayout.LayoutParams(LayoutParams.MatchParent, LayoutParams.MatchParent, 0, 0)
-#pragma warning restore 618
+				LayoutParameters = new LayoutParams(LayoutParams.MatchParent, LayoutParams.WrapContent)
 			};
+		}
 
-			if (aWebView.Settings != null)
-			{
-				aWebView.Settings.JavaScriptEnabled = true;
-				aWebView.Settings.DomStorageEnabled = true;
-			}
-			return aWebView;
+		public override void SetVirtualView(IView view)
+		{
+			_firstRun = true;
+			base.SetVirtualView(view);
+			// At this time all the mappers were already called
+			_firstRun = false;
+			ProcessSourceWhenReady(this, VirtualView);
 		}
 
 		protected override void DisconnectHandler(AWebView nativeView)
 		{
 			nativeView.StopLoading();
-			nativeView?.Dispose();
 		}
 
 		public static void MapSource(WebViewHandler handler, IWebView webView)
 		{
-			IWebViewDelegate? webViewDelegate = handler.NativeView as IWebViewDelegate;
+			ProcessSourceWhenReady(handler, webView);
+		}
 
+		public static void MapWebViewClient(WebViewHandler handler, IWebView webView)
+		{
+			handler.NativeView.SetWebViewClient(handler._webViewClient ??= new WebViewClient());
+		}
+
+		public static void MapWebChromeClient(WebViewHandler handler, IWebView webView)
+		{
+			handler.NativeView.SetWebChromeClient(handler._webChromeClient ??= new WebChromeClient());
+
+		}
+
+		public static void MapWebViewSettings(WebViewHandler handler, IWebView webView)
+		{
+			handler.NativeView.UpdateSettings(webView, true, true);
+		}
+
+		static void ProcessSourceWhenReady(WebViewHandler handler, IWebView webView)
+		{
+			//We want to load the source after making sure the mapper for webclients
+			//and settings were called already
+			if (handler._firstRun)
+				return;
+
+			IWebViewDelegate? webViewDelegate = handler.NativeView as IWebViewDelegate;
 			handler.NativeView?.UpdateSource(webView, webViewDelegate);
 		}
 	}
-}
+}

src/Core/src/Handlers/WebView/WebViewHandler.cs

@@ -1,10 +1,19 @@
-namespace Microsoft.Maui.Handlers
+#if __ANDROID__
+using Android.Webkit;
+#endif
+
+namespace Microsoft.Maui.Handlers
 {
 	public partial class WebViewHandler
 	{
 		public static PropertyMapper<IWebView, WebViewHandler> WebViewMapper = new PropertyMapper<IWebView, WebViewHandler>(ViewHandler.ViewMapper)
 		{
-			[nameof(IWebView.Source)] = MapSource
+			[nameof(IWebView.Source)] = MapSource,
+#if __ANDROID__
+			[nameof(WebViewClient)] = MapWebViewClient,
+			[nameof(WebChromeClient)] = MapWebChromeClient,
+			[nameof(WebView.Settings)] =  MapWebViewSettings
+#endif
 		};
 
 		public WebViewHandler() : base(WebViewMapper)

src/Core/src/Platform/Android/MauiWebView.cs

@@ -10,17 +10,8 @@ public class MauiWebView : WebView, IWebViewDelegate
 	{
 		public const string AssetBaseUrl = "file:///android_asset/";
 
-		WebViewClient? _webViewClient;
-		WebChromeClient? _webChromeClient;
-
 		public MauiWebView(Context context) : base(context)
 		{
-
-			_webViewClient = GetWebViewClient();
-			SetWebViewClient(_webViewClient);
-
-			_webChromeClient = GetWebChromeClient();
-			SetWebChromeClient(_webChromeClient);
 		}
 
 		void IWebViewDelegate.LoadHtml(string? html, string? baseUrl)
@@ -32,21 +23,5 @@ void IWebViewDelegate.LoadUrl(string? url)
 		{
 			LoadUrl(url ?? string.Empty);
 		}
-
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing)
-			{
-				_webViewClient?.Dispose();
-				_webChromeClient?.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		protected virtual WebViewClient GetWebViewClient() =>
-			new WebViewClient();
-
-		protected virtual WebChromeClient GetWebChromeClient() =>
-			new WebChromeClient();
 	}
 }

src/Core/src/Platform/Android/WebViewExtensions.cs

@@ -14,5 +14,14 @@ public static void UpdateSource(this AWebView nativeWebView, IWebView webView, I
 			if (webViewDelegate != null)
 				webView.Source?.Load(webViewDelegate);
 		}
+
+		public static void UpdateSettings(this AWebView nativeWebView, IWebView webView, bool javaScriptEnabled, bool domStorageEnabled)
+		{
+			if (nativeWebView.Settings == null)
+				return;
+
+			nativeWebView.Settings.JavaScriptEnabled = javaScriptEnabled;
+			nativeWebView.Settings.DomStorageEnabled = domStorageEnabled;
+		}
 	}
 }