fix(android): avoid emitting track changed when replaying the same track

see doublesymmetry#2059
puckey · Jul 13, 2023 · 6a551f6 · 6a551f6
1 parent c40e889
commit 6a551f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/android/src/main/java/com/doublesymmetry/trackplayer/service/MusicService.kt b/android/src/main/java/com/doublesymmetry/trackplayer/service/MusicService.kt
@@ -601,14 +601,13 @@ class MusicService : HeadlessJsTaskService() {
 
         scope.launch {
             event.audioItemTransition.collect {
-                var lastIndex: Int? = null
-                if (it is AudioItemTransitionReason.REPEAT) {
-                    lastIndex = player.currentIndex
-                } else if (player.previousItem != null) {
-                    lastIndex = player.previousIndex
+                if (!(it is AudioItemTransitionReason.REPEAT)) {
+                    emitPlaybackTrackChangedEvents(
+                        player.currentIndex,
+                        player.previousIndex,
+                        (it?.oldPosition ?: 0).toSeconds()
+                    )
                 }
-                var lastPosition = (it?.oldPosition ?: 0).toSeconds();
-                emitPlaybackTrackChangedEvents(player.currentIndex, lastIndex, lastPosition)
             }
         }
 

diff --git a/docs/docs/v4-migration.md b/docs/docs/v4-migration.md
@@ -43,7 +43,7 @@ instead of `null`
 1. `getPosition()` -  Please use the `position` property returned by [`getProgress()`](./api/functions/player.md#getprogress).
 1. `getBufferedPosition()` -  Please use the `buffered` property returned by [`getProgress()`](./api/functions/player.md#getprogress).
 1. `getCurrentTrack()` - Please use [`getActiveTrackIndex()`](./api/functions/queue.md#getactivetrackindex).
-1. `Event.PlaybackTrackChanged` - Please use [`Event.PlaybackActiveTrackChanged`](./api/events.md#playbackactivetrackchanged).
+1. `Event.PlaybackTrackChanged` - Please use [`Event.PlaybackActiveTrackChanged`](./api/events.md#playbackactivetrackchanged). Also note that in 4.0 `Event.PlaybackTrackChanged` is no longer emitted when a track repeats.
 
 ### Typescript Imports