439 improve current media item tracker (#440)

Co-authored-by: Gaëtan Muller <[email protected]>
SRGSSR · Feb 15, 2024 · 1d40aaa · 1d40aaa
1 parent b7ab56d
commit 1d40aaa
Show file tree

Hide file tree

Showing 18 changed files with 1,261 additions and 1,039 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -102,6 +102,8 @@ androidx-media3-ui-leanback = { group = "androidx.media3", name = "media3-ui-lea
 androidx-media3-dash = { group = "androidx.media3", name = "media3-exoplayer-dash", version.ref = "androidx-media3" }
 androidx-media3-hls = { group = "androidx.media3", name = "media3-exoplayer-hls", version.ref = "androidx-media3" }
 androidx-media3-session = { group = "androidx.media3", name = "media3-session", version.ref = "androidx-media3" }
+androidx-media3-test-utils = { group = "androidx.media3", name = "media3-test-utils", version.ref = "androidx-media3" }
+androidx-media3-test-utils-robolectric = { group = "androidx.media3", name = "media3-test-utils-robolectric", version.ref = "androidx-media3" }
 androidx-media = { group = "androidx.media", name = "media", version.ref = "androidx-media" }
 okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
 okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" }

diff --git a/...siness/src/main/java/ch/srgssr/pillarbox/core/business/MediaCompositionMediaItemSource.kt b/...siness/src/main/java/ch/srgssr/pillarbox/core/business/MediaCompositionMediaItemSource.kt
@@ -109,15 +109,17 @@ class MediaCompositionMediaItemSource(
         if (resource.tokenType == Resource.TokenType.AKAMAI) {
             uri = appendTokenQueryToUri(uri)
         }
-        val trackerData = mediaItem.getMediaItemTrackerData()
-        trackerDataProvider?.update(trackerData, resource, chapter, result)
-        trackerData.putData(SRGEventLoggerTracker::class.java, null)
-        getComScoreData(result, chapter, resource)?.let {
-            trackerData.putData(ComScoreTracker::class.java, it)
-        }
-        getCommandersActData(result, chapter, resource)?.let {
-            trackerData.putData(CommandersActTracker::class.java, it)
-        }
+        val trackerData = mediaItem.getMediaItemTrackerData().buildUpon().apply {
+            trackerDataProvider?.update(this, resource, chapter, result)
+            putData(SRGEventLoggerTracker::class.java, null)
+            getComScoreData(result, chapter, resource)?.let {
+                putData(ComScoreTracker::class.java, it)
+            }
+            getCommandersActData(result, chapter, resource)?.let {
+                putData(CommandersActTracker::class.java, it)
+            }
+        }.build()
+
         return mediaItem.buildUpon()
             .setMediaMetadata(fillMetaData(mediaItem.mediaMetadata, chapter))
             .setDrmConfiguration(fillDrmConfiguration(resource))

diff --git a/...rbox-core-business/src/main/java/ch/srgssr/pillarbox/core/business/TrackerDataProvider.kt b/...rbox-core-business/src/main/java/ch/srgssr/pillarbox/core/business/TrackerDataProvider.kt
@@ -16,13 +16,13 @@ interface TrackerDataProvider {
     /**
      * Update tracker data with given integration layer data.
      *
-     * @param trackerData The [MediaItemTrackerData] to update.
+     * @param trackerData The [MediaItemTrackerData.Builder] to update.
      * @param resource The selected [Resource].
      * @param chapter The selected [Chapter].
      * @param mediaComposition The loaded [MediaComposition].
      */
     fun update(
-        trackerData: MediaItemTrackerData,
+        trackerData: MediaItemTrackerData.Builder,
         resource: Resource,
         chapter: Chapter,
         mediaComposition: MediaComposition