kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 16:00:31 +05:30
Code Issues Projects Releases Wiki Activity

Use cronet for download service connections

Browse Source
This commit is contained in:
Krunal Patel 2022-12-24 23:39:56 +05:30
parent a38ef176ab
commit 295af6c6c6
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import android.os.Build
import android.os.IBinder import android.os.IBinder
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.api.CronetHelper
import com.github.libretube.api.RetrofitInstance import com.github.libretube.api.RetrofitInstance
import com.github.libretube.constants.DOWNLOAD_CHANNEL_ID import com.github.libretube.constants.DOWNLOAD_CHANNEL_ID
import com.github.libretube.constants.DOWNLOAD_PROGRESS_NOTIFICATION_ID import com.github.libretube.constants.DOWNLOAD_PROGRESS_NOTIFICATION_ID
@ -36,9 +37,11 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import okio.BufferedSink import okio.BufferedSink
import okio.buffer import okio.buffer
import okio.sink import okio.sink
@ -46,6 +49,7 @@ import okio.source
import java.io.File import java.io.File
import java.net.HttpURLConnection import java.net.HttpURLConnection
import java.net.URL import java.net.URL
import java.util.concurrent.Executors
/** /**
* Download service with custom implementation of downloading using [HttpURLConnection]. * Download service with custom implementation of downloading using [HttpURLConnection].
@ -53,8 +57,9 @@ import java.net.URL
class DownloadService : Service() { class DownloadService : Service() {
private val binder = LocalBinder() private val binder = LocalBinder()
private val dispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
private val jobMain = SupervisorJob() private val jobMain = SupervisorJob()
private val scope = CoroutineScope(Dispatchers.IO + jobMain) private val scope = CoroutineScope(dispatcher + jobMain)
private lateinit var notificationManager: NotificationManager private lateinit var notificationManager: NotificationManager
private lateinit var summaryNotificationBuilder: NotificationCompat.Builder private lateinit var summaryNotificationBuilder: NotificationCompat.Builder
@ -199,12 +204,14 @@ class DownloadService : Service() {
try { try {
// Set start range where last downloading was held. // Set start range where last downloading was held.
val con = url.openConnection() as HttpURLConnection val con = CronetHelper.getCronetEngine().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
con.readTimeout = DownloadHelper.DEFAULT_TIMEOUT con.readTimeout = DownloadHelper.DEFAULT_TIMEOUT
con.connect() withContext(Dispatchers.IO) {
con.connect()
}
if (con.responseCode !in 200..299) { if (con.responseCode !in 200..299) {
val message = getString(R.string.downloadfailed) + ": " + con.responseMessage val message = getString(R.string.downloadfailed) + ": " + con.responseMessage
@ -250,10 +257,12 @@ class DownloadService : Service() {
_downloadFlow.emit(item.id to DownloadStatus.Error(e.message.toString(), e)) _downloadFlow.emit(item.id to DownloadStatus.Error(e.message.toString(), e))
} }
sink.flush() withContext(Dispatchers.IO) {
sink.close() sink.flush()
sourceByte.close() sink.close()
con.disconnect() sourceByte.close()
con.disconnect()
}
} catch (_: Exception) { } } catch (_: Exception) { }
val completed = when (totalRead) { val completed = when (totalRead) {