[webview_flutter_wkwebview] Fix crash when calling setOnConsoleMessage multiple times #10922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

rickhohler wants to merge 7 commits into flutter:main from rickhohler:fix/webview-console-crash

-Original file line number
+Diff line change
@@ -1,3 +1,7 @@
+    ## 3.23.7
+    * Fixes crash when calling setOnConsoleMessage multiple times.
     ## 3.23.6
     * Fixes a crash if WebViewFlutterWKWebViewExternalAPI is passed the wrong registry.
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
       @override
       Future<void> setOnConsoleMessage(
         void Function(JavaScriptConsoleMessage consoleMessage) onConsoleMessage,
-      ) {
+      ) async {
         _onConsoleMessageCallback = onConsoleMessage;
         final JavaScriptChannelParams channelParams = WebKitJavaScriptChannelParams(
@@ Expand Down Expand Up @@
           },
         );
-        addJavaScriptChannel(channelParams);
+        // If fltConsoleMessage is already present, the callback is already registered.
+        if (_javaScriptChannelParams.containsKey('fltConsoleMessage')) {
+          return;
+        }
+        await addJavaScriptChannel(channelParams);
         return _injectConsoleOverride();
       }
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: webview_flutter_wkwebview @@
     description: A Flutter plugin that provides a WebView widget based on Apple's WKWebView control.
     repository: https://github.com/flutter/packages/tree/main/packages/webview_flutter/webview_flutter_wkwebview
     issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22
-    version: 3.23.6
+    version: 3.23.7
     environment:
       sdk: ^3.9.0
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -1815,6 +1815,26 @@ window.addEventListener("error", function(e) { @@
             expect(logs[JavaScriptLogLevel.log], 'Log message');
             expect(logs[JavaScriptLogLevel.warning], 'Warning message');
           });
+          test('setOnConsoleMessage called twice does not throw', () async {
+            final mockUserContentController = MockWKUserContentController();
+            final WebKitWebViewController controller = createControllerWithMocks(
+              mockUserContentController: mockUserContentController,
+            );
+            await controller.setOnConsoleMessage(
+              (JavaScriptConsoleMessage message) {},
+            );
+            await controller.setOnConsoleMessage(
+              (JavaScriptConsoleMessage message) {},
+            );
+            verifyNever(
+              mockUserContentController.removeScriptMessageHandler(
+                'fltConsoleMessage',
+              ),
+            );
+          });
         });
         test('setOnCanGoBackChange', () async {
@@ Expand Down @@

Provide feedback