From d4cb6c5c9a6a08ed7ad7d57b584671828294c106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Garc=C3=ADa?=
 <55400857+jaime-grj@users.noreply.github.com>
Date: Sat, 6 Sep 2025 00:20:35 +0200
Subject: [PATCH] fix: Update MediaService in all build variants

---
 .../com/cappielloantonio/tempo/service/MediaService.kt     | 7 ++-----
 .../com/cappielloantonio/tempo/service/MediaService.kt     | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/src/play/java/com/cappielloantonio/tempo/service/MediaService.kt b/app/src/play/java/com/cappielloantonio/tempo/service/MediaService.kt
index 2391a2bb..e46a140a 100644
--- a/app/src/play/java/com/cappielloantonio/tempo/service/MediaService.kt
+++ b/app/src/play/java/com/cappielloantonio/tempo/service/MediaService.kt
@@ -14,13 +14,13 @@ import androidx.media3.common.Tracks
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.ExoPlayer
-import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.session.MediaLibraryService
 import androidx.media3.session.MediaSession.ControllerInfo
 import com.cappielloantonio.tempo.repository.AutomotiveRepository
 import com.cappielloantonio.tempo.ui.activity.MainActivity
 import com.cappielloantonio.tempo.util.Constants
 import com.cappielloantonio.tempo.util.DownloadUtil
+import com.cappielloantonio.tempo.util.DynamicMediaSourceFactory
 import com.cappielloantonio.tempo.util.Preferences
 import com.cappielloantonio.tempo.util.ReplayGainUtil
 import com.google.android.gms.cast.framework.CastContext
@@ -74,7 +74,7 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
     private fun initializePlayer() {
         player = ExoPlayer.Builder(this)
                 .setRenderersFactory(getRenderersFactory())
-                .setMediaSourceFactory(getMediaSourceFactory())
+                .setMediaSourceFactory(DynamicMediaSourceFactory(this))
                 .setAudioAttributes(AudioAttributes.DEFAULT, true)
                 .setHandleAudioBecomingNoisy(true)
                 .setWakeMode(C.WAKE_MODE_NETWORK)
@@ -216,9 +216,6 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
 
     private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false)
 
-    private fun getMediaSourceFactory() =
-            DefaultMediaSourceFactory(this).setDataSourceFactory(DownloadUtil.getDataSourceFactory(this))
-
     override fun onCastSessionAvailable() {
         setPlayer(player, castPlayer)
     }
diff --git a/app/src/tempo/java/com/cappielloantonio/tempo/service/MediaService.kt b/app/src/tempo/java/com/cappielloantonio/tempo/service/MediaService.kt
index 2391a2bb..e46a140a 100644
--- a/app/src/tempo/java/com/cappielloantonio/tempo/service/MediaService.kt
+++ b/app/src/tempo/java/com/cappielloantonio/tempo/service/MediaService.kt
@@ -14,13 +14,13 @@ import androidx.media3.common.Tracks
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.ExoPlayer
-import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.session.MediaLibraryService
 import androidx.media3.session.MediaSession.ControllerInfo
 import com.cappielloantonio.tempo.repository.AutomotiveRepository
 import com.cappielloantonio.tempo.ui.activity.MainActivity
 import com.cappielloantonio.tempo.util.Constants
 import com.cappielloantonio.tempo.util.DownloadUtil
+import com.cappielloantonio.tempo.util.DynamicMediaSourceFactory
 import com.cappielloantonio.tempo.util.Preferences
 import com.cappielloantonio.tempo.util.ReplayGainUtil
 import com.google.android.gms.cast.framework.CastContext
@@ -74,7 +74,7 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
     private fun initializePlayer() {
         player = ExoPlayer.Builder(this)
                 .setRenderersFactory(getRenderersFactory())
-                .setMediaSourceFactory(getMediaSourceFactory())
+                .setMediaSourceFactory(DynamicMediaSourceFactory(this))
                 .setAudioAttributes(AudioAttributes.DEFAULT, true)
                 .setHandleAudioBecomingNoisy(true)
                 .setWakeMode(C.WAKE_MODE_NETWORK)
@@ -216,9 +216,6 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
 
     private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false)
 
-    private fun getMediaSourceFactory() =
-            DefaultMediaSourceFactory(this).setDataSourceFactory(DownloadUtil.getDataSourceFactory(this))
-
     override fun onCastSessionAvailable() {
         setPlayer(player, castPlayer)
     }