summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings/user_settings_advanced.jsx
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-09-16 15:35:13 -0300
committerGitHub <noreply@github.com>2016-09-16 15:35:13 -0300
commit781ff323db4c70e4ca476f9ef13a04e5aa063585 (patch)
treea9dae870d4e750ad87ee0624d8ea859995b0dbf7 /webapp/components/user_settings/user_settings_advanced.jsx
parentdf2d61d94175369bff5a16242f35cb6d7b62d7fb (diff)
downloadchat-781ff323db4c70e4ca476f9ef13a04e5aa063585.tar.gz
chat-781ff323db4c70e4ca476f9ef13a04e5aa063585.tar.bz2
chat-781ff323db4c70e4ca476f9ef13a04e5aa063585.zip
Webrtc client side (#4026)
* WebRTC Server side * WebRTC client side * Bug fixes and improvements * Pushing UI improvements for webrtc (#3728) * Pushing UI improvements for webrtc * Updating webrtc css * PLT-3943 WebRTC P1: bug fixes and improvements * Video resolution set to std, reduce volume of ringtone and flip video horizontally * Fix calling a user B while WebRTC RHS is still opened * Leave RHS opened when call ends, Fix isBusy on popover and channel_header * Fix pre-release feature, RHS & System Console * PLT-3945 - Updating UI for webrtc (#3908) * PLT-3943 Webrtc p1 * Add ongoing call indicator when RHS is opened * UI updates to to webrtc notifcation (#3959)
Diffstat (limited to 'webapp/components/user_settings/user_settings_advanced.jsx')
-rw-r--r--webapp/components/user_settings/user_settings_advanced.jsx16
1 files changed, 15 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx
index 88fd410c8..fe7b7bb5a 100644
--- a/webapp/components/user_settings/user_settings_advanced.jsx
+++ b/webapp/components/user_settings/user_settings_advanced.jsx
@@ -33,7 +33,7 @@ export default class AdvancedSettingsDisplay extends React.Component {
}
getStateFromStores() {
- const preReleaseFeaturesKeys = Object.keys(PreReleaseFeatures);
+ let preReleaseFeaturesKeys = Object.keys(PreReleaseFeatures);
const advancedSettings = PreferenceStore.getCategory(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS);
const settings = {
send_on_ctrl_enter: PreferenceStore.get(
@@ -55,6 +55,13 @@ export default class AdvancedSettingsDisplay extends React.Component {
let enabledFeatures = 0;
for (const [name, value] of advancedSettings) {
+ const webrtcEnabled = global.mm_config.EnableWebrtc === 'true' && global.mm_license.Webrtc === 'true' &&
+ global.mm_config.EnableDeveloper === 'true';
+
+ if (!webrtcEnabled) {
+ preReleaseFeaturesKeys = preReleaseFeaturesKeys.filter((f) => f !== 'WEBRTC_PREVIEW');
+ }
+
for (const key of preReleaseFeaturesKeys) {
const feature = PreReleaseFeatures[key];
@@ -329,6 +336,13 @@ export default class AdvancedSettingsDisplay extends React.Component {
defaultMessage='Show experimental previews of link content, when available'
/>
);
+ case 'WEBRTC_PREVIEW':
+ return (
+ <FormattedMessage
+ id='user.settings.advance.webrtc_preview'
+ defaultMessage='Enable the ability to make and receive one-on-one WebRTC calls'
+ />
+ );
default:
return null;
}