|
|
@ -8,6 +8,7 @@ import androidx.annotation.VisibleForTesting
|
|
|
|
import mozilla.components.concept.engine.EngineSession
|
|
|
|
import mozilla.components.concept.engine.EngineSession
|
|
|
|
import mozilla.components.concept.engine.EngineSession.LoadUrlFlags
|
|
|
|
import mozilla.components.concept.engine.EngineSession.LoadUrlFlags
|
|
|
|
import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.ALLOW_ADDITIONAL_HEADERS
|
|
|
|
import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.ALLOW_ADDITIONAL_HEADERS
|
|
|
|
|
|
|
|
import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.BYPASS_CACHE
|
|
|
|
import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE
|
|
|
|
import mozilla.components.concept.engine.EngineSession.LoadUrlFlags.Companion.LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE
|
|
|
|
import mozilla.components.concept.engine.request.RequestInterceptor
|
|
|
|
import mozilla.components.concept.engine.request.RequestInterceptor
|
|
|
|
|
|
|
|
|
|
|
@ -58,12 +59,24 @@ class UrlRequestInterceptor(private val isDeviceRamAboveThreshold: Boolean) : Re
|
|
|
|
return null
|
|
|
|
return null
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return RequestInterceptor.InterceptionResponse.Url(
|
|
|
|
// This is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1875668
|
|
|
|
url = uri,
|
|
|
|
// Remove this by implementing https://bugzilla.mozilla.org/show_bug.cgi?id=1883496
|
|
|
|
flags = LoadUrlFlags.select(
|
|
|
|
val loadUrlFlags = if (uri.endsWith("#ip=1", true)) {
|
|
|
|
|
|
|
|
LoadUrlFlags.select(
|
|
|
|
|
|
|
|
LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE,
|
|
|
|
|
|
|
|
ALLOW_ADDITIONAL_HEADERS,
|
|
|
|
|
|
|
|
BYPASS_CACHE,
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
LoadUrlFlags.select(
|
|
|
|
LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE,
|
|
|
|
LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE,
|
|
|
|
ALLOW_ADDITIONAL_HEADERS,
|
|
|
|
ALLOW_ADDITIONAL_HEADERS,
|
|
|
|
),
|
|
|
|
)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return RequestInterceptor.InterceptionResponse.Url(
|
|
|
|
|
|
|
|
url = uri,
|
|
|
|
|
|
|
|
flags = loadUrlFlags,
|
|
|
|
additionalHeaders = getAdditionalHeaders(isDeviceRamAboveThreshold),
|
|
|
|
additionalHeaders = getAdditionalHeaders(isDeviceRamAboveThreshold),
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|