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.

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

Use evaluateJavascript for WebView postMessage, if available #19655

Closed
Closed
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ public void receiveCommand(WebView root, int commandId, @Nullable ReadableArray
try {
JSONObject eventInitDict = new JSONObject();
eventInitDict.put("data", args.getString(0));
root.loadUrl("javascript:(function () {" +
String code = "(function () {" +
"var event;" +
"var data = " + eventInitDict.toString() + ";" +
"try {" +
Expand All @@ -649,7 +649,12 @@ public void receiveCommand(WebView root, int commandId, @Nullable ReadableArray
"event.initMessageEvent('message', true, true, data.data, data.origin, data.lastEventId, data.source);" +
"}" +
"document.dispatchEvent(event);" +
"})();");
"})();";
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
root.evaluateJavascript(code, null);
} else {
root.loadUrl("javascript:" + code);
}
} catch (JSONException e) {
throw new RuntimeException(e);
}
Expand Down