fix: crash when adding lots of songs to queue

Author: Heropowwa

composeApp/src/androidMain/kotlin/paige/navic/di/PlatformModule.android.kt

@@ -54,7 +54,9 @@ actual val platformModule = module {
 		AndroidMediaPlayerViewModel(
 			application = androidApplication(),
 			stateRepository = get(),
+			songRepository = get(),
 			albumDao = get(),
+			songDao = get(),
 			downloadManager = get(),
 			connectivityManager = get(),
 			sessionManager = get(),

composeApp/src/androidMain/kotlin/paige/navic/shared/MediaPlayer.android.kt

@@ -51,6 +51,7 @@ import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import paige.navic.data.database.dao.AlbumDao
+import paige.navic.data.database.dao.SongDao
 import paige.navic.data.database.mappers.toDomainModel
 import paige.navic.domain.manager.AndroidScrobbleManager
 import paige.navic.domain.manager.ConnectivityManager
@@ -66,6 +67,7 @@ import paige.navic.domain.models.DomainSong
 import paige.navic.domain.models.DomainSongCollection
 import paige.navic.domain.models.settings.ReplayGainMode
 import paige.navic.domain.repositories.PlayerStateRepository
+import paige.navic.domain.repositories.SongRepository
 import paige.navic.ui.core.PlayerUiState
 import paige.navic.util.core.Logger
 import paige.navic.util.core.ResourceProvider
@@ -286,16 +288,19 @@ class PlaybackService : MediaSessionService(), KoinComponent {
 
 class AndroidMediaPlayerViewModel(
 	stateRepository: PlayerStateRepository,
+	songRepository: SongRepository,
 	downloadManager: DownloadManager,
 	connectivityManager: ConnectivityManager,
 	preferenceManager: PreferenceManager,
 	private val application: Application,
 	private val albumDao: AlbumDao,
+	private val songDao: SongDao,
 	private val platformContext: CoilPlatformContext,
 	private val sessionManager: SessionManager,
 	private val snackBarManager: SnackBarManager
 ) : MediaPlayerViewModel(
 	stateRepository = stateRepository,
+	songRepository = songRepository,
 	connectivityManager = connectivityManager,
 	downloadManager = downloadManager,
 	preferenceManager = preferenceManager
@@ -650,6 +655,7 @@ class AndroidMediaPlayerViewModel(
 				val newQueue = state.queue + song
 				state.copy(
 					queue = newQueue,
+					queueIds = newQueue.map { it.id },
 					currentIndex = if (state.currentIndex == -1) 0 else state.currentIndex,
 					currentSong = if (state.currentIndex == -1) song else state.currentSong
 				)
@@ -678,6 +684,7 @@ class AndroidMediaPlayerViewModel(
 				val newQueue = state.queue + songs
 				state.copy(
 					queue = newQueue,
+					queueIds = newQueue.map { it.id },
 					currentIndex = if (state.currentIndex == -1) 0 else state.currentIndex,
 					currentSong = if (state.currentIndex == -1) songs.firstOrNull() else state.currentSong
 				)
@@ -701,6 +708,7 @@ class AndroidMediaPlayerViewModel(
 				}
 				state.copy(
 					queue = newQueue,
+					queueIds = newQueue.map { it.id },
 					currentIndex = newIndex,
 					currentSong = if (newIndex == -1) null else newQueue[newIndex]
 				)
@@ -724,6 +732,7 @@ class AndroidMediaPlayerViewModel(
 				}
 				state.copy(
 					queue = newQueue,
+					queueIds = newQueue.map { it.id },
 					currentIndex = newIndex,
 					currentSong = if (newIndex == -1) null else newQueue[newIndex]
 				)
@@ -736,6 +745,7 @@ class AndroidMediaPlayerViewModel(
 			_uiState.update {
 				it.copy(
 					queue = emptyList(),
+					queueIds = emptyList(),
 					currentSong = null,
 					currentIndex = -1,
 					progress = 0f
@@ -770,6 +780,7 @@ class AndroidMediaPlayerViewModel(
 						state.queue.slice(0..state.currentIndex) + song + state.queue.slice(state.currentIndex + 1..<state.queue.size)
 				state.copy(
 					queue = newQueue,
+					queueIds = newQueue.map { it.id },
 					currentIndex = if (state.currentIndex == -1) 0 else state.currentIndex,
 					currentSong = if (state.currentIndex == -1) song else state.currentSong
 				)
@@ -800,6 +811,7 @@ class AndroidMediaPlayerViewModel(
 						)
 				state.copy(
 					queue = newQueue,
+					queueIds = newQueue.map { it.id },
 					currentIndex = if (state.currentIndex == -1) 0 else state.currentIndex,
 					currentSong = if (state.currentIndex == -1) newCollection.firstOrNull() else state.currentSong
 				)
@@ -873,6 +885,7 @@ class AndroidMediaPlayerViewModel(
 			_uiState.update { state ->
 				state.copy(
 					queue = listOf(dummyRadioSong),
+					queueIds = listOf(radioId),
 					currentIndex = 0,
 					currentSong = dummyRadioSong,
 					isLoading = true
@@ -898,6 +911,7 @@ class AndroidMediaPlayerViewModel(
 			_uiState.update { state ->
 				state.copy(
 					queue = shuffledSongs,
+					queueIds = shuffledSongs.map { it.id },
 					currentIndex = 0,
 					currentSong = shuffledSongs.firstOrNull()
 				)

composeApp/src/commonMain/kotlin/paige/navic/domain/repositories/SongRepository.kt

@@ -31,6 +31,10 @@ class SongRepository(
 		return songDao.getAllSongs().map { it.toDomainModel() }
 	}
 
+	suspend fun getSongsByIds(ids: List<String>): List<DomainSong> {
+		return songDao.getSongsByIds(ids).map { it.toDomainModel() }
+	}
+
 	private suspend fun getLocalData(
 		listType: DomainSongListType,
 		reversed: Boolean

composeApp/src/commonMain/kotlin/paige/navic/shared/MediaPlayer.kt

@@ -20,12 +20,14 @@ import paige.navic.domain.models.DomainSong
 import paige.navic.domain.models.DomainSongCollection
 import paige.navic.domain.models.settings.ExplicitContentPlayback
 import paige.navic.domain.repositories.PlayerStateRepository
+import paige.navic.domain.repositories.SongRepository
 import paige.navic.ui.core.PlayerUiState
 import paige.navic.util.core.Logger
 import kotlin.time.Duration.Companion.seconds
 
 abstract class MediaPlayerViewModel(
-	private val stateRepository: PlayerStateRepository,
+	protected val songRepository: SongRepository,
+	protected val stateRepository: PlayerStateRepository,
 	protected val connectivityManager: ConnectivityManager,
 	protected val downloadManager: DownloadManager,
 	protected val preferenceManager: PreferenceManager
@@ -102,7 +104,21 @@ abstract class MediaPlayerViewModel(
 				val restoredState = Json.decodeFromJsonElement<PlayerUiState>(
 					Json.parseToJsonElement(savedJson)
 				)
-				val stateToApply = restoredState.copy(isPaused = true, isLoading = false)
+
+				val fullQueue = if (restoredState.queueIds.isNotEmpty()) {
+					songRepository.getSongsByIds(restoredState.queueIds)
+				} else {
+					emptyList()
+				}
+
+				val currentSong = fullQueue.getOrNull(restoredState.currentIndex)
+
+				val stateToApply = restoredState.copy(
+					queue = fullQueue,
+					currentSong = currentSong,
+					isPaused = true,
+					isLoading = false
+				)
 
 				_uiState.value = stateToApply
 
@@ -142,7 +158,8 @@ abstract class MediaPlayerViewModel(
 
 	private suspend fun saveStateInternal(state: PlayerUiState) {
 		try {
-			val jsonString = Json.encodeToString(state)
+			val persistentState = state.toPersistentState()
+			val jsonString = Json.encodeToString(persistentState)
 			stateRepository.saveState(jsonString)
 		} catch (e: Exception) {
 			Logger.e("MediaPlayerViewModel", "Failed to save state!", e)

composeApp/src/commonMain/kotlin/paige/navic/ui/core/PlayerUiState.kt

@@ -18,5 +18,12 @@ data class PlayerUiState(
 	val playbackSpeed: Float = 1.0f,
 	val playbackBitrate: Int? = null,
 	val playbackSampleRate: Int? = null,
-	val playbackMimeType: String? = null
-)
+	val playbackMimeType: String? = null,
+	val queueIds: List<String> = emptyList()
+) {
+	fun toPersistentState() = copy(
+		queue = emptyList(),
+		currentSong = null,
+		currentCollection = null
+	)
+}

composeApp/src/iosMain/kotlin/paige/navic/di/PlatformModule.ios.kt

@@ -61,6 +61,7 @@ actual val platformModule = module {
 	viewModel<MediaPlayerViewModel> {
 		IOSMediaPlayerViewModel(
 			stateRepository = get(),
+			songRepository = get(),
 			downloadManager = get(),
 			connectivityManager = get(),
 			syncManager = get(),

composeApp/src/iosMain/kotlin/paige/navic/shared/MediaPlayer.ios.kt

@@ -22,6 +22,7 @@ import paige.navic.domain.models.DomainRadio
 import paige.navic.domain.models.DomainSong
 import paige.navic.domain.models.DomainSongCollection
 import paige.navic.domain.repositories.PlayerStateRepository
+import paige.navic.domain.repositories.SongRepository
 import paige.navic.ui.core.PlayerUiState
 import paige.navic.util.core.Logger
 import platform.AVFAudio.AVAudioSession
@@ -75,6 +76,7 @@ import platform.darwin.dispatch_semaphore_wait
 
 class IOSMediaPlayerViewModel(
 	stateRepository: PlayerStateRepository,
+	songRepository: SongRepository,
 	downloadManager: DownloadManager,
 	connectivityManager: ConnectivityManager,
 	preferenceManager: PreferenceManager,
@@ -83,6 +85,7 @@ class IOSMediaPlayerViewModel(
 	private val snackBarManager: SnackBarManager
 ) : MediaPlayerViewModel(
 	stateRepository = stateRepository,
+	songRepository = songRepository,
 	connectivityManager = connectivityManager,
 	downloadManager = downloadManager,
 	preferenceManager = preferenceManager