Bump version; lock quality & handle fallbacks

Bump app version to 5.1.91 (versionCode 511) and update release notes. Improve playback robustness by adding detection for runtime/check and container-corruption errors, retrying/refreshing URLs, and clearing player cache when cache vs stream formats mismatch. Lock stream quality for the currently playing song (based on DB format) to prevent mid-stream container changes and force a player restart if a format fallback occurs during playback. Fix audio-fallback toast behavior by scoping toast flags per-resolution attempt so notifications can show appropriately. Update JioSaavn service base URL to saavn.sumit.co.

Author: iad1tya

RELEASE_INFO.md

@@ -1,29 +1,6 @@
-# Echo Music v5.1.9
+# Echo Music v5.1.91
 
-### New Features
-- **Pin Playlists** — Long-press to pin playlists to the top of your library.
-- **Sync to YouTube Music** — Sync local playlists via the playlist menu.
-- **Settings Search** — Filter settings categories and sub-settings instantly.
-- **Song Suggestions** — Discover and add related songs at the bottom of local playlists.
-- **Canvas Provider (Tidal)** — Animated album canvas with improved matching accuracy.
-- **Audio Fallback** — Opus failure auto-reroutes to JioSaavn 320 kbps, and vice versa.
-- **Markdown in Changelog** — Bold, italics, inline code, and links rendered natively.
-
-### UI & Design
-- **Echo Find Screen** — Material You pill button, animated wave visualizer, edge-to-edge blur.
-- **Recognition Screen** — Glassmorphism layout with full-square album art and playback FAB.
-- **Suggestions & Menus** — Rounded edges on suggestions list; removed grey header backgrounds from bottom sheets.
-- **Online Playlist Header** — Count and duration shown above action buttons.
-- **Logout Dialog** — Stacked buttons fix text clipping.
-
-### Bug Fixes
-- **Crash on Recognition** — Fixed `IllegalStateException` via main thread dispatch.
-- **Offline Playback** — Fixed downloaded songs failing due to bad cache length reads.
-- **Apple Music Black Screen** — Album art now shows for downloaded songs.
-- **Volume Slider** — Stays in sync with system volume.
-- **Background Updater** — Runs as background service with auto-retry; fixed notification spam.
-- **Comments Button** — Removed from Listen Together screen.
-
-### Build
-- **FFmpeg** — Switched to `ffmpeg-kit-audio`; removed unused `aria2c` dependency.
-- **ABI Filters** — Fixed per-arch filters to prevent universal APK generation.
+- Fixed specific playback error codes: 3001, 2008, 1004 by retrying the network or AudioTrack securely.
+- Fixed playback going soundless by locking the stream quality for the currently playing song to prevent mid-stream container changes.
+- Fixed audio fallback toast notifications only showing once per app session.
+- Fixed ExoPlayer crashing when stream container format falls back to a different format than the cache.

app/build.gradle.kts

@@ -33,8 +33,8 @@ android {
         applicationId = "iad1tya.echo.music"
         minSdk = 26
         targetSdk = 36
-        versionCode = 510
-        versionName = "5.1.9"
+        versionCode = 511
+        versionName = "5.1.91"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/src/main/kotlin/com/music/echo/playback/MusicService.kt

@@ -2098,7 +2098,13 @@ class MusicService :
         return error.errorCode == PlaybackException.ERROR_CODE_AUDIO_TRACK_WRITE_FAILED ||
                 error.errorCode == PlaybackException.ERROR_CODE_AUDIO_TRACK_INIT_FAILED ||
                 (error.cause as? PlaybackException)?.errorCode == PlaybackException.ERROR_CODE_AUDIO_TRACK_WRITE_FAILED ||
-                (error.cause as? PlaybackException)?.errorCode == PlaybackException.ERROR_CODE_AUDIO_TRACK_INIT_FAILED
+                (error.cause as? PlaybackException)?.errorCode == PlaybackException.ERROR_CODE_AUDIO_TRACK_INIT_FAILED ||
+                error.errorCode == PlaybackException.ERROR_CODE_FAILED_RUNTIME_CHECK
+    }
+
+    private fun isCacheOrStreamCorruptionError(error: PlaybackException): Boolean {
+        return error.errorCode == PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED ||
+                error.errorCode == PlaybackException.ERROR_CODE_IO_READ_POSITION_OUT_OF_RANGE
     }
 
     override fun onPlayerError(error: PlaybackException) {
@@ -2139,6 +2145,11 @@ class MusicService :
                 handleRangeNotSatisfiableError(mediaId)
                 return
             }
+            isCacheOrStreamCorruptionError(error) -> {
+                Timber.tag(TAG).d("Cache or stream corruption detected, clearing cache and refreshing URL")
+                handleExpiredUrlError(mediaId)
+                return
+            }
             isPageReloadError(error) -> {
                 Timber.tag(TAG).d("Page reload error detected, performing strict recovery")
                 handlePageReloadError(mediaId)
@@ -2522,16 +2533,33 @@ class MusicService :
             val cachedLength = androidx.media3.datasource.cache.ContentMetadata.getContentLength(downloadCache.getContentMetadata(mediaId))
             val isFullyDownloaded = cachedLength != androidx.media3.common.C.LENGTH_UNSET.toLong() && cachedLength > 0 && downloadCache.isCached(mediaId, 0, cachedLength)
 
-            if (!shouldBypassCache && !isFullyDownloaded && audioQuality == iad1tya.echo.music.constants.AudioQuality.LOSSLESS) {
-                val format = runBlocking(Dispatchers.IO) { database.format(mediaId).firstOrNull() }
-                if (format?.codecs != "flac") {
-                    shouldBypassCache = true
+            val isCurrentlyPlaying = runBlocking(Dispatchers.Main) { player.currentMediaItem?.mediaId == mediaId }
+            val dbFormat = runBlocking(Dispatchers.IO) { database.format(mediaId).firstOrNull() }
+            
+            val lockedQuality = if (isCurrentlyPlaying && dbFormat != null) {
+                when {
+                    dbFormat.mimeType.contains("flac", ignoreCase = true) -> iad1tya.echo.music.constants.AudioQuality.LOSSLESS
+                    dbFormat.mimeType.contains("mp4", ignoreCase = true) || dbFormat.mimeType.contains("m4a", ignoreCase = true) -> iad1tya.echo.music.constants.AudioQuality.SAAVN
+                    else -> iad1tya.echo.music.constants.AudioQuality.OPUS
                 }
+            } else {
+                audioQuality
             }
-            if (!shouldBypassCache && !isFullyDownloaded && audioQuality == iad1tya.echo.music.constants.AudioQuality.SAAVN) {
-                val format = runBlocking(Dispatchers.IO) { database.format(mediaId).firstOrNull() }
-                if (format?.codecs != "mp4a.40.2") {
+
+            if (!shouldBypassCache && !isFullyDownloaded && dbFormat != null) {
+                val isLosslessCache = dbFormat.codecs == "flac"
+                val isSaavnCache = dbFormat.codecs == "mp4a.40.2" || dbFormat.mimeType.contains("mp4", ignoreCase = true)
+                
+                val cacheMatchesTarget = when (lockedQuality) {
+                    iad1tya.echo.music.constants.AudioQuality.LOSSLESS -> isLosslessCache
+                    iad1tya.echo.music.constants.AudioQuality.SAAVN -> isSaavnCache
+                    iad1tya.echo.music.constants.AudioQuality.OPUS -> !isLosslessCache && !isSaavnCache
+                }
+                
+                if (!cacheMatchesTarget) {
                     shouldBypassCache = true
+                    Timber.tag(TAG).i("Quality changed to $lockedQuality for $mediaId. Clearing playerCache to prevent container mismatch.")
+                    playerCache.removeResource(mediaId)
                 }
             }
 
@@ -2575,7 +2603,7 @@ class MusicService :
                 Timber.tag("MusicService").i("BYPASSING CACHE for $mediaId due to quality change")
             }
 
-            Timber.tag("MusicService").i("FETCHING STREAM: $mediaId | quality=$audioQuality")
+            Timber.tag("MusicService").i("FETCHING STREAM: $mediaId | quality=$lockedQuality")
             val playbackData = runBlocking(Dispatchers.IO) {
                 val dbSong = database.song(mediaId).firstOrNull()
                 val knownArtist = dbSong?.artists?.joinToString { it.name }?.replace(" - Topic", "")
@@ -2584,7 +2612,7 @@ class MusicService :
 
                 YTPlayerUtils.playerResponseForPlayback(
                     mediaId,
-                    audioQuality = audioQuality,
+                    audioQuality = lockedQuality,
                     connectivityManager = connectivityManager,
                     context = this@MusicService,
                     knownArtist = knownArtist,
@@ -2624,6 +2652,29 @@ class MusicService :
             }
             run {
                 val format = nonNullPlayback.format
+                
+                val isFinalLossless = format.mimeType.contains("flac", ignoreCase = true)
+                val isFinalSaavn = format.mimeType.contains("mp4", ignoreCase = true) || format.mimeType.contains("m4a", ignoreCase = true)
+                
+                if (dbFormat != null && !shouldBypassCache) {
+                    val cacheIsLossless = dbFormat.codecs == "flac"
+                    val cacheIsSaavn = dbFormat.codecs == "mp4a.40.2" || dbFormat.mimeType.contains("mp4", ignoreCase = true)
+                    
+                    if (isFinalLossless != cacheIsLossless || isFinalSaavn != cacheIsSaavn) {
+                        Timber.tag(TAG).w("Format fallback detected AFTER fetch. Clearing playerCache to prevent mismatch crash.")
+                        playerCache.removeResource(mediaId)
+                        
+                        if (isCurrentlyPlaying) {
+                            Timber.tag(TAG).e("Format changed mid-stream for $mediaId. Throwing to force player restart.")
+                            throw PlaybackException(
+                                "Container format changed mid-stream due to fallback",
+                                null,
+                                PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED
+                            )
+                        }
+                    }
+                }
+
                 val loudnessDb = nonNullPlayback.audioConfig?.loudnessDb
                 val perceptualLoudnessDb = nonNullPlayback.audioConfig?.perceptualLoudnessDb
 

app/src/main/kotlin/com/music/echo/utils/YTPlayerUtils.kt

@@ -49,9 +49,6 @@ import kotlinx.coroutines.flow.first
 object YTPlayerUtils {
     private const val logTag = "YTPlayerUtils"
     private const val TAG = "YTPlayerUtils"
-    private var hasShownLosslessToast = false
-    private var hasShownSaavnToast = false
-    private var hasShownOpusToast = false
 
     private val httpClient: OkHttpClient = OkHttpClient.Builder()
         .dns(object : Dns {
@@ -127,6 +124,10 @@ object YTPlayerUtils {
             it.dataStore.data.first()[iad1tya.echo.music.constants.ShowAudioFallbackToastKey] 
         } ?: true
 
+        var hasShownLosslessToast = false
+        var hasShownSaavnToast = false
+        var hasShownOpusToast = false
+
         suspend fun tryOpus(): Result<PlaybackData> {
             val firstAttempt = resolvePlaybackData(videoId, playlistId, audioQuality, connectivityManager)
             if (firstAttempt.isFailure && YouTube.cookie == null) {

jiosaavn/src/main/kotlin/com/music/jiosaavn/SaavnService.kt

@@ -3,7 +3,7 @@
  * Licensed under GPL-3.0 | See git history for contributors
  *
  * JioSaavn audio streaming service.
- * Uses the Melo API (meloapi.vercel.app) which is an open wrapper around JioSaavn.
+ * Uses the Melo API (saavn.sumit.co) which is an open wrapper around JioSaavn.
  *
  * API endpoints used:
  *   - GET /api/search/songs?query={q}        → search songs by name+artist
@@ -91,7 +91,7 @@ data class SaavnSongResponse(
 
 object SaavnService {
 
-    private const val BASE_URL = "https://meloapi.vercel.app/api/"
+    private const val BASE_URL = "https://saavn.sumit.co/api/"
 
     private val json = Json {
         isLenient         = true