diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2021-03-09 11:15:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 11:15:52 +0300 |
| commit | 2a2a43a2065d7b0fd8da9d53ac1ee4d06dbbba6c (patch) | |
| tree | 5d137e68c1fc5f72bd9215dd3f01732c45a626ca /src/utils/signaling.js | |
| parent | ab141f7df5127ebef56c72dfbe8f512bd14abb8f (diff) | |
| parent | 1e9c21e0c96118b0f2b4017e4c082868cf4058be (diff) | |
Merge pull request #5194 from nextcloud/techdebt/noid/multi-session
👥 Multiple sessions 👥
Diffstat (limited to 'src/utils/signaling.js')
| -rw-r--r-- | src/utils/signaling.js | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/utils/signaling.js b/src/utils/signaling.js index 14d4e7222..a305bff32 100644 --- a/src/utils/signaling.js +++ b/src/utils/signaling.js @@ -242,7 +242,7 @@ Signaling.Base.prototype._joinCallSuccess = function(/* token */) { Signaling.Base.prototype.joinCall = function(token, flags) { return new Promise((resolve, reject) => { - axios.post(generateOcsUrl('apps/spreed/api/v1/call', 2) + token, { + axios.post(generateOcsUrl('apps/spreed/api/v4/call', 2) + token, { flags: flags, }) .then(function() { @@ -273,7 +273,7 @@ Signaling.Base.prototype.leaveCall = function(token, keepToken) { return } - axios.delete(generateOcsUrl('apps/spreed/api/v1/call', 2) + token) + axios.delete(generateOcsUrl('apps/spreed/api/v4/call', 2) + token) .then(function() { this._trigger('leaveCall', [token, keepToken]) this._leaveCallSuccess(token) @@ -1094,10 +1094,7 @@ Signaling.Standalone.prototype.processRoomEvent = function(data) { delete leftUsers[joinedUsers[i].sessionid] if (this.settings.userId && joinedUsers[i].userid === this.settings.userId) { - if (this.ownSessionJoined && joinedUsers[i].sessionid !== this.sessionId) { - console.error('Duplicated session detected for the same user.') - EventBus.$emit('duplicateSessionDetected') - } else if (joinedUsers[i].sessionid === this.sessionId) { + if (joinedUsers[i].sessionid === this.sessionId) { // We are ignoring joins before we found our own message, // as otherwise you get the warning for your own old session immediately this.ownSessionJoined = true |