tor-browser

commit dd7ee3c737aa3c6f6fed7d3b52a695bc7e73e6b4
parent d97599b58cb1b5cca8e9f4b145e2d648f0d5a96e
Author: Alex Catarineu <acat@torproject.org>
Date:   Wed,  4 Nov 2020 15:51:00 +0100

TB 34439 [android]: Isolate Icon loader on Android.

Originally, android-components#34439.

Diffstat:
M
mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
 | 
1
+
M
mobile/android/android-components/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt
 | 
1
+
M
mobile/android/android-components/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt
 | 
1
+

3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
@@ -92,6 +92,7 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url)
     .referrer(referrerUrl)
     .cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD)
     .beConservative(conservative)
+    .origin(origin)
     .build()
 
 private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder {
diff --git a/mobile/android/android-components/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt b/mobile/android/android-components/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt
@@ -62,6 +62,7 @@ open class HttpIconLoader(
             redirect = Request.Redirect.FOLLOW,
             useCaches = true,
             private = request.isPrivate,
+            origin = request.url
         )
 
         return try {
diff --git a/mobile/android/android-components/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt b/mobile/android/android-components/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt
@@ -52,6 +52,7 @@ data class Request(
     val useCaches: Boolean = true,
     val private: Boolean = false,
     val useOhttp: Boolean = false,
+    val origin: String? = null,
 ) {
     var referrerUrl: String? = null
     var conservative: Boolean = false