1. updated: resolved issue of ignoring allowHTTPSMixedContent setting

2. updated: resolved issue with setUserAgent() method call (the change in user agent may break existing app compatibility, see setDefaultUserAgentWithSuffix() method) Signed-off-by: Jack Cheung <[email protected]>
101medialab · Aug 5, 2016 · c6581f4 · c6581f4
1 parent 11f4632
commit c6581f4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Project-wide Gradle settings.
-VERSION_NAME=1.4.7
-VERSION_CODE=38
+VERSION_NAME=1.4.8
+VERSION_CODE=39
 GROUP=com.hkm.ezwebview
 PUBLISH_GROUP_ID=com.hkm.ezwebview
 POM_DESCRIPTION=A mini elegant webview for fast easy access

diff --git a/library/src/main/java/com/hkm/ezwebview/Util/Fx9C.java b/library/src/main/java/com/hkm/ezwebview/Util/Fx9C.java
@@ -677,7 +677,7 @@ public Fx9C setProgressBar(CircleProgressBar progressBar) {
         return this;
     }
 
-    public Fx9C setDefaultUserWithSuffix(String suffix) {
+    public Fx9C setDefaultUserAgentWithSuffix(String suffix) {
         this.userAgent = String.format("%s %s", WebSettings.getDefaultUserAgent(context), suffix);
         return this;
     }
@@ -761,7 +761,13 @@ protected void updateWebViewSettings() {
 
         WebSettings settings = this.webView.getSettings();
         if (userAgent != null) {
-            settings.setUserAgentString(String.format("%s %s", settings.getUserAgentString(), userAgent));
+            settings.setUserAgentString(userAgent);
+        }
+
+        if (allowHTTPSMixedContent) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+            }
         }
 
         settings.setJavaScriptEnabled(isJavaScriptEnabled);