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

Fix issues with watch positions

Browse Source
This commit is contained in:
Bnyro 2023-05-21 19:27:36 +02:00
parent 0345492599
commit ceb7ebeaac
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ import android.content.pm.ActivityInfo
import android.content.res.Configuration import android.content.res.Configuration
import android.media.session.PlaybackState import android.media.session.PlaybackState
import android.net.Uri import android.net.Uri
import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
@ -18,7 +17,6 @@ import android.text.format.DateUtils
import android.text.method.LinkMovementMethod import android.text.method.LinkMovementMethod
import android.text.util.Linkify import android.text.util.Linkify
import android.util.Base64 import android.util.Base64
import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -616,7 +614,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
} }
try { try {
saveWatchPosition() if (exoPlayer.duration != C.TIME_UNSET) saveWatchPosition()
PlayingQueue.clear() PlayingQueue.clear()
@ -637,7 +635,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
// save the watch position if video isn't finished and option enabled // save the watch position if video isn't finished and option enabled
private fun saveWatchPosition() { private fun saveWatchPosition() {
if (!PlayerHelper.watchPositionsVideo) return if (!PlayerHelper.watchPositionsVideo || exoPlayer.currentPosition == 0L) return
val watchPosition = WatchPosition(videoId!!, exoPlayer.currentPosition) val watchPosition = WatchPosition(videoId!!, exoPlayer.currentPosition)
CoroutineScope(Dispatchers.IO).launch { CoroutineScope(Dispatchers.IO).launch {
Database.watchPositionDao().insert(watchPosition) Database.watchPositionDao().insert(watchPosition)
@ -682,7 +680,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
} catch (e: HttpException) { } catch (e: HttpException) {
val errorMessage = e.response()?.errorBody()?.string()?.runCatching { val errorMessage = e.response()?.errorBody()?.string()?.runCatching {
JsonHelper.json.decodeFromString<Message>(this).message JsonHelper.json.decodeFromString<Message>(this).message
}?.getOrNull() ?: context?.getString(R.string.server_error) ?: "" }?.getOrNull() ?: context?.getString(R.string.server_error).orEmpty()
context?.toastFromMainDispatcher(errorMessage, Toast.LENGTH_LONG) context?.toastFromMainDispatcher(errorMessage, Toast.LENGTH_LONG)
return@launch return@launch
} }
@ -953,7 +951,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
// only called when the position is unequal to 0, otherwise it would become reset // only called when the position is unequal to 0, otherwise it would become reset
// before the player can seek to the saved position from videos of the queue // before the player can seek to the saved position from videos of the queue
// not called when the video has ended, since it then might save it to the next autoplay video // not called when the video has ended, since it then might save it to the next autoplay video
if (exoPlayer.currentPosition != 0L && playbackState != Player.STATE_ENDED) saveWatchPosition() if (playbackState != Player.STATE_ENDED) saveWatchPosition()
// check if video has ended, next video is available and autoplay is enabled. // check if video has ended, next video is available and autoplay is enabled.
if ( if (