From 572e60f4e24d2a43e77bebdcf979da7410fceebe Mon Sep 17 00:00:00 2001
From: Chad Pilkey <capilkey@gmail.com>
Date: Tue, 29 Jan 2019 16:33:57 -0800
Subject: [PATCH] [Flash] Chrome screenshare extension only required for <72
---
.../utils/WebRTCScreenshareUtility.as | 25 +++++++++++--------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/utils/WebRTCScreenshareUtility.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/utils/WebRTCScreenshareUtility.as
index 33dbaa8ac0..532f2c1ce7 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/utils/WebRTCScreenshareUtility.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/utils/WebRTCScreenshareUtility.as
@@ -76,20 +76,23 @@ package org.bigbluebutton.modules.screenshare.utils
// if its chrome we need to check for the extension
} else if (BrowserCheck.isChrome()) {
- WebRTCScreenshareUtility.extensionLink = options.chromeExtensionLink;
+ // We only need to check for the extension for Chrome versions before 72
+ if (BrowserCheck.browserMajorVersion < '72') {
+ WebRTCScreenshareUtility.extensionLink = options.chromeExtensionLink;
- // if theres no extension link-- users cant download-- fail
- if (StringUtils.isEmpty(options.chromeExtensionLink)) {
- cannotUseWebRTC("No extensionLink in config.xml");
- return;
- }
+ // if theres no extension link-- users cant download-- fail
+ if (StringUtils.isEmpty(options.chromeExtensionLink)) {
+ cannotUseWebRTC("No extensionLink in config.xml");
+ return;
+ }
- WebRTCScreenshareUtility.chromeExtensionKey = options.chromeExtensionKey;
+ WebRTCScreenshareUtility.chromeExtensionKey = options.chromeExtensionKey;
- // if theres no key we cannot connect to the extension-- fail
- if (StringUtils.isEmpty(WebRTCScreenshareUtility.chromeExtensionKey)) {
- cannotUseWebRTC("No chromeExtensionKey in config.xml");
- return;
+ // if theres no key we cannot connect to the extension-- fail
+ if (StringUtils.isEmpty(WebRTCScreenshareUtility.chromeExtensionKey)) {
+ cannotUseWebRTC("No chromeExtensionKey in config.xml");
+ return;
+ }
}
// connect to the webrtc code to attempt a connection with the extension
--
GitLab