x/grayjay
1
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2026-05-16 04:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

2 crash fixes.

Browse Source
This commit is contained in:
Koen J
2025-12-01 14:41:35 +01:00
parent acb9500e2a
commit 74ddfe9f0e
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+1 -1
View File
@@ -558,9 +558,9 @@ class VideoDetailView : ConstraintLayout {
_loaderGameVisible = b
fragment.lifecycleScope.launch(Dispatchers.Main) {
onShouldEnterPictureInPictureChanged.emit()
}
updateResumeVisibilityFor(lastPositionMilliseconds)
}
}
_player.loaderGameVisibilityChanged.subscribe(handleLoaderGameVisibilityChanged)
_cast.loaderGameVisibilityChanged.subscribe(handleLoaderGameVisibilityChanged)
app/src/main/java/com/futo/platformplayer/states/StatePlayer.kt
+19 -7
View File
@@ -247,17 +247,29 @@ class StatePlayer {
}
private fun createShuffledQueue() {
val currentItem = getCurrentQueueItem();
if (_queuePosition == -1 || currentItem == null) {
_queueShuffled = _queue.shuffled().toMutableList()
return;
if (_queue.isEmpty()) {
_queueShuffled = mutableListOf()
return
}
val nextItems = _queue.subList(Math.min(_queuePosition + 1, _queue.size - 1), _queue.size).shuffled();
val previousItems = _queue.subList(0, _queuePosition).shuffled();
_queueShuffled = (previousItems + currentItem + nextItems).toMutableList();
val currentItem = getCurrentQueueItem()
if (currentItem == null || _queuePosition !in _queue.indices) {
_queueShuffled = _queue.shuffled().toMutableList()
return
}
val previousItems = _queue
.take(_queuePosition)
.shuffled()
val nextItems = _queue
.drop(_queuePosition + 1)
.shuffled()
_queueShuffled = (previousItems + currentItem + nextItems).toMutableList()
}
private fun addToShuffledQueue(video: IPlatformVideo) {
val isLastVideo = _queuePosition + 1 >= _queue.size;
if (isLastVideo) {