Skip to content

[stable15] Fix removal of stale peers when a screen is shared #1746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 3 commits into from
Apr 29, 2019
Merged

[stable15] Fix removal of stale peers when a screen is shared #1746

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b77cd9b
Fix removal of stale peers when a screen is shared
danxuliu Feb 20, 2019
5041b96
Fix screen icon not shown for peer after reconnecting
danxuliu Feb 20, 2019
ab59755
Reset delayed video peer creation only with video offers
danxuliu Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions js/webrtc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,19 @@ var spreedPeerConnectionTable = [];

var peers = OCA.SpreedMe.webrtc.webrtc.peers;
var stalePeer = peers.find(function(peer) {
return peer.id === message.from && peer.sid !== message.sid;
return peer.id === message.from && peer.type === message.roomType && peer.sid !== message.sid;
});

if (stalePeer) {
usersChanged(signaling, [], [stalePeer.id]);
stalePeer.end();

if (message.roomType === 'video') {
OCA.SpreedMe.speakers.remove(stalePeer.id, true);
OCA.SpreedMe.videos.remove(stalePeer.id);
}
}

if (delayedCreatePeer[message.from]) {
if (message.roomType === 'video' && delayedCreatePeer[message.from]) {
clearTimeout(delayedCreatePeer[message.from]);
delete delayedCreatePeer[message.from];
}
Expand Down Expand Up @@ -437,7 +442,8 @@ var spreedPeerConnectionTable = [];
};

var screenSharingIndicator = document.createElement('button');
screenSharingIndicator.className = 'screensharingIndicator force-icon-white-in-call icon-shadow icon-screen screen-off';
var screenOnOffClass = spreedListofSharedScreens[id]? 'screen-on': 'screen-off';
screenSharingIndicator.className = 'screensharingIndicator force-icon-white-in-call icon-shadow icon-screen ' + screenOnOffClass;
screenSharingIndicator.setAttribute('data-original-title', t('spreed', 'Show screen'));

var iceFailedIndicator = document.createElement('button');
Expand Down