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

fix the watch progress

Browse Source
This commit is contained in:
Bnyro 2022-09-19 22:07:15 +02:00
parent 485cc19023
commit 7844cc7792
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/github/libretube/db/DatabaseHelper.kt
View File

@ -56,9 +56,9 @@ object DatabaseHelper {
fun removeWatchPosition(videoId: String) {
Thread {
Database.watchPositionDao().delete(
Database.watchPositionDao().findById(videoId)
)
Database.watchPositionDao().findById(videoId)?.let {
Database.watchPositionDao().delete(it)
}
}.start()
}

2
app/src/main/java/com/github/libretube/extensions/SetWatchProgressLength.kt
View File

@ -14,7 +14,7 @@ fun View?.setWatchProgressLength(videoId: String, duration: Long) {
Thread {
try {
progress = Database.watchPositionDao().findById(videoId).position
progress = Database.watchPositionDao().findById(videoId)?.position
} catch (e: Exception) {
progress = null
}

18
app/src/main/java/com/github/libretube/util/PlayingQueue.kt
View File

@ -1,8 +1,5 @@
package com.github.libretube.util
import android.util.Log
import com.github.libretube.extensions.TAG
object PlayingQueue {
private val queue = mutableListOf<String>()
private var currentVideoId: String? = null
@ -12,20 +9,23 @@ object PlayingQueue {
}
fun add(videoId: String) {
if (currentVideoId == videoId) return
if (queue.contains(videoId)) queue.remove(videoId)
queue.add(videoId)
}
fun playNext(nextVideoId: String) {
fun playNext(videoId: String) {
if (currentVideoId == videoId) return
if (queue.contains(videoId)) queue.remove(videoId)
queue.add(
queue.indexOf(currentVideoId),
nextVideoId
queue.indexOf(currentVideoId) + 1,
videoId
)
}
fun getNext(): String? {
val currentIndex = queue.indexOf(currentVideoId)
Log.e(TAG(), queue.toString())
return if (currentIndex > queue.size) {
return if (currentIndex >= queue.size) {
null
} else {
queue[currentIndex + 1]
@ -40,7 +40,7 @@ object PlayingQueue {
fun hasPrev(): Boolean {
val currentIndex = queue.indexOf(currentVideoId)
return currentIndex >= 1
return queue.size > currentIndex + 1
}
fun contains(videoId: String): Boolean {