Skip to content

fix(JBCallbackImpl): use evaluateJavascript so delayed callback.apply works (#34) #41

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

Open
jim-daf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(JBCallbackImpl): use evaluateJavascript so delayed callback.apply works (#34) #41

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
28 changes: 24 additions & 4 deletions jsbridge/src/main/java/com/apkfuns/jsbridge/JBCallbackImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.apkfuns.jsbridge;

import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.NonNull;
Expand Down Expand Up @@ -47,10 +48,29 @@ public void apply(Object... args) {
mHandler.post(new Runnable() {
@Override
public void run() {
if (method.getModule().mWebView instanceof WebView) {
((WebView) method.getModule().mWebView).loadUrl(builder.toString());
} else if (method.getModule().mWebView instanceof IWebView) {
((IWebView) method.getModule().mWebView).loadUrl(builder.toString());
// Issue #34: an asynchronous callback.apply (for example
// after a network request finishes) loses its result
// because loadUrl("javascript:...") is unreliable on
// modern WebView when called outside of an active JS
// event. evaluateJavascript was added in API 19 for
// exactly this case so prefer it when available.
Object webView = method.getModule().mWebView;
if (webView instanceof WebView) {
WebView wv = (WebView) webView;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
// Strip the leading "javascript:" prefix that
// loadUrl required, evaluateJavascript wants
// raw script.
String js = builder.toString();
if (js.startsWith("javascript:")) {
js = js.substring("javascript:".length());
}
wv.evaluateJavascript(js, null);
} else {
wv.loadUrl(builder.toString());
}
} else if (webView instanceof IWebView) {
((IWebView) webView).loadUrl(builder.toString());
}
}
});
Expand Down
Loading