github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-19 07:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(GH-1432): Default content src when content tag is missing (#1573)

Browse Source
This commit is contained in:
Norman Breau 2023-03-21 09:24:13 -07:00 committed by GitHub
parent dbddbf253b
commit d4bfd5079b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ public class ConfigXmlParser {
private static String SCHEME_HTTP = "http"; private static String SCHEME_HTTP = "http";
private static String SCHEME_HTTPS = "https"; private static String SCHEME_HTTPS = "https";
private static String DEFAULT_HOSTNAME = "localhost"; private static String DEFAULT_HOSTNAME = "localhost";
private static final String DEFAULT_CONTENT_SRC = "index.html";
private String launchUrl; private String launchUrl;
private String contentSrc; private String contentSrc;
@ -110,6 +111,18 @@ public class ConfigXmlParser {
e.printStackTrace(); e.printStackTrace();
} }
} }
onPostParse();
}
private void onPostParse() {
// After parsing, if contentSrc is still null, it signals
// that <content> tag was completely missing. In this case,
// default it.
// https://github.com/apache/cordova-android/issues/1432
if (contentSrc == null) {
contentSrc = DEFAULT_CONTENT_SRC;
}
} }
public void handleStartTag(XmlPullParser xml) { public void handleStartTag(XmlPullParser xml) {
@ -140,7 +153,7 @@ public class ConfigXmlParser {
contentSrc = src; contentSrc = src;
} else { } else {
// Default // Default
contentSrc = "index.html"; contentSrc = DEFAULT_CONTENT_SRC;
} }
} }
} }