[webview_flutter] Update webview packages for Android and iOS to implement runJavascript and runJavascriptReturningResult.

packages/webview_flutter/webview_flutter_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.0
+
+* Implemented new `runJavascript` and `runJavascriptReturningResult` methods in platform interface.
+
 ## 2.1.0
 
 * Add `zoomEnabled` functionality.

packages/webview_flutter/webview_flutter_android/android/build.gradle

@@ -58,4 +58,8 @@ android {
             }
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }

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

@@ -245,7 +245,11 @@ public void onMethodCall(MethodCall methodCall, Result result) {
         currentUrl(result);
         break;
       case "evaluateJavascript":
-        evaluateJavaScript(methodCall, result);
+      case "runJavascriptReturningResult":
+        evaluateJavaScript(methodCall, result, true);
+        break;
+      case "runJavascript":
+        evaluateJavaScript(methodCall, result, false);
         break;
       case "addJavascriptChannels":
         addJavaScriptChannels(methodCall, result);
@@ -326,7 +330,8 @@ private void updateSettings(MethodCall methodCall, Result result) {
   }
 
   @TargetApi(Build.VERSION_CODES.KITKAT)
-  private void evaluateJavaScript(MethodCall methodCall, final Result result) {
+  private void evaluateJavaScript(
+      MethodCall methodCall, final Result result, final boolean returnValue) {
     String jsString = (String) methodCall.arguments;
     if (jsString == null) {
       throw new UnsupportedOperationException("JavaScript string cannot be null");
@@ -336,7 +341,11 @@ private void evaluateJavaScript(MethodCall methodCall, final Result result) {
         new android.webkit.ValueCallback<String>() {
           @Override
           public void onReceiveValue(String value) {
-            result.success(value);
+            if (returnValue) {
+              result.success(value);
+            } else {
+              result.success(null);
+            }
           }
         });
   }

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

@@ -6,31 +6,46 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.content.Context;
 import android.webkit.DownloadListener;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.MockedStatic;
 
 public class FlutterWebViewTest {
   private WebChromeClient mockWebChromeClient;
   private DownloadListener mockDownloadListener;
   private WebViewBuilder mockWebViewBuilder;
   private WebView mockWebView;
+  private MethodChannel.Result mockResult;
+  private Context mockContext;
+  private MethodChannel mockMethodChannel;
 
   @Before
   public void before() {
+
     mockWebChromeClient = mock(WebChromeClient.class);
     mockWebViewBuilder = mock(WebViewBuilder.class);
     mockWebView = mock(WebView.class);
     mockDownloadListener = mock(DownloadListener.class);
+    mockResult = mock(MethodChannel.Result.class);
+    mockContext = mock(Context.class);
+    mockMethodChannel = mock(MethodChannel.class);
 
     when(mockWebViewBuilder.setDomStorageEnabled(anyBoolean())).thenReturn(mockWebViewBuilder);
     when(mockWebViewBuilder.setJavaScriptCanOpenWindowsAutomatically(anyBoolean()))
@@ -42,12 +57,11 @@ public void before() {
         .thenReturn(mockWebViewBuilder);
     when(mockWebViewBuilder.setDownloadListener(any(DownloadListener.class)))
         .thenReturn(mockWebViewBuilder);
-
     when(mockWebViewBuilder.build()).thenReturn(mockWebView);
   }
 
   @Test
-  public void createWebView_should_create_webview_with_default_configuration() {
+  public void createWebView_shouldCreateWebViewWithDefaultConfiguration() {
     FlutterWebView.createWebView(
         mockWebViewBuilder, createParameterMap(false), mockWebChromeClient, mockDownloadListener);
 
@@ -59,6 +73,97 @@ public void createWebView_should_create_webview_with_default_configuration() {
     verify(mockWebViewBuilder, times(1)).setZoomControlsEnabled(true);
   }
 
+  @Test(expected = UnsupportedOperationException.class)
+  public void evaluateJavaScript_shouldThrowForNullString() {
+    try (MockedStatic<FlutterWebView> mockedFlutterWebView = mockStatic(FlutterWebView.class)) {
+      // Setup
+      mockedFlutterWebView
+          .when(
+              new MockedStatic.Verification() {
+                @Override
+                public void apply() throws Throwable {
+                  FlutterWebView.createWebView(
+                      (WebViewBuilder) any(),
+                      (Map<String, Object>) any(),
+                      (WebChromeClient) any(),
+                      (DownloadListener) any());
+                }
+              })
+          .thenReturn(mockWebView);
+      FlutterWebView flutterWebView =
+          new FlutterWebView(mockContext, mockMethodChannel, new HashMap<String, Object>(), null);
+
+      // Run
+      flutterWebView.onMethodCall(new MethodCall("runJavascript", null), mockResult);
+    }
+  }
+
+  @Test
+  public void evaluateJavaScript_shouldReturnValueOnSuccessForReturnValue() {
+    try (MockedStatic<FlutterWebView> mockedFlutterWebView = mockStatic(FlutterWebView.class)) {
+      // Setup
+      mockedFlutterWebView
+          .when(
+              () ->
+                  FlutterWebView.createWebView(
+                      (WebViewBuilder) any(),
+                      (Map<String, Object>) any(),
+                      (WebChromeClient) any(),
+                      (DownloadListener) any()))
+          .thenReturn(mockWebView);
+      doAnswer(
+              invocation -> {
+                android.webkit.ValueCallback<String> callback = invocation.getArgument(1);
+                callback.onReceiveValue("Test JavaScript Result");
+                return null;
+              })
+          .when(mockWebView)
+          .evaluateJavascript(eq("Test JavaScript String"), any());
+      FlutterWebView flutterWebView =
+          new FlutterWebView(mockContext, mockMethodChannel, new HashMap<String, Object>(), null);
+
+      // Run
+      flutterWebView.onMethodCall(
+          new MethodCall("runJavascriptReturningResult", "Test JavaScript String"), mockResult);
+
+      // Verify
+      verify(mockResult, times(1)).success("Test JavaScript Result");
+    }
+  }
+
+  @Test
+  public void evaluateJavaScript_shouldReturnNilOnSuccessForNoReturnValue() {
+    try (MockedStatic<FlutterWebView> mockedFlutterWebView = mockStatic(FlutterWebView.class)) {
+      // Setup
+      mockedFlutterWebView
+          .when(
+              () ->
+                  FlutterWebView.createWebView(
+                      (WebViewBuilder) any(),
+                      (Map<String, Object>) any(),
+                      (WebChromeClient) any(),
+                      (DownloadListener) any()))
+          .thenReturn(mockWebView);
+      doAnswer(
+              invocation -> {
+                android.webkit.ValueCallback<String> callback = invocation.getArgument(1);
+                callback.onReceiveValue("Test JavaScript Result");
+                return null;
+              })
+          .when(mockWebView)
+          .evaluateJavascript(eq("Test JavaScript String"), any());
+      FlutterWebView flutterWebView =
+          new FlutterWebView(mockContext, mockMethodChannel, new HashMap<String, Object>(), null);
+
+      // Run
+      flutterWebView.onMethodCall(
+          new MethodCall("runJavascript", "Test JavaScript String"), mockResult);
+
+      // Verify
+      verify(mockResult, times(1)).success(isNull());
+    }
+  }
+
   private Map<String, Object> createParameterMap(boolean usesHybridComposition) {
     Map<String, Object> params = new HashMap<>();
     params.put("usesHybridComposition", usesHybridComposition);