diff --git a/react/features/base/config/functions.any.js b/react/features/base/config/functions.any.js index 56ab5b112..8173ae84f 100644 --- a/react/features/base/config/functions.any.js +++ b/react/features/base/config/functions.any.js @@ -68,7 +68,8 @@ export function getMultipleVideoSupportFeatureFlag(state: Object) { * @returns {boolean} */ export function getMultipleVideoSendingSupportFeatureFlag(state: Object) { - return getMultipleVideoSupportFeatureFlag(state) && isUnifiedPlanEnabled(state); + return navigator.product !== 'ReactNative' + && getMultipleVideoSupportFeatureFlag(state) && isUnifiedPlanEnabled(state); } /** diff --git a/react/features/base/participants/subscriber.js b/react/features/base/participants/subscriber.js index 686f36081..400a67fb8 100644 --- a/react/features/base/participants/subscriber.js +++ b/react/features/base/participants/subscriber.js @@ -3,7 +3,10 @@ import _ from 'lodash'; import { getCurrentConference } from '../conference'; -import { getMultipleVideoSupportFeatureFlag } from '../config'; +import { + getMultipleVideoSendingSupportFeatureFlag, + getMultipleVideoSupportFeatureFlag +} from '../config/functions.any'; import { StateListenerRegistry } from '../redux'; import { createVirtualScreenshareParticipant, participantLeft } from './actions'; @@ -47,12 +50,14 @@ function _updateScreenshareParticipants({ getState, dispatch }) { return acc; }, []); - if (!localScreenShare && newLocalSceenshareSourceName) { - dispatch(createVirtualScreenshareParticipant(newLocalSceenshareSourceName, true)); - } + if (getMultipleVideoSendingSupportFeatureFlag(state)) { + if (!localScreenShare && newLocalSceenshareSourceName) { + dispatch(createVirtualScreenshareParticipant(newLocalSceenshareSourceName, true)); + } - if (localScreenShare && !newLocalSceenshareSourceName) { - dispatch(participantLeft(localScreenShare.id, conference, undefined, true)); + if (localScreenShare && !newLocalSceenshareSourceName) { + dispatch(participantLeft(localScreenShare.id, conference, undefined, true)); + } } const removedScreenshareSourceNames = _.difference(previousScreenshareSourceNames, currentScreenshareSourceNames);