From 307699a34cd75b91f006750eb76f0c4ae842cbeb Mon Sep 17 00:00:00 2001 From: Calinteodor Date: Tue, 17 Aug 2021 13:42:29 +0300 Subject: [PATCH] feat(toolbox) added android screen share flag Fixes issue #9435 --- react/features/base/flags/constants.js | 6 ++++++ .../components/native/ScreenSharingAndroidButton.js | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/react/features/base/flags/constants.js b/react/features/base/flags/constants.js index 58207213d..09cbdd243 100644 --- a/react/features/base/flags/constants.js +++ b/react/features/base/flags/constants.js @@ -92,6 +92,12 @@ export const IOS_RECORDING_ENABLED = 'ios.recording.enabled'; */ export const IOS_SCREENSHARING_ENABLED = 'ios.screensharing.enabled'; +/** + * Flag indicating if screen sharing should be enabled in android. + * Default: enabled (true). + */ +export const ANDROID_SCREENSHARING_ENABLED = 'android.screensharing.enabled'; + /** * Flag indicating if kickout is enabled. * Default: enabled (true). diff --git a/react/features/toolbox/components/native/ScreenSharingAndroidButton.js b/react/features/toolbox/components/native/ScreenSharingAndroidButton.js index 263679f1f..68e0ad704 100644 --- a/react/features/toolbox/components/native/ScreenSharingAndroidButton.js +++ b/react/features/toolbox/components/native/ScreenSharingAndroidButton.js @@ -1,5 +1,9 @@ // @flow +import { + ANDROID_SCREENSHARING_ENABLED, + getFeatureFlag +} from '../../../base/flags'; import { translate } from '../../../base/i18n'; import { IconShareDesktop } from '../../../base/icons'; import { connect } from '../../../base/redux'; @@ -82,8 +86,11 @@ class ScreenSharingAndroidButton extends AbstractButton { * }} */ function _mapStateToProps(state): Object { + const enabled = getFeatureFlag(state, ANDROID_SCREENSHARING_ENABLED, true); + return { - _screensharing: isLocalVideoTrackDesktop(state) + _screensharing: isLocalVideoTrackDesktop(state), + visible: enabled }; }