[webview_flutter]Add the loadRequest method

packages/webview_flutter/webview_flutter/CHANGELOG.md

@@ -1,5 +1,8 @@
-## NEXT
+## 2.1.0
 
+* Add the `loadRequest` method to unify all supported HTTP methods for loading a page with URL 
+that are defined in `WebViewLoadMethod`.
+* Add the `WebViewRequest` class to define parameters that can be used to load a page in `WebView`.
 * Updated Android lint settings.
 
 ## 2.0.12

packages/webview_flutter/webview_flutter/android/build.gradle

@@ -33,6 +33,11 @@ android {
         disable 'InvalidPackage'
         disable 'GradleDependency'
     }
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
+
 
     dependencies {
         implementation 'androidx.annotation:annotation:1.0.0'

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

@@ -9,6 +9,7 @@
 import android.hardware.display.DisplayManager;
 import android.os.Build;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.view.View;
 import android.webkit.WebChromeClient;
@@ -18,6 +19,7 @@
 import android.webkit.WebViewClient;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
+import androidx.core.os.HandlerCompat;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -26,6 +28,9 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class FlutterWebView implements PlatformView, MethodCallHandler {
 
@@ -34,6 +39,9 @@ public class FlutterWebView implements PlatformView, MethodCallHandler {
   private final MethodChannel methodChannel;
   private final FlutterWebViewClient flutterWebViewClient;
   private final Handler platformThreadHandler;
+  private final Handler mainThreadHandler;
+  private final ExecutorService executorService;
+  private final HttpRequestManager httpRequestManager;
 
   // Verifies that a url opened by `Window.open` has a secure url.
   private class FlutterWebChromeClient extends WebChromeClient {
@@ -87,9 +95,9 @@ public void onProgressChanged(WebView view, int progress) {
       final Context context,
       MethodChannel methodChannel,
       Map<String, Object> params,
-      View containerView) {
+      View containerView,
+      DisplayListenerProxy displayListenerProxy) {
 
-    DisplayListenerProxy displayListenerProxy = new DisplayListenerProxy();
     DisplayManager displayManager =
         (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
     displayListenerProxy.onPreWebViewInitialization(displayManager);
@@ -102,6 +110,12 @@ public void onProgressChanged(WebView view, int progress) {
 
     platformThreadHandler = new Handler(context.getMainLooper());
 
+    executorService = Executors.newFixedThreadPool(4);
+
+    mainThreadHandler = HandlerCompat.createAsync(Looper.getMainLooper());
+
+    httpRequestManager = HttpRequestManagerFactory.create(executorService, mainThreadHandler);
+
     this.methodChannel = methodChannel;
     this.methodChannel.setMethodCallHandler(this);
 
@@ -229,6 +243,9 @@ public void onMethodCall(MethodCall methodCall, Result result) {
       case "loadUrl":
         loadUrl(methodCall, result);
         break;
+      case "loadRequest":
+        loadRequest(methodCall, result);
+        break;
       case "updateSettings":
         updateSettings(methodCall, result);
         break;
@@ -282,6 +299,7 @@ public void onMethodCall(MethodCall methodCall, Result result) {
     }
   }
 
+  @Deprecated
   @SuppressWarnings("unchecked")
   private void loadUrl(MethodCall methodCall, Result result) {
     Map<String, Object> request = (Map<String, Object>) methodCall.arguments;
@@ -294,6 +312,65 @@ private void loadUrl(MethodCall methodCall, Result result) {
     result.success(null);
   }
 
+  private void loadRequest(MethodCall methodCall, final Result result) {
+    final WebViewRequest webViewRequest = buildWebViewRequest(methodCall);
+    if (webViewRequest == null) {
+      result.error("missing_args", "Missing arguments", null);
+    } else {
+      switch (webViewRequest.getMethod()) {
+        case GET:
+          webView.loadUrl(webViewRequest.getUrl(), webViewRequest.getHeaders());
+          break;
+        case POST:
+          if (webViewRequest.getHeaders().isEmpty()) {
+            webView.postUrl(webViewRequest.getUrl(), webViewRequest.getBody());
+          } else {
+            // Execute the request manually to be able to provide headers with the post request.
+            httpRequestManager.requestAsync(
+                webViewRequest,
+                new HttpRequestCallback() {
+                  @Override
+                  public void onComplete(String content) {
+                    if (!webView.isAttachedToWindow()) {
+                      result.error(
+                          "webview_destroyed",
+                          "Could not complete the post request because the webview is destroyed",
+                          null);
+                    } else {
+                      webView.loadDataWithBaseURL(
+                          webViewRequest.getUrl(), content, "text/html", "UTF-8", null);
+                    }
+                  }
+
+                  @Override
+                  public void onError(Exception error) {
+                    result.error("request_failed", "HttpURLConnection has failed", null);
+                  }
+                });
+          }
+          break;
+        default:
+          result.error("unsupported_method", "Unsupported HTTP method call", null);
+      }
+      result.success(null);
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  private WebViewRequest buildWebViewRequest(MethodCall methodCall) {
+    Map<String, Object> request = (Map<String, Object>) methodCall.arguments;
+    if (request == null) {
+      return null;
+    }
+
+    Map<String, Object> requestObject = (Map<String, Object>) request.get("request");
+    if (requestObject == null) {
+      return null;
+    }
+
+    return WebViewRequest.fromMap(requestObject);
+  }
+
   private void canGoBack(Result result) {
     result.success(webView.canGoBack());
   }
@@ -482,4 +559,22 @@ public void dispose() {
     }
     webView.destroy();
   }
+
+  /** Factory class for creating a {@link HttpRequestManager} */
+  static class HttpRequestManagerFactory {
+    /**
+     * Creates a {@link HttpRequestManager}.
+     *
+     * <p><strong>Important:</strong> This method is visible for testing purposes only and should
+     * never be called from outside this class.
+     *
+     * @param executor a {@link Executor} to run network request on background thread.
+     * @param resultHandler a {@link Handler} to communicate back with main thread.
+     * @return The new {@link HttpRequestManager} object.
+     */
+    @VisibleForTesting
+    public static HttpRequestManager create(Executor executor, Handler resultHandler) {
+      return new HttpRequestManager(executor, resultHandler);
+    }
+  }
 }

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

@@ -28,6 +28,7 @@ public final class FlutterWebViewFactory extends PlatformViewFactory {
   public PlatformView create(Context context, int id, Object args) {
     Map<String, Object> params = (Map<String, Object>) args;
     MethodChannel methodChannel = new MethodChannel(messenger, "plugins.flutter.io/webview_" + id);
-    return new FlutterWebView(context, methodChannel, params, containerView);
+    DisplayListenerProxy displayListenerProxy = new DisplayListenerProxy();
+    return new FlutterWebView(context, methodChannel, params, containerView, displayListenerProxy);
   }
 }