fix(android): handle encoded WebView url (#12463)

Fixes https://jira.appcelerator.org/browse/TIMOB-28341
tidev · Feb 10, 2021 · f5f8f67 · f5f8f67
1 parent 7b26838
commit f5f8f67
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 1 deletion.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiUIWebView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiUIWebView.java
@@ -553,7 +553,8 @@ public void setUrl(String url)
 		final Uri uri = Uri.parse(url);
 
 		// Extract URL query parameters.
-		final String query = uri.getQuery() != null ? "?" + uri.getQuery() : "";
+		final String encodedQuery = uri.getEncodedQuery();
+		final String query = encodedQuery != null ? "?" + encodedQuery : "";
 		final String fragment = uri.getFragment();
 
 		// Resolve URL path.

diff --git a/tests/Resources/ti.ui.webview.test.js b/tests/Resources/ti.ui.webview.test.js
@@ -847,6 +847,48 @@ describe('Titanium.UI.WebView', function () {
 		win.open();
 	});
 
+	it('decode url', (finish) => {
+		win = Ti.UI.createWindow({
+			backgroundColor: 'blue'
+		});
+		const webview = Ti.UI.createWebView({
+			url: 'https://www.google.com/sub/api?key=TiTeSTKEy%3D%3D&var=1234'
+		});
+
+		webview.addEventListener('load', e => {
+			try {
+				should(e.source.url).be.a.String();
+				should(e.source.url).eql('https://www.google.com/sub/api?key=TiTeSTKEy%3D%3D&var=1234');
+			} catch (err) {
+				return finish(err);
+			}
+			finish();
+		});
+		win.add(webview);
+		win.open();
+	});
+
+	it('decode \'+\' in url', (finish) => {
+		win = Ti.UI.createWindow({
+			backgroundColor: 'blue'
+		});
+		const webview = Ti.UI.createWebView({
+			url: 'https://www.google.com/pin%20wheel+.jpg'
+		});
+
+		webview.addEventListener('load', e => {
+			try {
+				should(e.source.url).be.a.String();
+				should(e.source.url).eql('https://www.google.com/pin%20wheel+.jpg');
+			} catch (err) {
+				return finish(err);
+			}
+			finish();
+		});
+		win.add(webview);
+		win.open();
+	});
+
 	describe.ios('#findString()', function () {
 		it('is a Function', () => {
 			if (OS_VERSION_MAJOR < 14) {