Fix rebase issues

THEOplayer · Sep 4, 2024 · d3edb5c · d3edb5c
1 parent c93a202
commit d3edb5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...ynk/src/main/java/com/theoplayer/android/connector/uplynk/internal/UplynkAdIntegration.kt b/...ynk/src/main/java/com/theoplayer/android/connector/uplynk/internal/UplynkAdIntegration.kt
@@ -7,7 +7,6 @@ import com.theoplayer.android.api.event.player.PlayerEventTypes
 import com.theoplayer.android.api.player.Player
 import com.theoplayer.android.api.source.SourceDescription
 import com.theoplayer.android.api.source.drm.DRMConfiguration
-import com.theoplayer.android.api.source.drm.FairPlayKeySystemConfiguration
 import com.theoplayer.android.api.source.drm.KeySystemConfiguration
 import com.theoplayer.android.connector.uplynk.UplynkSsaiDescription
 import com.theoplayer.android.connector.uplynk.internal.network.UplynkApi
@@ -74,7 +73,7 @@ internal class UplynkAdIntegration(
 
         if (ssaiDescription.assetInfo) {
             uplynkDescriptionConverter
-                .buildAssetInfoUrls(ssaiDescription, minimalResponse.sid, internalResponse.prefix)
+                .buildAssetInfoUrls(ssaiDescription, minimalResponse.sid, minimalResponse.prefix)
                 .mapNotNull {
                     try {
                         uplynkApi.assetInfo(it)

diff --git a/.../java/com/theoplayer/android/connector/uplynk/internal/network/PreplayInternalResponse.kt b/.../java/com/theoplayer/android/connector/uplynk/internal/network/PreplayInternalResponse.kt
@@ -22,7 +22,7 @@ internal data class MinimalPreplayResponse(
     /**
      * The zone prefix for the viewer's session. (**NonNull**)
      */
-    val prefix: String)
+    val prefix: String,
 
     /*
     * The content protection information. (**Nullable**)