summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2023-01-30 17:48:11 +0100
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2023-01-31 05:00:56 +0100
commit0f0c0f5142ce2a44c1b1976893e95e703acb179d (patch)
treef9b73f990428dbe4ae90df9eae68a946dcff85ab
parent8479b8a18cd5f0b3782864e37956ec3bc0b5681f (diff)
Add "switchto" to the required signaling server features
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
-rw-r--r--lib/Signaling/Manager.php3
-rw-r--r--src/utils/signaling.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/Signaling/Manager.php b/lib/Signaling/Manager.php
index 87f472900..8fb6667a1 100644
--- a/lib/Signaling/Manager.php
+++ b/lib/Signaling/Manager.php
@@ -55,7 +55,8 @@ class Manager {
$features = array_map('trim', $features);
return in_array('audio-video-permissions', $features, true)
&& in_array('incall-all', $features, true)
- && in_array('hello-v2', $features, true);
+ && in_array('hello-v2', $features, true)
+ && in_array('switchto', $features, true);
}
public function getSignalingServerLinkForConversation(?Room $room): string {
diff --git a/src/utils/signaling.js b/src/utils/signaling.js
index ec6d40ba0..c45f5c988 100644
--- a/src/utils/signaling.js
+++ b/src/utils/signaling.js
@@ -1026,7 +1026,7 @@ Signaling.Standalone.prototype.helloResponseReceived = function(data) {
}
}
- if (!this.hasFeature('audio-video-permissions') || !this.hasFeature('incall-all')) {
+ if (!this.hasFeature('audio-video-permissions') || !this.hasFeature('incall-all') || !this.hasFeature('switchto')) {
showError(
t('spreed', 'The configured signaling server needs to be updated to be compatible with this version of Talk. Please contact your administrator.'),
{