[webview_flutter] Add support for payment requests on Android

packages/webview_flutter/webview_flutter_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.9.0
+
+* Adds support for the Payment Request API with `AndroidWebViewController.isWebViewFeatureSupported` and `AndroidWebViewController.setPaymentRequestEnabled`.
+
 ## 4.8.2
 
 * Bumps gradle from 8.9.0 to 8.11.1.

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

@@ -567,6 +567,18 @@ abstract class AndroidWebkitLibraryPigeonProxyApiRegistrar(val binaryMessenger:
    */
   abstract fun getPigeonApiCertificate(): PigeonApiCertificate
 
+  /**
+   * An implementation of [PigeonApiWebSettingsCompat] used to add a new Dart instance of
+   * `WebSettingsCompat` to the Dart `InstanceManager`.
+   */
+  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)
@@ -598,6 +610,9 @@ abstract class AndroidWebkitLibraryPigeonProxyApiRegistrar(val binaryMessenger:
         binaryMessenger, getPigeonApiSslCertificateDName())
     PigeonApiSslCertificate.setUpMessageHandlers(binaryMessenger, getPigeonApiSslCertificate())
     PigeonApiCertificate.setUpMessageHandlers(binaryMessenger, getPigeonApiCertificate())
+    PigeonApiWebSettingsCompat.setUpMessageHandlers(
+        binaryMessenger, getPigeonApiWebSettingsCompat())
+    PigeonApiWebViewFeature.setUpMessageHandlers(binaryMessenger, getPigeonApiWebViewFeature())
   }
 
   fun tearDown() {
@@ -623,6 +638,8 @@ abstract class AndroidWebkitLibraryPigeonProxyApiRegistrar(val binaryMessenger:
     PigeonApiSslCertificateDName.setUpMessageHandlers(binaryMessenger, null)
     PigeonApiSslCertificate.setUpMessageHandlers(binaryMessenger, null)
     PigeonApiCertificate.setUpMessageHandlers(binaryMessenger, null)
+    PigeonApiWebSettingsCompat.setUpMessageHandlers(binaryMessenger, null)
+    PigeonApiWebViewFeature.setUpMessageHandlers(binaryMessenger, null)
   }
 }
 
@@ -727,6 +744,10 @@ private class AndroidWebkitLibraryPigeonProxyApiBaseCodec(
       registrar.getPigeonApiSslCertificate().pigeon_newInstance(value) {}
     } else if (value is java.security.cert.Certificate) {
       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 {
@@ -6310,3 +6331,151 @@ abstract class PigeonApiCertificate(
     }
   }
 }
+
+@Suppress("UNCHECKED_CAST")
+abstract class PigeonApiWebSettingsCompat(
+    open val pigeonRegistrar: AndroidWebkitLibraryPigeonProxyApiRegistrar
+) {
+  abstract fun setPaymentRequestEnabled(webSettings: android.webkit.WebSettings, enabled: Boolean)
+
+  companion object {
+    @Suppress("LocalVariableName")
+    fun setUpMessageHandlers(binaryMessenger: BinaryMessenger, api: PigeonApiWebSettingsCompat?) {
+      val codec = api?.pigeonRegistrar?.codec ?: AndroidWebkitLibraryPigeonCodec()
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.webview_flutter_android.WebSettingsCompat.setPaymentRequestEnabled",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val webSettingsArg = args[0] as android.webkit.WebSettings
+            val enabledArg = args[1] as Boolean
+            val wrapped: List<Any?> =
+                try {
+                  api.setPaymentRequestEnabled(webSettingsArg, enabledArg)
+                  listOf(null)
+                } catch (exception: Throwable) {
+                  AndroidWebkitLibraryPigeonUtils.wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+    }
+  }
+
+  @Suppress("LocalVariableName", "FunctionName")
+  /** Creates a Dart instance of WebSettingsCompat and attaches it to [pigeon_instanceArg]. */
+  fun pigeon_newInstance(
+      pigeon_instanceArg: androidx.webkit.WebSettingsCompat,
+      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.WebSettingsCompat.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)))
+        }
+      }
+    }
+  }
+}
+
+@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

@@ -251,4 +251,16 @@ public void setContext(@NonNull Context context) {
   public FlutterAssetManager getFlutterAssetManager() {
     return flutterAssetManager;
   }
+
+  @NonNull
+  @Override
+  public PigeonApiWebViewFeature getPigeonApiWebViewFeature() {
+    return new WebViewFeatureProxyApi(this);
+  }
+
+  @NonNull
+  @Override
+  public PigeonApiWebSettingsCompat getPigeonApiWebSettingsCompat() {
+    return new WebSettingsCompatProxyApi(this);
+  }
 }

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

@@ -0,0 +1,28 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.webviewflutter;
+
+import android.webkit.WebSettings;
+import androidx.annotation.NonNull;
+import androidx.webkit.WebSettingsCompat;
+import androidx.webkit.WebViewFeature;
+
+/**
+ * Host api implementation for {@link WebSettingsCompat}.
+ *
+ * <p>Handles static methods for {@link WebSettingsCompat}.
+ */
+public class WebSettingsCompatProxyApi extends PigeonApiWebSettingsCompat {
+  public WebSettingsCompatProxyApi(@NonNull ProxyApiRegistrar pigeonRegistrar) {
+    super(pigeonRegistrar);
+  }
+
+  @Override
+  public void setPaymentRequestEnabled(@NonNull WebSettings webSettings, boolean enabled) {
+    if (WebViewFeature.isFeatureSupported(WebViewFeature.PAYMENT_REQUEST)) {
+      WebSettingsCompat.setPaymentRequestEnabled(webSettings, enabled);
+    }
+  }
+}

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

@@ -0,0 +1,24 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.webviewflutter;
+
+import androidx.annotation.NonNull;
+import androidx.webkit.WebViewFeature;
+
+/**
+ * Host api implementation for {@link WebViewFeature}.
+ *
+ * <p>Handles creating {@link WebViewFeature}s that intercommunicate with a paired Dart object.
+ */
+public class WebViewFeatureProxyApi extends PigeonApiWebViewFeature {
+  public WebViewFeatureProxyApi(@NonNull ProxyApiRegistrar pigeonRegistrar) {
+    super(pigeonRegistrar);
+  }
+
+  @Override
+  public boolean isFeatureSupported(@NonNull String feature) {
+    return WebViewFeature.isFeatureSupported(feature);
+  }
+}

packages/webview_flutter/webview_flutter_android/android/src/test/java/io/flutter/plugins/webviewflutter/WebSettingsCompatTest.java

@@ -0,0 +1,63 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.webviewflutter;
+
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.never;
+
+import android.webkit.WebSettings;
+import androidx.webkit.WebSettingsCompat;
+import androidx.webkit.WebViewFeature;
+import org.junit.Test;
+import org.mockito.MockedStatic;
+
+public class WebSettingsCompatTest {
+  @Test
+  public void setPaymentRequestEnabled_PAYMENT_REQUEST_is_supported() {
+    final PigeonApiWebSettingsCompat api =
+        new TestProxyApiRegistrar().getPigeonApiWebSettingsCompat();
+
+    final WebSettings webSettings = mock(WebSettings.class);
+
+    try (MockedStatic<WebSettingsCompat> mockedStatic = mockStatic(WebSettingsCompat.class)) {
+      try (MockedStatic<WebViewFeature> mockedWebViewFeature = mockStatic(WebViewFeature.class)) {
+        mockedWebViewFeature
+            .when(() -> WebViewFeature.isFeatureSupported(WebViewFeature.PAYMENT_REQUEST))
+            .thenReturn(true);
+        api.setPaymentRequestEnabled(webSettings, true);
+        mockedStatic.verify(() -> WebSettingsCompat.setPaymentRequestEnabled(webSettings, true));
+      } catch (Exception e) {
+        fail(e.toString());
+      }
+    } catch (Exception e) {
+      fail(e.toString());
+    }
+  }
+
+  @Test
+  public void setPaymentRequestEnabled_PAYMENT_REQUEST_is_NOT_supported() {
+    final PigeonApiWebSettingsCompat api =
+        new TestProxyApiRegistrar().getPigeonApiWebSettingsCompat();
+
+    final WebSettings webSettings = mock(WebSettings.class);
+
+    try (MockedStatic<WebSettingsCompat> mockedStatic = mockStatic(WebSettingsCompat.class)) {
+      try (MockedStatic<WebViewFeature> mockedWebViewFeature = mockStatic(WebViewFeature.class)) {
+        mockedWebViewFeature
+            .when(() -> WebViewFeature.isFeatureSupported(WebViewFeature.PAYMENT_REQUEST))
+            .thenReturn(false);
+        api.setPaymentRequestEnabled(webSettings, true);
+        mockedStatic.verify(
+            () -> WebSettingsCompat.setPaymentRequestEnabled(webSettings, true), never());
+      } catch (Exception e) {
+        fail(e.toString());
+      }
+    } catch (Exception e) {
+      fail(e.toString());
+    }
+  }
+}

packages/webview_flutter/webview_flutter_android/android/src/test/java/io/flutter/plugins/webviewflutter/WebViewFeatureTest.java

@@ -0,0 +1,54 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.webviewflutter;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mockStatic;
+
+import androidx.webkit.WebViewFeature;
+import org.junit.Test;
+import org.mockito.MockedStatic;
+
+public class WebViewFeatureTest {
+  @Test
+  public void isFeatureSupported() {
+    final PigeonApiWebViewFeature api = new TestProxyApiRegistrar().getPigeonApiWebViewFeature();
+
+    try (MockedStatic<WebViewFeature> mockedStatic = mockStatic(WebViewFeature.class)) {
+      mockedStatic
+          .when(() -> WebViewFeature.isFeatureSupported("PAYMENT_REQUEST"))
+          .thenReturn(true);
+
+      boolean result = api.isFeatureSupported("PAYMENT_REQUEST");
+
+      assertTrue(result);
+
+      mockedStatic.verify(() -> WebViewFeature.isFeatureSupported("PAYMENT_REQUEST"));
+    } catch (Exception e) {
+      fail(e.toString());
+    }
+  }
+
+  @Test
+  public void isFeatureSupportedReturnsFalse() {
+    final PigeonApiWebViewFeature api = new TestProxyApiRegistrar().getPigeonApiWebViewFeature();
+
+    try (MockedStatic<WebViewFeature> mockedStatic = mockStatic(WebViewFeature.class)) {
+      mockedStatic
+          .when(() -> WebViewFeature.isFeatureSupported("UNSUPPORTED_FEATURE"))
+          .thenReturn(false);
+
+      boolean result = api.isFeatureSupported("UNSUPPORTED_FEATURE");
+
+      assertFalse(result);
+
+      mockedStatic.verify(() -> WebViewFeature.isFeatureSupported("UNSUPPORTED_FEATURE"));
+    } catch (Exception e) {
+      fail(e.toString());
+    }
+  }
+}