Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Fix WebView Navigated Status Bug In Android #12169

Merged
merged 1 commit into from Oct 23, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions Xamarin.Forms.Platform.Android/Renderers/FormsWebViewClient.cs
Expand Up @@ -85,19 +85,25 @@ public override void OnPageFinished(WView view, string url)
[EditorBrowsable(EditorBrowsableState.Never)]
public override void OnReceivedError(WView view, ClientError errorCode, string description, string failingUrl)
{
_navigationResult = WebNavigationResult.Failure;
if (errorCode == ClientError.Timeout)
_navigationResult = WebNavigationResult.Timeout;
if(failingUrl == _renderer?.Control.Url)
{
_navigationResult = WebNavigationResult.Failure;
if (errorCode == ClientError.Timeout)
_navigationResult = WebNavigationResult.Timeout;
}
#pragma warning disable 618
base.OnReceivedError(view, errorCode, description, failingUrl);
#pragma warning restore 618
}

public override void OnReceivedError(WView view, IWebResourceRequest request, WebResourceError error)
{
_navigationResult = WebNavigationResult.Failure;
if (error.ErrorCode == ClientError.Timeout)
_navigationResult = WebNavigationResult.Timeout;
if(request.Url.ToString() == _renderer?.Control.Url)
{
_navigationResult = WebNavigationResult.Failure;
if (error.ErrorCode == ClientError.Timeout)
_navigationResult = WebNavigationResult.Timeout;
}
base.OnReceivedError(view, request, error);
}

Expand Down