Merge pull request #6997 from Bnyro/master

fix: preference to only store watch positions for video doesn't work
libre-tube · Jan 22, 2025 · a4253a7 · a4253a7
2 parents bbe81ea + 6a8de0d
commit a4253a7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt b/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
@@ -166,7 +166,10 @@ object PlayerHelper {
         get() = watchPositionsPref in listOf("always", "videos")
 
     val watchPositionsAudio: Boolean
-        get() = watchPositionsPref == "always"
+        get() = watchPositionsPref in listOf("always", "audio")
+
+    val watchPositionsAny: Boolean
+        get() = watchPositionsVideo || watchPositionsAudio
 
     val watchHistoryEnabled: Boolean
         get() = PreferenceHelper.getBoolean(

diff --git a/app/src/main/java/com/github/libretube/services/AbstractPlayerService.kt b/app/src/main/java/com/github/libretube/services/AbstractPlayerService.kt
@@ -313,7 +313,10 @@ abstract class AbstractPlayerService : MediaLibraryService(), MediaLibrarySessio
     abstract suspend fun startPlayback()
 
     private fun saveWatchPosition() {
-        if (isTransitioning || !PlayerHelper.watchPositionsVideo) return
+        val watchPositionsEnabled =
+            (PlayerHelper.watchPositionsAudio && isAudioOnlyPlayer) || (PlayerHelper.watchPositionsVideo && !isAudioOnlyPlayer)
+
+        if (isTransitioning || !watchPositionsEnabled) return
 
         exoPlayer?.let { PlayerHelper.saveWatchPosition(it, videoId) }
     }

diff --git a/app/src/main/java/com/github/libretube/ui/sheets/VideoOptionsBottomSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/VideoOptionsBottomSheet.kt
@@ -141,7 +141,7 @@ class VideoOptionsBottomSheet : BaseBottomSheet() {
         }
 
         // show the mark as watched or unwatched option if watch positions are enabled
-        if (PlayerHelper.watchPositionsVideo || PlayerHelper.watchHistoryEnabled) {
+        if (PlayerHelper.watchPositionsAny || PlayerHelper.watchHistoryEnabled) {
             val watchPositionEntry = runBlocking(Dispatchers.IO) {
                 DatabaseHolder.Database.watchPositionDao().findById(videoId)
             }

diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
@@ -439,12 +439,14 @@
     <string-array name="watchPosition">
         <item>@string/always</item>
         <item>@string/videos</item>
+        <item>@string/audio</item>
         <item>@string/never</item>
     </string-array>
 
     <string-array name="watchPositionValues">
         <item>always</item>
         <item>videos</item>
+        <item>audio</item>
         <item>never</item>
     </string-array>