From cc29df6376e25b63ac0214539c19a84179e4db1e Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Fri, 7 Aug 2015 10:31:27 -0500
Subject: [PATCH] Adds params for enabling rec on entering the conference.

---
 modules/UI/UI.js               |  2 ++
 modules/UI/toolbars/Toolbar.js | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index f181c395a5..00e759c53c 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -541,6 +541,8 @@ function onLocalRoleChanged(jid, info, pres, isModerator) {
         Authentication.closeAuthenticationWindow();
         messageHandler.notify(null, "notify.me",
             'connected', "notify.moderator");
+
+        Toolbar.checkAutoRecord();
     }
 }
 
diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js
index ceb09ef0d8..d3dfddae55 100644
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -123,8 +123,13 @@ function hangup() {
  * Starts or stops the recording for the conference.
  */
 
-function toggleRecording() {
+function toggleRecording(predefinedToken) {
     APP.xmpp.toggleRecording(function (callback) {
+        if (predefinedToken) {
+            callback(UIUtil.escapeHtml(predefinedToken));
+            return;
+        }
+
         var msg = APP.translation.generateTranslationHTML(
             "dialog.recordingToken");
         var token = APP.translation.translateString("dialog.token");
@@ -567,7 +572,7 @@ var Toolbar = (function (my) {
             }, 1500);
 
             recordingToaster = messageHandler.notify(null, "recording.toaster", null,
-                null, null, {timeOut: 0, closeButton: null});
+                null, null, {timeOut: 0, closeButton: null, tapToDismiss: false});
         } else if (recordingState === 'off') {
             selector.removeClass("icon-recEnable active");
             selector.addClass("icon-recEnable");
@@ -590,6 +595,13 @@ var Toolbar = (function (my) {
         }
     };
 
+    // checks whether recording is enabled and whether we have params to start automatically recording
+    my.checkAutoRecord = function () {
+        if (config.enableRecording && config.autoRecord) {
+            toggleRecording(config.autoRecordToken);
+        }
+    }
+
     // Shows or hides SIP calls button
     my.showSipCallButton = function (show) {
         if (APP.xmpp.isSipGatewayEnabled() && show) {