v2.1.0-preview: Download speed optimizations

.github/workflows/release.yml

@@ -85,19 +85,7 @@ jobs:
           restore-keys: gradle-${{ runner.os }}-
 
       - name: Install Android SDK & NDK
-        run: |
-          # Use pre-installed Android SDK on GitHub runners
-          echo "ANDROID_HOME=$ANDROID_HOME"
-          echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
-          
-          # Accept licenses
-          yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses || true
-          
-          # Install NDK (required for gomobile)
-          $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "ndk;25.2.9519653" "platforms;android-34" "build-tools;34.0.0"
-          
-          # Set NDK path
-          echo "ANDROID_NDK_HOME=$ANDROID_HOME/ndk/25.2.9519653" >> $GITHUB_ENV
+        uses: android-actions/setup-android@v3
 
       - name: Install gomobile
         run: |

CHANGELOG.md

@@ -1,100 +1,5 @@
 # Changelog
 
-## [2.1.5-preview] - 2026-01-07
-
-### Added
-- **Deezer as Alternative Metadata Source**: Choose between Deezer or Spotify for search
-  - Configure in Settings > Options > Spotify API > Search Source
-  - Default is Deezer for better reliability
-  - Spotify URLs are always supported regardless of this setting
-- **Automatic Deezer Fallback for Spotify URLs**: When Spotify API is rate limited (429), automatically falls back to Deezer
-  - Uses SongLink/Odesli API to convert Spotify track/album ID to Deezer ID
-  - Fetches metadata from Deezer instead
-  - Works for tracks and albums (playlists are user-specific, artists require Spotify API)
-- **Debug Logging for Search Source**: Console logs now show which metadata source is being used
-  - `[Search] Using metadata source: deezer/spotify for query: "..."`
-  - `[FetchURL] Fetching track with Deezer fallback enabled...`
-
-### Technical
-- New settings field: `metadataSource` in `lib/models/settings.dart`
-- New UI: Search Source selector in Options Settings page
-
-## [2.1.0] - 2026-01-06
-
-### Added
-- **Service Switcher in Quality Picker**: Choose download service (Tidal/Qobuz/Amazon) directly when selecting quality
-  - Service selector chips appear above quality options
-  - Defaults to your preferred service from settings
-  - Change service on-the-fly without going to settings
-  - Available in Home, Album, and Playlist screens
-- **AMOLED Dark Theme**: Pure black background for OLED screens
-  - Toggle in Settings > Appearance > Theme
-  - Saves battery on OLED/AMOLED displays
-  - All surface colors adjusted for true black background
-- **Update Channel Setting**: Choose between Stable and Preview release channels
-  - Stable: Only receive stable release notifications
-  - Preview: Get notified about preview/beta releases too
-  - Configure in Settings > Options > App
-
-### Changed
-- **Reduced APK Size**: Replaced FFmpeg plugin with custom AAR containing only required codecs
-  - arm64 APK: 46.6 MB (previously 51 MB)
-  - arm32 APK: 59 MB (previously 64 MB)
-  - Only includes FLAC, MP3 (LAME), and AAC codecs
-  - Custom FFmpeg AAR with arm64-v8a and armeabi-v7a only
-  - Native MethodChannel bridge for FFmpeg operations
-  - Separate iOS build configuration with ffmpeg_kit_flutter plugin
-
-### Fixed
-- **Retry Failed Downloads**: Fixed issue where retrying failed downloads sometimes did nothing
-  - Now properly handles retry when queue processing has finished
-  - Also allows retrying skipped (cancelled) downloads
-- **Lyrics Loading Timeout**: Added 20 second timeout for lyrics fetching
-  - Shows "Lyrics not available" instead of loading forever
-- **iOS Directory Picker**: Fixed unable to select download folder on iOS
-  - iOS limitation: Empty folders cannot be selected via document picker
-  - Added "App Documents Folder" option as recommended default
-  - Files saved to app Documents folder are accessible via iOS Files app
-
-### Performance
-- **Download Speed Optimizations**: Significant improvements to download initialization and throughput
-  - Token caching for Tidal (eliminates redundant auth requests)
-  - Singleton pattern for all downloaders (HTTP connection reuse)
-  - ISRC search first strategy (faster than SongLink API)
-  - Track ID cache with 30 minute TTL for album/playlist downloads
-  - Pre-warm cache when viewing album/playlist
-  - Parallel cover art and lyrics fetching during audio download
-  - 64KB HTTP read/write buffers
-  - 256KB buffered file writer for all downloaders
-  - Progress updates every 64KB (reduced lock contention)
-- **Amazon Music Optimizations**: Same optimizations now applied to Amazon downloader
-
-## [2.1.0-preview2] - 2026-01-06
-
-### Added
-- **Service Switcher in Quality Picker**: Choose download service (Tidal/Qobuz/Amazon) directly when selecting quality
-  - Service selector chips appear above quality options
-  - Defaults to your preferred service from settings
-  - Change service on-the-fly without going to settings
-  - Available in Home, Album, and Playlist screens
-- **AMOLED Dark Theme**: Pure black background for OLED screens
-  - Toggle in Settings > Appearance > Theme
-  - Saves battery on OLED/AMOLED displays
-  - All surface colors adjusted for true black background
-- **Update Channel Setting**: Choose between Stable and Preview release channels
-  - Stable: Only receive stable release notifications
-  - Preview: Get notified about preview/beta releases too
-  - Configure in Settings > Options > App
-
-### Fixed
-- **Retry Failed Downloads**: Fixed issue where retrying failed downloads sometimes did nothing
-  - Now properly handles retry when queue processing has finished
-  - Also allows retrying skipped (cancelled) downloads
-  - Added logging for better debugging
-- **Lyrics Loading Timeout**: Added 20 second timeout for lyrics fetching
-  - Shows "Lyrics not available" instead of loading forever
-  - Better error messages for timeout and not found cases
-
 ## [2.1.0-preview] - 2026-01-06
 
 ### Performance

README.md

@@ -1,5 +1,4 @@
 [![GitHub All Releases](https://img.shields.io/github/downloads/zarzet/SpotiFLAC-Mobile/total?style=for-the-badge)](https://github.com/zarzet/SpotiFLAC-Mobile/releases)
-[![VirusTotal](https://img.shields.io/badge/VirusTotal-Safe-brightgreen?style=for-the-badge&logo=virustotal)](https://www.virustotal.com/gui/file/9092dd9300289ceadd8e70cd71706a3ba32225d9cb2ae8b12648611d31814708)
 
 <div align="center">
 
@@ -23,34 +22,6 @@ Get Spotify tracks in true FLAC from Tidal, Qobuz & Amazon Music — no account
   <img src="assets/images/4.jpg?v=2" width="200" />
 </p>
 
-## Metadata Source
-
-SpotiFLAC supports two metadata sources for searching tracks:
-
-| Source | Pros | Cons |
-|--------|------|------|
-| **Deezer** (Default) | No developer account needed, rate limit per user IP | Slightly less comprehensive catalog |
-| **Spotify** | More comprehensive catalog, better search results | Requires developer API credentials to avoid rate limiting |
-
-### Using Deezer (Recommended)
-Works out of the box. No setup required.
-
-### Using Spotify
-To use Spotify as your search source without hitting rate limits:
-1. Create a Spotify Developer account at [developer.spotify.com](https://developer.spotify.com)
-2. Create an app to get your Client ID and Client Secret
-3. Go to **Settings > Options > Spotify API > Custom Credentials**
-4. Enter your Client ID and Secret
-5. Change **Search Source** to Spotify
-
-> **Note**: Spotify URLs (track, album) are always supported regardless of your search source setting. The app will automatically fall back to Deezer if Spotify API is rate limited.
-
-## Support
-
-If you find this app useful, consider supporting the development:
-
-[![Ko-fi](https://img.shields.io/badge/Ko--fi-Support%20Me-FF5E5B?style=for-the-badge&logo=ko-fi&logoColor=white)](https://ko-fi.com/zarzet)
-
 ## Other project
 
 ### [SpotiFLAC (Desktop)](https://github.com/afkarxyz/SpotiFLAC)

android/app/src/main/kotlin/com/zarz/spotiflac/MainActivity.kt

@@ -230,53 +230,6 @@ class MainActivity: FlutterActivity() {
                             }
                             result.success(null)
                         }
-                        // Deezer API methods
-                        "searchDeezerAll" -> {
-                            val query = call.argument<String>("query") ?: ""
-                            val trackLimit = call.argument<Int>("track_limit") ?: 15
-                            val artistLimit = call.argument<Int>("artist_limit") ?: 3
-                            val response = withContext(Dispatchers.IO) {
-                                Gobackend.searchDeezerAll(query, trackLimit.toLong(), artistLimit.toLong())
-                            }
-                            result.success(response)
-                        }
-                        "getDeezerMetadata" -> {
-                            val resourceType = call.argument<String>("resource_type") ?: ""
-                            val resourceId = call.argument<String>("resource_id") ?: ""
-                            val response = withContext(Dispatchers.IO) {
-                                Gobackend.getDeezerMetadata(resourceType, resourceId)
-                            }
-                            result.success(response)
-                        }
-                        "parseDeezerUrl" -> {
-                            val url = call.argument<String>("url") ?: ""
-                            val response = withContext(Dispatchers.IO) {
-                                Gobackend.parseDeezerURLExport(url)
-                            }
-                            result.success(response)
-                        }
-                        "searchDeezerByISRC" -> {
-                            val isrc = call.argument<String>("isrc") ?: ""
-                            val response = withContext(Dispatchers.IO) {
-                                Gobackend.searchDeezerByISRC(isrc)
-                            }
-                            result.success(response)
-                        }
-                        "convertSpotifyToDeezer" -> {
-                            val resourceType = call.argument<String>("resource_type") ?: ""
-                            val spotifyId = call.argument<String>("spotify_id") ?: ""
-                            val response = withContext(Dispatchers.IO) {
-                                Gobackend.convertSpotifyToDeezer(resourceType, spotifyId)
-                            }
-                            result.success(response)
-                        }
-                        "getSpotifyMetadataWithFallback" -> {
-                            val url = call.argument<String>("url") ?: ""
-                            val response = withContext(Dispatchers.IO) {
-                                Gobackend.getSpotifyMetadataWithDeezerFallback(url)
-                            }
-                            result.success(response)
-                        }
                         else -> result.notImplemented()
                     }
                 } catch (e: Exception) {

go_backend/deezer.go

@@ -1,591 +0,0 @@
-package gobackend
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"sync"
-	"time"
-)
-
-const (
-	deezerSearchURL  = "https://api.deezer.com/search"
-	deezerTrackURL   = "https://api.deezer.com/track/%s"
-	deezerAlbumURL   = "https://api.deezer.com/album/%s"
-	deezerArtistURL  = "https://api.deezer.com/artist/%s"
-	deezerPlaylistURL = "https://api.deezer.com/playlist/%s"
-	
-	deezerCacheTTL = 10 * time.Minute
-)
-
-// DeezerClient handles Deezer API interactions (no auth required)
-type DeezerClient struct {
-	httpClient  *http.Client
-	searchCache map[string]*cacheEntry
-	albumCache  map[string]*cacheEntry
-	artistCache map[string]*cacheEntry
-	cacheMu     sync.RWMutex
-}
-
-// Singleton instance
-var (
-	deezerClient     *DeezerClient
-	deezerClientOnce sync.Once
-)
-
-// GetDeezerClient returns singleton Deezer client
-func GetDeezerClient() *DeezerClient {
-	deezerClientOnce.Do(func() {
-		deezerClient = &DeezerClient{
-			httpClient:  NewHTTPClientWithTimeout(15 * time.Second),
-			searchCache: make(map[string]*cacheEntry),
-			albumCache:  make(map[string]*cacheEntry),
-			artistCache: make(map[string]*cacheEntry),
-		}
-	})
-	return deezerClient
-}
-
-// Deezer API response types
-type deezerTrack struct {
-	ID             int64  `json:"id"`
-	Title          string `json:"title"`
-	Duration       int    `json:"duration"` // in seconds
-	TrackPosition  int    `json:"track_position"`
-	DiskNumber     int    `json:"disk_number"`
-	ISRC           string `json:"isrc"`
-	Link           string `json:"link"`
-	Artist         deezerArtist `json:"artist"`
-	Album          deezerAlbumSimple `json:"album"`
-	Contributors   []deezerArtist `json:"contributors"`
-}
-
-type deezerArtist struct {
-	ID        int64  `json:"id"`
-	Name      string `json:"name"`
-	Picture   string `json:"picture"`
-	PictureMedium string `json:"picture_medium"`
-	PictureBig    string `json:"picture_big"`
-	PictureXL     string `json:"picture_xl"`
-	NbFan     int    `json:"nb_fan"`
-}
-
-type deezerAlbumSimple struct {
-	ID          int64  `json:"id"`
-	Title       string `json:"title"`
-	Cover       string `json:"cover"`
-	CoverMedium string `json:"cover_medium"`
-	CoverBig    string `json:"cover_big"`
-	CoverXL     string `json:"cover_xl"`
-}
-
-type deezerAlbumFull struct {
-	ID          int64  `json:"id"`
-	Title       string `json:"title"`
-	Cover       string `json:"cover"`
-	CoverMedium string `json:"cover_medium"`
-	CoverBig    string `json:"cover_big"`
-	CoverXL     string `json:"cover_xl"`
-	ReleaseDate string `json:"release_date"`
-	NbTracks    int    `json:"nb_tracks"`
-	Artist      deezerArtist `json:"artist"`
-	Contributors []deezerArtist `json:"contributors"`
-	Tracks      struct {
-		Data []deezerTrack `json:"data"`
-	} `json:"tracks"`
-}
-
-type deezerArtistFull struct {
-	ID            int64  `json:"id"`
-	Name          string `json:"name"`
-	Picture       string `json:"picture"`
-	PictureMedium string `json:"picture_medium"`
-	PictureBig    string `json:"picture_big"`
-	PictureXL     string `json:"picture_xl"`
-	NbFan         int    `json:"nb_fan"`
-	NbAlbum       int    `json:"nb_album"`
-}
-
-type deezerPlaylistFull struct {
-	ID          int64  `json:"id"`
-	Title       string `json:"title"`
-	Picture     string `json:"picture"`
-	PictureMedium string `json:"picture_medium"`
-	PictureBig    string `json:"picture_big"`
-	PictureXL     string `json:"picture_xl"`
-	NbTracks    int    `json:"nb_tracks"`
-	Creator     struct {
-		Name string `json:"name"`
-	} `json:"creator"`
-	Tracks      struct {
-		Data []deezerTrack `json:"data"`
-	} `json:"tracks"`
-}
-
-// SearchAll searches for tracks and artists on Deezer
-func (c *DeezerClient) SearchAll(ctx context.Context, query string, trackLimit, artistLimit int) (*SearchAllResult, error) {
-	cacheKey := fmt.Sprintf("deezer:all:%s:%d:%d", query, trackLimit, artistLimit)
-	
-	c.cacheMu.RLock()
-	if entry, ok := c.searchCache[cacheKey]; ok && !entry.isExpired() {
-		c.cacheMu.RUnlock()
-		return entry.data.(*SearchAllResult), nil
-	}
-	c.cacheMu.RUnlock()
-
-	result := &SearchAllResult{
-		Tracks:  make([]TrackMetadata, 0),
-		Artists: make([]SearchArtistResult, 0),
-	}
-
-	// Search tracks
-	trackURL := fmt.Sprintf("%s/track?q=%s&limit=%d", deezerSearchURL, url.QueryEscape(query), trackLimit)
-	var trackResp struct {
-		Data []deezerTrack `json:"data"`
-	}
-	if err := c.getJSON(ctx, trackURL, &trackResp); err != nil {
-		return nil, fmt.Errorf("deezer track search failed: %w", err)
-	}
-
-	for _, track := range trackResp.Data {
-		result.Tracks = append(result.Tracks, c.convertTrack(track))
-	}
-
-	// Search artists
-	artistURL := fmt.Sprintf("%s/artist?q=%s&limit=%d", deezerSearchURL, url.QueryEscape(query), artistLimit)
-	var artistResp struct {
-		Data []deezerArtist `json:"data"`
-	}
-	if err := c.getJSON(ctx, artistURL, &artistResp); err == nil {
-		for _, artist := range artistResp.Data {
-			result.Artists = append(result.Artists, SearchArtistResult{
-				ID:         fmt.Sprintf("deezer:%d", artist.ID),
-				Name:       artist.Name,
-				Images:     c.getBestArtistImage(artist),
-				Followers:  artist.NbFan,
-				Popularity: 0,
-			})
-		}
-	}
-
-	// Cache result
-	c.cacheMu.Lock()
-	c.searchCache[cacheKey] = &cacheEntry{
-		data:      result,
-		expiresAt: time.Now().Add(deezerCacheTTL),
-	}
-	c.cacheMu.Unlock()
-
-	return result, nil
-}
-
-// GetTrack fetches a single track by Deezer ID
-func (c *DeezerClient) GetTrack(ctx context.Context, trackID string) (*TrackResponse, error) {
-	trackURL := fmt.Sprintf(deezerTrackURL, trackID)
-	
-	var track deezerTrack
-	if err := c.getJSON(ctx, trackURL, &track); err != nil {
-		return nil, err
-	}
-
-	return &TrackResponse{
-		Track: c.convertTrack(track),
-	}, nil
-}
-
-// GetAlbum fetches album with tracks
-func (c *DeezerClient) GetAlbum(ctx context.Context, albumID string) (*AlbumResponsePayload, error) {
-	c.cacheMu.RLock()
-	if entry, ok := c.albumCache[albumID]; ok && !entry.isExpired() {
-		c.cacheMu.RUnlock()
-		return entry.data.(*AlbumResponsePayload), nil
-	}
-	c.cacheMu.RUnlock()
-
-	albumURL := fmt.Sprintf(deezerAlbumURL, albumID)
-	
-	var album deezerAlbumFull
-	if err := c.getJSON(ctx, albumURL, &album); err != nil {
-		return nil, err
-	}
-
-	albumImage := c.getBestAlbumImage(album)
-	artistName := album.Artist.Name
-	if len(album.Contributors) > 0 {
-		names := make([]string, len(album.Contributors))
-		for i, a := range album.Contributors {
-			names[i] = a.Name
-		}
-		artistName = strings.Join(names, ", ")
-	}
-
-	info := AlbumInfoMetadata{
-		TotalTracks: album.NbTracks,
-		Name:        album.Title,
-		ReleaseDate: album.ReleaseDate,
-		Artists:     artistName,
-		Images:      albumImage,
-	}
-
-	tracks := make([]AlbumTrackMetadata, 0, len(album.Tracks.Data))
-	for _, track := range album.Tracks.Data {
-		// Need to fetch full track info for ISRC
-		fullTrack, _ := c.fetchFullTrack(ctx, fmt.Sprintf("%d", track.ID))
-		isrc := ""
-		if fullTrack != nil {
-			isrc = fullTrack.ISRC
-		}
-
-		tracks = append(tracks, AlbumTrackMetadata{
-			SpotifyID:   fmt.Sprintf("deezer:%d", track.ID),
-			Artists:     track.Artist.Name,
-			Name:        track.Title,
-			AlbumName:   album.Title,
-			AlbumArtist: artistName,
-			DurationMS:  track.Duration * 1000,
-			Images:      albumImage,
-			ReleaseDate: album.ReleaseDate,
-			TrackNumber: track.TrackPosition,
-			TotalTracks: album.NbTracks,
-			DiscNumber:  track.DiskNumber,
-			ExternalURL: track.Link,
-			ISRC:        isrc,
-			AlbumID:     fmt.Sprintf("deezer:%d", album.ID),
-		})
-	}
-
-	result := &AlbumResponsePayload{
-		AlbumInfo: info,
-		TrackList: tracks,
-	}
-
-	c.cacheMu.Lock()
-	c.albumCache[albumID] = &cacheEntry{
-		data:      result,
-		expiresAt: time.Now().Add(deezerCacheTTL),
-	}
-	c.cacheMu.Unlock()
-
-	return result, nil
-}
-
-// GetArtist fetches artist with albums
-func (c *DeezerClient) GetArtist(ctx context.Context, artistID string) (*ArtistResponsePayload, error) {
-	c.cacheMu.RLock()
-	if entry, ok := c.artistCache[artistID]; ok && !entry.isExpired() {
-		c.cacheMu.RUnlock()
-		return entry.data.(*ArtistResponsePayload), nil
-	}
-	c.cacheMu.RUnlock()
-
-	// Fetch artist info
-	artistURL := fmt.Sprintf(deezerArtistURL, artistID)
-	var artist deezerArtistFull
-	if err := c.getJSON(ctx, artistURL, &artist); err != nil {
-		return nil, err
-	}
-
-	artistInfo := ArtistInfoMetadata{
-		ID:         fmt.Sprintf("deezer:%d", artist.ID),
-		Name:       artist.Name,
-		Images:     c.getBestArtistImageFull(artist),
-		Followers:  artist.NbFan,
-		Popularity: 0,
-	}
-
-	// Fetch artist albums
-	albumsURL := fmt.Sprintf("%s/albums?limit=100", fmt.Sprintf(deezerArtistURL, artistID))
-	var albumsResp struct {
-		Data []struct {
-			ID          int64  `json:"id"`
-			Title       string `json:"title"`
-			ReleaseDate string `json:"release_date"`
-			NbTracks    int    `json:"nb_tracks"`
-			Cover       string `json:"cover"`
-			CoverMedium string `json:"cover_medium"`
-			CoverBig    string `json:"cover_big"`
-			CoverXL     string `json:"cover_xl"`
-			RecordType  string `json:"record_type"` // album, single, ep, compile
-		} `json:"data"`
-	}
-
-	albums := make([]ArtistAlbumMetadata, 0)
-	if err := c.getJSON(ctx, albumsURL, &albumsResp); err == nil {
-		for _, album := range albumsResp.Data {
-			albumType := album.RecordType
-			if albumType == "compile" {
-				albumType = "compilation"
-			}
-			
-			coverURL := album.CoverXL
-			if coverURL == "" {
-				coverURL = album.CoverBig
-			}
-			if coverURL == "" {
-				coverURL = album.CoverMedium
-			}
-			if coverURL == "" {
-				coverURL = album.Cover
-			}
-
-			albums = append(albums, ArtistAlbumMetadata{
-				ID:          fmt.Sprintf("deezer:%d", album.ID),
-				Name:        album.Title,
-				ReleaseDate: album.ReleaseDate,
-				TotalTracks: album.NbTracks,
-				Images:      coverURL,
-				AlbumType:   albumType,
-				Artists:     artist.Name,
-			})
-		}
-	}
-
-	result := &ArtistResponsePayload{
-		ArtistInfo: artistInfo,
-		Albums:     albums,
-	}
-
-	c.cacheMu.Lock()
-	c.artistCache[artistID] = &cacheEntry{
-		data:      result,
-		expiresAt: time.Now().Add(deezerCacheTTL),
-	}
-	c.cacheMu.Unlock()
-
-	return result, nil
-}
-
-// GetPlaylist fetches playlist with tracks
-func (c *DeezerClient) GetPlaylist(ctx context.Context, playlistID string) (*PlaylistResponsePayload, error) {
-	playlistURL := fmt.Sprintf(deezerPlaylistURL, playlistID)
-	
-	var playlist deezerPlaylistFull
-	if err := c.getJSON(ctx, playlistURL, &playlist); err != nil {
-		return nil, err
-	}
-
-	playlistImage := playlist.PictureXL
-	if playlistImage == "" {
-		playlistImage = playlist.PictureBig
-	}
-	if playlistImage == "" {
-		playlistImage = playlist.PictureMedium
-	}
-
-	var info PlaylistInfoMetadata
-	info.Tracks.Total = playlist.NbTracks
-	info.Owner.DisplayName = playlist.Creator.Name
-	info.Owner.Name = playlist.Title
-	info.Owner.Images = playlistImage
-
-	tracks := make([]AlbumTrackMetadata, 0, len(playlist.Tracks.Data))
-	for _, track := range playlist.Tracks.Data {
-		albumImage := track.Album.CoverXL
-		if albumImage == "" {
-			albumImage = track.Album.CoverBig
-		}
-		if albumImage == "" {
-			albumImage = track.Album.CoverMedium
-		}
-
-		// Fetch full track for ISRC
-		fullTrack, _ := c.fetchFullTrack(ctx, fmt.Sprintf("%d", track.ID))
-		isrc := ""
-		releaseDate := ""
-		if fullTrack != nil {
-			isrc = fullTrack.ISRC
-		}
-
-		tracks = append(tracks, AlbumTrackMetadata{
-			SpotifyID:   fmt.Sprintf("deezer:%d", track.ID),
-			Artists:     track.Artist.Name,
-			Name:        track.Title,
-			AlbumName:   track.Album.Title,
-			AlbumArtist: track.Artist.Name,
-			DurationMS:  track.Duration * 1000,
-			Images:      albumImage,
-			ReleaseDate: releaseDate,
-			TrackNumber: track.TrackPosition,
-			DiscNumber:  track.DiskNumber,
-			ExternalURL: track.Link,
-			ISRC:        isrc,
-			AlbumID:     fmt.Sprintf("deezer:%d", track.Album.ID),
-		})
-	}
-
-	return &PlaylistResponsePayload{
-		PlaylistInfo: info,
-		TrackList:    tracks,
-	}, nil
-}
-
-// SearchByISRC searches for a track by ISRC
-func (c *DeezerClient) SearchByISRC(ctx context.Context, isrc string) (*TrackMetadata, error) {
-	searchURL := fmt.Sprintf("%s/track?q=isrc:%s&limit=1", deezerSearchURL, isrc)
-	
-	var resp struct {
-		Data []deezerTrack `json:"data"`
-	}
-	if err := c.getJSON(ctx, searchURL, &resp); err != nil {
-		return nil, err
-	}
-
-	if len(resp.Data) == 0 {
-		return nil, fmt.Errorf("no track found for ISRC: %s", isrc)
-	}
-
-	track := c.convertTrack(resp.Data[0])
-	return &track, nil
-}
-
-func (c *DeezerClient) fetchFullTrack(ctx context.Context, trackID string) (*deezerTrack, error) {
-	trackURL := fmt.Sprintf(deezerTrackURL, trackID)
-	var track deezerTrack
-	if err := c.getJSON(ctx, trackURL, &track); err != nil {
-		return nil, err
-	}
-	return &track, nil
-}
-
-func (c *DeezerClient) convertTrack(track deezerTrack) TrackMetadata {
-	artistName := track.Artist.Name
-	if len(track.Contributors) > 0 {
-		names := make([]string, len(track.Contributors))
-		for i, a := range track.Contributors {
-			names[i] = a.Name
-		}
-		artistName = strings.Join(names, ", ")
-	}
-
-	albumImage := track.Album.CoverXL
-	if albumImage == "" {
-		albumImage = track.Album.CoverBig
-	}
-	if albumImage == "" {
-		albumImage = track.Album.CoverMedium
-	}
-	if albumImage == "" {
-		albumImage = track.Album.Cover
-	}
-
-	return TrackMetadata{
-		SpotifyID:   fmt.Sprintf("deezer:%d", track.ID),
-		Artists:     artistName,
-		Name:        track.Title,
-		AlbumName:   track.Album.Title,
-		AlbumArtist: track.Artist.Name,
-		DurationMS:  track.Duration * 1000,
-		Images:      albumImage,
-		TrackNumber: track.TrackPosition,
-		DiscNumber:  track.DiskNumber,
-		ExternalURL: track.Link,
-		ISRC:        track.ISRC,
-	}
-}
-
-func (c *DeezerClient) getBestArtistImage(artist deezerArtist) string {
-	if artist.PictureXL != "" {
-		return artist.PictureXL
-	}
-	if artist.PictureBig != "" {
-		return artist.PictureBig
-	}
-	if artist.PictureMedium != "" {
-		return artist.PictureMedium
-	}
-	return artist.Picture
-}
-
-func (c *DeezerClient) getBestArtistImageFull(artist deezerArtistFull) string {
-	if artist.PictureXL != "" {
-		return artist.PictureXL
-	}
-	if artist.PictureBig != "" {
-		return artist.PictureBig
-	}
-	if artist.PictureMedium != "" {
-		return artist.PictureMedium
-	}
-	return artist.Picture
-}
-
-func (c *DeezerClient) getBestAlbumImage(album deezerAlbumFull) string {
-	if album.CoverXL != "" {
-		return album.CoverXL
-	}
-	if album.CoverBig != "" {
-		return album.CoverBig
-	}
-	if album.CoverMedium != "" {
-		return album.CoverMedium
-	}
-	return album.Cover
-}
-
-func (c *DeezerClient) getJSON(ctx context.Context, endpoint string, dst interface{}) error {
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
-	if err != nil {
-		return err
-	}
-
-	req.Header.Set("Accept", "application/json")
-
-	resp, err := c.httpClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return err
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("deezer API returned status %d: %s", resp.StatusCode, string(body))
-	}
-
-	return json.Unmarshal(body, dst)
-}
-
-// parseDeezerURL is internal function, returns type and ID
-func parseDeezerURL(input string) (string, string, error) {
-	trimmed := strings.TrimSpace(input)
-	if trimmed == "" {
-		return "", "", fmt.Errorf("empty URL")
-	}
-
-	parsed, err := url.Parse(trimmed)
-	if err != nil {
-		return "", "", err
-	}
-
-	if parsed.Host != "www.deezer.com" && parsed.Host != "deezer.com" && parsed.Host != "deezer.page.link" {
-		return "", "", fmt.Errorf("not a Deezer URL")
-	}
-
-	parts := strings.Split(strings.Trim(parsed.Path, "/"), "/")
-	
-	// Skip language prefix if present (e.g., /en/, /fr/)
-	if len(parts) > 0 && len(parts[0]) == 2 {
-		parts = parts[1:]
-	}
-
-	if len(parts) < 2 {
-		return "", "", fmt.Errorf("invalid Deezer URL format")
-	}
-
-	resourceType := parts[0]
-	resourceID := parts[1]
-
-	switch resourceType {
-	case "track", "album", "artist", "playlist":
-		return resourceType, resourceID, nil
-	default:
-		return "", "", fmt.Errorf("unsupported Deezer resource type: %s", resourceType)
-	}
-}

go_backend/exports.go

@@ -566,203 +566,6 @@ func ClearTrackIDCache() {
 	ClearTrackCache()
 }
 
-// ==================== DEEZER API ====================
-
-// SearchDeezerAll searches for tracks and artists on Deezer (no API key required)
-// Returns JSON with tracks and artists arrays
-func SearchDeezerAll(query string, trackLimit, artistLimit int) (string, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-	
-	client := GetDeezerClient()
-	results, err := client.SearchAll(ctx, query, trackLimit, artistLimit)
-	if err != nil {
-		return "", err
-	}
-	
-	jsonBytes, err := json.Marshal(results)
-	if err != nil {
-		return "", err
-	}
-	
-	return string(jsonBytes), nil
-}
-
-// GetDeezerMetadata fetches metadata from Deezer URL or ID
-// resourceType: track, album, artist, playlist
-// resourceID: Deezer ID
-func GetDeezerMetadata(resourceType, resourceID string) (string, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-	
-	client := GetDeezerClient()
-	var data interface{}
-	var err error
-	
-	switch resourceType {
-	case "track":
-		data, err = client.GetTrack(ctx, resourceID)
-	case "album":
-		data, err = client.GetAlbum(ctx, resourceID)
-	case "artist":
-		data, err = client.GetArtist(ctx, resourceID)
-	case "playlist":
-		data, err = client.GetPlaylist(ctx, resourceID)
-	default:
-		return "", fmt.Errorf("unsupported Deezer resource type: %s", resourceType)
-	}
-	
-	if err != nil {
-		return "", err
-	}
-	
-	jsonBytes, err := json.Marshal(data)
-	if err != nil {
-		return "", err
-	}
-	
-	return string(jsonBytes), nil
-}
-
-// ParseDeezerURLExport parses a Deezer URL and returns type and ID
-func ParseDeezerURLExport(url string) (string, error) {
-	resourceType, resourceID, err := parseDeezerURL(url)
-	if err != nil {
-		return "", err
-	}
-	
-	result := map[string]string{
-		"type": resourceType,
-		"id":   resourceID,
-	}
-	
-	jsonBytes, err := json.Marshal(result)
-	if err != nil {
-		return "", err
-	}
-	
-	return string(jsonBytes), nil
-}
-
-// SearchDeezerByISRC searches for a track by ISRC on Deezer
-func SearchDeezerByISRC(isrc string) (string, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-	
-	client := GetDeezerClient()
-	track, err := client.SearchByISRC(ctx, isrc)
-	if err != nil {
-		return "", err
-	}
-	
-	jsonBytes, err := json.Marshal(track)
-	if err != nil {
-		return "", err
-	}
-	
-	return string(jsonBytes), nil
-}
-
-// ConvertSpotifyToDeezer converts a Spotify track/album ID to Deezer and fetches metadata
-// This uses SongLink API to find the Deezer equivalent, then fetches from Deezer
-// Useful when Spotify API is rate limited
-func ConvertSpotifyToDeezer(resourceType, spotifyID string) (string, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-	
-	songlink := NewSongLinkClient()
-	deezerClient := GetDeezerClient()
-	
-	// For tracks, we can use SongLink to get Deezer ID
-	if resourceType == "track" {
-		deezerID, err := songlink.GetDeezerIDFromSpotify(spotifyID)
-		if err != nil {
-			return "", fmt.Errorf("could not find Deezer equivalent: %w", err)
-		}
-		
-		// Fetch metadata from Deezer
-		trackResp, err := deezerClient.GetTrack(ctx, deezerID)
-		if err != nil {
-			return "", fmt.Errorf("failed to fetch Deezer metadata: %w", err)
-		}
-		
-		jsonBytes, err := json.Marshal(trackResp)
-		if err != nil {
-			return "", err
-		}
-		
-		return string(jsonBytes), nil
-	}
-	
-	// For albums, SongLink also provides mapping
-	if resourceType == "album" {
-		deezerID, err := songlink.GetDeezerAlbumIDFromSpotify(spotifyID)
-		if err != nil {
-			return "", fmt.Errorf("could not find Deezer album: %w", err)
-		}
-		
-		// Fetch album metadata from Deezer
-		albumResp, err := deezerClient.GetAlbum(ctx, deezerID)
-		if err != nil {
-			return "", fmt.Errorf("failed to fetch Deezer album metadata: %w", err)
-		}
-		
-		jsonBytes, err := json.Marshal(albumResp)
-		if err != nil {
-			return "", err
-		}
-		
-		return string(jsonBytes), nil
-	}
-	
-	// For artists/playlists, SongLink doesn't provide direct mapping
-	return "", fmt.Errorf("Spotify to Deezer conversion only supported for tracks and albums. Please search by name for %s", resourceType)
-}
-
-// GetSpotifyMetadataWithDeezerFallback tries Spotify first, falls back to Deezer on rate limit
-func GetSpotifyMetadataWithDeezerFallback(spotifyURL string) (string, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-	
-	// Try Spotify first
-	client := NewSpotifyMetadataClient()
-	data, err := client.GetFilteredData(ctx, spotifyURL, false, 0)
-	if err == nil {
-		jsonBytes, err := json.Marshal(data)
-		if err != nil {
-			return "", err
-		}
-		return string(jsonBytes), nil
-	}
-	
-	// Check if it's a rate limit error
-	errStr := strings.ToLower(err.Error())
-	if !strings.Contains(errStr, "429") && !strings.Contains(errStr, "rate") && !strings.Contains(errStr, "limit") {
-		// Not a rate limit error, return original error
-		return "", err
-	}
-	
-	// Rate limited - try Deezer fallback for tracks and albums
-	parsed, parseErr := parseSpotifyURI(spotifyURL)
-	if parseErr != nil {
-		return "", fmt.Errorf("spotify rate limited and failed to parse URL: %w", parseErr)
-	}
-	
-	fmt.Printf("[Fallback] Spotify rate limited for %s, trying Deezer...\n", parsed.Type)
-	
-	if parsed.Type == "track" || parsed.Type == "album" {
-		// Convert to Deezer
-		return ConvertSpotifyToDeezer(parsed.Type, parsed.ID)
-	}
-	
-	// Artist and playlist not supported for fallback
-	if parsed.Type == "artist" {
-		return "", fmt.Errorf("spotify rate limited. Artist pages require Spotify API - please try again later")
-	}
-	
-	return "", fmt.Errorf("spotify rate limited. Playlists are user-specific and require Spotify API")
-}
-
 func errorResponse(msg string) (string, error) {
 	resp := DownloadResponse{
 		Success: false,

go_backend/songlink.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"strings"
 	"sync"
 	"time"
 )
@@ -22,12 +21,9 @@ type TrackAvailability struct {
 	Tidal     bool   `json:"tidal"`
 	Amazon    bool   `json:"amazon"`
 	Qobuz     bool   `json:"qobuz"`
-	Deezer    bool   `json:"deezer"`
 	TidalURL  string `json:"tidal_url,omitempty"`
 	AmazonURL string `json:"amazon_url,omitempty"`
 	QobuzURL  string `json:"qobuz_url,omitempty"`
-	DeezerURL string `json:"deezer_url,omitempty"`
-	DeezerID  string `json:"deezer_id,omitempty"`
 }
 
 var (
@@ -106,14 +102,6 @@ func (s *SongLinkClient) CheckTrackAvailability(spotifyTrackID string, isrc stri
 		availability.AmazonURL = amazonLink.URL
 	}
 
-	// Check Deezer
-	if deezerLink, ok := songLinkResp.LinksByPlatform["deezer"]; ok && deezerLink.URL != "" {
-		availability.Deezer = true
-		availability.DeezerURL = deezerLink.URL
-		// Extract Deezer ID from URL (e.g., https://www.deezer.com/track/123456)
-		availability.DeezerID = extractDeezerIDFromURL(deezerLink.URL)
-	}
-
 	// Check Qobuz using ISRC
 	if isrc != "" {
 		availability.Qobuz = checkQobuzAvailability(isrc)
@@ -173,112 +161,3 @@ func checkQobuzAvailability(isrc string) bool {
 
 	return searchResp.Tracks.Total > 0
 }
-
-// extractDeezerIDFromURL extracts Deezer track/album/artist ID from URL
-func extractDeezerIDFromURL(deezerURL string) string {
-	// URL format: https://www.deezer.com/track/123456 or https://www.deezer.com/en/track/123456
-	parts := strings.Split(deezerURL, "/")
-	if len(parts) > 0 {
-		// Get the last part which should be the ID
-		lastPart := parts[len(parts)-1]
-		// Remove any query parameters
-		if idx := strings.Index(lastPart, "?"); idx > 0 {
-			lastPart = lastPart[:idx]
-		}
-		return lastPart
-	}
-	return ""
-}
-
-// GetDeezerIDFromSpotify converts a Spotify track ID to Deezer track ID using SongLink
-func (s *SongLinkClient) GetDeezerIDFromSpotify(spotifyTrackID string) (string, error) {
-	availability, err := s.CheckTrackAvailability(spotifyTrackID, "")
-	if err != nil {
-		return "", err
-	}
-	
-	if !availability.Deezer || availability.DeezerID == "" {
-		return "", fmt.Errorf("track not found on Deezer")
-	}
-	
-	return availability.DeezerID, nil
-}
-
-// AlbumAvailability represents album availability on different platforms
-type AlbumAvailability struct {
-	SpotifyID string `json:"spotify_id"`
-	Deezer    bool   `json:"deezer"`
-	DeezerURL string `json:"deezer_url,omitempty"`
-	DeezerID  string `json:"deezer_id,omitempty"`
-}
-
-// CheckAlbumAvailability checks album availability on streaming platforms using SongLink
-func (s *SongLinkClient) CheckAlbumAvailability(spotifyAlbumID string) (*AlbumAvailability, error) {
-	// Use global rate limiter
-	songLinkRateLimiter.WaitForSlot()
-
-	// Build API URL for album
-	spotifyBase, _ := base64.StdEncoding.DecodeString("aHR0cHM6Ly9vcGVuLnNwb3RpZnkuY29tL2FsYnVtLw==")
-	spotifyURL := fmt.Sprintf("%s%s", string(spotifyBase), spotifyAlbumID)
-
-	apiBase, _ := base64.StdEncoding.DecodeString("aHR0cHM6Ly9hcGkuc29uZy5saW5rL3YxLWFscGhhLjEvbGlua3M/dXJsPQ==")
-	apiURL := fmt.Sprintf("%s%s", string(apiBase), url.QueryEscape(spotifyURL))
-
-	req, err := http.NewRequest("GET", apiURL, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create request: %w", err)
-	}
-
-	retryConfig := DefaultRetryConfig()
-	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
-	if err != nil {
-		return nil, fmt.Errorf("failed to check album availability: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("API returned status %d", resp.StatusCode)
-	}
-
-	body, err := ReadResponseBody(resp)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read response: %w", err)
-	}
-
-	var songLinkResp struct {
-		LinksByPlatform map[string]struct {
-			URL string `json:"url"`
-		} `json:"linksByPlatform"`
-	}
-
-	if err := json.Unmarshal(body, &songLinkResp); err != nil {
-		return nil, fmt.Errorf("failed to decode response: %w", err)
-	}
-
-	availability := &AlbumAvailability{
-		SpotifyID: spotifyAlbumID,
-	}
-
-	// Check Deezer
-	if deezerLink, ok := songLinkResp.LinksByPlatform["deezer"]; ok && deezerLink.URL != "" {
-		availability.Deezer = true
-		availability.DeezerURL = deezerLink.URL
-		availability.DeezerID = extractDeezerIDFromURL(deezerLink.URL)
-	}
-
-	return availability, nil
-}
-
-// GetDeezerAlbumIDFromSpotify converts a Spotify album ID to Deezer album ID using SongLink
-func (s *SongLinkClient) GetDeezerAlbumIDFromSpotify(spotifyAlbumID string) (string, error) {
-	availability, err := s.CheckAlbumAvailability(spotifyAlbumID)
-	if err != nil {
-		return "", err
-	}
-	
-	if !availability.Deezer || availability.DeezerID == "" {
-		return "", fmt.Errorf("album not found on Deezer")
-	}
-	
-	return availability.DeezerID, nil
-}

lib/constants/app_info.dart

@@ -1,8 +1,8 @@
 /// App version and info constants
 /// Update version here only - all other files will reference this
 class AppInfo {
-  static const String version = '2.1.5-preview';
-  static const String buildNumber = '42';
+  static const String version = '2.1.0-preview';
+  static const String buildNumber = '39';
   static const String fullVersion = '$version+$buildNumber';
   
   
@@ -15,6 +15,4 @@ class AppInfo {
   static const String githubRepo = 'zarzet/SpotiFLAC-Mobile';
   static const String githubUrl = 'https://github.com/$githubRepo';
   static const String originalGithubUrl = 'https://github.com/afkarxyz/SpotiFLAC';
-  
-  static const String kofiUrl = 'https://ko-fi.com/zarzet';
 }

lib/models/settings.dart

@@ -14,7 +14,6 @@ class AppSettings {
   final bool isFirstLaunch;
   final int concurrentDownloads; // 1 = sequential (default), max 3
   final bool checkForUpdates; // Check for updates on app start
-  final String updateChannel; // stable, preview
   final bool hasSearchedBefore; // Hide helper text after first search
   final String folderOrganization; // none, artist, album, artist_album
   final String historyViewMode; // list, grid
@@ -22,7 +21,6 @@ class AppSettings {
   final String spotifyClientId; // Custom Spotify client ID (empty = use default)
   final String spotifyClientSecret; // Custom Spotify client secret (empty = use default)
   final bool useCustomSpotifyCredentials; // Whether to use custom credentials (if set)
-  final String metadataSource; // spotify, deezer - source for search and metadata
 
   const AppSettings({
     this.defaultService = 'tidal',
@@ -35,7 +33,6 @@ class AppSettings {
     this.isFirstLaunch = true,
     this.concurrentDownloads = 1, // Default: sequential (off)
     this.checkForUpdates = true, // Default: enabled
-    this.updateChannel = 'stable', // Default: stable releases only
     this.hasSearchedBefore = false, // Default: show helper text
     this.folderOrganization = 'none', // Default: no folder organization
     this.historyViewMode = 'grid', // Default: grid view
@@ -43,7 +40,6 @@ class AppSettings {
     this.spotifyClientId = '', // Default: use built-in credentials
     this.spotifyClientSecret = '', // Default: use built-in credentials
     this.useCustomSpotifyCredentials = true, // Default: use custom if set
-    this.metadataSource = 'deezer', // Default: Deezer (no rate limit)
   });
 
   AppSettings copyWith({
@@ -57,7 +53,6 @@ class AppSettings {
     bool? isFirstLaunch,
     int? concurrentDownloads,
     bool? checkForUpdates,
-    String? updateChannel,
     bool? hasSearchedBefore,
     String? folderOrganization,
     String? historyViewMode,
@@ -65,7 +60,6 @@ class AppSettings {
     String? spotifyClientId,
     String? spotifyClientSecret,
     bool? useCustomSpotifyCredentials,
-    String? metadataSource,
   }) {
     return AppSettings(
       defaultService: defaultService ?? this.defaultService,
@@ -78,7 +72,6 @@ class AppSettings {
       isFirstLaunch: isFirstLaunch ?? this.isFirstLaunch,
       concurrentDownloads: concurrentDownloads ?? this.concurrentDownloads,
       checkForUpdates: checkForUpdates ?? this.checkForUpdates,
-      updateChannel: updateChannel ?? this.updateChannel,
       hasSearchedBefore: hasSearchedBefore ?? this.hasSearchedBefore,
       folderOrganization: folderOrganization ?? this.folderOrganization,
       historyViewMode: historyViewMode ?? this.historyViewMode,
@@ -86,7 +79,6 @@ class AppSettings {
       spotifyClientId: spotifyClientId ?? this.spotifyClientId,
       spotifyClientSecret: spotifyClientSecret ?? this.spotifyClientSecret,
       useCustomSpotifyCredentials: useCustomSpotifyCredentials ?? this.useCustomSpotifyCredentials,
-      metadataSource: metadataSource ?? this.metadataSource,
     );
   }
 

lib/models/settings.g.dart

@@ -17,7 +17,6 @@ AppSettings _$AppSettingsFromJson(Map<String, dynamic> json) => AppSettings(
   isFirstLaunch: json['isFirstLaunch'] as bool? ?? true,
   concurrentDownloads: (json['concurrentDownloads'] as num?)?.toInt() ?? 1,
   checkForUpdates: json['checkForUpdates'] as bool? ?? true,
-  updateChannel: json['updateChannel'] as String? ?? 'stable',
   hasSearchedBefore: json['hasSearchedBefore'] as bool? ?? false,
   folderOrganization: json['folderOrganization'] as String? ?? 'none',
   historyViewMode: json['historyViewMode'] as String? ?? 'grid',
@@ -26,7 +25,6 @@ AppSettings _$AppSettingsFromJson(Map<String, dynamic> json) => AppSettings(
   spotifyClientSecret: json['spotifyClientSecret'] as String? ?? '',
   useCustomSpotifyCredentials:
       json['useCustomSpotifyCredentials'] as bool? ?? true,
-  metadataSource: json['metadataSource'] as String? ?? 'deezer',
 );
 
 Map<String, dynamic> _$AppSettingsToJson(AppSettings instance) =>
@@ -41,7 +39,6 @@ Map<String, dynamic> _$AppSettingsToJson(AppSettings instance) =>
       'isFirstLaunch': instance.isFirstLaunch,
       'concurrentDownloads': instance.concurrentDownloads,
       'checkForUpdates': instance.checkForUpdates,
-      'updateChannel': instance.updateChannel,
       'hasSearchedBefore': instance.hasSearchedBefore,
       'folderOrganization': instance.folderOrganization,
       'historyViewMode': instance.historyViewMode,
@@ -49,5 +46,4 @@ Map<String, dynamic> _$AppSettingsToJson(AppSettings instance) =>
       'spotifyClientId': instance.spotifyClientId,
       'spotifyClientSecret': instance.spotifyClientSecret,
       'useCustomSpotifyCredentials': instance.useCustomSpotifyCredentials,
-      'metadataSource': instance.metadataSource,
     };

lib/models/theme_settings.dart

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 const String kThemeModeKey = 'theme_mode';
 const String kUseDynamicColorKey = 'use_dynamic_color';
 const String kSeedColorKey = 'seed_color';
-const String kUseAmoledKey = 'use_amoled';
 
 /// Default Spotify green color for fallback
 const int kDefaultSeedColor = 0xFF1DB954;
@@ -14,13 +13,11 @@ class ThemeSettings {
   final ThemeMode themeMode;
   final bool useDynamicColor;
   final int seedColorValue;
-  final bool useAmoled; // Pure black background for OLED screens
 
   const ThemeSettings({
     this.themeMode = ThemeMode.system,
     this.useDynamicColor = true,
     this.seedColorValue = kDefaultSeedColor,
-    this.useAmoled = false,
   });
 
   /// Get seed color as Color object
@@ -31,13 +28,11 @@ class ThemeSettings {
     ThemeMode? themeMode,
     bool? useDynamicColor,
     int? seedColorValue,
-    bool? useAmoled,
   }) {
     return ThemeSettings(
       themeMode: themeMode ?? this.themeMode,
       useDynamicColor: useDynamicColor ?? this.useDynamicColor,
       seedColorValue: seedColorValue ?? this.seedColorValue,
-      useAmoled: useAmoled ?? this.useAmoled,
     );
   }
 
@@ -46,7 +41,6 @@ class ThemeSettings {
         kThemeModeKey: themeMode.name,
         kUseDynamicColorKey: useDynamicColor,
         kSeedColorKey: seedColorValue,
-        kUseAmoledKey: useAmoled,
       };
 
   /// Create from JSON map
@@ -55,7 +49,6 @@ class ThemeSettings {
       themeMode: _themeModeFromString(json[kThemeModeKey] as String?),
       useDynamicColor: json[kUseDynamicColorKey] as bool? ?? true,
       seedColorValue: json[kSeedColorKey] as int? ?? kDefaultSeedColor,
-      useAmoled: json[kUseAmoledKey] as bool? ?? false,
     );
   }
 
@@ -65,13 +58,12 @@ class ThemeSettings {
     return other is ThemeSettings &&
         other.themeMode == themeMode &&
         other.useDynamicColor == useDynamicColor &&
-        other.seedColorValue == seedColorValue &&
-        other.useAmoled == useAmoled;
+        other.seedColorValue == seedColorValue;
   }
 
   @override
   int get hashCode =>
-      themeMode.hashCode ^ useDynamicColor.hashCode ^ seedColorValue.hashCode ^ useAmoled.hashCode;
+      themeMode.hashCode ^ useDynamicColor.hashCode ^ seedColorValue.hashCode;
 }
 
 /// Helper to convert string to ThemeMode

lib/providers/download_queue_provider.dart

@@ -686,37 +686,20 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     }
   }
 
-  /// Retry a failed or skipped download
+  /// Retry a failed download
   void retryItem(String id) {
-    final item = state.items.where((i) => i.id == id).firstOrNull;
-    if (item == null) {
-      _log.w('retryItem: Item not found: $id');
-      return;
-    }
-    
-    // Only retry if status is failed or skipped
-    if (item.status != DownloadStatus.failed && item.status != DownloadStatus.skipped) {
-      _log.w('retryItem: Item status is ${item.status}, not retrying');
-      return;
-    }
-    
-    _log.i('Retrying item: ${item.track.name} (id: $id)');
-    
-    final items = state.items.map((i) {
-      if (i.id == id) {
-        return i.copyWith(status: DownloadStatus.queued, progress: 0, error: null);
+    final items = state.items.map((item) {
+      if (item.id == id && item.status == DownloadStatus.failed) {
+        return item.copyWith(status: DownloadStatus.queued, progress: 0, error: null);
       }
-      return i;
+      return item;
     }).toList();
     state = state.copyWith(items: items);
     _saveQueueToStorage(); // Persist queue
     
-    // Start processing if not already running
+    // Start processing if not already
     if (!state.isProcessing) {
-      _log.d('Starting queue processing for retry');
       Future.microtask(() => _processQueue());
-    } else {
-      _log.d('Queue already processing, item will be picked up');
     }
   }
 
@@ -868,13 +851,6 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     
     _log.i('Queue processing finished');
     state = state.copyWith(isProcessing: false, currentDownload: null);
-    
-    // Check if there are new queued items (e.g., from retry) and restart if needed
-    final hasQueuedItems = state.items.any((item) => item.status == DownloadStatus.queued);
-    if (hasQueuedItems) {
-      _log.i('Found queued items after processing finished, restarting queue...');
-      Future.microtask(() => _processQueue());
-    }
   }
 
   /// Sequential download processing (uses multi-progress system with single item)
@@ -890,9 +866,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         continue;
       }
       
-      // Re-read state to get latest items (important for retry)
-      final currentItems = state.items;
-      final nextItem = currentItems.firstWhere(
+      final nextItem = state.items.firstWhere(
         (item) => item.status == DownloadStatus.queued,
         orElse: () => DownloadItem(
           id: '',
@@ -903,11 +877,10 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       );
 
       if (nextItem.id.isEmpty) {
-        _log.d('No more items to process (checked ${currentItems.length} items)');
+        _log.d('No more items to process');
         break;
       }
 
-      _log.d('Processing next item: ${nextItem.track.name} (id: ${nextItem.id})');
       await _downloadSingleItem(nextItem);
       
       // Clear item progress after download completes

lib/providers/settings_provider.dart

@@ -96,11 +96,6 @@ class SettingsNotifier extends Notifier<AppSettings> {
     _saveSettings();
   }
 
-  void setUpdateChannel(String channel) {
-    state = state.copyWith(updateChannel: channel);
-    _saveSettings();
-  }
-
   void setHasSearchedBefore() {
     if (!state.hasSearchedBefore) {
       state = state.copyWith(hasSearchedBefore: true);
@@ -156,11 +151,6 @@ class SettingsNotifier extends Notifier<AppSettings> {
     _saveSettings();
     _applySpotifyCredentials();
   }
-
-  void setMetadataSource(String source) {
-    state = state.copyWith(metadataSource: source);
-    _saveSettings();
-  }
 }
 
 final settingsProvider = NotifierProvider<SettingsNotifier, AppSettings>(

lib/providers/theme_provider.dart

@@ -24,13 +24,11 @@ class ThemeNotifier extends Notifier<ThemeSettings> {
       final modeString = prefs.getString(kThemeModeKey);
       final useDynamic = prefs.getBool(kUseDynamicColorKey);
       final seedColor = prefs.getInt(kSeedColorKey);
-      final useAmoled = prefs.getBool(kUseAmoledKey);
 
       state = ThemeSettings(
         themeMode: _themeModeFromString(modeString),
         useDynamicColor: useDynamic ?? true,
         seedColorValue: seedColor ?? kDefaultSeedColor,
-        useAmoled: useAmoled ?? false,
       );
     } catch (e) {
       debugPrint('Error loading theme settings: $e');
@@ -45,7 +43,6 @@ class ThemeNotifier extends Notifier<ThemeSettings> {
       await prefs.setString(kThemeModeKey, state.themeMode.name);
       await prefs.setBool(kUseDynamicColorKey, state.useDynamicColor);
       await prefs.setInt(kSeedColorKey, state.seedColorValue);
-      await prefs.setBool(kUseAmoledKey, state.useAmoled);
     } catch (e) {
       debugPrint('Error saving theme settings: $e');
     }
@@ -75,12 +72,6 @@ class ThemeNotifier extends Notifier<ThemeSettings> {
     await _saveToStorage();
   }
 
-  /// Enable or disable AMOLED mode (pure black background)
-  Future<void> setUseAmoled(bool value) async {
-    state = state.copyWith(useAmoled: value);
-    await _saveToStorage();
-  }
-
   /// Helper to convert string to ThemeMode
   ThemeMode _themeModeFromString(String? value) {
     if (value == null) return ThemeMode.system;

lib/providers/track_provider.dart

@@ -114,7 +114,7 @@ class TrackNotifier extends Notifier<TrackState> {
   /// Check if request is still valid (not cancelled by newer request)
   bool _isRequestValid(int requestId) => requestId == _currentRequestId;
 
-  Future<void> fetchFromUrl(String url, {bool useDeezerFallback = true}) async {
+  Future<void> fetchFromUrl(String url) async {
     // Increment request ID to cancel any pending requests
     final requestId = ++_currentRequestId;
 
@@ -127,22 +127,7 @@ class TrackNotifier extends Notifier<TrackState> {
       
       final type = parsed['type'] as String;
 
-      // Use the new fallback-enabled method
-      Map<String, dynamic> metadata;
-      
-      try {
-        // ignore: avoid_print
-        print('[FetchURL] Fetching $type with Deezer fallback enabled...');
-        metadata = await PlatformBridge.getSpotifyMetadataWithFallback(url);
-        // ignore: avoid_print
-        print('[FetchURL] Metadata fetch success');
-      } catch (e) {
-        // If fallback also fails, show error
-        // ignore: avoid_print
-        print('[FetchURL] Metadata fetch failed: $e');
-        rethrow;
-      }
-      
+      final metadata = await PlatformBridge.getSpotifyMetadata(url);
       if (!_isRequestValid(requestId)) return; // Request cancelled
 
       if (type == 'track') {
@@ -199,7 +184,7 @@ class TrackNotifier extends Notifier<TrackState> {
     }
   }
 
-  Future<void> search(String query, {String? metadataSource}) async {
+  Future<void> search(String query) async {
     // Increment request ID to cancel any pending requests
     final requestId = ++_currentRequestId;
 
@@ -207,24 +192,7 @@ class TrackNotifier extends Notifier<TrackState> {
     state = TrackState(isLoading: true, hasSearchText: state.hasSearchText);
 
     try {
-      // Use Deezer or Spotify based on settings
-      final source = metadataSource ?? 'deezer';
-      
-      // Debug log to show which source is being used
-      // ignore: avoid_print
-      print('[Search] Using metadata source: $source for query: "$query"');
-      
-      Map<String, dynamic> results;
-      if (source == 'deezer') {
-        results = await PlatformBridge.searchDeezerAll(query, trackLimit: 20, artistLimit: 5);
-        // ignore: avoid_print
-        print('[Search] Deezer returned ${(results['tracks'] as List?)?.length ?? 0} tracks');
-      } else {
-        results = await PlatformBridge.searchSpotifyAll(query, trackLimit: 20, artistLimit: 5);
-        // ignore: avoid_print
-        print('[Search] Spotify returned ${(results['tracks'] as List?)?.length ?? 0} tracks');
-      }
-      
+      final results = await PlatformBridge.searchSpotifyAll(query, trackLimit: 20, artistLimit: 5);
       if (!_isRequestValid(requestId)) return; // Request cancelled
       
       final trackList = results['tracks'] as List<dynamic>? ?? [];

lib/screens/album_screen.dart

@@ -71,22 +71,8 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
   Future<void> _fetchTracks() async {
     setState(() => _isLoading = true);
     try {
-      Map<String, dynamic> metadata;
-      
-      // Check if this is a Deezer album ID (format: "deezer:123456")
-      if (widget.albumId.startsWith('deezer:')) {
-        final deezerAlbumId = widget.albumId.replaceFirst('deezer:', '');
-        // ignore: avoid_print
-        print('[AlbumScreen] Fetching from Deezer: $deezerAlbumId');
-        metadata = await PlatformBridge.getDeezerMetadata('album', deezerAlbumId);
-      } else {
-        // Spotify album - use fallback method
-        // ignore: avoid_print
-        print('[AlbumScreen] Fetching from Spotify with fallback: ${widget.albumId}');
-        final url = 'https://open.spotify.com/album/${widget.albumId}';
-        metadata = await PlatformBridge.getSpotifyMetadataWithFallback(url);
-      }
-      
+      final url = 'https://open.spotify.com/album/${widget.albumId}';
+      final metadata = await PlatformBridge.getSpotifyMetadata(url);
       final trackList = metadata['track_list'] as List<dynamic>;
       final tracks = trackList.map((t) => _parseTrack(t as Map<String, dynamic>)).toList();
       
@@ -316,8 +302,8 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
   void _downloadTrack(BuildContext context, Track track) {
     final settings = ref.read(settingsProvider);
     if (settings.askQualityBeforeDownload) {
-      _showQualityPicker(context, (quality, service) {
-        ref.read(downloadQueueProvider.notifier).addToQueue(track, service, qualityOverride: quality);
+      _showQualityPicker(context, (quality) {
+        ref.read(downloadQueueProvider.notifier).addToQueue(track, settings.defaultService, qualityOverride: quality);
         ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added "${track.name}" to queue')));
       }, trackName: track.name, artistName: track.artistName, coverUrl: track.coverUrl);
     } else {
@@ -331,8 +317,8 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
     if (tracks == null || tracks.isEmpty) return;
     final settings = ref.read(settingsProvider);
     if (settings.askQualityBeforeDownload) {
-      _showQualityPicker(context, (quality, service) {
-        ref.read(downloadQueueProvider.notifier).addMultipleToQueue(tracks, service, qualityOverride: quality);
+      _showQualityPicker(context, (quality) {
+        ref.read(downloadQueueProvider.notifier).addMultipleToQueue(tracks, settings.defaultService, qualityOverride: quality);
         ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added ${tracks.length} tracks to queue')));
       }, trackName: '${tracks.length} tracks', artistName: widget.albumName);
     } else {
@@ -341,69 +327,44 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
     }
   }
 
-  void _showQualityPicker(BuildContext context, void Function(String quality, String service) onSelect, {String? trackName, String? artistName, String? coverUrl}) {
+  void _showQualityPicker(BuildContext context, void Function(String quality) onSelect, {String? trackName, String? artistName, String? coverUrl}) {
     final colorScheme = Theme.of(context).colorScheme;
-    final settings = ref.read(settingsProvider);
-    String selectedService = settings.defaultService;
-    
     showModalBottomSheet(
       context: context,
       backgroundColor: colorScheme.surfaceContainerHigh,
       shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(28))),
-      isScrollControlled: true,
-      builder: (context) => StatefulBuilder(
-        builder: (context, setModalState) => SafeArea(
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                if (trackName != null) ...[
-                  _TrackInfoHeader(trackName: trackName, artistName: artistName, coverUrl: coverUrl),
-                  Divider(height: 1, color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
-                ] else ...[
-                  const SizedBox(height: 8),
-                  Center(child: Container(width: 40, height: 4, decoration: BoxDecoration(color: colorScheme.onSurfaceVariant.withValues(alpha: 0.4), borderRadius: BorderRadius.circular(2)))),
-                ],
-                // Service selector
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(24, 16, 24, 8),
-                  child: Text('Download From', style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold)),
-                ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Row(
-                    children: [
-                      _ServiceChip(label: 'Tidal', isSelected: selectedService == 'tidal', onTap: () => setModalState(() => selectedService = 'tidal')),
-                      const SizedBox(width: 8),
-                      _ServiceChip(label: 'Qobuz', isSelected: selectedService == 'qobuz', onTap: () => setModalState(() => selectedService = 'qobuz')),
-                      const SizedBox(width: 8),
-                      _ServiceChip(label: 'Amazon', isSelected: selectedService == 'amazon', onTap: () => setModalState(() => selectedService = 'amazon')),
-                    ],
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(24, 16, 24, 8),
-                  child: Text('Select Quality', style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold)),
-                ),
-                // Disclaimer
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(24, 0, 24, 12),
-                  child: Text(
-                    'Actual quality depends on track availability. Hi-Res may not be available for all tracks.',
-                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      color: colorScheme.onSurfaceVariant,
-                      fontStyle: FontStyle.italic,
-                    ),
-                  ),
-                ),
-                _QualityOption(title: 'FLAC Lossless', subtitle: '16-bit / 44.1kHz', icon: Icons.music_note, onTap: () { Navigator.pop(context); onSelect('LOSSLESS', selectedService); }),
-                _QualityOption(title: 'Hi-Res FLAC', subtitle: '24-bit / up to 96kHz', icon: Icons.high_quality, onTap: () { Navigator.pop(context); onSelect('HI_RES', selectedService); }),
-                _QualityOption(title: 'Hi-Res FLAC Max', subtitle: '24-bit / up to 192kHz', icon: Icons.four_k, onTap: () { Navigator.pop(context); onSelect('HI_RES_LOSSLESS', selectedService); }),
-                const SizedBox(height: 16),
-              ],
+      builder: (context) => SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (trackName != null) ...[
+              _TrackInfoHeader(trackName: trackName, artistName: artistName, coverUrl: coverUrl),
+              Divider(height: 1, color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
+            ] else ...[
+              const SizedBox(height: 8),
+              Center(child: Container(width: 40, height: 4, decoration: BoxDecoration(color: colorScheme.onSurfaceVariant.withValues(alpha: 0.4), borderRadius: BorderRadius.circular(2)))),
+            ],
+            Padding(
+              padding: const EdgeInsets.fromLTRB(24, 16, 24, 8),
+              child: Text('Select Quality', style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold)),
             ),
-          ),
+            // Disclaimer
+            Padding(
+              padding: const EdgeInsets.fromLTRB(24, 0, 24, 12),
+              child: Text(
+                'Actual quality depends on track availability. Hi-Res may not be available for all tracks.',
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                  color: colorScheme.onSurfaceVariant,
+                  fontStyle: FontStyle.italic,
+                ),
+              ),
+            ),
+            _QualityOption(title: 'FLAC Lossless', subtitle: '16-bit / 44.1kHz', icon: Icons.music_note, onTap: () { Navigator.pop(context); onSelect('LOSSLESS'); }),
+            _QualityOption(title: 'Hi-Res FLAC', subtitle: '24-bit / up to 96kHz', icon: Icons.high_quality, onTap: () { Navigator.pop(context); onSelect('HI_RES'); }),
+            _QualityOption(title: 'Hi-Res FLAC Max', subtitle: '24-bit / up to 192kHz', icon: Icons.four_k, onTap: () { Navigator.pop(context); onSelect('HI_RES_LOSSLESS'); }),
+            const SizedBox(height: 16),
+          ],
         ),
       ),
     );
@@ -494,40 +455,6 @@ class _QualityOption extends StatelessWidget {
   }
 }
 
-class _ServiceChip extends StatelessWidget {
-  final String label;
-  final bool isSelected;
-  final VoidCallback onTap;
-  const _ServiceChip({required this.label, required this.isSelected, required this.onTap});
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    return Expanded(
-      child: GestureDetector(
-        onTap: onTap,
-        child: AnimatedContainer(
-          duration: const Duration(milliseconds: 200),
-          padding: const EdgeInsets.symmetric(vertical: 10),
-          decoration: BoxDecoration(
-            color: isSelected ? colorScheme.primaryContainer : colorScheme.surfaceContainerHighest,
-            borderRadius: BorderRadius.circular(12),
-            border: isSelected ? null : Border.all(color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
-          ),
-          child: Text(
-            label,
-            textAlign: TextAlign.center,
-            style: TextStyle(
-              fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
-              color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
 class _TrackInfoHeader extends StatefulWidget {
   final String trackName;
   final String? artistName;

lib/screens/artist_screen.dart

@@ -69,25 +69,10 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
   Future<void> _fetchDiscography() async {
     setState(() => _isLoadingDiscography = true);
     try {
-      List<ArtistAlbum> albums;
-      
-      // Check if this is a Deezer artist ID (format: "deezer:123456")
-      if (widget.artistId.startsWith('deezer:')) {
-        final deezerArtistId = widget.artistId.replaceFirst('deezer:', '');
-        // ignore: avoid_print
-        print('[ArtistScreen] Fetching from Deezer: $deezerArtistId');
-        final metadata = await PlatformBridge.getDeezerMetadata('artist', deezerArtistId);
-        final albumsList = metadata['albums'] as List<dynamic>;
-        albums = albumsList.map((a) => _parseArtistAlbum(a as Map<String, dynamic>)).toList();
-      } else {
-        // Spotify artist - use fallback method
-        // ignore: avoid_print
-        print('[ArtistScreen] Fetching from Spotify with fallback: ${widget.artistId}');
-        final url = 'https://open.spotify.com/artist/${widget.artistId}';
-        final metadata = await PlatformBridge.getSpotifyMetadataWithFallback(url);
-        final albumsList = metadata['albums'] as List<dynamic>;
-        albums = albumsList.map((a) => _parseArtistAlbum(a as Map<String, dynamic>)).toList();
-      }
+      final url = 'https://open.spotify.com/artist/${widget.artistId}';
+      final metadata = await PlatformBridge.getSpotifyMetadata(url);
+      final albumsList = metadata['albums'] as List<dynamic>;
+      final albums = albumsList.map((a) => _parseArtistAlbum(a as Map<String, dynamic>)).toList();
       
       // Store in cache
       _ArtistCache.set(widget.artistId, albums);
@@ -305,9 +290,7 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
                       Text(album.name, style: Theme.of(context).textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w600), maxLines: 2, overflow: TextOverflow.ellipsis),
                       const Spacer(),
                       Text(
-                        album.totalTracks > 0 
-                            ? '${album.releaseDate.length >= 4 ? album.releaseDate.substring(0, 4) : album.releaseDate} • ${album.totalTracks} tracks'
-                            : album.releaseDate.length >= 4 ? album.releaseDate.substring(0, 4) : album.releaseDate,
+                        '${album.releaseDate.length >= 4 ? album.releaseDate.substring(0, 4) : album.releaseDate} • ${album.totalTracks} tracks',
                         style: Theme.of(context).textTheme.bodySmall?.copyWith(color: colorScheme.onSurfaceVariant, fontSize: 11),
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,

lib/screens/home_screen.dart

@@ -38,8 +38,7 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
     if (url.startsWith('http') || url.startsWith('spotify:')) {
       await ref.read(trackProvider.notifier).fetchFromUrl(url);
     } else {
-      final settings = ref.read(settingsProvider);
-      await ref.read(trackProvider.notifier).search(url, metadataSource: settings.metadataSource);
+      await ref.read(trackProvider.notifier).search(url);
     }
   }
 

lib/screens/home_tab.dart

@@ -81,8 +81,7 @@ class _HomeTabState extends ConsumerState<HomeTab> with AutomaticKeepAliveClient
     if (_lastSearchQuery == query) return;
     _lastSearchQuery = query;
     
-    final settings = ref.read(settingsProvider);
-    await ref.read(trackProvider.notifier).search(query, metadataSource: settings.metadataSource);
+    await ref.read(trackProvider.notifier).search(query);
     ref.read(settingsProvider.notifier).setHasSearchedBefore();
   }
 
@@ -113,8 +112,7 @@ class _HomeTabState extends ConsumerState<HomeTab> with AutomaticKeepAliveClient
       await ref.read(trackProvider.notifier).fetchFromUrl(url);
       _navigateToDetailIfNeeded();
     } else {
-      final settings = ref.read(settingsProvider);
-      await ref.read(trackProvider.notifier).search(url, metadataSource: settings.metadataSource);
+      await ref.read(trackProvider.notifier).search(url);
     }
     ref.read(settingsProvider.notifier).setHasSearchedBefore();
   }
@@ -172,8 +170,8 @@ class _HomeTabState extends ConsumerState<HomeTab> with AutomaticKeepAliveClient
       final settings = ref.read(settingsProvider);
       
       if (settings.askQualityBeforeDownload) {
-        _showQualityPicker(context, (quality, service) {
-          ref.read(downloadQueueProvider.notifier).addToQueue(track, service, qualityOverride: quality);
+        _showQualityPicker(context, (quality) {
+          ref.read(downloadQueueProvider.notifier).addToQueue(track, settings.defaultService, qualityOverride: quality);
           ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added "${track.name}" to queue')));
         }, trackName: track.name, artistName: track.artistName, coverUrl: track.coverUrl);
       } else {
@@ -183,84 +181,59 @@ class _HomeTabState extends ConsumerState<HomeTab> with AutomaticKeepAliveClient
     }
   }
 
-  void _showQualityPicker(BuildContext context, void Function(String quality, String service) onSelect, {String? trackName, String? artistName, String? coverUrl}) {
+  void _showQualityPicker(BuildContext context, void Function(String quality) onSelect, {String? trackName, String? artistName, String? coverUrl}) {
     final colorScheme = Theme.of(context).colorScheme;
-    final settings = ref.read(settingsProvider);
-    String selectedService = settings.defaultService;
-    
     showModalBottomSheet(
       context: context,
       backgroundColor: colorScheme.surfaceContainerHigh,
       shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(28))),
-      isScrollControlled: true,
-      builder: (context) => StatefulBuilder(
-        builder: (context, setModalState) => SafeArea(
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                if (trackName != null) ...[
-                  _TrackInfoHeader(trackName: trackName, artistName: artistName, coverUrl: coverUrl),
-                  Divider(height: 1, color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
-                ] else ...[
-                  const SizedBox(height: 8),
-                  Center(child: Container(width: 40, height: 4, decoration: BoxDecoration(color: colorScheme.onSurfaceVariant.withValues(alpha: 0.4), borderRadius: BorderRadius.circular(2)))),
-                ],
-                // Service selector
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(24, 16, 24, 8),
-                  child: Text('Download From', style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold)),
-                ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Row(
-                    children: [
-                      _ServiceChip(label: 'Tidal', isSelected: selectedService == 'tidal', onTap: () => setModalState(() => selectedService = 'tidal')),
-                      const SizedBox(width: 8),
-                      _ServiceChip(label: 'Qobuz', isSelected: selectedService == 'qobuz', onTap: () => setModalState(() => selectedService = 'qobuz')),
-                      const SizedBox(width: 8),
-                      _ServiceChip(label: 'Amazon', isSelected: selectedService == 'amazon', onTap: () => setModalState(() => selectedService = 'amazon')),
-                    ],
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(24, 16, 24, 8),
-                  child: Text('Select Quality', style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold)),
-                ),
-                // Disclaimer
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(24, 0, 24, 12),
-                  child: Text(
-                    'Actual quality depends on track availability. Hi-Res may not be available for all tracks.',
-                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      color: colorScheme.onSurfaceVariant,
-                      fontStyle: FontStyle.italic,
-                    ),
-                  ),
-                ),
-                _QualityPickerOption(
-                  title: 'FLAC Lossless',
-                  subtitle: '16-bit / 44.1kHz',
-                  icon: Icons.music_note,
-                  onTap: () { Navigator.pop(context); onSelect('LOSSLESS', selectedService); },
-                ),
-                _QualityPickerOption(
-                  title: 'Hi-Res FLAC',
-                  subtitle: '24-bit / up to 96kHz',
-                  icon: Icons.high_quality,
-                  onTap: () { Navigator.pop(context); onSelect('HI_RES', selectedService); },
-                ),
-                _QualityPickerOption(
-                  title: 'Hi-Res FLAC Max',
-                  subtitle: '24-bit / up to 192kHz',
-                  icon: Icons.four_k,
-                  onTap: () { Navigator.pop(context); onSelect('HI_RES_LOSSLESS', selectedService); },
-                ),
-                const SizedBox(height: 16),
-              ],
+      builder: (context) => SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (trackName != null) ...[
+              _TrackInfoHeader(trackName: trackName, artistName: artistName, coverUrl: coverUrl),
+              Divider(height: 1, color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
+            ] else ...[
+              const SizedBox(height: 8),
+              Center(child: Container(width: 40, height: 4, decoration: BoxDecoration(color: colorScheme.onSurfaceVariant.withValues(alpha: 0.4), borderRadius: BorderRadius.circular(2)))),
+            ],
+            Padding(
+              padding: const EdgeInsets.fromLTRB(24, 16, 24, 8),
+              child: Text('Select Quality', style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold)),
             ),
-          ),
+            // Disclaimer
+            Padding(
+              padding: const EdgeInsets.fromLTRB(24, 0, 24, 12),
+              child: Text(
+                'Actual quality depends on track availability. Hi-Res may not be available for all tracks.',
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                  color: colorScheme.onSurfaceVariant,
+                  fontStyle: FontStyle.italic,
+                ),
+              ),
+            ),
+            _QualityPickerOption(
+              title: 'FLAC Lossless',
+              subtitle: '16-bit / 44.1kHz',
+              icon: Icons.music_note,
+              onTap: () { Navigator.pop(context); onSelect('LOSSLESS'); },
+            ),
+            _QualityPickerOption(
+              title: 'Hi-Res FLAC',
+              subtitle: '24-bit / up to 96kHz',
+              icon: Icons.high_quality,
+              onTap: () { Navigator.pop(context); onSelect('HI_RES'); },
+            ),
+            _QualityPickerOption(
+              title: 'Hi-Res FLAC Max',
+              subtitle: '24-bit / up to 192kHz',
+              icon: Icons.four_k,
+              onTap: () { Navigator.pop(context); onSelect('HI_RES_LOSSLESS'); },
+            ),
+            const SizedBox(height: 16),
+          ],
         ),
       ),
     );
@@ -791,40 +764,6 @@ class _QualityPickerOption extends StatelessWidget {
   }
 }
 
-class _ServiceChip extends StatelessWidget {
-  final String label;
-  final bool isSelected;
-  final VoidCallback onTap;
-  const _ServiceChip({required this.label, required this.isSelected, required this.onTap});
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    return Expanded(
-      child: GestureDetector(
-        onTap: onTap,
-        child: AnimatedContainer(
-          duration: const Duration(milliseconds: 200),
-          padding: const EdgeInsets.symmetric(vertical: 10),
-          decoration: BoxDecoration(
-            color: isSelected ? colorScheme.primaryContainer : colorScheme.surfaceContainerHighest,
-            borderRadius: BorderRadius.circular(12),
-            border: isSelected ? null : Border.all(color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
-          ),
-          child: Text(
-            label,
-            textAlign: TextAlign.center,
-            style: TextStyle(
-              fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
-              color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
 class _TrackInfoHeader extends StatefulWidget {
   final String trackName;
   final String? artistName;

lib/screens/main_shell.dart

@@ -85,7 +85,7 @@ class _MainShellState extends ConsumerState<MainShell> {
     final settings = ref.read(settingsProvider);
     if (!settings.checkForUpdates) return;
 
-    final updateInfo = await UpdateChecker.checkForUpdate(channel: settings.updateChannel);
+    final updateInfo = await UpdateChecker.checkForUpdate();
     if (updateInfo != null && mounted) {
       showUpdateDialog(
         context,

lib/screens/playlist_screen.dart

@@ -168,8 +168,8 @@ class PlaylistScreen extends ConsumerWidget {
   void _downloadTrack(BuildContext context, WidgetRef ref, Track track) {
     final settings = ref.read(settingsProvider);
     if (settings.askQualityBeforeDownload) {
-      _showQualityPicker(context, ref, (quality, service) {
-        ref.read(downloadQueueProvider.notifier).addToQueue(track, service, qualityOverride: quality);
+      _showQualityPicker(context, (quality) {
+        ref.read(downloadQueueProvider.notifier).addToQueue(track, settings.defaultService, qualityOverride: quality);
         ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added "${track.name}" to queue')));
       }, trackName: track.name, artistName: track.artistName, coverUrl: track.coverUrl);
     } else {
@@ -182,8 +182,8 @@ class PlaylistScreen extends ConsumerWidget {
     if (tracks.isEmpty) return;
     final settings = ref.read(settingsProvider);
     if (settings.askQualityBeforeDownload) {
-      _showQualityPicker(context, ref, (quality, service) {
-        ref.read(downloadQueueProvider.notifier).addMultipleToQueue(tracks, service, qualityOverride: quality);
+      _showQualityPicker(context, (quality) {
+        ref.read(downloadQueueProvider.notifier).addMultipleToQueue(tracks, settings.defaultService, qualityOverride: quality);
         ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added ${tracks.length} tracks to queue')));
       }, trackName: '${tracks.length} tracks', artistName: playlistName);
     } else {
@@ -192,66 +192,41 @@ class PlaylistScreen extends ConsumerWidget {
     }
   }
 
-  void _showQualityPicker(BuildContext context, WidgetRef ref, void Function(String quality, String service) onSelect, {String? trackName, String? artistName, String? coverUrl}) {
+  void _showQualityPicker(BuildContext context, void Function(String quality) onSelect, {String? trackName, String? artistName, String? coverUrl}) {
     final colorScheme = Theme.of(context).colorScheme;
-    final settings = ref.read(settingsProvider);
-    String selectedService = settings.defaultService;
-    
     showModalBottomSheet(
       context: context,
       backgroundColor: colorScheme.surfaceContainerHigh,
       shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(28))),
-      isScrollControlled: true,
-      builder: (context) => StatefulBuilder(
-        builder: (context, setModalState) => SafeArea(
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                if (trackName != null) ...[
-                  _TrackInfoHeader(trackName: trackName, artistName: artistName, coverUrl: coverUrl),
-                  Divider(height: 1, color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
-                ] else ...[
-                  const SizedBox(height: 8),
-                  Center(child: Container(width: 40, height: 4, decoration: BoxDecoration(color: colorScheme.onSurfaceVariant.withValues(alpha: 0.4), borderRadius: BorderRadius.circular(2)))),
-                ],
-                // Service selector
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(24, 16, 24, 8),
-                  child: Text('Download From', style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold)),
+      builder: (context) => SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (trackName != null) ...[
+              _TrackInfoHeader(trackName: trackName, artistName: artistName, coverUrl: coverUrl),
+              Divider(height: 1, color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
+            ] else ...[
+              const SizedBox(height: 8),
+              Center(child: Container(width: 40, height: 4, decoration: BoxDecoration(color: colorScheme.onSurfaceVariant.withValues(alpha: 0.4), borderRadius: BorderRadius.circular(2)))),
+            ],
+            Padding(padding: const EdgeInsets.fromLTRB(24, 16, 24, 8), child: Text('Select Quality', style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold))),
+            // Disclaimer
+            Padding(
+              padding: const EdgeInsets.fromLTRB(24, 0, 24, 12),
+              child: Text(
+                'Actual quality depends on track availability. Hi-Res may not be available for all tracks.',
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                  color: colorScheme.onSurfaceVariant,
+                  fontStyle: FontStyle.italic,
                 ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Row(
-                    children: [
-                      _ServiceChip(label: 'Tidal', isSelected: selectedService == 'tidal', onTap: () => setModalState(() => selectedService = 'tidal')),
-                      const SizedBox(width: 8),
-                      _ServiceChip(label: 'Qobuz', isSelected: selectedService == 'qobuz', onTap: () => setModalState(() => selectedService = 'qobuz')),
-                      const SizedBox(width: 8),
-                      _ServiceChip(label: 'Amazon', isSelected: selectedService == 'amazon', onTap: () => setModalState(() => selectedService = 'amazon')),
-                    ],
-                  ),
-                ),
-                Padding(padding: const EdgeInsets.fromLTRB(24, 16, 24, 8), child: Text('Select Quality', style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold))),
-                // Disclaimer
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(24, 0, 24, 12),
-                  child: Text(
-                    'Actual quality depends on track availability. Hi-Res may not be available for all tracks.',
-                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      color: colorScheme.onSurfaceVariant,
-                      fontStyle: FontStyle.italic,
-                    ),
-                  ),
-                ),
-                _QualityOption(title: 'FLAC Lossless', subtitle: '16-bit / 44.1kHz', icon: Icons.music_note, onTap: () { Navigator.pop(context); onSelect('LOSSLESS', selectedService); }),
-                _QualityOption(title: 'Hi-Res FLAC', subtitle: '24-bit / up to 96kHz', icon: Icons.high_quality, onTap: () { Navigator.pop(context); onSelect('HI_RES', selectedService); }),
-                _QualityOption(title: 'Hi-Res FLAC Max', subtitle: '24-bit / up to 192kHz', icon: Icons.four_k, onTap: () { Navigator.pop(context); onSelect('HI_RES_LOSSLESS', selectedService); }),
-                const SizedBox(height: 16),
-              ],
+              ),
             ),
-          ),
+            _QualityOption(title: 'FLAC Lossless', subtitle: '16-bit / 44.1kHz', icon: Icons.music_note, onTap: () { Navigator.pop(context); onSelect('LOSSLESS'); }),
+            _QualityOption(title: 'Hi-Res FLAC', subtitle: '24-bit / up to 96kHz', icon: Icons.high_quality, onTap: () { Navigator.pop(context); onSelect('HI_RES'); }),
+            _QualityOption(title: 'Hi-Res FLAC Max', subtitle: '24-bit / up to 192kHz', icon: Icons.four_k, onTap: () { Navigator.pop(context); onSelect('HI_RES_LOSSLESS'); }),
+            const SizedBox(height: 16),
+          ],
         ),
       ),
     );
@@ -279,40 +254,6 @@ class _QualityOption extends StatelessWidget {
   }
 }
 
-class _ServiceChip extends StatelessWidget {
-  final String label;
-  final bool isSelected;
-  final VoidCallback onTap;
-  const _ServiceChip({required this.label, required this.isSelected, required this.onTap});
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    return Expanded(
-      child: GestureDetector(
-        onTap: onTap,
-        child: AnimatedContainer(
-          duration: const Duration(milliseconds: 200),
-          padding: const EdgeInsets.symmetric(vertical: 10),
-          decoration: BoxDecoration(
-            color: isSelected ? colorScheme.primaryContainer : colorScheme.surfaceContainerHighest,
-            borderRadius: BorderRadius.circular(12),
-            border: isSelected ? null : Border.all(color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
-          ),
-          child: Text(
-            label,
-            textAlign: TextAlign.center,
-            style: TextStyle(
-              fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
-              color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
 class _TrackInfoHeader extends StatefulWidget {
   final String trackName;
   final String? artistName;

lib/screens/search_screen.dart

@@ -23,8 +23,7 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
     _searchController = TextEditingController(text: widget.query);
     if (widget.query.isNotEmpty) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        final settings = ref.read(settingsProvider);
-        ref.read(trackProvider.notifier).search(widget.query, metadataSource: settings.metadataSource);
+        ref.read(trackProvider.notifier).search(widget.query);
       });
     }
   }
@@ -38,8 +37,7 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
   void _search() {
     final query = _searchController.text.trim();
     if (query.isNotEmpty) {
-      final settings = ref.read(settingsProvider);
-      ref.read(trackProvider.notifier).search(query, metadataSource: settings.metadataSource);
+      ref.read(trackProvider.notifier).search(query);
     }
   }
 

lib/screens/settings/about_page.dart

@@ -123,24 +123,6 @@ class AboutPage extends StatelessWidget {
             ),
           ),
 
-          // Support section
-          const SliverToBoxAdapter(
-            child: SettingsSectionHeader(title: 'Support'),
-          ),
-          SliverToBoxAdapter(
-            child: SettingsGroup(
-              children: [
-                SettingsItem(
-                  icon: Icons.coffee_outlined,
-                  title: 'Buy me a coffee',
-                  subtitle: 'Support development on Ko-fi',
-                  onTap: () => _launchUrl(AppInfo.kofiUrl),
-                  showDivider: false,
-                ),
-              ],
-            ),
-          ),
-
           // App info section
           const SliverToBoxAdapter(
             child: SettingsSectionHeader(title: 'App'),

lib/screens/settings/appearance_settings_page.dart

@@ -40,14 +40,6 @@ class AppearanceSettingsPage extends ConsumerWidget {
                     currentMode: themeSettings.themeMode,
                     onChanged: (mode) => ref.read(themeProvider.notifier).setThemeMode(mode),
                   ),
-                  SettingsSwitchItem(
-                    icon: Icons.brightness_2,
-                    title: 'AMOLED Dark',
-                    subtitle: 'Pure black background for OLED screens',
-                    value: themeSettings.useAmoled,
-                    onChanged: (value) => ref.read(themeProvider.notifier).setUseAmoled(value),
-                    showDivider: false,
-                  ),
                 ],
               ),
             ),

lib/screens/settings/options_settings_page.dart

@@ -105,10 +105,7 @@ class OptionsSettingsPage extends ConsumerWidget {
                   subtitle: 'Notify when new version is available',
                   value: settings.checkForUpdates,
                   onChanged: (v) => ref.read(settingsProvider.notifier).setCheckForUpdates(v),
-                ),
-                _UpdateChannelSelector(
-                  currentChannel: settings.updateChannel,
-                  onChanged: (v) => ref.read(settingsProvider.notifier).setUpdateChannel(v),
+                  showDivider: false,
                 ),
               ],
             ),
@@ -119,35 +116,29 @@ class OptionsSettingsPage extends ConsumerWidget {
           SliverToBoxAdapter(
             child: SettingsGroup(
               children: [
-                _MetadataSourceSelector(
-                  currentSource: settings.metadataSource,
-                  onChanged: (v) => ref.read(settingsProvider.notifier).setMetadataSource(v),
+                SettingsItem(
+                  icon: Icons.key,
+                  title: 'Custom Credentials',
+                  subtitle: settings.spotifyClientId.isNotEmpty 
+                      ? 'Client ID: ${settings.spotifyClientId.length > 8 ? '${settings.spotifyClientId.substring(0, 8)}...' : settings.spotifyClientId}' 
+                      : 'Not configured',
+                  onTap: () => _showSpotifyCredentialsDialog(context, ref, settings),
+                  trailing: settings.spotifyClientId.isNotEmpty
+                      ? Icon(Icons.edit, color: Theme.of(context).colorScheme.onSurfaceVariant, size: 20)
+                      : Icon(Icons.add, color: Theme.of(context).colorScheme.primary, size: 20),
+                  showDivider: settings.spotifyClientId.isNotEmpty,
                 ),
-                if (settings.metadataSource == 'spotify') ...[
-                  SettingsItem(
-                    icon: Icons.key,
-                    title: 'Custom Credentials',
-                    subtitle: settings.spotifyClientId.isNotEmpty 
-                        ? 'Client ID: ${settings.spotifyClientId.length > 8 ? '${settings.spotifyClientId.substring(0, 8)}...' : settings.spotifyClientId}' 
-                        : 'Not configured',
-                    onTap: () => _showSpotifyCredentialsDialog(context, ref, settings),
-                    trailing: settings.spotifyClientId.isNotEmpty
-                        ? Icon(Icons.edit, color: Theme.of(context).colorScheme.onSurfaceVariant, size: 20)
-                        : Icon(Icons.add, color: Theme.of(context).colorScheme.primary, size: 20),
-                    showDivider: settings.spotifyClientId.isNotEmpty,
+                if (settings.spotifyClientId.isNotEmpty)
+                  SettingsSwitchItem(
+                    icon: Icons.toggle_on,
+                    title: 'Use Custom Credentials',
+                    subtitle: settings.useCustomSpotifyCredentials 
+                        ? 'Using your credentials' 
+                        : 'Using default credentials',
+                    value: settings.useCustomSpotifyCredentials,
+                    onChanged: (v) => ref.read(settingsProvider.notifier).setUseCustomSpotifyCredentials(v),
+                    showDivider: false,
                   ),
-                  if (settings.spotifyClientId.isNotEmpty)
-                    SettingsSwitchItem(
-                      icon: Icons.toggle_on,
-                      title: 'Use Custom Credentials',
-                      subtitle: settings.useCustomSpotifyCredentials 
-                          ? 'Using your credentials' 
-                          : 'Using default credentials',
-                      value: settings.useCustomSpotifyCredentials,
-                      onChanged: (v) => ref.read(settingsProvider.notifier).setUseCustomSpotifyCredentials(v),
-                      showDivider: false,
-                    ),
-                ],
               ],
             ),
           ),
@@ -402,149 +393,3 @@ class _ConcurrentChip extends StatelessWidget {
     );
   }
 }
-
-class _UpdateChannelSelector extends StatelessWidget {
-  final String currentChannel;
-  final ValueChanged<String> onChanged;
-  const _UpdateChannelSelector({required this.currentChannel, required this.onChanged});
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    return Padding(
-      padding: const EdgeInsets.all(20),
-      child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-        Row(children: [
-          Icon(Icons.new_releases, color: colorScheme.onSurfaceVariant, size: 24),
-          const SizedBox(width: 16),
-          Expanded(child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-            Text('Update Channel', style: Theme.of(context).textTheme.bodyLarge),
-            const SizedBox(height: 2),
-            Text(currentChannel == 'preview' ? 'Get preview releases' : 'Stable releases only',
-              style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant)),
-          ])),
-        ]),
-        const SizedBox(height: 16),
-        Row(children: [
-          _ChannelChip(label: 'Stable', isSelected: currentChannel == 'stable', onTap: () => onChanged('stable')),
-          const SizedBox(width: 8),
-          _ChannelChip(label: 'Preview', isSelected: currentChannel == 'preview', onTap: () => onChanged('preview')),
-        ]),
-        const SizedBox(height: 12),
-        Row(children: [
-          Icon(Icons.info_outline, size: 16, color: colorScheme.onSurfaceVariant),
-          const SizedBox(width: 8),
-          Expanded(child: Text('Preview may contain bugs or incomplete features',
-            style: Theme.of(context).textTheme.bodySmall?.copyWith(color: colorScheme.onSurfaceVariant))),
-        ]),
-      ]),
-    );
-  }
-}
-
-class _ChannelChip extends StatelessWidget {
-  final String label;
-  final bool isSelected;
-  final VoidCallback onTap;
-  const _ChannelChip({required this.label, required this.isSelected, required this.onTap});
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    final isDark = Theme.of(context).brightness == Brightness.dark;
-    
-    final unselectedColor = isDark 
-        ? Color.alphaBlend(Colors.white.withValues(alpha: 0.05), colorScheme.surface)
-        : colorScheme.surfaceContainerHigh;
-    
-    return Expanded(
-      child: Material(
-        color: isSelected ? colorScheme.primaryContainer : unselectedColor,
-        borderRadius: BorderRadius.circular(12),
-        child: InkWell(
-          onTap: onTap,
-          borderRadius: BorderRadius.circular(12),
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 12),
-            child: Center(child: Text(label, style: TextStyle(
-              fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
-              color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant))),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _MetadataSourceSelector extends StatelessWidget {
-  final String currentSource;
-  final ValueChanged<String> onChanged;
-  const _MetadataSourceSelector({required this.currentSource, required this.onChanged});
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    return Padding(
-      padding: const EdgeInsets.all(20),
-      child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-        Row(children: [
-          Icon(Icons.search, color: colorScheme.onSurfaceVariant, size: 24),
-          const SizedBox(width: 16),
-          Expanded(child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-            Text('Search Source', style: Theme.of(context).textTheme.bodyLarge),
-            const SizedBox(height: 2),
-            Text(currentSource == 'deezer' ? 'Deezer (no need developer account)' : 'Spotify (may hit rate limit)',
-              style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant)),
-          ])),
-        ]),
-        const SizedBox(height: 16),
-        Row(children: [
-          _SourceChip(label: 'Deezer', isSelected: currentSource == 'deezer', onTap: () => onChanged('deezer')),
-          const SizedBox(width: 8),
-          _SourceChip(label: 'Spotify', isSelected: currentSource == 'spotify', onTap: () => onChanged('spotify')),
-        ]),
-        const SizedBox(height: 12),
-        Row(children: [
-          Icon(Icons.info_outline, size: 16, color: colorScheme.onSurfaceVariant),
-          const SizedBox(width: 8),
-          Expanded(child: Text('Spotify URLs are always supported regardless of this setting',
-            style: Theme.of(context).textTheme.bodySmall?.copyWith(color: colorScheme.onSurfaceVariant))),
-        ]),
-      ]),
-    );
-  }
-}
-
-class _SourceChip extends StatelessWidget {
-  final String label;
-  final bool isSelected;
-  final VoidCallback onTap;
-  const _SourceChip({required this.label, required this.isSelected, required this.onTap});
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    final isDark = Theme.of(context).brightness == Brightness.dark;
-    
-    final unselectedColor = isDark 
-        ? Color.alphaBlend(Colors.white.withValues(alpha: 0.05), colorScheme.surface)
-        : colorScheme.surfaceContainerHigh;
-    
-    return Expanded(
-      child: Material(
-        color: isSelected ? colorScheme.primaryContainer : unselectedColor,
-        borderRadius: BorderRadius.circular(12),
-        child: InkWell(
-          onTap: onTap,
-          borderRadius: BorderRadius.circular(12),
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 12),
-            child: Center(child: Text(label, style: TextStyle(
-              fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
-              color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant))),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/screens/track_metadata_screen.dart

@@ -759,21 +759,17 @@ class _TrackMetadataScreenState extends ConsumerState<TrackMetadataScreen> {
     });
 
     try {
-      // Add timeout to prevent infinite loading
       final result = await PlatformBridge.getLyricsLRC(
         item.spotifyId ?? '',
         item.trackName,
         item.artistName,
         filePath: _fileExists ? item.filePath : null, // Try embedded lyrics first
-      ).timeout(
-        const Duration(seconds: 20),
-        onTimeout: () => '', // Return empty string on timeout
       );
       
       if (mounted) {
         if (result.isEmpty) {
           setState(() {
-            _lyricsError = 'Lyrics not available for this track';
+            _lyricsError = 'Lyrics not found';
             _lyricsLoading = false;
           });
         } else {
@@ -787,11 +783,8 @@ class _TrackMetadataScreenState extends ConsumerState<TrackMetadataScreen> {
       }
     } catch (e) {
       if (mounted) {
-        final errorMsg = e.toString().contains('TimeoutException') 
-            ? 'Request timed out. Try again later.'
-            : 'Failed to load lyrics';
         setState(() {
-          _lyricsError = errorMsg;
+          _lyricsError = 'Failed to load lyrics';
           _lyricsLoading = false;
         });
       }

lib/services/platform_bridge.dart

@@ -316,52 +316,4 @@ class PlatformBridge {
   static Future<void> clearTrackCache() async {
     await _channel.invokeMethod('clearTrackCache');
   }
-
-  // ==================== DEEZER API ====================
-
-  /// Search Deezer for tracks and artists (no API key required)
-  static Future<Map<String, dynamic>> searchDeezerAll(String query, {int trackLimit = 15, int artistLimit = 3}) async {
-    final result = await _channel.invokeMethod('searchDeezerAll', {
-      'query': query,
-      'track_limit': trackLimit,
-      'artist_limit': artistLimit,
-    });
-    return jsonDecode(result as String) as Map<String, dynamic>;
-  }
-
-  /// Get Deezer metadata by type and ID
-  static Future<Map<String, dynamic>> getDeezerMetadata(String resourceType, String resourceId) async {
-    final result = await _channel.invokeMethod('getDeezerMetadata', {
-      'resource_type': resourceType,
-      'resource_id': resourceId,
-    });
-    return jsonDecode(result as String) as Map<String, dynamic>;
-  }
-
-  /// Parse Deezer URL and return type and ID
-  static Future<Map<String, dynamic>> parseDeezerUrl(String url) async {
-    final result = await _channel.invokeMethod('parseDeezerUrl', {'url': url});
-    return jsonDecode(result as String) as Map<String, dynamic>;
-  }
-
-  /// Search Deezer by ISRC
-  static Future<Map<String, dynamic>> searchDeezerByISRC(String isrc) async {
-    final result = await _channel.invokeMethod('searchDeezerByISRC', {'isrc': isrc});
-    return jsonDecode(result as String) as Map<String, dynamic>;
-  }
-
-  /// Convert Spotify track to Deezer and get metadata (for rate limit fallback)
-  static Future<Map<String, dynamic>> convertSpotifyToDeezer(String resourceType, String spotifyId) async {
-    final result = await _channel.invokeMethod('convertSpotifyToDeezer', {
-      'resource_type': resourceType,
-      'spotify_id': spotifyId,
-    });
-    return jsonDecode(result as String) as Map<String, dynamic>;
-  }
-
-  /// Get Spotify metadata with automatic Deezer fallback on rate limit
-  static Future<Map<String, dynamic>> getSpotifyMetadataWithFallback(String url) async {
-    final result = await _channel.invokeMethod('getSpotifyMetadataWithFallback', {'url': url});
-    return jsonDecode(result as String) as Map<String, dynamic>;
-  }
 }

lib/services/update_checker.dart

@@ -12,7 +12,6 @@ class UpdateInfo {
   final String downloadUrl;
   final String? apkDownloadUrl;
   final DateTime publishedAt;
-  final bool isPrerelease;
 
   const UpdateInfo({
     required this.version,
@@ -20,13 +19,11 @@ class UpdateInfo {
     required this.downloadUrl,
     this.apkDownloadUrl,
     required this.publishedAt,
-    this.isPrerelease = false,
   });
 }
 
 class UpdateChecker {
-  static const String _latestApiUrl = 'https://api.github.com/repos/${AppInfo.githubRepo}/releases/latest';
-  static const String _allReleasesApiUrl = 'https://api.github.com/repos/${AppInfo.githubRepo}/releases';
+  static const String _apiUrl = 'https://api.github.com/repos/${AppInfo.githubRepo}/releases/latest';
 
   static Future<String> _getDeviceArch() async {
     if (!Platform.isAndroid) return 'unknown';
@@ -58,59 +55,30 @@ class UpdateChecker {
     }
   }
 
-  /// Check for updates based on channel preference
-  /// [channel] can be 'stable' or 'preview'
-  static Future<UpdateInfo?> checkForUpdate({String channel = 'stable'}) async {
+  static Future<UpdateInfo?> checkForUpdate() async {
     try {
-      Map<String, dynamic>? releaseData;
-      
-      if (channel == 'preview') {
-        // For preview channel, get all releases and find the latest (including prereleases)
-        final response = await http.get(
-          Uri.parse('$_allReleasesApiUrl?per_page=10'),
-          headers: {'Accept': 'application/vnd.github.v3+json'},
-        ).timeout(const Duration(seconds: 10));
+      final response = await http.get(
+        Uri.parse(_apiUrl),
+        headers: {'Accept': 'application/vnd.github.v3+json'},
+      ).timeout(const Duration(seconds: 10));
 
-        if (response.statusCode != 200) {
-          _log.w('GitHub API returned ${response.statusCode}');
-          return null;
-        }
-
-        final releases = jsonDecode(response.body) as List<dynamic>;
-        if (releases.isEmpty) {
-          _log.i('No releases found');
-          return null;
-        }
-        
-        // First release is the latest (including prereleases)
-        releaseData = releases.first as Map<String, dynamic>;
-      } else {
-        // For stable channel, use /latest endpoint (excludes prereleases)
-        final response = await http.get(
-          Uri.parse(_latestApiUrl),
-          headers: {'Accept': 'application/vnd.github.v3+json'},
-        ).timeout(const Duration(seconds: 10));
-
-        if (response.statusCode != 200) {
-          _log.w('GitHub API returned ${response.statusCode}');
-          return null;
-        }
-
-        releaseData = jsonDecode(response.body) as Map<String, dynamic>;
-      }
-
-      final tagName = releaseData['tag_name'] as String? ?? '';
-      final latestVersion = tagName.replaceFirst('v', '');
-      final isPrerelease = releaseData['prerelease'] as bool? ?? false;
-      
-      if (!_isNewerVersion(latestVersion, AppInfo.version)) {
-        _log.i('No update available (current: ${AppInfo.version}, latest: $latestVersion, channel: $channel)');
+      if (response.statusCode != 200) {
+        _log.w('GitHub API returned ${response.statusCode}');
         return null;
       }
 
-      final body = releaseData['body'] as String? ?? 'No changelog available';
-      final htmlUrl = releaseData['html_url'] as String? ?? '${AppInfo.githubUrl}/releases';
-      final publishedAt = DateTime.tryParse(releaseData['published_at'] as String? ?? '') ?? DateTime.now();
+      final data = jsonDecode(response.body) as Map<String, dynamic>;
+      final tagName = data['tag_name'] as String? ?? '';
+      final latestVersion = tagName.replaceFirst('v', '');
+      
+      if (!_isNewerVersion(latestVersion, AppInfo.version)) {
+        _log.i('No update available (current: ${AppInfo.version}, latest: $latestVersion)');
+        return null;
+      }
+
+      final body = data['body'] as String? ?? 'No changelog available';
+      final htmlUrl = data['html_url'] as String? ?? '${AppInfo.githubUrl}/releases';
+      final publishedAt = DateTime.tryParse(data['published_at'] as String? ?? '') ?? DateTime.now();
 
       final deviceArch = await _getDeviceArch();
       _log.d('Device architecture: $deviceArch');
@@ -119,7 +87,7 @@ class UpdateChecker {
       String? arm32Url;
       String? universalUrl;
       
-      final assets = releaseData['assets'] as List<dynamic>? ?? [];
+      final assets = data['assets'] as List<dynamic>? ?? [];
       for (final asset in assets) {
         final name = (asset['name'] as String? ?? '').toLowerCase();
         if (name.endsWith('.apk')) {
@@ -149,7 +117,7 @@ class UpdateChecker {
         apkUrl = universalUrl ?? arm64Url ?? arm32Url;
       }
 
-      _log.i('Update available: $latestVersion (prerelease: $isPrerelease), APK URL: $apkUrl');
+      _log.i('Update available: $latestVersion, APK URL: $apkUrl');
       
       return UpdateInfo(
         version: latestVersion,
@@ -157,7 +125,6 @@ class UpdateChecker {
         downloadUrl: htmlUrl,
         apkDownloadUrl: apkUrl,
         publishedAt: publishedAt,
-        isPrerelease: isPrerelease,
       );
     } catch (e) {
       _log.e('Error checking for updates: $e');

lib/theme/app_theme.dart

@@ -43,7 +43,6 @@ class AppTheme {
   static ThemeData dark({
     ColorScheme? dynamicScheme,
     Color? seedColor,
-    bool isAmoled = false,
   }) {
     final scheme = dynamicScheme ??
         ColorScheme.fromSeed(
@@ -54,8 +53,7 @@ class AppTheme {
     return ThemeData(
       useMaterial3: true,
       colorScheme: scheme,
-      scaffoldBackgroundColor: isAmoled ? Colors.black : null,
-      appBarTheme: _appBarTheme(scheme, isAmoled: isAmoled),
+      appBarTheme: _appBarTheme(scheme),
       cardTheme: _cardTheme(scheme),
       elevatedButtonTheme: _elevatedButtonTheme(scheme),
       filledButtonTheme: _filledButtonTheme(scheme),
@@ -65,7 +63,7 @@ class AppTheme {
       inputDecorationTheme: _inputDecorationTheme(scheme),
       listTileTheme: _listTileTheme(scheme),
       dialogTheme: _dialogTheme(scheme),
-      navigationBarTheme: _navigationBarTheme(scheme, isAmoled: isAmoled),
+      navigationBarTheme: _navigationBarTheme(scheme),
       snackBarTheme: _snackBarTheme(scheme),
       progressIndicatorTheme: _progressIndicatorTheme(scheme),
       switchTheme: _switchTheme(scheme),
@@ -75,12 +73,12 @@ class AppTheme {
   }
 
   /// AppBar theme
-  static AppBarTheme _appBarTheme(ColorScheme scheme, {bool isAmoled = false}) => AppBarTheme(
+  static AppBarTheme _appBarTheme(ColorScheme scheme) => AppBarTheme(
         elevation: 0,
-        scrolledUnderElevation: isAmoled ? 0 : 3,
-        backgroundColor: isAmoled ? Colors.black : scheme.surface,
+        scrolledUnderElevation: 3,
+        backgroundColor: scheme.surface,
         foregroundColor: scheme.onSurface,
-        surfaceTintColor: isAmoled ? Colors.transparent : scheme.surfaceTint,
+        surfaceTintColor: scheme.surfaceTint,
         centerTitle: true,
         titleTextStyle: TextStyle(
           color: scheme.onSurface,
@@ -182,12 +180,12 @@ class AppTheme {
       );
 
   /// Navigation bar theme
-  static NavigationBarThemeData _navigationBarTheme(ColorScheme scheme, {bool isAmoled = false}) =>
+  static NavigationBarThemeData _navigationBarTheme(ColorScheme scheme) =>
       NavigationBarThemeData(
         elevation: 0,
-        backgroundColor: isAmoled ? Colors.black : scheme.surfaceContainer,
+        backgroundColor: scheme.surfaceContainer,
         indicatorColor: scheme.secondaryContainer,
-        surfaceTintColor: isAmoled ? Colors.transparent : scheme.surfaceTint,
+        surfaceTintColor: scheme.surfaceTint,
         labelBehavior: NavigationDestinationLabelBehavior.alwaysShow,
       );
 

lib/theme/dynamic_color_wrapper.dart

@@ -40,32 +40,12 @@ class DynamicColorWrapper extends ConsumerWidget {
           );
         }
 
-        // Apply AMOLED mode if enabled (pure black background)
-        if (themeSettings.useAmoled) {
-          darkScheme = _applyAmoledColors(darkScheme);
-        }
-
         // Build themes
         final lightTheme = AppTheme.light(dynamicScheme: lightScheme);
-        final darkTheme = AppTheme.dark(dynamicScheme: darkScheme, isAmoled: themeSettings.useAmoled);
+        final darkTheme = AppTheme.dark(dynamicScheme: darkScheme);
 
         return builder(lightTheme, darkTheme, themeSettings.themeMode);
       },
     );
   }
-
-  /// Apply AMOLED colors - pure black background with adjusted surface colors
-  ColorScheme _applyAmoledColors(ColorScheme scheme) {
-    return scheme.copyWith(
-      surface: Colors.black,
-      onSurface: Colors.white,
-      surfaceContainerLowest: Colors.black,
-      surfaceContainerLow: const Color(0xFF0A0A0A),
-      surfaceContainer: const Color(0xFF121212),
-      surfaceContainerHigh: const Color(0xFF1A1A1A),
-      surfaceContainerHighest: const Color(0xFF222222),
-      inverseSurface: Colors.white,
-      onInverseSurface: Colors.black,
-    );
-  }
 }

pubspec.yaml

@@ -1,7 +1,7 @@
 name: spotiflac_android
 description: Download Spotify tracks in FLAC from Tidal, Qobuz & Amazon Music
 publish_to: 'none'
-version: 2.1.5-preview+42
+version: 2.1.0-preview+39
 
 environment:
   sdk: ^3.10.0

pubspec_ios.yaml

@@ -1,7 +1,7 @@
 name: spotiflac_android
 description: Download Spotify tracks in FLAC from Tidal, Qobuz & Amazon Music
 publish_to: 'none'
-version: 2.1.0-preview2+40
+version: 2.1.0-preview+39
 
 environment:
   sdk: ^3.10.0