Merge pull request #14023 from nextcloud/fix/noid/muted-warner-toast

fix(SpeakingWhileMutedWarner): show toast message

src/components/CallView/shared/LocalAudioControlButton.vue

@@ -85,10 +85,6 @@ export default {
 				return t('spreed', 'No audio. Click to select device')
 			}
 
-			if (this.speakingWhileMutedNotification && !this.screenSharingMenuOpen) {
-				return this.speakingWhileMutedNotification
-			}
-
 			if (this.model.attributes.audioEnabled) {
 				return this.disableKeyboardShortcuts
 					? t('spreed', 'Mute audio')

src/components/TopBar/TopBarMediaControls.vue

@@ -180,7 +180,6 @@ export default {
 
 	data() {
 		return {
-			speakingWhileMutedNotification: null,
 			screenSharingMenuOpen: false,
 			boundaryElement: document.querySelector('.main-view'),
 			mouseover: false,
@@ -398,7 +397,7 @@ export default {
 	},
 
 	mounted() {
-		this.speakingWhileMutedWarner = new SpeakingWhileMutedWarner(this.model, this)
+		this.speakingWhileMutedWarner = new SpeakingWhileMutedWarner(this.model)
 	},
 
 	beforeDestroy() {
@@ -408,10 +407,6 @@ export default {
 	methods: {
 		t,
 
-		setSpeakingWhileMutedNotification(message) {
-			this.speakingWhileMutedNotification = message
-		},
-
 		toggleVirtualBackground() {
 			if (this.model.attributes.virtualBackgroundEnabled) {
 				this.model.disableVirtualBackground()

src/utils/webrtc/SpeakingWhileMutedWarner.js

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { showWarning, TOAST_PERMANENT_TIMEOUT } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 
 /**
@@ -28,12 +29,11 @@ import { t } from '@nextcloud/l10n'
 	*
 	* @param {object} LocalMediaModel the model that emits "speakingWhileMuted"
 	* events.
-	* @param {object} view the view that provides the
 	* "setSpeakingWhileMutedNotification" method.
 	*/
-export default function SpeakingWhileMutedWarner(LocalMediaModel, view) {
+export default function SpeakingWhileMutedWarner(LocalMediaModel) {
 	this._model = LocalMediaModel
-	this._view = view
+	this._toast = null
 
 	this._handleSpeakingWhileMutedChangeBound = this._handleSpeakingWhileMutedChange.bind(this)
 
@@ -89,12 +89,19 @@ SpeakingWhileMutedWarner.prototype = {
 	},
 
 	_showNotification(message) {
-		if (this._notification) {
+		if (this._toast) {
 			return
 		}
 
-		this._view.setSpeakingWhileMutedNotification(message)
-		this._notification = true
+		this._toast = showWarning(message, {
+			timeout: TOAST_PERMANENT_TIMEOUT,
+			onClick: () => {
+				this._toast.hideToast()
+			},
+			onRemove: () => {
+				this._toast = null
+			}
+		})
 	},
 
 	_showBrowserNotification(message) {
@@ -143,10 +150,8 @@ SpeakingWhileMutedWarner.prototype = {
 	_hideWarning() {
 		this._pendingBrowserNotification = false
 
-		if (this._notification) {
-			this._view.setSpeakingWhileMutedNotification(null)
-
-			this._notification = false
+		if (this._toast) {
+			this._toast.hideToast()
 		}
 
 		if (this._browserNotification) {