Fallback to default UA string for all network requests

This commit is contained in:
arkon 2020-07-04 10:33:31 -04:00
parent 0ef073669a
commit 963cf4c996
2 changed files with 2 additions and 2 deletions

View File

@ -87,7 +87,7 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
webView = webview webView = webview
webview.settings.javaScriptEnabled = true webview.settings.javaScriptEnabled = true
// Avoid set empty User-Agent, Chromium WebView will reset to default if empty // Avoid sending empty User-Agent, Chromium WebView will reset to default if empty
webview.settings.userAgentString = request.header("User-Agent") webview.settings.userAgentString = request.header("User-Agent")
?: HttpSource.DEFAULT_USERAGENT ?: HttpSource.DEFAULT_USERAGENT

View File

@ -29,6 +29,7 @@ class NetworkHelper(context: Context) {
.cache(Cache(cacheDir, cacheSize)) .cache(Cache(cacheDir, cacheSize))
.connectTimeout(30, TimeUnit.SECONDS) .connectTimeout(30, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS) .readTimeout(30, TimeUnit.SECONDS)
.addInterceptor(UserAgentInterceptor())
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
val httpLoggingInterceptor = HttpLoggingInterceptor().apply { val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
@ -63,7 +64,6 @@ class NetworkHelper(context: Context) {
val cloudflareClient by lazy { val cloudflareClient by lazy {
client.newBuilder() client.newBuilder()
.addInterceptor(UserAgentInterceptor())
.addInterceptor(CloudflareInterceptor(context)) .addInterceptor(CloudflareInterceptor(context))
.build() .build()
} }