Merge branch 'main' into 18-url-matching-abstraction

balazsgerlei · Aug 9, 2024 · f75dab4 · f75dab4
2 parents 825577a + bfe1a14
commit f75dab4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,6 @@ Android WebView wrapper with secure defaults to avoid security issues caused by
 
 Still under heavy development, breaking API changes are expected!
 
-
 ## Setup
 
 The library is currently hosted on `jitpack.io`. You can add it as a depenency to your project:
@@ -29,7 +28,7 @@ Add it in your root `build.gradle` at the end of repositories:
 Step 2. Add the dependency
 
 	dependencies {
-	        implementation 'com.github.balazsgerlei:SecureWebView:1.0.0-alpha03'
+	        implementation 'com.github.balazsgerlei:SecureWebView:1.0.0-alpha04'
 	}
 
 
diff --git a/library/build.gradle b/library/build.gradle
@@ -52,7 +52,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'dev.gerlot.securewebview'
                 artifactId = 'securewebview'
-                version = '1.0.0-alpha03'
+                version = '1.0.0-alpha04'
             }
         }
     }

diff --git a/library/src/main/java/dev/gerlot/securewebview/SecureWebView.java b/library/src/main/java/dev/gerlot/securewebview/SecureWebView.java
@@ -178,15 +178,15 @@ private void init(final Context context) {
     }
 
     private boolean shouldBlockRequest(final Uri uri) {
-        return shouldBlockRequest(uri, false, false);
+        return shouldBlockRequest(uri, true, false);
     }
 
-    private boolean shouldBlockRequest(final Uri uri, boolean allowDataUrl, boolean allowJavaScript) {
+    private boolean shouldBlockRequest(final Uri uri, boolean allowDataUri, boolean allowJavaScript) {
         if ("http".equals(uri.getScheme())) {
             return true;
         }
 
-        if (!allowDataUrl && "data".equals(uri.getScheme())) {
+        if (!allowDataUri && "data".equals(uri.getScheme())) {
             return true;
         }
 

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "dev.gerlot.securewebview.sample"
         minSdk 21
         targetSdk 34
-        versionCode 3
-        versionName "1.0.0-alpha03"
+        versionCode 4
+        versionName "1.0.0-alpha04"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/sample/src/main/assets/same_origin_test.html b/sample/src/main/assets/same_origin_test.html
@@ -11,9 +11,9 @@ <h1 id="fetch-status"></h1>
     <script>
       const status = document.getElementById('fetch-status');
 
-      fetch('https://www.google.com')
+      fetch('https://www.example.com')
         .then(response => {
-          status.innerText = response.status;
+          status.innerText = `Status: ${response.status}`;
         })
         .catch(error => {
           status.innerText = error;

diff --git a/sample/src/main/java/dev/gerlot/securewebview/sample/demos/OpaqueOriginFragment.kt b/sample/src/main/java/dev/gerlot/securewebview/sample/demos/OpaqueOriginFragment.kt
@@ -62,7 +62,7 @@ class OpaqueOriginFragment: Fragment(), SecurableWebViewFragment {
         if (webViewSecureState == WebViewSecureState.INSECURE) {
             binding.insecureWebView.loadData(Base64.encode(data.toByteArray()), "text/html", "base64")
         } else {
-            binding.secureWebView.loadDataWithBaseURL("https://www.google.com", data, "text/html", "UTF-8", null)
+            binding.secureWebView.loadDataWithBaseURL("https://www.example.com", data, "text/html", "UTF-8", null)
         }
     }