Merge pull request #7395 from Bnyro/master

fix: SponsorBlock segments skipped even if temporarily allowed

Author: Bnyro

app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt

@@ -510,7 +510,7 @@ object PlayerHelper {
      * Create a basic player, that is used for all types of playback situations inside the app
      */
     @OptIn(androidx.media3.common.util.UnstableApi::class)
-    fun createPlayer(context: Context, trackSelector: DefaultTrackSelector, ): ExoPlayer {
+    fun createPlayer(context: Context, trackSelector: DefaultTrackSelector): ExoPlayer {
         val dataSourceFactory = DefaultDataSource.Factory(context)
         val audioAttributes = AudioAttributes.Builder()
             .setUsage(C.USAGE_MEDIA)
@@ -589,7 +589,7 @@ object PlayerHelper {
      * @param segments List of the SponsorBlock segments
      * @return If segment found and should skip manually, the end position of the segment in ms, otherwise null
      */
-    fun Player.checkForSegments(
+    fun Player.getCurrentSegment(
         segments: List<Segment>,
         sponsorBlockConfig: MutableMap<String, SbSkipOptions>,
     ): Pair<Segment, SbSkipOptions>? {
@@ -610,14 +610,6 @@ object PlayerHelper {
         return null
     }
 
-    fun Player.isInSegment(segments: List<Segment>): Boolean {
-        return segments.any {
-            val (start, end) = it.segmentStartAndEnd
-            val (segmentStart, segmentEnd) = (start * 1000f).toLong() to (end * 1000f).toLong()
-            currentPosition in segmentStart..segmentEnd
-        }
-    }
-
     /**
      * Get the name of the currently played chapter
      */

app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt

@@ -28,7 +28,7 @@ import com.github.libretube.extensions.toastFromMainDispatcher
 import com.github.libretube.extensions.toastFromMainThread
 import com.github.libretube.extensions.updateParameters
 import com.github.libretube.helpers.PlayerHelper
-import com.github.libretube.helpers.PlayerHelper.checkForSegments
+import com.github.libretube.helpers.PlayerHelper.getCurrentSegment
 import com.github.libretube.helpers.PlayerHelper.getSubtitleRoleFlags
 import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.helpers.ProxyHelper
@@ -236,12 +236,12 @@ open class OnlinePlayerService : AbstractPlayerService() {
     private fun checkForSegments() {
         handler.postDelayed(this::checkForSegments, 100)
 
-        val (currentSegment, sbSkipOption) = exoPlayer?.checkForSegments(
+        val (currentSegment, sbSkipOption) = exoPlayer?.getCurrentSegment(
             sponsorBlockSegments,
             sponsorBlockConfig
         ) ?: return
 
-        if (sbSkipOption in arrayOf(SbSkipOptions.AUTOMATIC, SbSkipOptions.AUTOMATIC_ONCE)) {
+        if (sbSkipOption in arrayOf(SbSkipOptions.AUTOMATIC, SbSkipOptions.AUTOMATIC_ONCE) && sponsorBlockAutoSkip) {
             exoPlayer?.seekTo(currentSegment.segmentStartAndEnd.second.toLong() * 1000)
             currentSegment.skipped = true
 

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

@@ -78,8 +78,7 @@ import com.github.libretube.helpers.IntentHelper
 import com.github.libretube.helpers.NavBarHelper
 import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.helpers.PlayerHelper
-import com.github.libretube.helpers.PlayerHelper.checkForSegments
-import com.github.libretube.helpers.PlayerHelper.isInSegment
+import com.github.libretube.helpers.PlayerHelper.getCurrentSegment
 import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.helpers.ProxyHelper
 import com.github.libretube.helpers.ThemeHelper
@@ -1007,23 +1006,29 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
         handler.postDelayed(this::checkForSegments, 100)
         if (viewModel.segments.value.isNullOrEmpty()) return
 
-        playerController.checkForSegments(
+        val segmentData = playerController.getCurrentSegment(
             viewModel.segments.value.orEmpty(),
             viewModel.sponsorBlockConfig
-        )?.let { (segment, sbSkipOption) ->
-            if (commonPlayerViewModel.isMiniPlayerVisible.value == true) return@let
+        )
+
+        if (segmentData != null && commonPlayerViewModel.isMiniPlayerVisible.value != true) {
+            val (segment, sbSkipOption) = segmentData
 
-            if (sbSkipOption in arrayOf(SbSkipOptions.AUTOMATIC_ONCE, SbSkipOptions.MANUAL)) {
+            val autoSkipTemporarilyDisabled = !binding.player.sponsorBlockAutoSkip &&
+                    sbSkipOption !in arrayOf(SbSkipOptions.OFF, SbSkipOptions.VISIBLE)
+
+            if (sbSkipOption in arrayOf(
+                    SbSkipOptions.AUTOMATIC_ONCE,
+                    SbSkipOptions.MANUAL
+                ) || autoSkipTemporarilyDisabled
+            ) {
                 binding.sbSkipBtn.isVisible = true
                 binding.sbSkipBtn.setOnClickListener {
                     playerController.seekTo((segment.segmentStartAndEnd.second * 1000f).toLong())
                     segment.skipped = true
                 }
             }
-            return
-        }
-
-        if (!playerController.isInSegment(viewModel.segments.value.orEmpty())) {
+        } else {
             binding.sbSkipBtn.isGone = true
         }
     }

app/src/main/java/com/github/libretube/ui/views/OnlinePlayerView.kt

@@ -52,7 +52,7 @@ class OnlinePlayerView(
     var currentWindow: Window? = null
 
     var selectedResolution: Int? = null
-    private var sponsorBlockAutoSkip = true
+    var sponsorBlockAutoSkip = true
 
     @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
     override fun getOptionsMenuItems(): List<BottomSheetItem> {