You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by er...@apache.org on 2022/06/20 14:26:02 UTC
[cordova-android] branch master updated: fix: force hostname to lowercase (#1443)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
The following commit(s) were added to refs/heads/master by this push:
new 4916e1db fix: force hostname to lowercase (#1443)
4916e1db is described below
commit 4916e1db5108291f837a7174563c4d85be8ba5a2
Author: エリス <er...@users.noreply.github.com>
AuthorDate: Mon Jun 20 23:25:57 2022 +0900
fix: force hostname to lowercase (#1443)
---
framework/src/org/apache/cordova/ConfigXmlParser.java | 2 +-
framework/src/org/apache/cordova/PluginManager.java | 2 +-
framework/src/org/apache/cordova/engine/SystemWebViewClient.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/framework/src/org/apache/cordova/ConfigXmlParser.java b/framework/src/org/apache/cordova/ConfigXmlParser.java
index e9365173..69d02ee6 100644
--- a/framework/src/org/apache/cordova/ConfigXmlParser.java
+++ b/framework/src/org/apache/cordova/ConfigXmlParser.java
@@ -154,7 +154,7 @@ public class ConfigXmlParser {
return "file:///android_asset/www/";
} else {
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)) {
LOG.d(TAG, "The provided scheme \"" + scheme + "\" is not valid. " +
diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java
index 472bd2b5..05029937 100755
--- a/framework/src/org/apache/cordova/PluginManager.java
+++ b/framework/src/org/apache/cordova/PluginManager.java
@@ -383,7 +383,7 @@ public class PluginManager {
private String getLaunchUrlPrefix() {
if (!app.getPreferences().getBoolean("AndroidInsecureFileModeEnabled", false)) {
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 + '/';
}
diff --git a/framework/src/org/apache/cordova/engine/SystemWebViewClient.java b/framework/src/org/apache/cordova/engine/SystemWebViewClient.java
index 2fea4feb..05400417 100755
--- a/framework/src/org/apache/cordova/engine/SystemWebViewClient.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebViewClient.java
@@ -71,7 +71,7 @@ public class SystemWebViewClient extends WebViewClient {
this.parentEngine = parentEngine;
WebViewAssetLoader.Builder assetLoaderBuilder = new WebViewAssetLoader.Builder()
- .setDomain(parentEngine.preferences.getString("hostname", "localhost"))
+ .setDomain(parentEngine.preferences.getString("hostname", "localhost").toLowerCase())
.setHttpAllowed(true);
assetLoaderBuilder.addPathHandler("/", path -> {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org