Skip to content

Fix finding a request; optimization of saving requests. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kumold wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix finding a request; optimization of saving requests. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
091de22
Update RequestInspectorJavaScriptInterface.kt
kumold Oct 17, 2023
ac46fa0
Update RequestInspectorWebViewClient.kt
kumold Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions ...src/main/java/com/acsbendi/requestinspectorwebview/RequestInspectorJavaScriptInterface.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import org.json.JSONObject
import java.net.URLEncoder
import java.util.Locale


internal class RequestInspectorJavaScriptInterface(webView: WebView) {

init {
Expand All @@ -17,10 +18,10 @@ internal class RequestInspectorJavaScriptInterface(webView: WebView) {

private val recordedRequests = ArrayList<RecordedRequest>()

fun findRecordedRequestForUrl(url: String): RecordedRequest? {
fun findRecordedRequestForUrl(url: String, method: String): RecordedRequest? {
return synchronized(recordedRequests) {
recordedRequests.find { recordedRequest ->
url.contains(recordedRequest.url)
url == recordedRequest.url && method == recordedRequest.method
}
}
}
Expand All @@ -34,7 +35,20 @@ internal class RequestInspectorJavaScriptInterface(webView: WebView) {
val headers: Map<String, String>,
val trace: String,
val enctype: String?
)
) {
override fun equals(other: Any?): Boolean {
if (other !is RecordedRequest) return super.equals(other)
return url == other.url
&& method == other.method
&& body == other.body
&& headers == other.headers
&& formParameters == other.formParameters
}

override fun hashCode(): Int {
return super.hashCode()
}
}

@JavascriptInterface
fun recordFormSubmission(
Expand Down Expand Up @@ -124,7 +138,8 @@ internal class RequestInspectorJavaScriptInterface(webView: WebView) {

private fun addRecordedRequest(recordedRequest: RecordedRequest) {
synchronized(recordedRequests) {
recordedRequests.add(recordedRequest)
if (!recordedRequests.equals(recordedRequest))
recordedRequests.add(recordedRequest)
}
}

Expand Down Expand Up @@ -293,7 +308,7 @@ XMLHttpRequest.prototype.send = function (body) {

window._fetch = window.fetch;
window.fetch = function () {
const url = arguments[1] && 'url' in arguments[1] ? arguments[1]['url'] : "/";
const url = arguments[0];
const fullUrl = getFullUrl(url);
const method = arguments[1] && 'method' in arguments[1] ? arguments[1]['method'] : "GET";
const body = arguments[1] && 'body' in arguments[1] ? arguments[1]['body'] : "";
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/acsbendi/requestinspectorwebview/RequestInspectorWebViewClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ open class RequestInspectorWebViewClient @JvmOverloads constructor(
request: WebResourceRequest
): WebResourceResponse? {
val recordedRequest = interceptionJavascriptInterface.findRecordedRequestForUrl(
request.url.toString()
request.url.toString(),
request.method,
)
val webViewRequest = WebViewRequest.create(request, recordedRequest)
return shouldInterceptRequest(view, webViewRequest)
Expand Down