Partially implement PR feedback

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

@@ -123,7 +123,7 @@ public void onProgressChanged(WebView view, int progress) {
     if (params.containsKey(JS_CHANNEL_NAMES_FIELD)) {
       List<String> names = (List<String>) params.get(JS_CHANNEL_NAMES_FIELD);
       if (names != null) {
-        registerJavascriptChannelNames(names);
+        registerJavaScriptChannelNames(names);
       }
     }
 
@@ -245,16 +245,16 @@ public void onMethodCall(MethodCall methodCall, Result result) {
         break;
       case "evaluateJavascript":
       case "runJavascriptReturningResult":
-        evaluateJavascript(methodCall, result, true);
+        evaluateJavaScript(methodCall, result, true);
         break;
       case "runJavascript":
-        evaluateJavascript(methodCall, result, false);
+        evaluateJavaScript(methodCall, result, false);
         break;
       case "addJavascriptChannels":
-        addJavascriptChannels(methodCall, result);
+        addJavaScriptChannels(methodCall, result);
         break;
       case "removeJavascriptChannels":
-        removeJavascriptChannels(methodCall, result);
+        removeJavaScriptChannels(methodCall, result);
         break;
       case "clearCache":
         clearCache(result);
@@ -329,7 +329,7 @@ private void updateSettings(MethodCall methodCall, Result result) {
   }
 
   @TargetApi(Build.VERSION_CODES.KITKAT)
-  private void evaluateJavascript(
+  private void evaluateJavaScript(
       MethodCall methodCall, final Result result, final boolean returnValue) {
     String jsString = (String) methodCall.arguments;
     if (jsString == null) {
@@ -350,14 +350,14 @@ public void onReceiveValue(String value) {
   }
 
   @SuppressWarnings("unchecked")
-  private void addJavascriptChannels(MethodCall methodCall, Result result) {
+  private void addJavaScriptChannels(MethodCall methodCall, Result result) {
     List<String> channelNames = (List<String>) methodCall.arguments;
-    registerJavascriptChannelNames(channelNames);
+    registerJavaScriptChannelNames(channelNames);
     result.success(null);
   }
 
   @SuppressWarnings("unchecked")
-  private void removeJavascriptChannels(MethodCall methodCall, Result result) {
+  private void removeJavaScriptChannels(MethodCall methodCall, Result result) {
     List<String> channelNames = (List<String>) methodCall.arguments;
     for (String channelName : channelNames) {
       webView.removeJavascriptInterface(channelName);
@@ -465,10 +465,10 @@ private void updateAutoMediaPlaybackPolicy(int mode) {
     }
   }
 
-  private void registerJavascriptChannelNames(List<String> channelNames) {
+  private void registerJavaScriptChannelNames(List<String> channelNames) {
     for (String channelName : channelNames) {
       webView.addJavascriptInterface(
-          new JavascriptChannel(methodChannel, channelName, platformThreadHandler), channelName);
+          new JavaScriptChannel(methodChannel, channelName, platformThreadHandler), channelName);
     }
   }
 

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

@@ -17,21 +17,21 @@
  * <p>Exposes a single method named `postMessage` to JavaScript, which sends a message over a method
  * channel to the Dart code.
  */
-class JavascriptChannel {
+class JavaScriptChannel {
   private final MethodChannel methodChannel;
-  private final String javascriptChannelName;
+  private final String javaScriptChannelName;
   private final Handler platformThreadHandler;
 
   /**
    * @param methodChannel the Flutter WebView method channel to which JS messages are sent
-   * @param javascriptChannelName the name of the JavaScript channel, this is sent over the method
+   * @param javaScriptChannelName the name of the JavaScript channel, this is sent over the method
    *     channel with each message to let the Dart code know which JavaScript channel the message
    *     was sent through
    */
-  JavascriptChannel(
-      MethodChannel methodChannel, String javascriptChannelName, Handler platformThreadHandler) {
+  JavaScriptChannel(
+      MethodChannel methodChannel, String javaScriptChannelName, Handler platformThreadHandler) {
     this.methodChannel = methodChannel;
-    this.javascriptChannelName = javascriptChannelName;
+    this.javaScriptChannelName = javaScriptChannelName;
     this.platformThreadHandler = platformThreadHandler;
   }
 
@@ -44,7 +44,7 @@ public void postMessage(final String message) {
           @Override
           public void run() {
             HashMap<String, String> arguments = new HashMap<>();
-            arguments.put("channel", javascriptChannelName);
+            arguments.put("channel", javaScriptChannelName);
             arguments.put("message", message);
             methodChannel.invokeMethod("javascriptChannelMessage", arguments);
           }

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

@@ -72,7 +72,7 @@ public void createWebView_shouldCreateWebViewWithDefaultConfiguration() {
   }
 
   @Test(expected = UnsupportedOperationException.class)
-  public void evaluateJavascript_shouldThrowForNullString() {
+  public void evaluateJavaScript_shouldThrowForNullString() {
     try (MockedStatic<FlutterWebView> mockedFlutterWebView = mockStatic(FlutterWebView.class)) {
       // Setup
       mockedFlutterWebView
@@ -97,7 +97,7 @@ public void apply() throws Throwable {
   }
 
   @Test
-  public void evaluateJavascript_shouldReturnValueOnSuccessForReturnValue() {
+  public void evaluateJavaScript_shouldReturnValueOnSuccessForReturnValue() {
     try (MockedStatic<FlutterWebView> mockedFlutterWebView = mockStatic(FlutterWebView.class)) {
       // Setup
       mockedFlutterWebView
@@ -130,7 +130,7 @@ public void evaluateJavascript_shouldReturnValueOnSuccessForReturnValue() {
   }
 
   @Test
-  public void evaluateJavascript_shouldReturnNilOnSuccessForNoReturnValue() {
+  public void evaluateJavaScript_shouldReturnNilOnSuccessForNoReturnValue() {
     try (MockedStatic<FlutterWebView> mockedFlutterWebView = mockStatic(FlutterWebView.class)) {
       // Setup
       mockedFlutterWebView

packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart

@@ -975,15 +975,15 @@ void main() {
 
       final WebViewController controller = await controllerCompleter.future;
       await pageLoaded.future;
-      final String viewportRectJSON = await _runJavascriptReturningResult(
+      final String viewportRectJSON = await _runJavaScriptReturningResult(
           controller, 'JSON.stringify(viewport.getBoundingClientRect())');
       final Map<String, dynamic> viewportRectRelativeToViewport =
           jsonDecode(viewportRectJSON);
 
       // Check that the input is originally outside of the viewport.
 
       final String initialInputClientRectJSON =
-          await _runJavascriptReturningResult(
+          await _runJavaScriptReturningResult(
               controller, 'JSON.stringify(inputEl.getBoundingClientRect())');
       final Map<String, dynamic> initialInputClientRectRelativeToViewport =
           jsonDecode(initialInputClientRectJSON);
@@ -998,7 +998,7 @@ void main() {
       // Check that focusing the input brought it into view.
 
       final String lastInputClientRectJSON =
-          await _runJavascriptReturningResult(
+          await _runJavaScriptReturningResult(
               controller, 'JSON.stringify(inputEl.getBoundingClientRect())');
       final Map<String, dynamic> lastInputClientRectRelativeToViewport =
           jsonDecode(lastInputClientRectJSON);
@@ -1408,10 +1408,10 @@ String _webviewBool(bool value) {
 
 /// Returns the value used for the HTTP User-Agent: request header in subsequent HTTP requests.
 Future<String> _getUserAgent(WebViewController controller) async {
-  return _runJavascriptReturningResult(controller, 'navigator.userAgent;');
+  return _runJavaScriptReturningResult(controller, 'navigator.userAgent;');
 }
 
-Future<String> _runJavascriptReturningResult(
+Future<String> _runJavaScriptReturningResult(
     WebViewController controller, String js) async {
   return jsonDecode(await controller.runJavascriptReturningResult(js));
 }

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FlutterWebView.m

@@ -5,7 +5,7 @@
 #import "FlutterWebView.h"
 #import "FLTWKNavigationDelegate.h"
 #import "FLTWKProgressionDelegate.h"
-#import "JavascriptChannelHandler.h"
+#import "JavaScriptChannelHandler.h"
 
 @implementation FLTWebViewFactory {
   NSObject<FlutterBinaryMessenger>* _messenger;
@@ -63,7 +63,7 @@ @implementation FLTWebViewController {
   FlutterMethodChannel* _channel;
   NSString* _currentUrl;
   // The set of registered JavaScript channel names.
-  NSMutableSet* _javascriptChannelNames;
+  NSMutableSet* _javaScriptChannelNames;
   FLTWKNavigationDelegate* _navigationDelegate;
   FLTWKProgressionDelegate* _progressionDelegate;
 }
@@ -77,13 +77,13 @@ - (instancetype)initWithFrame:(CGRect)frame
 
     NSString* channelName = [NSString stringWithFormat:@"plugins.flutter.io/webview_%lld", viewId];
     _channel = [FlutterMethodChannel methodChannelWithName:channelName binaryMessenger:messenger];
-    _javascriptChannelNames = [[NSMutableSet alloc] init];
+    _javaScriptChannelNames = [[NSMutableSet alloc] init];
 
     WKUserContentController* userContentController = [[WKUserContentController alloc] init];
     if ([args[@"javascriptChannelNames"] isKindOfClass:[NSArray class]]) {
       NSArray* javaScriptChannelNames = args[@"javascriptChannelNames"];
-      [_javascriptChannelNames addObjectsFromArray:javaScriptChannelNames];
-      [self registerJavascriptChannels:_javascriptChannelNames controller:userContentController];
+      [_javaScriptChannelNames addObjectsFromArray:javaScriptChannelNames];
+      [self registerJavaScriptChannels:_javaScriptChannelNames controller:userContentController];
     }
 
     NSDictionary<NSString*, id>* settings = args[@"settings"];
@@ -156,9 +156,9 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   } else if ([[call method] isEqualToString:@"runJavascriptReturningResult"]) {
     [self onRunJavascriptReturningResult:call result:result];
   } else if ([[call method] isEqualToString:@"addJavascriptChannels"]) {
-    [self onAddJavascriptChannels:call result:result];
+    [self onAddJavaScriptChannels:call result:result];
   } else if ([[call method] isEqualToString:@"removeJavascriptChannels"]) {
-    [self onRemoveJavascriptChannels:call result:result];
+    [self onRemoveJavaScriptChannels:call result:result];
   } else if ([[call method] isEqualToString:@"clearCache"]) {
     [self clearCache:result];
   } else if ([[call method] isEqualToString:@"getTitle"]) {
@@ -229,7 +229,7 @@ - (void)onCurrentUrl:(FlutterMethodCall*)call result:(FlutterResult)result {
 - (void)onEvaluateJavascript:(FlutterMethodCall*)call result:(FlutterResult)result {
   NSString* jsString = [call arguments];
   if (!jsString) {
-    result([FlutterError errorWithCode:@"evaluateJavascript_failed"
+    result([FlutterError errorWithCode:@"evaluateJavaScript_failed"
                                message:@"JavaScript String cannot be null"
                                details:nil]);
     return;
@@ -238,7 +238,7 @@ - (void)onEvaluateJavascript:(FlutterMethodCall*)call result:(FlutterResult)resu
              completionHandler:^(_Nullable id evaluateResult, NSError* _Nullable error) {
                if (error) {
                  result([FlutterError
-                     errorWithCode:@"evaluateJavascript_failed"
+                     errorWithCode:@"evaluateJavaScript_failed"
                            message:@"Failed evaluating JavaScript"
                            details:[NSString stringWithFormat:@"JavaScript string was: '%@'\n%@",
                                                               jsString, error]]);
@@ -248,7 +248,9 @@ - (void)onEvaluateJavascript:(FlutterMethodCall*)call result:(FlutterResult)resu
              }];
 }
 
-- (void)onRunJavascript:(FlutterMethodCall*)call result:(FlutterResult)result {
+- (void)onRunJavascript:(FlutterMethodCall*)call
+                 result:(FlutterResult)result
+        sendReturnValue:(BOOL)sendReturnValue {
   NSString* jsString = [call arguments];
   if (!jsString) {
     result([FlutterError errorWithCode:@"runJavascript_failed"
@@ -258,17 +260,20 @@ - (void)onRunJavascript:(FlutterMethodCall*)call result:(FlutterResult)result {
   }
   [_webView evaluateJavaScript:jsString
              completionHandler:^(_Nullable id evaluateResult, NSError* _Nullable error) {
-               BOOL unsupportedTypeError = false;
-               if (@available(iOS 9, *)) {
-                 unsupportedTypeError =
-                     error && error.code == WKErrorJavaScriptResultTypeIsUnsupported;
+               if (error) {
+                 if (sendReturnValue || (!sendReturnValue && error.code != WKErrorJavaScriptResultTypeIsUnsupported)) {
+                   result([FlutterError
+                       errorWithCode:(sendReturnValue ? @"runJavascriptReturningResult_failed"
+                                                      : @"runJavascript_failed")
+                             message:@"Failed running JavaScript"
+                             details:[NSString stringWithFormat:@"JavaScript string was: '%@'\n%@",
+                                                                jsString, error]]);
+                 } else {
+                   result(nil);
+                 }
                }
-               if (error && !unsupportedTypeError) {
-                 result([FlutterError
-                     errorWithCode:@"runJavascript_failed"
-                           message:@"Failed running JavaScript"
-                           details:[NSString stringWithFormat:@"JavaScript string was: '%@'\n%@",
-                                                              jsString, error]]);
+               if (sendReturnValue) {
+                 result([NSString stringWithFormat:@"%@", evaluateResult]);
                } else {
                  result(nil);
                }
@@ -284,42 +289,34 @@ - (void)onRunJavascriptReturningResult:(FlutterMethodCall*)call result:(FlutterR
     return;
   }
   [_webView evaluateJavaScript:jsString
-             completionHandler:^(_Nullable id evaluateResult, NSError* _Nullable error) {
-               if (error) {
-                 result([FlutterError
-                     errorWithCode:@"runJavascriptReturningResult_failed"
-                           message:@"Failed running JavaScript"
-                           details:[NSString stringWithFormat:@"JavaScript string was: '%@'\n%@",
-                                                              jsString, error]]);
-               } else {
-                 result([NSString stringWithFormat:@"%@", evaluateResult]);
-               }
+             completionHandler:^(_Nullable id evaluateResult, NSError* _Nullable error){
+
              }];
 }
 
-- (void)onAddJavascriptChannels:(FlutterMethodCall*)call result:(FlutterResult)result {
+- (void)onAddJavaScriptChannels:(FlutterMethodCall*)call result:(FlutterResult)result {
   NSArray* channelNames = [call arguments];
   NSSet* channelNamesSet = [[NSSet alloc] initWithArray:channelNames];
-  [_javascriptChannelNames addObjectsFromArray:channelNames];
-  [self registerJavascriptChannels:channelNamesSet
+  [_javaScriptChannelNames addObjectsFromArray:channelNames];
+  [self registerJavaScriptChannels:channelNamesSet
                         controller:_webView.configuration.userContentController];
   result(nil);
 }
 
-- (void)onRemoveJavascriptChannels:(FlutterMethodCall*)call result:(FlutterResult)result {
+- (void)onRemoveJavaScriptChannels:(FlutterMethodCall*)call result:(FlutterResult)result {
   // WkWebView does not support removing a single user script, so instead we remove all
   // user scripts, all message handlers. And re-register channels that shouldn't be removed.
   [_webView.configuration.userContentController removeAllUserScripts];
-  for (NSString* channelName in _javascriptChannelNames) {
+  for (NSString* channelName in _javaScriptChannelNames) {
     [_webView.configuration.userContentController removeScriptMessageHandlerForName:channelName];
   }
 
   NSArray* channelNamesToRemove = [call arguments];
   for (NSString* channelName in channelNamesToRemove) {
-    [_javascriptChannelNames removeObject:channelName];
+    [_javaScriptChannelNames removeObject:channelName];
   }
 
-  [self registerJavascriptChannels:_javascriptChannelNames
+  [self registerJavaScriptChannels:_javaScriptChannelNames
                         controller:_webView.configuration.userContentController];
   result(nil);
 }
@@ -503,11 +500,11 @@ - (bool)loadUrl:(NSString*)url withHeaders:(NSDictionary<NSString*, NSString*>*)
   return true;
 }
 
-- (void)registerJavascriptChannels:(NSSet*)channelNames
+- (void)registerJavaScriptChannels:(NSSet*)channelNames
                         controller:(WKUserContentController*)userContentController {
   for (NSString* channelName in channelNames) {
-    FLTJavascriptChannel* channel =
-        [[FLTJavascriptChannel alloc] initWithMethodChannel:_channel
+    FLTJavaScriptChannel* channel =
+        [[FLTJavaScriptChannel alloc] initWithMethodChannel:_channel
                                       javascriptChannelName:channelName];
     [userContentController addScriptMessageHandler:channel name:channelName];
     NSString* wrapperSource = [NSString

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/JavascriptChannelHandler.h → packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/JavaScriptChannelHandler.h

@@ -7,10 +7,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface FLTJavascriptChannel : NSObject <WKScriptMessageHandler>
+@interface FLTJavaScriptChannelFLTJavaScriptChannel : NSObject <WKScriptMessageHandler>
 
 - (instancetype)initWithMethodChannel:(FlutterMethodChannel*)methodChannel
-                javascriptChannelName:(NSString*)javascriptChannelName;
+                javaScriptChannelName:(NSString*)javaScriptChannelName;
 
 @end