Merge pull request #182 from jitsi/kick-fix-2

Cleaning resources after leaving (kick)

JitsiConference.js

@@ -83,8 +83,6 @@ JitsiConference.prototype._init = function (options) {
     this.room = this.xmpp.createRoom(this.options.name, this.options.config,
         this.settings, (this.retries < 4 ? 3 : null));
 
-    this.eventManager.setupChatRoomListeners();
-
     //restore previous presence options
     if(options.roomState) {
         this.room.loadState(options.roomState);
@@ -96,7 +94,6 @@ JitsiConference.prototype._init = function (options) {
         this.eventManager.setupRTCListeners();
     }
 
-
     if(!this.statistics) {
         this.statistics = new Statistics(this.xmpp, {
             callStatsID: this.options.config.callStatsID,
@@ -106,6 +103,9 @@ JitsiConference.prototype._init = function (options) {
             roomName: this.options.name
         });
     }
+
+    this.eventManager.setupChatRoomListeners();
+
     // Always add listeners because on reload we are executing leave and the
     // listeners are removed from statistics module.
     this.eventManager.setupStatisticsListeners();
@@ -490,6 +490,30 @@ JitsiConference.prototype._fireMuteChangeEvent = function (track) {
     this.eventEmitter.emit(JitsiConferenceEvents.TRACK_MUTE_CHANGED, track);
 };
 
+/**
+ * Clear JitsiLocalTrack properties and listeners.
+ * @param track the JitsiLocalTrack object.
+ */
+JitsiConference.prototype.onTrackRemoved = function (track) {
+    track._setSSRC(null);
+    track._setConference(null);
+    this.rtc.removeLocalTrack(track);
+    track.removeEventListener(JitsiTrackEvents.TRACK_MUTE_CHANGED,
+        track.muteHandler);
+    track.removeEventListener(JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED,
+        track.audioLevelHandler);
+    this.room.removeListener(XMPPEvents.SENDRECV_STREAMS_CHANGED,
+        track.ssrcHandler);
+
+    // send event for stopping screen sharing
+    // FIXME: we assume we have only one screen sharing track
+    // if we change this we need to fix this check
+    if (track.isVideoTrack() && track.videoType === "desktop")
+        this.statistics.sendScreenSharingEvent(false);
+
+    this.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, track);
+}
+
 /**
  * Removes JitsiLocalTrack object to the conference.
  * @param track the JitsiLocalTrack object.
@@ -503,30 +527,13 @@ JitsiConference.prototype.removeTrack = function (track) {
 
     if(!this.room){
         if(this.rtc) {
-            this.rtc.removeLocalTrack(track);
-            this.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, track);
+            this.onTrackRemoved(track);
         }
         return Promise.resolve();
     }
     return new Promise(function (resolve, reject) {
         this.room.removeStream(track.getOriginalStream(), function(){
-            track._setSSRC(null);
-            track._setConference(null);
-            this.rtc.removeLocalTrack(track);
-            track.removeEventListener(JitsiTrackEvents.TRACK_MUTE_CHANGED,
-                track.muteHandler);
-            track.removeEventListener(JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED,
-                track.audioLevelHandler);
-            this.room.removeListener(XMPPEvents.SENDRECV_STREAMS_CHANGED,
-                track.ssrcHandler);
-
-            // send event for stopping screen sharing
-            // FIXME: we assume we have only one screen sharing track
-            // if we change this we need to fix this check
-            if (track.isVideoTrack() && track.videoType === "desktop")
-                this.statistics.sendScreenSharingEvent(false);
-
-            this.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, track);
+            this.onTrackRemoved(track);
             resolve();
         }.bind(this), function (error) {
             reject(error);

JitsiConferenceEventManager.js

@@ -193,6 +193,11 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function () {
 
     this.chatRoomForwarder.forward(XMPPEvents.KICKED,
         JitsiConferenceEvents.KICKED);
+    chatRoom.addListener(XMPPEvents.KICKED,
+        function () {
+            conference.room = null;
+            conference.leave.bind(conference);
+        });
 
     chatRoom.addListener(XMPPEvents.MUC_MEMBER_JOINED,
         conference.onMemberJoined.bind(conference));

modules/xmpp/ChatRoom.js

@@ -495,7 +495,7 @@ ChatRoom.prototype.onPresenceUnavailable = function (pres, from) {
     }
     if ($(pres).find('>x[xmlns="http://jabber.org/protocol/muc#user"]>status[code="307"]').length) {
         if (this.myroomjid === from) {
-            this.leave();
+            this.leave(true);
             this.eventEmitter.emit(XMPPEvents.KICKED);
         }
     }
@@ -948,13 +948,15 @@ ChatRoom.prototype.onMute = function (iq) {
 
 /**
  * Leaves the room. Closes the jingle session.
+ * @parama voidSendingPresence avoids sending the presence when leaving
  */
-ChatRoom.prototype.leave = function () {
+ChatRoom.prototype.leave = function (avoidSendingPresence) {
     if (this.session) {
         this.session.close();
     }
     this.eventEmitter.emit(XMPPEvents.DISPOSE_CONFERENCE);
-    this.doLeave();
+    if(!avoidSendingPresence)
+        this.doLeave();
     this.connection.emuc.doLeave(this.roomjid);
 };