StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Fix raw live variants in ordered lists
David Nashasheaaecb37355f
diff --git a/app/src/main/java/com/streamvault/app/ui/model/ChannelVariantUiHelpers.kt b/app/src/main/java/com/streamvault/app/ui/model/ChannelVariantUiHelpers.ktindex 043a7867..788020c0 100644--- a/app/src/main/java/com/streamvault/app/ui/model/ChannelVariantUiHelpers.kt+++ b/app/src/main/java/com/streamvault/app/ui/model/ChannelVariantUiHelpers.kt@@ -18,10 +18,18 @@ fun List<Channel>.orderedByRequestedRawIds(filter { it.providerId == providerId }} ?: thisval byRawId = filtered.associateByAnyRawId()- val seenKeys = linkedSetOf<String>()- return requestedIds.mapNotNull { rawId ->+ val orderedChannels = requestedIds.mapNotNull { rawId ->byRawId[rawId]- }.filter { channel ->+ }+ val shouldCollapseGroupedDuplicates = orderedChannels.any { channel ->+ channel.allVariantRawIds().size > 1+ }+ if (!shouldCollapseGroupedDuplicates) {+ return orderedChannels+ }++ val seenKeys = linkedSetOf<String>()+ return orderedChannels.filter { channel ->seenKeys.add(channel.logicalGroupId.ifBlank { channel.id.toString() })}}diff --git a/app/src/test/java/com/streamvault/app/ui/model/ChannelVariantUiHelpersTest.kt b/app/src/test/java/com/streamvault/app/ui/model/ChannelVariantUiHelpersTest.ktnew file mode 100644index 00000000..2e0e9d22--- /dev/null+++ b/app/src/test/java/com/streamvault/app/ui/model/ChannelVariantUiHelpersTest.kt@@ -0,0 +1,70 @@+package com.streamvault.app.ui.model++import com.google.common.truth.Truth.assertThat+import com.streamvault.domain.model.Channel+import com.streamvault.domain.model.LiveChannelVariant+import org.junit.Test++class ChannelVariantUiHelpersTest {++ @Test+ fun `orderedByRequestedRawIds preserves raw variants from same logical group`() {+ val sd = rawChannel(id = 101L, name = "Channel X SD", logicalGroupId = "provider_channel_x")+ val hd = rawChannel(id = 102L, name = "Channel X HD", logicalGroupId = "provider_channel_x")++ val ordered = listOf(sd, hd).orderedByRequestedRawIds(listOf(101L, 102L))++ assertThat(ordered.map(Channel::id)).containsExactly(101L, 102L).inOrder()+ }++ @Test+ fun `orderedByRequestedRawIds keeps grouped channels collapsed`() {+ val grouped = Channel(+ id = 101L,+ name = "Channel X",+ providerId = 7L,+ logicalGroupId = "provider_channel_x",+ selectedVariantId = 101L,+ variants = listOf(+ LiveChannelVariant(+ rawChannelId = 101L,+ logicalGroupId = "provider_channel_x",+ providerId = 7L,+ originalName = "Channel X SD",+ canonicalName = "Channel X",+ streamUrl = "https://example.com/sd"+ ),+ LiveChannelVariant(+ rawChannelId = 102L,+ logicalGroupId = "provider_channel_x",+ providerId = 7L,+ originalName = "Channel X HD",+ canonicalName = "Channel X",+ streamUrl = "https://example.com/hd"+ )+ )+ )++ val ordered = listOf(grouped).orderedByRequestedRawIds(listOf(101L, 102L))++ assertThat(ordered.map(Channel::id)).containsExactly(101L)+ }++ private fun rawChannel(id: Long, name: String, logicalGroupId: String): Channel = Channel(+ id = id,+ name = name,+ providerId = 7L,+ logicalGroupId = logicalGroupId,+ selectedVariantId = id,+ variants = listOf(+ LiveChannelVariant(+ rawChannelId = id,+ logicalGroupId = logicalGroupId,+ providerId = 7L,+ originalName = name,+ canonicalName = "Channel X",+ streamUrl = "https://example.com/$id"+ )+ )+ )+}\ No newline at end of filediff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.mdindex 6100a9ff..003bf9ea 100644--- a/docs/CHANGELOG.md+++ b/docs/CHANGELOG.md@@ -12,6 +12,7 @@ All notable product changes are recorded in this document.- Fixed Stalker profile metrics so `uid` uses Device ID2, and removed `video_out` and `signature` from the generated metrics payload.- Fixed Stalker profile requests to send `prehash=false` literally instead of numeric `0`/`1` values.- Fixed the default Stalker `get_profile` version string to use the legacy MAG 250 `5.6.10` profile value expected by stricter portals.+- Fixed Live TV favorites, recents, and custom-group ordered lists still collapsing SD/HD/FHD channel variants after grouped variants were disabled.### Added