Removes unused code after reloads removal

JitsiConference.js

@@ -36,7 +36,6 @@ function JitsiConference(options) {
     }
     this.eventEmitter = new EventEmitter();
     this.settings = new Settings();
-    this.retries = 0;
     this.options = options;
     this.eventManager = new JitsiConferenceEventManager(this);
     this._init(options);
@@ -62,9 +61,6 @@ function JitsiConference(options) {
  * Initializes the conference object properties
  * @param options {object}
  * @param connection {JitsiConnection} overrides this.connection
- * @param roomState {object} the state of the ChatRoom instance received by
- * ChatRoom.exportState. If this property is set it will be passed to
- * ChatRoom.loadState
  */
 JitsiConference.prototype._init = function (options) {
     if(!options)
@@ -79,14 +75,9 @@ JitsiConference.prototype._init = function (options) {
         this.eventManager.setupXMPPListeners();
     }
 
-    this.retries++;
     this.room = this.xmpp.createRoom(this.options.name, this.options.config,
-        this.settings, (this.retries < 4 ? 3 : null));
+        this.settings);
 
-    //restore previous presence options
-    if(options.roomState) {
-        this.room.loadState(options.roomState);
-    }
     this.room.updateDeviceAvailability(RTC.getDeviceAvailability());
 
     if(!this.rtc) {
@@ -147,15 +138,11 @@ JitsiConference.prototype._leaveRoomAndRemoveParticipants = function () {
  * Leaves the conference.
  * @returns {Promise}
  */
-JitsiConference.prototype.leave = function (dontRemoveLocalTracks) {
+JitsiConference.prototype.leave = function () {
     var conference = this;
 
     this.statistics.stopCallStats();
     this.rtc.closeAllDataChannels();
-    if(dontRemoveLocalTracks) {
-        this._leaveRoomAndRemoveParticipants();
-        return  Promise.resolve();
-    }
 
     return Promise.all(
         conference.getLocalTracks().map(function (track) {

JitsiConferenceEventManager.js

@@ -179,9 +179,6 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function () {
     var eventLogHandler = function (reason) {
         Statistics.sendEventToAll("conference.error." + reason);
     };
-    chatRoom.addListener(
-        XMPPEvents.ALLOCATE_FOCUS_MAX_RETRIES_ERROR,
-        eventLogHandler.bind(null, "allocateFocusMaxRetries"));
     chatRoom.addListener(XMPPEvents.SESSION_ACCEPT_TIMEOUT,
         eventLogHandler.bind(null, "sessionAcceptTimeout"));
 

modules/xmpp/ChatRoom.js

@@ -62,8 +62,7 @@ function filterNodeFromPresenceJSON(pres, nodeName){
     return res;
 }
 
-function ChatRoom(connection, jid, password, XMPP, options, settings,
-    maxRetries) {
+function ChatRoom(connection, jid, password, XMPP, options, settings) {
     this.eventEmitter = new EventEmitter();
     this.xmpp = XMPP;
     this.connection = connection;
@@ -80,8 +79,7 @@ function ChatRoom(connection, jid, password, XMPP, options, settings,
     this.bridgeIsDown = false;
     this.options = options || {};
     this.moderator = new Moderator(this.roomjid, this.xmpp, this.eventEmitter,
-        settings, {connection: this.xmpp.options, conference: this.options},
-        maxRetries);
+        settings, {connection: this.xmpp.options, conference: this.options});
     this.initPresenceMap();
     this.session = null;
     var self = this;
@@ -631,30 +629,6 @@ ChatRoom.prototype.removePresenceListener = function (name) {
     delete this.presHandlers[name];
 };
 
-/**
- * Exports the current state of the ChatRoom instance.
- * @returns {object}
- */
-ChatRoom.prototype.exportState = function () {
-    return {
-        presHandlers: this.presHandlers,
-        presMapNodes: this.presMap.nodes
-    }
-}
-
-/**
- * Loads previously exported state object from ChatRoom instance into current
- * ChatRoom instance.
- * @param state {object} the state received by ChatRoom.exportState method.
- */
-ChatRoom.prototype.loadState = function (state) {
-    if(!state || !state.presHandlers || !state.presMapNodes)
-        throw new Error("Invalid state object passed");
-
-    this.presHandlers = state.presHandlers;
-    this.presMap.nodes = state.presMapNodes;
-}
-
 /**
  * Checks if the user identified by given <tt>mucJid</tt> is the conference
  * focus.

modules/xmpp/moderator.js

@@ -21,7 +21,7 @@ function createExpBackoffTimer(step) {
     };
 }
 
-function Moderator(roomName, xmpp, emitter, settings, options, maxRetries) {
+function Moderator(roomName, xmpp, emitter, settings, options) {
     this.roomName = roomName;
     this.xmppService = xmpp;
     this.getNextTimeout = createExpBackoffTimer(1000);
@@ -30,8 +30,6 @@ function Moderator(roomName, xmpp, emitter, settings, options, maxRetries) {
     this.externalAuthEnabled = false;
     this.settings = settings;
     this.options = options;
-    this.maxRetries = maxRetries || Infinity;
-    this.retries = 0;
 
     // Sip gateway can be enabled by configuring Jigasi host in config.js or
     // it will be enabled automatically if focus detects the component through

modules/xmpp/strophe.emuc.js

@@ -24,7 +24,7 @@ module.exports = function(XMPP) {
             this.connection.addHandler(this.onMute.bind(this),
                 'http://jitsi.org/jitmeet/audio', 'iq', 'set',null,null);
         },
-        createRoom: function (jid, password, options, settings, maxRetries) {
+        createRoom: function (jid, password, options, settings) {
             var roomJid = Strophe.getBareJidFromJid(jid);
             if (this.rooms[roomJid]) {
                 var errmsg = "You are already in the room!";
@@ -33,7 +33,7 @@ module.exports = function(XMPP) {
                 return;
             }
             this.rooms[roomJid] = new ChatRoom(this.connection, jid,
-                password, XMPP, options, settings, maxRetries);
+                password, XMPP, options, settings);
             return this.rooms[roomJid];
         },
         doLeave: function (jid) {

modules/xmpp/xmpp.js

@@ -272,7 +272,7 @@ XMPP.prototype.connect = function (jid, password) {
     return this._connect(jid, password);
 };
 
-XMPP.prototype.createRoom = function (roomName, options, settings, maxRetries) {
+XMPP.prototype.createRoom = function (roomName, options, settings) {
     var roomjid = roomName  + '@' + this.options.hosts.muc;
 
     if (options.useNicks) {
@@ -292,8 +292,7 @@ XMPP.prototype.createRoom = function (roomName, options, settings, maxRetries) {
         roomjid += '/' + tmpJid;
     }
 
-    return this.connection.emuc.createRoom(roomjid, null, options, settings,
-        maxRetries);
+    return this.connection.emuc.createRoom(roomjid, null, options, settings);
 }
 
 XMPP.prototype.addListener = function(type, listener) {

service/xmpp/XMPPEvents.js

@@ -7,11 +7,6 @@ var XMPPEvents = {
     // audio.
     AUDIO_MUTED_BY_FOCUS: "xmpp.audio_muted_by_focus",
     AUTHENTICATION_REQUIRED: "xmpp.authentication_required",
-    /**
-     * Max retries value of Moderator.allocateConferenceFocus failures is
-     * reached.
-     */
-    ALLOCATE_FOCUS_MAX_RETRIES_ERROR: "xmpp.allocate_focus_max_retries_error",
     BRIDGE_DOWN: "xmpp.bridge_down",
     // Designates an event indicating that an offer (e.g. Jingle
     // session-initiate) was received.