Skip to content
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

Inject Capacitor JS for error fallbacks. #7781

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Inject Capacitor JS for error fallbacks. #7781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions android/capacitor/src/main/java/com/getcapacitor/Bridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,12 @@ private void loadWebView() {
// Start the local web server
JSInjector injector = getJSInjector();
if (WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) {
String allowedOrigin = Uri.parse(appUrl).buildUpon().path(null).fragment(null).clearQuery().build().toString();
Set<String> allowedOrigins = new HashSet<>(Arrays.asList(
Uri.parse(appUrl).buildUpon().path(null).fragment(null).clearQuery().build().toString(),
"https://localhost"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there ever a situation where we'd also want to add http://localhost?

));
try {
WebViewCompat.addDocumentStartJavaScript(webView, injector.getScriptString(), Collections.singleton(allowedOrigin));
WebViewCompat.addDocumentStartJavaScript(webView, injector.getScriptString(), allowedOrigins);
injector = null;
} catch (IllegalArgumentException ex) {
Logger.warn("Invalid url, using fallback");
Expand Down