Skip to content

Fix notification next/previous, implement seek to start on previous when progress > 3 seconds #2571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janwiebe-jump wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix notification next/previous, implement seek to start on previous when progress > 3 seconds #2571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/src/main/java/com/doublesymmetry/kotlinaudio/models/CustomCommandButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ enum class CustomCommandButton(
),
PREVIOUS(
customAction = "PREVIOUS",
capability = Capability.SKIP_TO_NEXT,
capability = Capability.SKIP_TO_PREVIOUS,
commandButton = CommandButton.Builder()
.setDisplayName("Previous")
.setSessionCommand(SessionCommand("PREVIOUS", Bundle()))
Expand All @@ -39,7 +39,7 @@ enum class CustomCommandButton(
),
NEXT(
customAction = "NEXT",
capability = Capability.SKIP_TO_PREVIOUS,
capability = Capability.SKIP_TO_NEXT,
commandButton = CommandButton.Builder()
.setDisplayName("Next")
.setSessionCommand(SessionCommand("NEXT", Bundle()))
Expand Down
11 changes: 11 additions & 0 deletions android/src/main/java/com/doublesymmetry/kotlinaudio/players/BaseAudioPlayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,12 +476,23 @@ abstract class BaseAudioPlayer internal constructor(

override fun play() {
playerEventHolder.updateOnPlayerActionTriggeredExternally(MediaSessionCallback.PLAY)
super.play()
}

override fun pause() {
playerEventHolder.updateOnPlayerActionTriggeredExternally(MediaSessionCallback.PAUSE)
super.pause()
}

override fun setPlayWhenReady(playWhenReady: Boolean) {
if (playWhenReady) {
playerEventHolder.updateOnPlayerActionTriggeredExternally(MediaSessionCallback.PLAY)
} else {
playerEventHolder.updateOnPlayerActionTriggeredExternally(MediaSessionCallback.PAUSE)
}
super.setPlayWhenReady(playWhenReady)
}

override fun seekToNext() {
playerEventHolder.updateOnPlayerActionTriggeredExternally(MediaSessionCallback.NEXT)
}
Expand Down
114 changes: 103 additions & 11 deletions android/src/main/java/com/doublesymmetry/trackplayer/service/MusicService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,39 @@ class MusicService : HeadlessJsMediaService() {
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
onStartCommandIntentValid = intent != null
Timber.d("onStartCommand: ${intent?.action}, ${intent?.`package`}")
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
// HACK: this is not supposed to be here. I definitely screwed up. but Why?
onMediaKeyEvent(intent)
// Handle custom notification button clicks (NEXT, PREVIOUS, JUMP_FORWARD, JUMP_BACKWARD)
// from Media3's notification UI. This works on all Android versions.
if (intent?.action == ACTION_CUSTOM_NOTIFICATION_ACTION) {
val customAction = intent.getStringExtra(EXTRAS_KEY_CUSTOM_NOTIFICATION_ACTION)

if (customAction != null && ::player.isInitialized) {
when (customAction) {
CustomCommandButton.JUMP_BACKWARD.customAction -> {
player.forwardingPlayer.seekBack()
}
CustomCommandButton.JUMP_FORWARD.customAction -> {
player.forwardingPlayer.seekForward()
}
CustomCommandButton.NEXT.customAction -> {
skipToNext()
}
CustomCommandButton.PREVIOUS.customAction -> {
skipToPrevious()
}
else -> {
Timber.d("Unknown custom action: $customAction")
}
}
}
}

val manufacturer = Build.MANUFACTURER
val brand = Build.BRAND
val isOnePlus = manufacturer.equals("OnePlus", ignoreCase = true) && brand.equals("OnePlus", ignoreCase = true);

if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || isOnePlus && Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
Copy link

@Jojocaster Jojocaster Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙌

// Hack - fixes onMediaKeyEvent on Android < 13 & OxygenOS 14
onMediaKeyEvent(intent)
}
// HACK: Why is onPlay triggering onStartCommand??
if (!commandStarted) {
Expand Down Expand Up @@ -422,7 +452,15 @@ class MusicService : HeadlessJsMediaService() {

@MainThread
fun skipToPrevious() {
player.previous()
val RESTART_THRESHOLD_MS = 3000L // 3 seconds

if (player.position > RESTART_THRESHOLD_MS) {
// Position > 3 seconds: restart current track
seekTo(0f)
} else {
// Position <= 3 seconds: skip to previous track
player.previous()
}
}

@MainThread
Expand Down Expand Up @@ -812,41 +850,84 @@ class MusicService : HeadlessJsMediaService() {
if (keyEvent?.action == KeyEvent.ACTION_DOWN) {
return when (keyEvent.keyCode) {
KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> {
if (::player.isInitialized) {
if (player.isPlaying) {
player.pause()
} else {
player.play()
}
}
emit(MusicEvents.BUTTON_PLAY_PAUSE)
true
}

KeyEvent.KEYCODE_MEDIA_STOP -> {
if (::player.isInitialized) {
player.stop()
}
emit(MusicEvents.BUTTON_STOP)
true
}

KeyEvent.KEYCODE_MEDIA_PAUSE -> {
emit(MusicEvents.BUTTON_PAUSE)
if (::player.isInitialized) {
if (player.isPlaying) {
player.pause()
emit(MusicEvents.BUTTON_PAUSE)
} else {
player.play()
emit(MusicEvents.BUTTON_PLAY)
}
} else {
emit(MusicEvents.BUTTON_PLAY_PAUSE)
}
true
}

KeyEvent.KEYCODE_MEDIA_PLAY -> {
if (::player.isInitialized) {
player.play()
}
emit(MusicEvents.BUTTON_PLAY)
true
}

KeyEvent.KEYCODE_MEDIA_NEXT -> {
if (::player.isInitialized) {
skipToNext()
}
emit(MusicEvents.BUTTON_SKIP_NEXT)
true
}

KeyEvent.KEYCODE_MEDIA_PREVIOUS -> {
if (::player.isInitialized) {
skipToPrevious()
}
emit(MusicEvents.BUTTON_SKIP_PREVIOUS)
true
}

KeyEvent.KEYCODE_MEDIA_FAST_FORWARD, KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD, KeyEvent.KEYCODE_MEDIA_STEP_FORWARD -> {
if (::player.isInitialized) {
val interval = latestOptions?.getDouble(
FORWARD_JUMP_INTERVAL_KEY,
DEFAULT_JUMP_INTERVAL
)?.toLong() ?: DEFAULT_JUMP_INTERVAL.toLong()
seekBy(interval.toFloat())
}
emit(MusicEvents.BUTTON_JUMP_FORWARD)
true
}

KeyEvent.KEYCODE_MEDIA_REWIND, KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD, KeyEvent.KEYCODE_MEDIA_STEP_BACKWARD -> {
if (::player.isInitialized) {
val interval = latestOptions?.getDouble(
BACKWARD_JUMP_INTERVAL_KEY,
DEFAULT_JUMP_INTERVAL
)?.toLong() ?: DEFAULT_JUMP_INTERVAL.toLong()
seekBy(-interval.toFloat())
}
emit(MusicEvents.BUTTON_JUMP_BACKWARD)
true
}
Expand Down Expand Up @@ -931,13 +1012,20 @@ class MusicService : HeadlessJsMediaService() {
command: SessionCommand,
args: Bundle
): ListenableFuture<SessionResult> {
player.forwardingPlayer.let {
when (command.customAction) {
CustomCommandButton.JUMP_BACKWARD.customAction -> { it.seekBack() }
CustomCommandButton.JUMP_FORWARD.customAction -> { it.seekForward() }
CustomCommandButton.NEXT.customAction -> { it.seekToNext() }
CustomCommandButton.PREVIOUS.customAction -> { it.seekToPrevious() }
when (command.customAction) {
CustomCommandButton.JUMP_BACKWARD.customAction -> {
player.forwardingPlayer.seekBack()
}
CustomCommandButton.JUMP_FORWARD.customAction -> {
player.forwardingPlayer.seekForward()
}
CustomCommandButton.NEXT.customAction -> {
skipToNext()
}
CustomCommandButton.PREVIOUS.customAction -> {
skipToPrevious()
}
else -> {}
}
return super.onCustomCommand(session, controller, command, args)
}
Expand Down Expand Up @@ -994,6 +1082,10 @@ class MusicService : HeadlessJsMediaService() {
const val DURATION_KEY = "duration"
const val BUFFERED_POSITION_KEY = "buffered"

// Media3 custom notification action constants
const val ACTION_CUSTOM_NOTIFICATION_ACTION = "androidx.media3.session.CUSTOM_NOTIFICATION_ACTION"
const val EXTRAS_KEY_CUSTOM_NOTIFICATION_ACTION = "androidx.media3.session.EXTRAS_KEY_CUSTOM_NOTIFICATION_ACTION"

const val TASK_KEY = "TrackPlayer"

const val MIN_BUFFER_KEY = "minBuffer"
Expand Down
17 changes: 14 additions & 3 deletions ios/TrackPlayer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,13 +445,24 @@ public class NativeTrackPlayerImpl: NSObject, AudioSessionControllerDelegate {
) {
if (rejectWhenNotInitialized(reject: reject)) { return }

let RESTART_THRESHOLD: Double = 3.0 // 3 seconds

player.previous()

// if an initialTime is passed the seek to it
if (initialTime >= 0) {
self.seekTo(time: initialTime, resolve: resolve, reject: reject)
if player.currentTime > RESTART_THRESHOLD {
// Position > 3 seconds: restart current track
self.seekTo(time: 0.0, resolve: resolve, reject: reject)
} else {
resolve(NSNull())
// Position <= 3 seconds: skip to previous track
player.previous()

// if an initialTime is passed then seek to it
if (initialTime >= 0) {
self.seekTo(time: initialTime, resolve: resolve, reject: reject)
} else {
resolve(NSNull())
}
}
}

Expand Down