[APT-10128] Remove nullability on some jump to position actions

scribd · Jun 5, 2024 · 4418f8c · 4418f8c
1 parent b5a1ea4
commit 4418f8c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 36 deletions.
diff --git a/Armadillo/src/main/java/com/scribd/armadillo/Reducer.kt b/Armadillo/src/main/java/com/scribd/armadillo/Reducer.kt
@@ -189,15 +189,10 @@ internal object Reducer {
             }
             is FastForwardAction -> {
                 val playbackInfo = oldState.playbackInfo ?: throw ActionBeforeSetup(action)
-                val progress = if (action.seekPositionTarget != null) {
-                    playbackInfo.progress.copy(
-                        positionInDuration = action.seekPositionTarget,
-                        currentChapterIndex = playbackInfo.audioPlayable.getChapterIndexAtOffset(action.seekPositionTarget))
-                } else {
-                    playbackInfo.progress
-                }
                 oldState.copy(playbackInfo = playbackInfo.copy(
-                        progress = progress,
+                        progress = playbackInfo.progress.copy(
+                            positionInDuration = action.seekPositionTarget,
+                            currentChapterIndex = playbackInfo.audioPlayable.getChapterIndexAtOffset(action.seekPositionTarget)),
                         controlState = MediaControlState(
                                 isSeeking = true,
                                 isFastForwarding = true,
@@ -206,15 +201,10 @@ internal object Reducer {
             }
             is RewindAction -> {
                 val playbackInfo = oldState.playbackInfo ?: throw ActionBeforeSetup(action)
-                val progress = if (action.seekPositionTarget != null) {
-                    playbackInfo.progress.copy(
-                        positionInDuration = action.seekPositionTarget,
-                        currentChapterIndex = playbackInfo.audioPlayable.getChapterIndexAtOffset(action.seekPositionTarget))
-                } else {
-                    playbackInfo.progress
-                }
                 oldState.copy(playbackInfo = playbackInfo.copy(
-                        progress = progress,
+                        progress = playbackInfo.progress.copy(
+                            positionInDuration = action.seekPositionTarget,
+                            currentChapterIndex = playbackInfo.audioPlayable.getChapterIndexAtOffset(action.seekPositionTarget)),
                         controlState = MediaControlState(
                                 isSeeking = true,
                                 isRewinding = true,
@@ -223,15 +213,10 @@ internal object Reducer {
             }
             is SkipNextAction -> {
                 val playbackInfo = oldState.playbackInfo ?: throw ActionBeforeSetup(action)
-                val progress = if (action.seekPositionTarget != null) {
-                    playbackInfo.progress.copy(
-                        positionInDuration = action.seekPositionTarget,
-                        currentChapterIndex = playbackInfo.audioPlayable.getChapterIndexAtOffset(action.seekPositionTarget))
-                } else {
-                    playbackInfo.progress
-                }
                 oldState.copy(playbackInfo = playbackInfo.copy(
-                        progress = progress,
+                        progress = playbackInfo.progress.copy(
+                            positionInDuration = action.seekPositionTarget,
+                            currentChapterIndex = playbackInfo.audioPlayable.getChapterIndexAtOffset(action.seekPositionTarget)),
                         controlState = MediaControlState(
                                 isSeeking = true,
                                 isNextChapter = true,
@@ -240,15 +225,10 @@ internal object Reducer {
             }
             is SkipPrevAction -> {
                 val playbackInfo = oldState.playbackInfo ?: throw ActionBeforeSetup(action)
-                val progress = if (action.seekPositionTarget != null) {
-                    playbackInfo.progress.copy(
-                        positionInDuration = action.seekPositionTarget,
-                        currentChapterIndex = playbackInfo.audioPlayable.getChapterIndexAtOffset(action.seekPositionTarget))
-                } else {
-                    playbackInfo.progress
-                }
                 oldState.copy(playbackInfo = playbackInfo.copy(
-                        progress = progress,
+                        progress = playbackInfo.progress.copy(
+                            positionInDuration = action.seekPositionTarget,
+                            currentChapterIndex = playbackInfo.audioPlayable.getChapterIndexAtOffset(action.seekPositionTarget)),
                         controlState = MediaControlState(
                                 isSeeking = true,
                                 isPrevChapter = true,

diff --git a/Armadillo/src/main/java/com/scribd/armadillo/actions/Action.kt b/Armadillo/src/main/java/com/scribd/armadillo/actions/Action.kt
@@ -61,19 +61,19 @@ internal data class SeekAction(val isSeeking: Boolean, val seekPositionTarget: M
     override val name = "Seeking: $isSeeking"
 }
 
-internal data class FastForwardAction(val seekPositionTarget: Milliseconds?) : Action {
+internal data class FastForwardAction(val seekPositionTarget: Milliseconds) : Action {
     override val name = "FastForwardAction: $seekPositionTarget"
 }
 
-internal data class RewindAction(val seekPositionTarget: Milliseconds?) : Action {
+internal data class RewindAction(val seekPositionTarget: Milliseconds) : Action {
     override val name = "RewindAction: $seekPositionTarget"
 }
 
-internal data class SkipNextAction(val seekPositionTarget: Milliseconds?) : Action {
+internal data class SkipNextAction(val seekPositionTarget: Milliseconds) : Action {
     override val name = "SkipNextAction: $seekPositionTarget"
 }
 
-internal data class SkipPrevAction(val seekPositionTarget: Milliseconds?) : Action {
+internal data class SkipPrevAction(val seekPositionTarget: Milliseconds) : Action {
     override val name = "SkipNextAction: $seekPositionTarget"
 }