Merge pull request #101 from DreamBuddy/master

add new option to control the contentMode in Android platform
pichillilorenzo · Jun 1, 2019 · c51497b · c51497b
2 parents da99de0 + 499ab2a
commit c51497b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/...oid/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebView.java b/...oid/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebView.java
@@ -191,6 +191,16 @@ else if (options.clearSessionCache)
     if (options.transparentBackground) {
       setBackgroundColor(Color.TRANSPARENT);
     }
+
+    if (!options.mixedContentMode.isEmpty()) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (options.mixedContentMode.equals("MIXED_CONTENT_COMPATIBILITY_MODE")) {
+          settings.setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
+        } else if (options.mixedContentMode.equals("MIXED_CONTENT_ALWAYS_ALLOW")) {
+          settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        }
+      }
+    }
   }
 
   public void loadUrl(String url, MethodChannel.Result result) {
@@ -355,6 +365,16 @@ else if (newOptionsMap.get("clearSessionCache") != null && newOptions.clearSessi
       }
     }
 
+    if (newOptionsMap.get("mixedContentMode") != null && options.mixedContentMode != newOptions.mixedContentMode) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (newOptions.mixedContentMode.equals("MIXED_CONTENT_COMPATIBILITY_MODE")) {
+          settings.setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
+        } else if (newOptions.mixedContentMode.equals("MIXED_CONTENT_ALWAYS_ALLOW")) {
+          settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        }
+      }
+    }
+
     options = newOptions;
   }
 

diff --git a/.../main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewOptions.java b/.../main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewOptions.java
@@ -24,4 +24,5 @@ public class InAppWebViewOptions extends Options {
   public boolean useWideViewPort = true;
   public boolean safeBrowsingEnabled = true;
   public boolean transparentBackground = false;
+  public String mixedContentMode = "MIXED_CONTENT_NEVER_ALLOW";
 }