Skip to content

feat: add backwards compatibility mode for WebViewAssetLoader #1222

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

Merged
NiklasMerz merged 3 commits into from
May 6, 2021
+19 −2
Merged

feat: add backwards compatibility mode for WebViewAssetLoader #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ff9638
add backwards compatibility mode for WebViewAssetLoader
NiklasMerz Apr 28, 2021
fce8f2a
change preference name
NiklasMerz May 3, 2021
615f946
Support AndroidInsecureFileModeEnabled in setStartUrl
NiklasMerz May 3, 2021
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
13 changes: 11 additions & 2 deletions framework/src/org/apache/cordova/ConfigXmlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,14 @@ public ArrayList<PluginEntry> getPluginEntries() {
}

public String getLaunchUrl() {
if (launchUrl == null) {
if (launchUrl == null) {
Comment thread
NiklasMerz marked this conversation as resolved.
launchUrl = "https://" + this.prefs.getString("hostname", "localhost");
}

if (this.prefs.getBoolean("AndroidInsecureFileModeEnabled", false)) {
launchUrl = "file:///android_asset/www/index.html";
}

return launchUrl;
}

Expand Down Expand Up @@ -142,7 +147,11 @@ private void setStartUrl(String src) {
if (src.charAt(0) == '/') {
src = src.substring(1);
}
launchUrl = "https://" + this.prefs.getString("hostname", "localhost") + "/" + src;
if (this.prefs.getBoolean("AndroidInsecureFileModeEnabled", false)) {
launchUrl = "file:///android_asset/www/" + src;
} else {
launchUrl = "https://" + this.prefs.getString("hostname", "localhost") + "/" + src;
}
}
}
}
8 changes: 8 additions & 0 deletions framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,14 @@ private void initWebViewSettings() {
settings.setSaveFormData(false);
settings.setSavePassword(false);

if (preferences.getBoolean("AndroidInsecureFileModeEnabled", false)) {
//These settings are deprecated and loading content via file:// URLs is generally discouraged,
//but we allow this for compatibility reasons
LOG.d(TAG, "Enabled insecure file access");
settings.setAllowFileAccess(true);
settings.setAllowUniversalAccessFromFileURLs(true);
}

settings.setMediaPlaybackRequiresUserGesture(false);

// Enable database
Expand Down