kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 06:10:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #2979 from Isira-Seneviratne/CronetHelper_object

Browse Source 
Convert CronetHelper to an object.
This commit is contained in:
Bnyro 2023-02-06 15:30:16 +01:00 committed by GitHub
commit 12d3991f01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/github/libretube/LibreTubeApp.kt
View File

@ -6,7 +6,6 @@ import android.os.StrictMode.VmPolicy
import androidx.core.app.NotificationChannelCompat import androidx.core.app.NotificationChannelCompat
import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
import androidx.work.ExistingPeriodicWorkPolicy import androidx.work.ExistingPeriodicWorkPolicy
import com.github.libretube.api.CronetHelper
import com.github.libretube.api.RetrofitInstance import com.github.libretube.api.RetrofitInstance
import com.github.libretube.constants.BACKGROUND_CHANNEL_ID import com.github.libretube.constants.BACKGROUND_CHANNEL_ID
import com.github.libretube.constants.DOWNLOAD_CHANNEL_ID import com.github.libretube.constants.DOWNLOAD_CHANNEL_ID
@ -22,6 +21,7 @@ import com.github.libretube.util.ExceptionHandler
class LibreTubeApp : Application() { class LibreTubeApp : Application() {
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
instance = this
/** /**
* Initialize the needed notification channels for DownloadService and BackgroundMode * Initialize the needed notification channels for DownloadService and BackgroundMode
@ -48,7 +48,6 @@ class LibreTubeApp : Application() {
* Set the api and the auth api url * Set the api and the auth api url
*/ */
RetrofitInstance.initialize() RetrofitInstance.initialize()
CronetHelper.initCronet(this)
ImageHelper.initializeImageLoader(this) ImageHelper.initializeImageLoader(this)
/** /**
@ -112,4 +111,8 @@ class LibreTubeApp : Application() {
) )
) )
} }
companion object {
lateinit var instance: LibreTubeApp
}
} }

20
app/src/main/java/com/github/libretube/api/CronetHelper.kt
View File

@ -1,28 +1,16 @@
package com.github.libretube.api package com.github.libretube.api
import android.content.Context import com.github.libretube.LibreTubeApp
import com.google.net.cronet.okhttptransport.CronetCallFactory import com.google.net.cronet.okhttptransport.CronetCallFactory
import org.chromium.net.CronetEngine import org.chromium.net.CronetEngine
class CronetHelper { object CronetHelper {
companion object { val cronetEngine: CronetEngine = CronetEngine.Builder(LibreTubeApp.instance)
private lateinit var engine: CronetEngine
lateinit var callFactory: CronetCallFactory
fun initCronet(context: Context) {
engine = CronetEngine.Builder(context)
.enableHttp2(true) .enableHttp2(true)
.enableQuic(true) .enableQuic(true)
.enableBrotli(true) .enableBrotli(true)
.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_IN_MEMORY, 1024L * 1024L) // 1MiB .enableHttpCache(CronetEngine.Builder.HTTP_CACHE_IN_MEMORY, 1024L * 1024L) // 1MiB
.build() .build()
callFactory = CronetCallFactory.newBuilder(engine) val callFactory: CronetCallFactory = CronetCallFactory.newBuilder(cronetEngine).build()
.build()
}
fun getCronetEngine(): CronetEngine {
return engine
}
}
} }

2
app/src/main/java/com/github/libretube/services/DownloadService.kt
View File

@ -179,7 +179,7 @@ class DownloadService : Service() {
try { try {
// Set start range where last downloading was held. // Set start range where last downloading was held.
val con = CronetHelper.getCronetEngine().openConnection(url) as HttpURLConnection val con = CronetHelper.cronetEngine.openConnection(url) as HttpURLConnection
con.requestMethod = "GET" con.requestMethod = "GET"
con.setRequestProperty("Range", "bytes=$totalRead-") con.setRequestProperty("Range", "bytes=$totalRead-")
con.connectTimeout = DownloadHelper.DEFAULT_TIMEOUT con.connectTimeout = DownloadHelper.DEFAULT_TIMEOUT

12
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -123,7 +123,6 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.datetime.LocalDate import kotlinx.datetime.LocalDate
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import org.chromium.net.CronetEngine
import retrofit2.HttpException import retrofit2.HttpException
class PlayerFragment : BaseFragment(), OnlinePlayerOptions { class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
@ -1300,14 +1299,11 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
} }
private fun createExoPlayer() { private fun createExoPlayer() {
val cronetEngine: CronetEngine = CronetHelper.getCronetEngine() val cronetDataSourceFactory = CronetDataSource.Factory(
val cronetDataSourceFactory: CronetDataSource.Factory = CronetHelper.cronetEngine,
CronetDataSource.Factory(cronetEngine, Executors.newCachedThreadPool()) Executors.newCachedThreadPool()
val dataSourceFactory = DefaultDataSource.Factory(
requireContext(),
cronetDataSourceFactory
) )
val dataSourceFactory = DefaultDataSource.Factory(requireContext(), cronetDataSourceFactory)
// control for the track sources like subtitles and audio source // control for the track sources like subtitles and audio source
trackSelector = DefaultTrackSelector(requireContext()) trackSelector = DefaultTrackSelector(requireContext())