From 26e2fd6ef02126f12d680a1f5fc9450bd72fbb2c Mon Sep 17 00:00:00 2001
From: yanas <yana@jitsi.org>
Date: Fri, 13 Nov 2015 11:04:49 -0600
Subject: [PATCH 01/44] Fixes desktop streaming layout.

---
 modules/UI/UI.js                      |  6 ++-
 modules/UI/toolbars/BottomToolbar.js  |  9 +++-
 modules/UI/videolayout/LargeVideo.js  | 70 ++++++++++++++++++---------
 modules/UI/videolayout/VideoLayout.js | 57 ++++++++++++++++------
 service/UI/UIEvents.js                |  7 ++-
 5 files changed, 108 insertions(+), 41 deletions(-)

diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 95e4870eb..3bf7c3dda 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -107,7 +107,7 @@ function setupChat() {
 function setupToolbars() {
     Toolbar.init(UI);
     Toolbar.setupButtonsFromConfig();
-    BottomToolbar.init();
+    BottomToolbar.init(eventEmitter);
 }
 
 function streamHandler(stream, isMuted) {
@@ -343,6 +343,10 @@ function registerListeners() {
         AudioLevels.init();
     });
 
+    UI.addListener(UIEvents.FILM_STRIP_TOGGLED, function (isToggled) {
+        VideoLayout.onFilmStripToggled(isToggled);
+    });
+
     if (!interfaceConfig.filmStripOnly) {
         APP.xmpp.addListener(XMPPEvents.MESSAGE_RECEIVED, updateChatConversation);
         APP.xmpp.addListener(XMPPEvents.CHAT_ERROR_RECEIVED, chatAddError);
diff --git a/modules/UI/toolbars/BottomToolbar.js b/modules/UI/toolbars/BottomToolbar.js
index 0cf0f9a7a..747688f83 100644
--- a/modules/UI/toolbars/BottomToolbar.js
+++ b/modules/UI/toolbars/BottomToolbar.js
@@ -2,6 +2,9 @@
 var PanelToggler = require("../side_pannels/SidePanelToggler");
 var UIUtil = require("../util/UIUtil");
 var AnalyticsAdapter = require("../../statistics/AnalyticsAdapter");
+var UIEvents = require("../../../service/UI/UIEvents");
+
+var eventEmitter = null;
 
 var buttonHandlers = {
     "bottom_toolbar_contact_list": function () {
@@ -27,7 +30,8 @@ var defaultBottomToolbarButtons = {
 
 
 var BottomToolbar = (function (my) {
-    my.init = function () {
+    my.init = function (emitter) {
+        eventEmitter = emitter;
         UIUtil.hideDisabledButtons(defaultBottomToolbarButtons);
 
         for(var k in buttonHandlers)
@@ -45,6 +49,9 @@ var BottomToolbar = (function (my) {
     my.toggleFilmStrip = function() {
         var filmstrip = $("#remoteVideos");
         filmstrip.toggleClass("hidden");
+
+        eventEmitter.emit(  UIEvents.FILM_STRIP_TOGGLED,
+                            filmstrip.hasClass("hidden"));
     };
 
     $(document).bind("remotevideo.resized", function (event, width, height) {
diff --git a/modules/UI/videolayout/LargeVideo.js b/modules/UI/videolayout/LargeVideo.js
index 20485c81a..b32569e48 100644
--- a/modules/UI/videolayout/LargeVideo.js
+++ b/modules/UI/videolayout/LargeVideo.js
@@ -115,7 +115,10 @@ function getDesktopVideoSize(videoWidth,
     var availableWidth = Math.max(videoWidth, videoSpaceWidth);
     var availableHeight = Math.max(videoHeight, videoSpaceHeight);
 
-    videoSpaceHeight -= $('#remoteVideos').outerHeight();
+    var filmstrip = $("#remoteVideos");
+
+    if (!filmstrip.hasClass("hidden"))
+        videoSpaceHeight -= filmstrip.outerHeight();
 
     if (availableWidth / aspectRatio >= videoSpaceHeight)
     {
@@ -268,13 +271,7 @@ function changeVideo(isVisible) {
 
     largeVideoElement.style.transform = flipX ? "scaleX(-1)" : "none";
 
-    var isDesktop = currentSmallVideo.getVideoType() === 'screen';
-    // Change the way we'll be measuring and positioning large video
-
-    getVideoSize = isDesktop ? getDesktopVideoSize : getCameraVideoSize;
-    getVideoPosition = isDesktop ? getDesktopVideoPosition :
-        getCameraVideoPosition;
-
+    LargeVideo.updateVideoSizeAndPosition(currentSmallVideo.getVideoType());
 
     // Only if the large video is currently visible.
     if (isVisible) {
@@ -451,10 +448,8 @@ var LargeVideo = {
             return;
         if (LargeVideo.isCurrentlyOnLarge(resourceJid))
         {
-            var isDesktop = newVideoType === 'screen';
-            getVideoSize = isDesktop ? getDesktopVideoSize : getCameraVideoSize;
-            getVideoPosition = isDesktop ? getDesktopVideoPosition
-                : getCameraVideoPosition;
+            LargeVideo.updateVideoSizeAndPosition(newVideoType);
+
             this.position(null, null, null, null, true);
         }
     },
@@ -496,17 +491,23 @@ var LargeVideo = {
     },
     /**
      * Resizes the large html elements.
-     * @param animate boolean property that indicates whether the resize should be animated or not.
-     * @param isChatVisible boolean property that indicates whether the chat area is displayed or not.
-     * If that parameter is null the method will check the chat pannel visibility.
-     * @param completeFunction a function to be called when the video space is resized
-     * @returns {*[]} array with the current width and height values of the largeVideo html element.
+     *
+     * @param animate boolean property that indicates whether the resize should
+     * be animated or not.
+     * @param isSideBarVisible boolean property that indicates whether the chat
+     * area is displayed or not.
+     * If that parameter is null the method will check the chat panel
+     * visibility.
+     * @param completeFunction a function to be called when the video space is
+     * resized
+     * @returns {*[]} array with the current width and height values of the
+     * largeVideo html element.
      */
-    resize: function (animate, isVisible, completeFunction) {
+    resize: function (animate, isSideBarVisible, completeFunction) {
         if(!isEnabled)
             return;
         var availableHeight = window.innerHeight;
-        var availableWidth = UIUtil.getAvailableVideoWidth(isVisible);
+        var availableWidth = UIUtil.getAvailableVideoWidth(isSideBarVisible);
 
         if (availableWidth < 0 || availableHeight < 0) return;
 
@@ -514,7 +515,8 @@ var LargeVideo = {
         var top = availableHeight / 2 - avatarSize / 4 * 3;
         $('#activeSpeaker').css('top', top);
 
-        this.VideoLayout.resizeVideoSpace(animate, isVisible, completeFunction);
+        this.VideoLayout
+            .resizeVideoSpace(animate, isSideBarVisible, completeFunction);
         if(animate) {
             $('#largeVideoContainer').animate({
                     width: availableWidth,
@@ -530,12 +532,36 @@ var LargeVideo = {
         }
         return [availableWidth, availableHeight];
     },
-    resizeVideoAreaAnimated: function (isVisible, completeFunction) {
+    /**
+     * Resizes the large video.
+     *
+     * @param isSideBarVisible indicating if the side bar is visible
+     * @param completeFunction the callback function to be executed after the
+     * resize
+     */
+    resizeVideoAreaAnimated: function (isSideBarVisible, completeFunction) {
         if(!isEnabled)
             return;
-        var size = this.resize(true, isVisible, completeFunction);
+        var size = this.resize(true, isSideBarVisible, completeFunction);
         this.position(null, null, size[0], size[1], true);
     },
+    /**
+     * Updates the video size and position.
+     *
+     * @param videoType the video type indicating if the stream is of type
+     * desktop or web cam
+     */
+    updateVideoSizeAndPosition: function (videoType) {
+        if (!videoType)
+            videoType = currentSmallVideo.getVideoType();
+
+        var isDesktop = videoType === 'screen';
+
+        // Change the way we'll be measuring and positioning large video
+        getVideoSize = isDesktop ? getDesktopVideoSize : getCameraVideoSize;
+        getVideoPosition = isDesktop ? getDesktopVideoPosition :
+            getCameraVideoPosition;
+    },
     getResourceJid: function () {
         return currentSmallVideo ? currentSmallVideo.getResourceJid() : null;
     },
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index 10aefd39c..6513280b9 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -214,7 +214,8 @@ var VideoLayout = (function (my) {
     my.handleVideoThumbClicked = function(noPinnedEndpointChangedEvent,
                                           resourceJid) {
         if(focusedVideoResourceJid) {
-            var oldSmallVideo = VideoLayout.getSmallVideo(focusedVideoResourceJid);
+            var oldSmallVideo
+                    = VideoLayout.getSmallVideo(focusedVideoResourceJid);
             if (oldSmallVideo && !interfaceConfig.filmStripOnly)
                 oldSmallVideo.focus(false);
         }
@@ -400,7 +401,8 @@ var VideoLayout = (function (my) {
 
         if(animate) {
             $('#remoteVideos').animate({
-                    height: height + 2 // adds 2 px because of small video 1px border
+                    // adds 2 px because of small video 1px border
+                    height: height + 2
                 },
                 {
                     queue: false,
@@ -425,7 +427,8 @@ var VideoLayout = (function (my) {
         } else {
             // size videos so that while keeping AR and max height, we have a
             // nice fit
-            $('#remoteVideos').height(height + 2);// adds 2 px because of small video 1px border
+            // adds 2 px because of small video 1px border
+            $('#remoteVideos').height(height + 2);
             $('#remoteVideos>span').width(width);
             $('#remoteVideos>span').height(height);
 
@@ -439,10 +442,10 @@ var VideoLayout = (function (my) {
      * @param videoSpaceWidth the width of the video space
      */
     my.calculateThumbnailSize = function (videoSpaceWidth) {
-        // Calculate the available height, which is the inner window height minus
-       // 39px for the header minus 2px for the delimiter lines on the top and
-       // bottom of the large video, minus the 36px space inside the remoteVideos
-       // container used for highlighting shadow.
+        // Calculate the available height, which is the inner window height
+        // minus 39px for the header minus 2px for the delimiter lines on the
+        // top and bottom of the large video, minus the 36px space inside the
+        // remoteVideos container used for highlighting shadow.
        var availableHeight = 100;
 
         var numvids = $('#remoteVideos>span:visible').length;
@@ -458,7 +461,11 @@ var VideoLayout = (function (my) {
        var availableWidth = availableWinWidth / numvids;
        var aspectRatio = 16.0 / 9.0;
        var maxHeight = Math.min(160, availableHeight);
-       availableHeight = Math.min(maxHeight, availableWidth / aspectRatio, window.innerHeight - 18);
+       availableHeight
+           = Math.min(  maxHeight,
+                        availableWidth / aspectRatio,
+                        window.innerHeight - 18);
+
        if (availableHeight < availableWidth / aspectRatio) {
            availableWidth = Math.floor(availableHeight * aspectRatio);
        }
@@ -882,6 +889,17 @@ var VideoLayout = (function (my) {
 
     };
 
+    /**
+     * Updates the video size and position when the film strip is toggled.
+     *
+     * @param isToggled indicates if the film strip is toggled or not. True
+     * would mean that the film strip is hidden, false would mean it's shown
+     */
+    my.onFilmStripToggled = function(isToggled) {
+        LargeVideo.updateVideoSizeAndPosition();
+        LargeVideo.position(null, null, null, null, true);
+    };
+
     my.showMore = function (jid) {
         if (jid === 'local') {
             localVideoThumbnail.connectionIndicator.showMore();
@@ -914,21 +932,27 @@ var VideoLayout = (function (my) {
     };
 
     /**
-     * Resizes the video area
+     * Resizes the video area.
+     *
+     * @param isSideBarVisible indicates if the side bar is currently visible
      * @param callback a function to be called when the video space is
      * resized.
      */
-    my.resizeVideoArea = function(isVisible, callback) {
-        LargeVideo.resizeVideoAreaAnimated(isVisible, callback);
+    my.resizeVideoArea = function(isSideBarVisible, callback) {
+        LargeVideo.resizeVideoAreaAnimated(isSideBarVisible, callback);
         VideoLayout.resizeThumbnails(true);
     };
 
     /**
      * Resizes the #videospace html element
-     * @param animate boolean property that indicates whether the resize should be animated or not.
-     * @param isChatVisible boolean property that indicates whether the chat area is displayed or not.
-     * If that parameter is null the method will check the chat pannel visibility.
-     * @param completeFunction a function to be called when the video space is resized
+     * @param animate boolean property that indicates whether the resize should
+     * be animated or not.
+     * @param isChatVisible boolean property that indicates whether the chat
+     * area is displayed or not.
+     * If that parameter is null the method will check the chat panel
+     * visibility.
+     * @param completeFunction a function to be called when the video space
+     * is resized.
      */
     my.resizeVideoSpace = function (animate, isChatVisible, completeFunction) {
         var availableHeight = window.innerHeight;
@@ -998,7 +1022,8 @@ var VideoLayout = (function (my) {
         LargeVideo.enableVideoProblemFilter(true);
         var reconnectingKey = "connection.RECONNECTING";
         $('#videoConnectionMessage').attr("data-i18n", reconnectingKey);
-        $('#videoConnectionMessage').text(APP.translation.translateString(reconnectingKey));
+        $('#videoConnectionMessage')
+            .text(APP.translation.translateString(reconnectingKey));
         $('#videoConnectionMessage').css({display: "block"});
     };
 
diff --git a/service/UI/UIEvents.js b/service/UI/UIEvents.js
index 4c3c36e49..e0b31eae5 100644
--- a/service/UI/UIEvents.js
+++ b/service/UI/UIEvents.js
@@ -2,6 +2,11 @@ var UIEvents = {
     NICKNAME_CHANGED: "UI.nickname_changed",
     SELECTED_ENDPOINT: "UI.selected_endpoint",
     PINNED_ENDPOINT: "UI.pinned_endpoint",
-    LARGEVIDEO_INIT: "UI.largevideo_init"
+    LARGEVIDEO_INIT: "UI.largevideo_init",
+    /**
+     * Notifies interested parties when the film strip (remote video's panel)
+     * is hidden (toggled) or shown (un-toggled).
+     */
+    FILM_STRIP_TOGGLED: "UI.filmstrip_toggled"
 };
 module.exports = UIEvents;
\ No newline at end of file

From 74c420a609a7a7a88db53150247d69cd7f8bd94a Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Fri, 13 Nov 2015 16:18:22 -0600
Subject: [PATCH 02/44] Adds config option for auto enable desktop sharing when
 opening an url.

---
 modules/UI/UI.js               |  2 ++
 modules/UI/toolbars/Toolbar.js | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 3bf7c3dda..637256394 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -528,6 +528,8 @@ function onMucJoined(jid, info) {
 
 
     VideoLayout.mucJoined();
+
+    Toolbar.checkAutoEnableDesktopSharing();
 }
 
 function initEtherpad(name) {
diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js
index 9f229ddfd..03949b09f 100644
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -632,13 +632,23 @@ var Toolbar = (function (my) {
         }
     };
 
-    // checks whether recording is enabled and whether we have params to start automatically recording
+    // checks whether recording is enabled and whether we have params
+    // to start automatically recording
     my.checkAutoRecord = function () {
         if (UIUtil.isButtonEnabled('recording') && config.autoRecord) {
             toggleRecording(config.autoRecordToken);
         }
     };
 
+    // checks whether desktop sharing is enabled and whether
+    // we have params to start automatically sharing
+    my.checkAutoEnableDesktopSharing = function () {
+        if (UIUtil.isButtonEnabled('desktop')
+                && config.autoEnableDesktopSharing) {
+            APP.desktopsharing.toggleScreenSharing();
+        }
+    };
+
     // Shows or hides SIP calls button
     my.showSipCallButton = function (show) {
         if (APP.xmpp.isSipGatewayEnabled() && UIUtil.isButtonEnabled('sip') && show) {

From f9d1fd13dfb57652a7307b14cd0998d2489032b4 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Mon, 16 Nov 2015 13:33:29 -0600
Subject: [PATCH 03/44] Fixes an issue where lastN event, includes in the logic
 local resource and detects it as removed from lastN and schedules update of
 large video. If we receive this event for newly joined participant and we
 have pinned the local video, the event triggers update of large video which
 displays the wrong participant, not the pinned local video.

---
 modules/UI/videolayout/VideoLayout.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index 6513280b9..5c4449e3f 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -690,6 +690,16 @@ var VideoLayout = (function (my) {
         $('#remoteVideos>span').each(function( index, element ) {
             var resourceJid = VideoLayout.getPeerContainerResourceJid(element);
 
+            // We do not want to process any logic for our own(local) video
+            // because the local participant is never in the lastN set.
+            // The code of this function might detect that the local participant
+            // has been dropped out of the lastN set and will update the large
+            // video
+            // Detected from avatar tests, where lastN event override
+            // local video pinning
+            if(resourceJid == APP.xmpp.myResource())
+                return;
+
             var isReceived = true;
             if (resourceJid &&
                 lastNEndpoints.indexOf(resourceJid) < 0 &&

From 0ae702922c76e5bf660361f4a78d05035a3375a9 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Mon, 16 Nov 2015 16:50:15 -0600
Subject: [PATCH 04/44] Makes the room parameter lower case.

---
 modules/xmpp/xmpp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/xmpp/xmpp.js b/modules/xmpp/xmpp.js
index 9b28cb49f..3a980a5a4 100644
--- a/modules/xmpp/xmpp.js
+++ b/modules/xmpp/xmpp.js
@@ -322,7 +322,7 @@ var XMPP = {
     createConnection: function () {
         var bosh = config.bosh || '/http-bind';
         // adds the room name used to the bosh connection
-        return new Strophe.Connection(bosh + '?ROOM=' + APP.UI.getRoomNode());
+        return new Strophe.Connection(bosh + '?room=' + APP.UI.getRoomNode());
     },
     getStatusString: function (status) {
         return Strophe.getStatusString(status);

From 7ea675159e0fa2e1c3af7a913cd2480e0a039062 Mon Sep 17 00:00:00 2001
From: yanas <yana@jitsi.org>
Date: Mon, 16 Nov 2015 18:06:28 -0600
Subject: [PATCH 05/44] Disables feedback functionality if callstats isn't
 available.

---
 css/main.css                   |  1 +
 modules/UI/Feedback.js         | 30 +++++++++++++++++++++++++++---
 modules/UI/UI.js               |  5 +----
 modules/UI/toolbars/Toolbar.js | 26 +++++++++++++++++++++-----
 4 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/css/main.css b/css/main.css
index e4855d8c9..5a937025f 100644
--- a/css/main.css
+++ b/css/main.css
@@ -248,6 +248,7 @@ form {
 }
 
 div.feedbackButton {
+    display: none;
     position: absolute;
     background-color: rgba(0,0,0,.50);
     border-radius: 50%;
diff --git a/modules/UI/Feedback.js b/modules/UI/Feedback.js
index 670bb38ea..baf53447c 100644
--- a/modules/UI/Feedback.js
+++ b/modules/UI/Feedback.js
@@ -1,4 +1,4 @@
-/* global $, interfaceConfig */
+/* global $, config, interfaceConfig */
 
 /*
  * Created by Yana Stamcheva on 2/10/15.
@@ -73,6 +73,30 @@ var Feedback = {
      * The feedback score. -1 indicates no score has been given for now.
      */
     feedbackScore: -1,
+    /**
+     * Initialise the Feedback functionality.
+     */
+    init: function () {
+        // CallStats is the way we send feedback, so we don't have to initialise
+        // if callstats isn't enabled.
+        if (!config.callStatsID || !config.callStatsSecret)
+            return;
+
+        $("div.feedbackButton").css("display", "block");
+        $("#feedbackButton").click(function (event) {
+            Feedback.openFeedbackWindow();
+        });
+    },
+    /**
+     * Indicates if the feedback functionality is enabled.
+     *
+     * @return true if the feedback functionality is enabled, false otherwise.
+     */
+    isEnabled: function() {
+        var isCallStatsEnabled = (config.callStatsID && config.callStatsSecret);
+
+        return isCallStatsEnabled;
+    },
     /**
      * Opens the feedback window.
      */
@@ -120,7 +144,7 @@ var Feedback = {
         var states = {
             overall_feedback: {
                 html: constructOverallFeedbackHtml(),
-                persistent: true,
+                persistent: false,
                 buttons: {},
                 closeText: '',
                 focus: "div[id='stars']",
@@ -161,7 +185,7 @@ var Feedback = {
         var feedbackDialog
             = APP.UI.messageHandler.openDialogWithStates(
                 states,
-                {   persistent: true,
+                {   persistent: false,
                     buttons: {},
                     closeText: '',
                     loaded: onLoadFunction,
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 637256394..8cbb07709 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -429,15 +429,12 @@ UI.start = function (init) {
         $("#downloadlog").click(function (event) {
             dump(event.target);
         });
-        $("#feedbackButton").click(function (event) {
-            Feedback.openFeedbackWindow();
-        });
+        Feedback.init();
     }
     else
     {
         $("#header").css("display", "none");
         $("#bottomToolbar").css("display", "none");
-        $("#feedbackButton").css("display", "none");
         $("#downloadlog").css("display", "none");
         $("#remoteVideos").css("padding", "0px 0px 18px 0px");
         $("#remoteVideos").css("right", "0px");
diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js
index 03949b09f..092858101 100644
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -151,12 +151,28 @@ function hangup() {
         }
     };
 
-    if (Feedback.feedbackScore > 0) {
-        Feedback.openFeedbackWindow();
-        conferenceDispose();
+    if (Feedback.isEnabled())
+    {
+        // If the user has already entered feedback, we'll show the window and
+        // immidiately start the conference dispose timeout.
+        if (Feedback.feedbackScore > 0) {
+            Feedback.openFeedbackWindow();
+            conferenceDispose();
+
+        }
+        // Otherwise we'll wait for user's feedback.
+        else
+            Feedback.openFeedbackWindow(conferenceDispose);
+    }
+    else {
+        conferenceDispose();
+
+        // If the feedback functionality isn't enabled we show a thank you
+        // dialog.
+        APP.UI.messageHandler.openMessageDialog(null, null, null,
+            APP.translation.translateString("dialog.thankYou",
+                {appName:interfaceConfig.APP_NAME}));
     }
-    else
-        Feedback.openFeedbackWindow(conferenceDispose);
 }
 
 /**

From b64f3a591327430c11af8998bbeb004ca89c2810 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Mon, 16 Nov 2015 17:42:21 -0600
Subject: [PATCH 06/44] Adds method to obtain remote video type.

---
 modules/UI/UI.js                      | 9 +++++++++
 modules/UI/videolayout/VideoLayout.js | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 8cbb07709..59070a3db 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -700,6 +700,15 @@ UI.getLargeVideoResource = function () {
     return VideoLayout.getLargeVideoResource();
 };
 
+/**
+ * Return the type of the remote video.
+ * @param jid the jid for the remote video
+ * @returns the video type video or screen.
+ */
+UI.getRemoteVideoType = function (jid) {
+    return VideoLayout.getRemoteVideoType(jid);
+};
+
 UI.getRoomNode = function () {
     if (roomNode)
         return roomNode;
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index 5c4449e3f..a17b5f506 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -191,6 +191,15 @@ var VideoLayout = (function (my) {
         return LargeVideo.getResourceJid();
     };
 
+    /**
+     * Return the type of the remote video.
+     * @param jid the jid for the remote video
+     * @returns the video type video or screen.
+     */
+    my.getRemoteVideoType = function (jid) {
+        return remoteVideoTypes[jid];
+    };
+
     /**
      * Called when large video update is finished
      * @param currentSmallVideo small video currently displayed on large video

From ce397d9e747dcdf4332fdc2cd0b946f420fd923f Mon Sep 17 00:00:00 2001
From: George Politis <gp@jitsi.org>
Date: Thu, 1 Oct 2015 17:23:40 -0500
Subject: [PATCH 07/44] Fixes issue in ssrc-group SDP parsing.

How did this even work before?
---
 modules/xmpp/SDP.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/xmpp/SDP.js b/modules/xmpp/SDP.js
index e799e5520..bacbe77ed 100644
--- a/modules/xmpp/SDP.js
+++ b/modules/xmpp/SDP.js
@@ -57,6 +57,7 @@ SDP.prototype.getMediaSsrcMap = function() {
         });
         tmp = SDPUtil.find_lines(self.media[mediaindex], 'a=ssrc-group:');
         tmp.forEach(function(line){
+            var idx = line.indexOf(' ');
             var semantics = line.substr(0, idx).substr(13);
             var ssrcs = line.substr(14 + semantics.length).split(' ');
             if (ssrcs.length) {

From 5d571e696f9612964f6573783c57950c51a585fa Mon Sep 17 00:00:00 2001
From: George Politis <gp@jitsi.org>
Date: Fri, 23 Oct 2015 09:32:29 -0500
Subject: [PATCH 08/44] Sets up simulcast for 2 layers.

---
 modules/xmpp/TraceablePeerConnection.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/xmpp/TraceablePeerConnection.js b/modules/xmpp/TraceablePeerConnection.js
index 4e05a2811..56bba8944 100644
--- a/modules/xmpp/TraceablePeerConnection.js
+++ b/modules/xmpp/TraceablePeerConnection.js
@@ -25,7 +25,7 @@ function TraceablePeerConnection(ice_config, constraints, session) {
     var Interop = require('sdp-interop').Interop;
     this.interop = new Interop();
     var Simulcast = require('sdp-simulcast');
-    this.simulcast = new Simulcast({numOfLayers: 3, explodeRemoteSimulcast: false});
+    this.simulcast = new Simulcast({numOfLayers: 2, explodeRemoteSimulcast: false});
 
     // override as desired
     this.trace = function (what, info) {
@@ -218,6 +218,8 @@ if (TraceablePeerConnection.prototype.__defineGetter__ !== undefined) {
         function() {
             var desc = this.peerconnection.localDescription;
 
+            // TODO this should be after the Unified Plan -> Plan B
+            // transformation.
             desc = SSRCReplacement.mungeLocalVideoSSRC(desc);
 
             this.trace('getLocalDescription::preTransform', dumpSDP(desc));

From 9f1e953e8afd3b0e1159066a8ce021e0ce86207d Mon Sep 17 00:00:00 2001
From: George Politis <gp@jitsi.org>
Date: Tue, 17 Nov 2015 18:10:41 +0000
Subject: [PATCH 09/44] Bumps sdp-simulcast@0.1.2.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ed4b2eab3..0d3606b2b 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "pako": "*",
     "retry": "0.6.1",
     "sdp-interop": "0.1.10",
-    "sdp-simulcast": "0.1.0",
+    "sdp-simulcast": "0.1.2",
     "sdp-transform": "1.4.1",
     "socket.io-client": "1.3.6",
     "strophe": "^1.2.2",

From 94b54279f253c92cf683cf32ea81427b260ee096 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Tue, 17 Nov 2015 14:27:26 -0600
Subject: [PATCH 10/44] Fixes wrong handler name, which causes adding multiple
 local video tags in the local video.

---
 modules/RTC/RTC.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/RTC/RTC.js b/modules/RTC/RTC.js
index 9ac19b204..790e81708 100644
--- a/modules/RTC/RTC.js
+++ b/modules/RTC/RTC.js
@@ -303,7 +303,7 @@ var RTC = {
         if (mediaStream.addEventListener) {
             // chrome
             if(typeof mediaStream.active !== "undefined")
-                mediaStream.inactive = handler;
+                mediaStream.oninactive = handler;
             else
                 mediaStream.onended = handler;
         } else {
@@ -322,7 +322,7 @@ var RTC = {
         if (mediaStream.removeEventListener) {
             // chrome
             if(typeof mediaStream.active !== "undefined")
-                mediaStream.inactive = null;
+                mediaStream.oninactive = null;
             else
                 mediaStream.onended = null;
         } else {

From 72c39a0162f52d31ce92195e0726b13edb7b1318 Mon Sep 17 00:00:00 2001
From: isymchych <ivansymchych@gmail.com>
Date: Fri, 13 Nov 2015 17:58:59 +0200
Subject: [PATCH 11/44] accumulate erorrs unitl connected to callstats

---
 modules/statistics/CallStats.js         | 103 +++++++++++++-----------
 modules/statistics/statistics.js        |  31 ++++---
 modules/xmpp/JingleSessionPC.js         |   2 +-
 modules/xmpp/TraceablePeerConnection.js |   8 +-
 4 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/modules/statistics/CallStats.js b/modules/statistics/CallStats.js
index e91932832..3ba54286f 100644
--- a/modules/statistics/CallStats.js
+++ b/modules/statistics/CallStats.js
@@ -5,20 +5,35 @@ var jsSHA = require('jssha');
 var io = require('socket.io-client');
 var callStats = null;
 
-// getUserMedia calls happen before CallStats init
-// so if there are any getUserMedia errors, we store them in this array
+/**
+ * @const
+ * @see http://www.callstats.io/api/#enumeration-of-wrtcfuncnames
+ */
+var wrtcFuncNames = {
+    createOffer:          "createOffer",
+    createAnswer:         "createAnswer",
+    setLocalDescription:  "setLocalDescription",
+    setRemoteDescription: "setRemoteDescription",
+    addIceCandidate:      "addIceCandidate",
+    getUserMedia:         "getUserMedia"
+};
+
+// some errors may happen before CallStats init
+// in this case we accumulate them in this array
 // and send them to callstats on init
-var pendingUserMediaErrors = [];
+var pendingErrors = [];
 
 function initCallback (err, msg) {
-    console.log("Initializing Status: err="+err+" msg="+msg);
+    console.log("CallStats Status: err=" + err + " msg=" + msg);
 }
 
+var callStatsIntegrationEnabled = config.callStatsID && config.callStatsSecret;
+
 var CallStats = {
     init: function (jingleSession) {
-
-        if(!config.callStatsID || !config.callStatsSecret || callStats !== null)
+        if(!callStatsIntegrationEnabled || callStats !== null) {
             return;
+        }
 
         callStats = new callstats($, io, jsSHA);
 
@@ -44,10 +59,12 @@ var CallStats = {
             this.confID,
             this.pcCallback.bind(this));
 
-        // notify callstats about getUserMedia failures if there were any
-        if (pendingUserMediaErrors.length) {
-            pendingUserMediaErrors.forEach(this.sendGetUserMediaFailed, this);
-            pendingUserMediaErrors.length = 0;
+        // notify callstats about failures if there were any
+        if (pendingErrors.length) {
+            pendingErrors.forEach(function (error) {
+                this._reportError(error.type, error.error, error.pc);
+            }, this);
+            pendingErrors.length = 0;
         }
     },
     pcCallback: function (err, msg) {
@@ -109,84 +126,76 @@ var CallStats = {
             this.confID, feedbackJSON);
     },
 
+    _reportError: function (type, e, pc) {
+        if (callStats) {
+            callStats.reportError(pc, this.confID, type, e);
+        } else if (callStatsIntegrationEnabled) {
+            pendingErrors.push({
+                type: type,
+                error: e,
+                pc: pc
+            });
+        }
+        // else just ignore it
+    },
+
     /**
      * Notifies CallStats that getUserMedia failed.
      *
      * @param {Error} e error to send
      */
     sendGetUserMediaFailed: function (e) {
-        if(!callStats) {
-            pendingUserMediaErrors.push(e);
-            return;
-        }
-        callStats.reportError(this.peerconnection, this.confID,
-                              callStats.webRTCFunctions.getUserMedia, e);
+        this._reportError(wrtcFuncNames.getUserMedia, e, null);
     },
 
     /**
      * Notifies CallStats that peer connection failed to create offer.
      *
      * @param {Error} e error to send
+     * @param {RTCPeerConnection} pc connection on which failure occured.
      */
-    sendCreateOfferFailed: function (e) {
-        if(!callStats) {
-            return;
-        }
-        callStats.reportError(this.peerconnection, this.confID,
-                              callStats.webRTCFunctions.createOffer, e);
+    sendCreateOfferFailed: function (e, pc) {
+        this._reportError(wrtcFuncNames.createOffer, e, pc);
     },
 
     /**
      * Notifies CallStats that peer connection failed to create answer.
      *
      * @param {Error} e error to send
+     * @param {RTCPeerConnection} pc connection on which failure occured.
      */
-    sendCreateAnswerFailed: function (e) {
-        if(!callStats) {
-            return;
-        }
-        callStats.reportError(this.peerconnection, this.confID,
-                              callStats.webRTCFunctions.createAnswer, e);
+    sendCreateAnswerFailed: function (e, pc) {
+        this._reportError(wrtcFuncNames.createAnswer, e, pc);
     },
 
     /**
      * Notifies CallStats that peer connection failed to set local description.
      *
      * @param {Error} e error to send
+     * @param {RTCPeerConnection} pc connection on which failure occured.
      */
-    sendSetLocalDescFailed: function (e) {
-        if(!callStats) {
-            return;
-        }
-        callStats.reportError(this.peerconnection, this.confID,
-                              callStats.webRTCFunctions.setLocalDescription, e);
+    sendSetLocalDescFailed: function (e, pc) {
+        this._reportError(wrtcFuncNames.setLocalDescription, e, pc);
     },
 
     /**
      * Notifies CallStats that peer connection failed to set remote description.
      *
      * @param {Error} e error to send
+     * @param {RTCPeerConnection} pc connection on which failure occured.
      */
-    sendSetRemoteDescFailed: function (e) {
-        if(!callStats) {
-            return;
-        }
-        callStats.reportError(
-            this.peerconnection, this.confID,
-            callStats.webRTCFunctions.setRemoteDescription, e);
+    sendSetRemoteDescFailed: function (e, pc) {
+        this._reportError(wrtcFuncNames.setRemoteDescription, e, pc);
     },
 
     /**
      * Notifies CallStats that peer connection failed to add ICE candidate.
      *
      * @param {Error} e error to send
+     * @param {RTCPeerConnection} pc connection on which failure occured.
      */
-    sendAddIceCandidateFailed: function (e) {
-        if(!callStats) {
-            return;
-        }
-        callStats.reportError(this.peerconnection, this.confID,
-                              callStats.webRTCFunctions.addIceCandidate, e);
+    sendAddIceCandidateFailed: function (e, pc) {
+        this._reportError(wrtcFuncNames.addIceCandidate, e, pc);
     }
 };
 module.exports = CallStats;
diff --git a/modules/statistics/statistics.js b/modules/statistics/statistics.js
index 91908f0de..9f63b0786 100644
--- a/modules/statistics/statistics.js
+++ b/modules/statistics/statistics.js
@@ -113,25 +113,30 @@ var statistics = {
         APP.RTC.addListener(RTCEvents.GET_USER_MEDIA_FAILED, function (e) {
             CallStats.sendGetUserMediaFailed(e);
         });
-        APP.xmpp.addListener(RTCEvents.CREATE_OFFER_FAILED, function (e) {
-            CallStats.sendCreateOfferFailed(e);
+        APP.xmpp.addListener(RTCEvents.CREATE_OFFER_FAILED, function (e, pc) {
+            CallStats.sendCreateOfferFailed(e, pc);
         });
-        APP.xmpp.addListener(RTCEvents.CREATE_ANSWER_FAILED, function (e) {
-            CallStats.sendCreateAnswerFailed(e);
+        APP.xmpp.addListener(RTCEvents.CREATE_ANSWER_FAILED, function (e, pc) {
+            CallStats.sendCreateAnswerFailed(e, pc);
         });
         APP.xmpp.addListener(
             RTCEvents.SET_LOCAL_DESCRIPTION_FAILED,
-            function (e) {
-                CallStats.sendSetLocalDescFailed(e);
-        });
+            function (e, pc) {
+                CallStats.sendSetLocalDescFailed(e, pc);
+            }
+        );
         APP.xmpp.addListener(
             RTCEvents.SET_REMOTE_DESCRIPTION_FAILED,
-            function (e) {
-                CallStats.sendSetRemoteDescFailed(e);
-        });
-        APP.xmpp.addListener(RTCEvents.ADD_ICE_CANDIDATE_FAILED, function (e) {
-            CallStats.sendAddIceCandidateFailed(e);
-        });
+            function (e, pc) {
+                CallStats.sendSetRemoteDescFailed(e, pc);
+            }
+        );
+        APP.xmpp.addListener(
+            RTCEvents.ADD_ICE_CANDIDATE_FAILED,
+            function (e, pc) {
+                CallStats.sendAddIceCandidateFailed(e, pc);
+            }
+        );
     }
 };
 
diff --git a/modules/xmpp/JingleSessionPC.js b/modules/xmpp/JingleSessionPC.js
index 9f167d9af..6500e6186 100644
--- a/modules/xmpp/JingleSessionPC.js
+++ b/modules/xmpp/JingleSessionPC.js
@@ -720,7 +720,7 @@ JingleSessionPC.prototype.addIceCandidate = function (elem) {
                 self.peerconnection.addIceCandidate(candidate);
             } catch (e) {
                 console.error('addIceCandidate failed', e.toString(), line);
-                self.eventEmitter.emit(RTCEvents.ADD_ICE_CANDIDATE_FAILED, err);
+                self.eventEmitter.emit(RTCEvents.ADD_ICE_CANDIDATE_FAILED, err, self.peerconnection);
             }
         });
     });
diff --git a/modules/xmpp/TraceablePeerConnection.js b/modules/xmpp/TraceablePeerConnection.js
index 56bba8944..5b006feb5 100644
--- a/modules/xmpp/TraceablePeerConnection.js
+++ b/modules/xmpp/TraceablePeerConnection.js
@@ -295,7 +295,7 @@ TraceablePeerConnection.prototype.setLocalDescription
         },
         function (err) {
             self.trace('setLocalDescriptionOnFailure', err);
-            self.eventEmitter.emit(RTCEvents.SET_LOCAL_DESCRIPTION_FAILED, err);
+            self.eventEmitter.emit(RTCEvents.SET_LOCAL_DESCRIPTION_FAILED, err, self.peerconnection);
             failureCallback(err);
         }
     );
@@ -331,7 +331,7 @@ TraceablePeerConnection.prototype.setRemoteDescription
         },
         function (err) {
             self.trace('setRemoteDescriptionOnFailure', err);
-            self.eventEmitter.emit(RTCEvents.SET_REMOTE_DESCRIPTION_FAILED, err);
+            self.eventEmitter.emit(RTCEvents.SET_REMOTE_DESCRIPTION_FAILED, err, self.peerconnection);
             failureCallback(err);
         }
     );
@@ -377,7 +377,7 @@ TraceablePeerConnection.prototype.createOffer
         },
         function(err) {
             self.trace('createOfferOnFailure', err);
-            self.eventEmitter.emit(RTCEvents.CREATE_OFFER_FAILED, err);
+            self.eventEmitter.emit(RTCEvents.CREATE_OFFER_FAILED, err, self.peerconnection);
             failureCallback(err);
         },
         constraints
@@ -408,7 +408,7 @@ TraceablePeerConnection.prototype.createAnswer
         },
         function(err) {
             self.trace('createAnswerOnFailure', err);
-            self.eventEmitter.emit(RTCEvents.CREATE_ANSWER_FAILED, err);
+            self.eventEmitter.emit(RTCEvents.CREATE_ANSWER_FAILED, err, self.peerconnection);
             failureCallback(err);
         },
         constraints

From 236c4bb37c3497a93565ad12e2b9b0da78055937 Mon Sep 17 00:00:00 2001
From: yanas <yana@jitsi.org>
Date: Tue, 17 Nov 2015 16:39:05 -0600
Subject: [PATCH 12/44] Adds a method in callstats in order to check if it's
 enabled.

---
 modules/UI/Feedback.js          |  6 ++----
 modules/statistics/CallStats.js | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/modules/UI/Feedback.js b/modules/UI/Feedback.js
index baf53447c..c9bbea0d6 100644
--- a/modules/UI/Feedback.js
+++ b/modules/UI/Feedback.js
@@ -79,7 +79,7 @@ var Feedback = {
     init: function () {
         // CallStats is the way we send feedback, so we don't have to initialise
         // if callstats isn't enabled.
-        if (!config.callStatsID || !config.callStatsSecret)
+        if (!callStats.isEnabled())
             return;
 
         $("div.feedbackButton").css("display", "block");
@@ -93,9 +93,7 @@ var Feedback = {
      * @return true if the feedback functionality is enabled, false otherwise.
      */
     isEnabled: function() {
-        var isCallStatsEnabled = (config.callStatsID && config.callStatsSecret);
-
-        return isCallStatsEnabled;
+        return callStats.isEnabled();
     },
     /**
      * Opens the feedback window.
diff --git a/modules/statistics/CallStats.js b/modules/statistics/CallStats.js
index 3ba54286f..73327f0aa 100644
--- a/modules/statistics/CallStats.js
+++ b/modules/statistics/CallStats.js
@@ -67,6 +67,16 @@ var CallStats = {
             pendingErrors.length = 0;
         }
     },
+    /**
+     * Returns true if the callstats integration is enabled, otherwise returns
+     * false.
+     *
+     * @returns true if the callstats integration is enabled, otherwise returns
+     * false.
+     */
+    isEnabled: function() {
+        return callStatsIntegrationEnabled;
+    },
     pcCallback: function (err, msg) {
         if (!callStats) {
             return;
@@ -125,7 +135,14 @@ var CallStats = {
         callStats.sendUserFeedback(
             this.confID, feedbackJSON);
     },
-
+    /**
+     * Reports an error to callstats.
+     *
+     * @param type the type of the error, which will be one of the wrtcFuncNames
+     * @param e the error
+     * @param pc the peerconnection
+     * @private
+     */
     _reportError: function (type, e, pc) {
         if (callStats) {
             callStats.reportError(pc, this.confID, type, e);

From 19d9c0be50f75fabd91696c8560b1246f2b58e86 Mon Sep 17 00:00:00 2001
From: isymchych <ivansymchych@gmail.com>
Date: Thu, 19 Nov 2015 14:32:07 +0200
Subject: [PATCH 13/44] fixed switching to large video from FF on safari

---
 modules/UI/videolayout/SmallVideo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js
index 3d5e7acd2..8186fdffc 100644
--- a/modules/UI/videolayout/SmallVideo.js
+++ b/modules/UI/videolayout/SmallVideo.js
@@ -322,7 +322,7 @@ SmallVideo.prototype.selectVideoElement = function () {
     } else {
         return $('#' + this.videoSpanId +
                (this.isLocal ? '>>' : '>') +
-               videoElem + '>param[value="video"]').parent();
+                 videoElem + '>param[value="video"]').first().parent();
     }
 };
 

From de311b137291cc2ad91ae3689d456fa549d3f20c Mon Sep 17 00:00:00 2001
From: hristoterezov <hristo@jitsi.org>
Date: Thu, 19 Nov 2015 16:21:10 -0600
Subject: [PATCH 14/44] Updates gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 501a87349..d04786e1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ node_modules
 deploy-local.sh
 libs/app.bundle.*
 all.css
+.remote-sync.json

From 1d59283518c831a06237f85d663fc15edbfa52ff Mon Sep 17 00:00:00 2001
From: isymchych <ivansymchych@gmail.com>
Date: Thu, 19 Nov 2015 14:32:07 +0200
Subject: [PATCH 15/44] fixed switching to large video from FF on safari

---
 modules/UI/videolayout/SmallVideo.js | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js
index 3d5e7acd2..67ed2e986 100644
--- a/modules/UI/videolayout/SmallVideo.js
+++ b/modules/UI/videolayout/SmallVideo.js
@@ -320,9 +320,26 @@ SmallVideo.prototype.selectVideoElement = function () {
     if (!RTCBrowserType.isTemasysPluginUsed()) {
         return $('#' + this.videoSpanId).find(videoElem);
     } else {
-        return $('#' + this.videoSpanId +
-               (this.isLocal ? '>>' : '>') +
-               videoElem + '>param[value="video"]').parent();
+        var matching = $('#' + this.videoSpanId +
+                         (this.isLocal ? '>>' : '>') +
+                         videoElem + '>param[value="video"]');
+        if (matching.length < 2) {
+            return matching.parent();
+        }
+
+        // there are 2 video objects from FF
+        // object with id which ends with '_default' (like 'remoteVideo_default')
+        // doesn't contain video, so we ignore it
+        for (var i = 0; i < matching.length; i += 1) {
+            var el = matching[i].parentNode;
+
+            // check id suffix
+            if (el.id.substr(-8) !== '_default') {
+                return $(el);
+            }
+        }
+
+        return $([]);
     }
 };
 

From c3f9226ec8b90c6161f343e1fa040215d6afb8db Mon Sep 17 00:00:00 2001
From: George Politis <gp@jitsi.org>
Date: Mon, 23 Nov 2015 15:54:10 -0600
Subject: [PATCH 16/44] Updates the supported browser list and closes #372.

- Adds Safari and IE in the supported browser list.
- Adds version numbers for the supported browsers.
---
 css/unsupported_browser.css |  40 ++++++++++++++++++++++++++----------
 images/ie.png               | Bin 0 -> 4167 bytes
 images/safari.png           | Bin 0 -> 12912 bytes
 unsupported_browser.html    |  25 ++++++++++++++++++----
 4 files changed, 50 insertions(+), 15 deletions(-)
 create mode 100644 images/ie.png
 create mode 100644 images/safari.png

diff --git a/css/unsupported_browser.css b/css/unsupported_browser.css
index 847103b91..65744b12d 100644
--- a/css/unsupported_browser.css
+++ b/css/unsupported_browser.css
@@ -11,8 +11,8 @@ body {
 #wrap{
     display: block;
     position: absolute;
-    width:900px;
-    height: 365px;
+    width:500px;
+    height: 565px;
     overflow:hidden;
     text-align: center;
     margin: auto;
@@ -29,7 +29,7 @@ body {
 #text{
     display:inline-block;
     font-size: 28px;
-    width: 568px;
+    /* width: 568px; */
     vertical-align:middle;
     padding-top: 25px;
 }
@@ -51,18 +51,23 @@ a {
 .browser_wrapper
 {
     width: 138px;
-    height: 188px;
+    /* height: 188px; */
     vertical-align: middle;
     color: #929391;
     font-size: 20px;
     float: left;
     margin-left: 15px;
+    margin-top: 5px;
 }
 
+.browser_text
+{
+    height: 2em;
+}
 .supported_browsers
 {
     margin: 0px auto 0px auto;
-    width: 660px;
+    /* width: 660px; */
 }
 
 .clear
@@ -97,14 +102,14 @@ a {
 }
 #chromium_logo
 {
-    width: 85px;
-    height: 79px;
+    width: 77px;
+    height: 78px;
     background-image: url('/images/chromium.png');
 }
 #firefox_logo
 {
-    width: 73px;
-    height: 79px;
+    width: 86px;
+    height: 80px;
     background-image: url('/images/firefox.png');
 }
 
@@ -114,5 +119,18 @@ a {
     height: 78px;
     background-image: url('/images/opera.png');
 }
-   
-   
+
+#safari_logo
+{
+    width: 78px;
+    height: 79px;
+    background-image: url('/images/safari.png');
+}
+
+#ie_logo
+{
+    width: 80px;
+    height: 78px;
+    background-image: url('/images/ie.png');
+}
+
diff --git a/images/ie.png b/images/ie.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d8e2a95dc5003c91660510683ff34a1bdaf2604
GIT binary patch
literal 4167
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
M#J~byrSBH^KVUqCbN~PV

literal 0
HcmV?d00001

diff --git a/images/safari.png b/images/safari.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cc2983723dfb12f61cb0be4d22a142ffc7ca218
GIT binary patch
literal 12912
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
X{{I0w0DDB(0JyI*D$=!*rlJ1>F$h<k

literal 0
HcmV?d00001

diff --git a/unsupported_browser.html b/unsupported_browser.html
index 68981fbab..94728c2ca 100644
--- a/unsupported_browser.html
+++ b/unsupported_browser.html
@@ -12,33 +12,50 @@
 
     <div class="supported_browsers">
         <div class="browser_wrapper">
-            Chrome
+            Chrome 44+
             <div class="browser">
                 <div class="logo" id="chrome_logo"></div>
                 <a href="http://google.com/chrome"><div class="button">DOWNLOAD</div></a>
             </div>
         </div>
         <div class="browser_wrapper">
-            Chromium
+            Chromium 44+
             <div class="browser">
                 <div class="logo" id="chromium_logo"></div>
                 <a href="http://www.chromium.org/"><div class="button">DOWNLOAD</div></a>
             </div>
         </div>
         <div class="browser_wrapper">
-            Opera
+            Opera 32+
             <div class="browser">
                 <div class="logo" id="opera_logo"></div>
                 <a href="http://www.opera.com"><div class="button">DOWNLOAD</div></a>
             </div>
         </div>
         <div class="browser_wrapper">
-            Firefox
+            <div class="browser_text">
+                Firefox and Iceweasel 40+</div>
             <div class="browser">
                 <div class="logo" id="firefox_logo"></div>
                 <a href="http://www.getfirefox.com/"><div class="button">DOWNLOAD</div></a>
             </div>
         </div>
+        <div class="browser_wrapper">
+            <div class="browser_text">
+                IE <br /> <span style="font-size: small">(Temasys 0.8.854+)</span></div>
+            <div class="browser">
+                <div class="logo" id="ie_logo"></div>
+                <a href="https://temasys.atlassian.net/wiki/display/TWPP/WebRTC+Plugins"><div class="button">DOWNLOAD</div></a>
+            </div>
+        </div>
+        <div class="browser_wrapper">
+            <div class="browser_text">
+                Safari <br /> <span style="font-size: small">(Temasys 0.8.854+)</span></div>
+            <div class="browser">
+                <div class="logo" id="safari_logo"></div>
+                <a href="https://temasys.atlassian.net/wiki/display/TWPP/WebRTC+Plugins"><div class="button">DOWNLOAD</div></a>
+            </div>
+        </div>
     </div>
     <div class="clear"></div>
 </div>

From 6b621654abb0c33c9abcf2be20e0a3cb419f57a4 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Mon, 23 Nov 2015 17:30:09 -0600
Subject: [PATCH 17/44] Adds speaker indicator and no longer use the display
 name for that purpose.

---
 css/videolayout_default.css           | 21 ++++++++++++++++
 interface_config.js                   |  1 -
 modules/UI/videolayout/RemoteVideo.js | 35 +++++++++++++++++++++++++++
 modules/UI/videolayout/VideoLayout.js | 18 ++++++--------
 4 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/css/videolayout_default.css b/css/videolayout_default.css
index 02649ca18..02a71eafa 100644
--- a/css/videolayout_default.css
+++ b/css/videolayout_default.css
@@ -319,6 +319,27 @@
     z-index: 3;
 }
 
+.videocontainer>span.dominantspeakerindicator {
+    bottom: 0px;
+    left: 0px;
+    width: 25px;
+    height: 25px;
+    z-index: 3;
+    text-align: center;
+    border-radius: 50%;
+    background: #0cf;
+    margin: 5px;
+    display: inline-block;
+    position: absolute;
+    color: #FFFFFF;
+    font-size: 11pt;
+    border: 0px;
+}
+
+#speakerindicatoricon {
+    padding-top: 5px;
+}
+
 #reloadPresentation {
     display: none;
     position: absolute;
diff --git a/interface_config.js b/interface_config.js
index d6dec390e..3078707e0 100644
--- a/interface_config.js
+++ b/interface_config.js
@@ -5,7 +5,6 @@ var interfaceConfig = {
     INITIAL_TOOLBAR_TIMEOUT: 20000,
     TOOLBAR_TIMEOUT: 4000,
     DEFAULT_REMOTE_DISPLAY_NAME: "Fellow Jitster",
-    DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME: "speaker",
     DEFAULT_LOCAL_DISPLAY_NAME: "me",
     SHOW_JITSI_WATERMARK: true,
     JITSI_WATERMARK_LINK: "https://jitsi.org",
diff --git a/modules/UI/videolayout/RemoteVideo.js b/modules/UI/videolayout/RemoteVideo.js
index 4812bc720..7fafb0337 100644
--- a/modules/UI/videolayout/RemoteVideo.js
+++ b/modules/UI/videolayout/RemoteVideo.js
@@ -334,6 +334,41 @@ RemoteVideo.prototype.updateRemoteVideoMenu = function (isMuted) {
     }
 };
 
+/**
+ * Updates the Indicator for dominant speaker.
+ *
+ * @param isSpeaker indicates the current indicator state
+ */
+RemoteVideo.prototype.updateDominantSpeakerIndicator = function (isSpeaker) {
+
+    if (!this.container) {
+        console.warn( "Unable to set dominant speaker indicator - "
+            + this.videoSpanId + " does not exist");
+        return;
+    }
+
+    var indicatorSpan
+        = $('#' + this.videoSpanId + '>span.dominantspeakerindicator');
+
+    // If we do not have an indicator for this video.
+    if (indicatorSpan.length <= 0) {
+        indicatorSpan = document.createElement('span');
+
+        indicatorSpan.innerHTML
+            = "<i id='speakerindicatoricon' class='fa fa-bullhorn'></i>";
+        indicatorSpan.className = 'dominantspeakerindicator';
+
+        $('#' + this.videoSpanId)[0].appendChild(indicatorSpan);
+
+        // adds a tooltip
+        UIUtils.setTooltip(indicatorSpan, "speaker", "left");
+        APP.translation.translateElement($(indicatorSpan));
+    }
+
+    $(indicatorSpan).css("visibility", isSpeaker ? "visible" : "hidden");
+};
+
+
 /**
  * Sets the display name for the given video span id.
  */
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index a17b5f506..a22ac90e8 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -614,16 +614,14 @@ var VideoLayout = (function (my) {
         var members = APP.xmpp.getMembers();
         // Update the current dominant speaker.
         if (resourceJid !== currentDominantSpeaker) {
-            var currentJID = APP.xmpp.findJidFromResource(currentDominantSpeaker);
-            var newJID = APP.xmpp.findJidFromResource(resourceJid);
-            if (currentDominantSpeaker && (!members || !members[currentJID] ||
-                !members[currentJID].displayName) && remoteVideo) {
-                remoteVideo.setDisplayName(null);
-            }
-            if (resourceJid && (!members || !members[newJID] ||
-                !members[newJID].displayName) && remoteVideo) {
-                remoteVideo.setDisplayName(null,
-                    interfaceConfig.DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME);
+            if (remoteVideo) {
+                remoteVideo.updateDominantSpeakerIndicator(true);
+                // let's remove the indications from the remote video if any
+                var oldSpeakerRemoteVideo
+                    = remoteVideos[currentDominantSpeaker];
+                if (oldSpeakerRemoteVideo) {
+                    oldSpeakerRemoteVideo.updateDominantSpeakerIndicator(false);
+                }
             }
             currentDominantSpeaker = resourceJid;
         } else {

From c5b3677e71aa287376f075df25e85bb379a85f49 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Tue, 24 Nov 2015 13:10:29 -0600
Subject: [PATCH 18/44] Updates sdp-interop and sdp-transform versions, thanks
 to virtuacoplenny.

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0d3606b2b..9e74f9791 100644
--- a/package.json
+++ b/package.json
@@ -27,9 +27,9 @@
     "jssha": "1.5.0",
     "pako": "*",
     "retry": "0.6.1",
-    "sdp-interop": "0.1.10",
+    "sdp-interop": "0.1.11",
     "sdp-simulcast": "0.1.2",
-    "sdp-transform": "1.4.1",
+    "sdp-transform": "1.5.2",
     "socket.io-client": "1.3.6",
     "strophe": "^1.2.2",
     "strophejs-plugins": "^0.0.6",

From b2a3866fe42c0a99599203cb23f6745b7d61e8f8 Mon Sep 17 00:00:00 2001
From: bgrozev <boris@jitsi.org>
Date: Wed, 25 Nov 2015 15:46:41 -0600
Subject: [PATCH 19/44] Fixes a typo (reported by Emil Ivov)

---
 modules/util/RoomnameGenerator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/util/RoomnameGenerator.js b/modules/util/RoomnameGenerator.js
index 198838091..4ed55d16e 100644
--- a/modules/util/RoomnameGenerator.js
+++ b/modules/util/RoomnameGenerator.js
@@ -16,7 +16,7 @@ var pluralNouns = [
     "Priests", "Rats", "Reptiles", "Reptilians", "Rhinos", "Seagulls", "Sheep",
     "Siblings", "Snakes", "Spaghetti", "Spiders", "Squid", "Squirrels",
     "Stars", "Students", "Teachers", "Tigers", "Tomatoes", "Trees", "Vampires",
-    "Vegetables", "Viruses", "Vulcans", "Warewolves", "Weasels", "Whales",
+    "Vegetables", "Viruses", "Vulcans", "Weasels", "Werewolves", "Whales",
     "Witches", "Wizards", "Wolves", "Workers", "Worms", "Zebras"
 ];
 //var places = [

From 286225e81e0a9eeefa346ec90291584088dc033d Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Wed, 25 Nov 2015 11:56:58 -0600
Subject: [PATCH 20/44] Removes unused code used to inject local SSRCs.

---
 modules/xmpp/JingleSessionPC.js | 14 ++------------
 modules/xmpp/SDP.js             |  8 ++------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/modules/xmpp/JingleSessionPC.js b/modules/xmpp/JingleSessionPC.js
index 6500e6186..e7772a9d4 100644
--- a/modules/xmpp/JingleSessionPC.js
+++ b/modules/xmpp/JingleSessionPC.js
@@ -40,7 +40,6 @@ function JingleSessionPC(me, sid, connection, service, eventEmitter) {
     this.switchstreams = false;
 
     this.wait = true;
-    this.localStreamsSSRC = null;
     this.ssrcOwners = {};
     this.ssrcVideoTypes = {};
     this.eventEmitter = eventEmitter;
@@ -256,8 +255,7 @@ JingleSessionPC.prototype.accept = function () {
     // FIXME why do we generate session-accept in 3 different places ?
     prsdp.toJingle(
         accept,
-        this.initiator == this.me ? 'initiator' : 'responder',
-        this.localStreamsSSRC);
+        this.initiator == this.me ? 'initiator' : 'responder');
     var sdp = this.peerconnection.localDescription.sdp;
     while (SDPUtil.find_line(sdp, 'a=inactive')) {
         // FIXME: change any inactive to sendrecv or whatever they were originally
@@ -484,8 +482,7 @@ JingleSessionPC.prototype.createdOffer = function (sdp) {
                 sid: this.sid});
         self.localSDP.toJingle(
             init,
-            this.initiator == this.me ? 'initiator' : 'responder',
-            this.localStreamsSSRC);
+            this.initiator == this.me ? 'initiator' : 'responder');
 
         SSRCReplacement.processSessionInit(init);
 
@@ -1429,13 +1426,6 @@ JingleSessionPC.prototype.setLocalDescription = function () {
                 });
             });
         }
-        else if(self.localStreamsSSRC && self.localStreamsSSRC[media.type])
-        {
-            newssrcs.push({
-                'ssrc': self.localStreamsSSRC[media.type],
-                'type': media.type
-            });
-        }
 
     });
 
diff --git a/modules/xmpp/SDP.js b/modules/xmpp/SDP.js
index bacbe77ed..fc24b4d34 100644
--- a/modules/xmpp/SDP.js
+++ b/modules/xmpp/SDP.js
@@ -139,7 +139,7 @@ SDP.prototype.removeMediaLines = function(mediaindex, prefix) {
 };
 
 // add content's to a jingle element
-SDP.prototype.toJingle = function (elem, thecreator, ssrcs) {
+SDP.prototype.toJingle = function (elem, thecreator) {
 //    console.log("SSRC" + ssrcs["audio"] + " - " + ssrcs["video"]);
     var i, j, k, mline, ssrc, rtpmap, tmp, lines;
     // new bundle plan
@@ -166,11 +166,7 @@ SDP.prototype.toJingle = function (elem, thecreator, ssrcs) {
         if (SDPUtil.find_line(this.media[i], 'a=ssrc:')) {
             ssrc = SDPUtil.find_line(this.media[i], 'a=ssrc:').substring(7).split(' ')[0]; // take the first
         } else {
-            if(ssrcs && ssrcs[mline.media]) {
-                ssrc = ssrcs[mline.media];
-            } else {
-                ssrc = false;
-            }
+            ssrc = false;
         }
 
         elem.c('content', {creator: thecreator, name: mline.media});

From 0a7cea26b3be3ce58f7fd42ae5d7341453b6bee3 Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Wed, 25 Nov 2015 16:05:58 -0600
Subject: [PATCH 21/44] Exposes methods for obtaining stream SSRCs and audio
 levels.

---
 modules/statistics/statistics.js | 16 ++++++++++++++++
 modules/xmpp/JingleSessionPC.js  | 16 ++++++++++++++++
 modules/xmpp/xmpp.js             | 13 +++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/modules/statistics/statistics.js b/modules/statistics/statistics.js
index 9f63b0786..00bf4c0ca 100644
--- a/modules/statistics/statistics.js
+++ b/modules/statistics/statistics.js
@@ -137,6 +137,22 @@ var statistics = {
                 CallStats.sendAddIceCandidateFailed(e, pc);
             }
         );
+    },
+    /**
+     * Obtains audio level reported in the stats for specified peer.
+     * @param peerJid full MUC jid of the user for whom we want to obtain last
+     *        audio level.
+     * @param ssrc the SSRC of audio stream for which we want to obtain audio
+     *        level.
+     * @returns {*} a float form 0 to 1 that represents current audio level or
+     *              <tt>null</tt> if for any reason the value is not available
+     *              at this time.
+     */
+    getPeerSSRCAudioLevel: function (peerJid, ssrc) {
+
+        var peerStats = rtpStats.jid2stats[peerJid];
+
+        return peerStats ? peerStats.ssrc2AudioLevel[ssrc] : null;
     }
 };
 
diff --git a/modules/xmpp/JingleSessionPC.js b/modules/xmpp/JingleSessionPC.js
index e7772a9d4..dc53b6e01 100644
--- a/modules/xmpp/JingleSessionPC.js
+++ b/modules/xmpp/JingleSessionPC.js
@@ -40,6 +40,11 @@ function JingleSessionPC(me, sid, connection, service, eventEmitter) {
     this.switchstreams = false;
 
     this.wait = true;
+    /**
+     * A map that stores SSRCs of local streams
+     * @type {{}} maps media type('audio' or 'video') to SSRC number
+     */
+    this.localStreamsSSRC = {};
     this.ssrcOwners = {};
     this.ssrcVideoTypes = {};
     this.eventEmitter = eventEmitter;
@@ -552,6 +557,15 @@ JingleSessionPC.prototype.getSsrcOwner = function (ssrc) {
     return this.ssrcOwners[ssrc];
 };
 
+/**
+ * Returns the SSRC of local audio stream.
+ * @param mediaType 'audio' or 'video' media type
+ * @returns {*} the SSRC number of local audio or video stream.
+ */
+JingleSessionPC.prototype.getLocalSSRC = function (mediaType) {
+    return this.localStreamsSSRC[mediaType];
+};
+
 JingleSessionPC.prototype.setRemoteDescription = function (elem, desctype) {
     this.remoteSDP = new SDP('');
     if (config.webrtcIceTcpDisable) {
@@ -1424,6 +1438,8 @@ JingleSessionPC.prototype.setLocalDescription = function () {
                     'ssrc': ssrc.id,
                     'type': media.type
                 });
+                // FIXME allows for only one SSRC per media type
+                self.localStreamsSSRC[media.type] = ssrc.id;
             });
         }
 
diff --git a/modules/xmpp/xmpp.js b/modules/xmpp/xmpp.js
index 3a980a5a4..0e90713d2 100644
--- a/modules/xmpp/xmpp.js
+++ b/modules/xmpp/xmpp.js
@@ -596,6 +596,19 @@ var XMPP = {
             return null;
         return connection.jingle.activecall.getSsrcOwner(ssrc);
     },
+    /**
+     * Gets the SSRC of local media stream.
+     * @param mediaType the media type that tells whether we want to get
+     *        the SSRC of local audio or video stream.
+     * @returns {*} the SSRC number for local media stream or <tt>null</tt> if
+     *              not available.
+     */
+    getLocalSSRC: function (mediaType) {
+        if (!this.isConferenceInProgress()) {
+            return null;
+        }
+        return connection.jingle.activecall.getLocalSSRC(mediaType);
+    },
     // Returns true iff we have joined the MUC.
     isMUCJoined: function () {
         return connection === null ? false : connection.emuc.joined;

From b6786716074b8d5835de3a30b2b376f2a20707ae Mon Sep 17 00:00:00 2001
From: George Politis <gp@jitsi.org>
Date: Tue, 1 Dec 2015 13:24:15 -0600
Subject: [PATCH 22/44] Revert "Sets up simulcast for 2 layers."

This reverts commit b2993d8cf3f647c3194257eef0b21b77026b7bef.
---
 modules/xmpp/TraceablePeerConnection.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/xmpp/TraceablePeerConnection.js b/modules/xmpp/TraceablePeerConnection.js
index 5b006feb5..eb8771387 100644
--- a/modules/xmpp/TraceablePeerConnection.js
+++ b/modules/xmpp/TraceablePeerConnection.js
@@ -25,7 +25,7 @@ function TraceablePeerConnection(ice_config, constraints, session) {
     var Interop = require('sdp-interop').Interop;
     this.interop = new Interop();
     var Simulcast = require('sdp-simulcast');
-    this.simulcast = new Simulcast({numOfLayers: 2, explodeRemoteSimulcast: false});
+    this.simulcast = new Simulcast({numOfLayers: 3, explodeRemoteSimulcast: false});
 
     // override as desired
     this.trace = function (what, info) {
@@ -218,8 +218,6 @@ if (TraceablePeerConnection.prototype.__defineGetter__ !== undefined) {
         function() {
             var desc = this.peerconnection.localDescription;
 
-            // TODO this should be after the Unified Plan -> Plan B
-            // transformation.
             desc = SSRCReplacement.mungeLocalVideoSSRC(desc);
 
             this.trace('getLocalDescription::preTransform', dumpSDP(desc));

From d42415959facddca687197c5a9b509ca91bce149 Mon Sep 17 00:00:00 2001
From: George Politis <gp@jitsi.org>
Date: Tue, 1 Dec 2015 13:25:20 -0600
Subject: [PATCH 23/44] Adds comment.

---
 modules/xmpp/TraceablePeerConnection.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/xmpp/TraceablePeerConnection.js b/modules/xmpp/TraceablePeerConnection.js
index eb8771387..7df5bd8a5 100644
--- a/modules/xmpp/TraceablePeerConnection.js
+++ b/modules/xmpp/TraceablePeerConnection.js
@@ -218,6 +218,8 @@ if (TraceablePeerConnection.prototype.__defineGetter__ !== undefined) {
         function() {
             var desc = this.peerconnection.localDescription;
 
+            // FIXME this should probably be after the Unified Plan -> Plan B
+            // transformation.
             desc = SSRCReplacement.mungeLocalVideoSSRC(desc);
 
             this.trace('getLocalDescription::preTransform', dumpSDP(desc));

From d7317a94bb74e049ac47f253db1fe84d8cc63fb9 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Wed, 2 Dec 2015 16:35:00 -0600
Subject: [PATCH 24/44] Converts ssltcp candidate to tcp one on FF.

---
 modules/xmpp/SDPUtil.js | 13 +++++++++++--
 package.json            |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/xmpp/SDPUtil.js b/modules/xmpp/SDPUtil.js
index ad581fc06..ed1057050 100644
--- a/modules/xmpp/SDPUtil.js
+++ b/modules/xmpp/SDPUtil.js
@@ -1,4 +1,6 @@
 /* jshint -W101 */
+var RTCBrowserType = require("../RTC/RTCBrowserType");
+
 var SDPUtil = {
     filter_special_chars: function (text) {
         return text.replace(/[\\\/\{,\}\+]/g, "");
@@ -311,7 +313,14 @@ var SDPUtil = {
         line += ' ';
         line += cand.getAttribute('component');
         line += ' ';
-        line += cand.getAttribute('protocol'); //.toUpperCase(); // chrome M23 doesn't like this
+
+        var protocol = cand.getAttribute('protocol');
+        // use tcp candidates for FF
+        if (RTCBrowserType.isFirefox() && protocol.toLowerCase() == 'ssltcp') {
+            protocol = 'tcp';
+        }
+
+        line += protocol; //.toUpperCase(); // chrome M23 doesn't like this
         line += ' ';
         line += cand.getAttribute('priority');
         line += ' ';
@@ -338,7 +347,7 @@ var SDPUtil = {
                 }
                 break;
         }
-        if (cand.getAttribute('protocol').toLowerCase() == 'tcp') {
+        if (protocol.toLowerCase() == 'tcp') {
             line += 'tcptype';
             line += ' ';
             line += cand.getAttribute('tcptype');
diff --git a/package.json b/package.json
index 9e74f9791..c133f3c07 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,8 @@
     "pako": "*",
     "retry": "0.6.1",
     "sdp-interop": "0.1.11",
-    "sdp-simulcast": "0.1.2",
-    "sdp-transform": "1.5.2",
+    "sdp-simulcast": "0.1.3",
+    "sdp-transform": "1.5.*",
     "socket.io-client": "1.3.6",
     "strophe": "^1.2.2",
     "strophejs-plugins": "^0.0.6",

From 09a509400fc822e4e288787283cf7157711be37e Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Fri, 4 Dec 2015 10:38:42 -0600
Subject: [PATCH 25/44] Fixes showing prezi button.

---
 modules/UI/toolbars/Toolbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js
index 092858101..b60d87b74 100644
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -396,7 +396,7 @@ var Toolbar = (function (my) {
      * Disables and enables some of the buttons.
      */
     my.setupButtonsFromConfig = function () {
-        if (UIUtil.isButtonEnabled('prezi')) {
+        if (!UIUtil.isButtonEnabled('prezi')) {
             $("#toolbar_button_prezi").css({display: "none"});
         }
     };

From 5f6bba435c2ba0ff566bca5ba575ab7e2fb0432e Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Fri, 4 Dec 2015 11:30:11 -0600
Subject: [PATCH 26/44] Fixes Uncaught TypeError: mediaStream.detachEvent on
 stopping desktop sharing.

---
 modules/RTC/RTC.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/RTC/RTC.js b/modules/RTC/RTC.js
index 790e81708..79d212f21 100644
--- a/modules/RTC/RTC.js
+++ b/modules/RTC/RTC.js
@@ -300,18 +300,18 @@ var RTC = {
      * @param handler the handler
      */
     addMediaStreamInactiveHandler: function (mediaStream, handler) {
-        if (mediaStream.addEventListener) {
-            // chrome
-            if(typeof mediaStream.active !== "undefined")
-                mediaStream.oninactive = handler;
-            else
-                mediaStream.onended = handler;
-        } else {
+        if(RTCBrowserType.isTemasysPluginUsed()) {
             // themasys
             mediaStream.attachEvent('ended', function () {
                 handler(mediaStream);
             });
         }
+        else {
+            if(typeof mediaStream.active !== "undefined")
+                mediaStream.oninactive = handler;
+            else
+                mediaStream.onended = handler;
+        }
     },
     /**
      * Removes onended/inactive handler.
@@ -319,15 +319,15 @@ var RTC = {
      * @param handler the handler to remove.
      */
     removeMediaStreamInactiveHandler: function (mediaStream, handler) {
-        if (mediaStream.removeEventListener) {
-            // chrome
+        if(RTCBrowserType.isTemasysPluginUsed()) {
+            // themasys
+            mediaStream.detachEvent('ended', handler);
+        }
+        else {
             if(typeof mediaStream.active !== "undefined")
                 mediaStream.oninactive = null;
             else
                 mediaStream.onended = null;
-        } else {
-            // themasys
-            mediaStream.detachEvent('ended', handler);
         }
     }
 };

From 3f42f8bf671a44cb6662dda98a16454526dd43ba Mon Sep 17 00:00:00 2001
From: Jesse Bickel <bickelj@gmail.com>
Date: Fri, 4 Dec 2015 13:03:10 -0600
Subject: [PATCH 27/44] Only load 3rd party JavaScript when
 config.enableThirdPartyRequests is true.

---
 config.js  |  1 +
 index.html | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/config.js b/config.js
index 90bbd6410..1bb3d1563 100644
--- a/config.js
+++ b/config.js
@@ -69,4 +69,5 @@ var config = {
     /*noticeMessage: 'Service update is scheduled for 16th March 2015. ' +
     'During that time service will not be available. ' +
     'Apologise for inconvenience.'*/
+    enableThirdPartyRequests: true
 };
diff --git a/index.html b/index.html
index 93681fc6d..facee3d0e 100644
--- a/index.html
+++ b/index.html
@@ -11,11 +11,9 @@
     <meta itemprop="image" content="/images/jitsilogo.png?v=1"/>
       <link rel="stylesheet" href="css/all.css"/>
     <script>console.log("(TIME) index.html loaded:\t", window.performance.now());</script>
-    <script src="https://api.callstats.io/static/callstats.min.js"></script>
     <script src="config.js?v=15"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
     <script src="interface_config.js?v=6"></script>
     <script src="libs/app.bundle.min.js?v=139"></script>
-    <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
     <!--
         Link used for inline installation of chrome desktop streaming extension,
         is updated automatically from the code with the value defined in config.js -->
@@ -224,5 +222,20 @@
             <a id="feedbackButton" data-container="body" data-toggle="popover" data-placement="right" data-i18n="[data-content]feedback"><i class="fa fa-heart"></i></a>
         </div>
     </div>
+    <script type="text/javascript">
+      if (config.enableThirdPartyRequests === true)
+      { 
+        [
+          'https://api.callstats.io/static/callstats.min.js',
+          'analytics.js?v=1'
+        ].forEach(function(extSrc) 
+        {
+          var extScript = document.createElement('script');
+          extScript.src = extSrc;
+          extScript.async = false;
+          document.head.appendChild(extScript);
+        });
+      }
+    </script>
   </body>
 </html>

From 895bb3fd608a7a13848909538fc957e24aa61383 Mon Sep 17 00:00:00 2001
From: Jesse Bickel <bickelj@gmail.com>
Date: Mon, 7 Dec 2015 14:41:35 -0600
Subject: [PATCH 28/44] Use gravatar when enabled.

---
 index.html                  |  2 +-
 modules/UI/avatar/Avatar.js | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index facee3d0e..8b134f2cc 100644
--- a/index.html
+++ b/index.html
@@ -201,7 +201,7 @@
         </div>
         <div id="settingsmenu" class="right-panel">
             <div class="icon-settings" data-i18n="settings.title"></div>
-            <img id="avatar" src="https://www.gravatar.com/avatar/87291c37c25be69a072a4514931b1749?d=wavatar&size=30"/>
+            <img id="avatar" src="images/avatar2.png"/>
             <div class="arrow-up"></div>
             <input type="text" id="setDisplayName" data-i18n="[placeholder]settings.name" placeholder="Name">
             <input type="text" id="setEmail" placeholder="E-Mail">
diff --git a/modules/UI/avatar/Avatar.js b/modules/UI/avatar/Avatar.js
index 6ab1327e4..d59f494c7 100644
--- a/modules/UI/avatar/Avatar.js
+++ b/modules/UI/avatar/Avatar.js
@@ -1,4 +1,4 @@
-/* global Strophe, APP, MD5 */
+/* global Strophe, APP, MD5, config */
 var Settings = require("../../settings/Settings");
 
 var users = {};
@@ -57,12 +57,16 @@ var Avatar = {
                 "No avatar stored yet for " + jid + " - using JID as ID");
             id = jid;
         }
-        return 'https://www.gravatar.com/avatar/' +
-            MD5.hexdigest(id.trim().toLowerCase()) +
-            "?d=wavatar&size=" + (size || "30");
+        if (config.enableThirdPartyRequests === true) {
+            return 'https://www.gravatar.com/avatar/' +
+                MD5.hexdigest(id.trim().toLowerCase()) +
+                "?d=wavatar&size=" + (size || "30");
+        } else {
+            return 'images/avatar2.png';
+        }
     }
 
 };
 
 
-module.exports = Avatar;
\ No newline at end of file
+module.exports = Avatar;

From c2c3d0fd8734c507c75ddd173ca905ddceafa160 Mon Sep 17 00:00:00 2001
From: Jesse Bickel <bickelj@gmail.com>
Date: Mon, 7 Dec 2015 15:52:11 -0600
Subject: [PATCH 29/44] Shrink the avatar on contact list to <=30px.

---
 css/contact_list.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/css/contact_list.css b/css/contact_list.css
index 4929cc90b..7dab8a523 100644
--- a/css/contact_list.css
+++ b/css/contact_list.css
@@ -44,6 +44,8 @@
     vertical-align: middle;
     font-size: 22pt;
     border-radius: 20px;
+    max-height: 30px;
+    max-width: 30px;
 }
 
 #contactlist .clickable {

From 3406802aa8d66abdcd8f85222c5a6b8b1fd212ab Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Wed, 18 Nov 2015 12:49:36 -0600
Subject: [PATCH 30/44] Uses JWT for token generation in prosody plugin.

---
 prosody-plugins/mod_auth_token.lua         |  3 +-
 prosody-plugins/mod_token_verification.lua | 19 ++++--
 prosody-plugins/token/util.lib.lua         | 78 ++++++----------------
 3 files changed, 35 insertions(+), 65 deletions(-)

diff --git a/prosody-plugins/mod_auth_token.lua b/prosody-plugins/mod_auth_token.lua
index bf2df1920..a8a899dac 100644
--- a/prosody-plugins/mod_auth_token.lua
+++ b/prosody-plugins/mod_auth_token.lua
@@ -27,10 +27,9 @@ local provider = {};
 
 local appId = module:get_option_string("app_id");
 local appSecret = module:get_option_string("app_secret");
-local tokenLifetime = module:get_option_number("token_lifetime");
 
 function provider.test_password(username, password)
-	local result, msg = token_util.verify_password(password, appId, appSecret, tokenLifetime);
+	local result, msg = token_util.verify_password(password, appId, appSecret, nil);
 	if result == true then
 		return true;
 	else
diff --git a/prosody-plugins/mod_token_verification.lua b/prosody-plugins/mod_token_verification.lua
index 08e1e53ec..79933040f 100644
--- a/prosody-plugins/mod_token_verification.lua
+++ b/prosody-plugins/mod_token_verification.lua
@@ -22,25 +22,34 @@ end
 
 local appId = parentCtx:get_option_string("app_id");
 local appSecret = parentCtx:get_option_string("app_secret");
-local tokenLifetime = parentCtx:get_option_string("token_lifetime");
 
-log("debug", "%s - starting MUC token verifier app_id: %s app_secret: %s token-lifetime: %s",
-	tostring(host), tostring(appId), tostring(appSecret), tostring(tokenLifetime));
+log("debug", "%s - starting MUC token verifier app_id: %s app_secret: %s",
+	tostring(host), tostring(appId), tostring(appSecret));
 
 local function handle_pre_create(event)
+
 	local origin, stanza = event.origin, event.stanza;	
 	local token = stanza:get_child("token", "http://jitsi.org/jitmeet/auth-token");
+
 	-- token not required for admin users
 	local user_jid = stanza.attr.from;	
 	if is_admin(user_jid) then
 		log("debug", "Token not required from admin user: %s", user_jid);
 		return nil;
 	end
-	log("debug", "Will verify token for user: %s ", user_jid);
+
+	local room = string.match(stanza.attr.to, "^(%w+)@");
+	log("debug", "Will verify token for user: %s, room: %s ", user_jid, room);
+	if room == nil then
+		log("error", "Unable to get name of the MUC room ? to: %s", stanza.attr.to);
+		return nil;
+	end
+
 	if token ~= nil then
 		token = token[1];
 	end
-	local result, msg = token_util.verify_password(token, appId, appSecret, tokenLifetime);
+
+	local result, msg = token_util.verify_password(token, appId, appSecret, room);
 	if result ~= true then
 		log("debug", "Token verification failed: %s", msg);
 		origin.send(st.error_reply(stanza, "cancel", "not-allowed", msg));
diff --git a/prosody-plugins/token/util.lib.lua b/prosody-plugins/token/util.lib.lua
index 64747e03a..6781f07b9 100644
--- a/prosody-plugins/token/util.lib.lua
+++ b/prosody-plugins/token/util.lib.lua
@@ -1,76 +1,38 @@
 -- Token authentication
 -- Copyright (C) 2015 Atlassian
 
-local hashes = require "util.hashes";
+local jwt = require "luajwt";
 
 local _M = {};
 
-local function calc_hash(password, appId, appSecret)
-	local hash, room, ts = string.match(password, "(%w+)_(%w+)_(%d+)");
-	if hash ~= nil and room ~= nil and ts ~= nil then
-		log("debug", "Hash: '%s' room: '%s', ts: '%s'", hash, room, ts);
-                local toHash = room .. ts .. appId .. appSecret;
-		log("debug", "to be hashed: '%s'", toHash);
-		local hash = hashes.sha256(toHash, true);
-		log("debug", "hash: '%s'", hash);
-		return hash;
-	else
-		log("error", "Invalid password format: '%s'", password);
-		return nil;
-	end
-end
+local function verify_password_impl(password, appId, appSecret, roomName)
 
-local function extract_hash(password)
-	local hash, room, ts = string.match(password, "(%w+)_(%w+)_(%d+)");
-	return hash;
-end
-
-local function extract_ts(password)
-	local hash, room, ts = string.match(password, "(%w+)_(%w+)_(%d+)");
-	return ts;
-end
-
-local function get_utc_timestamp()
-        return os.time(os.date("!*t")) * 1000;
-end
-
-local function verify_timestamp(ts, tokenLifetime)
-	return get_utc_timestamp() - ts <= tokenLifetime;
-end
-
-local function verify_password_impl(password, appId, appSecret, tokenLifetime)
-
-	if password == nil then
-   		return nil, "password is missing";
-        end
-
-	if tokenLifetime == nil then
-		tokenLifetime = 24 * 60 * 60 * 1000;
+	local claims, err = jwt.decode(password, appSecret, true);
+	if claims == nil then
+		return nil, err;
 	end
 
-	local ts = extract_ts(password);	
-	if ts == nil then
-		return nil, "timestamp not found in the password";
+	local issClaim = claims["iss"];
+	if issClaim == nil then
+		return nil, "Issuer field is missing";
 	end
-       	local os_ts = get_utc_timestamp();
-	log("debug", "System TS: '%s' user TS: %s", tostring(os_ts), tostring(ts));
-	local isValid = verify_timestamp(ts, tokenLifetime);
-	if not isValid then
-		return nil, "token expired";
+	if issClaim ~= appId then
+		return nil, "Invalid application ID('iss' claim)";
 	end
 
-	local realHash = calc_hash(password, appId, appSecret);
-	local givenhash = extract_hash(password);
-        log("debug", "Compare '%s' to '%s'", tostring(realHash), tostring(givenhash));
-	if realHash == givenhash then
-		return true;
-	else
-		return nil, "invalid hash";
+	local roomClaim = claims["room"];
+	if roomClaim == nil then
+		return nil, "Room field is missing";
 	end
+	if roomName ~= nil and roomName ~= roomClaim then
+		return nil, "Invalid room name('room' claim)";
+	end
+	
+	return true;
 end
 
-function _M.verify_password(password, appId, appSecret, tokenLifetime)
-	return verify_password_impl(password, appId, appSecret, tokenLifetime);
+function _M.verify_password(password, appId, appSecret, roomName)
+	return verify_password_impl(password, appId, appSecret, roomName);
 end
 
 return _M;

From 1e3ef532aa426176ba78c96b412744e96bc0a865 Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Fri, 20 Nov 2015 13:28:42 -0600
Subject: [PATCH 31/44] Adds 'enforcedBridge' property used to make Jicofo use
 specific bridge and ignore what BridgeSelector module says.

---
 modules/xmpp/moderator.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/xmpp/moderator.js b/modules/xmpp/moderator.js
index 0c32057dc..8d355d343 100644
--- a/modules/xmpp/moderator.js
+++ b/modules/xmpp/moderator.js
@@ -149,6 +149,14 @@ var Moderator = {
                 { name: 'bridge', value: config.hosts.bridge})
                 .up();
         }
+
+        if (config.enforcedBridge) {
+            elem.c(
+                'property',
+                { name: 'enforcedBridge', value: config.enforcedBridge})
+                .up();
+        }
+
         // Tell the focus we have Jigasi configured
         if (config.hosts.call_control !== undefined) {
             elem.c(

From f42684d7896061580ee10614bb05f8246e676bbc Mon Sep 17 00:00:00 2001
From: Boris Grozev <boris@jitsi.org>
Date: Tue, 8 Dec 2015 22:51:29 +0000
Subject: [PATCH 32/44] Changes enableThirdParty requests to disableThirdParty
 requests, in order to not change existing behaviour (without changes to
 config.js).

---
 config.js                   | 2 +-
 index.html                  | 6 ++----
 modules/UI/avatar/Avatar.js | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/config.js b/config.js
index 1bb3d1563..f180124f2 100644
--- a/config.js
+++ b/config.js
@@ -69,5 +69,5 @@ var config = {
     /*noticeMessage: 'Service update is scheduled for 16th March 2015. ' +
     'During that time service will not be available. ' +
     'Apologise for inconvenience.'*/
-    enableThirdPartyRequests: true
+    disableThirdPartyRequests: false
 };
diff --git a/index.html b/index.html
index 8b134f2cc..d66835e1d 100644
--- a/index.html
+++ b/index.html
@@ -223,13 +223,11 @@
         </div>
     </div>
     <script type="text/javascript">
-      if (config.enableThirdPartyRequests === true)
-      { 
+      if (!config.disableThirdPartyRequests) {
         [
           'https://api.callstats.io/static/callstats.min.js',
           'analytics.js?v=1'
-        ].forEach(function(extSrc) 
-        {
+        ].forEach(function(extSrc) {
           var extScript = document.createElement('script');
           extScript.src = extSrc;
           extScript.async = false;
diff --git a/modules/UI/avatar/Avatar.js b/modules/UI/avatar/Avatar.js
index d59f494c7..4a31d7582 100644
--- a/modules/UI/avatar/Avatar.js
+++ b/modules/UI/avatar/Avatar.js
@@ -57,7 +57,7 @@ var Avatar = {
                 "No avatar stored yet for " + jid + " - using JID as ID");
             id = jid;
         }
-        if (config.enableThirdPartyRequests === true) {
+        if (!config.disableThirdPartyRequests) {
             return 'https://www.gravatar.com/avatar/' +
                 MD5.hexdigest(id.trim().toLowerCase()) +
                 "?d=wavatar&size=" + (size || "30");

From a2c41392dd1bc93b468aead4917eb70e573ab785 Mon Sep 17 00:00:00 2001
From: Boris Grozev <boris@jitsi.org>
Date: Tue, 8 Dec 2015 17:19:51 -0600
Subject: [PATCH 33/44] Uses a single avatar URL, allows to override gravatar
 with a custom URL for avatars in interface_config.js.

---
 interface_config.js                           |  4 +-
 modules/UI/UI.js                              |  8 +-
 modules/UI/avatar/Avatar.js                   | 78 +++++++++----------
 .../side_pannels/contactlist/ContactList.js   |  6 +-
 modules/UI/videolayout/LargeVideo.js          |  2 +-
 modules/UI/videolayout/SmallVideo.js          |  2 +-
 modules/UI/videolayout/VideoLayout.js         |  6 +-
 7 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/interface_config.js b/interface_config.js
index 3078707e0..413640dda 100644
--- a/interface_config.js
+++ b/interface_config.js
@@ -27,5 +27,7 @@ var interfaceConfig = {
     /**
      * Whether to only show the filmstrip (and hide the toolbar).
      */
-    filmStripOnly: false
+    filmStripOnly: false,
+    RANDOM_AVATAR_URL_PREFIX: false,
+    RANDOM_AVATAR_URL_SUFFIX: false
 };
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 59070a3db..9b8ae0ce3 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -896,11 +896,11 @@ UI.setVideoMuteButtonsState = function (mute) {
     }
 };
 
-UI.userAvatarChanged = function (resourceJid, thumbUrl, contactListUrl) {
-    VideoLayout.userAvatarChanged(resourceJid, thumbUrl);
-    ContactList.userAvatarChanged(resourceJid, contactListUrl);
+UI.userAvatarChanged = function (resourceJid, avatarUrl) {
+    VideoLayout.userAvatarChanged(resourceJid, avatarUrl);
+    ContactList.userAvatarChanged(resourceJid, avatarUrl);
     if(resourceJid === APP.xmpp.myResource())
-        SettingsMenu.changeAvatar(thumbUrl);
+        SettingsMenu.changeAvatar(avatarUrl);
 };
 
 UI.setVideoMute = setVideoMute;
diff --git a/modules/UI/avatar/Avatar.js b/modules/UI/avatar/Avatar.js
index 4a31d7582..d785bffdd 100644
--- a/modules/UI/avatar/Avatar.js
+++ b/modules/UI/avatar/Avatar.js
@@ -1,4 +1,4 @@
-/* global Strophe, APP, MD5, config */
+/* global Strophe, APP, MD5, config, interfaceConfig */
 var Settings = require("../../settings/Settings");
 
 var users = {};
@@ -18,55 +18,51 @@ var Avatar = {
             }
             users[jid] = id;
         }
-        var thumbUrl = this.getThumbUrl(jid);
-        var contactListUrl = this.getContactListUrl(jid);
+        var avatarUrl = this.getAvatarUrl(jid);
         var resourceJid = Strophe.getResourceFromJid(jid);
 
-        APP.UI.userAvatarChanged(resourceJid, thumbUrl, contactListUrl);
+        APP.UI.userAvatarChanged(resourceJid, avatarUrl);
     },
     /**
-     * Returns image URL for the avatar to be displayed on large video area
-     * where current active speaker is presented.
+     * Returns the URL of the image for the avatar of a particular user,
+     * identified by its jid
+     * @param jid
      * @param jid full MUC jid of the user for whom we want to obtain avatar URL
      */
-    getActiveSpeakerUrl: function (jid) {
-        return this.getGravatarUrl(jid, 100);
-    },
-    /**
-     * Returns image URL for the avatar to be displayed on small video thumbnail
-     * @param jid full MUC jid of the user for whom we want to obtain avatar URL
-     */
-    getThumbUrl: function (jid) {
-        return this.getGravatarUrl(jid, 100);
-    },
-    /**
-     * Returns the URL for the avatar to be displayed as contactlist item
-     * @param jid full MUC jid of the user for whom we want to obtain avatar URL
-     */
-    getContactListUrl: function (jid) {
-        return this.getGravatarUrl(jid, 30);
-    },
-    getGravatarUrl: function (jid, size) {
-        if (!jid) {
-            console.error("Get gravatar - jid is undefined");
-            return null;
-        }
-        var id = users[jid];
-        if (!id) {
-            console.warn(
-                "No avatar stored yet for " + jid + " - using JID as ID");
-            id = jid;
-        }
-        if (!config.disableThirdPartyRequests) {
-            return 'https://www.gravatar.com/avatar/' +
-                MD5.hexdigest(id.trim().toLowerCase()) +
-                "?d=wavatar&size=" + (size || "30");
-        } else {
+    getAvatarUrl: function (jid) {
+        if (config.disableThirdPartyRequests) {
             return 'images/avatar2.png';
+        } else {
+            if (!jid) {
+                console.error("Get avatar - jid is undefined");
+                return null;
+            }
+            var id = users[jid];
+
+            // If the ID looks like an email, we'll use gravatar.
+            // Otherwise, it's a random avatar, and we'll use the configured
+            // URL.
+            var random = !id || id.indexOf('@') < 0;
+
+            if (!id) {
+                console.warn(
+                    "No avatar stored yet for " + jid + " - using JID as ID");
+                id = jid;
+            }
+            id = MD5.hexdigest(id.trim().toLowerCase());
+
+            // Default to using gravatar.
+            var urlPref = 'https://www.gravatar.com/avatar/';
+            var urlSuf = "?d=wavatar&size=100";
+
+            if (random && interfaceConfig.RANDOM_AVATAR_URL_PREFIX) {
+                urlPref = interfaceConfig.RANDOM_AVATAR_URL_PREFIX;
+                urlSuf = interfaceConfig.RANDOM_AVATAR_URL_SUFFIX;
+            }
+
+            return urlPref + id + urlSuf;
         }
     }
-
 };
 
-
 module.exports = Avatar;
diff --git a/modules/UI/side_pannels/contactlist/ContactList.js b/modules/UI/side_pannels/contactlist/ContactList.js
index 4e3c29466..4fdbb2795 100644
--- a/modules/UI/side_pannels/contactlist/ContactList.js
+++ b/modules/UI/side_pannels/contactlist/ContactList.js
@@ -32,7 +32,7 @@ function updateNumberOfParticipants(delta) {
 function createAvatar(jid) {
     var avatar = document.createElement('img');
     avatar.className = "icon-avatar avatar";
-    avatar.src = Avatar.getContactListUrl(jid);
+    avatar.src = Avatar.getAvatarUrl(jid);
 
     return avatar;
 }
@@ -181,11 +181,11 @@ var ContactList = {
             contactName.html(displayName);
     },
 
-    userAvatarChanged: function (resourceJid, contactListUrl) {
+    userAvatarChanged: function (resourceJid, avatarUrl) {
         // set the avatar in the contact list
         var contact = $('#' + resourceJid + '>img');
         if (contact && contact.length > 0) {
-            contact.get(0).src = contactListUrl;
+            contact.get(0).src = avatarUrl;
         }
 
     }
diff --git a/modules/UI/videolayout/LargeVideo.js b/modules/UI/videolayout/LargeVideo.js
index b32569e48..89243ee66 100644
--- a/modules/UI/videolayout/LargeVideo.js
+++ b/modules/UI/videolayout/LargeVideo.js
@@ -242,7 +242,7 @@ function getCameraVideoSize(videoWidth,
 function updateActiveSpeakerAvatarSrc() {
     var avatar = $("#activeSpeakerAvatar")[0];
     var jid = currentSmallVideo.peerJid;
-    var url = Avatar.getActiveSpeakerUrl(jid);
+    var url = Avatar.getAvatarUrl(jid);
     if (avatar.src === url)
         return;
     if (jid) {
diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js
index cea1e6a72..5352b22ee 100644
--- a/modules/UI/videolayout/SmallVideo.js
+++ b/modules/UI/videolayout/SmallVideo.js
@@ -369,7 +369,7 @@ SmallVideo.prototype.showAvatar = function (show) {
     if (!this.hasAvatar) {
         if (this.peerJid) {
             // Init avatar
-            this.avatarChanged(Avatar.getThumbUrl(this.peerJid));
+            this.avatarChanged(Avatar.getAvatarUrl(this.peerJid));
         } else {
             console.error("Unable to init avatar - no peerjid", this);
             return;
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index a22ac90e8..d98a18464 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -1005,14 +1005,14 @@ var VideoLayout = (function (my) {
         }
     };
 
-    my.userAvatarChanged = function(resourceJid, thumbUrl) {
+    my.userAvatarChanged = function(resourceJid, avatarUrl) {
         var smallVideo = VideoLayout.getSmallVideo(resourceJid);
         if(smallVideo)
-            smallVideo.avatarChanged(thumbUrl);
+            smallVideo.avatarChanged(avatarUrl);
         else
             console.warn(
                 "Missed avatar update - no small video yet for " + resourceJid);
-        LargeVideo.updateAvatar(resourceJid, thumbUrl);
+        LargeVideo.updateAvatar(resourceJid, avatarUrl);
     };
 
     my.createEtherpadIframe = function(src, onloadHandler)

From 08107ca95b666c7014ef35dfd524d6a29fdd0c4e Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Tue, 8 Dec 2015 18:58:12 -0600
Subject: [PATCH 34/44] Fixes retrieving correct local ssrc in FF. Fixes tests
 that were checking for audio levels.

---
 modules/xmpp/JingleSessionPC.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/xmpp/JingleSessionPC.js b/modules/xmpp/JingleSessionPC.js
index dc53b6e01..30c833086 100644
--- a/modules/xmpp/JingleSessionPC.js
+++ b/modules/xmpp/JingleSessionPC.js
@@ -1438,6 +1438,20 @@ JingleSessionPC.prototype.setLocalDescription = function () {
                     'ssrc': ssrc.id,
                     'type': media.type
                 });
+
+                // In FF we have multiple local SSRC per media type, 1 that is
+                // sending and some that are receive only. The
+                // localStramsSSRC['audio'] needs to be set to the one that is
+                // sending! We find it by checking for an msid. Note that
+                // self.localStreamsSSRC is primarily used by the tests atm.
+                var isSending = media.ssrcs.some(function (ssrc$1) {
+                    return ssrc$1.id == ssrc.id && ssrc$1.attribute == 'msid';
+                });
+
+                if (!isSending) {
+                    return;
+                }
+
                 // FIXME allows for only one SSRC per media type
                 self.localStreamsSSRC[media.type] = ssrc.id;
             });

From 75a822be6622342cd96c156a4395682aeb03efe0 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Tue, 8 Dec 2015 19:00:02 -0600
Subject: [PATCH 35/44] Removes second audio track for fake FF devices.

---
 modules/RTC/RTCUtils.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/RTC/RTCUtils.js b/modules/RTC/RTCUtils.js
index 67872b76f..761c805b4 100644
--- a/modules/RTC/RTCUtils.js
+++ b/modules/RTC/RTCUtils.js
@@ -146,7 +146,9 @@ function getConstraints(um, resolution, bandwidth, fps, desktopStream) {
     // this later can be a problem with some of the tests
     if(RTCBrowserType.isFirefox() && config.firefox_fake_device)
     {
-        constraints.audio = true;
+        // seems to be fixed now, removing this experimental fix, as having
+        // multiple audio tracks brake the tests
+        //constraints.audio = true;
         constraints.fake = true;
     }
 

From e0e0baf87e5640c9dd394c5a1b011ed28ba69d17 Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Wed, 9 Dec 2015 23:30:24 -0600
Subject: [PATCH 36/44] Makes sure that we keep local video SSRC as a
 "recvonly" when muted.

---
 modules/xmpp/LocalSSRCReplacement.js | 72 ++++++++++++++--------------
 modules/xmpp/SDP.js                  | 16 ++++---
 2 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/modules/xmpp/LocalSSRCReplacement.js b/modules/xmpp/LocalSSRCReplacement.js
index 0b8e65cff..207e60b87 100644
--- a/modules/xmpp/LocalSSRCReplacement.js
+++ b/modules/xmpp/LocalSSRCReplacement.js
@@ -130,7 +130,9 @@ var storeLocalVideoSSRC = function (jingleIq) {
 function generateRecvonlySSRC() {
     //
     localRecvOnlySSRC =
-        Math.random().toString(10).substring(2, 11);
+        localVideoSSRC ?
+            localVideoSSRC : Math.random().toString(10).substring(2, 11);
+
     localRecvOnlyCName =
         Math.random().toString(36).substring(2);
     console.info(
@@ -175,44 +177,44 @@ var LocalSSRCReplacement = {
 
         // IF we have local video SSRC stored make sure it is replaced
         // with old SSRC
-        if (localVideoSSRC) {
-            var newSdp = new SDP(localDescription.sdp);
-            if (newSdp.media[1].indexOf("a=ssrc:") !== -1 &&
-                !newSdp.containsSSRC(localVideoSSRC)) {
-                // Get new video SSRC
-                var map = newSdp.getMediaSsrcMap();
-                var videoPart = map[1];
-                var videoSSRCs = videoPart.ssrcs;
-                var newSSRC = Object.keys(videoSSRCs)[0];
+        var sdp = new SDP(localDescription.sdp);
+        if (sdp.media.length < 2)
+            return;
 
-                console.info(
-                    "Replacing new video SSRC: " + newSSRC +
-                    " with " + localVideoSSRC);
+        if (localVideoSSRC && sdp.media[1].indexOf("a=ssrc:") !== -1 &&
+            !sdp.containsSSRC(localVideoSSRC)) {
 
-                localDescription.sdp =
-                    newSdp.raw.replace(
-                        new RegExp('a=ssrc:' + newSSRC, 'g'),
-                        'a=ssrc:' + localVideoSSRC);
-            }
-        } else {
+            console.info("Does not contain: " + localVideoSSRC + "---" + sdp.media[1]);
+
+            // Get new video SSRC
+            var map = sdp.getMediaSsrcMap();
+            var videoPart = map[1];
+            var videoSSRCs = videoPart.ssrcs;
+            var newSSRC = Object.keys(videoSSRCs)[0];
+
+            console.info(
+                "Replacing new video SSRC: " + newSSRC +
+                " with " + localVideoSSRC);
+
+            localDescription.sdp =
+                sdp.raw.replace(
+                    new RegExp('a=ssrc:' + newSSRC, 'g'),
+                    'a=ssrc:' + localVideoSSRC);
+        }
+        else if (sdp.media[1].indexOf('a=ssrc:') === -1 &&
+                 sdp.media[1].indexOf('a=recvonly') !== -1) {
             // Make sure we have any SSRC for recvonly video stream
-            var sdp = new SDP(localDescription.sdp);
-
-            if (sdp.media[1] && sdp.media[1].indexOf('a=ssrc:') === -1 &&
-                sdp.media[1].indexOf('a=recvonly') !== -1) {
-
-                if (!localRecvOnlySSRC) {
-                    generateRecvonlySSRC();
-                }
-
-                console.info('No SSRC in video recvonly stream' +
-                             ' - adding SSRC: ' + localRecvOnlySSRC);
-
-                sdp.media[1] += 'a=ssrc:' + localRecvOnlySSRC +
-                                ' cname:' + localRecvOnlyCName + '\r\n';
-
-                localDescription.sdp = sdp.session + sdp.media.join('');
+            if (!localRecvOnlySSRC) {
+                generateRecvonlySSRC();
             }
+
+            console.info('No SSRC in video recvonly stream' +
+                         ' - adding SSRC: ' + localRecvOnlySSRC);
+
+            sdp.media[1] += 'a=ssrc:' + localRecvOnlySSRC +
+                            ' cname:' + localRecvOnlyCName + '\r\n';
+
+            localDescription.sdp = sdp.session + sdp.media.join('');
         }
         return localDescription;
     },
diff --git a/modules/xmpp/SDP.js b/modules/xmpp/SDP.js
index fc24b4d34..1fcf59d7a 100644
--- a/modules/xmpp/SDP.js
+++ b/modules/xmpp/SDP.js
@@ -75,16 +75,18 @@ SDP.prototype.getMediaSsrcMap = function() {
  * @param ssrc the ssrc to check.
  * @returns {boolean} <tt>true</tt> if this SDP contains given SSRC.
  */
-SDP.prototype.containsSSRC = function(ssrc) {
+SDP.prototype.containsSSRC = function (ssrc) {
+    // FIXME this code is really strange - improve it if you can
     var medias = this.getMediaSsrcMap();
-    Object.keys(medias).forEach(function(mediaindex){
-        var media = medias[mediaindex];
-        //console.log("Check", channel, ssrc);
-        if(Object.keys(media.ssrcs).indexOf(ssrc) != -1){
-            return true;
+    var result = false;
+    Object.keys(medias).forEach(function (mediaindex) {
+        if (result)
+            return;
+        if (medias[mediaindex].ssrcs[ssrc]) {
+            result = true;
         }
     });
-    return false;
+    return result;
 };
 
 // remove iSAC and CN from SDP

From 067de62a6d083ea04e5126cc8d0b8094bf30ca29 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Fri, 11 Dec 2015 14:18:05 -0600
Subject: [PATCH 37/44] Fixes long line.

---
 modules/xmpp/LocalSSRCReplacement.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/xmpp/LocalSSRCReplacement.js b/modules/xmpp/LocalSSRCReplacement.js
index 207e60b87..4bf109c1b 100644
--- a/modules/xmpp/LocalSSRCReplacement.js
+++ b/modules/xmpp/LocalSSRCReplacement.js
@@ -184,7 +184,8 @@ var LocalSSRCReplacement = {
         if (localVideoSSRC && sdp.media[1].indexOf("a=ssrc:") !== -1 &&
             !sdp.containsSSRC(localVideoSSRC)) {
 
-            console.info("Does not contain: " + localVideoSSRC + "---" + sdp.media[1]);
+            console.info("Does not contain: "
+                + localVideoSSRC + "---" + sdp.media[1]);
 
             // Get new video SSRC
             var map = sdp.getMediaSsrcMap();

From 303287f7a651cd3a7ad88c62e3e41856ba0973f7 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Fri, 11 Dec 2015 14:18:16 -0600
Subject: [PATCH 38/44] Fixes a problem with receiving presence for start muted
 video before creating the stream element, which will end up that the muted
 video element will hide the avatar.

---
 modules/RTC/MediaStream.js            | 4 ++++
 modules/UI/videolayout/SmallVideo.js  | 7 +++++++
 modules/UI/videolayout/VideoLayout.js | 3 +++
 3 files changed, 14 insertions(+)

diff --git a/modules/RTC/MediaStream.js b/modules/RTC/MediaStream.js
index fc500781e..343285956 100644
--- a/modules/RTC/MediaStream.js
+++ b/modules/RTC/MediaStream.js
@@ -54,4 +54,8 @@ MediaStream.prototype.setMute = function (value) {
     this.muted = value;
 };
 
+MediaStream.prototype.getMute = function () {
+    return this.muted;
+};
+
 module.exports = MediaStream;
diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js
index 5352b22ee..06fee6ef7 100644
--- a/modules/UI/videolayout/SmallVideo.js
+++ b/modules/UI/videolayout/SmallVideo.js
@@ -112,6 +112,13 @@ SmallVideo.createStreamElement = function (stream) {
         : document.createElement('audio');
     if (isVideo) {
         element.setAttribute("muted", "true");
+
+        // the presence for muted (start muted) can be received before creating
+        // the element, so we need to check here and if that is the case
+        // hide the element
+        if (stream.getMute()) {
+            $(element).hide();
+        }
     }
 
     if (!RTCBrowserType.isIExplorer()) {
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index d98a18464..021dc5c17 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -579,6 +579,9 @@ var VideoLayout = (function (my) {
             remoteVideo.showVideoIndicator(value);
 
             var el = remoteVideo.selectVideoElement();
+            // the presence and trigger of onVideoMute can be earlier than
+            // creating the stream element. So show and hide can be ignored
+            // we need to take care for them also on creating the stream elem
             if (!value)
                 el.show();
             else

From 9734da3083a548e7e98f9c6bc40c3acf0863b9fe Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Tue, 15 Dec 2015 11:46:37 -0600
Subject: [PATCH 39/44] Configures Jicofo when jitsi-meet-tokens package is
 installed

---
 debian/jitsi-meet-tokens.postinst | 12 ++++++++++++
 debian/jitsi-meet-tokens.postrm   | 14 ++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/debian/jitsi-meet-tokens.postinst b/debian/jitsi-meet-tokens.postinst
index 4343e219a..ac194ff4b 100644
--- a/debian/jitsi-meet-tokens.postinst
+++ b/debian/jitsi-meet-tokens.postinst
@@ -66,6 +66,18 @@ case "$1" in
                 sed -i "s/ --app_secret=example_app_secret/ app_secret=$APP_SECRET/g" $PROSODY_HOST_CONFIG
                 sed -i 's/ --modules_enabled = { "token_verification" }/ modules_enabled = { "token_verification" }/g' $PROSODY_HOST_CONFIG
 
+                # Configure Jicofo properties
+                JICOFO_CONFIG="/etc/jitsi/jicofo/sip-communicator.properties"
+                if ! grep -q "org.jitsi.jicofo.auth.jwt.APP_ID" $JICOFO_CONFIG && \
+                   ! grep -q "org.jitsi.jicofo.auth.jwt.APP_SECRET" $JICOFO_CONFIG; then
+                   echo "org.jitsi.jicofo.auth.jwt.APP_ID=$APP_ID" >> $JICOFO_CONFIG
+                   echo "org.jitsi.jicofo.auth.jwt.APP_SECRET=$APP_SECRET" >> $JICOFO_CONFIG
+                   # Restart Jicofo
+                   if [ -x "/etc/init.d/jicofo" ]; then
+                       invoke-rc.d jicofo restart
+                   fi
+                fi
+
                 if [ -x "/etc/init.d/prosody" ]; then
                     invoke-rc.d prosody reload
                 fi
diff --git a/debian/jitsi-meet-tokens.postrm b/debian/jitsi-meet-tokens.postrm
index 53a69f530..44582f20a 100644
--- a/debian/jitsi-meet-tokens.postrm
+++ b/debian/jitsi-meet-tokens.postrm
@@ -44,6 +44,20 @@ case "$1" in
             sed -i "s/ app_secret=$APP_SECRET/ --app_secret=example_app_secret/g" $PROSODY_HOST_CONFIG
             sed -i 's/ modules_enabled = { "token_verification" }/ --modules_enabled = { "token_verification" }/g' $PROSODY_HOST_CONFIG
 
+            JICOFO_CONFIG="/etc/jitsi/jicofo/sip-communicator.properties"
+            if [ -f "$JICOFO_CONFIG" ] ; then
+                if grep -q "org.jitsi.jicofo.auth.jwt.APP_ID" $JICOFO_CONFIG || \
+                   grep -q "org.jitsi.jicofo.auth.jwt.APP_SECRET" $JICOFO_CONFIG; then
+                   sed -i.old "/org.jitsi.jicofo.auth.jwt.APP_ID=$APP_ID/d" $JICOFO_CONFIG
+                   sed -i.old "/org.jitsi.jicofo.auth.jwt.APP_SECRET=$APP_SECRET/d" $JICOFO_CONFIG
+                   rm "$JICOFO_CONFIG.old"
+                   # Restart Jicofo
+                   if [ -x "/etc/init.d/jicofo" ]; then
+                       invoke-rc.d jicofo restart
+                   fi
+                fi
+            fi
+
             if [ -x "/etc/init.d/prosody" ]; then
                 invoke-rc.d prosody reload
             fi

From 97ebcebdbedc7214b8b858b61c61f4f4c14e0c5f Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Tue, 15 Dec 2015 16:55:25 -0600
Subject: [PATCH 40/44] Revert "Fixes a problem with receiving presence for
 start muted video before creating the stream element, which will end up that
 the muted video element will hide the avatar."

This reverts commit 303287f7a651cd3a7ad88c62e3e41856ba0973f7.
---
 modules/RTC/MediaStream.js            | 4 ----
 modules/UI/videolayout/SmallVideo.js  | 7 -------
 modules/UI/videolayout/VideoLayout.js | 3 ---
 3 files changed, 14 deletions(-)

diff --git a/modules/RTC/MediaStream.js b/modules/RTC/MediaStream.js
index 343285956..fc500781e 100644
--- a/modules/RTC/MediaStream.js
+++ b/modules/RTC/MediaStream.js
@@ -54,8 +54,4 @@ MediaStream.prototype.setMute = function (value) {
     this.muted = value;
 };
 
-MediaStream.prototype.getMute = function () {
-    return this.muted;
-};
-
 module.exports = MediaStream;
diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js
index 06fee6ef7..5352b22ee 100644
--- a/modules/UI/videolayout/SmallVideo.js
+++ b/modules/UI/videolayout/SmallVideo.js
@@ -112,13 +112,6 @@ SmallVideo.createStreamElement = function (stream) {
         : document.createElement('audio');
     if (isVideo) {
         element.setAttribute("muted", "true");
-
-        // the presence for muted (start muted) can be received before creating
-        // the element, so we need to check here and if that is the case
-        // hide the element
-        if (stream.getMute()) {
-            $(element).hide();
-        }
     }
 
     if (!RTCBrowserType.isIExplorer()) {
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index 021dc5c17..d98a18464 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -579,9 +579,6 @@ var VideoLayout = (function (my) {
             remoteVideo.showVideoIndicator(value);
 
             var el = remoteVideo.selectVideoElement();
-            // the presence and trigger of onVideoMute can be earlier than
-            // creating the stream element. So show and hide can be ignored
-            // we need to take care for them also on creating the stream elem
             if (!value)
                 el.show();
             else

From 589380c7b3f06afa543fe7fec53239fe4637522f Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Wed, 16 Dec 2015 12:45:13 -0600
Subject: [PATCH 41/44] Displays correct resolution coming from FF.

---
 modules/UI/videolayout/ConnectionIndicator.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/UI/videolayout/ConnectionIndicator.js b/modules/UI/videolayout/ConnectionIndicator.js
index 7923d4135..4ee8ae5de 100644
--- a/modules/UI/videolayout/ConnectionIndicator.js
+++ b/modules/UI/videolayout/ConnectionIndicator.js
@@ -90,6 +90,11 @@ ConnectionIndicator.prototype.generateText = function () {
     if(this.resolution && this.jid) {
         var keys = Object.keys(this.resolution);
         for(var ssrc in this.resolution) {
+            // skip resolutions for ssrc that don't have this info
+            // like receive-only ssrc for FF
+            if(this.resolution[ssrc]
+                && this.resolution[ssrc].height != -1
+                && this.resolution[ssrc].width != -1)
             resolutionValue = this.resolution[ssrc];
         }
     }

From baf31aa9f313353b79ba73ab82aaaf3038531fa6 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Thu, 17 Dec 2015 16:22:07 -0600
Subject: [PATCH 42/44] Adds logging for results of mungeLocalVideoSSRC.

---
 modules/xmpp/TraceablePeerConnection.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/xmpp/TraceablePeerConnection.js b/modules/xmpp/TraceablePeerConnection.js
index 7df5bd8a5..51dd22e89 100644
--- a/modules/xmpp/TraceablePeerConnection.js
+++ b/modules/xmpp/TraceablePeerConnection.js
@@ -368,6 +368,7 @@ TraceablePeerConnection.prototype.createOffer
             }
 
             offer = SSRCReplacement.mungeLocalVideoSSRC(offer);
+            self.trace('createOfferOnSuccess::mungeLocalVideoSSRC', dumpSDP(offer));
 
             if (config.enableSimulcast && self.simulcast.isSupported()) {
                 offer = self.simulcast.mungeLocalDescription(offer);
@@ -399,6 +400,7 @@ TraceablePeerConnection.prototype.createAnswer
 
             // munge local video SSRC
             answer = SSRCReplacement.mungeLocalVideoSSRC(answer);
+            self.trace('createAnswerOnSuccess::mungeLocalVideoSSRC', dumpSDP(answer));
 
             if (config.enableSimulcast && self.simulcast.isSupported()) {
                 answer = self.simulcast.mungeLocalDescription(answer);

From 9d60af1a9d01c47dc4593b303e717d44c44c0129 Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Tue, 22 Dec 2015 19:51:43 +0100
Subject: [PATCH 43/44] New JWT token impl that does not require token
 verification in Jicofo and uses anonymous authentication method(token goes as
 BOSH query param). Adds 'allow_empty_token" config option.

---
 debian/control                                |   2 +-
 debian/jitsi-meet-tokens.postinst             |  24 ++--
 debian/jitsi-meet-tokens.postrm               |  21 +---
 .../prosody.cfg.lua-jvb.example               |   7 +-
 prosody-plugins/mod_auth_token.lua            | 115 ++++++++++++------
 prosody-plugins/mod_bosh.lua.patch            |  12 ++
 prosody-plugins/mod_token_verification.lua    |  59 ++++++---
 prosody-plugins/token/util.lib.lua            |  25 +++-
 8 files changed, 171 insertions(+), 94 deletions(-)
 create mode 100644 prosody-plugins/mod_bosh.lua.patch

diff --git a/debian/control b/debian/control
index 47d274ce9..3d4368f9a 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,6 @@ Description: Prosody configuration for Jitsi Meet
 
 Package: jitsi-meet-tokens
 Architecture: all
-Depends: ${misc:Depends}, prosody | prosody-trunk, jitsi-meet-prosody
+Depends: ${misc:Depends}, prosody-trunk (>= 1nightly603), libssl-dev, luarocks, jitsi-meet-prosody
 Description: Prosody token authentication plugin for Jitsi Meet
 
diff --git a/debian/jitsi-meet-tokens.postinst b/debian/jitsi-meet-tokens.postinst
index ac194ff4b..d298316ab 100644
--- a/debian/jitsi-meet-tokens.postinst
+++ b/debian/jitsi-meet-tokens.postinst
@@ -62,25 +62,23 @@ case "$1" in
                 sed -i 's/--plugin_paths/plugin_paths/g' $PROSODY_HOST_CONFIG
                 sed -i 's/authentication = "anonymous"/authentication = "token"/g' $PROSODY_HOST_CONFIG
                 sed -i 's/ --allow_unencrypted_plain_auth/ allow_unencrypted_plain_auth/g' $PROSODY_HOST_CONFIG
-                sed -i "s/ --app_id=example_app_id/ app_id=$APP_ID/g" $PROSODY_HOST_CONFIG
-                sed -i "s/ --app_secret=example_app_secret/ app_secret=$APP_SECRET/g" $PROSODY_HOST_CONFIG
+                sed -i "s/ --app_id=\"example_app_id\"/ app_id=\"$APP_ID\"/g" $PROSODY_HOST_CONFIG
+                sed -i "s/ --app_secret=\"example_app_secret\"/ app_secret=\"$APP_SECRET\"/g" $PROSODY_HOST_CONFIG
                 sed -i 's/ --modules_enabled = { "token_verification" }/ modules_enabled = { "token_verification" }/g' $PROSODY_HOST_CONFIG
 
-                # Configure Jicofo properties
-                JICOFO_CONFIG="/etc/jitsi/jicofo/sip-communicator.properties"
-                if ! grep -q "org.jitsi.jicofo.auth.jwt.APP_ID" $JICOFO_CONFIG && \
-                   ! grep -q "org.jitsi.jicofo.auth.jwt.APP_SECRET" $JICOFO_CONFIG; then
-                   echo "org.jitsi.jicofo.auth.jwt.APP_ID=$APP_ID" >> $JICOFO_CONFIG
-                   echo "org.jitsi.jicofo.auth.jwt.APP_SECRET=$APP_SECRET" >> $JICOFO_CONFIG
-                   # Restart Jicofo
-                   if [ -x "/etc/init.d/jicofo" ]; then
-                       invoke-rc.d jicofo restart
-                   fi
+                # Install luajwt
+                if ! luarocks install luajwt; then
+                   echo "Failed to install luajwt - try installing it manually"
                 fi
 
                 if [ -x "/etc/init.d/prosody" ]; then
-                    invoke-rc.d prosody reload
+                    invoke-rc.d prosody restart
                 fi
+
+                echo "This package requires BOSH Prosody module to be patched !"
+                echo "Use the following command, after this package has been installed and"
+                echo "after every prosody-trunk upgrade:"
+                echo "sudo patch -N /usr/lib/prosody/modules/mod_bosh.lua /usr/share/jitsi-meet/prosody-plugins/mod_bosh.lua.patch"
             else
                 echo "Failed apply auto-config to $PROSODY_HOST_CONFIG which most likely comes from not supported version of jitsi-meet"
             fi
diff --git a/debian/jitsi-meet-tokens.postrm b/debian/jitsi-meet-tokens.postrm
index 44582f20a..b57fe1ee7 100644
--- a/debian/jitsi-meet-tokens.postrm
+++ b/debian/jitsi-meet-tokens.postrm
@@ -39,27 +39,12 @@ case "$1" in
             # Revert prosody config
             sed -i 's/plugin_paths/--plugin_paths/g' $PROSODY_HOST_CONFIG
             sed -i 's/authentication = "token"/authentication = "anonymous"/g' $PROSODY_HOST_CONFIG
-            sed -i 's/ allow_unencrypted_plain_auth/ --allow_unencrypted_plain_auth/g' $PROSODY_HOST_CONFIG
-            sed -i "s/ app_id=$APP_ID/ --app_id=example_app_id/g" $PROSODY_HOST_CONFIG
-            sed -i "s/ app_secret=$APP_SECRET/ --app_secret=example_app_secret/g" $PROSODY_HOST_CONFIG
+            sed -i "s/ app_id=\"$APP_ID\"/ --app_id=\"example_app_id\"/g" $PROSODY_HOST_CONFIG
+            sed -i "s/ app_secret=\"$APP_SECRET\"/ --app_secret=\"example_app_secret\"/g" $PROSODY_HOST_CONFIG
             sed -i 's/ modules_enabled = { "token_verification" }/ --modules_enabled = { "token_verification" }/g' $PROSODY_HOST_CONFIG
 
-            JICOFO_CONFIG="/etc/jitsi/jicofo/sip-communicator.properties"
-            if [ -f "$JICOFO_CONFIG" ] ; then
-                if grep -q "org.jitsi.jicofo.auth.jwt.APP_ID" $JICOFO_CONFIG || \
-                   grep -q "org.jitsi.jicofo.auth.jwt.APP_SECRET" $JICOFO_CONFIG; then
-                   sed -i.old "/org.jitsi.jicofo.auth.jwt.APP_ID=$APP_ID/d" $JICOFO_CONFIG
-                   sed -i.old "/org.jitsi.jicofo.auth.jwt.APP_SECRET=$APP_SECRET/d" $JICOFO_CONFIG
-                   rm "$JICOFO_CONFIG.old"
-                   # Restart Jicofo
-                   if [ -x "/etc/init.d/jicofo" ]; then
-                       invoke-rc.d jicofo restart
-                   fi
-                fi
-            fi
-
             if [ -x "/etc/init.d/prosody" ]; then
-                invoke-rc.d prosody reload
+                invoke-rc.d prosody restart
             fi
         fi
 
diff --git a/doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example b/doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example
index dd4302c63..36efd73f5 100644
--- a/doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example
+++ b/doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example
@@ -4,11 +4,10 @@
 VirtualHost "jitmeet.example.com"
         -- enabled = false -- Remove this line to enable this host
         authentication = "anonymous"
-        -- Three properties below get uncommented by jitsi-meet-tokens package config
+        -- Properties below are modified by jitsi-meet-tokens package config
         -- and authentication above is switched to "token"
-        --allow_unencrypted_plain_auth = true;
-        --app_id=example_app_id
-        --app_secret=example_app_secret
+        --app_id="example_app_id"
+        --app_secret="example_app_secret"
         -- Assign this host a certificate for TLS, otherwise it would use the one
         -- set in the global section (if any).
         -- Note that old-style SSL on port 5223 only supports one certificate, and will always
diff --git a/prosody-plugins/mod_auth_token.lua b/prosody-plugins/mod_auth_token.lua
index a8a899dac..1b24e94c2 100644
--- a/prosody-plugins/mod_auth_token.lua
+++ b/prosody-plugins/mod_auth_token.lua
@@ -1,41 +1,46 @@
 -- Token authentication
 -- Copyright (C) 2015 Atlassian
 
-local usermanager = require "core.usermanager";
+local generate_uuid = require "util.uuid".generate;
 local new_sasl = require "util.sasl".new;
-
-local log = module._log;
-local host = module.host;
-
+local sasl = require "util.sasl";
+local formdecode = require "util.http".formdecode;
 local token_util = module:require "token/util";
 
 -- define auth provider
 local provider = {};
 
---do
---	local list;
---	for mechanism in pairs(new_sasl(module.host):mechanisms()) do
---		list = (not(list) and mechanism) or (list..", "..mechanism);
---	end
---	if not list then
---		module:log("error", "No mechanisms");
---	else
---		module:log("error", "Mechanisms: %s", list);
---	end
---end
-
+local host = module.host;
 
 local appId = module:get_option_string("app_id");
 local appSecret = module:get_option_string("app_secret");
+local allowEmptyToken = module:get_option_boolean("allow_empty_token");
+
+if allowEmptyToken == true then
+	module:log("warn", "WARNING - empty tokens allowed");
+end
+
+if appId == nil then
+	module:log("error", "'app_id' must not be empty");
+	return;
+end
+
+if appSecret == nil then
+	module:log("error", "'app_secret' must not be empty");
+	return;
+end
+
+-- Extract 'token' param from BOSH URL when session is created
+module:hook("bosh-session", function(event)
+	local session, request = event.session, event.request;
+	local query = request.url.query;
+	if query ~= nil then
+		session.auth_token = query and formdecode(query).token or nil;
+	end
+end)
 
 function provider.test_password(username, password)
-	local result, msg = token_util.verify_password(password, appId, appSecret, nil);
-	if result == true then
-		return true;
-	else
-		log("error", "Token auth failed for user %s, reason: %s",username, msg);
-		return nil, msg;
-	end
+	return nil, "Password based auth not supported";
 end
 
 function provider.get_password(username)
@@ -50,10 +55,6 @@ function provider.user_exists(username)
 	return nil;
 end
 
-function provider.users()
-	return next, hosts[module.host].sessions, nil;
-end
-
 function provider.create_user(username, password)
 	return nil;
 end
@@ -62,13 +63,59 @@ function provider.delete_user(username)
 	return nil;
 end
 
-function provider.get_sasl_handler()
-	local testpass_authentication_profile = {
-		plain_test = function(sasl, username, password, realm)
-			return usermanager.test_password(username, realm, password), true;
+function provider.get_sasl_handler(session)
+	-- JWT token extracted from BOSH URL
+	local token = session.auth_token;
+
+	local function get_username_from_token(self, message)
+
+		if token == nil then
+			if allowEmptyToken == true then
+				return true;
+			else
+				return false, "not-allowed", "token required";
+			end
 		end
-	};
-	return new_sasl(host, testpass_authentication_profile);
+
+		-- here we check if 'room' claim exists
+		local room, roomErr = token_util.get_room_name(token, appSecret);
+		if room == nil then
+			return false, "not-allowed", roomErr;
+		end
+
+		-- now verify the whole token
+		local result, msg
+		= token_util.verify_token(token, appId, appSecret, room);
+		if result == true then
+			-- Binds room name to the session which is later checked on MUC join
+			session.jitsi_meet_room = room;
+			return true
+		else
+			return false, "not-allowed", msg
+		end
+	end
+
+	return new_sasl(host, { anonymous = get_username_from_token });
 end
 
 module:provides("auth", provider);
+
+local function anonymous(self, message)
+
+	local username = generate_uuid();
+
+	-- This calls the handler created in 'provider.get_sasl_handler(session)'
+	local result, err, msg = self.profile.anonymous(self, username, self.realm);
+
+	self.username = username;
+
+	if result == true then
+		return "success"
+	else
+
+		return "failure", err, msg
+	end
+end
+
+sasl.registerMechanism("ANONYMOUS", {"anonymous"}, anonymous);
+
diff --git a/prosody-plugins/mod_bosh.lua.patch b/prosody-plugins/mod_bosh.lua.patch
new file mode 100644
index 000000000..928261661
--- /dev/null
+++ b/prosody-plugins/mod_bosh.lua.patch
@@ -0,0 +1,12 @@
+--- /usr/lib/prosody/modules/mod_bosh.lua	2015-12-16 14:28:34.000000000 -0600
++++ /usr/lib/prosody/modules/mod_bosh.lua	2015-12-22 10:45:59.818197967 -0600
+@@ -294,6 +294,9 @@
+ 
+ 		session.log("debug", "BOSH session created for request from %s", session.ip);
+ 		log("info", "New BOSH session, assigned it sid '%s'", sid);
++		
++		hosts[session.host].events.fire_event(
++			"bosh-session", { session = session, request = request });
+ 
+ 		-- Send creation response
+ 		local creating_session = true;
diff --git a/prosody-plugins/mod_token_verification.lua b/prosody-plugins/mod_token_verification.lua
index 79933040f..597664ebd 100644
--- a/prosody-plugins/mod_token_verification.lua
+++ b/prosody-plugins/mod_token_verification.lua
@@ -4,7 +4,6 @@
 local log = module._log;
 local host = module.host;
 local st = require "util.stanza";
-local token_util = module:require("token/util");
 local is_admin = require "core.usermanager".is_admin;
 
 
@@ -16,23 +15,35 @@ end
 
 local parentCtx = module:context(parentHostName);
 if parentCtx == nil then
-	log("error", "Failed to start - unable to get parent context for host: %s", tostring(parentHostName));
+	log("error",
+		"Failed to start - unable to get parent context for host: %s",
+		tostring(parentHostName));
 	return;
 end
 
 local appId = parentCtx:get_option_string("app_id");
 local appSecret = parentCtx:get_option_string("app_secret");
+local allowEmptyToken = parentCtx:get_option_boolean("allow_empty_token");
 
-log("debug", "%s - starting MUC token verifier app_id: %s app_secret: %s",
-	tostring(host), tostring(appId), tostring(appSecret));
+log("debug",
+	"%s - starting MUC token verifier app_id: %s app_secret: %s allow empty: %s",
+	tostring(host), tostring(appId), tostring(appSecret),
+	tostring(allowEmptyToken));
 
-local function handle_pre_create(event)
+local function verify_user(session, stanza)
+	log("debug", "Session token: %s, session room: %s",
+		tostring(session.auth_token),
+		tostring(session.jitsi_meet_room));
 
-	local origin, stanza = event.origin, event.stanza;	
-	local token = stanza:get_child("token", "http://jitsi.org/jitmeet/auth-token");
+	if allowEmptyToken and session.auth_token == nil then
+		module:log(
+			"debug",
+			"Skipped room token verification - empty tokens are allowed");
+		return nil;
+	end
 
 	-- token not required for admin users
-	local user_jid = stanza.attr.from;	
+	local user_jid = stanza.attr.from;
 	if is_admin(user_jid) then
 		log("debug", "Token not required from admin user: %s", user_jid);
 		return nil;
@@ -41,21 +52,33 @@ local function handle_pre_create(event)
 	local room = string.match(stanza.attr.to, "^(%w+)@");
 	log("debug", "Will verify token for user: %s, room: %s ", user_jid, room);
 	if room == nil then
-		log("error", "Unable to get name of the MUC room ? to: %s", stanza.attr.to);
+		log("error",
+			"Unable to get name of the MUC room ? to: %s", stanza.attr.to);
 		return nil;
 	end
 
-	if token ~= nil then
-		token = token[1];
-	end
-
-	local result, msg = token_util.verify_password(token, appId, appSecret, room);
-	if result ~= true then
-		log("debug", "Token verification failed: %s", msg);
-		origin.send(st.error_reply(stanza, "cancel", "not-allowed", msg));
+	local token = session.auth_token;
+	local auth_room = session.jitsi_meet_room;
+	if room ~= auth_room then
+		log("error", "Token %s not allowed to join: %s",
+			tostring(token), tostring(auth_room));
+		session.send(
+			st.error_reply(
+				stanza, "cancel", "not-allowed", "Room and token mismatched"));
 		return true;
 	end
+	log("debug", "allowed: %s to enter/create room: %s", user_jid, room);
 end
 
-module:hook("muc-room-pre-create", handle_pre_create);
+module:hook("muc-room-pre-create", function(event)
+	local origin, stanza = event.origin, event.stanza;
+	log("debug", "pre create: %s %s", tostring(origin), tostring(stanza));
+	return verify_user(origin, stanza);
+end);
+
+module:hook("muc-occupant-pre-join", function(event)
+	local origin, room, stanza = event.origin, event.room, event.stanza;
+	log("debug", "pre join: %s %s", tostring(room), tostring(stanza));
+	return verify_user(origin, stanza);
+end);
 
diff --git a/prosody-plugins/token/util.lib.lua b/prosody-plugins/token/util.lib.lua
index 6781f07b9..c281c3d95 100644
--- a/prosody-plugins/token/util.lib.lua
+++ b/prosody-plugins/token/util.lib.lua
@@ -5,9 +5,18 @@ local jwt = require "luajwt";
 
 local _M = {};
 
-local function verify_password_impl(password, appId, appSecret, roomName)
+local function _get_room_name(token, appSecret)
+	local claims, err = jwt.decode(token, appSecret);
+	if claims ~= nil then
+		return claims["room"];
+	else
+		return nil, err;
+	end
+end
 
-	local claims, err = jwt.decode(password, appSecret, true);
+local function _verify_token(token, appId, appSecret, roomName)
+
+	local claims, err = jwt.decode(token, appSecret, true);
 	if claims == nil then
 		return nil, err;
 	end
@@ -27,12 +36,16 @@ local function verify_password_impl(password, appId, appSecret, roomName)
 	if roomName ~= nil and roomName ~= roomClaim then
 		return nil, "Invalid room name('room' claim)";
 	end
-	
+
 	return true;
 end
 
-function _M.verify_password(password, appId, appSecret, roomName)
-	return verify_password_impl(password, appId, appSecret, roomName);
+function _M.verify_token(token, appId, appSecret, roomName)
+	return _verify_token(token, appId, appSecret, roomName);
 end
 
-return _M;
+function _M.get_room_name(token, appSecret)
+	return _get_room_name(token, appSecret);
+end
+
+return _M;
\ No newline at end of file

From ca8a147ea652b1435260f9548cc51cedb95c0075 Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Wed, 23 Dec 2015 14:57:23 +0100
Subject: [PATCH 44/44] JWT token is now passed as BOSH URL parameter.

---
 modules/UI/UI.js             | 12 ++++++++++--
 modules/xmpp/strophe.emuc.js |  4 ----
 modules/xmpp/xmpp.js         | 17 ++++++-----------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 9b8ae0ce3..1685f5dfb 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -325,8 +325,16 @@ function registerListeners() {
             "dialog.connectError", pres);
     });
     APP.xmpp.addListener(XMPPEvents.ROOM_CONNECT_ERROR, function (pres) {
-        UI.messageHandler.openReportDialog(null,
-            "dialog.connectError", pres);
+        if (config.token &&
+            $(pres).find(
+                '>error[type="cancel"]' +
+                '>not-allowed[xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"]'
+            ).length) {
+            messageHandler.showError("dialog.error", "dialog.tokenAuthFailed");
+        } else {
+            UI.messageHandler.openReportDialog(null,
+                "dialog.connectError", pres);
+        }
     });
 
     APP.xmpp.addListener(XMPPEvents.READY_TO_JOIN, function () {
diff --git a/modules/xmpp/strophe.emuc.js b/modules/xmpp/strophe.emuc.js
index ef6be3585..2b83c049b 100644
--- a/modules/xmpp/strophe.emuc.js
+++ b/modules/xmpp/strophe.emuc.js
@@ -562,10 +562,6 @@ module.exports = function(XMPP, eventEmitter) {
                 delete this.presMap["startMuted"];
             }
 
-            if (config.token) {
-                pres.c('token', { xmlns: 'http://jitsi.org/jitmeet/auth-token'}).t(config.token).up();
-            }
-
             pres.up();
             this.connection.send(pres);
         },
diff --git a/modules/xmpp/xmpp.js b/modules/xmpp/xmpp.js
index 0e90713d2..0edc1c41b 100644
--- a/modules/xmpp/xmpp.js
+++ b/modules/xmpp/xmpp.js
@@ -308,21 +308,16 @@ var XMPP = {
             configDomain = config.hosts.domain;
         }
         var jid = configDomain || window.location.hostname;
-        var password = null;
-        if (config.token) {
-            password = config.token;
-            if (config.id) {
-                jid = config.id + "@" + jid;
-            } else {
-                jid = generateUserName() + "@" + jid;
-            }
-        }
-        connect(jid, password);
+        connect(jid);
     },
     createConnection: function () {
         var bosh = config.bosh || '/http-bind';
         // adds the room name used to the bosh connection
-        return new Strophe.Connection(bosh + '?room=' + APP.UI.getRoomNode());
+        bosh +=  '?room=' + APP.UI.getRoomNode();
+        if (config.token) {
+            bosh += "&token=" + config.token;
+        }
+        return new Strophe.Connection(bosh);
     },
     getStatusString: function (status) {
         return Strophe.getStatusString(status);