Processed PR feedback

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

@@ -86,8 +86,7 @@ public void onProgressChanged(WebView view, int progress) {
   @SuppressWarnings("unchecked")
   FlutterWebView(
       final Context context,
-      BinaryMessenger messenger,
-      int id,
+      MethodChannel methodChannel,
       Map<String, Object> params,
       View containerView) {
 
@@ -104,7 +103,8 @@ public void onProgressChanged(WebView view, int progress) {
 
     platformThreadHandler = new Handler(context.getMainLooper());
 
-    methodChannel = createMethodChannel(messenger, id, this);
+    this.methodChannel = methodChannel;
+    this.methodChannel.setMethodCallHandler(this);
 
     flutterWebViewClient = new FlutterWebViewClient(methodChannel);
     Map<String, Object> settings = (Map<String, Object>) params.get("settings");
@@ -158,7 +158,7 @@ public void onProgressChanged(WebView view, int progress) {
   @VisibleForTesting
   static WebView createWebView(
       WebViewBuilder webViewBuilder, Map<String, Object> params, WebChromeClient webChromeClient) {
-    Boolean usesHybridComposition = (Boolean) params.get("usesHybridComposition");
+    boolean usesHybridComposition = Boolean.TRUE.equals(params.get("usesHybridComposition"));
     webViewBuilder
         .setUsesHybridComposition(usesHybridComposition)
         .setDomStorageEnabled(true) // Always enable DOM storage API.
@@ -171,30 +171,6 @@ static WebView createWebView(
     return webViewBuilder.build();
   }
 
-  /**
-   * Creates a {@link MethodChannel} used to handle communication with the Flutter application about
-   * the {@link FlutterWebView} instance.
-   *
-   * <p><strong>Important:</strong> This method is visible for testing purposes only and should
-   * never be called from outside this class.
-   *
-   * @param messenger a {@link BinaryMessenger} to facilitate communication with Flutter.
-   * @param id an identifier used to create a unique channel name and identify communication with a
-   *     particular {@link FlutterWebView} instance.
-   * @param handler a {@link MethodCallHandler} responsible for handling messages that arrive from
-   *     the Flutter application.
-   * @return The {@link MethodChannel} configured using the supplied {@link BinaryMessenger} and
-   *     {@link MethodCallHandler}.
-   */
-  @VisibleForTesting
-  static MethodChannel createMethodChannel(
-      BinaryMessenger messenger, int id, MethodCallHandler handler) {
-    MethodChannel methodChannel = new MethodChannel(messenger, "plugins.flutter.io/webview_" + id);
-    methodChannel.setMethodCallHandler(handler);
-
-    return methodChannel;
-  }
-
   @Override
   public View getView() {
     return webView;

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

@@ -7,6 +7,7 @@
 import android.content.Context;
 import android.view.View;
 import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.StandardMessageCodec;
 import io.flutter.plugin.platform.PlatformView;
 import io.flutter.plugin.platform.PlatformViewFactory;
@@ -26,6 +27,7 @@ public final class FlutterWebViewFactory extends PlatformViewFactory {
   @Override
   public PlatformView create(Context context, int id, Object args) {
     Map<String, Object> params = (Map<String, Object>) args;
-    return new FlutterWebView(context, messenger, id, params, containerView);
+    MethodChannel methodChannel = new MethodChannel(messenger, "plugins.flutter.io/webview_" + id);
+    return new FlutterWebView(context, methodChannel, params, containerView);
   }
 }

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

@@ -10,6 +10,7 @@
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /** Builder used to create {@link android.webkit.WebView} objects. */
 public class WebViewBuilder {
@@ -116,7 +117,7 @@ public WebViewBuilder setUsesHybridComposition(boolean flag) {
    * @param webChromeClient an implementation of WebChromeClient This value may be null.
    * @return This builder. This value cannot be {@code null}.
    */
-  public WebViewBuilder setWebChromeClient(WebChromeClient webChromeClient) {
+  public WebViewBuilder setWebChromeClient(@Nullable WebChromeClient webChromeClient) {
     this.webChromeClient = webChromeClient;
     return this;
   }

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

@@ -78,4 +78,23 @@ public void build_should_set_values() throws IOException {
     verify(mockWebSettings).setSupportMultipleWindows(true);
     verify(mockWebView).setWebChromeClient(mockWebChromeClient);
   }
+
+  @Test
+  public void build_should_use_default_values() throws IOException {
+    WebSettings mockWebSettings = mock(WebSettings.class);
+    WebChromeClient mockWebChromeClient = mock(WebChromeClient.class);
+
+    when(mockWebView.getSettings()).thenReturn(mockWebSettings);
+
+    WebViewBuilder builder =
+        new WebViewBuilder(mockContext, mockContainerView);
+
+    WebView webView = builder.build();
+
+    assertNotNull(webView);
+    verify(mockWebSettings).setDomStorageEnabled(false);
+    verify(mockWebSettings).setJavaScriptCanOpenWindowsAutomatically(false);
+    verify(mockWebSettings).setSupportMultipleWindows(false);
+    verify(mockWebView).setWebChromeClient(null);
+  }
 }