From 74f69b228f9885972a3108c8f91237953d3fad73 Mon Sep 17 00:00:00 2001 From: yostyle Date: Sat, 17 Dec 2022 21:00:01 +0100 Subject: [PATCH] Prompt the user before ending a voice broadcast --- .../ui-strings/src/main/res/values/strings.xml | 3 +++ .../features/home/room/detail/RoomDetailAction.kt | 1 + .../home/room/detail/RoomDetailViewEvents.kt | 2 ++ .../features/home/room/detail/TimelineFragment.kt | 15 +++++++++++++++ .../home/room/detail/TimelineViewModel.kt | 3 ++- 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml index d37b5f0906..b57bb88df2 100644 --- a/library/ui-strings/src/main/res/values/strings.xml +++ b/library/ui-strings/src/main/res/values/strings.xml @@ -419,6 +419,7 @@ Got it Select all Deselect all + Yes, Stop Copied to clipboard @@ -3120,6 +3121,8 @@ You are already recording a voice broadcast. Please end your current voice broadcast to start a new one. %1$s left + Stop live broadcasting? + Are you sure you want to stop your live broadcast? This will end the broadcast and the full recording will be available in the room. Anyone in %s will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime. Anyone in a parent space will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime. diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt index faee8f652c..9fe296e1f9 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt @@ -127,6 +127,7 @@ sealed class RoomDetailAction : VectorViewModelAction { object Pause : Recording() object Resume : Recording() object Stop : Recording() + object StopConfirmed : Recording() } sealed class Listening : VoiceBroadcastAction() { diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt index 399d5e0abe..77dd826cfe 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt @@ -71,6 +71,8 @@ sealed class RoomDetailViewEvents : VectorViewEvents { object DisplayEnableIntegrationsWarning : RoomDetailViewEvents() + object DisplayPromptToStopVoiceBroadcast : RoomDetailViewEvents() + data class OpenStickerPicker(val widget: Widget) : RoomDetailViewEvents() object OpenIntegrationManager : RoomDetailViewEvents() diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index 6ab20275c2..980e8ebac5 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -413,6 +413,7 @@ class TimelineFragment : is RoomDetailViewEvents.DisplayAndAcceptCall -> acceptIncomingCall(it) RoomDetailViewEvents.RoomReplacementStarted -> handleRoomReplacement() RoomDetailViewEvents.OpenElementCallWidget -> handleOpenElementCallWidget() + RoomDetailViewEvents.DisplayPromptToStopVoiceBroadcast -> displayPromptToStopVoiceBroadcast() } } @@ -2006,6 +2007,20 @@ class TimelineFragment : } } + private fun displayPromptToStopVoiceBroadcast() { + ConfirmationDialogBuilder + .show( + activity = requireActivity(), + askForReason = false, + confirmationRes = R.string.stop_voice_broadcast_content, + positiveRes = R.string.action_stop, + reasonHintRes = 0, + titleRes = R.string.stop_voice_broadcast_dialog_title + ) { + timelineViewModel.handle(RoomDetailAction.VoiceBroadcastAction.Recording.StopConfirmed) + } + } + override fun onTapToReturnToCall() { callManager.getCurrentCall()?.let { call -> VectorCallActivity.newIntent( diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt index 02782783b8..ff24872ab8 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt @@ -633,7 +633,8 @@ class TimelineViewModel @AssistedInject constructor( } VoiceBroadcastAction.Recording.Pause -> voiceBroadcastHelper.pauseVoiceBroadcast(room.roomId) VoiceBroadcastAction.Recording.Resume -> voiceBroadcastHelper.resumeVoiceBroadcast(room.roomId) - VoiceBroadcastAction.Recording.Stop -> voiceBroadcastHelper.stopVoiceBroadcast(room.roomId) + VoiceBroadcastAction.Recording.Stop -> _viewEvents.post(RoomDetailViewEvents.DisplayPromptToStopVoiceBroadcast) + VoiceBroadcastAction.Recording.StopConfirmed -> voiceBroadcastHelper.stopVoiceBroadcast(room.roomId) is VoiceBroadcastAction.Listening.PlayOrResume -> voiceBroadcastHelper.playOrResumePlayback(action.voiceBroadcast) VoiceBroadcastAction.Listening.Pause -> voiceBroadcastHelper.pausePlayback() VoiceBroadcastAction.Listening.Stop -> voiceBroadcastHelper.stopPlayback()