Skip to content

fix(android): return webview id from openWebView promise #474

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

Closed
riderx wants to merge 1 commit into from
Closed

fix(android): return webview id from openWebView promise #474

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
17 changes: 13 additions & 4 deletions android/src/main/java/ee/forgr/capacitor_inappbrowser/WebViewDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,15 @@ public String getInstanceId() {
return instanceId;
}

private void resolvePluginCallWithId() {
if (_options == null || _options.getPluginCall() == null) {
return;
}
JSObject result = new JSObject();
result.put("id", instanceId != null ? instanceId : "");
_options.getPluginCall().resolve(result);
}

// Add this class to provide safer JavaScript interface
private class JavaScriptInterface {

Expand Down Expand Up @@ -978,10 +987,10 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
show();
applyHiddenMode();
}
_options.getPluginCall().resolve();
resolvePluginCallWithId();
} else if (!this._options.isPresentAfterPageLoad()) {
show();
_options.getPluginCall().resolve();
resolvePluginCallWithId();
}
}

Expand Down Expand Up @@ -2787,7 +2796,7 @@ public void onPageFinished(WebView view, String url) {
boolean usePreShowScript = _options.getPreShowScript() != null && !_options.getPreShowScript().isEmpty();
if (!usePreShowScript) {
show();
_options.getPluginCall().resolve();
resolvePluginCallWithId();
} else {
executorService.execute(
new Runnable() {
Expand All @@ -2802,7 +2811,7 @@ public void run() {
@Override
public void run() {
show();
_options.getPluginCall().resolve();
resolvePluginCallWithId();
}
}
);
Expand Down