filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix fetch playlist task getting stopped event from other voice broadcast

This commit is contained in:
Florian Renaud 2022-11-10 16:34:43 +01:00
parent 2d006f8725
commit a3cd0ee790
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastExtensions.kt
View File

@ -39,6 +39,9 @@ val MessageAudioEvent.sequence: Int? get() = getVoiceBroadcastChunk()?.sequence
val MessageAudioEvent.duration get() = content.audioInfo?.duration ?: content.audioWaveformInfo?.duration ?: 0 val MessageAudioEvent.duration get() = content.audioInfo?.duration ?: content.audioWaveformInfo?.duration ?: 0
val VoiceBroadcastEvent.voiceBroadcastId
get() = reference?.eventId
val VoiceBroadcastEvent.isLive val VoiceBroadcastEvent.isLive
get() = content?.isLive.orFalse() get() = content?.isLive.orFalse()

14
vector/src/main/java/im/vector/app/features/voicebroadcast/listening/usecase/GetLiveVoiceBroadcastChunksUseCase.kt
View File

@ -25,6 +25,7 @@ import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
import im.vector.app.features.voicebroadcast.sequence import im.vector.app.features.voicebroadcast.sequence
import im.vector.app.features.voicebroadcast.usecase.GetVoiceBroadcastEventUseCase import im.vector.app.features.voicebroadcast.usecase.GetVoiceBroadcastEventUseCase
import im.vector.app.features.voicebroadcast.voiceBroadcastId
import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.callbackFlow
@ -73,14 +74,15 @@ class GetLiveVoiceBroadcastChunksUseCase @Inject constructor(
// Observe new timeline events // Observe new timeline events
val listener = object : Timeline.Listener { val listener = object : Timeline.Listener {
private var lastEventId: String? = null private var latestEventId: String? = null
private var lastSequence: Int? = null private var lastSequence: Int? = null
override fun onTimelineUpdated(snapshot: List<TimelineEvent>) { override fun onTimelineUpdated(snapshot: List<TimelineEvent>) {
val newEvents = lastEventId?.let { eventId -> snapshot.subList(0, snapshot.indexOfFirst { it.eventId == eventId }) } ?: snapshot val latestEventIndex = latestEventId?.let { eventId -> snapshot.indexOfFirst { it.eventId == eventId } }
val newEvents = if (latestEventIndex != null) snapshot.subList(0, latestEventIndex) else snapshot
// Detect a potential stopped voice broadcast state event // Detect a potential stopped voice broadcast state event
val stopEvent = newEvents.findStopEvent() val stopEvent = newEvents.findStopEvent(voiceBroadcast)
if (stopEvent != null) { if (stopEvent != null) {
lastSequence = stopEvent.content?.lastChunkSequence lastSequence = stopEvent.content?.lastChunkSequence
} }
@ -98,7 +100,7 @@ class GetLiveVoiceBroadcastChunksUseCase @Inject constructor(
timeline.dispose() timeline.dispose()
} }
lastEventId = snapshot.firstOrNull()?.eventId latestEventId = snapshot.firstOrNull()?.eventId
} }
} }
@ -117,8 +119,8 @@ class GetLiveVoiceBroadcastChunksUseCase @Inject constructor(
/** /**
* Find a [VoiceBroadcastEvent] with a [VoiceBroadcastState.STOPPED] state. * Find a [VoiceBroadcastEvent] with a [VoiceBroadcastState.STOPPED] state.
*/ */
private fun List<TimelineEvent>.findStopEvent(): VoiceBroadcastEvent? = private fun List<TimelineEvent>.findStopEvent(voiceBroadcast: VoiceBroadcast): VoiceBroadcastEvent? =
this.mapNotNull { it.root.asVoiceBroadcastEvent() } this.mapNotNull { timelineEvent -> timelineEvent.root.asVoiceBroadcastEvent()?.takeIf { it.voiceBroadcastId == voiceBroadcast.voiceBroadcastId } }
.find { it.content?.voiceBroadcastState == VoiceBroadcastState.STOPPED } .find { it.content?.voiceBroadcastState == VoiceBroadcastState.STOPPED }
/** /**