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

Merge pull request #2698 from Bnyro/master

Browse Source 
Download Manager: Apply review from #2469
This commit is contained in:
Bnyro 2023-01-14 18:18:08 +01:00 committed by GitHub
commit fec8965a4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 75 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/github/libretube/compat/PendingIntentCompat.kt Normal file
View File

@ -0,0 +1,20 @@
package com.github.libretube.compat
import android.app.PendingIntent
import android.os.Build
object PendingIntentCompat {
val updateCurrentFlags: Int
get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
(PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
} else {
PendingIntent.FLAG_UPDATE_CURRENT
}
val cancelCurrentFlags: Int
get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
} else {
PendingIntent.FLAG_CANCEL_CURRENT
}
}

15
app/src/main/java/com/github/libretube/compat/ServiceCompat.kt Normal file
View File

@ -0,0 +1,15 @@
package com.github.libretube.compat
import android.content.Context
import android.content.Intent
import android.os.Build
class ServiceCompat(private val context: Context) {
fun startForeground(intent: Intent) {
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
context.startForegroundService(intent)
} else {
context.startService(intent)
}
}
}

4
app/src/main/java/com/github/libretube/constants/IntentData.kt
View File

@ -10,9 +10,9 @@ object IntentData {
const val fileName = "fileName"
const val keepQueue = "keepQueue"
const val playlistType = "playlistType"
const val videoFormat = "videoFormate"
const val videoFormat = "videoFormat"
const val videoQuality = "videoQuality"
const val audioFormat = "audioFormate"
const val audioFormat = "audioFormat"
const val audioQuality = "audioQuality"
const val subtitleCode = "subtitleCode"
const val downloading = "downloading"

11
app/src/main/java/com/github/libretube/enums/DownloadType.kt
View File

@ -1,11 +0,0 @@
package com.github.libretube.enums
/**
* object for saving the download type
*/
enum class DownloadType {
AUDIO,
VIDEO,
AUDIO_VIDEO,
NONE
}

8
app/src/main/java/com/github/libretube/receivers/NotificationReceiver.kt
View File

@ -3,7 +3,7 @@ package com.github.libretube.receivers
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.os.Build
import com.github.libretube.compat.ServiceCompat
import com.github.libretube.services.DownloadService
class NotificationReceiver : BroadcastReceiver() {
@ -17,10 +17,8 @@ class NotificationReceiver : BroadcastReceiver() {
if (id == -1) return
serviceIntent.putExtra("id", id)
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
context?.startForegroundService(serviceIntent)
} else {
context?.startService(serviceIntent)
context?.let {
ServiceCompat(it).startForeground(serviceIntent)
}
}

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

@ -11,6 +11,7 @@ import androidx.core.app.NotificationCompat
import com.github.libretube.R
import com.github.libretube.api.CronetHelper
import com.github.libretube.api.RetrofitInstance
import com.github.libretube.compat.PendingIntentCompat
import com.github.libretube.constants.DOWNLOAD_CHANNEL_ID
import com.github.libretube.constants.DOWNLOAD_PROGRESS_NOTIFICATION_ID
import com.github.libretube.constants.IntentData
@ -95,18 +96,14 @@ class DownloadService : Service() {
try {
val streams = RetrofitInstance.api.getStreams(videoId)
val thumbnailTargetFile = getDownloadFile(DownloadHelper.THUMBNAIL_DIR, fileName)
awaitQuery {
Database.downloadDao().insertDownload(
Download(
videoId = videoId,
title = streams.title ?: "",
thumbnailPath = File(
DownloadHelper.getDownloadDir(
this@DownloadService,
DownloadHelper.THUMBNAIL_DIR
),
fileName
).absolutePath,
thumbnailPath = thumbnailTargetFile.absolutePath,
description = streams.description ?: "",
uploadDate = streams.uploadDate,
uploader = streams.uploader ?: ""
@ -117,13 +114,7 @@ class DownloadService : Service() {
ImageHelper.downloadImage(
this@DownloadService,
url,
File(
DownloadHelper.getDownloadDir(
this@DownloadService,
DownloadHelper.THUMBNAIL_DIR
),
fileName
).absolutePath
thumbnailTargetFile.absolutePath
)
}
@ -151,27 +142,9 @@ class DownloadService : Service() {
*/
private fun start(item: DownloadItem) {
val file: File = when (item.type) {
FileType.AUDIO -> {
val audioDownloadDir = DownloadHelper.getDownloadDir(
this,
DownloadHelper.AUDIO_DIR
)
File(audioDownloadDir, item.fileName)
}
FileType.VIDEO -> {
val videoDownloadDir = DownloadHelper.getDownloadDir(
this,
DownloadHelper.VIDEO_DIR
)
File(videoDownloadDir, item.fileName)
}
FileType.SUBTITLE -> {
val subtitleDownloadDir = DownloadHelper.getDownloadDir(
this,
DownloadHelper.SUBTITLE_DIR
)
File(subtitleDownloadDir, item.fileName)
}
FileType.AUDIO -> getDownloadFile(DownloadHelper.AUDIO_DIR, item.fileName)
FileType.VIDEO -> getDownloadFile(DownloadHelper.VIDEO_DIR, item.fileName)
FileType.SUBTITLE -> getDownloadFile(DownloadHelper.SUBTITLE_DIR, item.fileName)
}
file.createNewFile()
item.path = file.absolutePath
@ -382,7 +355,7 @@ class DownloadService : Service() {
summaryNotificationBuilder = NotificationCompat
.Builder(this, DOWNLOAD_CHANNEL_ID)
.setSmallIcon(R.mipmap.ic_launcher)
.setSmallIcon(R.drawable.ic_launcher_lockscreen)
.setContentTitle(getString(R.string.downloading))
.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
.setGroup(DOWNLOAD_NOTIFICATION_GROUP)
@ -394,12 +367,6 @@ class DownloadService : Service() {
}
private fun getNotificationBuilder(item: DownloadItem): NotificationCompat.Builder {
val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
} else {
PendingIntent.FLAG_CANCEL_CURRENT
}
val activityIntent =
PendingIntent.getActivity(
this@DownloadService,
@ -407,7 +374,7 @@ class DownloadService : Service() {
Intent(this@DownloadService, MainActivity::class.java).apply {
putExtra("fragmentToOpen", "downloads")
},
flags
PendingIntentCompat.cancelCurrentFlags
)
return NotificationCompat
@ -459,43 +426,44 @@ class DownloadService : Service() {
}
private fun getResumeAction(id: Int): NotificationCompat.Action {
val intent = Intent(this, NotificationReceiver::class.java)
intent.action = ACTION_DOWNLOAD_RESUME
intent.putExtra("id", id)
val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
(PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
} else {
PendingIntent.FLAG_UPDATE_CURRENT
val intent = Intent(this, NotificationReceiver::class.java).apply {
action = ACTION_DOWNLOAD_RESUME
putExtra("id", id)
}
return NotificationCompat.Action.Builder(
R.drawable.ic_play,
getString(R.string.resume),
PendingIntent.getBroadcast(this, id, intent, flags)
PendingIntent.getBroadcast(this, id, intent, PendingIntentCompat.updateCurrentFlags)
).build()
}
private fun getPauseAction(id: Int): NotificationCompat.Action {
val intent = Intent(this, NotificationReceiver::class.java)
intent.action = ACTION_DOWNLOAD_PAUSE
intent.putExtra("id", id)
val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
(PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
} else {
PendingIntent.FLAG_UPDATE_CURRENT
val intent = Intent(this, NotificationReceiver::class.java).apply {
action = ACTION_DOWNLOAD_PAUSE
putExtra("id", id)
}
return NotificationCompat.Action.Builder(
R.drawable.ic_pause,
getString(R.string.pause),
PendingIntent.getBroadcast(this, id, intent, flags)
PendingIntent.getBroadcast(this, id, intent, PendingIntentCompat.updateCurrentFlags)
).build()
}
/**
* Get a [File] from the corresponding download directory and the file name
*/
private fun getDownloadFile(directory: String, fileName: String): File {
return File(
DownloadHelper.getDownloadDir(
this@DownloadService,
directory
),
fileName
)
}
override fun onDestroy() {
downloadQueue.clear()
IS_DOWNLOAD_RUNNING = false

8
app/src/main/java/com/github/libretube/util/BackgroundHelper.kt
View File

@ -3,7 +3,7 @@ package com.github.libretube.util
import android.app.ActivityManager
import android.content.Context
import android.content.Intent
import android.os.Build
import com.github.libretube.compat.ServiceCompat
import com.github.libretube.constants.IntentData
import com.github.libretube.services.BackgroundMode
@ -33,11 +33,7 @@ object BackgroundHelper {
intent.putExtra(IntentData.keepQueue, keepQueue)
// start the background mode as foreground service
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
context.startForegroundService(intent)
} else {
context.startService(intent)
}
ServiceCompat(context).startForeground(intent)
}
/**

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

@ -3,6 +3,7 @@ package com.github.libretube.util
import android.content.Context
import android.content.Intent
import android.os.Build
import com.github.libretube.compat.ServiceCompat
import com.github.libretube.constants.IntentData
import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.db.obj.DownloadItem
@ -65,11 +66,7 @@ object DownloadHelper {
intent.putExtra(IntentData.audioQuality, audioQuality)
intent.putExtra(IntentData.subtitleCode, subtitleCode)
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
context.startForegroundService(intent)
} else {
context.startService(intent)
}
ServiceCompat(context).startForeground(intent)
}
fun DownloadItem.getNotificationId(): Int {