diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as b/bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
index 7c684a195e12f1625542a2c70f9ce57baf086dcb..2a1654b6d80f8a5773d4836f0d027be14b01629d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
@@ -161,7 +161,6 @@ package org.bigbluebutton.core.managers
LOGGER.info(JSON.stringify(logData));
dispatchReconnectionSucceededEvent(type);
-
delete _connections[type];
if (type == BIGBLUEBUTTON_CONNECTION) {
reconnect();
@@ -173,7 +172,7 @@ package org.bigbluebutton.core.managers
_dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.SUCCESS_MESSAGE_EVENT,
ResourceUtil.getInstance().getString('bbb.connection.reestablished'),
- msg));
+ msg, 'bbb.connection.reestablished'));
_reconnectTimeout.reset();
removePopUp();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/events/ClientStatusEvent.as b/bigbluebutton-client/src/org/bigbluebutton/main/events/ClientStatusEvent.as
index c8a890e8cc05779962bd236414711ee3f989a871..2fe1797d611a365012c7ee4f07f91e0b933c58f8 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/events/ClientStatusEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/events/ClientStatusEvent.as
@@ -29,12 +29,14 @@ package org.bigbluebutton.main.events
public var title:String;
public var message:String;
-
- public function ClientStatusEvent(type:String, title:String, message:String)
+ public var logCode:String;
+
+ public function ClientStatusEvent(type:String, title:String, message:String, logCode:String)
{
super(type);
this.title = title;
this.message = message;
+ this.logCode = logCode;
}
}
-}
\ No newline at end of file
+}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
index 230deeb12e28204dd0fbd9a624066a4fb3d08441..632ab7089d60b2b457283d223c827485404c18c4 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
@@ -11,6 +11,7 @@ terms of the GNU Lesser General Public License as published by the Free Software
Foundation; either version 3.0 of the License, or (at your option) any later
version.
+
BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
@@ -309,7 +310,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
// this is a terrible place for these checks because this function runs 4 times on startup
if (BBB.initConnectionManager().isTunnelling) {
isTunneling = true;
- globalDispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT, ResourceUtil.getInstance().getString("bbb.clientstatus.tunneling.title"), ResourceUtil.getInstance().getString("bbb.clientstatus.tunneling.message")));
+ globalDispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT,
+ ResourceUtil.getInstance().getString("bbb.clientstatus.tunneling.title"),
+ ResourceUtil.getInstance().getString("bbb.clientstatus.tunneling.message"),
+ 'bbb.clientstatus.tunneling'));
}
versionCheck();
@@ -331,7 +335,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if ((browserVersion[0].toString().toLowerCase() == "chrome" && browserVersion[1] < xml.@chrome) || browserVersion[0].toString().toLowerCase() == "firefox" && browserVersion[1] < xml.@firefox) {
globalDispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT,
ResourceUtil.getInstance().getString("bbb.clientstatus.browser.title"),
- ResourceUtil.getInstance().getString("bbb.clientstatus.browser.message", [browserVersion[0]+" "+browserVersion[1]])));
+ ResourceUtil.getInstance().getString("bbb.clientstatus.browser.message", [browserVersion[0]+" "+browserVersion[1]]),
+ 'bbb.clientstatus.browser.message'));
}
//find flash version
@@ -341,7 +346,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
((flashVersion.os != 'LNX' || browserVersion[0].toString().toLowerCase() == "chrome") && flashVersion.major < xml.@flash)) {
globalDispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT,
ResourceUtil.getInstance().getString("bbb.clientstatus.flash.title"),
- ResourceUtil.getInstance().getString("bbb.clientstatus.flash.message", [flashVersion.major+"."+flashVersion.minor+"."+flashVersion.build])));
+ ResourceUtil.getInstance().getString("bbb.clientstatus.flash.message", [flashVersion.major+"."+flashVersion.minor+"."+flashVersion.build]),
+ 'bbb.clientstatus.flash.message'));
}
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml
index 7f26f8fed5ce801c28189543d1a470b5e7a93587..50013250951b357b8ba4157c9f3c70e624e1c9c8 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml
@@ -94,7 +94,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
messages.push(obj);
showNotification();
- LOGGER.warn("ClientNotification:" + e.title + " " + e.message);
+
+ var logData:Object = {};
+ logData.type = "ClientNotification";
+ logData.logCode = e.logCode;
+ logData.message = e.message;
+ logData.title = e.title;
+ LOGGER.warn(JSON.stringify(logData));
}
private function showNotification():void {
@@ -102,7 +108,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
visible = includeInLayout = true;
if (hideTimer.running) hideTimer.reset();
- hideTimer.start()
+ hideTimer.start();
if (!notification) {
notification = ToolTipManager.createToolTip(ResourceUtil.getInstance().getString("bbb.clientstatus.notification"), 100, 100, "errorTipAbove", this) as ToolTip;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
index 7c0ea79396a6e7c288333e94debd60dbdebbac5e..16b346b22fbeaa2a598c8d8a8839e02460dbb8dc 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
@@ -32,7 +32,7 @@ package org.bigbluebutton.modules.phone.managers
public class WebRTCCallManager
{
- private static const LOGGER:ILogger = getClassLogger(WebRTCCallManager);
+ private static const LOGGER:ILogger = getClassLogger(WebRTCCallManager);
private const MAX_RETRIES:Number = 3;
private var browserType:String = "unknown";
@@ -60,7 +60,8 @@ package org.bigbluebutton.modules.phone.managers
if (options.useWebRTCIfAvailable && !isWebRTCSupported()) {
dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT,
ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.title"),
- ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.message")));
+ ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.message"),
+ 'bbb.clientstatus.webrtc.title'));
}
usingWebRTC = checkIfToUseWebRTC();
@@ -135,7 +136,8 @@ package org.bigbluebutton.modules.phone.managers
if(reconnecting) {
dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.SUCCESS_MESSAGE_EVENT,
ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.reestablished"),
- ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.reestablished")));
+ ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.reestablished"),
+ 'bbb.webrtcWarning.connection.reestablished'));
reconnecting = false;
}
}
@@ -233,7 +235,8 @@ package org.bigbluebutton.modules.phone.managers
reconnecting = true;
dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT,
ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.dropped"),
- ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.reconnecting")));
+ ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.reconnecting"),
+ 'bbb.webrtcWarning.connection.dropped,reconnecting'));
reconnect.onDisconnect(joinVoiceConference, []);
}
else {
@@ -308,7 +311,7 @@ package org.bigbluebutton.modules.phone.managers
Alert.show(message, title, Alert.YES | Alert.NO, null, handleCallFailedUserResponse, null, Alert.YES);
});
popUpDelayTimer.start();
- dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.FAIL_MESSAGE_EVENT, title, error));
+ dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.FAIL_MESSAGE_EVENT, title, error, ''));
LOGGER.warn("WebRTCAlert:" + title + " " + error + " " + message);
}