Remove getOngoingVoiceBroadcasts from VoiceBroadcastHelper
This commit is contained in:
parent
5855fe1242
commit
443d573205
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
package im.vector.app.features.voicebroadcast
|
package im.vector.app.features.voicebroadcast
|
||||||
|
|
||||||
import im.vector.app.features.voicebroadcast.usecase.GetOngoingVoiceBroadcastsUseCase
|
|
||||||
import im.vector.app.features.voicebroadcast.usecase.PauseVoiceBroadcastUseCase
|
import im.vector.app.features.voicebroadcast.usecase.PauseVoiceBroadcastUseCase
|
||||||
import im.vector.app.features.voicebroadcast.usecase.ResumeVoiceBroadcastUseCase
|
import im.vector.app.features.voicebroadcast.usecase.ResumeVoiceBroadcastUseCase
|
||||||
import im.vector.app.features.voicebroadcast.usecase.StartVoiceBroadcastUseCase
|
import im.vector.app.features.voicebroadcast.usecase.StartVoiceBroadcastUseCase
|
||||||
|
@ -31,7 +30,6 @@ class VoiceBroadcastHelper @Inject constructor(
|
||||||
private val pauseVoiceBroadcastUseCase: PauseVoiceBroadcastUseCase,
|
private val pauseVoiceBroadcastUseCase: PauseVoiceBroadcastUseCase,
|
||||||
private val resumeVoiceBroadcastUseCase: ResumeVoiceBroadcastUseCase,
|
private val resumeVoiceBroadcastUseCase: ResumeVoiceBroadcastUseCase,
|
||||||
private val stopVoiceBroadcastUseCase: StopVoiceBroadcastUseCase,
|
private val stopVoiceBroadcastUseCase: StopVoiceBroadcastUseCase,
|
||||||
private val getOngoingVoiceBroadcastsUseCase: GetOngoingVoiceBroadcastsUseCase,
|
|
||||||
private val voiceBroadcastPlayer: VoiceBroadcastPlayer,
|
private val voiceBroadcastPlayer: VoiceBroadcastPlayer,
|
||||||
) {
|
) {
|
||||||
suspend fun startVoiceBroadcast(roomId: String) = startVoiceBroadcastUseCase.execute(roomId)
|
suspend fun startVoiceBroadcast(roomId: String) = startVoiceBroadcastUseCase.execute(roomId)
|
||||||
|
@ -47,6 +45,4 @@ class VoiceBroadcastHelper @Inject constructor(
|
||||||
fun pausePlayback() = voiceBroadcastPlayer.pause()
|
fun pausePlayback() = voiceBroadcastPlayer.pause()
|
||||||
|
|
||||||
fun stopPlayback() = voiceBroadcastPlayer.stop()
|
fun stopPlayback() = voiceBroadcastPlayer.stop()
|
||||||
|
|
||||||
fun getOngoingVoiceBroadcasts(roomId: String) = getOngoingVoiceBroadcastsUseCase.execute(roomId)
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,7 @@ import javax.inject.Inject
|
||||||
*/
|
*/
|
||||||
class StopOngoingVoiceBroadcastUseCase @Inject constructor(
|
class StopOngoingVoiceBroadcastUseCase @Inject constructor(
|
||||||
private val activeSessionHolder: ActiveSessionHolder,
|
private val activeSessionHolder: ActiveSessionHolder,
|
||||||
|
private val getOngoingVoiceBroadcastsUseCase: GetOngoingVoiceBroadcastsUseCase,
|
||||||
private val voiceBroadcastHelper: VoiceBroadcastHelper,
|
private val voiceBroadcastHelper: VoiceBroadcastHelper,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
@ -51,7 +52,7 @@ class StopOngoingVoiceBroadcastUseCase @Inject constructor(
|
||||||
|
|
||||||
recentRooms
|
recentRooms
|
||||||
.forEach { room ->
|
.forEach { room ->
|
||||||
val ongoingVoiceBroadcasts = voiceBroadcastHelper.getOngoingVoiceBroadcasts(room.roomId)
|
val ongoingVoiceBroadcasts = getOngoingVoiceBroadcastsUseCase.execute(room.roomId)
|
||||||
val myOngoingVoiceBroadcastId = ongoingVoiceBroadcasts.find { it.root.stateKey == session.myUserId }?.reference?.eventId
|
val myOngoingVoiceBroadcastId = ongoingVoiceBroadcasts.find { it.root.stateKey == session.myUserId }?.reference?.eventId
|
||||||
val initialEvent = myOngoingVoiceBroadcastId?.let { room.timelineService().getTimelineEvent(it)?.root?.asVoiceBroadcastEvent() }
|
val initialEvent = myOngoingVoiceBroadcastId?.let { room.timelineService().getTimelineEvent(it)?.root?.asVoiceBroadcastEvent() }
|
||||||
if (myOngoingVoiceBroadcastId != null && initialEvent?.content?.deviceId == session.sessionParams.deviceId) {
|
if (myOngoingVoiceBroadcastId != null && initialEvent?.content?.deviceId == session.sessionParams.deviceId) {
|
||||||
|
|
Loading…
Reference in New Issue