Fix Issue ClaasBrueggemann#23: no cancel event

andreyliventsev · Jul 18, 2018 · 3227730 · 3227730
1 parent 2e87faa
commit 3227730
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/android/InAppBrowserXwalk.java b/src/android/InAppBrowserXwalk.java
@@ -2,6 +2,7 @@
 
 import com.example.plugin.InAppBrowserXwalk.BrowserDialog;
 
+import android.content.DialogInterface;
 import android.content.res.Resources;
 import org.apache.cordova.*;
 import org.apache.cordova.PluginManager;
@@ -14,7 +15,7 @@
 import org.xwalk.core.XWalkView;
 import org.xwalk.core.XWalkResourceClient;
 import org.xwalk.core.internal.XWalkViewInternal;
-import org.xwalk.core.internal.XWalkCookieManager;
+import org.xwalk.core.XWalkCookieManager;
 
 import android.view.View;
 import android.view.Window;
@@ -161,6 +162,21 @@ public void onClick(View v) {
                 dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
                 dialog.getWindow().getAttributes().windowAnimations = android.R.style.Animation_Dialog;
                 dialog.setCancelable(true);
+
+                dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    public void onCancel(DialogInterface dialog) {
+                        try {
+                            JSONObject obj = new JSONObject();
+                            obj.put("type", "cancel");
+                            PluginResult result = new PluginResult(PluginResult.Status.OK, obj);
+                            result.setKeepCallback(true);
+                            callbackContext.sendPluginResult(result);
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+
                 LayoutParams layoutParams = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
                 dialog.addContentView(main, layoutParams);
                 if(!openHidden) {

diff --git a/www/inappbrowserxwalk.js b/www/inappbrowserxwalk.js
@@ -34,6 +34,9 @@ var callback = function(event) {
     if (event.type === "exit" && callbacks['exit'] !== undefined) {
         callbacks['exit']();
     }
+    if (event.type === "cancel" && callbacks['cancel'] !== undefined) {
+        callbacks['cancel']();
+    }
 }
 
 module.exports = {