Skip to content

[Android] Encoding webview's source #24002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kubaflo wants to merge 2 commits into from
Closed

[Android] Encoding webview's source #24002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f55641
[Android] Space character in Webview's Source
kubaflo Aug 4, 2024
7eb144d
Encoding the url - Applied idea of the chief build triggerer
kubaflo Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/Compatibility/Core/src/Android/Renderers/WebViewRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Threading.Tasks;
using Android.Content;
using Android.Webkit;
using System.Web;
using Microsoft.Maui.Controls.Internals;
using Microsoft.Maui.Controls.Platform;
using Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;
Expand Down Expand Up @@ -48,7 +49,24 @@ void LoadUrl(string url, bool fireNavigatingCanceled)
if (!fireNavigatingCanceled || !SendNavigatingCanceled(url))
{
_eventState = WebNavigationEvent.NewPage;
if (url != null && !url.StartsWith('/') && !Uri.IsWellFormedUriString(url, UriKind.Absolute))

string? encodedUrl = url;
if (!string.IsNullOrEmpty(encodedUrl))
{
int questionMarkIndex = encodedUrl.IndexOf('?', StringComparison.InvariantCulture);

if (questionMarkIndex != -1)
{
string baseUrl = encodedUrl.Substring(0, questionMarkIndex + 1);
string queryString = encodedUrl.Substring(questionMarkIndex + 1);

// URI encode the part after the '?'
string encodedPart = HttpUtility.UrlEncode(queryString);
encodedUrl = baseUrl + encodedPart;
}
}

if (url != null && !url.StartsWith('/') && !Uri.IsWellFormedUriString(encodedUrl, UriKind.Absolute))
{
// URLs like "index.html" can't possibly load, so try "file:///android_asset/index.html"
url = AssetBaseUrl + url;
Expand Down
19 changes: 18 additions & 1 deletion src/Core/src/Platform/Android/MauiWebView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Web;
using Android.Content;
using Android.Webkit;

Expand Down Expand Up @@ -32,7 +33,23 @@ void IWebViewDelegate.LoadUrl(string? url)
_handler.CurrentNavigationEvent = WebNavigationEvent.NewPage;
}

if (url != null && !url.StartsWith('/') && !Uri.IsWellFormedUriString(url, UriKind.Absolute))
string? encodedUrl = url;
if (!string.IsNullOrEmpty(encodedUrl))
{
int questionMarkIndex = encodedUrl.IndexOf('?', StringComparison.InvariantCulture);

if (questionMarkIndex != -1)
{
string baseUrl = encodedUrl.Substring(0, questionMarkIndex + 1);
string queryString = encodedUrl.Substring(questionMarkIndex + 1);

// URI encode the part after the '?'
string encodedPart = HttpUtility.UrlEncode(queryString);
encodedUrl = baseUrl + encodedPart;
}
}

if (url != null && !url.StartsWith('/') && !Uri.IsWellFormedUriString(encodedUrl, UriKind.Absolute))
{
// URLs like "index.html" can't possibly load, so try "file:///android_asset/index.html"
url = AssetBaseUrl + url;
Expand Down