chore: bumped version for release

.github/workflows/github_release.yml

@@ -3,7 +3,7 @@ name: Github Release Workflow
 on:
   push:
     tags:
-      - '[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
   build:

.gitignore

@@ -18,3 +18,4 @@
 # release / debug files
 tempus-release-key.jks
 app/tempo/
+app/notquitemy/

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ***This log is for this fork to detail updates since 3.9.0 from the main repo.***
 
+## [3.17.0](https://github.com/eddyizm/tempo/releases/tag/v3.17.0) (2025-10-10)
+## What's Changed
+* chore: adding screenshot and docs for 4 icons/buttons in player control by @eddyizm in https://github.com/eddyizm/tempo/pull/162
+* Update Polish translation by @skajmer in https://github.com/eddyizm/tempo/pull/160
+* feat: Make all objects in Tempo references for quick access by @le-firehawk in https://github.com/eddyizm/tempo/pull/158
+* fix: Glide module incorrectly encoding IPv6 addresses by @le-firehawk in https://github.com/eddyizm/tempo/pull/159
+
+**Full Changelog**: https://github.com/eddyizm/tempo/compare/v3.16.6...v3.17.0
+
 ## [3.16.6](https://github.com/eddyizm/tempo/releases/tag/v3.16.6) (2025-10-08)
 ## What's Changed
 * chore(i18n): Update Spanish translation by @jaime-grj in https://github.com/eddyizm/tempo/pull/151

README.md

@@ -25,7 +25,7 @@ Tempo does not rely on magic algorithms to decide what you should listen to. Ins
 ## Fork  
 
 sha256 signing key fingerprint   
-`SHA256: B7:85:01:B9:34:D0:4E:0A:CA:8D:94:AF:D6:72:6A:4D:1D:CE:65:79:7F:1D:41:71:0F:64:3C:29:00:EB:1D:1D`  
+`B7:85:01:B9:34:D0:4E:0A:CA:8D:94:AF:D6:72:6A:4D:1D:CE:65:79:7F:1D:41:71:0F:64:3C:29:00:EB:1D:1D`  
 
 This fork is my attempt to keep development moving forward and merge in PR's that have been sitting for a while in the main repo. Thankful to @CappielloAntonio for the amazing app and hopefully we can continue to build on top of it. I will only be releasing on github and if I am not able to merge back to the main repo, I plan to rename the app to be able to publish it to fdroid and possibly google play? We will see.
 
@@ -39,7 +39,7 @@ Please note the two variants in the release assets include release/debug and 32/
 
 As mentioned above, I am working towards a rebrand to get into app stores with a new name an icon.
 
-Moved details to [CHANGELOG.md](https://github.com/eddyizm/tempo/blob/main/CHANGELOG.md)
+Moved details to [CHANGELOG.md](CHANGELOG.md)
 
 Fork [**sponsorship here**](https://ko-fi.com/eddyizm). 
 
@@ -59,6 +59,7 @@ Fork [**sponsorship here**](https://ko-fi.com/eddyizm).
 - **Podcasts and Radio**: If your Subsonic server supports it, listen to podcasts and radio shows directly within Tempo, expanding your audio entertainment options.
 - **Transcoding Support**: Activate transcoding of tracks on your Subsonic server, allowing you to set a transcoding profile for optimized streaming directly from the app. This feature requires support from your Subsonic server.
 - **Android Auto Support**: Enjoy your favorite music on the go with full Android Auto integration, allowing you to seamlessly control and listen to your tracks directly from your mobile device while driving.
+- **Multiple Libraries**: Tempo handles multi-library setups gracefully. They are displayed as Library folders.
 
 ## Credits
 Thanks to the original repo/creator [CappielloAntonio](https://github.com/CappielloAntonio) (3.9.0)
@@ -101,9 +102,9 @@ Thanks to the original repo/creator [CappielloAntonio](https://github.com/Cappie
 
 Please fork and open PR's against the development branch. Make sure your PR builds successfully. 
 
-If there is a UI change, please provide a before/after screenshot and a short video/gif if that helps elaborating the fix/feature in the PR. 
+If there is an UI change, please include a before/after screenshot and a short video/gif if that helps elaborating the fix/feature in the PR. 
 
-Currently there are not tests but I would love to start on some unit tests. 
+Currently there are no tests but I would love to start on some unit tests. 
 
 Not a hard requirement but any new feature/change should ideally include an update to the nacent documention. 
 

USAGE.md

@@ -57,7 +57,14 @@ This app works with any service that implements the Subsonic API, including:
 ## Main Features
 
 ### Library View
-**TODO**
+
+**Multi-library**
+
+Tempo handles multi-library setups gracefully. They are displayed as Library folders. 
+
+However, if you want to limit or change libraries you could use a workaround, if your server supports it.
+
+You can create multiple users , one for each library, and save each of them in Tempo app.
 
 ### Now Playing Screen
 

app/build.gradle

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

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

@@ -8,18 +8,18 @@ import androidx.room.PrimaryKey
 import com.cappielloantonio.tempo.subsonic.models.Child
 import com.cappielloantonio.tempo.util.Preferences
 import kotlinx.parcelize.Parcelize
-import java.util.*
+import java.util.Date
 
 @Keep
 @Parcelize
 @Entity(tableName = "chronology")
-class Chronology(@PrimaryKey override val id: String) : Child(id) {
+class Chronology(
+    @PrimaryKey override val id: String,
     @ColumnInfo(name = "timestamp")
-    var timestamp: Long = System.currentTimeMillis()
+    var timestamp: Long = System.currentTimeMillis(),
-
     @ColumnInfo(name = "server")
-    var server: String? = null
+    var server: String? = null,
-
+) : Child(id) {
     constructor(mediaItem: MediaItem) : this(mediaItem.mediaMetadata.extras!!.getString("id")!!) {
         parentId = mediaItem.mediaMetadata.extras!!.getString("parentId")
         isDir = mediaItem.mediaMetadata.extras!!.getBoolean("isDir")

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

@@ -10,19 +10,17 @@ import kotlinx.parcelize.Parcelize
 @Keep
 @Parcelize
 @Entity(tableName = "download")
-class Download(@PrimaryKey override val id: String) : Child(id) {
+class Download(
+    @PrimaryKey override val id: String,
     @ColumnInfo(name = "playlist_id")
-    var playlistId: String? = null
+    var playlistId: String? = null,
-
     @ColumnInfo(name = "playlist_name")
-    var playlistName: String? = null
+    var playlistName: String? = null,
-
     @ColumnInfo(name = "download_state", defaultValue = "1")
-    var downloadState: Int = 0
+    var downloadState: Int = 0,
-
     @ColumnInfo(name = "download_uri", defaultValue = "")
-    var downloadUri: String? = null
+    var downloadUri: String? = null,
-
+) : Child(id) {
     constructor(child: Child) : this(child.id) {
         parentId = child.parentId
         isDir = child.isDir
@@ -62,5 +60,5 @@ class Download(@PrimaryKey override val id: String) : Child(id) {
 @Keep
 data class DownloadStack(
     var id: String,
-    var view: String?
+    var view: String?,
 )

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

@@ -10,20 +10,18 @@ import kotlinx.parcelize.Parcelize
 @Keep
 @Parcelize
 @Entity(tableName = "queue")
-class Queue(override val id: String) : Child(id) {
+class Queue(
+    override val id: String,
     @PrimaryKey
     @ColumnInfo(name = "track_order")
-    var trackOrder: Int = 0
+    var trackOrder: Int = 0,
-
     @ColumnInfo(name = "last_play")
-    var lastPlay: Long = 0
+    var lastPlay: Long = 0,
-
     @ColumnInfo(name = "playing_changed")
-    var playingChanged: Long = 0
+    var playingChanged: Long = 0,
-
     @ColumnInfo(name = "stream_id")
-    var streamId: String? = null
+    var streamId: String? = null,
-
+) : Child(id) {
     constructor(child: Child) : this(child.id) {
         parentId = child.parentId
         isDir = child.isDir

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

@@ -2,6 +2,7 @@ package com.cappielloantonio.tempo.repository;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
+import android.util.Log;
 
 import com.cappielloantonio.tempo.App;
 import com.cappielloantonio.tempo.interfaces.DecadesCallback;
@@ -31,14 +32,22 @@ public class AlbumRepository {
                 .enqueue(new Callback<ApiResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getAlbumList2() != null && response.body().getSubsonicResponse().getAlbumList2().getAlbums() != null) {
+                        if (response.isSuccessful() 
+                            && response.body() != null 
+                            && response.body().getSubsonicResponse().getAlbumList2() != null 
+                            && response.body().getSubsonicResponse().getAlbumList2().getAlbums() != null) {
+                            
                             listLiveAlbums.setValue(response.body().getSubsonicResponse().getAlbumList2().getAlbums());
+                        } else {
+                            Log.e("AlbumRepository", "API Error on getAlbums. HTTP Code: " + response.code());
+                            listLiveAlbums.setValue(new ArrayList<>());
                         }
                     }
 
                     @Override
                     public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
+                        Log.e("AlbumRepository", "Network Failure on getAlbums: " + t.getMessage());
+                        listLiveAlbums.setValue(new ArrayList<>());
                     }
                 });
 

app/src/main/java/com/cappielloantonio/tempo/subsonic/RetrofitClient.kt

@@ -2,22 +2,28 @@ package com.cappielloantonio.tempo.subsonic
 
 import com.cappielloantonio.tempo.App
 import com.cappielloantonio.tempo.subsonic.utils.CacheUtil
+import com.cappielloantonio.tempo.subsonic.utils.EmptyDateTypeAdapter
 import com.google.gson.GsonBuilder
 import okhttp3.Cache
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import java.util.Date
 import java.util.concurrent.TimeUnit
 
 class RetrofitClient(subsonic: Subsonic) {
     var retrofit: Retrofit
 
     init {
+        val gson = GsonBuilder()
+            .registerTypeAdapter(Date::class.java, EmptyDateTypeAdapter())
+            .setLenient()
+            .create()
+
         retrofit = Retrofit.Builder()
             .baseUrl(subsonic.url)
-            .addConverterFactory(GsonConverterFactory.create(GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss").create()))
+            .addConverterFactory(GsonConverterFactory.create(gson))
-            .addConverterFactory(GsonConverterFactory.create(GsonBuilder().setLenient().create()))
             .client(getOkHttpClient())
             .build()
     }

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/AlbumID3.kt

@@ -4,38 +4,36 @@ import android.os.Parcelable
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
-import java.time.Instant
+import java.util.Date
-import java.time.LocalDate
-import java.util.*
 
 @Keep
 @Parcelize
-open class AlbumID3 : Parcelable {
+open class AlbumID3(
-    var id: String? = null
+    var id: String? = null,
-    var name: String? = null
+    var name: String? = null,
-    var artist: String? = null
+    var artist: String? = null,
-    var artistId: String? = null
+    var artistId: String? = null,
     @SerializedName("coverArt")
-    var coverArtId: String? = null
+    var coverArtId: String? = null,
-    var songCount: Int? = 0
+    var songCount: Int? = 0,
-    var duration: Int? = 0
+    var duration: Int? = 0,
-    var playCount: Long? = 0
+    var playCount: Long? = 0,
-    var created: Date? = null
+    var created: Date? = null,
-    var starred: Date? = null
+    var starred: Date? = null,
-    var year: Int = 0
+    var year: Int = 0,
-    var genre: String? = null
+    var genre: String? = null,
-    var played: Date? = Date(0)
+    var played: Date? = Date(0),
-    var userRating: Int? = 0
+    var userRating: Int? = 0,
-    var recordLabels: List<RecordLabel>? = null
+    var recordLabels: List<RecordLabel>? = null,
-    var musicBrainzId: String? = null
+    var musicBrainzId: String? = null,
-    var genres: List<ItemGenre>? = null
+    var genres: List<ItemGenre>? = null,
-    var artists: List<ArtistID3>? = null
+    var artists: List<ArtistID3>? = null,
-    var displayArtist: String? = null
+    var displayArtist: String? = null,
-    var releaseTypes: List<String>? = null
+    var releaseTypes: List<String>? = null,
-    var moods: List<String>? = null
+    var moods: List<String>? = null,
-    var sortName: String? = null
+    var sortName: String? = null,
-    var originalReleaseDate: ItemDate? = null
+    var originalReleaseDate: ItemDate? = null,
-    var releaseDate: ItemDate? = null
+    var releaseDate: ItemDate? = null,
-    var isCompilation: Boolean? = null
+    var isCompilation: Boolean? = null,
-    var discTitles: List<DiscTitle>? = null
+    var discTitles: List<DiscTitle>? = null,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/AlbumWithSongsID3.kt

@@ -7,7 +7,7 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class AlbumWithSongsID3 : AlbumID3(), Parcelable {
+class AlbumWithSongsID3(
     @SerializedName("song")
-    var songs: List<Child>? = null
+    var songs: List<Child>? = null,
-}
+) : AlbumID3(), Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/Artist.kt

@@ -7,10 +7,10 @@ import java.util.Date
 
 @Keep
 @Parcelize
-class Artist : Parcelable {
+class Artist(
-    var id: String? = null
+    var id: String? = null,
-    var name: String? = null
+    var name: String? = null,
-    var starred: Date? = null
+    var starred: Date? = null,
-    var userRating: Int? = null
+    var userRating: Int? = null,
-    var averageRating: Double? = null
+    var averageRating: Double? = null,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/ArtistID3.kt

@@ -4,15 +4,15 @@ import android.os.Parcelable
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
-import java.util.*
+import java.util.Date
 
 @Keep
 @Parcelize
-open class ArtistID3 : Parcelable {
+open class ArtistID3(
-    var id: String? = null
+    var id: String? = null,
-    var name: String? = null
+    var name: String? = null,
     @SerializedName("coverArt")
-    var coverArtId: String? = null
+    var coverArtId: String? = null,
-    var albumCount = 0
+    var albumCount: Int = 0,
-    var starred: Date? = null
+    var starred: Date? = null,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/ArtistWithAlbumsID3.kt

@@ -7,7 +7,7 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class ArtistWithAlbumsID3 : ArtistID3(), Parcelable {
+class ArtistWithAlbumsID3(
     @SerializedName("album")
-    var albums: List<AlbumID3>? = null
+    var albums: List<AlbumID3>? = null,
-}
+) : ArtistID3(), Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/Directory.kt

@@ -8,15 +8,15 @@ import java.util.Date
 
 @Keep
 @Parcelize
-class Directory : Parcelable {
+class Directory(
     @SerializedName("child")
-    var children: List<Child>? = null
+    var children: List<Child>? = null,
-    var id: String? = null
+    var id: String? = null,
     @SerializedName("parent")
-    var parentId: String? = null
+    var parentId: String? = null,
-    var name: String? = null
+    var name: String? = null,
-    var starred: Date? = null
+    var starred: Date? = null,
-    var userRating: Int? = null
+    var userRating: Int? = null,
-    var averageRating: Double? = null
+    var averageRating: Double? = null,
-    var playCount: Long? = null
+    var playCount: Long? = null,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/DiscTitle.kt

@@ -6,7 +6,7 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-open class DiscTitle : Parcelable {
+open class DiscTitle(
-    var disc: Int? = null
+    var disc: Int? = null,
-    var title: String? = null
+    var title: String? = null,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/Genre.kt

@@ -7,9 +7,9 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class Genre : Parcelable {
+class Genre(
     @SerializedName("value")
-    var genre: String? = null
+    var genre: String? = null,
-    var songCount = 0
+    var songCount: Int = 0,
-    var albumCount = 0
+    var albumCount: Int = 0,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/InternetRadioStation.kt

@@ -6,9 +6,9 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class InternetRadioStation : Parcelable {
+class InternetRadioStation(
-    var id: String? = null
+    var id: String? = null,
-    var name: String? = null
+    var name: String? = null,
-    var streamUrl: String? = null
+    var streamUrl: String? = null,
-    var homePageUrl: String? = null
+    var homePageUrl: String? = null,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/ItemDate.kt

@@ -9,11 +9,11 @@ import java.util.Locale
 
 @Keep
 @Parcelize
-open class ItemDate : Parcelable {
+open class ItemDate(
-    var year: Int? = null
+    var year: Int? = null,
-    var month: Int? = null
+    var month: Int? = null,
-    var day: Int? = null
+    var day: Int? = null,
-
+) : Parcelable {
     fun getFormattedDate(): String? {
         if (year == null && month == null && day == null) return null
 
@@ -22,8 +22,7 @@ open class ItemDate : Parcelable {
             SimpleDateFormat("yyyy", Locale.getDefault())
         } else if (day == null) {
             SimpleDateFormat("MMMM yyyy", Locale.getDefault())
-        }
+        } else {
-        else{
             SimpleDateFormat("MMMM dd, yyyy", Locale.getDefault())
         }
 

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/ItemGenre.kt

@@ -6,6 +6,6 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-open class ItemGenre : Parcelable {
+open class ItemGenre(
-    var name: String? = null
+    var name: String? = null,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/MusicFolder.kt

@@ -6,7 +6,7 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class MusicFolder : Parcelable {
+class MusicFolder(
-    var id: String? = null
+    var id: String? = null,
-    var name: String? = null
+    var name: String? = null,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/NowPlayingEntry.kt

@@ -8,10 +8,9 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 class NowPlayingEntry(
     @SerializedName("_id")
-    override val id: String
+    override val id: String,
-) : Child(id) {
+    var username: String? = null,
-    var username: String? = null
+    var minutesAgo: Int = 0,
-    var minutesAgo = 0
+    var playerId: Int = 0,
-    var playerId = 0
+    var playerName: String? = null,
-    var playerName: String? = null
+) : Child(id)
-}

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/Playlist.kt

@@ -7,8 +7,9 @@ import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import java.util.*
+import java.util.Date
 
 @Keep
 @Parcelize
@@ -16,27 +17,56 @@ import java.util.*
 open class Playlist(
     @PrimaryKey
     @ColumnInfo(name = "id")
-    open var id: String
+    open var id: String,
-) : Parcelable {
     @ColumnInfo(name = "name")
-    var name: String? = null
+    var name: String? = null,
+    @ColumnInfo(name = "duration")
+    var duration: Long = 0,
+    @ColumnInfo(name = "coverArt")
+    var coverArtId: String? = null,
+) : Parcelable {
     @Ignore
+    @IgnoredOnParcel
     var comment: String? = null
     @Ignore
+    @IgnoredOnParcel
     var owner: String? = null
     @Ignore
+    @IgnoredOnParcel
     @SerializedName("public")
     var isUniversal: Boolean? = null
     @Ignore
+    @IgnoredOnParcel
     var songCount: Int = 0
-    @ColumnInfo(name = "duration")
-    var duration: Long = 0
     @Ignore
+    @IgnoredOnParcel
     var created: Date? = null
     @Ignore
+    @IgnoredOnParcel
     var changed: Date? = null
-    @ColumnInfo(name = "coverArt")
-    var coverArtId: String? = null
     @Ignore
+    @IgnoredOnParcel
     var allowedUsers: List<String>? = null
+    @Ignore
+    constructor(
+        id: String,
+        name: String?,
+        comment: String?,
+        owner: String?,
+        isUniversal: Boolean?,
+        songCount: Int,
+        duration: Long,
+        created: Date?,
+        changed: Date?,
+        coverArtId: String?,
+        allowedUsers: List<String>?,
+    ) : this(id, name, duration, coverArtId) {
+        this.comment = comment
+        this.owner = owner
+        this.isUniversal = isUniversal
+        this.songCount = songCount
+        this.created = created
+        this.changed = changed
+        this.allowedUsers = allowedUsers
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/PlaylistWithSongs.kt

@@ -9,8 +9,7 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 class PlaylistWithSongs(
     @SerializedName("_id")
-    override var id: String
+    override var id: String,
-) : Playlist(id), Parcelable {
     @SerializedName("entry")
-    var entries: List<Child>? = null
+    var entries: List<Child>? = null,
-}
+) : Playlist(id), Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/Playlists.kt

@@ -6,5 +6,5 @@ import com.google.gson.annotations.SerializedName
 @Keep
 class Playlists(
     @SerializedName("playlist")
-    var playlists: List<Playlist>? = null
+    var playlists: List<Playlist>? = null,
 )

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/PodcastChannel.kt

@@ -3,20 +3,21 @@ package com.cappielloantonio.tempo.subsonic.models
 import android.os.Parcelable
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class PodcastChannel : Parcelable {
+class PodcastChannel(
     @SerializedName("episode")
-    var episodes: List<PodcastEpisode>? = null
+    var episodes: List<PodcastEpisode>? = null,
-    var id: String? = null
+    var id: String? = null,
-    var url: String? = null
+    var url: String? = null,
-    var title: String? = null
+    var title: String? = null,
-    var description: String? = null
+    var description: String? = null,
     @SerializedName("coverArt")
-    var coverArtId: String? = null
+    var coverArtId: String? = null,
-    var originalImageUrl: String? = null
+    var originalImageUrl: String? = null,
-    var status: String? = null
+    var status: String? = null,
-    var errorMessage: String? = null
+    var errorMessage: String? = null,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/PodcastEpisode.kt

@@ -3,37 +3,38 @@ package com.cappielloantonio.tempo.subsonic.models
 import android.os.Parcelable
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Keep
 @Parcelize
-class PodcastEpisode : Parcelable {
+class PodcastEpisode(
-    var id: String? = null
+    var id: String? = null,
     @SerializedName("parent")
-    var parentId: String? = null
+    var parentId: String? = null,
-    var isDir = false
+    var isDir: Boolean = false,
-    var title: String? = null
+    var title: String? = null,
-    var album: String? = null
+    var album: String? = null,
-    var artist: String? = null
+    var artist: String? = null,
-    var year: Int? = null
+    var year: Int? = null,
-    var genre: String? = null
+    var genre: String? = null,
     @SerializedName("coverArt")
-    var coverArtId: String? = null
+     var coverArtId: String? = null,
-    var size: Long? = null
+    var size: Long? = null,
-    var contentType: String? = null
+    var contentType: String? = null,
-    var suffix: String? = null
+    var suffix: String? = null,
-    var duration: Int? = null
+    var duration: Int? = null,
     @SerializedName("bitRate")
-    var bitrate: Int? = null
+    var bitrate: Int? = null,
-    var path: String? = null
+    var path: String? = null,
-    var isVideo: Boolean = false
+    var isVideo: Boolean = false,
-    var created: Date? = null
+    var created: Date? = null,
-    var artistId: String? = null
+    var artistId: String? = null,
-    var type: String? = null
+    var type: String? = null,
-    var streamId: String? = null
+    var streamId: String? = null,
-    var channelId: String? = null
+    var channelId: String? = null,
-    var description: String? = null
+    var description: String? = null,
-    var status: String? = null
+    var status: String? = null,
-    var publishDate: Date? = null
+    var publishDate: Date? = null,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/RecordLabel.kt

@@ -2,10 +2,11 @@ package com.cappielloantonio.tempo.subsonic.models
 
 import android.os.Parcelable
 import androidx.annotation.Keep
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-open class RecordLabel : Parcelable {
+open class RecordLabel(
-    var name: String? = null
+    var name: String? = null,
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/Share.kt

@@ -3,20 +3,21 @@ package com.cappielloantonio.tempo.subsonic.models
 import android.os.Parcelable
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import java.util.*
+import java.util.Date
 
 @Keep
 @Parcelize
-class Share : Parcelable {
+data class Share(
     @SerializedName("entry")
-    var entries: List<Child>? = null
+    var entries: List<Child>? = null,
-    var id: String? = null
+    var id: String? = null,
-    var url: String? = null
+    var url: String? = null,
-    var description: String? = null
+    var description: String? = null,
-    var username: String? = null
+    var username: String? = null,
-    var created: Date? = null
+    var created: Date? = null,
-    var expires: Date? = null
+    var expires: Date? = null,
-    var lastVisited: Date? = null
+    var lastVisited: Date? = null,
-    var visitCount = 0
+    var visitCount: Int = 0
-}
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/utils/EmptyDateTypeAdapter.kt

@@ -0,0 +1,42 @@
+package com.cappielloantonio.tempo.subsonic.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import java.lang.reflect.Type
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+
+// This adapter handles Date objects, returning null if the JSON string is empty or unparsable.
+class EmptyDateTypeAdapter : JsonDeserializer<Date> {
+
+    // Define the date formats expected from the Subsonic server.
+    private val dateFormats: List<SimpleDateFormat> = listOf(
+        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") },
+        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") },
+        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }
+    )
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Date? {
+        val jsonString = json.asString.trim()
+
+        if (jsonString.isEmpty()) {
+            return null
+        }
+
+        for (format in dateFormats) {
+            try {
+                return format.parse(jsonString)
+            } catch (e: ParseException) {
+                // Ignore and try the next format
+            }
+        }
+        
+        return null 
+    }
+}

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

@@ -20,6 +20,7 @@ import com.cappielloantonio.tempo.util.MusicUtil;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 
 public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAdapter.ViewHolder> implements Filterable {
@@ -152,12 +153,20 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
     }
 
     public void sort(String order) {
+        if (albums == null) return;
+        
         switch (order) {
             case Constants.ALBUM_ORDER_BY_NAME:
-                albums.sort(Comparator.comparing(AlbumID3::getName));
+                albums.sort(Comparator.comparing(
+                    album -> album.getName() != null ? album.getName() : "",
+                    String.CASE_INSENSITIVE_ORDER
+                ));
                 break;
             case Constants.ALBUM_ORDER_BY_ARTIST:
-                albums.sort(Comparator.comparing(AlbumID3::getArtist, Comparator.nullsLast(Comparator.naturalOrder())));
+                albums.sort(Comparator.comparing(
+                    album -> album.getArtist() != null ? album.getArtist() : "",
+                    String.CASE_INSENSITIVE_ORDER
+                ));
                 break;
             case Constants.ALBUM_ORDER_BY_YEAR:
                 albums.sort(Comparator.comparing(AlbumID3::getYear));
@@ -166,15 +175,23 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
                 Collections.shuffle(albums);
                 break;
             case Constants.ALBUM_ORDER_BY_RECENTLY_ADDED:
-                albums.sort(Comparator.comparing(AlbumID3::getCreated));
+                albums.sort(Comparator.comparing(
+                    album -> album.getCreated() != null ? album.getCreated() : new Date(0),
+                    Comparator.nullsLast(Date::compareTo)
+                ));
                 Collections.reverse(albums);
                 break;
             case Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED:
-                albums.sort(Comparator.comparing(AlbumID3::getPlayed));
+                albums.sort(Comparator.comparing(
+                    album -> album.getPlayed() != null ? album.getPlayed() : new Date(0),
+                    Comparator.nullsLast(Date::compareTo)
+                ));
                 Collections.reverse(albums);
                 break;
             case Constants.ALBUM_ORDER_BY_MOST_PLAYED:
-                albums.sort(Comparator.comparing(AlbumID3::getPlayCount));
+                albums.sort(Comparator.comparing(
+                    album -> album.getPlayCount() != null ? album.getPlayCount() : 0L
+                ));
                 Collections.reverse(albums);
                 break;
         }

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

@@ -32,17 +32,19 @@ import com.cappielloantonio.tempo.interfaces.ClickCallback;
 import com.cappielloantonio.tempo.ui.activity.MainActivity;
 import com.cappielloantonio.tempo.ui.adapter.AlbumCatalogueAdapter;
 import com.cappielloantonio.tempo.util.Constants;
+import com.cappielloantonio.tempo.util.Preferences;
 import com.cappielloantonio.tempo.viewmodel.AlbumCatalogueViewModel;
 
 @OptIn(markerClass = UnstableApi.class)
 public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
-    private static final String TAG = "ArtistCatalogueFragment";
+    private static final String TAG = "AlbumCatalogueFragment";
 
     private FragmentAlbumCatalogueBinding bind;
     private MainActivity activity;
     private AlbumCatalogueViewModel albumCatalogueViewModel;
 
     private AlbumCatalogueAdapter albumAdapter;
+    private String currentSortOrder;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -115,7 +117,10 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
         albumAdapter = new AlbumCatalogueAdapter(this, true);
         albumAdapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY);
         bind.albumCatalogueRecyclerView.setAdapter(albumAdapter);
-        albumCatalogueViewModel.getAlbumList().observe(getViewLifecycleOwner(), albums -> albumAdapter.setItems(albums));
+        albumCatalogueViewModel.getAlbumList().observe(getViewLifecycleOwner(), albums -> {
+            albumAdapter.setItems(albums);
+            applySavedSortOrder();
+        });
 
         bind.albumCatalogueRecyclerView.setOnTouchListener((v, event) -> {
             hideKeyboard(v);
@@ -137,6 +142,44 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
         });
     }
 
+    private void applySavedSortOrder() {
+        String savedSortOrder = Preferences.getAlbumSortOrder();
+        currentSortOrder = savedSortOrder;
+        albumAdapter.sort(savedSortOrder);
+        updateSortIndicator();
+    }
+
+    private void updateSortIndicator() {
+        if (bind == null) return;
+
+        String sortText = getSortDisplayText(currentSortOrder);
+        bind.albumListSortTextView.setText(sortText);
+        bind.albumListSortTextView.setVisibility(View.VISIBLE);
+    }
+
+    private String getSortDisplayText(String sortOrder) {
+        if (sortOrder == null) return "";
+        
+        switch (sortOrder) {
+            case Constants.ALBUM_ORDER_BY_NAME:
+                return getString(R.string.menu_sort_name);
+            case Constants.ALBUM_ORDER_BY_ARTIST:
+                return getString(R.string.menu_group_by_artist);
+            case Constants.ALBUM_ORDER_BY_YEAR:
+                return getString(R.string.menu_sort_year);
+            case Constants.ALBUM_ORDER_BY_RANDOM:
+                return getString(R.string.menu_sort_random);
+            case Constants.ALBUM_ORDER_BY_RECENTLY_ADDED:
+                return getString(R.string.menu_sort_recently_added);
+            case Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED:
+                return getString(R.string.menu_sort_recently_played);
+            case Constants.ALBUM_ORDER_BY_MOST_PLAYED:
+                return getString(R.string.menu_sort_most_played);
+            default:
+                return "";
+        }
+    }
+
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         inflater.inflate(R.menu.toolbar_menu, menu);
@@ -172,26 +215,29 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
         popup.getMenuInflater().inflate(menuResource, popup.getMenu());
 
         popup.setOnMenuItemClickListener(menuItem -> {
+            String newSortOrder = null;
+            
             if (menuItem.getItemId() == R.id.menu_album_sort_name) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_NAME);
+                newSortOrder = Constants.ALBUM_ORDER_BY_NAME;
-                return true;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_artist) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_ARTIST);
+                newSortOrder = Constants.ALBUM_ORDER_BY_ARTIST;
-                return true;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_year) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_YEAR);
+                newSortOrder = Constants.ALBUM_ORDER_BY_YEAR;
-                return true;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_random) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_RANDOM);
+                newSortOrder = Constants.ALBUM_ORDER_BY_RANDOM;
-                return true;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_recently_added) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_RECENTLY_ADDED);
+                newSortOrder = Constants.ALBUM_ORDER_BY_RECENTLY_ADDED;
-                return true;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_recently_played) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED);
+                newSortOrder = Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED;
-                return true;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_most_played) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_MOST_PLAYED);
+                newSortOrder = Constants.ALBUM_ORDER_BY_MOST_PLAYED;
+            }
+
+            if (newSortOrder != null) {
+                currentSortOrder = newSortOrder;
+                albumAdapter.sort(newSortOrder);
+                Preferences.setAlbumSortOrder(newSortOrder);
+                updateSortIndicator();
                 return true;
             }
 

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

@@ -76,6 +76,8 @@ object Preferences {
     private const val EQUALIZER_ENABLED = "equalizer_enabled"
     private const val EQUALIZER_BAND_LEVELS = "equalizer_band_levels"
     private const val MINI_SHUFFLE_BUTTON_VISIBILITY = "mini_shuffle_button_visibility"
+    private const val ALBUM_SORT_ORDER = "album_sort_order"
+    private const val DEFAULT_ALBUM_SORT_ORDER = Constants.ALBUM_ORDER_BY_NAME
 
     @JvmStatic
     fun getServer(): String? {
@@ -638,4 +640,14 @@ object Preferences {
         if (parts.size < bandCount) return ShortArray(bandCount.toInt())
         return ShortArray(bandCount.toInt()) { i -> parts[i].toShortOrNull() ?: 0 }
     }
+
+    @JvmStatic
+    fun getAlbumSortOrder(): String {
+        return App.getInstance().preferences.getString(ALBUM_SORT_ORDER, DEFAULT_ALBUM_SORT_ORDER) ?: DEFAULT_ALBUM_SORT_ORDER
+    }
+
+    @JvmStatic
+    fun setAlbumSortOrder(sortOrder: String) {
+        App.getInstance().preferences.edit().putString(ALBUM_SORT_ORDER, sortOrder).apply()
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/widget/WidgetUpdateManager.java

@@ -27,6 +27,8 @@ import java.util.concurrent.ExecutionException;
 
 public final class WidgetUpdateManager {
 
+    private static final int WIDGET_SAFE_ART_SIZE = 512;
+
     public static void updateFromState(Context ctx,
                                        String title,
                                        String artist,
@@ -95,7 +97,7 @@ public final class WidgetUpdateManager {
             CustomGlideRequest.loadAlbumArtBitmap(
                     appCtx,
                     coverArtId,
-                    com.cappielloantonio.tempo.util.Preferences.getImageSize(),
+                    WIDGET_SAFE_ART_SIZE,
                     new CustomTarget<Bitmap>() {
                         @Override
                         public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {

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

@@ -41,23 +41,40 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent" />
 
-                <Button
+                <LinearLayout
-                    android:id="@+id/album_list_sort_image_view"
+                    android:id="@+id/sort_container"
-                    style="@style/Widget.Material3.Button.TonalButton.Icon"
+                    android:layout_width="wrap_content"
-                    android:layout_width="52dp"
+                    android:layout_height="wrap_content"
-                    android:layout_height="52dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginBottom="12dp"
-                    android:insetLeft="0dp"
+                    android:orientation="horizontal"
-                    android:insetTop="0dp"
+                    android:gravity="center_vertical"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    app:cornerRadius="30dp"
-                    app:icon="@drawable/ic_sort_list"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent" />
+                    app:layout_constraintEnd_toEndOf="parent">
+
+                    <TextView
+                        android:id="@+id/albumListSortTextView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                        android:paddingEnd="8dp"
+                        android:visibility="gone" />
+
+                    <Button
+                        android:id="@+id/album_list_sort_image_view"
+                        style="@style/Widget.Material3.Button.TonalButton.Icon"
+                        android:layout_width="52dp"
+                        android:layout_height="52dp"
+                        android:insetLeft="0dp"
+                        android:insetTop="0dp"
+                        android:insetRight="0dp"
+                        android:insetBottom="0dp"
+                        app:cornerRadius="30dp"
+                        app:icon="@drawable/ic_sort_list" />
+
+                </LinearLayout>
 
                 <ProgressBar
                     android:id="@+id/album_list_progress_loader"
@@ -71,7 +88,6 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"/>
 
-
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -87,4 +103,3 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
-

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

@@ -14,16 +14,19 @@ 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.TrackGroupArray
 import androidx.media3.exoplayer.trackselection.TrackSelectionArray
 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
@@ -84,6 +87,7 @@ class MediaService : MediaLibraryService() {
         initializeCustomCommands()
         initializePlayer()
         initializeMediaLibrarySession()
+        restorePlayerFromQueue()
         initializePlayerListener()
         initializeEqualizerManager()
 
@@ -119,15 +123,17 @@ class MediaService : MediaLibraryService() {
             val connectionResult = super.onConnect(session, controller)
             val availableSessionCommands = connectionResult.availableSessionCommands.buildUpon()
 
-            shuffleCommands.forEach { commandButton ->
+            (shuffleCommands + repeatCommands).forEach { commandButton ->
-                // TODO: Aggiungere i comandi personalizzati
+                commandButton.sessionCommand?.let { availableSessionCommands.add(it) }
-                // commandButton.sessionCommand?.let { availableSessionCommands.add(it) }
             }
 
-            return MediaSession.ConnectionResult.accept(
+            customLayout = buildCustomLayout(session.player)
-                availableSessionCommands.build(),
+
-                connectionResult.availablePlayerCommands
+            return MediaSession.ConnectionResult.AcceptedResultBuilder(session)
-            )
+                .setAvailableSessionCommands(availableSessionCommands.build())
+                .setAvailablePlayerCommands(connectionResult.availablePlayerCommands)
+                .setCustomLayout(customLayout)
+                .build()
         }
 
         override fun onPostConnect(session: MediaSession, controller: ControllerInfo) {
@@ -226,7 +232,7 @@ class MediaService : MediaLibraryService() {
     private fun initializePlayer() {
         player = ExoPlayer.Builder(this)
             .setRenderersFactory(getRenderersFactory())
-            .setMediaSourceFactory(DynamicMediaSourceFactory(this))
+            .setMediaSourceFactory(getMediaSourceFactory())
             .setAudioAttributes(AudioAttributes.DEFAULT, true)
             .setHandleAudioBecomingNoisy(true)
             .setWakeMode(C.WAKE_MODE_NETWORK)
@@ -269,6 +275,33 @@ class MediaService : MediaLibraryService() {
         }
     }
 
+    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) {
@@ -399,7 +432,7 @@ class MediaService : MediaLibraryService() {
             .build()
     }
 
-    private fun ignoreFuture(customLayout: ListenableFuture<SessionResult>) {
+    private fun ignoreFuture(@Suppress("UNUSED_PARAMETER") customLayout: ListenableFuture<SessionResult>) {
         /* Do nothing. */
     }
 
@@ -464,6 +497,7 @@ class MediaService : MediaLibraryService() {
 
     private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false)
 
+    private fun getMediaSourceFactory(): MediaSource.Factory = DynamicMediaSourceFactory(this)
 }
 
 private const val WIDGET_UPDATE_INTERVAL_MS = 1000L

app/src/tempo/java/com/cappielloantonio/tempo/service/MediaLibraryServiceCallback.kt

@@ -295,11 +295,6 @@ open class MediaLibrarySessionCallback(
         args: Bundle
     ): ListenableFuture<SessionResult> {
 
-        val mediaItemId = args.getString(
-            MediaConstants.EXTRA_KEY_MEDIA_ID,
-            session.player.currentMediaItem?.mediaId
-        )
-
         when (customCommand.customAction) {
             CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON -> {
                 session.player.shuffleModeEnabled = true

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

@@ -8,6 +8,7 @@ import android.os.Binder
 import android.os.IBinder
 import android.os.Handler
 import android.os.Looper
+import androidx.core.content.ContextCompat
 import androidx.media3.cast.CastPlayer
 import androidx.media3.cast.SessionAvailabilityListener
 import androidx.media3.common.AudioAttributes
@@ -21,11 +22,13 @@ 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
@@ -71,9 +74,10 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
 
         initializeRepository()
         initializePlayer()
-        initializeCastPlayer()
         initializeMediaLibrarySession()
+        restorePlayerFromQueue()
         initializePlayerListener()
+        initializeCastPlayer()
         initializeEqualizerManager()
 
         setPlayer(
@@ -143,12 +147,20 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
         player.repeatMode = Preferences.getRepeatMode()
     }
 
+    @Suppress("DEPRECATION")
     private fun initializeCastPlayer() {
         if (GoogleApiAvailability.getInstance()
                 .isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS
         ) {
-            castPlayer = CastPlayer(CastContext.getSharedInstance(this))
+            CastContext.getSharedInstance(this, ContextCompat.getMainExecutor(this))
-            castPlayer.setSessionAvailabilityListener(this)
+                    .addOnSuccessListener { castContext ->
+                        castPlayer = CastPlayer(castContext)
+                        castPlayer.setSessionAvailabilityListener(this@MediaService)
+
+                        if (castPlayer.isCastSessionAvailable && this::mediaLibrarySession.isInitialized) {
+                            setPlayer(player, castPlayer)
+                        }
+                    }
         }
     }
 
@@ -166,6 +178,33 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
                 .build()
     }
 
+    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 {
         return MediaLibrarySessionCallback(this, automotiveRepository)
     }

app/src/tempo/java/com/cappielloantonio/tempo/util/Flavors.java

@@ -2,13 +2,16 @@ package com.cappielloantonio.tempo.util;
 
 import android.content.Context;
 
+import androidx.core.content.ContextCompat;
+
 import com.google.android.gms.cast.framework.CastContext;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
 public class Flavors {
+    @SuppressWarnings("deprecation")
     public static void initializeCastContext(Context context) {
         if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS)
-            CastContext.getSharedInstance(context);
+            CastContext.getSharedInstance(context, ContextCompat.getMainExecutor(context));
     }
 }