From 098dec5a013e96fd3963f994eecf3b28f44b13a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Gerlei?= <gerlotdev@gmail.com>
Date: Wed, 31 Jul 2024 00:03:04 +0200
Subject: [PATCH 1/3] Fix opaque origin demo (#24)

* Load example.com in opaque origin demo and slightly improve success display

* Only block data URIs in loadUrl so opaque origin demo works again
---
 .../main/java/dev/gerlot/securewebview/SecureWebView.java | 8 ++++----
 sample/src/main/assets/same_origin_test.html              | 4 ++--
 .../securewebview/sample/demos/OpaqueOriginFragment.kt    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/src/main/java/dev/gerlot/securewebview/SecureWebView.java b/library/src/main/java/dev/gerlot/securewebview/SecureWebView.java
index 9295a9f..e75b297 100644
--- a/library/src/main/java/dev/gerlot/securewebview/SecureWebView.java
+++ b/library/src/main/java/dev/gerlot/securewebview/SecureWebView.java
@@ -222,15 +222,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;
         }
 
@@ -309,7 +309,7 @@ public boolean getAllowContentAccess() {
         return webView.getSettings().getAllowContentAccess();
     }
 
-    public void loadDataWithBaseURL(String baseUrl,String data, String mimeType, String encoding, String historyUrl) {
+    public void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, String historyUrl) {
         webView.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl);
     }
 
diff --git a/sample/src/main/assets/same_origin_test.html b/sample/src/main/assets/same_origin_test.html
index 8f4c42a..f3ab8c1 100644
--- 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
index 242fe32..56838c7 100644
--- 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)
         }
     }
 

From b88dc95eefbc8b326d4aed003dc55bba75692916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bala=CC=81zs=20Gerlei?= <gerlotdev@gmail.com>
Date: Thu, 8 Aug 2024 09:07:57 +0200
Subject: [PATCH 2/3] Version bump

---
 library/build.gradle | 2 +-
 sample/build.gradle  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/build.gradle b/library/build.gradle
index b37f34f..085a54c 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -51,7 +51,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'dev.gerlot.securewebview'
                 artifactId = 'securewebview'
-                version = '1.0.0-alpha03'
+                version = '1.0.0-alpha04'
             }
         }
     }
diff --git a/sample/build.gradle b/sample/build.gradle
index e2fab9e..9bb162d 100644
--- 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"
     }

From bfe1a14e1c92c36b10078e931c9e88fb67e2c56e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Gerlei?= <gerlotdev@gmail.com>
Date: Thu, 8 Aug 2024 09:32:44 +0200
Subject: [PATCH 3/3] Update README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8a31fcd..b4a68c9 100644
--- 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'
 	}