Use participant name from model in ScreenViewuse-model-in-screen-view

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

2 files changed, 6 insertions, 27 deletions

diff --git a/js/views/screenview.js b/js/views/screenview.js
index 9fab59a0d..4e5f58848 100644
--- a/js/views/screenview.js
+++ b/js/views/screenview.js
@@ -57,25 +57,26 @@
 
 			this.listenTo(this._localMediaModel, 'change:localScreen', this._setScreen);
 			this.listenTo(this._callParticipantModel, 'change:screen', this._setScreen);
+			this.listenTo(this._callParticipantModel, 'change:name', this._setParticipantName);
 
 			this.render();
-
-			if (this._localMediaModel) {
-				this.getUI('nameIndicator').text(t('spreed', 'Your screen'));
-			}
 		},
 
 		onRender: function() {
 			// Match current model state.
 			if (this._localMediaModel) {
 				this._setScreen(this._localMediaModel, this._localMediaModel.get('localScreen'));
+				this._setParticipantName(this._localMediaModel, null);
 			} else {
 				this._setScreen(this._callParticipantModel, this._callParticipantModel.get('screen'));
+				this._setParticipantName(this._callParticipantModel, this._callParticipantModel.get('name'));
 			}
 		},
 
-		setParticipantName: function(participantName) {
+		_setParticipantName: function(model, participantName) {
 			if (this._localMediaModel) {
+				this.getUI('nameIndicator').text(t('spreed', 'Your screen'));
+
 				return;
 			}
 
diff --git a/js/webrtc.js b/js/webrtc.js
index 8b15c4dda..0dee4f7dc 100644
--- a/js/webrtc.js
+++ b/js/webrtc.js
@@ -2,7 +2,6 @@
 /* global SimpleWebRTC, OC, OCA: false */
 
 var webrtc;
-var guestNamesTable = {};
 var spreedPeerConnectionTable = [];
 
 (function(OCA, OC) {
@@ -253,7 +252,6 @@ var spreedPeerConnectionTable = [];
 			OCA.SpreedMe.speakers.remove(sessionId, true);
 			OCA.SpreedMe.videos.remove(sessionId);
 			delete OCA.SpreedMe.callParticipantModels[sessionId];
-			delete guestNamesTable[sessionId];
 			if (delayedConnectionToPeer[sessionId]) {
 				clearInterval(delayedConnectionToPeer[sessionId]);
 				delete delayedConnectionToPeer[sessionId];
@@ -1215,11 +1213,6 @@ var spreedPeerConnectionTable = [];
 					callParticipantModel: peer? OCA.SpreedMe.callParticipantModels[peer.id]: null,
 				});
 
-				if (peer) {
-					var participantName = peer.nick || guestNamesTable[peer.id];
-					screenView.setParticipantName(participantName);
-				}
-
 				screenView.$el.prependTo($('#screens'));
 
 				if (peer) {
@@ -1275,21 +1268,6 @@ var spreedPeerConnectionTable = [];
 				});
 			}
 		});
-
-		// Peer changed nick
-		OCA.SpreedMe.webrtc.on('nick', function(data) {
-			//Screen
-			var screenView = OCA.SpreedMe.sharedScreens.screenViews[data.id];
-			if (screenView) {
-				screenView.setParticipantName(data.name);
-			}
-
-			if (!data.userid && data.name) {
-				// Use null to differentiate between empty (null) and not known
-				// yet (undefined).
-				guestNamesTable[data.id] = data.name || null;
-			}
-		});
 	}
 
 	OCA.SpreedMe.initWebRTC = initWebRTC;