From 7f6c5134780ad3cedc718772b40578f0170f200e Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 21 Sep 2020 18:43:03 +0200 Subject: cordova-plugin-inappbrowser welcome to the family!! --- .../src/android/InAppChromeClient.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'StoneIsland/plugins/cordova-plugin-inappbrowser/src/android/InAppChromeClient.java') diff --git a/StoneIsland/plugins/cordova-plugin-inappbrowser/src/android/InAppChromeClient.java b/StoneIsland/plugins/cordova-plugin-inappbrowser/src/android/InAppChromeClient.java index a2145e6a..fe5dd349 100644 --- a/StoneIsland/plugins/cordova-plugin-inappbrowser/src/android/InAppChromeClient.java +++ b/StoneIsland/plugins/cordova-plugin-inappbrowser/src/android/InAppChromeClient.java @@ -104,7 +104,7 @@ public class InAppChromeClient extends WebChromeClient { if(defaultValue.startsWith("gap-iab://")) { PluginResult scriptResult; String scriptCallbackId = defaultValue.substring(10); - if (scriptCallbackId.startsWith("InAppBrowser")) { + if (scriptCallbackId.matches("^InAppBrowser[0-9]{1,10}$")) { if(message == null || message.length() == 0) { scriptResult = new PluginResult(PluginResult.Status.OK, new JSONArray()); } else { @@ -118,9 +118,14 @@ public class InAppChromeClient extends WebChromeClient { result.confirm(""); return true; } + else { + // Anything else that doesn't look like InAppBrowser0123456789 should end up here + LOG.w(LOG_TAG, "InAppBrowser callback called with invalid callbackId : "+ scriptCallbackId); + result.cancel(); + return true; + } } - else - { + else { // Anything else with a gap: prefix should get this message LOG.w(LOG_TAG, "InAppBrowser does not support Cordova API calls: " + url + " " + defaultValue); result.cancel(); -- cgit v1.2.3-70-g09d2