chore: version bump

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Pending release...
 
+* fix: updates starred syncing downloads to user defined directory by @eddyizm in https://github.com/eddyizm/tempus/pull/298
+* fix: handle empty albums and null mappings by @eddyizm in https://github.com/eddyizm/tempus/pull/301
+* feat: integrate sort recent searches chronologically by @J4mm3ris in https://github.com/eddyizm/tempus/pull/300
+* feat: add heart to artist/album pages, fixed artist cover art failing by @eddyizm in https://github.com/eddyizm/tempus/pull/303
+
+## [4.4.0](https://github.com/eddyizm/tempo/releases/tag/v4.4.0) (2025-11-29)
+## What's Changed
+* chore: bringing in media service refactor previously reverted after more testing  by @eddyizm in https://github.com/eddyizm/tempus/pull/286
+* fix: refactor start queue to put the db writing in the background to address instant mix bug by @eddyizm in https://github.com/eddyizm/tempus/pull/287
+* Feat: playerqueue fab allows playqueue actions -> saving to playlist, download all, load queue, shuffle, clean queue  by @eddyizm in https://github.com/eddyizm/tempus/pull/288
+* chore(i18n): Update Polish translation by @skajmer in https://github.com/eddyizm/tempus/pull/291
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.3.0...v4.4.0
+
 ## [4.3.0](https://github.com/eddyizm/tempo/releases/tag/v4.3.0) (2025-11-23)
 ## What's Changed
 * chore: Add Obtainium badge to README by @mikaeldui in https://github.com/eddyizm/tempus/pull/280

README.md

@@ -10,8 +10,8 @@
 
 <div align="center">
 
-  <!-- Reproducible build  -->  
-[<img src="https://shields.rbtlog.dev/simple/com.eddyizm.degoogled.tempus" alt="RB Status">](https://shields.rbtlog.dev/com.eddyizm.degoogled.tempus) 
+  <!-- Reproducible build  -->
+<a href="https://shields.rbtlog.dev/com.eddyizm.degoogled.tempus"><img src="https://shields.rbtlog.dev/simple/com.eddyizm.degoogled.tempus" alt="RB Status"></a>
 
 </div>
 

app/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdkVersion 24
         targetSdk 35
 
-        versionCode 8
-        versionName '4.3.0'
+        versionCode 10
+        versionName '4.5.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
         javaCompileOptions {

app/src/degoogled/java/com/cappielloantonio/tempo/service/MediaService.kt

@@ -1,579 +1,6 @@
 package com.cappielloantonio.tempo.service
 
-import android.annotation.SuppressLint
-import android.app.PendingIntent.FLAG_IMMUTABLE
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.app.TaskStackBuilder
-import android.content.Intent
-import android.net.ConnectivityManager
-import android.net.Network
-import android.net.NetworkCapabilities
-import android.os.Binder
-import android.os.Bundle
-import android.os.IBinder
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import androidx.media3.common.*
 import androidx.media3.common.util.UnstableApi
-import androidx.media3.exoplayer.DefaultLoadControl
-import androidx.media3.exoplayer.ExoPlayer
-import androidx.media3.exoplayer.source.MediaSource
-import androidx.media3.exoplayer.source.ShuffleOrder.DefaultShuffleOrder
-import androidx.media3.session.*
-import androidx.media3.session.MediaSession.ControllerInfo
-import com.cappielloantonio.tempo.R
-import com.cappielloantonio.tempo.repository.QueueRepository
-import com.cappielloantonio.tempo.ui.activity.MainActivity
-import com.cappielloantonio.tempo.util.AssetLinkUtil
-import com.cappielloantonio.tempo.util.Constants
-import com.cappielloantonio.tempo.util.DownloadUtil
-import com.cappielloantonio.tempo.util.DynamicMediaSourceFactory
-import com.cappielloantonio.tempo.util.MappingUtil
-import com.cappielloantonio.tempo.util.Preferences
-import com.cappielloantonio.tempo.util.ReplayGainUtil
-import com.cappielloantonio.tempo.widget.WidgetUpdateManager
-import com.google.common.collect.ImmutableList
-import com.google.common.util.concurrent.Futures
-import com.google.common.util.concurrent.ListenableFuture
-
 
 @UnstableApi
-class MediaService : MediaLibraryService() {
-    private val TAG = "MediaService"
-    private val librarySessionCallback = CustomMediaLibrarySessionCallback()
-
-    private lateinit var player: ExoPlayer
-    private lateinit var mediaLibrarySession: MediaLibrarySession
-    private lateinit var shuffleCommands: List<CommandButton>
-    private lateinit var repeatCommands: List<CommandButton>
-    private lateinit var networkCallback: CustomNetworkCallback
-    lateinit var equalizerManager: EqualizerManager
-
-    private var customLayout = ImmutableList.of<CommandButton>()
-    private val widgetUpdateHandler = Handler(Looper.getMainLooper())
-    private var widgetUpdateScheduled = false
-    private val widgetUpdateRunnable = object : Runnable {
-        override fun run() {
-            if (!player.isPlaying) {
-                widgetUpdateScheduled = false
-                return
-            }
-            updateWidget()
-            widgetUpdateHandler.postDelayed(this, WIDGET_UPDATE_INTERVAL_MS)
-        }
-    }
-
-    inner class LocalBinder : Binder() {
-        fun getEqualizerManager(): EqualizerManager {
-            return this@MediaService.equalizerManager
-        }
-    }
-
-    private val binder = LocalBinder()
-
-    companion object {
-        private const val CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON =
-            "android.media3.session.demo.SHUFFLE_ON"
-        private const val CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_OFF =
-            "android.media3.session.demo.SHUFFLE_OFF"
-        private const val CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_OFF =
-            "android.media3.session.demo.REPEAT_OFF"
-        private const val CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE =
-            "android.media3.session.demo.REPEAT_ONE"
-        private const val CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL =
-            "android.media3.session.demo.REPEAT_ALL"
-        const val ACTION_BIND_EQUALIZER = "com.cappielloantonio.tempo.service.BIND_EQUALIZER"
-        const val ACTION_EQUALIZER_UPDATED = "com.cappielloantonio.tempo.service.EQUALIZER_UPDATED"
-    }
-
-    fun updateMediaItems() {
-        Log.d(TAG, "update items");
-        val n = player.mediaItemCount
-        val k = player.currentMediaItemIndex
-        val current = player.currentPosition
-        val items = (0 .. n-1).map{i -> MappingUtil.mapMediaItem(player.getMediaItemAt(i))}
-        player.clearMediaItems()
-        player.setMediaItems(items, k, current)
-    }
-
-    inner class CustomNetworkCallback : ConnectivityManager.NetworkCallback() {
-        var wasWifi = false
-
-        init {
-            val manager = getSystemService(ConnectivityManager::class.java)
-            val network = manager.activeNetwork
-            val capabilities = manager.getNetworkCapabilities(network)
-            if (capabilities != null)
-                wasWifi = capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
-        }
-
-        override fun onCapabilitiesChanged(network : Network, networkCapabilities : NetworkCapabilities) {
-            val isWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
-            if (isWifi != wasWifi) {
-                wasWifi = isWifi
-                widgetUpdateHandler.post(Runnable {
-                    updateMediaItems()
-                })
-            }
-        }
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-
-        initializeCustomCommands()
-        initializePlayer()
-        initializeMediaLibrarySession()
-        restorePlayerFromQueue()
-        initializePlayerListener()
-        initializeEqualizerManager()
-        initializeNetworkListener()
-
-        setPlayer(player)
-    }
-
-    override fun onGetSession(controllerInfo: ControllerInfo): MediaLibrarySession {
-        return mediaLibrarySession
-    }
-
-    override fun onDestroy() {
-        releaseNetworkCallback()
-        equalizerManager.release()
-        stopWidgetUpdates()
-        releasePlayer()
-        super.onDestroy()
-    }
-
-    override fun onBind(intent: Intent?): IBinder? {
-        // Check if the intent is for our custom equalizer binder
-        if (intent?.action == ACTION_BIND_EQUALIZER) {
-            return binder
-        }
-        // Otherwise, handle it as a normal MediaLibraryService connection
-        return super.onBind(intent)
-    }
-
-    private inner class CustomMediaLibrarySessionCallback : MediaLibrarySession.Callback {
-
-        override fun onConnect(
-            session: MediaSession,
-            controller: ControllerInfo
-        ): MediaSession.ConnectionResult {
-            val connectionResult = super.onConnect(session, controller)
-            val availableSessionCommands = connectionResult.availableSessionCommands.buildUpon()
-
-            (shuffleCommands + repeatCommands).forEach { commandButton ->
-                commandButton.sessionCommand?.let { availableSessionCommands.add(it) }
-            }
-
-            customLayout = buildCustomLayout(session.player)
-
-            return MediaSession.ConnectionResult.AcceptedResultBuilder(session)
-                .setAvailableSessionCommands(availableSessionCommands.build())
-                .setAvailablePlayerCommands(connectionResult.availablePlayerCommands)
-                .setCustomLayout(customLayout)
-                .build()
-        }
-
-        override fun onPostConnect(session: MediaSession, controller: ControllerInfo) {
-            if (!customLayout.isEmpty() && controller.controllerVersion != 0) {
-                ignoreFuture(mediaLibrarySession.setCustomLayout(controller, customLayout))
-            }
-        }
-
-        fun buildCustomLayout(player: Player): ImmutableList<CommandButton> {
-            val shuffle = shuffleCommands[if (player.shuffleModeEnabled) 1 else 0]
-            val repeat = when (player.repeatMode) {
-                Player.REPEAT_MODE_ONE -> repeatCommands[1]
-                Player.REPEAT_MODE_ALL -> repeatCommands[2]
-                else -> repeatCommands[0]
-            }
-            return ImmutableList.of(shuffle, repeat)
-        }
-
-        override fun onCustomCommand(
-            session: MediaSession,
-            controller: ControllerInfo,
-            customCommand: SessionCommand,
-            args: Bundle
-        ): ListenableFuture<SessionResult> {
-            when (customCommand.customAction) {
-                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON -> player.shuffleModeEnabled = true
-                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_OFF -> player.shuffleModeEnabled = false
-                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_OFF,
-                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL,
-                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> {
-                    val nextMode = when (player.repeatMode) {
-                        Player.REPEAT_MODE_ONE -> Player.REPEAT_MODE_ALL
-                        Player.REPEAT_MODE_OFF -> Player.REPEAT_MODE_ONE
-                        else -> Player.REPEAT_MODE_OFF
-                    }
-                    player.repeatMode = nextMode
-                }
-            }
-
-            customLayout = librarySessionCallback.buildCustomLayout(player)
-            session.setCustomLayout(customLayout)
-
-            return Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
-        }
-
-        override fun onAddMediaItems(
-            mediaSession: MediaSession,
-            controller: ControllerInfo,
-            mediaItems: List<MediaItem>
-        ): ListenableFuture<List<MediaItem>> {
-            val updatedMediaItems = mediaItems.map { mediaItem ->
-                val mediaMetadata = mediaItem.mediaMetadata
-
-                val newMetadata = mediaMetadata.buildUpon()
-                    .setArtist(
-                        if (mediaMetadata.artist != null) mediaMetadata.artist
-                        else mediaMetadata.extras?.getString("uri") ?: ""
-                    )
-                    .build()
-
-                mediaItem.buildUpon()
-                    .setUri(mediaItem.requestMetadata.mediaUri)
-                    .setMediaMetadata(newMetadata)
-                    .setMimeType(MimeTypes.BASE_TYPE_AUDIO)
-                    .build()
-            }
-            return Futures.immediateFuture(updatedMediaItems)
-        }
-    }
-
-    private fun initializeCustomCommands() {
-        shuffleCommands = listOf(
-            getShuffleCommandButton(
-                SessionCommand(CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON, Bundle.EMPTY)
-            ),
-            getShuffleCommandButton(
-                SessionCommand(CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_OFF, Bundle.EMPTY)
-            )
-        )
-
-        repeatCommands = listOf(
-            getRepeatCommandButton(
-                SessionCommand(CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_OFF, Bundle.EMPTY)
-            ),
-            getRepeatCommandButton(
-                SessionCommand(CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE, Bundle.EMPTY)
-            ),
-            getRepeatCommandButton(
-                SessionCommand(CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL, Bundle.EMPTY)
-            )
-        )
-
-        customLayout = ImmutableList.of(shuffleCommands[0], repeatCommands[0])
-    }
-
-    private fun initializePlayer() {
-        player = ExoPlayer.Builder(this)
-            .setRenderersFactory(getRenderersFactory())
-            .setMediaSourceFactory(getMediaSourceFactory())
-            .setAudioAttributes(AudioAttributes.DEFAULT, true)
-            .setHandleAudioBecomingNoisy(true)
-            .setWakeMode(C.WAKE_MODE_NETWORK)
-            .setLoadControl(initializeLoadControl())
-            .build()
-
-        player.shuffleModeEnabled = Preferences.isShuffleModeEnabled()
-        player.repeatMode = Preferences.getRepeatMode()
-    }
-
-    private fun initializeEqualizerManager() {
-        equalizerManager = EqualizerManager()
-        val audioSessionId = player.audioSessionId
-        attachEqualizerIfPossible(audioSessionId)
-    }
-
-    private fun initializeMediaLibrarySession() {
-        val sessionActivityPendingIntent =
-            TaskStackBuilder.create(this).run {
-                addNextIntent(Intent(this@MediaService, MainActivity::class.java))
-                getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)
-            }
-
-        mediaLibrarySession =
-            MediaLibrarySession.Builder(this, player, librarySessionCallback)
-                .setSessionActivity(sessionActivityPendingIntent)
-                .build()
-
-        if (!customLayout.isEmpty()) {
-            mediaLibrarySession.setCustomLayout(customLayout)
-        }
-    }
-
-    private fun initializeNetworkListener() {
-        networkCallback = CustomNetworkCallback()
-        getSystemService(ConnectivityManager::class.java).registerDefaultNetworkCallback(networkCallback)
-        updateMediaItems()
-    }
-
-    private fun restorePlayerFromQueue() {
-        if (player.mediaItemCount > 0) return
-
-        val queueRepository = QueueRepository()
-        val storedQueue = queueRepository.media
-        if (storedQueue.isNullOrEmpty()) return
-
-        val mediaItems = MappingUtil.mapMediaItems(storedQueue)
-        if (mediaItems.isEmpty()) return
-
-        val lastIndex = try {
-            queueRepository.lastPlayedMediaIndex
-        } catch (_: Exception) {
-            0
-        }.coerceIn(0, mediaItems.size - 1)
-
-        val lastPosition = try {
-            queueRepository.lastPlayedMediaTimestamp
-        } catch (_: Exception) {
-            0L
-        }.let { if (it < 0L) 0L else it }
-
-        player.setMediaItems(mediaItems, lastIndex, lastPosition)
-        player.prepare()
-        updateWidget()
-    }
-
-    private fun initializePlayerListener() {
-        player.addListener(object : Player.Listener {
-            override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
-                if (mediaItem == null) return
-
-                if (reason == Player.MEDIA_ITEM_TRANSITION_REASON_SEEK || reason == Player.MEDIA_ITEM_TRANSITION_REASON_AUTO) {
-                    MediaManager.setLastPlayedTimestamp(mediaItem)
-                }
-                updateWidget()
-            }
-
-            override fun onTracksChanged(tracks: Tracks) {
-                Log.d(TAG, "onTracksChanged " + player.currentMediaItemIndex);
-                ReplayGainUtil.setReplayGain(player, tracks)
-                val currentMediaItem = player.currentMediaItem
-                if (currentMediaItem != null) {
-                    val item = MappingUtil.mapMediaItem(currentMediaItem)
-                    if (item.mediaMetadata.extras != null)
-                        MediaManager.scrobble(item, false)
-
-                    if (player.nextMediaItemIndex == C.INDEX_UNSET)
-                        MediaManager.continuousPlay(player.currentMediaItem)
-                }
-
-                // https://stackoverflow.com/questions/56937283/exoplayer-shuffle-doesnt-reproduce-all-the-songs
-                if (MediaManager.justStarted.get()) {
-                    Log.d(TAG, "update shuffle order")
-                    MediaManager.justStarted.set(false)
-                    val shuffledList = IntArray(player.mediaItemCount) { i -> i }
-                    shuffledList.shuffle()
-                    val index = shuffledList.indexOf(player.currentMediaItemIndex)
-                    // swap current media index to the first index
-                    if (index > -1 && shuffledList.isNotEmpty())
-                        run { val tmp = shuffledList[0]; shuffledList[0] = shuffledList[index]; shuffledList[index] = tmp}
-                    player.shuffleOrder = DefaultShuffleOrder(shuffledList, kotlin.random.Random.nextLong())
-                }
-            }
-
-            override fun onIsPlayingChanged(isPlaying: Boolean) {
-                if (!isPlaying) {
-                    MediaManager.setPlayingPausedTimestamp(
-                        player.currentMediaItem,
-                        player.currentPosition
-                    )
-                } else {
-                    MediaManager.scrobble(player.currentMediaItem, false)
-                }
-                if (isPlaying) {
-                    scheduleWidgetUpdates()
-                } else {
-                    stopWidgetUpdates()
-                }
-                updateWidget()
-            }
-
-            override fun onPlaybackStateChanged(playbackState: Int) {
-                super.onPlaybackStateChanged(playbackState)
-                if (!player.hasNextMediaItem() &&
-                    playbackState == Player.STATE_ENDED &&
-                    player.mediaMetadata.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC
-                ) {
-                    MediaManager.scrobble(player.currentMediaItem, true)
-                    MediaManager.saveChronology(player.currentMediaItem)
-                }
-                updateWidget()
-            }
-
-            override fun onPositionDiscontinuity(
-                oldPosition: Player.PositionInfo,
-                newPosition: Player.PositionInfo,
-                reason: Int
-            ) {
-                super.onPositionDiscontinuity(oldPosition, newPosition, reason)
-
-                if (reason == Player.DISCONTINUITY_REASON_AUTO_TRANSITION) {
-                    if (oldPosition.mediaItem?.mediaMetadata?.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC) {
-                        MediaManager.scrobble(oldPosition.mediaItem, true)
-                        MediaManager.saveChronology(oldPosition.mediaItem)
-                    }
-
-                    if (newPosition.mediaItem?.mediaMetadata?.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC) {
-                        MediaManager.setLastPlayedTimestamp(newPosition.mediaItem)
-                    }
-                }
-            }
-
-            override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) {
-                Preferences.setShuffleModeEnabled(shuffleModeEnabled)
-                customLayout = librarySessionCallback.buildCustomLayout(player)
-                mediaLibrarySession.setCustomLayout(customLayout)
-            }
-
-            override fun onRepeatModeChanged(repeatMode: Int) {
-                Preferences.setRepeatMode(repeatMode)
-                customLayout = librarySessionCallback.buildCustomLayout(player)
-                mediaLibrarySession.setCustomLayout(customLayout)
-            }
-
-            override fun onAudioSessionIdChanged(audioSessionId: Int) {
-                attachEqualizerIfPossible(audioSessionId)
-            }
-        })
-        if (player.isPlaying) {
-            scheduleWidgetUpdates()
-        }
-    }
-
-    private fun setPlayer(player: Player) {
-        mediaLibrarySession.player = player
-    }
-
-    private fun releasePlayer() {
-        player.release()
-        mediaLibrarySession.release()
-    }
-
-    private fun releaseNetworkCallback() {
-        getSystemService(ConnectivityManager::class.java).unregisterNetworkCallback(networkCallback)
-    }
-
-    @SuppressLint("PrivateResource")
-    private fun getShuffleCommandButton(sessionCommand: SessionCommand): CommandButton {
-        val isOn = sessionCommand.customAction == CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON
-        return CommandButton.Builder()
-            .setDisplayName(
-                getString(
-                    if (isOn) R.string.exo_controls_shuffle_on_description
-                    else R.string.exo_controls_shuffle_off_description
-                )
-            )
-            .setSessionCommand(sessionCommand)
-            .setIconResId(if (isOn) R.drawable.exo_icon_shuffle_off else R.drawable.exo_icon_shuffle_on)
-            .build()
-    }
-
-    @SuppressLint("PrivateResource")
-    private fun getRepeatCommandButton(sessionCommand: SessionCommand): CommandButton {
-        val icon = when (sessionCommand.customAction) {
-            CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> R.drawable.exo_icon_repeat_one
-            CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL -> R.drawable.exo_icon_repeat_all
-            else -> R.drawable.exo_icon_repeat_off
-        }
-        val description = when (sessionCommand.customAction) {
-            CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> R.string.exo_controls_repeat_one_description
-            CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL -> R.string.exo_controls_repeat_all_description
-            else -> R.string.exo_controls_repeat_off_description
-        }
-        return CommandButton.Builder()
-            .setDisplayName(getString(description))
-            .setSessionCommand(sessionCommand)
-            .setIconResId(icon)
-            .build()
-    }
-
-    private fun ignoreFuture(@Suppress("UNUSED_PARAMETER") customLayout: ListenableFuture<SessionResult>) {
-        /* Do nothing. */
-    }
-
-    private fun initializeLoadControl(): DefaultLoadControl {
-        return DefaultLoadControl.Builder()
-            .setBufferDurationsMs(
-                (DefaultLoadControl.DEFAULT_MIN_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
-                (DefaultLoadControl.DEFAULT_MAX_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
-                DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS,
-                DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS
-            )
-            .build()
-    }
-
-    private fun updateWidget() {
-        val mi = player.currentMediaItem
-        val title = mi?.mediaMetadata?.title?.toString()
-            ?: mi?.mediaMetadata?.extras?.getString("title")
-        val artist = mi?.mediaMetadata?.artist?.toString()
-            ?: mi?.mediaMetadata?.extras?.getString("artist")
-        val album = mi?.mediaMetadata?.albumTitle?.toString()
-            ?: mi?.mediaMetadata?.extras?.getString("album")
-        val extras = mi?.mediaMetadata?.extras
-        val coverId = extras?.getString("coverArtId")
-        val songLink = extras?.getString("assetLinkSong")
-            ?: AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_SONG, extras?.getString("id"))
-        val albumLink = extras?.getString("assetLinkAlbum")
-            ?: AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ALBUM, extras?.getString("albumId"))
-        val artistLink = extras?.getString("assetLinkArtist")
-            ?: AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ARTIST, extras?.getString("artistId"))
-        val position = player.currentPosition.takeIf { it != C.TIME_UNSET } ?: 0L
-        val duration = player.duration.takeIf { it != C.TIME_UNSET } ?: 0L
-        WidgetUpdateManager.updateFromState(
-            this,
-            title ?: "",
-            artist ?: "",
-            album ?: "",
-            coverId,
-            player.isPlaying,
-            player.shuffleModeEnabled,
-            player.repeatMode,
-            position,
-            duration,
-            songLink,
-            albumLink,
-            artistLink
-        )
-    }
-
-    private fun scheduleWidgetUpdates() {
-        if (widgetUpdateScheduled) return
-        widgetUpdateHandler.postDelayed(widgetUpdateRunnable, WIDGET_UPDATE_INTERVAL_MS)
-        widgetUpdateScheduled = true
-    }
-
-    private fun stopWidgetUpdates() {
-        if (!widgetUpdateScheduled) return
-        widgetUpdateHandler.removeCallbacks(widgetUpdateRunnable)
-        widgetUpdateScheduled = false
-    }
-
-    private fun attachEqualizerIfPossible(audioSessionId: Int): Boolean {
-        if (audioSessionId == 0 || audioSessionId == -1) return false
-        val attached = equalizerManager.attachToSession(audioSessionId)
-        if (attached) {
-            val enabled = Preferences.isEqualizerEnabled()
-            equalizerManager.setEnabled(enabled)
-            val bands = equalizerManager.getNumberOfBands()
-            val savedLevels = Preferences.getEqualizerBandLevels(bands)
-            for (i in 0 until bands) {
-                equalizerManager.setBandLevel(i.toShort(), savedLevels[i])
-            }
-            sendBroadcast(Intent(ACTION_EQUALIZER_UPDATED))
-        }
-        return attached
-    }
-
-    private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false)
-
-    private fun getMediaSourceFactory(): MediaSource.Factory = DynamicMediaSourceFactory(this)
-}
-
-private const val WIDGET_UPDATE_INTERVAL_MS = 1000L
+class MediaService : BaseMediaService()

app/src/main/java/com/cappielloantonio/tempo/database/AppDatabase.java

@@ -30,7 +30,7 @@ import com.cappielloantonio.tempo.subsonic.models.Playlist;
 
 @UnstableApi
 @Database(
-        version = 12,
+        version = 13,
         entities = {Queue.class, Server.class, RecentSearch.class, Download.class, Chronology.class, Favorite.class, SessionMediaItem.class, Playlist.class, LyricsCache.class},
         autoMigrations = {@AutoMigration(from = 10, to = 11), @AutoMigration(from = 11, to = 12)}
 )

app/src/main/java/com/cappielloantonio/tempo/database/dao/RecentSearchDao.java

@@ -12,9 +12,12 @@ import java.util.List;
 
 @Dao
 public interface RecentSearchDao {
-    @Query("SELECT * FROM recent_search ORDER BY search DESC")
+    @Query("SELECT search FROM recent_search ORDER BY timestamp DESC")
     List<String> getRecent();
 
+    @Query("SELECT search FROM recent_search ORDER BY search DESC")
+    List<String> getAlpha();
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     void insert(RecentSearch search);
 

app/src/main/java/com/cappielloantonio/tempo/model/RecentSearch.kt

@@ -13,5 +13,8 @@ import kotlinx.parcelize.Parcelize
 data class RecentSearch(
     @PrimaryKey
     @ColumnInfo(name = "search")
-    var search: String
+    var search: String,
+
+    @ColumnInfo(name = "timestamp", defaultValue = "0")
+    var timestamp: Long
 ) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/repository/AlbumRepository.java

@@ -205,6 +205,8 @@ public class AlbumRepository {
     }
 
     public void getInstantMix(AlbumID3 album, int count, MediaCallback callback) {
+        Log.d("AlbumRepository", "Attempting getInstantMix for AlbumID: " + album.getId());
+        
         App.getSubsonicClientInstance(false)
                 .getBrowsingClient()
                 .getSimilarSongs2(album.getId(), count)
@@ -213,8 +215,17 @@ public class AlbumRepository {
                     public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
                         List<Child> songs = new ArrayList<>();
 
-                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getSimilarSongs2() != null) {
-                            songs.addAll(response.body().getSubsonicResponse().getSimilarSongs2().getSongs());
+                        if (response.isSuccessful() 
+                            && response.body() != null 
+                            && response.body().getSubsonicResponse().getSimilarSongs2() != null) {
+                            
+                            List<Child> similarSongs = response.body().getSubsonicResponse().getSimilarSongs2().getSongs();
+                            
+                            if (similarSongs == null) {
+                                Log.w("AlbumRepository", "API successful but 'songs' list was NULL for AlbumID: " + album.getId());
+                            } else {
+                                songs.addAll(similarSongs);
+                            }
                         }
 
                         callback.onLoadMedia(songs);
@@ -298,4 +309,4 @@ public class AlbumRepository {
                     }
                 });
     }
-}
+}

app/src/main/java/com/cappielloantonio/tempo/repository/QueueRepository.java

@@ -1,8 +1,11 @@
 package com.cappielloantonio.tempo.repository;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
 
 import com.cappielloantonio.tempo.App;
 import com.cappielloantonio.tempo.database.AppDatabase;
@@ -52,6 +55,8 @@ public class QueueRepository {
     public MutableLiveData<PlayQueue> getPlayQueue() {
         MutableLiveData<PlayQueue> playQueue = new MutableLiveData<>();
 
+        Log.d(TAG, "Getting play queue from server...");
+
         App.getSubsonicClientInstance(false)
                 .getBookmarksClient()
                 .getPlayQueue()
@@ -59,12 +64,19 @@ public class QueueRepository {
                     @Override
                     public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getPlayQueue() != null) {
-                            playQueue.setValue(response.body().getSubsonicResponse().getPlayQueue());
+                            PlayQueue serverQueue = response.body().getSubsonicResponse().getPlayQueue();
+                            Log.d(TAG, "Server returned play queue with " +
+                                    (serverQueue.getEntries() != null ? serverQueue.getEntries().size() : 0) + " items");
+                            playQueue.setValue(serverQueue);
+                        } else {
+                            Log.d(TAG, "Server returned no play queue");
+                            playQueue.setValue(null);
                         }
                     }
 
                     @Override
                     public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                        Log.e(TAG, "Failed to get play queue", t);
                         playQueue.setValue(null);
                     }
                 });
@@ -73,18 +85,24 @@ public class QueueRepository {
     }
 
     public void savePlayQueue(List<String> ids, String current, long position) {
+        Log.d(TAG, "Saving play queue to server - Items: " + ids.size() + ", Current: " + current);
+
         App.getSubsonicClientInstance(false)
                 .getBookmarksClient()
                 .savePlayQueue(ids, current, position)
                 .enqueue(new Callback<ApiResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
+                        if (response.isSuccessful()) {
+                            Log.d(TAG, "Play queue saved successfully");
+                        } else {
+                            Log.d(TAG, "Play queue save failed with code: " + response.code());
+                        }
                     }
 
                     @Override
                     public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
+                        Log.e(TAG, "Play queue save failed", t);
                     }
                 });
     }
@@ -123,10 +141,9 @@ public class QueueRepository {
 
     private boolean isMediaInQueue(List<Queue> queue, Child media) {
         if (queue == null || media == null) return false;
-        
-        return queue.stream().anyMatch(queueItem -> 
-            queueItem != null && media.getId() != null && 
-            queueItem.getId().equals(media.getId())
+        return queue.stream().anyMatch(queueItem ->
+                queueItem != null && media.getId() != null &&
+                        queueItem.getId().equals(media.getId())
         );
     }
 
@@ -146,8 +163,8 @@ public class QueueRepository {
             List<Child> filteredToAdd = toAdd;
             final List<Queue> finalMedia = media;
             filteredToAdd = toAdd.stream()
-                .filter(child -> !isMediaInQueue(finalMedia, child))
-                .collect(Collectors.toList());
+                    .filter(child -> !isMediaInQueue(finalMedia, child))
+                    .collect(Collectors.toList());
 
             for (int i = 0; i < filteredToAdd.size(); i++) {
                 Queue queueItem = new Queue(filteredToAdd.get(i));

app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java

@@ -13,6 +13,7 @@ import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.subsonic.models.SearchResult2;
 import com.cappielloantonio.tempo.subsonic.models.SearchResult3;
+import com.cappielloantonio.tempo.util.Preferences;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -186,7 +187,12 @@ public class SearchingRepository {
 
         @Override
         public void run() {
-            recent = recentSearchDao.getRecent();
+            if(Preferences.isSearchSortingChronologicallyEnabled()){
+                recent = recentSearchDao.getRecent();
+            }
+            else {
+                recent = recentSearchDao.getAlpha();
+            }
         }
 
         public List<String> getRecent() {

app/src/main/java/com/cappielloantonio/tempo/service/BaseMediaService.kt

@@ -0,0 +1,590 @@
+package com.cappielloantonio.tempo.service
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent.FLAG_IMMUTABLE
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.app.TaskStackBuilder
+import android.content.Context
+import android.content.Intent
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.os.Binder
+import android.os.Bundle
+import android.os.IBinder
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import androidx.media3.common.*
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.DefaultLoadControl
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.source.MediaSource
+import androidx.media3.exoplayer.source.ShuffleOrder.DefaultShuffleOrder
+import androidx.media3.session.*
+import androidx.media3.session.MediaSession.ControllerInfo
+import com.cappielloantonio.tempo.R
+import com.cappielloantonio.tempo.repository.QueueRepository
+import com.cappielloantonio.tempo.ui.activity.MainActivity
+import com.cappielloantonio.tempo.util.*
+import com.cappielloantonio.tempo.widget.WidgetUpdateManager
+import com.google.common.collect.ImmutableList
+import com.google.common.util.concurrent.Futures
+import com.google.common.util.concurrent.ListenableFuture
+
+@UnstableApi
+open class BaseMediaService : MediaLibraryService() {
+    companion object {
+        private const val CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON =
+            "android.media3.session.demo.SHUFFLE_ON"
+        private const val CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_OFF =
+            "android.media3.session.demo.SHUFFLE_OFF"
+        private const val CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_OFF =
+            "android.media3.session.demo.REPEAT_OFF"
+        private const val CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE =
+            "android.media3.session.demo.REPEAT_ONE"
+        private const val CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL =
+            "android.media3.session.demo.REPEAT_ALL"
+        const val ACTION_BIND_EQUALIZER = "com.cappielloantonio.tempo.service.BIND_EQUALIZER"
+        const val ACTION_EQUALIZER_UPDATED = "com.cappielloantonio.tempo.service.EQUALIZER_UPDATED"
+    }
+
+    protected lateinit var exoplayer: ExoPlayer
+    protected lateinit var mediaLibrarySession: MediaLibrarySession
+    private lateinit var networkCallback: CustomNetworkCallback
+    private lateinit var equalizerManager: EqualizerManager
+    private val widgetUpdateHandler = Handler(Looper.getMainLooper())
+    private var widgetUpdateScheduled = false
+    private val widgetUpdateRunnable = object : Runnable {
+        override fun run() {
+            val player = mediaLibrarySession.player
+            if (!player.isPlaying) {
+                widgetUpdateScheduled = false
+                return
+            }
+            updateWidget(player)
+            widgetUpdateHandler.postDelayed(this, WIDGET_UPDATE_INTERVAL_MS)
+        }
+    }
+
+    private val binder = LocalBinder()
+
+    open fun playerInitHook() {
+        initializeExoPlayer()
+        initializeMediaLibrarySession(exoplayer)
+        initializePlayerListener(exoplayer)
+        setPlayer(null, exoplayer)
+    }
+
+    open fun getMediaLibrarySessionCallback(): MediaLibrarySession.Callback {
+        return CustomMediaLibrarySessionCallback(baseContext)
+    }
+
+    fun updateMediaItems(player: Player) {
+        Log.d(javaClass.toString(), "update items")
+        val n = player.mediaItemCount
+        val k = player.currentMediaItemIndex
+        val current = player.currentPosition
+        val items = (0..n - 1).map { MappingUtil.mapMediaItem(player.getMediaItemAt(it)) }
+        player.clearMediaItems()
+        player.setMediaItems(items, k, current)
+    }
+
+    fun restorePlayerFromQueue(player: Player) {
+        if (player.mediaItemCount > 0) return
+
+        val queueRepository = QueueRepository()
+        val storedQueue = queueRepository.media
+        if (storedQueue.isNullOrEmpty()) return
+
+        val mediaItems = MappingUtil.mapMediaItems(storedQueue)
+        if (mediaItems.isEmpty()) return
+
+        val lastIndex = try {
+            queueRepository.lastPlayedMediaIndex
+        } catch (_: Exception) {
+            0
+        }.coerceIn(0, mediaItems.size - 1)
+
+        val lastPosition = try {
+            queueRepository.lastPlayedMediaTimestamp
+        } catch (_: Exception) {
+            0L
+        }.let { if (it < 0L) 0L else it }
+
+        player.setMediaItems(mediaItems, lastIndex, lastPosition)
+        player.prepare()
+        updateWidget(player)
+    }
+
+    fun initializePlayerListener(player: Player) {
+        player.addListener(object : Player.Listener {
+            override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
+                Log.d(javaClass.toString(), "onMediaItemTransition" + player.currentMediaItemIndex)
+                if (mediaItem == null) return
+
+                if (reason == Player.MEDIA_ITEM_TRANSITION_REASON_SEEK || reason == Player.MEDIA_ITEM_TRANSITION_REASON_AUTO) {
+                    MediaManager.setLastPlayedTimestamp(mediaItem)
+                }
+                updateWidget(player)
+            }
+
+            override fun onTracksChanged(tracks: Tracks) {
+                Log.d(javaClass.toString(), "onTracksChanged " + player.currentMediaItemIndex)
+                ReplayGainUtil.setReplayGain(player, tracks)
+                val currentMediaItem = player.currentMediaItem
+                if (currentMediaItem != null) {
+                    val item = MappingUtil.mapMediaItem(currentMediaItem)
+                    if (item.mediaMetadata.extras != null)
+                        MediaManager.scrobble(item, false)
+
+                    if (player.nextMediaItemIndex == C.INDEX_UNSET)
+                        MediaManager.continuousPlay(player.currentMediaItem)
+                }
+
+                if (player is ExoPlayer) {
+                    // https://stackoverflow.com/questions/56937283/exoplayer-shuffle-doesnt-reproduce-all-the-songs
+                    if (MediaManager.justStarted.get()) {
+                        Log.d(javaClass.toString(), "update shuffle order")
+                        MediaManager.justStarted.set(false)
+                        val shuffledList = IntArray(player.mediaItemCount) { i -> i }
+                        shuffledList.shuffle()
+                        val index = shuffledList.indexOf(player.currentMediaItemIndex)
+                        // swap current media index to the first index
+                        if (index > -1 && shuffledList.isNotEmpty()) {
+                            val tmp = shuffledList[0]
+                            shuffledList[0] = shuffledList[index]
+                            shuffledList[index] = tmp
+                        }
+                        player.shuffleOrder =
+                            DefaultShuffleOrder(shuffledList, kotlin.random.Random.nextLong())
+                    }
+                }
+            }
+
+            override fun onIsPlayingChanged(isPlaying: Boolean) {
+                Log.d(javaClass.toString(), "onIsPlayingChanged " + player.currentMediaItemIndex)
+                if (!isPlaying) {
+                    MediaManager.setPlayingPausedTimestamp(
+                        player.currentMediaItem,
+                        player.currentPosition
+                    )
+                } else {
+                    MediaManager.scrobble(player.currentMediaItem, false)
+                }
+                if (isPlaying) {
+                    scheduleWidgetUpdates()
+                } else {
+                    stopWidgetUpdates()
+                }
+                updateWidget(player)
+            }
+
+            override fun onPlaybackStateChanged(playbackState: Int) {
+                Log.d(javaClass.toString(), "onPlaybackStateChanged")
+                super.onPlaybackStateChanged(playbackState)
+                if (!player.hasNextMediaItem() &&
+                    playbackState == Player.STATE_ENDED &&
+                    player.mediaMetadata.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC
+                ) {
+                    MediaManager.scrobble(player.currentMediaItem, true)
+                    MediaManager.saveChronology(player.currentMediaItem)
+                }
+                updateWidget(player)
+            }
+
+            override fun onPositionDiscontinuity(
+                oldPosition: Player.PositionInfo,
+                newPosition: Player.PositionInfo,
+                reason: Int
+            ) {
+                Log.d(javaClass.toString(), "onPositionDiscontinuity")
+                super.onPositionDiscontinuity(oldPosition, newPosition, reason)
+
+                if (reason == Player.DISCONTINUITY_REASON_AUTO_TRANSITION) {
+                    if (oldPosition.mediaItem?.mediaMetadata?.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC) {
+                        MediaManager.scrobble(oldPosition.mediaItem, true)
+                        MediaManager.saveChronology(oldPosition.mediaItem)
+                    }
+
+                    if (newPosition.mediaItem?.mediaMetadata?.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC) {
+                        MediaManager.setLastPlayedTimestamp(newPosition.mediaItem)
+                    }
+                }
+            }
+
+            override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) {
+                Preferences.setShuffleModeEnabled(shuffleModeEnabled)
+            }
+
+            override fun onRepeatModeChanged(repeatMode: Int) {
+                Preferences.setRepeatMode(repeatMode)
+            }
+
+            override fun onAudioSessionIdChanged(audioSessionId: Int) {
+                Log.d(javaClass.toString(), "onAudioSessionIdChanged")
+                attachEqualizerIfPossible(audioSessionId)
+            }
+        })
+        if (player.isPlaying) {
+            scheduleWidgetUpdates()
+        }
+    }
+
+    fun setPlayer(oldPlayer: Player?, newPlayer: Player) {
+        if (oldPlayer === newPlayer) return
+        if (oldPlayer != null) {
+            val currentQueue = getQueueFromPlayer(oldPlayer)
+            val currentIndex = oldPlayer.currentMediaItemIndex
+            val currentPosition = oldPlayer.currentPosition
+            val isPlaying = oldPlayer.playWhenReady
+            oldPlayer.stop()
+            newPlayer.setMediaItems(currentQueue, currentIndex, currentPosition)
+            newPlayer.playWhenReady = isPlaying
+            newPlayer.prepare()
+        }
+        mediaLibrarySession.player = newPlayer
+    }
+
+    open fun releasePlayers() {
+        exoplayer.release()
+    }
+
+    fun getQueueFromPlayer(player: Player): List<MediaItem> {
+        return (0..player.mediaItemCount - 1).map(player::getMediaItemAt)
+    }
+
+    override fun onTaskRemoved(rootIntent: Intent?) {
+        val player = mediaLibrarySession.player
+
+        if (!player.playWhenReady || player.mediaItemCount == 0) {
+            stopSelf()
+        }
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+
+        playerInitHook()
+        initializeEqualizerManager()
+        initializeNetworkListener()
+        restorePlayerFromQueue(mediaLibrarySession.player)
+    }
+
+    override fun onGetSession(controllerInfo: ControllerInfo): MediaLibrarySession {
+        return mediaLibrarySession
+    }
+
+    override fun onDestroy() {
+        releaseNetworkCallback()
+        equalizerManager.release()
+        stopWidgetUpdates()
+        releasePlayers()
+        mediaLibrarySession.release()
+        super.onDestroy()
+    }
+
+    override fun onBind(intent: Intent?): IBinder? {
+        // Check if the intent is for our custom equalizer binder
+        if (intent?.action == ACTION_BIND_EQUALIZER) {
+            return binder
+        }
+        // Otherwise, handle it as a normal MediaLibraryService connection
+        return super.onBind(intent)
+    }
+
+    private fun initializeExoPlayer() {
+        exoplayer = ExoPlayer.Builder(this)
+            .setRenderersFactory(getRenderersFactory())
+            .setMediaSourceFactory(getMediaSourceFactory())
+            .setAudioAttributes(AudioAttributes.DEFAULT, true)
+            .setHandleAudioBecomingNoisy(true)
+            .setWakeMode(C.WAKE_MODE_NETWORK)
+            .setLoadControl(initializeLoadControl())
+            .build()
+
+        exoplayer.shuffleModeEnabled = Preferences.isShuffleModeEnabled()
+        exoplayer.repeatMode = Preferences.getRepeatMode()
+    }
+
+    private fun initializeEqualizerManager() {
+        equalizerManager = EqualizerManager()
+        val audioSessionId = exoplayer.audioSessionId
+        attachEqualizerIfPossible(audioSessionId)
+    }
+
+    private fun initializeMediaLibrarySession(player: Player) {
+        Log.d(javaClass.toString(), "initializeMediaLibrarySession")
+        val sessionActivityPendingIntent =
+            TaskStackBuilder.create(this).run {
+                addNextIntent(Intent(baseContext, MainActivity::class.java))
+                getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)
+            }
+
+        mediaLibrarySession =
+            MediaLibrarySession.Builder(this, player, getMediaLibrarySessionCallback())
+                .setSessionActivity(sessionActivityPendingIntent)
+                .build()
+    }
+
+    private fun initializeNetworkListener() {
+        networkCallback = CustomNetworkCallback()
+        getSystemService(ConnectivityManager::class.java).registerDefaultNetworkCallback(
+            networkCallback
+        )
+        updateMediaItems(mediaLibrarySession.player)
+    }
+
+    private fun initializeLoadControl(): DefaultLoadControl {
+        return DefaultLoadControl.Builder()
+            .setBufferDurationsMs(
+                (DefaultLoadControl.DEFAULT_MIN_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
+                (DefaultLoadControl.DEFAULT_MAX_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
+                DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS,
+                DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS
+            )
+            .build()
+    }
+
+    private fun releaseNetworkCallback() {
+        getSystemService(ConnectivityManager::class.java).unregisterNetworkCallback(networkCallback)
+    }
+
+    private fun updateWidget(player: Player) {
+        val mi = player.currentMediaItem
+        val title = mi?.mediaMetadata?.title?.toString()
+            ?: mi?.mediaMetadata?.extras?.getString("title")
+        val artist = mi?.mediaMetadata?.artist?.toString()
+            ?: mi?.mediaMetadata?.extras?.getString("artist")
+        val album = mi?.mediaMetadata?.albumTitle?.toString()
+            ?: mi?.mediaMetadata?.extras?.getString("album")
+        val extras = mi?.mediaMetadata?.extras
+        val coverId = extras?.getString("coverArtId")
+        val songLink = extras?.getString("assetLinkSong")
+            ?: AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_SONG, extras?.getString("id"))
+        val albumLink = extras?.getString("assetLinkAlbum")
+            ?: AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ALBUM, extras?.getString("albumId"))
+        val artistLink = extras?.getString("assetLinkArtist")
+            ?: AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ARTIST, extras?.getString("artistId"))
+        val position = player.currentPosition.takeIf { it != C.TIME_UNSET } ?: 0L
+        val duration = player.duration.takeIf { it != C.TIME_UNSET } ?: 0L
+        WidgetUpdateManager.updateFromState(
+            this,
+            title ?: "",
+            artist ?: "",
+            album ?: "",
+            coverId,
+            player.isPlaying,
+            player.shuffleModeEnabled,
+            player.repeatMode,
+            position,
+            duration,
+            songLink,
+            albumLink,
+            artistLink
+        )
+    }
+
+    private fun scheduleWidgetUpdates() {
+        if (widgetUpdateScheduled) return
+        widgetUpdateHandler.postDelayed(widgetUpdateRunnable, WIDGET_UPDATE_INTERVAL_MS)
+        widgetUpdateScheduled = true
+    }
+
+    private fun stopWidgetUpdates() {
+        if (!widgetUpdateScheduled) return
+        widgetUpdateHandler.removeCallbacks(widgetUpdateRunnable)
+        widgetUpdateScheduled = false
+    }
+
+    private fun attachEqualizerIfPossible(audioSessionId: Int): Boolean {
+        if (audioSessionId == 0 || audioSessionId == -1) return false
+        val attached = equalizerManager.attachToSession(audioSessionId)
+        if (attached) {
+            val enabled = Preferences.isEqualizerEnabled()
+            equalizerManager.setEnabled(enabled)
+            val bands = equalizerManager.getNumberOfBands()
+            val savedLevels = Preferences.getEqualizerBandLevels(bands)
+            for (i in 0 until bands) {
+                equalizerManager.setBandLevel(i.toShort(), savedLevels[i])
+            }
+            sendBroadcast(Intent(ACTION_EQUALIZER_UPDATED))
+        }
+        return attached
+    }
+
+    private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false)
+
+    private fun getMediaSourceFactory(): MediaSource.Factory = DynamicMediaSourceFactory(this)
+
+    @UnstableApi
+    private class CustomMediaLibrarySessionCallback : MediaLibrarySession.Callback {
+        private val shuffleCommands: List<CommandButton>
+        private val repeatCommands: List<CommandButton>
+
+        constructor(ctx: Context) {
+            shuffleCommands = listOf(
+                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON,
+                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_OFF
+            )
+                .map { getShuffleCommandButton(SessionCommand(it, Bundle.EMPTY), ctx) }
+            repeatCommands = listOf(
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_OFF,
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE,
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL
+            )
+                .map { getRepeatCommandButton(SessionCommand(it, Bundle.EMPTY), ctx) }
+        }
+
+        override fun onConnect(
+            session: MediaSession,
+            controller: ControllerInfo
+        ): MediaSession.ConnectionResult {
+            val connectionResult = super.onConnect(session, controller)
+            val availableSessionCommands = connectionResult.availableSessionCommands.buildUpon()
+
+            (shuffleCommands + repeatCommands).forEach { commandButton ->
+                commandButton.sessionCommand?.let { availableSessionCommands.add(it) }
+            }
+
+            val result = MediaSession.ConnectionResult.AcceptedResultBuilder(session)
+                .setAvailableSessionCommands(availableSessionCommands.build())
+                .setAvailablePlayerCommands(connectionResult.availablePlayerCommands)
+                .setMediaButtonPreferences(buildCustomLayout(session.player))
+                .build()
+            return result
+        }
+
+        override fun onCustomCommand(
+            session: MediaSession,
+            controller: ControllerInfo,
+            customCommand: SessionCommand,
+            args: Bundle
+        ): ListenableFuture<SessionResult> {
+            Log.d(javaClass.toString(), "onCustomCommand")
+            when (customCommand.customAction) {
+                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON -> session.player.shuffleModeEnabled = true
+                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_OFF -> session.player.shuffleModeEnabled = false
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_OFF,
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL,
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> {
+                    val nextMode = when (session.player.repeatMode) {
+                        Player.REPEAT_MODE_ONE -> Player.REPEAT_MODE_ALL
+                        Player.REPEAT_MODE_OFF -> Player.REPEAT_MODE_ONE
+                        else -> Player.REPEAT_MODE_OFF
+                    }
+                    session.player.repeatMode = nextMode
+                }
+            }
+
+            session.setMediaButtonPreferences(buildCustomLayout(session.player))
+            return Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
+        }
+
+        override fun onAddMediaItems(
+            mediaSession: MediaSession,
+            controller: ControllerInfo,
+            mediaItems: List<MediaItem>
+        ): ListenableFuture<List<MediaItem>> {
+            Log.d(javaClass.toString(), "onAddMediaItems")
+            val updatedMediaItems = mediaItems.map { mediaItem ->
+                val mediaMetadata = mediaItem.mediaMetadata
+                val newMetadata = mediaMetadata.buildUpon()
+                    .setArtist(
+                        if (mediaMetadata.artist != null) mediaMetadata.artist
+                        else mediaMetadata.extras?.getString("uri") ?: ""
+                    )
+                    .build()
+
+                mediaItem.buildUpon()
+                    .setUri(mediaItem.requestMetadata.mediaUri)
+                    .setMediaMetadata(newMetadata)
+                    .setMimeType(MimeTypes.BASE_TYPE_AUDIO)
+                    .build()
+            }
+            return Futures.immediateFuture(updatedMediaItems)
+        }
+
+        @SuppressLint("PrivateResource")
+        private fun getShuffleCommandButton(
+            sessionCommand: SessionCommand,
+            ctx: Context
+        ): CommandButton {
+            val isOn = sessionCommand.customAction == CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON
+            return CommandButton.Builder(if (isOn) CommandButton.ICON_SHUFFLE_OFF else CommandButton.ICON_SHUFFLE_ON)
+                .setSessionCommand(sessionCommand)
+                .setDisplayName(
+                    ctx.getString(
+                        if (isOn) R.string.exo_controls_shuffle_on_description
+                        else R.string.exo_controls_shuffle_off_description
+                    )
+                )
+                .build()
+        }
+
+        @SuppressLint("PrivateResource")
+        private fun getRepeatCommandButton(
+            sessionCommand: SessionCommand,
+            ctx: Context
+        ): CommandButton {
+            val icon = when (sessionCommand.customAction) {
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> CommandButton.ICON_REPEAT_ONE
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL -> CommandButton.ICON_REPEAT_ALL
+                else -> CommandButton.ICON_REPEAT_OFF
+            }
+            val description = when (sessionCommand.customAction) {
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> R.string.exo_controls_repeat_one_description
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL -> R.string.exo_controls_repeat_all_description
+                else -> R.string.exo_controls_repeat_off_description
+            }
+            return CommandButton.Builder(icon)
+                .setSessionCommand(sessionCommand)
+                .setDisplayName(ctx.getString(description))
+                .build()
+        }
+
+        private fun buildCustomLayout(player: Player): ImmutableList<CommandButton> {
+            val shuffle = shuffleCommands[if (player.shuffleModeEnabled) 1 else 0]
+            val repeat = when (player.repeatMode) {
+                Player.REPEAT_MODE_ONE -> repeatCommands[1]
+                Player.REPEAT_MODE_ALL -> repeatCommands[2]
+                else -> repeatCommands[0]
+            }
+            return ImmutableList.of(shuffle, repeat)
+        }
+    }
+
+    private inner class CustomNetworkCallback : ConnectivityManager.NetworkCallback() {
+        var wasWifi = false
+
+        init {
+            val manager = getSystemService(ConnectivityManager::class.java)
+            val network = manager.activeNetwork
+            val capabilities = manager.getNetworkCapabilities(network)
+            if (capabilities != null)
+                wasWifi = capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+        }
+
+        override fun onCapabilitiesChanged(
+            network: Network,
+            networkCapabilities: NetworkCapabilities
+        ) {
+            val isWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+            if (isWifi != wasWifi) {
+                wasWifi = isWifi
+                widgetUpdateHandler.post {
+                    updateMediaItems(mediaLibrarySession.player)
+                }
+            }
+        }
+    }
+
+    inner class LocalBinder : Binder() {
+        fun getEqualizerManager(): EqualizerManager {
+            return equalizerManager
+        }
+    }
+}
+
+private const val WIDGET_UPDATE_INTERVAL_MS = 1000L
+

app/src/main/java/com/cappielloantonio/tempo/service/MediaManager.java

@@ -1,14 +1,13 @@
 package com.cappielloantonio.tempo.service;
 
 import android.content.ComponentName;
-import android.util.Log;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.OptIn;
-import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.media3.common.MediaItem;
@@ -188,27 +187,28 @@ public class MediaManager {
                 try {
                     if (mediaBrowserListenableFuture.isDone()) {
                         final MediaBrowser browser = mediaBrowserListenableFuture.get();
+                        final List<MediaItem> items = MappingUtil.mapMediaItems(media);
+                        new Handler(Looper.getMainLooper()).post(() -> {
+                            justStarted.set(true);
+                            browser.setMediaItems(items, startIndex, 0);
+                            browser.prepare();
+
+                            Player.Listener timelineListener = new Player.Listener() {
+                                @Override
+                                public void onTimelineChanged(Timeline timeline, int reason) {
+                                    int itemCount = browser.getMediaItemCount();
+                                    if (itemCount > 0 && startIndex >= 0 && startIndex < itemCount) {
+                                        browser.seekTo(startIndex, 0);
+                                        browser.play();
+                                        browser.removeListener(this);
+                                    }
+                                }
+                            };
+                            browser.addListener(timelineListener);
+                        });
 
                         backgroundExecutor.execute(() -> {
-                            final List<MediaItem> items = MappingUtil.mapMediaItems(media);
                             enqueueDatabase(media, true, 0);
-                            new Handler(Looper.getMainLooper()).post(() -> {
-                                justStarted.set(true);
-                                browser.setMediaItems(items, startIndex, 0);
-                                browser.prepare();
-                                Player.Listener timelineListener = new Player.Listener() {
-                                    @Override
-                                    public void onTimelineChanged(Timeline timeline, int reason) {
-                                        int itemCount = browser.getMediaItemCount();
-                                        if (itemCount > 0 && startIndex >= 0 && startIndex < itemCount) {
-                                            browser.seekTo(startIndex, 0);
-                                            browser.play();
-                                            browser.removeListener(this);
-                                        }
-                                    }
-                                };
-                                browser.addListener(timelineListener);
-                            });
                         });
                     }
                 } catch (ExecutionException | InterruptedException e) {

app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlayerSongQueueAdapter.java

@@ -18,8 +18,10 @@ import com.cappielloantonio.tempo.databinding.ItemPlayerQueueSongBinding;
 import com.cappielloantonio.tempo.glide.CustomGlideRequest;
 import com.cappielloantonio.tempo.interfaces.ClickCallback;
 import com.cappielloantonio.tempo.interfaces.MediaIndexCallback;
+import com.cappielloantonio.tempo.service.DownloaderManager;
 import com.cappielloantonio.tempo.service.MediaManager;
 import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.util.DownloadUtil;
 import com.cappielloantonio.tempo.util.Constants;
 import com.cappielloantonio.tempo.util.MusicUtil;
 import com.cappielloantonio.tempo.util.Preferences;
@@ -94,6 +96,20 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
             }
         });
 
+        DownloaderManager downloaderManager = DownloadUtil.getDownloadTracker(holder.itemView.getContext());
+
+        if (downloaderManager != null) {
+            boolean isDownloaded = downloaderManager.isDownloaded(song.getId());
+
+            if (isDownloaded) {
+                holder.item.downloadIndicatorIcon.setVisibility(View.VISIBLE);
+            } else {
+                holder.item.downloadIndicatorIcon.setVisibility(View.GONE);
+            }
+        } else {
+            holder.item.downloadIndicatorIcon.setVisibility(View.GONE);
+        }
+
         if (Preferences.showItemRating()) {
             if (song.getStarred() == null && song.getUserRating() == null) {
                 holder.item.ratingIndicatorImageView.setVisibility(View.GONE);

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumPageFragment.java

@@ -4,7 +4,7 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Parcelable;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -12,6 +12,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
+import android.widget.ToggleButton;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -60,12 +61,14 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
     private SongHorizontalAdapter songHorizontalAdapter;
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
 
+    /** @noinspection deprecation*/
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
     }
 
+    /** @noinspection deprecation*/
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
@@ -81,7 +84,7 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
         albumPageViewModel = new ViewModelProvider(requireActivity()).get(AlbumPageViewModel.class);
         playbackViewModel = new ViewModelProvider(requireActivity()).get(PlaybackViewModel.class);
 
-        init();
+        init(view);
         initAppBar();
         initAlbumInfoTextButton();
         initAlbumNotes();
@@ -119,12 +122,13 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
         bind = null;
     }
 
+    /** @noinspection deprecation*/
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         if (item.getItemId() == R.id.action_rate_album) {
             Bundle bundle = new Bundle();
             AlbumID3 album = albumPageViewModel.getAlbum().getValue();
-            bundle.putParcelable(Constants.ALBUM_OBJECT, (Parcelable) album);
+            bundle.putParcelable(Constants.ALBUM_OBJECT, album);
             RatingDialog dialog = new RatingDialog();
             dialog.setArguments(bundle);
             dialog.show(requireActivity().getSupportFragmentManager(), null);
@@ -159,8 +163,21 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
         return false;
     }
 
-    private void init() {
-        albumPageViewModel.setAlbum(getViewLifecycleOwner(), requireArguments().getParcelable(Constants.ALBUM_OBJECT));
+    private void init(View view) {
+        AlbumID3 albumArg = requireArguments().getParcelable(Constants.ALBUM_OBJECT);
+        assert albumArg != null;
+        albumPageViewModel.setAlbum(getViewLifecycleOwner(), albumArg);
+        ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite);
+        favoriteToggle.setChecked(albumArg.getStarred() != null);
+
+        favoriteToggle.setOnClickListener(v -> {
+            albumPageViewModel.setFavorite();
+        });
+        albumPageViewModel.getAlbum().observe(getViewLifecycleOwner(), album -> {
+            if (album != null) {
+                favoriteToggle.setChecked(album.getStarred() != null);
+            }
+        });
     }
 
     private void initAppBar() {

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/ArtistPageFragment.java

@@ -2,14 +2,18 @@ package com.cappielloantonio.tempo.ui.fragment;
 
 import android.content.ComponentName;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
+import android.widget.ToggleButton;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.media3.common.util.UnstableApi;
@@ -40,6 +44,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @UnstableApi
 public class ArtistPageFragment extends Fragment implements ClickCallback {
@@ -63,7 +68,7 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
         artistPageViewModel = new ViewModelProvider(requireActivity()).get(ArtistPageViewModel.class);
         playbackViewModel = new ViewModelProvider(requireActivity()).get(PlaybackViewModel.class);
 
-        init();
+        init(view);
         initAppBar();
         initArtistInfo();
         initPlayButtons();
@@ -100,7 +105,7 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
         bind = null;
     }
 
-    private void init() {
+    private void init(View view) {
         artistPageViewModel.setArtist(requireArguments().getParcelable(Constants.ARTIST_OBJECT));
 
         bind.mostStreamedSongTextViewClickable.setOnClickListener(v -> {
@@ -109,6 +114,10 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
             bundle.putParcelable(Constants.ARTIST_OBJECT, artistPageViewModel.getArtist());
             activity.navController.navigate(R.id.action_artistPageFragment_to_songListPageFragment, bundle);
         });
+
+        ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite);
+        favoriteToggle.setChecked(artistPageViewModel.getArtist().getStarred() != null);
+        favoriteToggle.setOnClickListener(v -> artistPageViewModel.setFavorite(requireContext()));
     }
 
     private void initAppBar() {
@@ -133,10 +142,54 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
                 if (bind != null)
                     bind.bioMoreTextViewClickable.setVisibility(artistInfo.getLastFmUrl() != null ? View.VISIBLE : View.GONE);
 
-                if (getContext() != null && bind != null) CustomGlideRequest.Builder
-                        .from(requireContext(), artistPageViewModel.getArtist().getId(), CustomGlideRequest.ResourceType.Artist)
-                        .build()
-                        .into(bind.artistBackdropImageView);
+                if (getContext() != null && bind != null) {
+                    ArtistID3 currentArtist = artistPageViewModel.getArtist();
+                        String primaryId = currentArtist.getCoverArtId() != null && !currentArtist.getCoverArtId().trim().isEmpty()
+                            ? currentArtist.getCoverArtId()
+                            : currentArtist.getId();
+                    
+                    final String fallbackId = (Objects.requireNonNull(primaryId).equals(currentArtist.getCoverArtId()) &&
+                                            currentArtist.getId() != null && 
+                                            !currentArtist.getId().equals(primaryId))
+                            ? currentArtist.getId()
+                            : null;
+                    
+                    CustomGlideRequest.Builder
+                            .from(requireContext(), primaryId, CustomGlideRequest.ResourceType.Artist)
+                            .build()
+                            .listener(new com.bumptech.glide.request.RequestListener<Drawable>() {
+                                @Override
+                                public boolean onLoadFailed(@Nullable com.bumptech.glide.load.engine.GlideException e,
+                                                            Object model,
+                                                            @NonNull com.bumptech.glide.request.target.Target<Drawable> target,
+                                                            boolean isFirstResource) {
+                                    if (e != null) {
+                                        e.getMessage();
+                                        if (e.getMessage().contains("400") && fallbackId != null) {
+
+                                            Log.d("ArtistCover", "Primary ID failed (400), trying fallback: " + fallbackId);
+
+                                            CustomGlideRequest.Builder
+                                                    .from(requireContext(), fallbackId, CustomGlideRequest.ResourceType.Artist)
+                                                    .build()
+                                                    .into(bind.artistBackdropImageView);
+                                            return true;
+                                        }
+                                    }
+                                    return false;
+                                }
+
+                                @Override
+                                public boolean onResourceReady(@NonNull Drawable resource,
+                                                               @NonNull Object model,
+                                                               com.bumptech.glide.request.target.Target<Drawable> target,
+                                                               @NonNull com.bumptech.glide.load.DataSource dataSource,
+                                                               boolean isFirstResource) {
+                                    return false;
+                                }
+                            })
+                            .into(bind.artistBackdropImageView);
+                }
 
                 if (bind != null) bind.bioTextView.setText(normalizedBio);
 
@@ -150,29 +203,24 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
             }
         });
     }
-
     private void initPlayButtons() {
-        bind.artistPageShuffleButton.setOnClickListener(v -> {
-            artistPageViewModel.getArtistShuffleList().observe(getViewLifecycleOwner(), songs -> {
-                if (!songs.isEmpty()) {
-                    MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
-                    activity.setBottomSheetInPeek(true);
-                } else {
-                    Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_tracks), Toast.LENGTH_SHORT).show();
-                }
-            });
-        });
+        bind.artistPageShuffleButton.setOnClickListener(v -> artistPageViewModel.getArtistShuffleList().observe(getViewLifecycleOwner(), songs -> {
+            if (!songs.isEmpty()) {
+                MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
+                activity.setBottomSheetInPeek(true);
+            } else {
+                Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_tracks), Toast.LENGTH_SHORT).show();
+            }
+        }));
 
-        bind.artistPageRadioButton.setOnClickListener(v -> {
-            artistPageViewModel.getArtistInstantMix().observe(getViewLifecycleOwner(), songs -> {
-                if (songs != null && !songs.isEmpty()) {
-                    MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
-                    activity.setBottomSheetInPeek(true);
-                } else {
-                    Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_radio), Toast.LENGTH_SHORT).show();
-                }
-            });
-        });
+        bind.artistPageRadioButton.setOnClickListener(v -> artistPageViewModel.getArtistInstantMix().observe(getViewLifecycleOwner(), songs -> {
+            if (songs != null && !songs.isEmpty()) {
+                MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
+                activity.setBottomSheetInPeek(true);
+            } else {
+                Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_radio), Toast.LENGTH_SHORT).show();
+            }
+        }));
     }
 
     private void initTopSongsView() {

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/EqualizerFragment.kt

@@ -19,6 +19,7 @@ import androidx.fragment.app.Fragment
 import androidx.media3.common.util.UnstableApi
 import com.cappielloantonio.tempo.R
 import com.cappielloantonio.tempo.service.EqualizerManager
+import com.cappielloantonio.tempo.service.BaseMediaService
 import com.cappielloantonio.tempo.service.MediaService
 import com.cappielloantonio.tempo.util.Preferences
 
@@ -35,7 +36,7 @@ class EqualizerFragment : Fragment() {
     private val equalizerUpdatedReceiver = object : BroadcastReceiver() {
         @OptIn(UnstableApi::class)
         override fun onReceive(context: Context?, intent: Intent?) {
-            if (intent?.action == MediaService.ACTION_EQUALIZER_UPDATED) {
+            if (intent?.action == BaseMediaService.ACTION_EQUALIZER_UPDATED) {
                 initUI()
                 restoreEqualizerPreferences()
             }
@@ -45,7 +46,7 @@ class EqualizerFragment : Fragment() {
     private val connection = object : ServiceConnection {
         @OptIn(UnstableApi::class)
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            val binder = service as MediaService.LocalBinder
+            val binder = service as BaseMediaService.LocalBinder
             equalizerManager = binder.getEqualizerManager()
             initUI()
             restoreEqualizerPreferences()
@@ -60,14 +61,14 @@ class EqualizerFragment : Fragment() {
     override fun onStart() {
         super.onStart()
         Intent(requireContext(), MediaService::class.java).also { intent ->
-            intent.action = MediaService.ACTION_BIND_EQUALIZER
+            intent.action = BaseMediaService.ACTION_BIND_EQUALIZER
             requireActivity().bindService(intent, connection, Context.BIND_AUTO_CREATE)
         }
         if (!receiverRegistered) {
             ContextCompat.registerReceiver(
                 requireContext(),
                 equalizerUpdatedReceiver,
-                IntentFilter(MediaService.ACTION_EQUALIZER_UPDATED),
+                IntentFilter(BaseMediaService.ACTION_EQUALIZER_UPDATED),
                 ContextCompat.RECEIVER_NOT_EXPORTED
             )
             receiverRegistered = true

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabMusicFragment.java

@@ -38,10 +38,10 @@ import com.cappielloantonio.tempo.model.HomeSector;
 import com.cappielloantonio.tempo.service.DownloaderManager;
 import com.cappielloantonio.tempo.service.MediaManager;
 import com.cappielloantonio.tempo.service.MediaService;
-import com.cappielloantonio.tempo.subsonic.models.Child;
-import com.cappielloantonio.tempo.subsonic.models.Share;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
+import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.subsonic.models.Share;
 import com.cappielloantonio.tempo.ui.activity.MainActivity;
 import com.cappielloantonio.tempo.ui.adapter.AlbumAdapter;
 import com.cappielloantonio.tempo.ui.adapter.AlbumHorizontalAdapter;
@@ -57,6 +57,8 @@ import com.cappielloantonio.tempo.ui.dialog.HomeRearrangementDialog;
 import com.cappielloantonio.tempo.ui.dialog.PlaylistEditorDialog;
 import com.cappielloantonio.tempo.util.Constants;
 import com.cappielloantonio.tempo.util.DownloadUtil;
+import com.cappielloantonio.tempo.util.ExternalAudioReader;
+import com.cappielloantonio.tempo.util.ExternalAudioWriter;
 import com.cappielloantonio.tempo.util.MappingUtil;
 import com.cappielloantonio.tempo.util.MusicUtil;
 import com.cappielloantonio.tempo.util.Preferences;
@@ -66,8 +68,6 @@ import com.cappielloantonio.tempo.viewmodel.PlaybackViewModel;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.common.util.concurrent.ListenableFuture;
 
-import androidx.media3.common.MediaItem;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -279,51 +279,113 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
     }
 
     private void initSyncStarredView() {
-        if (Preferences.isStarredSyncEnabled() && Preferences.getDownloadDirectoryUri() == null) {
-            homeViewModel.getAllStarredTracks().observeForever(new Observer<List<Child>>() {
+        if (Preferences.isStarredSyncEnabled()) {
+            homeViewModel.getAllStarredTracks().observe(getViewLifecycleOwner(), new Observer<List<Child>>() {
                 @Override
                 public void onChanged(List<Child> songs) {
-                    if (songs != null) {
-                        DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
-                        List<String> toSync = new ArrayList<>();
+                    if (songs != null && !songs.isEmpty()) {
+                        int songsToSyncCount = 0;
+                        List<String> toSyncSample = new ArrayList<>();
 
-                        for (Child song : songs) {
-                            if (!manager.isDownloaded(song.getId())) {
-                                toSync.add(song.getTitle());
-                            }
-                        }
-
-                        if (!toSync.isEmpty()) {
-                            bind.homeSyncStarredCard.setVisibility(View.VISIBLE);
-                            bind.homeSyncStarredTracksToSync.setText(String.join(", ", toSync));
-                        }
-                    }
-
-                    homeViewModel.getAllStarredTracks().removeObserver(this);
-                }
-            });
-        }
-
-        bind.homeSyncStarredCancel.setOnClickListener(v -> bind.homeSyncStarredCard.setVisibility(View.GONE));
-
-        bind.homeSyncStarredDownload.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                homeViewModel.getAllStarredTracks().observeForever(new Observer<List<Child>>() {
-                    @Override
-                    public void onChanged(List<Child> songs) {
-                        if (songs != null) {
+                        if (Preferences.getDownloadDirectoryUri() == null) {
                             DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
-
                             for (Child song : songs) {
                                 if (!manager.isDownloaded(song.getId())) {
-                                    manager.download(MappingUtil.mapDownload(song), new Download(song));
+                                    songsToSyncCount++;
+                                    if (toSyncSample.size() < 3) {
+                                        toSyncSample.add(song.getTitle());
+                                    }
+                                }
+                            }
+                        } else {
+                            for (Child song : songs) {
+                                if (ExternalAudioReader.getUri(song) == null) {
+                                    songsToSyncCount++;
+                                    if (toSyncSample.size() < 3) {
+                                        toSyncSample.add(song.getTitle());
+                                    }
                                 }
                             }
                         }
 
-                        homeViewModel.getAllStarredTracks().removeObserver(this);
+                        if (songsToSyncCount > 0) {
+                            bind.homeSyncStarredCard.setVisibility(View.VISIBLE);
+
+                            StringBuilder displayText = new StringBuilder();
+                            if (!toSyncSample.isEmpty()) {
+                                displayText.append(String.join(", ", toSyncSample));
+                                if (songsToSyncCount > 3) {
+                                    displayText.append("...");
+                                }
+                            }
+
+                            String countText = getResources().getQuantityString(
+                                    R.plurals.home_sync_starred_songs_count,
+                                    songsToSyncCount,
+                                    songsToSyncCount
+                            );
+
+                            if (displayText.length() > 0) {
+                                bind.homeSyncStarredTracksToSync.setText(displayText.toString() + "\n" + countText);
+                            } else {
+                                bind.homeSyncStarredTracksToSync.setText(countText);
+                            }
+
+                            if (getActivity() != null) {
+                                getActivity().runOnUiThread(() -> reorder());
+                            }
+                        } else {
+                            bind.homeSyncStarredCard.setVisibility(View.GONE);
+                        }
+                    }
+                }
+            });
+        }
+
+        bind.homeSyncStarredCancel.setOnClickListener(v -> {
+            bind.homeSyncStarredCard.setVisibility(View.GONE);
+            if (getActivity() != null) {
+                getActivity().runOnUiThread(() -> reorder());
+            }
+        });
+
+        bind.homeSyncStarredDownload.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                homeViewModel.getAllStarredTracks().observe(getViewLifecycleOwner(), new Observer<List<Child>>() {
+                    @Override
+                    public void onChanged(List<Child> songs) {
+                        if (songs != null && !songs.isEmpty()) {
+                            int downloadedCount = 0;
+
+                            if (Preferences.getDownloadDirectoryUri() == null) {
+                                DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
+                                for (Child song : songs) {
+                                    if (!manager.isDownloaded(song.getId())) {
+                                        manager.download(MappingUtil.mapDownload(song), new Download(song));
+                                        downloadedCount++;
+                                    }
+                                }
+                            } else {
+                                for (Child song : songs) {
+                                    if (ExternalAudioReader.getUri(song) == null) {
+                                        ExternalAudioWriter.downloadToUserDirectory(requireContext(), song);
+                                        downloadedCount++;
+                                    }
+                                }
+                            }
+
+                            if (downloadedCount > 0) {
+                                Toast.makeText(requireContext(),
+                                        getResources().getQuantityString(R.plurals.songs_download_started, downloadedCount, downloadedCount),
+                                        Toast.LENGTH_SHORT).show();
+                            }
+                        }
+
                         bind.homeSyncStarredCard.setVisibility(View.GONE);
+                        if (getActivity() != null) {
+                            getActivity().runOnUiThread(() -> reorder());
+                        }
                     }
                 });
             }
@@ -331,6 +393,7 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
     }
 
     private void initSyncStarredAlbumsView() {
+
         if (Preferences.isStarredAlbumsSyncEnabled()) {
             homeViewModel.getStarredAlbums(getViewLifecycleOwner()).observe(getViewLifecycleOwner(), new Observer<List<AlbumID3>>() {
                 @Override
@@ -344,6 +407,9 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
 
         bind.homeSyncStarredAlbumsCancel.setOnClickListener(v -> {
             bind.homeSyncStarredAlbumsCard.setVisibility(View.GONE);
+            if (getActivity() != null) {
+                getActivity().runOnUiThread(() -> reorder());
+            }
         });
 
         bind.homeSyncStarredAlbumsDownload.setOnClickListener(v -> {
@@ -351,24 +417,36 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
                 @Override
                 public void onChanged(List<Child> allSongs) {
                     if (allSongs != null && !allSongs.isEmpty()) {
-                        DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
                         int songsToDownload = 0;
 
-                        for (Child song : allSongs) {
-                            if (!manager.isDownloaded(song.getId())) {
-                                manager.download(MappingUtil.mapDownload(song), new Download(song));
-                                songsToDownload++;
+                        if (Preferences.getDownloadDirectoryUri() == null) {
+                            DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
+                            for (Child song : allSongs) {
+                                if (!manager.isDownloaded(song.getId())) {
+                                    manager.download(MappingUtil.mapDownload(song), new Download(song));
+                                    songsToDownload++;
+                                }
+                            }
+                        } else {
+                            for (Child song : allSongs) {
+                                if (ExternalAudioReader.getUri(song) == null) {
+                                    ExternalAudioWriter.downloadToUserDirectory(requireContext(), song);
+                                    songsToDownload++;
+                                }
                             }
                         }
 
                         if (songsToDownload > 0) {
-                            Toast.makeText(requireContext(), 
-                                getResources().getQuantityString(R.plurals.songs_download_started, songsToDownload, songsToDownload), 
+                            Toast.makeText(requireContext(),
+                                getResources().getQuantityString(R.plurals.songs_download_started, songsToDownload, songsToDownload),
                                 Toast.LENGTH_SHORT).show();
                         }
                     }
-                    
+
                     bind.homeSyncStarredAlbumsCard.setVisibility(View.GONE);
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(() -> reorder());
+                    }
                 }
             });
         });
@@ -379,33 +457,73 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
             @Override
             public void onChanged(List<Child> allSongs) {
                 if (allSongs != null) {
-                    DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
                     int songsToDownload = 0;
                     List<String> albumsNeedingSync = new ArrayList<>();
 
-                    for (AlbumID3 album : albums) {
-                        boolean albumNeedsSync = false;
-                        // Check if any songs from this album need downloading
-                        for (Child song : allSongs) {
-                            if (song.getAlbumId() != null && song.getAlbumId().equals(album.getId()) && 
-                                !manager.isDownloaded(song.getId())) {
-                                songsToDownload++;
-                                albumNeedsSync = true;
+                    if (Preferences.getDownloadDirectoryUri() == null) {
+                        DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
+                        
+                        for (AlbumID3 album : albums) {
+                            boolean albumNeedsSync = false;
+                            for (Child song : allSongs) {
+                                if (song.getAlbumId() != null && song.getAlbumId().equals(album.getId()) &&
+                                        !manager.isDownloaded(song.getId())) {
+                                    songsToDownload++;
+                                    albumNeedsSync = true;
+                                }
+                            }
+                            if (albumNeedsSync) {
+                                albumsNeedingSync.add(album.getName());
                             }
                         }
-                        if (albumNeedsSync) {
-                            albumsNeedingSync.add(album.getName());
+                    } else {
+                        for (AlbumID3 album : albums) {
+                            boolean albumNeedsSync = false;
+                            for (Child song : allSongs) {
+                                if (song.getAlbumId() != null && song.getAlbumId().equals(album.getId()) &&
+                                        ExternalAudioReader.getUri(song) == null) {
+                                    songsToDownload++;
+                                    albumNeedsSync = true;
+                                }
+                            }
+                            if (albumNeedsSync) {
+                                albumsNeedingSync.add(album.getName());
+                            }
                         }
                     }
 
                     if (songsToDownload > 0) {
                         bind.homeSyncStarredAlbumsCard.setVisibility(View.VISIBLE);
-                        String message = getResources().getQuantityString(
-                            R.plurals.home_sync_starred_albums_count, 
-                            albumsNeedingSync.size(), 
+                        
+                        StringBuilder displayText = new StringBuilder();
+                        List<String> sampleAlbums = new ArrayList<>();
+                        
+                        for (int i = 0; i < Math.min(albumsNeedingSync.size(), 3); i++) {
+                            sampleAlbums.add(albumsNeedingSync.get(i));
+                        }
+                        
+                        if (!sampleAlbums.isEmpty()) {
+                            displayText.append(String.join(", ", sampleAlbums));
+                            if (albumsNeedingSync.size() > 3) {
+                                displayText.append("...");
+                            }
+                        }
+                        
+                        String countText = getResources().getQuantityString(
+                            R.plurals.home_sync_starred_albums_count,
+                            albumsNeedingSync.size(),
                             albumsNeedingSync.size()
                         );
-                        bind.homeSyncStarredAlbumsToSync.setText(message);
+                        
+                        if (displayText.length() > 0) {
+                            bind.homeSyncStarredAlbumsToSync.setText(displayText.toString() + "\n" + countText);
+                        } else {
+                            bind.homeSyncStarredAlbumsToSync.setText(countText);
+                        }
+                        
+                        if (getActivity() != null) {
+                            getActivity().runOnUiThread(() -> reorder());
+                        }
                     } else {
                         bind.homeSyncStarredAlbumsCard.setVisibility(View.GONE);
                     }
@@ -428,6 +546,9 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
 
         bind.homeSyncStarredArtistsCancel.setOnClickListener(v -> {
             bind.homeSyncStarredArtistsCard.setVisibility(View.GONE);
+            if (getActivity() != null) {
+                getActivity().runOnUiThread(() -> reorder());
+            }
         });
 
         bind.homeSyncStarredArtistsDownload.setOnClickListener(v -> {
@@ -435,24 +556,36 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
                 @Override
                 public void onChanged(List<Child> allSongs) {
                     if (allSongs != null && !allSongs.isEmpty()) {
-                        DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
                         int songsToDownload = 0;
 
-                        for (Child song : allSongs) {
-                            if (!manager.isDownloaded(song.getId())) {
-                                manager.download(MappingUtil.mapDownload(song), new Download(song));
-                                songsToDownload++;
+                        if (Preferences.getDownloadDirectoryUri() == null) {
+                            DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
+                            for (Child song : allSongs) {
+                                if (!manager.isDownloaded(song.getId())) {
+                                    manager.download(MappingUtil.mapDownload(song), new Download(song));
+                                    songsToDownload++;
+                                }
+                            }
+                        } else {
+                            for (Child song : allSongs) {
+                                if (ExternalAudioReader.getUri(song) == null) {
+                                    ExternalAudioWriter.downloadToUserDirectory(requireContext(), song);
+                                    songsToDownload++;
+                                }
                             }
                         }
 
                         if (songsToDownload > 0) {
-                            Toast.makeText(requireContext(), 
-                                getResources().getQuantityString(R.plurals.songs_download_started, songsToDownload, songsToDownload), 
+                            Toast.makeText(requireContext(),
+                                getResources().getQuantityString(R.plurals.songs_download_started, songsToDownload, songsToDownload),
                                 Toast.LENGTH_SHORT).show();
                         }
                     }
-                    
+
                     bind.homeSyncStarredArtistsCard.setVisibility(View.GONE);
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(() -> reorder());
+                    }
                 }
             });
         });
@@ -463,33 +596,73 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
             @Override
             public void onChanged(List<Child> allSongs) {
                 if (allSongs != null) {
-                    DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
                     int songsToDownload = 0;
                     List<String> artistsNeedingSync = new ArrayList<>();
 
-                    for (ArtistID3 artist : artists) {
-                        boolean artistNeedsSync = false;
-                        // Check if any songs from this artist need downloading
-                        for (Child song : allSongs) {
-                            if (song.getArtistId() != null && song.getArtistId().equals(artist.getId()) && 
-                                !manager.isDownloaded(song.getId())) {
-                                songsToDownload++;
-                                artistNeedsSync = true;
+                    if (Preferences.getDownloadDirectoryUri() == null) {
+                        DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
+                        
+                        for (ArtistID3 artist : artists) {
+                            boolean artistNeedsSync = false;
+                            for (Child song : allSongs) {
+                                if (song.getArtistId() != null && song.getArtistId().equals(artist.getId()) &&
+                                        !manager.isDownloaded(song.getId())) {
+                                    songsToDownload++;
+                                    artistNeedsSync = true;
+                                }
+                            }
+                            if (artistNeedsSync) {
+                                artistsNeedingSync.add(artist.getName());
                             }
                         }
-                        if (artistNeedsSync) {
-                            artistsNeedingSync.add(artist.getName());
+                    } else {
+                        for (ArtistID3 artist : artists) {
+                            boolean artistNeedsSync = false;
+                            for (Child song : allSongs) {
+                                if (song.getArtistId() != null && song.getArtistId().equals(artist.getId()) &&
+                                        ExternalAudioReader.getUri(song) == null) {
+                                    songsToDownload++;
+                                    artistNeedsSync = true;
+                                }
+                            }
+                            if (artistNeedsSync) {
+                                artistsNeedingSync.add(artist.getName());
+                            }
                         }
                     }
 
                     if (songsToDownload > 0) {
                         bind.homeSyncStarredArtistsCard.setVisibility(View.VISIBLE);
-                        String message = getResources().getQuantityString(
-                            R.plurals.home_sync_starred_artists_count, 
-                            artistsNeedingSync.size(), 
+                        
+                        StringBuilder displayText = new StringBuilder();
+                        List<String> sampleArtists = new ArrayList<>();
+                        
+                        for (int i = 0; i < Math.min(artistsNeedingSync.size(), 3); i++) {
+                            sampleArtists.add(artistsNeedingSync.get(i));
+                        }
+                        
+                        if (!sampleArtists.isEmpty()) {
+                            displayText.append(String.join(", ", sampleArtists));
+                            if (artistsNeedingSync.size() > 3) {
+                                displayText.append("...");
+                            }
+                        }
+                        
+                        String countText = getResources().getQuantityString(
+                            R.plurals.home_sync_starred_artists_count,
+                            artistsNeedingSync.size(),
                             artistsNeedingSync.size()
                         );
-                        bind.homeSyncStarredArtistsToSync.setText(message);
+                        
+                        if (displayText.length() > 0) {
+                            bind.homeSyncStarredArtistsToSync.setText(displayText.toString() + "\n" + countText);
+                        } else {
+                            bind.homeSyncStarredArtistsToSync.setText(countText);
+                        }
+                        
+                        if (getActivity() != null) {
+                            getActivity().runOnUiThread(() -> reorder());
+                        }
                     } else {
                         bind.homeSyncStarredArtistsCard.setVisibility(View.GONE);
                     }
@@ -497,7 +670,7 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
             }
         });
     }
-    
+
     private void initDiscoverSongSlideView() {
         if (homeViewModel.checkHomeSectorVisibility(Constants.HOME_SECTOR_DISCOVERY)) return;
 
@@ -962,6 +1135,18 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
         if (bind != null && homeViewModel.getHomeSectorList() != null) {
             bind.homeLinearLayoutContainer.removeAllViews();
 
+            if (bind.homeSyncStarredCard.getVisibility() == View.VISIBLE) {
+                bind.homeLinearLayoutContainer.addView(bind.homeSyncStarredCard);
+            }
+
+            if (bind.homeSyncStarredAlbumsCard.getVisibility() == View.VISIBLE) {
+                bind.homeLinearLayoutContainer.addView(bind.homeSyncStarredAlbumsCard);
+            }
+
+            if (bind.homeSyncStarredArtistsCard.getVisibility() == View.VISIBLE) {
+                bind.homeLinearLayoutContainer.addView(bind.homeSyncStarredArtistsCard);
+            }
+
             for (HomeSector sector : homeViewModel.getHomeSectorList()) {
                 if (!sector.isVisible()) continue;
 

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerQueueFragment.java

@@ -2,16 +2,20 @@ package com.cappielloantonio.tempo.ui.fragment;
 
 import android.content.ComponentName;
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.lifecycle.Observer;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.session.MediaBrowser;
+import androidx.media3.common.MediaItem;
 import androidx.media3.session.SessionToken;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -19,11 +23,17 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.cappielloantonio.tempo.databinding.InnerFragmentPlayerQueueBinding;
 import com.cappielloantonio.tempo.interfaces.ClickCallback;
+import com.cappielloantonio.tempo.service.DownloaderManager;
 import com.cappielloantonio.tempo.service.MediaManager;
 import com.cappielloantonio.tempo.service.MediaService;
 import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.subsonic.models.PlayQueue;
 import com.cappielloantonio.tempo.ui.adapter.PlayerSongQueueAdapter;
+import com.cappielloantonio.tempo.ui.dialog.PlaylistChooserDialog;
 import com.cappielloantonio.tempo.util.Constants;
+import com.cappielloantonio.tempo.util.DownloadUtil;
+import com.cappielloantonio.tempo.util.MappingUtil;
+import com.cappielloantonio.tempo.util.Preferences;
 import com.cappielloantonio.tempo.viewmodel.PlaybackViewModel;
 import com.cappielloantonio.tempo.viewmodel.PlayerBottomSheetViewModel;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -31,6 +41,7 @@ import com.google.common.util.concurrent.MoreExecutors;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.stream.Collectors;
 
 @UnstableApi
@@ -39,6 +50,18 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
 
     private InnerFragmentPlayerQueueBinding bind;
 
+    private com.google.android.material.floatingactionbutton.FloatingActionButton fabMenuToggle;
+    private com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton fabClearQueue;
+    private com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton fabShuffleQueue;
+
+    private com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton fabSaveToPlaylist;
+    private com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton fabDownloadAll;
+    private com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton fabLoadQueue;
+
+    private boolean isMenuOpen = false;
+    private final int ANIMATION_DURATION = 250; 
+    private final float FAB_VERTICAL_SPACING_DP = 70f;
+
     private PlayerBottomSheetViewModel playerBottomSheetViewModel;
     private PlaybackViewModel playbackViewModel;
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
@@ -53,6 +76,27 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
         playerBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(PlayerBottomSheetViewModel.class);
         playbackViewModel = new ViewModelProvider(requireActivity()).get(PlaybackViewModel.class);
 
+        fabMenuToggle = bind.fabMenuToggle;
+        fabClearQueue = bind.fabClearQueue;
+        fabShuffleQueue = bind.fabShuffleQueue;
+
+        fabSaveToPlaylist = bind.fabSaveToPlaylist;
+        fabDownloadAll = bind.fabDownloadAll;
+        fabLoadQueue = bind.fabLoadQueue;
+
+        fabMenuToggle.setOnClickListener(v -> toggleFabMenu());
+        fabClearQueue.setOnClickListener(v -> handleClearQueueClick());
+        fabShuffleQueue.setOnClickListener(v -> handleShuffleQueueClick());
+
+        fabSaveToPlaylist.setOnClickListener(v -> handleSaveToPlaylistClick());
+        fabDownloadAll.setOnClickListener(v -> handleDownloadAllClick());
+        fabLoadQueue.setOnClickListener(v -> handleLoadQueueClick());
+
+        // Hide Load Queue FAB if sync is disabled
+        if (!Preferences.isSyncronizationEnabled()) {
+            fabLoadQueue.setVisibility(View.GONE);
+        }
+
         initQueueRecyclerView();
 
         return view;
@@ -62,8 +106,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
     public void onStart() {
         super.onStart();
         initializeBrowser();
-        bindMediaController();
-
         MediaManager.registerPlaybackObserver(mediaBrowserListenableFuture, playbackViewModel);
         observePlayback();
     }
@@ -105,18 +147,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
         MediaBrowser.releaseFuture(mediaBrowserListenableFuture);
     }
 
-    private void bindMediaController() {
-        mediaBrowserListenableFuture.addListener(() -> {
-            try {
-                MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
-                initShuffleButton(mediaBrowser);
-                initCleanButton(mediaBrowser);
-            } catch (Exception exception) {
-                exception.printStackTrace();
-            }
-        }, MoreExecutors.directExecutor());
-    }
-
     private void setMediaBrowserListenableFuture() {
         playerSongQueueAdapter.setMediaBrowserListenableFuture(mediaBrowserListenableFuture);
     }
@@ -149,18 +179,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
 
                 fromPosition = viewHolder.getBindingAdapterPosition();
                 toPosition = target.getBindingAdapterPosition();
-
-                /*
-                 * Per spostare un elemento nella coda devo:
-                 *    - Spostare graficamente la traccia da una posizione all'altra con Collections.swap()
-                 *    - Spostare nel db la traccia, tramite QueueRepository
-                 *    - Notificare il Service dell'avvenuto spostamento con MusicPlayerRemote.moveSong()
-                 *
-                 * In onMove prendo la posizione di inizio e fine, ma solo al rilascio dell'elemento procedo allo spostamento
-                 * In questo modo evito che ad ogni cambio di posizione vada a riscrivere nel db
-                 * Al rilascio dell'elemento chiamo il metodo clearView()
-                 */
-
                 Collections.swap(playerSongQueueAdapter.getItems(), fromPosition, toPosition);
                 recyclerView.getAdapter().notifyItemMoved(fromPosition, toPosition);
 
@@ -188,46 +206,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
         }).attachToRecyclerView(bind.playerQueueRecyclerView);
     }
 
-    private void initShuffleButton(MediaBrowser mediaBrowser) {
-        bind.playerShuffleQueueFab.setOnClickListener(view -> {
-            int startPosition = mediaBrowser.getCurrentMediaItemIndex() + 1;
-            int endPosition = playerSongQueueAdapter.getItems().size() - 1;
-
-            if (startPosition < endPosition) {
-                ArrayList<Integer> pool = new ArrayList<>();
-
-                for (int i = startPosition; i <= endPosition; i++) {
-                    pool.add(i);
-                }
-
-                while (pool.size() >= 2) {
-                    int fromPosition = (int) (Math.random() * (pool.size()));
-                    int positionA = pool.get(fromPosition);
-                    pool.remove(fromPosition);
-
-                    int toPosition = (int) (Math.random() * (pool.size()));
-                    int positionB = pool.get(toPosition);
-                    pool.remove(toPosition);
-
-                    Collections.swap(playerSongQueueAdapter.getItems(), positionA, positionB);
-                    bind.playerQueueRecyclerView.getAdapter().notifyItemMoved(positionA, positionB);
-                }
-
-                MediaManager.shuffle(mediaBrowserListenableFuture, playerSongQueueAdapter.getItems(), startPosition, endPosition);
-            }
-        });
-    }
-
-    private void initCleanButton(MediaBrowser mediaBrowser) {
-        bind.playerCleanQueueButton.setOnClickListener(view -> {
-            int startPosition = mediaBrowser.getCurrentMediaItemIndex() + 1;
-            int endPosition = playerSongQueueAdapter.getItems().size();
-
-            MediaManager.removeRange(mediaBrowserListenableFuture, playerSongQueueAdapter.getItems(), startPosition, endPosition);
-            bind.playerQueueRecyclerView.getAdapter().notifyItemRangeRemoved(startPosition, endPosition);
-        });
-    }
-
     private void updateNowPlayingItem() {
         playerSongQueueAdapter.notifyDataSetChanged();
     }
@@ -259,4 +237,216 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
             playerSongQueueAdapter.setPlaybackState(id, playing != null && playing);
         }
     }
+
+    /**
+     * Toggles the visibility and animates all six secondary FABs.
+     */
+    private void toggleFabMenu() {
+        if (isMenuOpen) {
+            // CLOSE MENU (Reverse order for visual effect)
+            if (Preferences.isSyncronizationEnabled()) {
+                closeFab(fabLoadQueue, 4);
+            }
+            closeFab(fabSaveToPlaylist, 3); 
+            closeFab(fabClearQueue, 2);
+            closeFab(fabDownloadAll, 1);
+            closeFab(fabShuffleQueue, 0);
+            
+            fabMenuToggle.animate().rotation(0f).setDuration(ANIMATION_DURATION).start();
+        } else {
+            // OPEN MENU (lowest index at bottom)
+            openFab(fabShuffleQueue, 0);
+            openFab(fabDownloadAll, 1);
+            openFab(fabClearQueue, 2);
+            openFab(fabSaveToPlaylist, 3);
+            if (Preferences.isSyncronizationEnabled()) {
+                openFab(fabLoadQueue, 4);
+            }
+            fabMenuToggle.animate().rotation(45f).setDuration(ANIMATION_DURATION).start();
+        }
+        isMenuOpen = !isMenuOpen;
+    }
+
+    private void openFab(View fab, int index) {
+        final float displacement = getResources().getDisplayMetrics().density * (FAB_VERTICAL_SPACING_DP * (index + 1));
+        
+        fab.setVisibility(View.VISIBLE);
+        fab.setAlpha(0f);
+        fab.setTranslationY(displacement); // Start at the hidden (closed) position
+        
+        fab.animate()
+        .translationY(0f)
+        .alpha(1f)
+        .setDuration(ANIMATION_DURATION)
+        .start();
+    }
+
+    private void closeFab(View fab, int index) {
+        final float displacement = getResources().getDisplayMetrics().density * (FAB_VERTICAL_SPACING_DP * (index + 1));
+
+        fab.animate()
+        .translationY(displacement)
+        .alpha(0f)
+        .setDuration(ANIMATION_DURATION)
+        .withEndAction(() -> fab.setVisibility(View.GONE))
+        .start();
+    }
+
+    private void handleShuffleQueueClick() {
+        Log.d(TAG, "Shuffle Queue Clicked!");
+
+        mediaBrowserListenableFuture.addListener(() -> {
+            try {
+                MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
+                int startPosition = mediaBrowser.getCurrentMediaItemIndex() + 1;
+                int endPosition = playerSongQueueAdapter.getItems().size() - 1;
+
+                if (startPosition < endPosition) {
+                    ArrayList<Integer> pool = new ArrayList<>();
+
+                    for (int i = startPosition; i <= endPosition; i++) {
+                        pool.add(i);
+                    }
+
+                    while (pool.size() >= 2) {
+                        int fromPosition = (int) (Math.random() * (pool.size()));
+                        int positionA = pool.get(fromPosition);
+                        pool.remove(fromPosition);
+
+                        int toPosition = (int) (Math.random() * (pool.size()));
+                        int positionB = pool.get(toPosition);
+                        pool.remove(toPosition);
+
+                        Collections.swap(playerSongQueueAdapter.getItems(), positionA, positionB);
+                        bind.playerQueueRecyclerView.getAdapter().notifyItemMoved(positionA, positionB);
+                    }
+
+                    MediaManager.shuffle(mediaBrowserListenableFuture, playerSongQueueAdapter.getItems(), startPosition, endPosition);
+                }
+
+            } catch (Exception e) {
+                Log.e(TAG, "Error shuffling queue", e);
+            }
+
+            toggleFabMenu();
+        }, MoreExecutors.directExecutor());
+    }
+
+    private void handleClearQueueClick() {
+        Log.d(TAG, "Clear Queue Clicked!");
+
+        mediaBrowserListenableFuture.addListener(() -> {
+            try {
+                MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
+                int startPosition = mediaBrowser.getCurrentMediaItemIndex() + 1;
+                int endPosition = playerSongQueueAdapter.getItems().size();
+
+                MediaManager.removeRange(mediaBrowserListenableFuture, playerSongQueueAdapter.getItems(), startPosition, endPosition);
+                bind.playerQueueRecyclerView.getAdapter().notifyItemRangeRemoved(startPosition, endPosition - startPosition);
+
+            } catch (Exception e) {
+                Log.e(TAG, "Error clearing queue", e);
+            }
+
+            toggleFabMenu();
+        }, MoreExecutors.directExecutor());
+    }
+
+    private void handleSaveToPlaylistClick() {
+        Log.d(TAG, "Save to Playlist Clicked!");
+
+        List<Child> queueSongs = playerSongQueueAdapter.getItems();
+
+        if (queueSongs == null || queueSongs.isEmpty()) {
+            Toast.makeText(requireContext(), "Queue is empty", Toast.LENGTH_SHORT).show();
+            toggleFabMenu();
+            return;
+        }
+
+        Bundle bundle = new Bundle();
+        bundle.putParcelableArrayList(Constants.TRACKS_OBJECT, new ArrayList<>(queueSongs));
+
+        PlaylistChooserDialog dialog = new PlaylistChooserDialog();
+        dialog.setArguments(bundle);
+        dialog.show(requireActivity().getSupportFragmentManager(), null);
+
+        toggleFabMenu();
+    }
+
+    private void handleDownloadAllClick() {
+        Log.d(TAG, "Download All Clicked!");
+
+        List<Child> queueSongs = playerSongQueueAdapter.getItems();
+
+        if (queueSongs == null || queueSongs.isEmpty()) {
+            Toast.makeText(requireContext(), "Queue is empty", Toast.LENGTH_SHORT).show();
+            toggleFabMenu();
+            return;
+        }
+
+        List<MediaItem> mediaItemsToDownload = MappingUtil.mapMediaItems(queueSongs);
+
+        List<com.cappielloantonio.tempo.model.Download> downloadModels = new ArrayList<>();
+
+        for (Child child : queueSongs) {
+            com.cappielloantonio.tempo.model.Download downloadModel =
+                    new com.cappielloantonio.tempo.model.Download(child);
+            downloadModel.setArtist(child.getArtist());
+            downloadModel.setAlbum(child.getAlbum());
+            downloadModel.setCoverArtId(child.getCoverArtId());
+            downloadModels.add(downloadModel);
+        }
+
+        DownloaderManager downloaderManager = DownloadUtil.getDownloadTracker(requireContext());
+
+        if (downloaderManager != null) {
+            downloaderManager.download(mediaItemsToDownload, downloadModels);
+            Toast.makeText(requireContext(), "Starting download of " + queueSongs.size() + " songs in the background.", Toast.LENGTH_SHORT).show();
+        } else {
+            Log.e(TAG, "DownloaderManager not initialized. Check DownloadUtil.");
+            Toast.makeText(requireContext(), "Download service unavailable.", Toast.LENGTH_SHORT).show();
+        }
+        toggleFabMenu();
+    }
+
+    private void handleLoadQueueClick() {
+        Log.d(TAG, "Load Queue Clicked!");
+        if (!Preferences.isSyncronizationEnabled()) {
+            toggleFabMenu();
+            return;
+        }
+
+        PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(PlayerBottomSheetViewModel.class);
+        
+        playerBottomSheetViewModel.getPlayQueue().observe(getViewLifecycleOwner(), new Observer<PlayQueue>() {
+            @Override
+            public void onChanged(PlayQueue playQueue) {
+                playerBottomSheetViewModel.getPlayQueue().removeObserver(this);
+                
+                if (playQueue != null && playQueue.getEntries() != null && !playQueue.getEntries().isEmpty()) {
+                    int currentIndex = 0;
+                    for (int i = 0; i < playQueue.getEntries().size(); i++) {
+                        if (playQueue.getEntries().get(i).getId().equals(playQueue.getCurrent())) {
+                            currentIndex = i;
+                            break;
+                        }
+                    }
+                    
+                    MediaManager.startQueue(mediaBrowserListenableFuture, playQueue.getEntries(), currentIndex);
+                    
+                    Toast.makeText(requireContext(), "Queue loaded", Toast.LENGTH_SHORT).show();
+                } else {
+                    Toast.makeText(requireContext(), "No saved queue found", Toast.LENGTH_SHORT).show();
+                }
+                
+                toggleFabMenu();
+            }
+        });
+
+        new Handler().postDelayed(() -> {
+            if (isMenuOpen) {
+                toggleFabMenu();
+            }
+        }, 1000);
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java

@@ -2,6 +2,7 @@ package com.cappielloantonio.tempo.util;
 
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 
 import androidx.annotation.OptIn;
 import androidx.lifecycle.LifecycleOwner;
@@ -35,84 +36,106 @@ public class MappingUtil {
         return mediaItems;
     }
 
+    private static final String TAG = "MappingUtil";
+
     public static MediaItem mapMediaItem(Child media) {
-        Uri uri = getUri(media);
-        Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(media.getCoverArtId(), Preferences.getImageSize()));
+        try {
+            Uri uri = getUri(media);
+            String coverArtId = media.getCoverArtId();
+            Uri artworkUri = null;
 
-        Bundle bundle = new Bundle();
-        bundle.putString("id", media.getId());
-        bundle.putString("parentId", media.getParentId());
-        bundle.putBoolean("isDir", media.isDir());
-        bundle.putString("title", media.getTitle());
-        bundle.putString("album", media.getAlbum());
-        bundle.putString("artist", media.getArtist());
-        bundle.putInt("track", media.getTrack() != null ? media.getTrack() : 0);
-        bundle.putInt("year", media.getYear() != null ? media.getYear() : 0);
-        bundle.putString("genre", media.getGenre());
-        bundle.putString("coverArtId", media.getCoverArtId());
-        bundle.putLong("size", media.getSize() != null ? media.getSize() : 0);
-        bundle.putString("contentType", media.getContentType());
-        bundle.putString("suffix", media.getSuffix());
-        bundle.putString("transcodedContentType", media.getTranscodedContentType());
-        bundle.putString("transcodedSuffix", media.getTranscodedSuffix());
-        bundle.putInt("duration", media.getDuration() != null ? media.getDuration() : 0);
-        bundle.putInt("bitrate", media.getBitrate() != null ? media.getBitrate() : 0);
-        bundle.putInt("samplingRate", media.getSamplingRate() != null ? media.getSamplingRate() : 0);
-        bundle.putInt("bitDepth", media.getBitDepth() != null ? media.getBitDepth() : 0);
-        bundle.putString("path", media.getPath());
-        bundle.putBoolean("isVideo", media.isVideo());
-        bundle.putInt("userRating", media.getUserRating() != null ? media.getUserRating() : 0);
-        bundle.putDouble("averageRating", media.getAverageRating() != null ? media.getAverageRating() : 0);
-        bundle.putLong("playCount", media.getPlayCount() != null ? media.getPlayCount() : 0);
-        bundle.putInt("discNumber", media.getDiscNumber() != null ? media.getDiscNumber() : 0);
-        bundle.putLong("created", media.getCreated() != null ? media.getCreated().getTime() : 0);
-        bundle.putLong("starred", media.getStarred() != null ? media.getStarred().getTime() : 0);
-        bundle.putString("albumId", media.getAlbumId());
-        bundle.putString("artistId", media.getArtistId());
-        bundle.putString("type", Constants.MEDIA_TYPE_MUSIC);
-        bundle.putLong("bookmarkPosition", media.getBookmarkPosition() != null ? media.getBookmarkPosition() : 0);
-        bundle.putInt("originalWidth", media.getOriginalWidth() != null ? media.getOriginalWidth() : 0);
-        bundle.putInt("originalHeight", media.getOriginalHeight() != null ? media.getOriginalHeight() : 0);
-        bundle.putString("uri", uri.toString());
-        bundle.putString("assetLinkSong", AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_SONG, media.getId()));
-        bundle.putString("assetLinkAlbum", AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ALBUM, media.getAlbumId()));
-        bundle.putString("assetLinkArtist", AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ARTIST, media.getArtistId()));
-        bundle.putString("assetLinkGenre", AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_GENRE, media.getGenre()));
-        Integer year = media.getYear();
-        bundle.putString("assetLinkYear", year != null && year != 0 ? AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_YEAR, String.valueOf(year)) : null);
+            if (coverArtId != null) {
+                artworkUri = Uri.parse(CustomGlideRequest.createUrl(coverArtId, Preferences.getImageSize()));
+            }
 
-        return new MediaItem.Builder()
-                .setMediaId(media.getId())
-                .setMediaMetadata(
-                        new MediaMetadata.Builder()
-                                .setTitle(media.getTitle())
-                                .setTrackNumber(media.getTrack() != null ? media.getTrack() : 0)
-                                .setDiscNumber(media.getDiscNumber() != null ? media.getDiscNumber() : 0)
-                                .setReleaseYear(media.getYear() != null ? media.getYear() : 0)
-                                .setAlbumTitle(media.getAlbum())
-                                .setArtist(media.getArtist())
-                                .setArtworkUri(artworkUri)
-                                .setUserRating(new HeartRating(media.getStarred() != null))
-                                .setSupportedCommands(
+            Bundle bundle = new Bundle();
+            bundle.putString("id", media.getId());
+            bundle.putString("parentId", media.getParentId());
+            bundle.putBoolean("isDir", media.isDir());
+            
+            bundle.putString("title", media.getTitle());
+            bundle.putString("album", media.getAlbum());
+            bundle.putString("artist", media.getArtist());
+
+            bundle.putInt("track", media.getTrack() != null ? media.getTrack() : 0);
+            bundle.putInt("year", media.getYear() != null ? media.getYear() : 0);
+            bundle.putString("genre", media.getGenre());
+            bundle.putString("coverArtId", coverArtId);
+            bundle.putLong("size", media.getSize() != null ? media.getSize() : 0);
+            bundle.putString("contentType", media.getContentType());
+            bundle.putString("suffix", media.getSuffix());
+            bundle.putString("transcodedContentType", media.getTranscodedContentType());
+            bundle.putString("transcodedSuffix", media.getTranscodedSuffix());
+            bundle.putInt("duration", media.getDuration() != null ? media.getDuration() : 0);
+            bundle.putInt("bitrate", media.getBitrate() != null ? media.getBitrate() : 0);
+            bundle.putInt("samplingRate", media.getSamplingRate() != null ? media.getSamplingRate() : 0);
+            bundle.putInt("bitDepth", media.getBitDepth() != null ? media.getBitDepth() : 0);
+            bundle.putString("path", media.getPath());
+            bundle.putBoolean("isVideo", media.isVideo());
+            bundle.putInt("userRating", media.getUserRating() != null ? media.getUserRating() : 0);
+            bundle.putDouble("averageRating", media.getAverageRating() != null ? media.getAverageRating() : 0);
+            bundle.putLong("playCount", media.getPlayCount() != null ? media.getPlayCount() : 0);
+            bundle.putInt("discNumber", media.getDiscNumber() != null ? media.getDiscNumber() : 0);
+            bundle.putLong("created", media.getCreated() != null ? media.getCreated().getTime() : 0);
+            bundle.putLong("starred", media.getStarred() != null ? media.getStarred().getTime() : 0);
+            bundle.putString("albumId", media.getAlbumId());
+            bundle.putString("artistId", media.getArtistId());
+            bundle.putString("type", Constants.MEDIA_TYPE_MUSIC);
+            bundle.putLong("bookmarkPosition", media.getBookmarkPosition() != null ? media.getBookmarkPosition() : 0);
+            bundle.putInt("originalWidth", media.getOriginalWidth() != null ? media.getOriginalWidth() : 0);
+            bundle.putInt("originalHeight", media.getOriginalHeight() != null ? media.getOriginalHeight() : 0);
+            bundle.putString("uri", uri.toString());
+            
+            bundle.putString("assetLinkSong", media.getId() != null ? AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_SONG, media.getId()) : null);
+            bundle.putString("assetLinkAlbum", media.getAlbumId() != null ? AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ALBUM, media.getAlbumId()) : null);
+            bundle.putString("assetLinkArtist", media.getArtistId() != null ? AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ARTIST, media.getArtistId()) : null);
+            bundle.putString("assetLinkGenre", AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_GENRE, media.getGenre()));
+            Integer year = media.getYear();
+            bundle.putString("assetLinkYear", year != null && year != 0 ? AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_YEAR, String.valueOf(year)) : null);
+
+            return new MediaItem.Builder()
+                    .setMediaId(media.getId())
+                    .setMediaMetadata(
+                            new MediaMetadata.Builder()
+                                    .setTitle(media.getTitle())
+                                    .setTrackNumber(media.getTrack() != null ? media.getTrack() : 0)
+                                    .setDiscNumber(media.getDiscNumber() != null ? media.getDiscNumber() : 0)
+                                    .setReleaseYear(media.getYear() != null ? media.getYear() : 0)
+                                    .setAlbumTitle(media.getAlbum())
+                                    .setArtist(media.getArtist())
+                                    .setArtworkUri(artworkUri)
+                                    .setUserRating(new HeartRating(media.getStarred() != null))
+                                    .setSupportedCommands(
                                         ImmutableList.of(
                                                 Constants.CUSTOM_COMMAND_TOGGLE_HEART_ON,
                                                 Constants.CUSTOM_COMMAND_TOGGLE_HEART_OFF
                                         )
-                                )
-                                .setExtras(bundle)
-                                .setIsBrowsable(false)
-                                .setIsPlayable(true)
-                                .build()
-                )
-                .setRequestMetadata(
-                        new MediaItem.RequestMetadata.Builder()
-                                .setMediaUri(uri)
-                                .setExtras(bundle)
-                                .build()
-                )
-                .setMimeType(MimeTypes.BASE_TYPE_AUDIO)
-                .setUri(uri)
-                .build();
+                                    )
+                                    .setExtras(bundle)
+                                    .setIsBrowsable(false)
+                                    .setIsPlayable(true)
+                                    .build()
+                    )
+                    .setRequestMetadata(
+                            new MediaItem.RequestMetadata.Builder()
+                                    .setMediaUri(uri)
+                                    .setExtras(bundle)
+                                    .build()
+                    )
+                    .setMimeType(MimeTypes.BASE_TYPE_AUDIO)
+                    .setUri(uri)
+                    .build();
+
+        } catch (Exception e) {
+            String id = media != null ? media.getId() : "NULL_MEDIA_OBJECT";
+            String title = media != null ? media.getTitle() : "N/A";
+            
+            Log.e(TAG, "Instant Mix CRASH! Failed to map song to MediaItem. " +
+                       "Problematic Song ID: " + id + 
+                       ", Title: " + title + 
+                       ". Inspect this song's Subsonic data for missing fields.", e);
+            throw new RuntimeException("Mapping failed for song ID: " + id, e);
+        }
     }
 
     public static MediaItem mapMediaItem(MediaItem old) {

app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt

@@ -81,6 +81,7 @@ object Preferences {
     private const val ALBUM_SORT_ORDER = "album_sort_order"
     private const val DEFAULT_ALBUM_SORT_ORDER = Constants.ALBUM_ORDER_BY_NAME
     private const val ARTIST_SORT_BY_ALBUM_COUNT= "artist_sort_by_album_count"
+    private const val SORT_SEARCH_CHRONOLOGICALLY= "sort_search_chronologically"
 
     @JvmStatic
     fun getServer(): String? {
@@ -674,4 +675,9 @@ object Preferences {
         else
             return Constants.ARTIST_ORDER_BY_NAME
     }
+
+    @JvmStatic
+    fun isSearchSortingChronologicallyEnabled(): Boolean {
+        return App.getInstance().preferences.getBoolean(SORT_SEARCH_CHRONOLOGICALLY, false)
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/util/ReplayGainUtil.java

@@ -1,11 +1,12 @@
 package com.cappielloantonio.tempo.util;
 
 import androidx.annotation.OptIn;
+import androidx.media3.common.C;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.Metadata;
 import androidx.media3.common.Tracks;
 import androidx.media3.common.util.UnstableApi;
-import androidx.media3.exoplayer.ExoPlayer;
+import androidx.media3.common.Player;
 
 import com.cappielloantonio.tempo.model.ReplayGain;
 
@@ -17,7 +18,7 @@ import java.util.Objects;
 public class ReplayGainUtil {
     private static final String[] tags = {"REPLAYGAIN_TRACK_GAIN", "REPLAYGAIN_ALBUM_GAIN", "R128_TRACK_GAIN", "R128_ALBUM_GAIN"};
 
-    public static void setReplayGain(ExoPlayer player, Tracks tracks) {
+    public static void setReplayGain(Player player, Tracks tracks) {
         List<Metadata> metadata = getMetadata(tracks);
         List<ReplayGain> gains = getReplayGains(metadata);
 
@@ -62,7 +63,7 @@ public class ReplayGainUtil {
             }
         }
 
-        if (gains.size() == 0) gains.add(0, new ReplayGain());
+        if (gains.isEmpty()) gains.add(0, new ReplayGain());
         if (gains.size() == 1) gains.add(1, new ReplayGain());
 
         return gains;
@@ -108,7 +109,7 @@ public class ReplayGainUtil {
         }
     }
 
-    private static void applyReplayGain(ExoPlayer player, List<ReplayGain> gains) {
+    private static void applyReplayGain(Player player, List<ReplayGain> gains) {
         if (Objects.equals(Preferences.getReplayGainMode(), "disabled") || gains == null || gains.isEmpty()) {
             setNoReplayGain(player);
             return;
@@ -137,33 +138,33 @@ public class ReplayGainUtil {
         setNoReplayGain(player);
     }
 
-    private static void setNoReplayGain(ExoPlayer player) {
+    private static void setNoReplayGain(Player player) {
         setReplayGain(player, 0f);
     }
 
-    private static void setTrackReplayGain(ExoPlayer player, List<ReplayGain> gains) {
+    private static void setTrackReplayGain(Player player, List<ReplayGain> gains) {
         float trackGain = gains.get(0).getTrackGain() != 0f ? gains.get(0).getTrackGain() : gains.get(1).getTrackGain();
 
         setReplayGain(player, trackGain != 0f ? trackGain : 0f);
     }
 
-    private static void setAlbumReplayGain(ExoPlayer player, List<ReplayGain> gains) {
+    private static void setAlbumReplayGain(Player player, List<ReplayGain> gains) {
         float albumGain = gains.get(0).getAlbumGain() != 0f ? gains.get(0).getAlbumGain() : gains.get(1).getAlbumGain();
 
         setReplayGain(player, albumGain != 0f ? albumGain : 0f);
     }
 
-    private static void setAutoReplayGain(ExoPlayer player, List<ReplayGain> gains) {
+    private static void setAutoReplayGain(Player player, List<ReplayGain> gains) {
         float albumGain = gains.get(0).getAlbumGain() != 0f ? gains.get(0).getAlbumGain() : gains.get(1).getAlbumGain();
         float trackGain = gains.get(0).getTrackGain() != 0f ? gains.get(0).getTrackGain() : gains.get(1).getTrackGain();
 
         setReplayGain(player, albumGain != 0f ? albumGain : trackGain);
     }
 
-    private static boolean areTracksConsecutive(ExoPlayer player) {
+    private static boolean areTracksConsecutive(Player player) {
         MediaItem currentMediaItem = player.getCurrentMediaItem();
-        int currentMediaItemIndex = player.getCurrentMediaItemIndex();
-        MediaItem pastMediaItem = currentMediaItemIndex > 0 ? player.getMediaItemAt(currentMediaItemIndex - 1) : null;
+        int prevMediaItemIndex = player.getPreviousMediaItemIndex();
+        MediaItem pastMediaItem = prevMediaItemIndex == C.INDEX_UNSET ? null : player.getMediaItemAt(prevMediaItemIndex);
 
         return currentMediaItem != null &&
                 pastMediaItem != null &&
@@ -172,7 +173,7 @@ public class ReplayGainUtil {
                 pastMediaItem.mediaMetadata.albumTitle.toString().equals(currentMediaItem.mediaMetadata.albumTitle.toString());
     }
 
-    private static void setReplayGain(ExoPlayer player, float gain) {
+    private static void setReplayGain(Player player, float gain) {
         player.setVolume((float) Math.pow(10f, gain / 20f));
     }
 }

app/src/main/java/com/cappielloantonio/tempo/viewmodel/AlbumListPageViewModel.java

@@ -9,7 +9,6 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.tempo.repository.AlbumRepository;
-import com.cappielloantonio.tempo.repository.DownloadRepository;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.util.Constants;
@@ -21,7 +20,6 @@ import java.util.List;
 
 public class AlbumListPageViewModel extends AndroidViewModel {
     private final AlbumRepository albumRepository;
-    private final DownloadRepository downloadRepository;
 
     public String title;
     public ArtistID3 artist;
@@ -32,9 +30,7 @@ public class AlbumListPageViewModel extends AndroidViewModel {
 
     public AlbumListPageViewModel(@NonNull Application application) {
         super(application);
-
         albumRepository = new AlbumRepository();
-        downloadRepository = new DownloadRepository();
     }
 
     public LiveData<List<AlbumID3>> getAlbumList(LifecycleOwner owner) {

app/src/main/java/com/cappielloantonio/tempo/viewmodel/AlbumPageViewModel.java

@@ -8,18 +8,23 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
+import com.cappielloantonio.tempo.interfaces.StarCallback;
 import com.cappielloantonio.tempo.repository.AlbumRepository;
 import com.cappielloantonio.tempo.repository.ArtistRepository;
+import com.cappielloantonio.tempo.repository.FavoriteRepository;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.AlbumInfo;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.util.NetworkUtil;
 
+import java.util.Date;
 import java.util.List;
 
 public class AlbumPageViewModel extends AndroidViewModel {
     private final AlbumRepository albumRepository;
     private final ArtistRepository artistRepository;
+    private final FavoriteRepository favoriteRepository;
     private String albumId;
     private String artistId;
     private final MutableLiveData<AlbumID3> album = new MutableLiveData<>(null);
@@ -29,6 +34,7 @@ public class AlbumPageViewModel extends AndroidViewModel {
 
         albumRepository = new AlbumRepository();
         artistRepository = new ArtistRepository();
+        favoriteRepository = new FavoriteRepository();
     }
 
     public LiveData<List<Child>> getAlbumSongLiveList() {
@@ -49,6 +55,61 @@ public class AlbumPageViewModel extends AndroidViewModel {
         });
     }
 
+    public void setFavorite() {
+        AlbumID3 currentAlbum = album.getValue();
+        if (currentAlbum == null) return;
+        
+        if (currentAlbum.getStarred() != null) {
+            if (NetworkUtil.isOffline()) {
+                removeFavoriteOffline(currentAlbum);
+            } else {
+                removeFavoriteOnline(currentAlbum);
+            }
+        } else {
+            if (NetworkUtil.isOffline()) {
+                setFavoriteOffline(currentAlbum);
+            } else {
+                setFavoriteOnline(currentAlbum);
+            }
+        }
+    }
+
+    private void removeFavoriteOffline(AlbumID3 album) {
+        favoriteRepository.starLater(null, album.getId(), null, false);
+        album.setStarred(null);
+        this.album.postValue(album);
+    }
+
+    private void removeFavoriteOnline(AlbumID3 album) {
+        favoriteRepository.unstar(null, album.getId(), null, new StarCallback() {
+            @Override
+            public void onError() {
+                favoriteRepository.starLater(null, album.getId(), null, false);
+            }
+        });
+
+        album.setStarred(null);
+        this.album.postValue(album);
+    }
+
+    private void setFavoriteOffline(AlbumID3 album) {
+        favoriteRepository.starLater(null, album.getId(), null, true);
+        album.setStarred(new Date());
+        this.album.postValue(album);
+    }
+
+    private void setFavoriteOnline(AlbumID3 album) {
+        favoriteRepository.star(null, album.getId(), null, new StarCallback() {
+            @Override
+            public void onError() {
+                favoriteRepository.starLater(null, album.getId(), null, true);
+            }
+        });
+
+        album.setStarred(new Date());
+        this.album.postValue(album);
+    }
+
     public LiveData<ArtistID3> getArtist() {
         return artistRepository.getArtistInfo(artistId);
     }

app/src/main/java/com/cappielloantonio/tempo/viewmodel/ArtistPageViewModel.java

@@ -1,23 +1,37 @@
 package com.cappielloantonio.tempo.viewmodel;
 
 import android.app.Application;
+import android.content.Context;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.OptIn;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
+import androidx.media3.common.util.UnstableApi;
 
+import com.cappielloantonio.tempo.model.Download;
+import com.cappielloantonio.tempo.interfaces.StarCallback;
 import com.cappielloantonio.tempo.repository.AlbumRepository;
 import com.cappielloantonio.tempo.repository.ArtistRepository;
+import com.cappielloantonio.tempo.repository.FavoriteRepository;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.subsonic.models.ArtistInfo2;
 import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.util.DownloadUtil;
+import com.cappielloantonio.tempo.util.MappingUtil;
+import com.cappielloantonio.tempo.util.NetworkUtil;
+import com.cappielloantonio.tempo.util.Preferences;
 
+import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class ArtistPageViewModel extends AndroidViewModel {
     private final AlbumRepository albumRepository;
     private final ArtistRepository artistRepository;
+    private final FavoriteRepository favoriteRepository;
 
     private ArtistID3 artist;
 
@@ -26,6 +40,7 @@ public class ArtistPageViewModel extends AndroidViewModel {
 
         albumRepository = new AlbumRepository();
         artistRepository = new ArtistRepository();
+        favoriteRepository = new FavoriteRepository();
     }
 
     public LiveData<List<AlbumID3>> getAlbumList() {
@@ -55,4 +70,71 @@ public class ArtistPageViewModel extends AndroidViewModel {
     public void setArtist(ArtistID3 artist) {
         this.artist = artist;
     }
+
+    public void setFavorite(Context context) {
+        if (artist.getStarred() != null) {
+            if (NetworkUtil.isOffline()) {
+                removeFavoriteOffline();
+            } else {
+                removeFavoriteOnline();
+            }
+        } else {
+            if (NetworkUtil.isOffline()) {
+                setFavoriteOffline();
+            } else {
+                setFavoriteOnline(context);
+            }
+        }
+    }
+
+    private void removeFavoriteOffline() {
+        favoriteRepository.starLater(null, null, artist.getId(), false);
+        artist.setStarred(null);
+    }
+
+    private void removeFavoriteOnline() {
+        favoriteRepository.unstar(null, null, artist.getId(), new StarCallback() {
+            @Override
+            public void onError() {
+                favoriteRepository.starLater(null, null, artist.getId(), false);
+            }
+        });
+
+        artist.setStarred(null);
+    }
+
+        private void setFavoriteOffline() {
+        favoriteRepository.starLater(null, null, artist.getId(), true);
+        artist.setStarred(new Date());
+    }
+
+    private void setFavoriteOnline(Context context) {
+        favoriteRepository.star(null, null, artist.getId(), new StarCallback() {
+            @Override
+            public void onError() {
+                favoriteRepository.starLater(null, null, artist.getId(), true);
+            }
+        });
+
+        artist.setStarred(new Date());
+
+        if (Preferences.isStarredArtistsSyncEnabled()) {
+            artistRepository.getArtistAllSongs(artist.getId(), new ArtistRepository.ArtistSongsCallback() {
+                @OptIn(markerClass = UnstableApi.class)
+                @Override
+                public void onSongsCollected(List<Child> songs) {
+                    if (songs != null && !songs.isEmpty()) {
+                        DownloadUtil.getDownloadTracker(context).download(
+                                MappingUtil.mapDownloads(songs),
+                                songs.stream().map(Download::new).collect(Collectors.toList())
+                        );
+                    } else {
+                    }
+                }
+            });
+        } else {
+            Log.d("ArtistSync", "Artist sync preference is disabled");
+        }
+    }
+
 }

app/src/main/java/com/cappielloantonio/tempo/viewmodel/PlayerBottomSheetViewModel.java

@@ -3,6 +3,7 @@ package com.cappielloantonio.tempo.viewmodel;
 import android.app.Application;
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.OptIn;
@@ -12,6 +13,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 import androidx.media3.common.util.UnstableApi;
+import androidx.media3.session.MediaBrowser;
 
 import com.cappielloantonio.tempo.interfaces.StarCallback;
 import com.cappielloantonio.tempo.model.Download;
@@ -291,13 +293,13 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
         List<String> ids = queue.stream().map(Child::getId).collect(Collectors.toList());
 
         if (media != null) {
-            queueRepository.savePlayQueue(ids, media.getId(), 0);
+            // TODO: We need to get the actual playback position here
+            Log.d(TAG, "Saving play queue - Current: " + media.getId() + ", Items: " + ids.size());
+            queueRepository.savePlayQueue(ids, media.getId(), 0); // Still hardcoded to 0 for now
             return true;
         }
-
         return false;
     }
-
     private void observeCachedLyrics(LifecycleOwner owner, String songId) {
         if (TextUtils.isEmpty(songId)) {
             return;

app/src/main/java/com/cappielloantonio/tempo/viewmodel/SearchViewModel.java

@@ -48,11 +48,11 @@ public class SearchViewModel extends AndroidViewModel {
     }
 
     public void insertNewSearch(String search) {
-        searchingRepository.insert(new RecentSearch(search));
+        searchingRepository.insert(new RecentSearch(search, System.currentTimeMillis() / 1000L));
     }
 
     public void deleteRecentSearch(String search) {
-        searchingRepository.delete(new RecentSearch(search));
+        searchingRepository.delete(new RecentSearch(search, 0));
     }
 
     public LiveData<List<String>> getSearchSuggestion(String query) {

app/src/main/res/layout/fragment_album_page.xml

@@ -174,7 +174,6 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/album_notes_textview" />
 
-
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <View
@@ -188,43 +187,69 @@
                     app:layout_constraintTop_toBottomOf="@+id/album_detail_view" />
 
                 <LinearLayout
-                    android:id="@+id/album_page_button_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:paddingTop="4dp"
                     android:paddingBottom="4dp"
+                    android:paddingStart="12dp"
+                    android:paddingEnd="12dp"
+                    android:gravity="center_vertical"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/upper_button_divider">
 
-                    <Button
-                        android:id="@+id/album_page_play_button"
+                    <LinearLayout
+                        android:id="@+id/album_page_button_layout"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="4dp"
                         android:layout_weight="1"
-                        android:padding="10dp"
-                        android:text="@string/album_page_play_button"
-                        android:textAllCaps="false"
-                        app:icon="@drawable/ic_play"
-                        app:iconGravity="textStart"
-                        app:iconPadding="18dp" />
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
+
+                        <Button
+                            android:id="@+id/album_page_play_button"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:layout_marginStart="4dp"
+                            android:layout_marginEnd="4dp"
+                            android:padding="10dp"
+                            android:text="@string/album_page_play_button"
+                            android:textAllCaps="false"
+                            app:icon="@drawable/ic_play"
+                            app:iconGravity="textStart"
+                            app:iconPadding="18dp" />
+
+                        <Button
+                            android:id="@+id/album_page_shuffle_button"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:layout_marginStart="4dp"
+                            android:layout_marginEnd="4dp"
+                            android:padding="10dp"
+                            android:text="@string/album_page_shuffle_button"
+                            android:textAllCaps="false"
+                            app:icon="@drawable/ic_shuffle"
+                            app:iconGravity="textStart"
+                            app:iconPadding="18dp" />
+                    </LinearLayout>
+
+                    <ToggleButton
+                        android:id="@+id/button_favorite"
+                        android:layout_width="34dp"
+                        android:layout_height="34dp"
+                        android:layout_marginStart="12dp"
+                        android:layout_marginEnd="0dp"
+                        android:background="@drawable/button_favorite_selector"
+                        android:checked="false"
+                        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                        android:gravity="center"
+                        android:text=""
+                        android:textOff=""
+                        android:textOn="" />
 
-                    <Button
-                        android:id="@+id/album_page_shuffle_button"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_weight="1"
-                        android:padding="10dp"
-                        android:text="@string/album_page_shuffle_button"
-                        android:textAllCaps="false"
-                        app:icon="@drawable/ic_shuffle"
-                        app:iconGravity="textStart"
-                        app:iconPadding="18dp" />
                 </LinearLayout>
 
                 <TextView
@@ -239,7 +264,8 @@
                     android:visibility="gone"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/album_page_button_layout" />
+                    app:layout_constraintTop_toBottomOf="@id/album_page_button_layout"
+                    tools:ignore="NotSibling" />
 
                 <View
                     android:id="@+id/bottom_button_divider"
@@ -249,7 +275,7 @@
                     android:layout_marginBottom="18dp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/album_page_button_layout" />
+                    app:layout_constraintTop_toBottomOf="@+id/album_bio_label" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.AppBarLayout>
 

app/src/main/res/layout/fragment_artist_page.xml

@@ -63,40 +63,67 @@
                 android:layout_marginEnd="18dp" />
 
             <LinearLayout
-                android:id="@+id/album_page_button_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:paddingTop="4dp"
-                android:paddingBottom="4dp">
+                android:paddingBottom="4dp"
+                android:paddingStart="12dp"
+                android:paddingEnd="12dp"
+                android:gravity="center_vertical">
 
-                <Button
-                    android:id="@+id/artist_page_shuffle_button"
+
+                <LinearLayout
+                    android:id="@+id/album_page_button_layout"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="4dp"
                     android:layout_weight="1"
-                    android:padding="10dp"
-                    android:text="@string/artist_page_shuffle_button"
-                    android:textAllCaps="false"
-                    app:icon="@drawable/ic_shuffle"
-                    app:iconGravity="textStart"
-                    app:iconPadding="18dp" />
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical">
+
+                    <Button
+                        android:id="@+id/artist_page_shuffle_button"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="6dp"
+                        android:layout_marginEnd="6dp"
+                        android:padding="10dp"
+                        android:text="@string/artist_page_shuffle_button"
+                        android:textAllCaps="false"
+                        app:icon="@drawable/ic_shuffle"
+                        app:iconGravity="textStart"
+                        app:iconPadding="18dp" />
+
+                    <Button
+                        android:id="@+id/artist_page_radio_button"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="6dp"
+                        android:layout_marginEnd="6dp"
+                        android:padding="10dp"
+                        android:text="@string/artist_page_radio_button"
+                        android:textAllCaps="false"
+                        app:icon="@drawable/ic_feed"
+                        app:iconGravity="textStart"
+                        app:iconPadding="18dp" />
+                </LinearLayout>
+
+                <ToggleButton
+                    android:id="@+id/button_favorite"
+                    android:layout_width="34dp"
+                    android:layout_height="34dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="0dp"
+                    android:background="@drawable/button_favorite_selector"
+                    android:checked="false"
+                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:gravity="center"
+                    android:text=""
+                    android:textOff=""
+                    android:textOn="" />
 
-                <Button
-                    android:id="@+id/artist_page_radio_button"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_weight="1"
-                    android:padding="10dp"
-                    android:text="@string/artist_page_radio_button"
-                    android:textAllCaps="false"
-                    app:icon="@drawable/ic_feed"
-                    app:iconGravity="textStart"
-                    app:iconPadding="18dp" />
             </LinearLayout>
 
             <View

app/src/main/res/layout/inner_fragment_player_queue.xml

@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/player_clean_queue_button"
-        style="@style/TitleMedium"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:gravity="center"
-        android:text="@string/player_queue_clean_all_button" />
-
     <com.cappielloantonio.tempo.helper.recyclerview.NestedScrollableHost
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -21,20 +14,74 @@
             android:id="@+id/player_queue_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="40dp"
             android:paddingTop="8dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     </com.cappielloantonio.tempo.helper.recyclerview.NestedScrollableHost>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/player_shuffle_queue_fab"
+    <LinearLayout
+        android:id="@+id/fab_menu_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="end"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        android:contentDescription="@string/content_description_shuffle_button"
-        app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
-        app:srcCompat="@drawable/ic_shuffle" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+        app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior">
 
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/fab_save_to_playlist"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            android:text="@string/player_queue_save_to_playlist"
+            app:icon="@android:drawable/ic_menu_edit" />
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/fab_clear_queue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            android:text="@string/player_queue_clean_all_button"
+            app:icon="@android:drawable/ic_menu_delete" />
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/fab_download_all"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            android:text="@string/menu_download_all_button"
+            app:icon="@android:drawable/stat_sys_download_done" />
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/fab_load_queue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            android:text="@string/player_queue_load_queue"
+            app:icon="@android:drawable/ic_menu_revert" />
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/fab_shuffle_queue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            android:text="@string/content_description_shuffle_button"
+            app:icon="@drawable/ic_shuffle" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_menu_toggle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="Toggle FAB Action menu"
+            tools:ignore="HardcodedText"
+            app:srcCompat="@drawable/ic_add" />
+
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/item_player_queue_song.xml

@@ -139,6 +139,17 @@
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <ImageView
+        android:id="@+id/download_indicator_icon"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginEnd="8dp"
+        android:visibility="gone"
+        android:src="@drawable/ic_download"  app:layout_constraintBottom_toBottomOf="@+id/queue_song_cover_image_view"
+        app:layout_constraintEnd_toStartOf="@+id/queue_song_holder_image"
+        app:layout_constraintTop_toTopOf="@+id/queue_song_cover_image_view"
+        tools:visibility="visible" />
+
     <ImageView
         android:id="@+id/queue_song_holder_image"
         android:layout_width="wrap_content"

app/src/main/res/values-night/styles.xml

@@ -32,6 +32,8 @@
         <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:navigationBarColor">?attr/colorSurface</item>
         <item name="android:scrollbars">none</item>
+
+        <item name="floatingActionButtonStyle">@style/FloatingActionButtonStyle</item>
     </style>
 
     <style name="Divider">
@@ -40,6 +42,21 @@
         <item name="android:background">@color/dividerColor</item>
     </style>
 
+    <style name="FloatingActionButtonStyle" parent="Widget.MaterialComponents.FloatingActionButton">
+        <item name="backgroundTint">?attr/colorSecondary</item>
+        <item name="tint">?attr/colorOnPrimary</item>
+        <item name="shapeAppearanceOverlay">@style/FabShapeStyle</item>
+    </style>
+
+    <style name="FabShapeStyle" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+        <item name="cornerSize">50%</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+        <item name="cornerFamilyTopLeft">rounded</item>
+        <item name="cornerFamilyTopRight">rounded</item>
+        <item name="cornerFamilyBottomLeft">rounded</item>
+        <item name="cornerFamilyBottomRight">rounded</item>
+    </style>
+
     <style name="NoConnectionTextView">
         <item name="background">?attr/colorErrorContainer</item>
         <item name="android:textColor">?attr/colorOnErrorContainer</item>

app/src/main/res/values-pl/strings.xml

@@ -201,7 +201,9 @@
     <string name="menu_sort_year">Rok</string>
     <string name="player_playback_speed">%1$.2fx</string>
     <string name="player_queue_clean_all_button">Wyczyść kolejkę odtwarzania</string>
-    <string name="player_queue_save_queue_success">Zapisana kolejka odtwarzania</string>
+    <string name="player_queue_save_queue_success">Zapisano kolejkę odtwarzania</string>
+    <string name="player_queue_save_to_playlist">Zapisz kolejkę do playlisty</string>
+    <string name="player_queue_load_queue">Wczytaj kolejkę</string>
     <string name="player_lyrics_download_content_description">Pobierz teksty do odtwarzania offline</string>
     <string name="player_lyrics_downloaded_content_description">Teksty pobrane do odtwarzania offline</string>
     <string name="player_lyrics_download_success">Zapisano tekst do odtwarzania offline.</string>
@@ -522,4 +524,7 @@
     <string name="settings_album_detail_summary">Jeżeli włączone, pokaż szczegóły albumu takie jak gatunek, ilość piosenek itp. na stronie albumu</string>
     <string name="settings_artist_sort_by_album_count">Sortuj wykonawców po ilości albumów</string>
     <string name="settings_artist_sort_by_album_count_summary">Jeżeli włączone, sortuje wykonawców po ilości albumów. Jeżeli wyłączone, sortuje albumy po nazwach.</string>
+    <string name="folder_play_collecting">Zbieranie piosenek z folderu…</string>
+    <string name="folder_play_playing">Odtwarzanie %d piosenek</string>
+    <string name="folder_play_no_songs">Nie znaleziono piosenek w folderze</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -133,6 +133,10 @@
     <string name="home_sync_starred_albums_subtitle">Albums marked with a star will be available offline</string>
     <string name="home_sync_starred_artists_title">Starred Artists Sync</string>
     <string name="home_sync_starred_artists_subtitle">You have starred artists with music not downloaded</string>
+    <plurals name="home_sync_starred_songs_count">
+        <item quantity="one">%d song needs sync</item>
+        <item quantity="other">%d songs need sync</item>
+    </plurals>
     <string name="home_title_best_of">Best of</string>
     <string name="home_title_discovery">Discovery</string>
     <string name="home_title_discovery_shuffle_all_button">Shuffle all</string>
@@ -212,6 +216,8 @@
     <string name="player_playback_speed">%1$.2fx</string>
     <string name="player_queue_clean_all_button">Clean play queue</string>
     <string name="player_queue_save_queue_success">Saved play queue</string>
+    <string name="player_queue_save_to_playlist">Save Queue to Playlist</string>
+    <string name="player_queue_load_queue">Load Queue</string>
     <string name="player_lyrics_download_content_description">Download lyrics for offline playback</string>
     <string name="player_lyrics_downloaded_content_description">Lyrics downloaded for offline playback</string>
     <string name="player_lyrics_download_success">Lyrics saved for offline playback.</string>
@@ -537,4 +543,7 @@
     <string name="folder_play_collecting">Collecting songs from folder…</string>
     <string name="folder_play_playing">Playing %d songs</string>
     <string name="folder_play_no_songs">No songs found in folder</string>
+
+    <string name="search_sort_title">Sort recent searches chronologically</string>
+    <string name="search_sort_summary">If enabled, sort searches chronologically. Sort by name if disabled.</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -39,6 +39,8 @@
         <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:navigationBarColor">?attr/colorSurface</item>
         <item name="android:scrollbars">none</item>
+
+        <item name="floatingActionButtonStyle">@style/FloatingActionButtonStyle</item>
     </style>
 
     <style name="Divider">
@@ -47,6 +49,21 @@
         <item name="android:background">@color/dividerColor</item>
     </style>
 
+    <style name="FloatingActionButtonStyle" parent="Widget.MaterialComponents.FloatingActionButton">
+        <item name="backgroundTint">?attr/colorSecondary</item>
+        <item name="tint">?attr/colorOnPrimary</item>
+        <item name="shapeAppearanceOverlay">@style/FabShapeStyle</item>
+    </style>
+
+    <style name="FabShapeStyle" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+        <item name="cornerSize">50%</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+        <item name="cornerFamilyTopLeft">rounded</item>
+        <item name="cornerFamilyTopRight">rounded</item>
+        <item name="cornerFamilyBottomLeft">rounded</item>
+        <item name="cornerFamilyBottomRight">rounded</item>
+    </style>
+
     <style name="NoConnectionTextView">
         <item name="background">?attr/colorErrorContainer</item>
         <item name="android:textColor">?attr/colorOnErrorContainer</item>

app/src/main/res/xml/global_preferences.xml

@@ -122,6 +122,12 @@
             android:summary="@string/settings_artist_sort_by_album_count_summary"
             android:key="artist_sort_by_album_count" />
 
+        <SwitchPreference
+            android:title="@string/search_sort_title"
+            android:defaultValue="false"
+            android:summary="@string/search_sort_summary"
+            android:key="sort_search_chronologically" />
+
     </PreferenceCategory>
 
      <PreferenceCategory app:title="@string/settings_title_playlist">

app/src/tempus/java/com/cappielloantonio/tempo/service/MediaService.kt

@@ -1,182 +1,18 @@
 package com.cappielloantonio.tempo.service
 
-import android.app.PendingIntent.FLAG_IMMUTABLE
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.app.TaskStackBuilder
-import android.content.Intent
-import android.net.ConnectivityManager
-import android.net.Network
-import android.net.NetworkCapabilities
-import android.os.Binder
-import android.os.IBinder
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
 import androidx.core.content.ContextCompat
 import androidx.media3.cast.CastPlayer
 import androidx.media3.cast.SessionAvailabilityListener
-import androidx.media3.common.AudioAttributes
-import androidx.media3.common.C
-import androidx.media3.common.MediaItem
-import androidx.media3.common.Player
-import androidx.media3.common.Tracks
 import androidx.media3.common.util.UnstableApi
-import androidx.media3.exoplayer.DefaultLoadControl
-import androidx.media3.exoplayer.ExoPlayer
-import androidx.media3.session.MediaLibraryService
-import androidx.media3.session.MediaSession.ControllerInfo
 import com.cappielloantonio.tempo.repository.AutomotiveRepository
-import com.cappielloantonio.tempo.repository.QueueRepository
-import com.cappielloantonio.tempo.ui.activity.MainActivity
-import com.cappielloantonio.tempo.util.AssetLinkUtil
-import com.cappielloantonio.tempo.util.Constants
-import com.cappielloantonio.tempo.util.DownloadUtil
-import com.cappielloantonio.tempo.util.DynamicMediaSourceFactory
-import com.cappielloantonio.tempo.util.MappingUtil
-import com.cappielloantonio.tempo.util.Preferences
-import com.cappielloantonio.tempo.util.ReplayGainUtil
-import com.cappielloantonio.tempo.widget.WidgetUpdateManager
 import com.google.android.gms.cast.framework.CastContext
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 
 @UnstableApi
-class MediaService : MediaLibraryService(), SessionAvailabilityListener {
-    private lateinit var automotiveRepository: AutomotiveRepository
-    private lateinit var player: ExoPlayer
+class MediaService : BaseMediaService(), SessionAvailabilityListener {
+    private val automotiveRepository = AutomotiveRepository()
     private lateinit var castPlayer: CastPlayer
-    private lateinit var mediaLibrarySession: MediaLibrarySession
-    private lateinit var librarySessionCallback: MediaLibrarySessionCallback
-    private lateinit var networkCallback: CustomNetworkCallback
-    lateinit var equalizerManager: EqualizerManager
-
-    inner class LocalBinder : Binder() {
-        fun getEqualizerManager(): EqualizerManager {
-            return this@MediaService.equalizerManager
-        }
-    }
-
-    private val binder = LocalBinder()
-
-    companion object {
-        const val ACTION_BIND_EQUALIZER = "com.cappielloantonio.tempo.service.BIND_EQUALIZER"
-        const val ACTION_EQUALIZER_UPDATED = "com.cappielloantonio.tempo.service.EQUALIZER_UPDATED"
-    }
-    private val widgetUpdateHandler = Handler(Looper.getMainLooper())
-    private var widgetUpdateScheduled = false
-    private val widgetUpdateRunnable = object : Runnable {
-        override fun run() {
-            if (!player.isPlaying) {
-                widgetUpdateScheduled = false
-                return
-            }
-            updateWidget()
-            widgetUpdateHandler.postDelayed(this, WIDGET_UPDATE_INTERVAL_MS)
-        }
-    }
-
-    fun updateMediaItems() {
-        Log.d("MediaService", "update items");
-        val n = player.mediaItemCount
-        val k = player.currentMediaItemIndex
-        val current = player.currentPosition
-        val items = (0 .. n-1).map{i -> MappingUtil.mapMediaItem(player.getMediaItemAt(i))}
-        player.clearMediaItems()
-        player.setMediaItems(items, k, current)
-    }
-
-    inner class CustomNetworkCallback : ConnectivityManager.NetworkCallback() {
-        var wasWifi = false
-
-        init {
-            val manager = getSystemService(ConnectivityManager::class.java)
-            val network = manager.activeNetwork
-            val capabilities = manager.getNetworkCapabilities(network)
-            if (capabilities != null)
-                wasWifi = capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
-        }
-
-        override fun onCapabilitiesChanged(network : Network, networkCapabilities : NetworkCapabilities) {
-            val isWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
-            if (isWifi != wasWifi) {
-                wasWifi = isWifi
-                widgetUpdateHandler.post(Runnable {
-                    updateMediaItems()
-                })
-            }
-        }
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-
-        initializeRepository()
-        initializePlayer()
-        initializeMediaLibrarySession()
-        restorePlayerFromQueue()
-        initializePlayerListener()
-        initializeCastPlayer()
-        initializeEqualizerManager()
-        initializeNetworkListener()
-
-        setPlayer(
-            null,
-            if (this::castPlayer.isInitialized && castPlayer.isCastSessionAvailable) castPlayer else player
-        )
-    }
-
-    override fun onGetSession(controllerInfo: ControllerInfo): MediaLibrarySession {
-        return mediaLibrarySession
-    }
-
-    override fun onTaskRemoved(rootIntent: Intent?) {
-        val player = mediaLibrarySession.player
-
-        if (!player.playWhenReady || player.mediaItemCount == 0) {
-            stopSelf()
-        }
-    }
-
-    override fun onDestroy() {
-        releaseNetworkCallback()
-        equalizerManager.release()
-        stopWidgetUpdates()
-        releasePlayer()
-        super.onDestroy()
-    }
-
-    override fun onBind(intent: Intent?): IBinder? {
-        // Check if the intent is for our custom equalizer binder
-        if (intent?.action == ACTION_BIND_EQUALIZER) {
-            return binder
-        }
-        // Otherwise, handle it as a normal MediaLibraryService connection
-        return super.onBind(intent)
-    }
-
-    private fun initializeRepository() {
-        automotiveRepository = AutomotiveRepository()
-    }
-
-    private fun initializeEqualizerManager() {
-        equalizerManager = EqualizerManager()
-        val audioSessionId = player.audioSessionId
-        attachEqualizerIfPossible(audioSessionId)
-    }
-
-    private fun initializePlayer() {
-        player = ExoPlayer.Builder(this)
-                .setRenderersFactory(getRenderersFactory())
-                .setMediaSourceFactory(DynamicMediaSourceFactory(this))
-                .setAudioAttributes(AudioAttributes.DEFAULT, true)
-                .setHandleAudioBecomingNoisy(true)
-                .setWakeMode(C.WAKE_MODE_NETWORK)
-                .setLoadControl(initializeLoadControl())
-                .build()
-
-        player.shuffleModeEnabled = Preferences.isShuffleModeEnabled()
-        player.repeatMode = Preferences.getRepeatMode()
-    }
 
     @Suppress("DEPRECATION")
     private fun initializeCastPlayer() {
@@ -184,284 +20,41 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
                 .isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS
         ) {
             CastContext.getSharedInstance(this, ContextCompat.getMainExecutor(this))
-                    .addOnSuccessListener { castContext ->
-                        castPlayer = CastPlayer(castContext)
-                        castPlayer.setSessionAvailabilityListener(this@MediaService)
-
-                        if (castPlayer.isCastSessionAvailable && this::mediaLibrarySession.isInitialized) {
-                            setPlayer(player, castPlayer)
-                        }
-                    }
+                .addOnSuccessListener { castContext ->
+                    castPlayer = CastPlayer(castContext)
+                    castPlayer.setSessionAvailabilityListener(this@MediaService)
+                    initializePlayerListener(castPlayer)
+                    if (castPlayer.isCastSessionAvailable)
+                        setPlayer(mediaLibrarySession.player, castPlayer)
+                }
         }
     }
 
-    private fun initializeMediaLibrarySession() {
-        val sessionActivityPendingIntent =
-            TaskStackBuilder.create(this).run {
-                addNextIntent(Intent(this@MediaService, MainActivity::class.java))
-                getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)
-            }
-
-        librarySessionCallback = createLibrarySessionCallback()
-        mediaLibrarySession =
-            MediaLibrarySession.Builder(this, player, librarySessionCallback)
-                .setSessionActivity(sessionActivityPendingIntent)
-                .build()
-    }
-
-    private fun initializeNetworkListener() {
-        networkCallback = CustomNetworkCallback()
-        getSystemService(ConnectivityManager::class.java).registerDefaultNetworkCallback(networkCallback)
-        updateMediaItems()
-    }
-
-    private fun restorePlayerFromQueue() {
-        if (player.mediaItemCount > 0) return
-
-        val queueRepository = QueueRepository()
-        val storedQueue = queueRepository.media
-        if (storedQueue.isNullOrEmpty()) return
-
-        val mediaItems = MappingUtil.mapMediaItems(storedQueue)
-        if (mediaItems.isEmpty()) return
-
-        val lastIndex = try {
-            queueRepository.lastPlayedMediaIndex
-        } catch (_: Exception) {
-            0
-        }.coerceIn(0, mediaItems.size - 1)
-
-        val lastPosition = try {
-            queueRepository.lastPlayedMediaTimestamp
-        } catch (_: Exception) {
-            0L
-        }.let { if (it < 0L) 0L else it }
-
-        player.setMediaItems(mediaItems, lastIndex, lastPosition)
-        player.prepare()
-        updateWidget()
-    }
-
-    private fun createLibrarySessionCallback(): MediaLibrarySessionCallback {
+    override fun getMediaLibrarySessionCallback(): MediaLibrarySession.Callback {
         return MediaLibrarySessionCallback(this, automotiveRepository)
     }
 
-    private fun initializePlayerListener() {
-        player.addListener(object : Player.Listener {
-            override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
-                if (mediaItem == null) return
+    override fun playerInitHook() {
+        super.playerInitHook()
+        initializeCastPlayer()
+        if (this::castPlayer.isInitialized && castPlayer.isCastSessionAvailable)
+            setPlayer(null, castPlayer)
+    }
 
-                if (reason == Player.MEDIA_ITEM_TRANSITION_REASON_SEEK || reason == Player.MEDIA_ITEM_TRANSITION_REASON_AUTO) {
-                    MediaManager.setLastPlayedTimestamp(mediaItem)
-                }
-                updateWidget()
-            }
-
-            override fun onTracksChanged(tracks: Tracks) {
-                ReplayGainUtil.setReplayGain(player, tracks)
-
-                val currentMediaItem = player.currentMediaItem
-                if (currentMediaItem != null && currentMediaItem.mediaMetadata.extras != null) {
-                    MediaManager.scrobble(currentMediaItem, false)
-                }
-
-                if (player.currentMediaItemIndex + 1 == player.mediaItemCount)
-                    MediaManager.continuousPlay(player.currentMediaItem)
-            }
-
-            override fun onIsPlayingChanged(isPlaying: Boolean) {
-                if (!isPlaying) {
-                    MediaManager.setPlayingPausedTimestamp(
-                        player.currentMediaItem,
-                        player.currentPosition
-                    )
-                } else {
-                    MediaManager.scrobble(player.currentMediaItem, false)
-                }
-                if (isPlaying) {
-                    scheduleWidgetUpdates()
-                } else {
-                    stopWidgetUpdates()
-                }
-                updateWidget()
-            }
-
-            override fun onPlaybackStateChanged(playbackState: Int) {
-                super.onPlaybackStateChanged(playbackState)
-
-                if (!player.hasNextMediaItem() &&
-                    playbackState == Player.STATE_ENDED &&
-                    player.mediaMetadata.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC
-                ) {
-                    MediaManager.scrobble(player.currentMediaItem, true)
-                    MediaManager.saveChronology(player.currentMediaItem)
-                }
-                updateWidget()
-            }
-
-            override fun onPositionDiscontinuity(
-                oldPosition: Player.PositionInfo,
-                newPosition: Player.PositionInfo,
-                reason: Int
-            ) {
-                super.onPositionDiscontinuity(oldPosition, newPosition, reason)
-
-                if (reason == Player.DISCONTINUITY_REASON_AUTO_TRANSITION) {
-                    if (oldPosition.mediaItem?.mediaMetadata?.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC) {
-                        MediaManager.scrobble(oldPosition.mediaItem, true)
-                        MediaManager.saveChronology(oldPosition.mediaItem)
-                    }
-
-                    if (newPosition.mediaItem?.mediaMetadata?.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC) {
-                        MediaManager.setLastPlayedTimestamp(newPosition.mediaItem)
-                    }
-                }
-            }
-
-            override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) {
-                Preferences.setShuffleModeEnabled(shuffleModeEnabled)
-            }
-
-            override fun onRepeatModeChanged(repeatMode: Int) {
-                Preferences.setRepeatMode(repeatMode)
-            }
-
-            override fun onAudioSessionIdChanged(audioSessionId: Int) {
-                attachEqualizerIfPossible(audioSessionId)
-            }
-        })
-        if (player.isPlaying) {
-            scheduleWidgetUpdates()
+    override fun releasePlayers() {
+        if (this::castPlayer.isInitialized) {
+            castPlayer.setSessionAvailabilityListener(null)
+            castPlayer.release()
         }
-    }
-
-    private fun updateWidget() {
-        val mi = player.currentMediaItem
-        val title = mi?.mediaMetadata?.title?.toString()
-            ?: mi?.mediaMetadata?.extras?.getString("title")
-        val artist = mi?.mediaMetadata?.artist?.toString()
-            ?: mi?.mediaMetadata?.extras?.getString("artist")
-        val album = mi?.mediaMetadata?.albumTitle?.toString()
-            ?: mi?.mediaMetadata?.extras?.getString("album")
-        val extras = mi?.mediaMetadata?.extras
-        val coverId = extras?.getString("coverArtId")
-        val songLink = extras?.getString("assetLinkSong")
-            ?: AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_SONG, extras?.getString("id"))
-        val albumLink = extras?.getString("assetLinkAlbum")
-            ?: AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ALBUM, extras?.getString("albumId"))
-        val artistLink = extras?.getString("assetLinkArtist")
-            ?: AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ARTIST, extras?.getString("artistId"))
-        val position = player.currentPosition.takeIf { it != C.TIME_UNSET } ?: 0L
-        val duration = player.duration.takeIf { it != C.TIME_UNSET } ?: 0L
-        WidgetUpdateManager.updateFromState(
-            this,
-            title ?: "",
-            artist ?: "",
-            album ?: "",
-            coverId,
-            player.isPlaying,
-            player.shuffleModeEnabled,
-            player.repeatMode,
-            position,
-            duration,
-            songLink,
-            albumLink,
-            artistLink
-        )
-    }
-
-    private fun scheduleWidgetUpdates() {
-        if (widgetUpdateScheduled) return
-        widgetUpdateHandler.postDelayed(widgetUpdateRunnable, WIDGET_UPDATE_INTERVAL_MS)
-        widgetUpdateScheduled = true
-    }
-
-    private fun stopWidgetUpdates() {
-        if (!widgetUpdateScheduled) return
-        widgetUpdateHandler.removeCallbacks(widgetUpdateRunnable)
-        widgetUpdateScheduled = false
-    }
-
-    private fun initializeLoadControl(): DefaultLoadControl {
-        return DefaultLoadControl.Builder()
-            .setBufferDurationsMs(
-                (DefaultLoadControl.DEFAULT_MIN_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
-                (DefaultLoadControl.DEFAULT_MAX_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
-                DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS,
-                DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS
-            )
-            .build()
-    }
-
-    private fun getQueueFromPlayer(player: Player): List<MediaItem> {
-        val queue = mutableListOf<MediaItem>()
-        for (i in 0 until player.mediaItemCount) {
-            queue.add(player.getMediaItemAt(i))
-        }
-        return queue
-    }
-
-    private fun setPlayer(oldPlayer: Player?, newPlayer: Player) {
-        if (oldPlayer === newPlayer) return
-        oldPlayer?.stop()
-        mediaLibrarySession.player = newPlayer
-    }
-
-    private fun releasePlayer() {
-        if (this::castPlayer.isInitialized) castPlayer.setSessionAvailabilityListener(null)
-        if (this::castPlayer.isInitialized) castPlayer.release()
-        player.release()
-        mediaLibrarySession.release()
         automotiveRepository.deleteMetadata()
+        super.releasePlayers()
     }
 
-    private fun releaseNetworkCallback() {
-        getSystemService(ConnectivityManager::class.java).unregisterNetworkCallback(networkCallback)
-    }
-
-    private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false)
-
     override fun onCastSessionAvailable() {
-        val currentQueue = getQueueFromPlayer(player)
-        val currentIndex = player.currentMediaItemIndex
-        val currentPosition = player.currentPosition
-        val isPlaying = player.playWhenReady
-
-        setPlayer(player, castPlayer)
-
-        castPlayer.setMediaItems(currentQueue, currentIndex, currentPosition)
-        castPlayer.playWhenReady = isPlaying
-        castPlayer.prepare()
+        setPlayer(exoplayer, castPlayer)
     }
 
     override fun onCastSessionUnavailable() {
-        val currentQueue = getQueueFromPlayer(castPlayer)
-        val currentIndex = castPlayer.currentMediaItemIndex
-        val currentPosition = castPlayer.currentPosition
-        val isPlaying = castPlayer.playWhenReady
-
-        setPlayer(castPlayer, player)
-
-        player.setMediaItems(currentQueue, currentIndex, currentPosition)
-        player.playWhenReady = isPlaying
-        player.prepare()
+        setPlayer(castPlayer, exoplayer)
     }
-
-    private fun attachEqualizerIfPossible(audioSessionId: Int): Boolean {
-        if (audioSessionId == 0 || audioSessionId == -1) return false
-        val attached = equalizerManager.attachToSession(audioSessionId)
-        if (attached) {
-            val enabled = Preferences.isEqualizerEnabled()
-            equalizerManager.setEnabled(enabled)
-            val bands = equalizerManager.getNumberOfBands()
-            val savedLevels = Preferences.getEqualizerBandLevels(bands)
-            for (i in 0 until bands) {
-                equalizerManager.setBandLevel(i.toShort(), savedLevels[i])
-            }
-            sendBroadcast(Intent(ACTION_EQUALIZER_UPDATED))
-        }
-        return attached
-    }
-}
-
-private const val WIDGET_UPDATE_INTERVAL_MS = 1000L
+}

fastlane/metadata/android/en-US/changelogs/10.txt

@@ -0,0 +1,4 @@
+* fix: updates starred syncing downloads to user defined directory
+* fix: handle empty albums and null mappings
+* feat: integrate sort recent searches chronologically
+* feat: add heart to artist/album pages, fixed artist cover art failing

fastlane/metadata/android/en-US/changelogs/9.txt

@@ -0,0 +1,3 @@
+* chore: bringing in media service refactor previously reverted after more testing 
+* fix: refactor start queue to put the db writing in the background to address instant mix bug
+* Feat: playerqueue fab allows playqueue actions -> saving to playlist, download all, load queue, shuffle, clean queue