Fix artwork loading via server image proxy (e.g. Youtube plugin)

The default HTTP data source doesn't follow redirects.
While at it, also unify OkHttpClient construction.

Author: maniac103

app/build.gradle.kts

@@ -121,6 +121,8 @@ dependencies {
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.service)
     implementation(libs.androidx.media3.session)
+    implementation(libs.androidx.media3.datasource)
+    implementation(libs.androidx.media3.datasource.okhttp)
     implementation(libs.androidx.paging.runtime.ktx)
     implementation(libs.androidx.preference.ktx)
     implementation(libs.androidx.recyclerview)

app/src/main/java/de/maniac103/squeezeclient/SqueezeClientApplication.kt

@@ -25,13 +25,30 @@ import com.google.android.material.color.DynamicColors
 import com.markodevcic.peko.PermissionRequester
 import de.maniac103.squeezeclient.cometd.ConnectionHelper
 import de.maniac103.squeezeclient.extfuncs.prefs
+import de.maniac103.squeezeclient.extfuncs.serverConfig
 import kotlinx.serialization.json.Json
+import okhttp3.OkHttpClient
 
 class SqueezeClientApplication : Application(), SharedPreferences.OnSharedPreferenceChangeListener {
     val json = Json {
         coerceInputValues = true
         ignoreUnknownKeys = true
     }
+    val httpClient = OkHttpClient.Builder()
+        .addInterceptor { chain ->
+            val request = chain.request()
+            val serverConfig = prefs.serverConfig
+            val authHeader = serverConfig?.credentialsAsAuthorizationHeader
+            val actualRequest = when {
+                request.url.host == serverConfig?.url?.host && authHeader != null ->
+                    request.newBuilder().addHeader("Authorization", authHeader).build()
+
+                else -> request
+            }
+            chain.proceed(actualRequest)
+        }
+        .followRedirects(true)
+        .build()
     val connectionHelper = ConnectionHelper(this)
 
     override fun onCreate() {

app/src/main/java/de/maniac103/squeezeclient/cometd/CometdClient.kt

@@ -61,8 +61,12 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.ResponseBody
 import okhttp3.logging.HttpLoggingInterceptor
 
-class CometdClient(private val json: Json, private val serverConfig: ServerConfiguration) {
-    private val requestClient = OkHttpClient.Builder()
+class CometdClient(
+    private val httpClient: OkHttpClient,
+    private val json: Json,
+    private val serverConfig: ServerConfiguration
+) {
+    private val requestClient = httpClient.newBuilder()
         .apply {
             if (HTTP_LOGGING_LEVEL != HttpLoggingInterceptor.Level.NONE) {
                 val logger = HttpLoggingInterceptor.Logger { message -> Log.d(TAG, message) }
@@ -177,7 +181,7 @@ class CometdClient(private val json: Json, private val serverConfig: ServerConfi
             put("id", nextId++)
         }
         val request = buildRequest(connectMessage, metaSubscribeMessage)
-        val subscriptionClient = OkHttpClient.Builder()
+        val subscriptionClient = httpClient.newBuilder()
             .readTimeout(listenTimeout.inWholeMilliseconds, TimeUnit.MILLISECONDS)
             .build()
         val body = withContext(Dispatchers.IO) {

app/src/main/java/de/maniac103/squeezeclient/cometd/ConnectionHelper.kt

@@ -123,7 +123,7 @@ class ConnectionHelper(private val appContext: SqueezeClientApplication) {
             return
         }
         val prefs = appContext.prefs
-        val client = prefs.serverConfig?.let { CometdClient(json, it) }
+        val client = prefs.serverConfig?.let { CometdClient(appContext.httpClient, json, it) }
             ?: return
 
         this.client = client

app/src/main/java/de/maniac103/squeezeclient/extfuncs/ContextExtensions.kt

@@ -26,5 +26,7 @@ val Context.connectionHelper get() =
     (applicationContext as SqueezeClientApplication).connectionHelper
 val Context.jsonParser get() =
     (applicationContext as SqueezeClientApplication).json
+val Context.httpClient get() =
+    (applicationContext as SqueezeClientApplication).httpClient
 val Context.prefs: SharedPreferences get() =
     PreferenceManager.getDefaultSharedPreferences(this)

app/src/main/java/de/maniac103/squeezeclient/service/DownloadWorker.kt

@@ -40,6 +40,7 @@ import androidx.work.workDataOf
 import de.maniac103.squeezeclient.R
 import de.maniac103.squeezeclient.extfuncs.DownloadFolderStructure
 import de.maniac103.squeezeclient.extfuncs.downloadFolderStructure
+import de.maniac103.squeezeclient.extfuncs.httpClient
 import de.maniac103.squeezeclient.extfuncs.jsonParser
 import de.maniac103.squeezeclient.extfuncs.prefs
 import de.maniac103.squeezeclient.extfuncs.serverConfig
@@ -52,7 +53,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.datetime.Clock
 import kotlinx.serialization.encodeToString
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.ResponseBody
 import okio.Buffer
@@ -73,8 +73,7 @@ class DownloadWorker(
         val serverConfig = applicationContext.prefs.serverConfig
             ?: return Result.failure()
         val baseUrl = serverConfig.url
-        val authorizationHeader = serverConfig.credentialsAsAuthorizationHeader
-        val client = OkHttpClient.Builder().build()
+        val client = applicationContext.httpClient
         val resolver = applicationContext.contentResolver
         val folderStructure = applicationContext.prefs.downloadFolderStructure
 
@@ -91,10 +90,9 @@ class DownloadWorker(
                 .addPathSegment(item.trackId.toString())
                 .addPathSegment("download")
                 .build()
-            val request = Request.Builder().apply {
-                url(songUrl)
-                authorizationHeader?.let { addHeader("Authorization", it) }
-            }.build()
+            val request = Request.Builder()
+                .url(songUrl)
+                .build()
 
             withContext(Dispatchers.IO) {
                 val response = client.newCall(request).execute()

app/src/main/java/de/maniac103/squeezeclient/service/MediaService.kt

@@ -40,6 +40,10 @@ import androidx.media3.common.MediaMetadata
 import androidx.media3.common.Player
 import androidx.media3.common.SimpleBasePlayer
 import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.DataSourceBitmapLoader
+import androidx.media3.datasource.DefaultDataSource
+import androidx.media3.datasource.okhttp.OkHttpDataSource
+import androidx.media3.session.CacheBitmapLoader
 import androidx.media3.session.CommandButton
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSession.ConnectionResult
@@ -52,6 +56,7 @@ import de.maniac103.squeezeclient.cometd.ConnectionHelper
 import de.maniac103.squeezeclient.cometd.ConnectionState
 import de.maniac103.squeezeclient.cometd.request.PlaybackButtonRequest
 import de.maniac103.squeezeclient.extfuncs.connectionHelper
+import de.maniac103.squeezeclient.extfuncs.httpClient
 import de.maniac103.squeezeclient.extfuncs.lastSelectedPlayer
 import de.maniac103.squeezeclient.extfuncs.prefs
 import de.maniac103.squeezeclient.model.PagingParams
@@ -122,10 +127,20 @@ class MediaService : MediaSessionService(), LifecycleOwner, MediaSession.Callbac
             Intent(this, MainActivity::class.java).setAction(Intent.ACTION_MAIN),
             PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
+
+        val dataSourceFactory = DefaultDataSource.Factory(
+            this,
+            OkHttpDataSource.Factory(httpClient)
+        )
+        val bitmapLoader = DataSourceBitmapLoader(
+            DataSourceBitmapLoader.DEFAULT_EXECUTOR_SERVICE.get(),
+            dataSourceFactory
+        )
         mediaSession = MediaSession.Builder(this, player)
             .setCallback(this)
             .setCustomLayout(listOf(powerButton, disconnectButton))
             .setSessionActivity(activityIntent)
+            .setBitmapLoader(CacheBitmapLoader(bitmapLoader))
             .build()
         addSession(mediaSession)
     }

gradle/libs.versions.toml

@@ -49,6 +49,8 @@ androidx-lifecycle-service = { module = "androidx.lifecycle:lifecycle-service",
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
 androidx-material-icons-extended-android = { module = "androidx.compose.material:material-icons-extended-android", version.ref = "androidx-compose-material" }
 androidx-media3-session = { module = "androidx.media3:media3-session", version.ref = "androidx-media3" }
+androidx-media3-datasource = { module = "androidx.media3:media3-datasource", version.ref = "androidx-media3" }
+androidx-media3-datasource-okhttp = { module = "androidx.media3:media3-datasource-okhttp", version.ref = "androidx-media3" }
 androidx-paging-runtime-ktx = { module = "androidx.paging:paging-runtime-ktx", version.ref = "androidx-paging" }
 androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "androidx-preference" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "androidx-recyclerview" }