github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-03-04 00:13:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: force hostname to lowercase (#1443)

Browse Source
This commit is contained in:
エリス 2022-06-20 23:25:57 +09:00 committed by GitHub
parent 68a9a3181a
commit 4916e1db51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/org/apache/cordova/ConfigXmlParser.java
View File

@ -154,7 +154,7 @@ public class ConfigXmlParser {
return "file:///android_asset/www/"; return "file:///android_asset/www/";
} else { } else {
String scheme = prefs.getString("scheme", SCHEME_HTTPS).toLowerCase(); String scheme = prefs.getString("scheme", SCHEME_HTTPS).toLowerCase();
String hostname = prefs.getString("hostname", DEFAULT_HOSTNAME); String hostname = prefs.getString("hostname", DEFAULT_HOSTNAME).toLowerCase();
if (!scheme.contentEquals(SCHEME_HTTP) && !scheme.contentEquals(SCHEME_HTTPS)) { if (!scheme.contentEquals(SCHEME_HTTP) && !scheme.contentEquals(SCHEME_HTTPS)) {
LOG.d(TAG, "The provided scheme \"" + scheme + "\" is not valid. " + LOG.d(TAG, "The provided scheme \"" + scheme + "\" is not valid. " +

2
framework/src/org/apache/cordova/PluginManager.java
View File

@ -383,7 +383,7 @@ public class PluginManager {
private String getLaunchUrlPrefix() { private String getLaunchUrlPrefix() {
if (!app.getPreferences().getBoolean("AndroidInsecureFileModeEnabled", false)) { if (!app.getPreferences().getBoolean("AndroidInsecureFileModeEnabled", false)) {
String scheme = app.getPreferences().getString("scheme", SCHEME_HTTPS).toLowerCase(); String scheme = app.getPreferences().getString("scheme", SCHEME_HTTPS).toLowerCase();
String hostname = app.getPreferences().getString("hostname", DEFAULT_HOSTNAME); String hostname = app.getPreferences().getString("hostname", DEFAULT_HOSTNAME).toLowerCase();
return scheme + "://" + hostname + '/'; return scheme + "://" + hostname + '/';
} }

2
framework/src/org/apache/cordova/engine/SystemWebViewClient.java
View File

@ -71,7 +71,7 @@ public class SystemWebViewClient extends WebViewClient {
this.parentEngine = parentEngine; this.parentEngine = parentEngine;
WebViewAssetLoader.Builder assetLoaderBuilder = new WebViewAssetLoader.Builder() WebViewAssetLoader.Builder assetLoaderBuilder = new WebViewAssetLoader.Builder()
.setDomain(parentEngine.preferences.getString("hostname", "localhost")) .setDomain(parentEngine.preferences.getString("hostname", "localhost").toLowerCase())
.setHttpAllowed(true); .setHttpAllowed(true);
assetLoaderBuilder.addPathHandler("/", path -> { assetLoaderBuilder.addPathHandler("/", path -> {