Skip to content
Snippets Groups Projects
Commit 5c1a656f authored by Chad Pilkey's avatar Chad Pilkey
Browse files

add a microphone warning for chrome on http

parent 28215f16
No related branches found
No related tags found
No related merge requests found
...@@ -66,6 +66,7 @@ bbb.micSettings.webrtc.waitingforice = Connecting ...@@ -66,6 +66,7 @@ bbb.micSettings.webrtc.waitingforice = Connecting
bbb.micSettings.webrtc.transferring = Transferring bbb.micSettings.webrtc.transferring = Transferring
bbb.micSettings.webrtc.endingecho = Joining audio bbb.micSettings.webrtc.endingecho = Joining audio
bbb.micSettings.webrtc.endedecho = Echo test ended. bbb.micSettings.webrtc.endedecho = Echo test ended.
bbb.micPermissions.message.browserhttp = This server is not configured with SSL. As a result, {0} disables sharing of your microphone.
bbb.micPermissions.firefox.title = Firefox Microphone Permissions bbb.micPermissions.firefox.title = Firefox Microphone Permissions
bbb.micPermissions.firefox.message = Click Allow to give Firefox permission to use your microphone. bbb.micPermissions.firefox.message = Click Allow to give Firefox permission to use your microphone.
bbb.micPermissions.chrome.title = Chrome Microphone Permissions bbb.micPermissions.chrome.title = Chrome Microphone Permissions
......
...@@ -35,6 +35,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. ...@@ -35,6 +35,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<![CDATA[ <![CDATA[
import com.asfusion.mate.events.Dispatcher; import com.asfusion.mate.events.Dispatcher;
import mx.controls.Alert;
import org.as3commons.logging.api.ILogger; import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger; import org.as3commons.logging.api.getClassLogger;
import org.bigbluebutton.core.Options; import org.bigbluebutton.core.Options;
...@@ -78,11 +80,18 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. ...@@ -78,11 +80,18 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
vboxListen.percentWidth = 100; vboxListen.percentWidth = 100;
} }
} }
private function browserForcesHTTPS() : Boolean {
var result : Boolean = !BrowserCheck.isHttps() && ((BrowserCheck.isChrome() && BrowserCheck.browserMajorVersion >= "60") || (BrowserCheck.isOpera() && BrowserCheck.browserMajorVersion >= "47"));
return result;
}
private function onMicClick():void { private function onMicClick():void {
LOGGER.debug("AudioSelectionWindow - Share Microphone Clicked"); LOGGER.debug("AudioSelectionWindow - Share Microphone Clicked");
var dispatcher:Dispatcher = new Dispatcher(); var dispatcher:Dispatcher = new Dispatcher();
if (BrowserCheck.isPuffin46AndAbove() || (!BrowserCheck.isHttps() && ((BrowserCheck.isChrome() && BrowserCheck.browserMajorVersion >= "60") || (BrowserCheck.isOpera() && BrowserCheck.browserMajorVersion >= "47")))) { if (browserForcesHTTPS()) {
Alert.show(ResourceUtil.getInstance().getString("bbb.micPermissions.message.browserhttp", [BrowserCheck.browserName]));
} else if (BrowserCheck.isPuffin46AndAbove()) {
dispatcher.dispatchEvent(new UseFlashModeCommand()); dispatcher.dispatchEvent(new UseFlashModeCommand());
} else { } else {
var command:JoinVoiceConferenceCommand = new JoinVoiceConferenceCommand(); var command:JoinVoiceConferenceCommand = new JoinVoiceConferenceCommand();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment