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

Merge pull request #8070 from vector-im/yostyle/fix_vb_block_recording

This commit is contained in:
Yoan Pintas 2023-02-03 16:27:53 +00:00 committed by GitHub
parent d04afb898f c139eb55c3
commit 3e17c1c4e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.d/8062.bugfix Normal file
View File

@ -0,0 +1,2 @@
[Voice Broadcast] We should not be able to start broadcasting if there is already a live broadcast in the Room

5
vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastStateEventUseCase.kt
View File

@ -49,14 +49,15 @@ class GetVoiceBroadcastStateEventUseCase @Inject constructor(
* Get the most recent event related to the given voice broadcast. * Get the most recent event related to the given voice broadcast.
*/ */
private fun getMostRecentRelatedEvent(room: Room, voiceBroadcast: VoiceBroadcast): VoiceBroadcastEvent? { private fun getMostRecentRelatedEvent(room: Room, voiceBroadcast: VoiceBroadcast): VoiceBroadcastEvent? {
val startedEvent = room.getTimelineEvent(voiceBroadcast.voiceBroadcastId) val startedEvent = room.getTimelineEvent(voiceBroadcast.voiceBroadcastId)?.root
return if (startedEvent?.root?.isRedacted().orTrue()) { return if (startedEvent?.isRedacted().orTrue()) {
null null
} else { } else {
room.timelineService().getTimelineEventsRelatedTo(RelationType.REFERENCE, voiceBroadcast.voiceBroadcastId) room.timelineService().getTimelineEventsRelatedTo(RelationType.REFERENCE, voiceBroadcast.voiceBroadcastId)
.mapNotNull { timelineEvent -> timelineEvent.root.asVoiceBroadcastEvent() } .mapNotNull { timelineEvent -> timelineEvent.root.asVoiceBroadcastEvent() }
.filterNot { it.root.isRedacted() } .filterNot { it.root.isRedacted() }
.maxByOrNull { it.root.originServerTs ?: 0 } .maxByOrNull { it.root.originServerTs ?: 0 }
?: startedEvent?.asVoiceBroadcastEvent()
} }
} }
} }