Skip to content

Remove queue from LT #108

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

Merged
d0x-dev merged 4 commits into from
Oct 21, 2026
Merged

Remove queue from LT #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
426528d
fix(together): notification controls, seekbar sync, shared queue play…
drkvenom786 Oct 20, 2026
041d260
fix(recognition, dynamicisland): polish recognition overlay, bg play,…
drkvenom786 Oct 21, 2026
c1a4542
fix(listen-together): remove queue screen from ListenTogetherScreen a…
drkvenom786 Oct 21, 2026
d2a7464
fix(listen-together): resolve META_PREFIX constants and verify all im…
drkvenom786 Oct 21, 2026
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
5 changes: 2 additions & 3 deletions app/src/main/java/com/darkxvenom/airbeats/playback/DynamicIslandService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,12 +625,11 @@ private class DynamicIslandView(
drawArtwork(canvas, art, corner = artSize / 2f, rotate = true)
drawSpotifyWaveform(canvas, localWidth - 22f.dp, localHeight / 2f, compact = true)
} else {
// Standard Full Pill Mode (Rotating circular artwork on left, live dot in center, waveform on right)
// Standard Full Pill Mode (Rotating circular artwork on left, waveform on right - center dot removed)
val artSize = (localHeight - 8f.dp).coerceAtLeast(14f.dp)
val art = RectF(5f.dp, 4f.dp, 5f.dp + artSize, 4f.dp + artSize)
drawArtwork(canvas, art, corner = artSize / 2f, rotate = true)
drawLiveDot(canvas, localWidth / 2f, localHeight / 2f)
drawSpotifyWaveform(canvas, localWidth - 34f.dp, localHeight / 2f, compact = true)
drawSpotifyWaveform(canvas, localWidth - 22f.dp, localHeight / 2f, compact = true)
}
}

Expand Down
52 changes: 52 additions & 0 deletions app/src/main/java/com/darkxvenom/airbeats/playback/MediaLibrarySessionCallback.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import androidx.annotation.DrawableRes
import androidx.core.net.toUri
import androidx.media3.common.MediaItem
import androidx.media3.common.MediaMetadata
import androidx.media3.common.Player
import androidx.media3.exoplayer.offline.Download
import androidx.media3.session.LibraryResult
import androidx.media3.session.MediaLibraryService
Expand Down Expand Up @@ -138,6 +139,57 @@ constructor(
return Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
}

override fun onPlayerCommandRequest(
session: MediaSession,
controller: MediaSession.ControllerInfo,
@Player.Command playerCommand: Int,
): Int {
val syncSession = com.darkxvenom.airbeats.utils.ListenTogetherSync.session.value
val isHost = com.darkxvenom.airbeats.utils.ListenTogetherSync.isHost.value
if (syncSession != null && !isHost) {
val allowPlayback = syncSession.settings.allowGuestsToControlPlayback
when (playerCommand) {
Player.COMMAND_SEEK_TO_NEXT,
Player.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM -> {
if (!allowPlayback) {
com.darkxvenom.airbeats.utils.ListenTogetherSync.notifyDisallowedAction("Playback controls are disabled by the host")
return SessionResult.RESULT_ERROR_PERMISSION_DENIED
}
com.darkxvenom.airbeats.utils.ListenTogetherSync.sendGuestAction("skip_next")
com.darkxvenom.airbeats.playback.PlayerConnection.instance?.seekToNext()
return SessionResult.RESULT_SUCCESS
}
Player.COMMAND_SEEK_TO_PREVIOUS,
Player.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM -> {
if (!allowPlayback) {
com.darkxvenom.airbeats.utils.ListenTogetherSync.notifyDisallowedAction("Playback controls are disabled by the host")
return SessionResult.RESULT_ERROR_PERMISSION_DENIED
}
com.darkxvenom.airbeats.utils.ListenTogetherSync.sendGuestAction("skip_previous")
com.darkxvenom.airbeats.playback.PlayerConnection.instance?.seekToPrevious()
return SessionResult.RESULT_SUCCESS
}
Player.COMMAND_PLAY_PAUSE -> {
if (!allowPlayback) {
com.darkxvenom.airbeats.utils.ListenTogetherSync.notifyDisallowedAction("Playback controls are disabled by the host")
return SessionResult.RESULT_ERROR_PERMISSION_DENIED
}
com.darkxvenom.airbeats.utils.ListenTogetherSync.sendGuestAction("toggle_play_pause")
com.darkxvenom.airbeats.playback.PlayerConnection.instance?.togglePlayPause()
return SessionResult.RESULT_SUCCESS
}
Player.COMMAND_SEEK_IN_CURRENT_MEDIA_ITEM,
Player.COMMAND_SEEK_TO_MEDIA_ITEM -> {
if (!allowPlayback) {
com.darkxvenom.airbeats.utils.ListenTogetherSync.notifyDisallowedAction("Playback controls are disabled by the host")
return SessionResult.RESULT_ERROR_PERMISSION_DENIED
}
}
}
}
return super.onPlayerCommandRequest(session, controller, playerCommand)
}

override fun onGetLibraryRoot(
session: MediaLibrarySession,
browser: MediaSession.ControllerInfo,
Expand Down
154 changes: 128 additions & 26 deletions app/src/main/java/com/darkxvenom/airbeats/playback/PlayerConnection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ class PlayerConnection(
Log.d(TAG, "PlayerConnection initialized successfully")
}


private fun initializeStates() {
try {
_playbackState.value = player.playbackState
Expand Down Expand Up @@ -239,12 +238,10 @@ class PlayerConnection(
}
}


fun refreshLikeStatus() {
updateScope.launch(Dispatchers.IO) {
updateLikeStatusForCurrentSong()
}

}

private fun handlePlayerEvents(player: Player, events: Player.Events) {
Expand Down Expand Up @@ -332,7 +329,6 @@ class PlayerConnection(
if (kotlin.math.abs(currentPos - lastPosition) > 500L ||
_duration.value != totalDuration
) {

_currentPosition.value = currentPos
_duration.value = totalDuration
_bufferedPosition.value = buffered
Expand All @@ -359,7 +355,6 @@ class PlayerConnection(
widgetUpdateHandler.postDelayed(pendingWidgetUpdate!!, WIDGET_UPDATE_DEBOUNCE)
}


fun clearError() {
_error.value = null
}
Expand Down Expand Up @@ -509,6 +504,36 @@ class PlayerConnection(

fun removeQueueItem(index: Int, songId: String? = null) {
try {
if (!songId.isNullOrBlank()) {
ListenTogetherSync.removeLocalSharedQueueItem(index, songId)
}

val targetInTimeline = if (!songId.isNullOrBlank()) {
val cur = player.currentMediaItemIndex
var match = -1
if (cur >= 0 && cur + 1 + index < player.mediaItemCount && player.getMediaItemAt(cur + 1 + index).mediaId == songId) {
cur + 1 + index
} else {
for (i in (cur + 1).coerceAtLeast(0) until player.mediaItemCount) {
if (player.getMediaItemAt(i).mediaId == songId) {
match = i
break
}
}
if (match < 0) {
for (i in 0 until player.mediaItemCount) {
if (player.getMediaItemAt(i).mediaId == songId) {
match = i
break
}
}
}
}
match
} else {
if (index in 0 until player.mediaItemCount) index else -1
}

if (ListenTogetherSync.session.value != null && !ListenTogetherSync.isHost.value) {
val allowed = ListenTogetherSync.session.value?.settings?.allowGuestsToAddTracks == true ||
ListenTogetherSync.session.value?.settings?.allowGuestsToControlPlayback == true
Expand All @@ -521,13 +546,17 @@ class PlayerConnection(
if (!songId.isNullOrBlank()) put("songId", songId)
}
ListenTogetherSync.sendGuestAction("remove_track", extraData = data)
if (index in 0 until player.mediaItemCount) {
player.removeMediaItem(index)
if (targetInTimeline >= 0) {
player.removeMediaItem(targetInTimeline)
}
return
}
if (index in 0 until player.mediaItemCount) {
player.removeMediaItem(index)

if (targetInTimeline >= 0) {
player.removeMediaItem(targetInTimeline)
if (ListenTogetherSync.session.value != null && ListenTogetherSync.isHost.value) {
ListenTogetherSync.publishNow()
}
}
} catch (e: Exception) {
Log.e(TAG, "Error removing queue item at index: $index", e)
Expand All @@ -537,6 +566,32 @@ class PlayerConnection(

fun playQueueIndex(index: Int, songId: String? = null) {
try {
val targetInTimeline = if (!songId.isNullOrBlank()) {
val cur = player.currentMediaItemIndex
var match = -1
if (cur >= 0 && cur + 1 + index < player.mediaItemCount && player.getMediaItemAt(cur + 1 + index).mediaId == songId) {
cur + 1 + index
} else {
for (i in (cur + 1).coerceAtLeast(0) until player.mediaItemCount) {
if (player.getMediaItemAt(i).mediaId == songId) {
match = i
break
}
}
if (match < 0) {
for (i in 0 until player.mediaItemCount) {
if (player.getMediaItemAt(i).mediaId == songId) {
match = i
break
}
}
}
}
match
} else {
if (index in 0 until player.mediaItemCount) index else -1
}

if (ListenTogetherSync.session.value != null && !ListenTogetherSync.isHost.value) {
val allowed = ListenTogetherSync.session.value?.settings?.allowGuestsToControlPlayback == true
if (!allowed) {
Expand All @@ -548,40 +603,58 @@ class PlayerConnection(
if (!songId.isNullOrBlank()) put("songId", songId)
}
ListenTogetherSync.sendGuestAction("play_index", extraData = data)
if (index in 0 until player.mediaItemCount) {
player.seekToDefaultPosition(index)
if (targetInTimeline >= 0) {
player.seekToDefaultPosition(targetInTimeline)
player.play()
}
return
}
if (index in 0 until player.mediaItemCount) {
player.seekToDefaultPosition(index)

if (targetInTimeline >= 0) {
player.seekToDefaultPosition(targetInTimeline)
player.play()
if (ListenTogetherSync.session.value != null && ListenTogetherSync.isHost.value) {
ListenTogetherSync.publishNow()
}
}
} catch (e: Exception) {
Log.e(TAG, "Error playing queue item at index: $index", e)
reportException(e)
}
}

fun moveQueueItem(from: Int, to: Int) {
fun moveQueueItem(from: Int, to: Int, songId: String? = null) {
try {
ListenTogetherSync.moveLocalSharedQueueItem(from, to)

val cur = player.currentMediaItemIndex
val realFrom = if (cur >= 0 && cur + 1 + from < player.mediaItemCount) cur + 1 + from else from
val realTo = if (cur >= 0 && cur + 1 + to < player.mediaItemCount) cur + 1 + to else to

if (ListenTogetherSync.session.value != null && !ListenTogetherSync.isHost.value) {
val allowed = ListenTogetherSync.session.value?.settings?.allowGuestsToAddTracks == true ||
ListenTogetherSync.session.value?.settings?.allowGuestsToControlPlayback == true
if (!allowed) {
ListenTogetherSync.notifyDisallowedAction("Reordering queue is disabled by the host")
return
}
val data = org.json.JSONObject().put("from", from).put("to", to)
val data = org.json.JSONObject().apply {
put("from", from)
put("to", to)
if (!songId.isNullOrBlank()) put("songId", songId)
}
ListenTogetherSync.sendGuestAction("move_track", extraData = data)
if (from in 0 until player.mediaItemCount && to in 0 until player.mediaItemCount) {
player.moveMediaItem(from, to)
if (realFrom in 0 until player.mediaItemCount && realTo in 0 until player.mediaItemCount && realFrom != realTo) {
player.moveMediaItem(realFrom, realTo)
}
return
}
if (from in 0 until player.mediaItemCount && to in 0 until player.mediaItemCount) {
player.moveMediaItem(from, to)

if (realFrom in 0 until player.mediaItemCount && realTo in 0 until player.mediaItemCount && realFrom != realTo) {
player.moveMediaItem(realFrom, realTo)
if (ListenTogetherSync.session.value != null && ListenTogetherSync.isHost.value) {
ListenTogetherSync.publishNow()
}
}
} catch (e: Exception) {
Log.e(TAG, "Error moving queue item from $from to $to", e)
Expand Down Expand Up @@ -609,7 +682,6 @@ class PlayerConnection(
}
}


fun isCurrentSongLiked(): Boolean {
return _isLiked.value
}
Expand Down Expand Up @@ -765,29 +837,32 @@ class PlayerConnection(

fun seekTo(positionMs: Long) {
try {
val safeDuration = player.duration.coerceAtLeast(0L)
val targetPosition = if (safeDuration > 0L) positionMs.coerceIn(0L, safeDuration) else positionMs.coerceAtLeast(0L)

if (ListenTogetherSync.session.value != null && !ListenTogetherSync.isHost.value) {
val allowed = ListenTogetherSync.session.value?.settings?.allowGuestsToControlPlayback == true
if (!allowed) {
ListenTogetherSync.notifyDisallowedAction("Playback controls are disabled by the host")
return
}
val safeDuration = player.duration.coerceAtLeast(0L)
val targetPosition = if (safeDuration > 0L) positionMs.coerceIn(0L, safeDuration) else positionMs.coerceAtLeast(0L)
player.seekTo(targetPosition)
_currentPosition.value = targetPosition
ListenTogetherSync.sendGuestAction("seek", targetPosition)
return
}

Log.d(TAG, "Seeking to position: ${positionMs}ms")
if (service.isCasting.value) {
service.seekCastTo(positionMs)
_currentPosition.value = positionMs
return
}
val safeDuration = player.duration.coerceAtLeast(0L)
val targetPosition = if (safeDuration > 0L) positionMs.coerceIn(0L, safeDuration) else positionMs.coerceAtLeast(0L)
player.seekTo(targetPosition)
_currentPosition.value = targetPosition
if (ListenTogetherSync.session.value != null && ListenTogetherSync.isHost.value) {
ListenTogetherSync.publishNow()
}
} catch (e: Exception) {
Log.e(TAG, "Error seeking to position", e)
reportException(e)
Expand Down Expand Up @@ -871,14 +946,40 @@ class PlayerConnection(
updateCanSkipPreviousAndNext()
scheduleWidgetUpdate()
}

if (ListenTogetherSync.session.value != null) {
if (ListenTogetherSync.isHost.value) {
ListenTogetherSync.publishNow()
} else {
ListenTogetherSync.onMediaItemTransitioned(mediaItem?.mediaId)
}
}
}

override fun onPositionDiscontinuity(
oldPosition: Player.PositionInfo,
newPosition: Player.PositionInfo,
reason: Int,
) {
if (reason == Player.DISCONTINUITY_REASON_SEEK) {
val session = ListenTogetherSync.session.value
if (session != null) {
if (ListenTogetherSync.isHost.value) {
ListenTogetherSync.publishNow()
} else {
val allowed = session.settings.allowGuestsToControlPlayback
if (allowed) {
ListenTogetherSync.sendGuestAction("seek", newPosition.positionMs)
}
}
}
}
}

private suspend fun updateLikeStatusForCurrentSong() {
try {
val currentSongId = withContext(Dispatchers.Main) { player.currentMediaItem?.mediaId }
if (currentSongId != null) {
// Consultar la base de datos para obtener el estado actual del like
// Similar a como lo hace Player.kt con currentSong?.song?.liked
val songWithInfo = database.song(currentSongId).first()
_isLiked.value = songWithInfo?.song?.liked ?: false
Timber.tag(TAG).d("Like status updated for song $currentSongId: ${_isLiked.value}")
Expand All @@ -891,6 +992,7 @@ class PlayerConnection(
_isLiked.value = false
}
}

override fun onTimelineChanged(timeline: Timeline, reason: Int) {
Log.d(TAG, "Timeline changed (reason: $reason)")
_queueWindows.value = player.getQueueWindows()
Expand Down
Loading
Loading