Follow skip forward/back length on ExoPlayer

app/src/main/java/org/jellyfin/mobile/api/ApiModule.kt

@@ -5,6 +5,7 @@ import org.jellyfin.sdk.Jellyfin
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.KtorClient
 import org.jellyfin.sdk.api.operations.ArtistsApi
+import org.jellyfin.sdk.api.operations.DisplayPreferencesApi
 import org.jellyfin.sdk.api.operations.GenresApi
 import org.jellyfin.sdk.api.operations.HlsSegmentApi
 import org.jellyfin.sdk.api.operations.ImageApi
@@ -49,6 +50,7 @@ val apiModule = module {
     single { VideosApi(get()) }
     single { UniversalAudioApi(get()) }
     single { MediaInfoApi(get()) }
+    single { DisplayPreferencesApi(get()) }
     single { PlayStateApi(get()) }
     single { HlsSegmentApi(get()) }
 }

app/src/main/java/org/jellyfin/mobile/model/DisplayPreferences.kt

@@ -0,0 +1,8 @@
+package org.jellyfin.mobile.model
+
+import org.jellyfin.mobile.utils.Constants
+
+data class DisplayPreferences(
+    val skipBackLength: Long = Constants.DEFAULT_SEEK_TIME_MS,
+    val skipForwardLength: Long = Constants.DEFAULT_SEEK_TIME_MS,
+)

app/src/main/java/org/jellyfin/mobile/player/PlayerFragment.kt

@@ -239,9 +239,9 @@ class PlayerFragment : Fragment() {
     fun isLandscape(configuration: Configuration = resources.configuration) =
         configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
 
-    fun onSeek(offsetMs: Long) {
-        viewModel.seekToOffset(offsetMs)
-    }
+    fun onRewind() = viewModel.rewind()
+
+    fun onFastForward() = viewModel.fastForward()
 
     /**
      * @return true if the audio track was changed

app/src/main/java/org/jellyfin/mobile/player/PlayerGestureHelper.kt

@@ -89,12 +89,12 @@ class PlayerGestureHelper(
             val viewHeight = playerView.measuredHeight
             val viewCenterX = viewWidth / 2
             val viewCenterY = viewHeight / 2
-            val fastForward = e.x.toInt() > viewCenterX
+            val isFastForward = e.x.toInt() > viewCenterX
 
             // Show ripple effect
             playerView.foreground?.apply {
-                val left = if (fastForward) viewCenterX else 0
-                val right = if (fastForward) viewWidth else viewCenterX
+                val left = if (isFastForward) viewCenterX else 0
+                val right = if (isFastForward) viewWidth else viewCenterX
                 setBounds(left, viewCenterY - viewCenterX / 2, right, viewCenterY + viewCenterX / 2)
                 setHotspot(e.x, e.y)
                 state = intArrayOf(android.R.attr.state_enabled, android.R.attr.state_pressed)
@@ -104,7 +104,7 @@ class PlayerGestureHelper(
             }
 
             // Fast-forward/rewind
-            fragment.onSeek(if (fastForward) Constants.DEFAULT_SEEK_TIME_MS else Constants.DEFAULT_SEEK_TIME_MS.unaryMinus())
+            with(fragment) { if (isFastForward) onFastForward() else onRewind() }
 
             // Cancel previous runnable to not hide controller while seeking
             playerView.removeCallbacks(hidePlayerViewControllerAction)

app/src/main/java/org/jellyfin/mobile/player/PlayerViewModel.kt

@@ -30,6 +30,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.jellyfin.mobile.BuildConfig
 import org.jellyfin.mobile.PLAYER_EVENT_CHANNEL
+import org.jellyfin.mobile.model.DisplayPreferences
 import org.jellyfin.mobile.player.source.JellyfinMediaSource
 import org.jellyfin.mobile.player.source.MediaQueueManager
 import org.jellyfin.mobile.utils.Constants
@@ -47,6 +48,7 @@ import org.jellyfin.mobile.utils.toMediaMetadata
 import org.jellyfin.mobile.utils.width
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.operations.DisplayPreferencesApi
 import org.jellyfin.sdk.api.operations.HlsSegmentApi
 import org.jellyfin.sdk.api.operations.PlayStateApi
 import org.jellyfin.sdk.model.api.PlayMethod
@@ -62,6 +64,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 
 class PlayerViewModel(application: Application) : AndroidViewModel(application), KoinComponent, Player.Listener {
     private val apiClient by inject<ApiClient>()
+    private val displayPreferencesApi by inject<DisplayPreferencesApi>()
     private val playStateApi by inject<PlayStateApi>()
     private val hlsSegmentApi by inject<HlsSegmentApi>()
 
@@ -104,9 +107,32 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application),
     }
     private val mediaSessionCallback = PlayerMediaSessionCallback(this)
 
+    private var displayPreferences = DisplayPreferences()
+
     init {
         ProcessLifecycleOwner.get().lifecycle.addObserver(lifecycleObserver)
 
+        // Load display preferences
+        viewModelScope.launch {
+            try {
+                val displayPreferencesDto by displayPreferencesApi.getDisplayPreferences(
+                    displayPreferencesId = Constants.DISPLAY_PREFERENCES_ID_USER_SETTINGS,
+                    client = Constants.DISPLAY_PREFERENCES_CLIENT_EMBY,
+                )
+
+                val customPrefs = displayPreferencesDto.customPrefs
+
+                displayPreferences = DisplayPreferences(
+                    skipBackLength = customPrefs?.get(Constants.DISPLAY_PREFERENCES_SKIP_BACK_LENGTH)?.toLongOrNull()
+                        ?: Constants.DEFAULT_SEEK_TIME_MS,
+                    skipForwardLength = customPrefs?.get(Constants.DISPLAY_PREFERENCES_SKIP_FORWARD_LENGTH)?.toLongOrNull()
+                        ?: Constants.DEFAULT_SEEK_TIME_MS
+                )
+            } catch (e: ApiClientException) {
+                Timber.e(e, "Failed to load display preferences")
+            }
+        }
+
         // Subscribe to player events from webapp
         viewModelScope.launch {
             for (event in playerEventChannel) {
@@ -296,16 +322,12 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application),
         playerOrNull?.playWhenReady = false
     }
 
-    fun seekToOffset(offsetMs: Long) {
-        playerOrNull?.seekToOffset(offsetMs)
-    }
-
     fun rewind() {
-        seekToOffset(Constants.DEFAULT_SEEK_TIME_MS.unaryMinus())
+        playerOrNull?.seekToOffset(displayPreferences.skipBackLength.unaryMinus())
     }
 
     fun fastForward() {
-        seekToOffset(Constants.DEFAULT_SEEK_TIME_MS)
+        playerOrNull?.seekToOffset(displayPreferences.skipForwardLength)
     }
 
     fun skipToPrevious(force: Boolean = false) {

app/src/main/java/org/jellyfin/mobile/utils/Constants.kt

@@ -94,7 +94,11 @@ object Constants {
     const val DEFAULT_CONTROLS_TIMEOUT_MS = 2500
     const val GESTURE_EXCLUSION_AREA_TOP = 48
     const val DEFAULT_CENTER_OVERLAY_TIMEOUT_MS = 250
-    const val DEFAULT_SEEK_TIME_MS = 5000L
+    const val DISPLAY_PREFERENCES_ID_USER_SETTINGS = "usersettings"
+    const val DISPLAY_PREFERENCES_CLIENT_EMBY = "emby"
+    const val DISPLAY_PREFERENCES_SKIP_BACK_LENGTH = "skipBackLength"
+    const val DISPLAY_PREFERENCES_SKIP_FORWARD_LENGTH = "skipForwardLength"
+    const val DEFAULT_SEEK_TIME_MS = 10000L
     const val MAX_SKIP_TO_PREV_MS = 3000L
     const val DOUBLE_TAP_RIPPLE_DURATION_MS = 100L
     const val FULL_SWIPE_RANGE_SCREEN_RATIO = 0.66f