Skip to content
Snippets Groups Projects
Unverified Commit f66e0b39 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Revert "Merge remote-tracking branch 'acatgl/34439' into android-components-60.0.5-10.0-1"

This reverts commit 8dff8431, reversing
changes made to c2d4d984.
parent 8dff8431
No related branches found
No related tags found
No related merge requests found
......@@ -80,7 +80,6 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url)
.addHeadersFrom(this)
.addBodyFrom(this)
.cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD)
.origin(origin)
.build()
private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder {
......
......@@ -51,8 +51,7 @@ class HttpIconLoader(
connectTimeout = Pair(CONNECT_TIMEOUT, TimeUnit.SECONDS),
readTimeout = Pair(READ_TIMEOUT, TimeUnit.SECONDS),
redirect = Request.Redirect.FOLLOW,
useCaches = true,
origin = request.url)
useCaches = true)
return try {
val response = httpClient.fetch(downloadRequest)
......
......@@ -46,8 +46,7 @@ data class Request(
val body: Body? = null,
val redirect: Redirect = Redirect.FOLLOW,
val cookiePolicy: CookiePolicy = CookiePolicy.INCLUDE,
val useCaches: Boolean = true,
val origin: String? = null
val useCaches: Boolean = true
) {
/**
* A [Body] to be send with the [Request].
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment