[tor-commits] [Git][tpo/applications/android-components][android-components-60.0.5-10.0-1] Revert "Merge remote-tracking branch 'acatgl/34439' into android-components-60.0.5-10.0-1"

[Matthew Finkel]

Matthew Finkel pushed to branch android-components-60.0.5-10.0-1 at The Tor Project / Applications / android-components


Commits:
f66e0b39 by Matthew Finkel at 2020-11-05T01:39:20+00:00
Revert "Merge remote-tracking branch 'acatgl/34439' into android-components-60.0.5-10.0-1"

This reverts commit 8dff84319a18189e6b4bcca5ce78beed9aba984b, reversing
changes made to c2d4d9840a0f8e789e091bc693d01f2995fb5fc5.

- - - - -


3 changed files:

- components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
- components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt
- components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt


Changes:

=====================================
components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
=====================================
@@ -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 {


=====================================
components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt
=====================================
@@ -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)


=====================================
components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt
=====================================
@@ -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].



View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/commit/f66e0b39c817da2ee18a7f74b77f317ccccf01d9

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/commit/f66e0b39c817da2ee18a7f74b77f317ccccf01d9
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20201105/6d9e8802/attachment-0001.htm>