acsbendi · maxeoneo · Jan 26, 2026 · Jan 13, 2026 · Jan 20, 2026 · Jan 13, 2026
diff --git a/README.md b/README.md
@@ -52,6 +52,29 @@ To manually process requests:
     }
 ```
 
+For both cases you can choose between different strategies for how the recorded requests (including 
+the body) and the intercepted requests are matched together. By default, only the url is used. If 
+you want to use a different strategy, for example if you have parallel requests to the same url with
+different bodies (e.g. GraphQL queries), you can pass a custom `RequestMatcher` to the constructor 
+of `RequestInspectorWebViewClient`:
+
+```kotlin
+    val webView = WebView(this)
+    webView.webViewClient = RequestInspectorWebViewClient(
+        webView,
+        matcher = RequestGeneratedUuidInHeaderMatcher()
+    )
+```
+
+Currently available matchers are `GeneratedUuidInHeaderRequestMatcher` and 
+`GeneratedUuidInUrlRequestMatcher`, which both create an UUID and add it to the request before it's 
+recorded and sent from JavaScript. They only differ by how they attach the UUID to the request, as 
+an additional header or as an additional query param. But both clean up the request when it's 
+intecepted on native side, so before it's really sent out to the target. 
+
+If you want to implement your own matching strategy, you can implement the `RequestMatcher` 
+interface and pass an instance of it to the constructor of `RequestInspectorWebViewClient`.
+
 Known limitations
 ===
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,14 +10,19 @@ group = "com.acsbendi"
 version = currentVersion
 
 android {
-    compileSdk = 31
+    compileSdk = 36
     namespace = "com.acsbendi.requestinspectorwebview"
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 31
-
+        testOptions {
+            targetSdk = 36
+        }
+        lint {
+            targetSdk = 36
+        }
         version = currentVersion
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -28,8 +33,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     publishing {
@@ -39,6 +44,10 @@ android {
     }
 }
 
+kotlin {
+    jvmToolchain(21)
+}
+
 publishing {
     publications {
         register<MavenPublication>("release") {
@@ -52,3 +61,11 @@ publishing {
         }
     }
 }
+
+dependencies {
+    implementation("androidx.core:core-ktx:1.17.0")
+
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test:runner:1.5.2")
+    androidTestImplementation("androidx.test:rules:1.5.0")
+}
diff --git a/app/src/androidTest/assets/test_page.html b/app/src/androidTest/assets/test_page.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <script src="test_requests.js"></script>
+</head>
+<body>
+    <form id="formGet" action="https://example.com/form-get" method="GET">
+        <input type="text" name="query" value="hello">
+        <input type="hidden" name="source" value="test">
+    </form>
+
+    <form id="formPostUrlEncoded" action="https://example.com/form-post-urlencoded" method="POST"
+          enctype="application/x-www-form-urlencoded">
+        <input type="text" name="username" value="testuser">
+        <input type="password" name="password" value="secret123">
+    </form>
+
+    <form id="formPostMultipart" action="https://example.com/form-post-multipart" method="POST"
+          enctype="multipart/form-data">
+        <input type="text" name="field1" value="value1">
+        <input type="text" name="field2" value="value2">
+    </form>
+
+    <form id="formPostPlainText" action="https://example.com/form-post-plaintext" method="POST"
+          enctype="text/plain">
+        <input type="text" name="message" value="hello world">
+    </form>
+</body>
+</html>
diff --git a/app/src/androidTest/assets/test_requests.js b/app/src/androidTest/assets/test_requests.js
@@ -0,0 +1,41 @@
+function triggerFetchStringUrl() {
+    fetch('https://example.com/api/data', {
+        method: 'POST',
+        body: '{"key":"value"}',
+        headers: {
+            'Content-Type': 'application/json',
+            'X-Custom': 'test-value'
+        }
+    });
+}
+
+function triggerFetchRequestObject() {
+    fetch(new Request('https://example.com/api/request', {
+        method: 'PUT',
+        headers: { 'X-Request-Header': 'request-value' }
+    }));
+}
+
+function triggerXhr() {
+    var xhr = new XMLHttpRequest();
+    xhr.open('POST', 'https://example.com/api/xhr', true);
+    xhr.setRequestHeader('Content-Type', 'text/plain');
+    xhr.setRequestHeader('X-Xhr-Header', 'xhr-value');
+    xhr.send('xhr-body-content');
+}
+
+function submitFormGet() {
+    document.getElementById('formGet').submit();
+}
+
+function submitFormPostUrlEncoded() {
+    document.getElementById('formPostUrlEncoded').submit();
+}
+
+function submitFormPostMultipart() {
+    document.getElementById('formPostMultipart').submit();
+}
+
+function submitFormPostPlainText() {
+    document.getElementById('formPostPlainText').submit();
+}
diff --git a/app/src/androidTest/java/com/acsbendi/requestinspectorwebview/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/acsbendi/requestinspectorwebview/ExampleInstrumentedTest.kt