summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs')
-rw-r--r--Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs
index 01c74b02..baa1e794 100644
--- a/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs
@@ -1,6 +1,7 @@
using System;
using System.ComponentModel;
using Android.Webkit;
+using Android.Widget;
using AWebView = Android.Webkit.WebView;
namespace Xamarin.Forms.Platform.Android
@@ -61,7 +62,7 @@ namespace Xamarin.Forms.Platform.Android
if (Control == null)
{
var webView = new AWebView(Context);
-#pragma warning disable 618
+#pragma warning disable 618 // This can probably be replaced with LinearLayout(LayoutParams.MatchParent, LayoutParams.MatchParent); just need to test that theory
webView.LayoutParameters = new global::Android.Widget.AbsoluteLayout.LayoutParams(LayoutParams.MatchParent, LayoutParams.MatchParent, 0, 0);
#pragma warning restore 618
webView.SetWebViewClient(new WebClient(this));
@@ -175,6 +176,7 @@ namespace Xamarin.Forms.Platform.Android
base.OnPageFinished(view, url);
}
+ [Obsolete("This method was deprecated in API level 23.")]
public override void OnReceivedError(AWebView view, ClientError errorCode, string description, string failingUrl)
{
_navigationResult = WebNavigationResult.Failure;
@@ -185,6 +187,14 @@ namespace Xamarin.Forms.Platform.Android
#pragma warning restore 618
}
+ public override void OnReceivedError(AWebView view, IWebResourceRequest request, WebResourceError error)
+ {
+ _navigationResult = WebNavigationResult.Failure;
+ if (error.ErrorCode == ClientError.Timeout)
+ _navigationResult = WebNavigationResult.Timeout;
+ base.OnReceivedError(view, request, error);
+ }
+
public override bool ShouldOverrideUrlLoading(AWebView view, string url)
{
if (_renderer.Element == null)