From 2ae07055c35d97c09fbcc97df920ca572cf99dfd Mon Sep 17 00:00:00 2001 From: Lorenzo Pichilli Date: Wed, 11 Dec 2019 01:50:42 +0100 Subject: [PATCH] fix name dropDownWorkaroundEnabled --- .../flutter_inappwebview/InAppWebView/InAppWebView.java | 7 +++---- .../flutter_inappwebview/JavaScriptBridgeInterface.java | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebView.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebView.java index d85ee51c..718a20c8 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebView.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebView.java @@ -567,7 +567,7 @@ final public class InAppWebView extends InputAwareWebView { " });" + " }" + " var isMultiple = !!this.flutterInAppWebViewSelect.multiple;" + - " window." + JavaScriptBridgeInterface.name + ".callHandler('flutterInAppWebViewDropDownWorkaroud', getIndexSelectValues(this.flutterInAppWebViewSelect), isMultiple, options).then(function(result) {" + + " window." + JavaScriptBridgeInterface.name + ".callHandler('flutterInAppWebViewDropDownWorkaround', getIndexSelectValues(this.flutterInAppWebViewSelect), isMultiple, options).then(function(result) {" + " if (result != null && result.values != null) {" + " if (!isMultiple) {" + " if (result.values.length > 0) {" + @@ -1470,7 +1470,7 @@ final public class InAppWebView extends InputAwareWebView { new PrintAttributes.Builder().build()); } - public void showDropDownWorkaroud(final List selectedValues, final List> values, final boolean isMultiSelect, final DropDownWorkaroudCallback callback) { + public void showDropDownWorkaround(final List selectedValues, final List> values, final boolean isMultiSelect, final DropDownWorkaroundCallback callback) { FrameLayout layout = new FrameLayout(getContext()); final List listViewValues = new ArrayList(); @@ -1495,7 +1495,6 @@ final public class InAppWebView extends InputAwareWebView { String value = values.get(position).get(1); if (!isMultiSelect) { result.add(value); - //callback.result(result); alertDialog.dismiss(); } else { if (!result.contains(value)) { @@ -1530,7 +1529,7 @@ final public class InAppWebView extends InputAwareWebView { alertDialog.show(); } - public static class DropDownWorkaroudCallback { + public static class DropDownWorkaroundCallback { public void result(List value) { } diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/JavaScriptBridgeInterface.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/JavaScriptBridgeInterface.java index 76ed3336..7658d42d 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/JavaScriptBridgeInterface.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/JavaScriptBridgeInterface.java @@ -274,7 +274,7 @@ public class JavaScriptBridgeInterface { public void run() { // workaround for https://github.com/pichillilorenzo/flutter_inappwebview/issues/182 - if (handlerName.equals("flutterInAppWebViewDropDownWorkaroud")) { + if (handlerName.equals("flutterInAppWebViewDropDownWorkaround")) { try { JSONArray jsonArray = new JSONArray(args); @@ -301,7 +301,7 @@ public class JavaScriptBridgeInterface { values.add(value); } - webView.showDropDownWorkaroud(selectedValues, values, isMultiSelect, new InAppWebView.DropDownWorkaroudCallback() { + webView.showDropDownWorkaround(selectedValues, values, isMultiSelect, new InAppWebView.DropDownWorkaroundCallback() { @Override public void result(List values) { String value = "{values: " + (new JSONArray(values)) + "}";