quality model

Author: crackededed

app/src/main/java/com/github/andreyasadchy/xtra/model/VideoQuality.kt

@@ -0,0 +1,7 @@
+package com.github.andreyasadchy.xtra.model
+
+class VideoQuality(
+    val name: String? = null,
+    val codecs: String? = null,
+    val url: String? = null,
+)

app/src/main/java/com/github/andreyasadchy/xtra/repository/PlayerRepository.kt

@@ -17,6 +17,7 @@ import com.github.andreyasadchy.xtra.graphql.StreamPlaybackAccessTokenQuery
 import com.github.andreyasadchy.xtra.graphql.type.BadgeImageSize
 import com.github.andreyasadchy.xtra.graphql.type.EmoteType
 import com.github.andreyasadchy.xtra.model.VideoPosition
+import com.github.andreyasadchy.xtra.model.VideoQuality
 import com.github.andreyasadchy.xtra.model.chat.CheerEmote
 import com.github.andreyasadchy.xtra.model.chat.Emote
 import com.github.andreyasadchy.xtra.model.chat.RecentEmote
@@ -351,7 +352,7 @@ class PlayerRepository @Inject constructor(
         }
     }
 
-    suspend fun loadClipUrls(networkLibrary: String?, gqlHeaders: Map<String, String>, clipId: String?, enableIntegrity: Boolean): Map<Pair<String, String?>, String>? = withContext(Dispatchers.IO) {
+    suspend fun loadClipQualities(networkLibrary: String?, gqlHeaders: Map<String, String>, clipId: String?, enableIntegrity: Boolean): List<VideoQuality>? = withContext(Dispatchers.IO) {
         try {
             val response = graphQLRepository.loadClipUrls(networkLibrary, gqlHeaders, clipId)
             if (enableIntegrity) {
@@ -375,9 +376,9 @@ class PlayerRepository @Inject constructor(
                             appendQueryParameter("sig", accessToken?.signature)
                             appendQueryParameter("token", accessToken?.value)
                         }.build().toString()
-                        Pair(name, quality.codecs) to url
+                        VideoQuality(name, quality.codecs, url)
                     } else null
-                }?.toMap()
+                }
             }
         } catch (e: Exception) {
             if (e.message == "failed integrity check") throw e
@@ -403,9 +404,9 @@ class PlayerRepository @Inject constructor(
                             appendQueryParameter("sig", accessToken?.signature)
                             appendQueryParameter("token", accessToken?.value)
                         }.build().toString()
-                        Pair(name, quality.codecs) to url
+                        VideoQuality(name, quality.codecs, url)
                     } else null
-                }?.toMap()
+                }
             }
         }
     }

app/src/main/java/com/github/andreyasadchy/xtra/ui/common/RadioButtonDialogFragment.kt

@@ -23,7 +23,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 class RadioButtonDialogFragment : BottomSheetDialogFragment() {
 
     interface OnSortOptionChanged {
-        fun onChange(requestCode: Int, index: Int, text: CharSequence, tag: Int?)
+        fun onChange(requestCode: Int, index: Int, text: CharSequence, tag: String?)
     }
 
     companion object {
@@ -33,7 +33,7 @@ class RadioButtonDialogFragment : BottomSheetDialogFragment() {
         private const val TAGS = "tags"
         private const val CHECKED = "checked"
 
-        fun newInstance(requestCode: Int, labels: Collection<CharSequence>, tags: IntArray? = null, checkedIndex: Int): RadioButtonDialogFragment {
+        fun newInstance(requestCode: Int, labels: Collection<CharSequence>, tags: Array<String>? = null, checkedIndex: Int): RadioButtonDialogFragment {
             return RadioButtonDialogFragment().apply {
                 arguments = bundleOf(REQUEST_CODE to requestCode, LABELS to ArrayList(labels), TAGS to tags, CHECKED to checkedIndex)
             }
@@ -61,11 +61,11 @@ class RadioButtonDialogFragment : BottomSheetDialogFragment() {
         val clickListener = View.OnClickListener { v ->
             val clickedId = v.id
             if (clickedId != checkedId) {
-                listenerSort.onChange(arguments.getInt(REQUEST_CODE), clickedId, (v as RadioButton).text, v.tag as Int?)
+                listenerSort.onChange(arguments.getInt(REQUEST_CODE), clickedId, (v as RadioButton).text, v.tag as String?)
             }
             dismiss()
         }
-        val tags = arguments.getIntArray(TAGS)
+        val tags = arguments.getStringArray(TAGS)
         arguments.getCharSequenceArrayList(LABELS)?.forEachIndexed { index, label ->
             val button = AppCompatRadioButton(context).apply {
                 id = index

app/src/main/java/com/github/andreyasadchy/xtra/ui/download/DownloadDialog.kt

@@ -39,6 +39,7 @@ import androidx.media3.session.MediaSessionService
 import androidx.media3.session.SessionCommand
 import androidx.media3.session.SessionResult
 import com.github.andreyasadchy.xtra.model.VideoPosition
+import com.github.andreyasadchy.xtra.model.VideoQuality
 import com.github.andreyasadchy.xtra.player.lowlatency.CronetDataSource
 import com.github.andreyasadchy.xtra.player.lowlatency.HlsPlaylistParser
 import com.github.andreyasadchy.xtra.player.lowlatency.HttpEngineDataSource
@@ -528,7 +529,7 @@ class PlaybackService : MediaSessionService() {
                                                 endTime != null && (it.id.startsWith("stitched-ad-") ||
                                                         it.clientDefinedAttributes.find { it.name == "CLASS" }?.textValue == "twitch-stitched-ad" ||
                                                         it.clientDefinedAttributes.find { it.name.startsWith("X-TV-TWITCH-AD-") } != null)
-                                                        && (startTime <= segmentStartTime && segmentStartTime < endTime)
+                                                        && segmentStartTime in startTime..endTime
                                             } != null
                                 }
                                 Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS, bundleOf(
@@ -537,23 +538,17 @@ class PlaybackService : MediaSessionService() {
                             }
                             GET_QUALITIES -> {
                                 val playlist = (session.player.currentManifest as? HlsManifest)?.multivariantPlaylist
-                                val names = playlist?.variants?.mapNotNull { it.format.label }?.toTypedArray()
-                                if (!names.isNullOrEmpty()) {
-                                    Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS, bundleOf(
-                                        NAMES to names,
-                                        CODECS to playlist.variants.map { it.format.codecs }.toTypedArray(),
-                                        URLS to playlist.variants.map { it.url.toString() }.toTypedArray(),
-                                    )))
-                                } else {
-                                    val variants = playlist?.variants?.mapNotNull { variant ->
-                                        playlist.videos.find { it.groupId == variant.videoGroupId }?.name?.let { variant to it }
-                                    }
-                                    Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS, bundleOf(
-                                        NAMES to variants?.map { it.second }?.toTypedArray(),
-                                        CODECS to variants?.map { it.first.format.codecs }?.toTypedArray(),
-                                        URLS to variants?.map { it.first.url.toString() }?.toTypedArray(),
-                                    )))
+                                val list = playlist?.variants?.mapIndexedNotNull { index, variant ->
+                                    val name = variant.format.label?.takeIf { it.isNotBlank() }
+                                        ?: playlist.videos.find { it.groupId == variant.videoGroupId }?.name?.takeIf { it.isNotBlank() }
+                                        ?: index.toString()
+                                    VideoQuality(name, variant.format.codecs, variant.url.toString())
                                 }
+                                Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS, bundleOf(
+                                    NAMES to list?.map { it.name.toString() }?.toTypedArray(),
+                                    CODECS to list?.map { it.codecs.toString() }?.toTypedArray(),
+                                    URLS to list?.map { it.url.toString() }?.toTypedArray(),
+                                )))
                             }
                             GET_DURATION -> {
                                 Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS, bundleOf(