[webview_flutter] update pigeon to 11 (#4821)

updates pigeon version to 11 to remove need for primitive enum wrappers - removes unnused enum wrappers.

Some work toward https://github.com/flutter/flutter/issues/133455
This commit is contained in:
Tarrin Neal
2023-08-31 11:18:05 -07:00
committed by GitHub
parent 5f90356002
commit bd4a8eb6a4
11 changed files with 1230 additions and 1176 deletions

View File

@ -85,8 +85,8 @@ class AuthResultDetails {
/// Pigeon equivalent of the subset of BiometricType used by iOS. /// Pigeon equivalent of the subset of BiometricType used by iOS.
enum AuthBiometric { face, fingerprint } enum AuthBiometric { face, fingerprint }
// TODO(stuartmorgan): Remove this when // TODO(stuartmorgan): Enums need be wrapped in a data class because thay can't
// https://github.com/flutter/flutter/issues/87307 is implemented. // be used as collection arguments. See https://github.com/flutter/flutter/issues/133728
class AuthBiometricWrapper { class AuthBiometricWrapper {
AuthBiometricWrapper({required this.value}); AuthBiometricWrapper({required this.value});
final AuthBiometric value; final AuthBiometric value;

View File

@ -1,3 +1,7 @@
## 3.9.5
* Updates pigeon to 11 and removes unneeded enum wrappers.
## 3.9.4 ## 3.9.4
* Adds pub topics to package metadata. * Adds pub topics to package metadata.

View File

@ -34,25 +34,21 @@ public class FileChooserParamsFlutterApiImpl
this.instanceManager = instanceManager; this.instanceManager = instanceManager;
} }
private static GeneratedAndroidWebView.FileChooserModeEnumData toFileChooserEnumData(int mode) { private static GeneratedAndroidWebView.FileChooserMode toFileChooserEnumData(int mode) {
final GeneratedAndroidWebView.FileChooserModeEnumData.Builder builder =
new GeneratedAndroidWebView.FileChooserModeEnumData.Builder();
switch (mode) { switch (mode) {
case WebChromeClient.FileChooserParams.MODE_OPEN: case WebChromeClient.FileChooserParams.MODE_OPEN:
builder.setValue(GeneratedAndroidWebView.FileChooserMode.OPEN); return GeneratedAndroidWebView.FileChooserMode.OPEN;
break;
case WebChromeClient.FileChooserParams.MODE_OPEN_MULTIPLE: case WebChromeClient.FileChooserParams.MODE_OPEN_MULTIPLE:
builder.setValue(GeneratedAndroidWebView.FileChooserMode.OPEN_MULTIPLE); return GeneratedAndroidWebView.FileChooserMode.OPEN_MULTIPLE;
break;
case WebChromeClient.FileChooserParams.MODE_SAVE: case WebChromeClient.FileChooserParams.MODE_SAVE:
builder.setValue(GeneratedAndroidWebView.FileChooserMode.SAVE); return GeneratedAndroidWebView.FileChooserMode.SAVE;
break;
default: default:
throw new IllegalArgumentException(String.format("Unsupported FileChooserMode: %d", mode)); throw new IllegalArgumentException(String.format("Unsupported FileChooserMode: %d", mode));
} }
return builder.build();
} }
/** /**

View File

@ -1,7 +1,7 @@
// Copyright 2013 The Flutter Authors. All rights reserved. // Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// Autogenerated from Pigeon (v9.2.5), do not edit directly. // Autogenerated from Pigeon (v11.0.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon // See also: https://pub.dev/packages/pigeon
package io.flutter.plugins.webviewflutter; package io.flutter.plugins.webviewflutter;
@ -94,55 +94,6 @@ public class GeneratedAndroidWebView {
} }
} }
/** Generated class from Pigeon that represents data sent in messages. */
public static final class FileChooserModeEnumData {
private @NonNull FileChooserMode value;
public @NonNull FileChooserMode getValue() {
return value;
}
public void setValue(@NonNull FileChooserMode setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"value\" is null.");
}
this.value = setterArg;
}
/** Constructor is non-public to enforce null safety; use Builder. */
FileChooserModeEnumData() {}
public static final class Builder {
private @Nullable FileChooserMode value;
public @NonNull Builder setValue(@NonNull FileChooserMode setterArg) {
this.value = setterArg;
return this;
}
public @NonNull FileChooserModeEnumData build() {
FileChooserModeEnumData pigeonReturn = new FileChooserModeEnumData();
pigeonReturn.setValue(value);
return pigeonReturn;
}
}
@NonNull
ArrayList<Object> toList() {
ArrayList<Object> toListResult = new ArrayList<Object>(1);
toListResult.add(value == null ? null : value.index);
return toListResult;
}
static @NonNull FileChooserModeEnumData fromList(@NonNull ArrayList<Object> list) {
FileChooserModeEnumData pigeonResult = new FileChooserModeEnumData();
Object value = list.get(0);
pigeonResult.setValue(value == null ? null : FileChooserMode.values()[(int) value]);
return pigeonResult;
}
}
/** Generated class from Pigeon that represents data sent in messages. */ /** Generated class from Pigeon that represents data sent in messages. */
public static final class WebResourceRequestData { public static final class WebResourceRequestData {
private @NonNull String url; private @NonNull String url;
@ -490,7 +441,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.InstanceManagerHostApi.clear", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.InstanceManagerHostApi.clear",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -534,7 +487,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.JavaObjectHostApi.dispose", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.JavaObjectHostApi.dispose",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -583,7 +538,9 @@ public class GeneratedAndroidWebView {
public void dispose(@NonNull Long identifierArg, @NonNull Reply<Void> callback) { public void dispose(@NonNull Long identifierArg, @NonNull Reply<Void> callback) {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.JavaObjectFlutterApi.dispose", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.JavaObjectFlutterApi.dispose",
getCodec());
channel.send( channel.send(
new ArrayList<Object>(Collections.singletonList(identifierArg)), new ArrayList<Object>(Collections.singletonList(identifierArg)),
channelReply -> callback.reply(null)); channelReply -> callback.reply(null));
@ -623,7 +580,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.CookieManagerHostApi.attachInstance", "dev.flutter.pigeon.webview_flutter_android.CookieManagerHostApi.attachInstance",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -648,7 +605,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.CookieManagerHostApi.setCookie", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.CookieManagerHostApi.setCookie",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -675,7 +634,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.CookieManagerHostApi.removeAllCookies", "dev.flutter.pigeon.webview_flutter_android.CookieManagerHostApi.removeAllCookies",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -707,7 +666,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.CookieManagerHostApi.setAcceptThirdPartyCookies", "dev.flutter.pigeon.webview_flutter_android.CookieManagerHostApi.setAcceptThirdPartyCookies",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -846,7 +805,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.create", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.create",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -869,7 +830,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.loadData", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.loadData",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -900,7 +863,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl", "dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.loadDataWithBaseUrl",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -935,7 +898,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.loadUrl", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.loadUrl",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -963,7 +928,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.postUrl", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.postUrl",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -989,7 +956,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.getUrl", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.getUrl",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1013,7 +982,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.canGoBack", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.canGoBack",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1037,7 +1008,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.canGoForward", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.canGoForward",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1061,7 +1034,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.goBack", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.goBack",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1084,7 +1059,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.goForward", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.goForward",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1107,7 +1084,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.reload", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.reload",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1130,7 +1109,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.clearCache", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.clearCache",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1157,7 +1138,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewHostApi.evaluateJavascript", "dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.evaluateJavascript",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1191,7 +1172,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.getTitle", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.getTitle",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1215,7 +1198,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.scrollTo", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.scrollTo",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1243,7 +1228,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.scrollBy", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.scrollBy",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1271,7 +1258,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.getScrollX", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.getScrollX",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1295,7 +1284,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.getScrollY", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.getScrollY",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1319,7 +1310,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.getScrollPosition", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.getScrollPosition",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1345,7 +1338,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewHostApi.setWebContentsDebuggingEnabled", "dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.setWebContentsDebuggingEnabled",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1369,7 +1362,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewHostApi.setWebViewClient", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.setWebViewClient",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1398,7 +1393,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewHostApi.addJavaScriptChannel", "dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.addJavaScriptChannel",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1428,7 +1423,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewHostApi.removeJavaScriptChannel", "dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.removeJavaScriptChannel",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1458,7 +1453,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewHostApi.setDownloadListener", "dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.setDownloadListener",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1486,7 +1481,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewHostApi.setWebChromeClient", "dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.setWebChromeClient",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1514,7 +1509,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewHostApi.setBackgroundColor", "dev.flutter.pigeon.webview_flutter_android.WebViewHostApi.setBackgroundColor",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1570,7 +1565,9 @@ public class GeneratedAndroidWebView {
public void create(@NonNull Long identifierArg, @NonNull Reply<Void> callback) { public void create(@NonNull Long identifierArg, @NonNull Reply<Void> callback) {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewFlutterApi.create", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewFlutterApi.create",
getCodec());
channel.send( channel.send(
new ArrayList<Object>(Collections.singletonList(identifierArg)), new ArrayList<Object>(Collections.singletonList(identifierArg)),
channelReply -> callback.reply(null)); channelReply -> callback.reply(null));
@ -1618,7 +1615,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebSettingsHostApi.create", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.create",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -1645,7 +1644,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setDomStorageEnabled",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1672,7 +1671,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1699,7 +1698,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setSupportMultipleWindows", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setSupportMultipleWindows",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1726,7 +1725,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setJavaScriptEnabled",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1753,7 +1752,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setUserAgentString", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setUserAgentString",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1781,7 +1780,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1808,7 +1807,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setSupportZoom", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setSupportZoom",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1835,7 +1834,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setLoadWithOverviewMode",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1862,7 +1861,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setUseWideViewPort", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setUseWideViewPort",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1889,7 +1888,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setDisplayZoomControls",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1916,7 +1915,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setBuiltInZoomControls",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1943,7 +1942,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebSettingsHostApi.setAllowFileAccess", "dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setAllowFileAccess",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -1969,7 +1968,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebSettingsHostApi.setTextZoom", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebSettingsHostApi.setTextZoom",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -2012,7 +2013,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.JavaScriptChannelHostApi.create", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.JavaScriptChannelHostApi.create",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -2059,7 +2062,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.JavaScriptChannelFlutterApi.postMessage", "dev.flutter.pigeon.webview_flutter_android.JavaScriptChannelFlutterApi.postMessage",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>(Arrays.asList(instanceIdArg, messageArg)), new ArrayList<Object>(Arrays.asList(instanceIdArg, messageArg)),
@ -2087,7 +2090,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewClientHostApi.create", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewClientHostApi.create",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -2111,7 +2116,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewClientHostApi.setSynchronousReturnValueForShouldOverrideUrlLoading", "dev.flutter.pigeon.webview_flutter_android.WebViewClientHostApi.setSynchronousReturnValueForShouldOverrideUrlLoading",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -2194,7 +2199,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted", "dev.flutter.pigeon.webview_flutter_android.WebViewClientFlutterApi.onPageStarted",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, urlArg)), new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, urlArg)),
@ -2209,7 +2214,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished", "dev.flutter.pigeon.webview_flutter_android.WebViewClientFlutterApi.onPageFinished",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, urlArg)), new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, urlArg)),
@ -2225,7 +2230,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError", "dev.flutter.pigeon.webview_flutter_android.WebViewClientFlutterApi.onReceivedRequestError",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>( new ArrayList<Object>(
@ -2243,7 +2248,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError", "dev.flutter.pigeon.webview_flutter_android.WebViewClientFlutterApi.onReceivedError",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>( new ArrayList<Object>(
@ -2264,7 +2269,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading", "dev.flutter.pigeon.webview_flutter_android.WebViewClientFlutterApi.requestLoading",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, requestArg)), new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, requestArg)),
@ -2278,7 +2283,9 @@ public class GeneratedAndroidWebView {
@NonNull Reply<Void> callback) { @NonNull Reply<Void> callback) {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebViewClientFlutterApi.urlLoading",
getCodec());
channel.send( channel.send(
new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, urlArg)), new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, urlArg)),
channelReply -> callback.reply(null)); channelReply -> callback.reply(null));
@ -2293,7 +2300,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebViewClientFlutterApi.doUpdateVisitedHistory", "dev.flutter.pigeon.webview_flutter_android.WebViewClientFlutterApi.doUpdateVisitedHistory",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>( new ArrayList<Object>(
@ -2319,7 +2326,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.DownloadListenerHostApi.create", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.DownloadListenerHostApi.create",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -2370,7 +2379,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart", "dev.flutter.pigeon.webview_flutter_android.DownloadListenerFlutterApi.onDownloadStart",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>( new ArrayList<Object>(
@ -2405,7 +2414,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebChromeClientHostApi.create", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebChromeClientHostApi.create",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -2429,7 +2440,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebChromeClientHostApi.setSynchronousReturnValueForOnShowFileChooser", "dev.flutter.pigeon.webview_flutter_android.WebChromeClientHostApi.setSynchronousReturnValueForOnShowFileChooser",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -2476,7 +2487,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.FlutterAssetManagerHostApi.list", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.FlutterAssetManagerHostApi.list",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -2500,7 +2513,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.FlutterAssetManagerHostApi.getAssetFilePathByName", "dev.flutter.pigeon.webview_flutter_android.FlutterAssetManagerHostApi.getAssetFilePathByName",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -2549,7 +2562,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged", "dev.flutter.pigeon.webview_flutter_android.WebChromeClientFlutterApi.onProgressChanged",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, progressArg)), new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, progressArg)),
@ -2564,7 +2577,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebChromeClientFlutterApi.onShowFileChooser", "dev.flutter.pigeon.webview_flutter_android.WebChromeClientFlutterApi.onShowFileChooser",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>( new ArrayList<Object>(
@ -2583,7 +2596,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebChromeClientFlutterApi.onPermissionRequest", "dev.flutter.pigeon.webview_flutter_android.WebChromeClientFlutterApi.onPermissionRequest",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>(Arrays.asList(instanceIdArg, requestInstanceIdArg)), new ArrayList<Object>(Arrays.asList(instanceIdArg, requestInstanceIdArg)),
@ -2598,7 +2611,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebChromeClientFlutterApi.onGeolocationPermissionsShowPrompt", "dev.flutter.pigeon.webview_flutter_android.WebChromeClientFlutterApi.onGeolocationPermissionsShowPrompt",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>(Arrays.asList(instanceIdArg, paramsInstanceIdArg, originArg)), new ArrayList<Object>(Arrays.asList(instanceIdArg, paramsInstanceIdArg, originArg)),
@ -2610,7 +2623,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.WebChromeClientFlutterApi.onGeolocationPermissionsHidePrompt", "dev.flutter.pigeon.webview_flutter_android.WebChromeClientFlutterApi.onGeolocationPermissionsHidePrompt",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>(Collections.singletonList(identifierArg)), new ArrayList<Object>(Collections.singletonList(identifierArg)),
@ -2635,7 +2648,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebStorageHostApi.create", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebStorageHostApi.create",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -2658,7 +2673,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.WebStorageHostApi.deleteAllData", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.WebStorageHostApi.deleteAllData",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -2680,34 +2697,6 @@ public class GeneratedAndroidWebView {
} }
} }
} }
private static class FileChooserParamsFlutterApiCodec extends StandardMessageCodec {
public static final FileChooserParamsFlutterApiCodec INSTANCE =
new FileChooserParamsFlutterApiCodec();
private FileChooserParamsFlutterApiCodec() {}
@Override
protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) {
switch (type) {
case (byte) 128:
return FileChooserModeEnumData.fromList((ArrayList<Object>) readValue(buffer));
default:
return super.readValueOfType(type, buffer);
}
}
@Override
protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) {
if (value instanceof FileChooserModeEnumData) {
stream.write(128);
writeValue(stream, ((FileChooserModeEnumData) value).toList());
} else {
super.writeValue(stream, value);
}
}
}
/** /**
* Handles callbacks methods for the native Java FileChooserParams class. * Handles callbacks methods for the native Java FileChooserParams class.
* *
@ -2730,23 +2719,29 @@ public class GeneratedAndroidWebView {
} }
/** The codec used by FileChooserParamsFlutterApi. */ /** The codec used by FileChooserParamsFlutterApi. */
static @NonNull MessageCodec<Object> getCodec() { static @NonNull MessageCodec<Object> getCodec() {
return FileChooserParamsFlutterApiCodec.INSTANCE; return new StandardMessageCodec();
} }
public void create( public void create(
@NonNull Long instanceIdArg, @NonNull Long instanceIdArg,
@NonNull Boolean isCaptureEnabledArg, @NonNull Boolean isCaptureEnabledArg,
@NonNull List<String> acceptTypesArg, @NonNull List<String> acceptTypesArg,
@NonNull FileChooserModeEnumData modeArg, @NonNull FileChooserMode modeArg,
@Nullable String filenameHintArg, @Nullable String filenameHintArg,
@NonNull Reply<Void> callback) { @NonNull Reply<Void> callback) {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.FileChooserParamsFlutterApi.create", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.FileChooserParamsFlutterApi.create",
getCodec());
channel.send( channel.send(
new ArrayList<Object>( new ArrayList<Object>(
Arrays.asList( Arrays.asList(
instanceIdArg, isCaptureEnabledArg, acceptTypesArg, modeArg, filenameHintArg)), instanceIdArg,
isCaptureEnabledArg,
acceptTypesArg,
modeArg.index,
filenameHintArg)),
channelReply -> callback.reply(null)); channelReply -> callback.reply(null));
} }
} }
@ -2780,7 +2775,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.PermissionRequestHostApi.grant", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.PermissionRequestHostApi.grant",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -2805,7 +2802,9 @@ public class GeneratedAndroidWebView {
{ {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.PermissionRequestHostApi.deny", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.PermissionRequestHostApi.deny",
getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
(message, reply) -> { (message, reply) -> {
@ -2860,7 +2859,9 @@ public class GeneratedAndroidWebView {
@NonNull Reply<Void> callback) { @NonNull Reply<Void> callback) {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, "dev.flutter.pigeon.PermissionRequestFlutterApi.create", getCodec()); binaryMessenger,
"dev.flutter.pigeon.webview_flutter_android.PermissionRequestFlutterApi.create",
getCodec());
channel.send( channel.send(
new ArrayList<Object>(Arrays.asList(instanceIdArg, resourcesArg)), new ArrayList<Object>(Arrays.asList(instanceIdArg, resourcesArg)),
channelReply -> callback.reply(null)); channelReply -> callback.reply(null));
@ -2900,7 +2901,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.GeolocationPermissionsCallbackHostApi.invoke", "dev.flutter.pigeon.webview_flutter_android.GeolocationPermissionsCallbackHostApi.invoke",
getCodec()); getCodec());
if (api != null) { if (api != null) {
channel.setMessageHandler( channel.setMessageHandler(
@ -2961,7 +2962,7 @@ public class GeneratedAndroidWebView {
BasicMessageChannel<Object> channel = BasicMessageChannel<Object> channel =
new BasicMessageChannel<>( new BasicMessageChannel<>(
binaryMessenger, binaryMessenger,
"dev.flutter.pigeon.GeolocationPermissionsCallbackFlutterApi.create", "dev.flutter.pigeon.webview_flutter_android.GeolocationPermissionsCallbackFlutterApi.create",
getCodec()); getCodec());
channel.send( channel.send(
new ArrayList<Object>(Collections.singletonList(instanceIdArg)), new ArrayList<Object>(Collections.singletonList(instanceIdArg)),

View File

@ -57,8 +57,8 @@ public class FileChooserParamsTest {
final long identifier = final long identifier =
Objects.requireNonNull( Objects.requireNonNull(
instanceManager.getIdentifierForStrongReference(mockFileChooserParams)); instanceManager.getIdentifierForStrongReference(mockFileChooserParams));
final ArgumentCaptor<GeneratedAndroidWebView.FileChooserModeEnumData> modeCaptor = final ArgumentCaptor<GeneratedAndroidWebView.FileChooserMode> modeCaptor =
ArgumentCaptor.forClass(GeneratedAndroidWebView.FileChooserModeEnumData.class); ArgumentCaptor.forClass(GeneratedAndroidWebView.FileChooserMode.class);
verify(spyFlutterApi) verify(spyFlutterApi)
.create( .create(
@ -68,7 +68,6 @@ public class FileChooserParamsTest {
modeCaptor.capture(), modeCaptor.capture(),
eq("filenameHint"), eq("filenameHint"),
any()); any());
assertEquals( assertEquals(modeCaptor.getValue(), GeneratedAndroidWebView.FileChooserMode.OPEN_MULTIPLE);
modeCaptor.getValue().getValue(), GeneratedAndroidWebView.FileChooserMode.OPEN_MULTIPLE);
} }
} }

View File

@ -1025,14 +1025,14 @@ class FileChooserParamsFlutterApiImpl extends FileChooserParamsFlutterApi {
int instanceId, int instanceId,
bool isCaptureEnabled, bool isCaptureEnabled,
List<String?> acceptTypes, List<String?> acceptTypes,
FileChooserModeEnumData mode, FileChooserMode mode,
String? filenameHint, String? filenameHint,
) { ) {
instanceManager.addHostCreatedInstance( instanceManager.addHostCreatedInstance(
FileChooserParams.detached( FileChooserParams.detached(
isCaptureEnabled: isCaptureEnabled, isCaptureEnabled: isCaptureEnabled,
acceptTypes: acceptTypes.cast(), acceptTypes: acceptTypes.cast(),
mode: mode.value, mode: mode,
filenameHint: filenameHint, filenameHint: filenameHint,
binaryMessenger: binaryMessenger, binaryMessenger: binaryMessenger,
instanceManager: instanceManager, instanceManager: instanceManager,

View File

@ -57,12 +57,6 @@ enum FileChooserMode {
save, save,
} }
// TODO(bparrishMines): Enums need be wrapped in a data class because thay can't
// be used as primitive arguments. See https://github.com/flutter/flutter/issues/87307
class FileChooserModeEnumData {
late FileChooserMode value;
}
class WebResourceRequestData { class WebResourceRequestData {
WebResourceRequestData( WebResourceRequestData(
this.url, this.url,
@ -393,7 +387,7 @@ abstract class FileChooserParamsFlutterApi {
int instanceId, int instanceId,
bool isCaptureEnabled, bool isCaptureEnabled,
List<String> acceptTypes, List<String> acceptTypes,
FileChooserModeEnumData mode, FileChooserMode mode,
String? filenameHint, String? filenameHint,
); );
} }

View File

@ -2,7 +2,7 @@ name: webview_flutter_android
description: A Flutter plugin that provides a WebView widget on Android. description: A Flutter plugin that provides a WebView widget on Android.
repository: https://github.com/flutter/packages/tree/main/packages/webview_flutter/webview_flutter_android repository: https://github.com/flutter/packages/tree/main/packages/webview_flutter/webview_flutter_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22
version: 3.9.4 version: 3.9.5
environment: environment:
sdk: ">=2.19.0 <4.0.0" sdk: ">=2.19.0 <4.0.0"
@ -27,7 +27,7 @@ dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter
mockito: 5.4.1 mockito: 5.4.1
pigeon: ^9.2.4 pigeon: ^11.0.0
topics: topics:
- html - html

View File

@ -1085,7 +1085,7 @@ void main() {
0, 0,
false, false,
const <String>['my', 'list'], const <String>['my', 'list'],
FileChooserModeEnumData(value: FileChooserMode.openMultiple), FileChooserMode.openMultiple,
'filenameHint', 'filenameHint',
); );