Twelve: Don't support nullable audios in playlist

We weren't handling it at all, we submitted the list and that was it! If we ever want to handle the media remocal case we need to add a routine to sync local playlist items with media provider. For now having stale entries is good enough. Change-Id: I790cabe57ed9b002eae259c099f05a900013e61d
LineageOS · Nov 28, 2024 · 19afe0b · 19afe0b
1 parent 4265a30
commit 19afe0b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/app/src/main/java/org/lineageos/twelve/datasources/LocalDataSource.kt b/app/src/main/java/org/lineageos/twelve/datasources/LocalDataSource.kt
@@ -535,7 +535,7 @@ class LocalDataSource(context: Context, private val database: TwelveDatabase) :
 
             audios(playlistWithItems.items.map(Item::audioUri))
                 .mapLatest { items ->
-                    RequestStatus.Success<_, MediaError>(playlist to items)
+                    RequestStatus.Success<_, MediaError>(playlist to items.filterNotNull())
                 }
         } ?: flowOf(
             RequestStatus.Error(

diff --git a/app/src/main/java/org/lineageos/twelve/datasources/MediaDataSource.kt b/app/src/main/java/org/lineageos/twelve/datasources/MediaDataSource.kt
@@ -95,9 +95,8 @@ interface MediaDataSource {
 
     /**
      * Get the playlist information and all the tracks of the given playlist.
-     * If the playlist contains an audio that is unavailable, it will be mapped to null.
      */
-    fun playlist(playlistUri: Uri): Flow<MediaRequestStatus<Pair<Playlist, List<Audio?>>>>
+    fun playlist(playlistUri: Uri): Flow<MediaRequestStatus<Pair<Playlist, List<Audio>>>>
 
     /**
      * Get an audio status within all playlists.

diff --git a/app/src/main/java/org/lineageos/twelve/datasources/SubsonicDataSource.kt b/app/src/main/java/org/lineageos/twelve/datasources/SubsonicDataSource.kt
@@ -288,7 +288,7 @@ class SubsonicDataSource(arguments: Bundle, cache: Cache? = null) : MediaDataSou
         subsonicClient.getPlaylist(playlistUri.lastPathSegment!!.toInt()).toRequestStatus {
             toPlaylist().toMediaItem() to entry.orEmpty().map {
                 it.toMediaItem()
-            } as List<Audio?>
+            }
         }
     }
 

diff --git a/app/src/main/java/org/lineageos/twelve/fragments/PlaylistFragment.kt b/app/src/main/java/org/lineageos/twelve/fragments/PlaylistFragment.kt
@@ -253,7 +253,7 @@ class PlaylistFragment : Fragment(R.layout.fragment_playlist) {
                     )
 
                     val totalDurationMs = audios.sumOf { audio ->
-                        audio?.durationMs ?: 0
+                        audio.durationMs
                     }
                     val totalDurationMinutes = (totalDurationMs / 1000 / 60).toInt()