Add wrapper for androidx.webkit.WebViewFeature

Author: mataku

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/AndroidWebkitLibrary.g.kt

@@ -573,6 +573,12 @@ abstract class AndroidWebkitLibraryPigeonProxyApiRegistrar(val binaryMessenger:
    */
   abstract fun getPigeonApiWebSettingsCompat(): PigeonApiWebSettingsCompat
 
+  /**
+   * An implementation of [PigeonApiWebViewFeature] used to add a new Dart instance of
+   * `WebViewFeature` to the Dart `InstanceManager`.
+   */
+  abstract fun getPigeonApiWebViewFeature(): PigeonApiWebViewFeature
+
   fun setUp() {
     AndroidWebkitLibraryPigeonInstanceManagerApi.setUpMessageHandlers(
         binaryMessenger, instanceManager)
@@ -606,6 +612,7 @@ abstract class AndroidWebkitLibraryPigeonProxyApiRegistrar(val binaryMessenger:
     PigeonApiCertificate.setUpMessageHandlers(binaryMessenger, getPigeonApiCertificate())
     PigeonApiWebSettingsCompat.setUpMessageHandlers(
         binaryMessenger, getPigeonApiWebSettingsCompat())
+    PigeonApiWebViewFeature.setUpMessageHandlers(binaryMessenger, getPigeonApiWebViewFeature())
   }
 
   fun tearDown() {
@@ -632,6 +639,7 @@ abstract class AndroidWebkitLibraryPigeonProxyApiRegistrar(val binaryMessenger:
     PigeonApiSslCertificate.setUpMessageHandlers(binaryMessenger, null)
     PigeonApiCertificate.setUpMessageHandlers(binaryMessenger, null)
     PigeonApiWebSettingsCompat.setUpMessageHandlers(binaryMessenger, null)
+    PigeonApiWebViewFeature.setUpMessageHandlers(binaryMessenger, null)
   }
 }
 
@@ -738,6 +746,8 @@ private class AndroidWebkitLibraryPigeonProxyApiBaseCodec(
       registrar.getPigeonApiCertificate().pigeon_newInstance(value) {}
     } else if (value is androidx.webkit.WebSettingsCompat) {
       registrar.getPigeonApiWebSettingsCompat().pigeon_newInstance(value) {}
+    } else if (value is androidx.webkit.WebViewFeature) {
+      registrar.getPigeonApiWebViewFeature().pigeon_newInstance(value) {}
     }
 
     when {
@@ -6397,3 +6407,75 @@ abstract class PigeonApiWebSettingsCompat(
   }
 }
 
+@Suppress("UNCHECKED_CAST")
+abstract class PigeonApiWebViewFeature(
+    open val pigeonRegistrar: AndroidWebkitLibraryPigeonProxyApiRegistrar
+) {
+  abstract fun isFeatureSupported(feature: String): Boolean
+
+  companion object {
+    @Suppress("LocalVariableName")
+    fun setUpMessageHandlers(binaryMessenger: BinaryMessenger, api: PigeonApiWebViewFeature?) {
+      val codec = api?.pigeonRegistrar?.codec ?: AndroidWebkitLibraryPigeonCodec()
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.webview_flutter_android.WebViewFeature.isFeatureSupported",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val featureArg = args[0] as String
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.isFeatureSupported(featureArg))
+                } catch (exception: Throwable) {
+                  AndroidWebkitLibraryPigeonUtils.wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+    }
+  }
+
+  @Suppress("LocalVariableName", "FunctionName")
+  /** Creates a Dart instance of WebViewFeature and attaches it to [pigeon_instanceArg]. */
+  fun pigeon_newInstance(
+      pigeon_instanceArg: androidx.webkit.WebViewFeature,
+      callback: (Result<Unit>) -> Unit
+  ) {
+    if (pigeonRegistrar.ignoreCallsToDart) {
+      callback(
+          Result.failure(
+              AndroidWebKitError("ignore-calls-error", "Calls to Dart are being ignored.", "")))
+    } else if (pigeonRegistrar.instanceManager.containsInstance(pigeon_instanceArg)) {
+      callback(Result.success(Unit))
+    } else {
+      val pigeon_identifierArg =
+          pigeonRegistrar.instanceManager.addHostCreatedInstance(pigeon_instanceArg)
+      val binaryMessenger = pigeonRegistrar.binaryMessenger
+      val codec = pigeonRegistrar.codec
+      val channelName =
+          "dev.flutter.pigeon.webview_flutter_android.WebViewFeature.pigeon_newInstance"
+      val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+      channel.send(listOf(pigeon_identifierArg)) {
+        if (it is List<*>) {
+          if (it.size > 1) {
+            callback(
+                Result.failure(
+                    AndroidWebKitError(it[0] as String, it[1] as String, it[2] as String?)))
+          } else {
+            callback(Result.success(Unit))
+          }
+        } else {
+          callback(
+              Result.failure(AndroidWebkitLibraryPigeonUtils.createConnectionError(channelName)))
+        }
+      }
+    }
+  }
+}

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/ProxyApiRegistrar.java

@@ -252,6 +252,12 @@ public FlutterAssetManager getFlutterAssetManager() {
     return flutterAssetManager;
   }
 
+  @NonNull
+  @Override
+  public PigeonApiWebViewFeature getPigeonApiWebViewFeature() {
+    return new WebViewFeatureProxyApi(this);
+  }
+
   @NonNull
   @Override
   public PigeonApiWebSettingsCompat getPigeonApiWebSettingsCompat() {

packages/webview_flutter/webview_flutter_android/pigeons/android_webkit.dart

@@ -1104,3 +1104,13 @@ abstract class WebSettingsCompat {
     bool enabled,
   );
 }
+
+@ProxyApi(
+  kotlinOptions: KotlinProxyApiOptions(
+    fullClassName: 'androidx.webkit.WebViewFeature',
+  ),
+)
+abstract class WebViewFeature {
+  @static
+  bool isFeatureSupported(String feature);
+}