CB-10456 InAppBrowser is not closed if I close it programmatically on Android
guthub close #143 Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/4d9e4884 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/4d9e4884 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/4d9e4884 Branch: refs/heads/master Commit: 4d9e4884dd485203804fcc53091c6567cc987fda Parents: 04c05a5 Author: sgrebnov <v-seg...@microsoft.com> Authored: Thu Jan 28 12:35:53 2016 +0300 Committer: sgrebnov <v-seg...@microsoft.com> Committed: Mon Feb 1 13:59:42 2016 +0300 ---------------------------------------------------------------------- src/android/InAppBrowser.java | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/4d9e4884/src/android/InAppBrowser.java ---------------------------------------------------------------------- diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java index 256c064..a3b4a0d 100644 --- a/src/android/InAppBrowser.java +++ b/src/android/InAppBrowser.java @@ -362,15 +362,16 @@ public class InAppBrowser extends CordovaPlugin { * Closes the dialog */ public void closeDialog() { - final WebView childView = this.inAppWebView; - // The JS protects against multiple calls, so this should happen only when - // closeDialog() is called by other native code. - if (childView == null) { - return; - } this.cordova.getActivity().runOnUiThread(new Runnable() { @Override public void run() { + final WebView childView = inAppWebView; + // The JS protects against multiple calls, so this should happen only when + // closeDialog() is called by other native code. + if (childView == null) { + return; + } + childView.setWebViewClient(new WebViewClient() { // NB: wait for about:blank before dismissing public void onPageFinished(WebView view, String url) { @@ -383,16 +384,16 @@ public class InAppBrowser extends CordovaPlugin { // other than your app's UI thread, it can cause unexpected results." // http://developer.android.com/guide/webapps/migrating.html#Threads childView.loadUrl("about:blank"); + + try { + JSONObject obj = new JSONObject(); + obj.put("type", EXIT_EVENT); + sendUpdate(obj, false); + } catch (JSONException ex) { + Log.d(LOG_TAG, "Should never happen"); + } } }); - - try { - JSONObject obj = new JSONObject(); - obj.put("type", EXIT_EVENT); - sendUpdate(obj, false); - } catch (JSONException ex) { - Log.d(LOG_TAG, "Should never happen"); - } } /** --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
