kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 08:20:32 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #5936 from FireMasterK/fix-http-client

Browse Source 
Fix cronet not being used because of httpClient
This commit is contained in:
Kavin 2024-04-26 23:18:45 +01:00 committed by GitHub
commit 4b9d673c4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/github/libretube/api/RetrofitInstance.kt
View File

@ -3,6 +3,7 @@ package com.github.libretube.api
import com.github.libretube.BuildConfig import com.github.libretube.BuildConfig
import com.github.libretube.constants.PreferenceKeys import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.helpers.PreferenceHelper import com.github.libretube.helpers.PreferenceHelper
import com.google.net.cronet.okhttptransport.CronetInterceptor
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
@ -24,6 +25,7 @@ object RetrofitInstance {
PreferenceKeys.AUTH_INSTANCE, PreferenceKeys.AUTH_INSTANCE,
PIPED_API_URL PIPED_API_URL
) )
false -> apiUrl false -> apiUrl
} }
@ -65,6 +67,7 @@ object RetrofitInstance {
private fun buildClient(): OkHttpClient { private fun buildClient(): OkHttpClient {
val httpClient = OkHttpClient().newBuilder() val httpClient = OkHttpClient().newBuilder()
.addInterceptor(CronetInterceptor.newBuilder(CronetHelper.cronetEngine).build())
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
val loggingInterceptor = HttpLoggingInterceptor().apply { val loggingInterceptor = HttpLoggingInterceptor().apply {

2
app/src/main/java/com/github/libretube/helpers/ImageHelper.kt
View File

@ -17,6 +17,7 @@ import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.extensions.toAndroidUri import com.github.libretube.extensions.toAndroidUri
import com.github.libretube.extensions.toAndroidUriOrNull import com.github.libretube.extensions.toAndroidUriOrNull
import com.github.libretube.util.DataSaverMode import com.github.libretube.util.DataSaverMode
import com.google.net.cronet.okhttptransport.CronetInterceptor
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
@ -36,6 +37,7 @@ object ImageHelper {
val maxCacheSize = PreferenceHelper.getString(PreferenceKeys.MAX_IMAGE_CACHE, "128") val maxCacheSize = PreferenceHelper.getString(PreferenceKeys.MAX_IMAGE_CACHE, "128")
val httpClient = OkHttpClient().newBuilder() val httpClient = OkHttpClient().newBuilder()
.addInterceptor(CronetInterceptor.newBuilder(CronetHelper.cronetEngine).build())
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
val loggingInterceptor = HttpLoggingInterceptor().apply { val loggingInterceptor = HttpLoggingInterceptor().apply {