Use skip instead of seek when possible

intro-skipper · Oct 12, 2024 · 01fea6c · 01fea6c
1 parent 611e19a
commit 01fea6c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/segments/SegmentSkipFragment.kt b/app/src/main/java/org/jellyfin/androidtv/ui/playback/segments/SegmentSkipFragment.kt
@@ -49,13 +49,15 @@ class SegmentSkipFragment : Fragment() {
 		}
 	}
 
-	private fun doSkip() {
+	private fun doSkip(currentPosition: Long?) {
 		lastSegment?.let { segment ->
 			playbackControllerContainer.playbackController?.run {
 				if ((segment.endTime + 3).millis > getDuration() && hasNextItem()) {
 					next()
 				} else {
-					seek(segment.endTime.millis)
+					currentPosition?.let {
+						skip(segment.endTime.millis - it)
+					} ?: seek(segment.endTime.millis)
 				}
 			}
 		}
@@ -76,8 +78,7 @@ class SegmentSkipFragment : Fragment() {
 		preferences[UserPreferences.skipMode].let { setting ->
 			when {
 				isSkipSegment && setting == SegmentMode.AUTO_SKIP -> {
-					doSkip()
-					// videoPlayerAdapter.leanbackOverlayFragment.hideOverlay()
+					doSkip(currentPosition)
 				}
 				isSkipSegment && setting == SegmentMode.SHOW_SKIP_BUTTON -> {
 					if (!button.isVisible) {