Compare commits

...

2 Commits

Author SHA1 Message Date
Hristo Terezov
6f94784958 fix(screen-capture): disable. 2022-01-20 18:52:19 -06:00
Saúl Ibarra Corretgé
0b4c172c9c fix(ios) fix build with Xcode 13 2022-01-20 19:28:45 +01:00
4 changed files with 33 additions and 5 deletions

View File

@@ -41,5 +41,12 @@ post_install do |installer|
config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
end
# https://github.com/facebook/react-native/issues/32351#issuecomment-939157955
case target.name
when 'RCT-Folly'
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
end
end
end
end

View File

@@ -712,6 +712,6 @@ SPEC CHECKSUMS:
RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80
Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280
PODFILE CHECKSUM: 40b99aeea6fd9b3363170ff85721de7c2a5b26a3
PODFILE CHECKSUM: 93620e428bb16cc7fb8fd7314c0402e26929b5bf
COCOAPODS: 1.11.2

View File

@@ -481,7 +481,9 @@ function initCommands() {
return;
}
if (isScreenVideoShared(APP.store.getState())) {
const enableScreenshotCapture = state['features/base/config'].enableScreenshotCapture;
if (enableScreenshotCapture && isScreenVideoShared(state)) {
APP.store.dispatch(toggleScreenshotCaptureSummary(true));
}
conference.startRecording(recordingConfig);
@@ -512,7 +514,9 @@ function initCommands() {
const activeSession = getActiveSession(state, mode);
if (activeSession && activeSession.id) {
APP.store.dispatch(toggleScreenshotCaptureSummary(false));
if (state['features/base/config'].enableScreenshotCapture) {
APP.store.dispatch(toggleScreenshotCaptureSummary(false));
}
conference.stopRecording(activeSession.id);
} else {
logger.error('No recording or streaming session found');

View File

@@ -8,7 +8,7 @@ import { connect } from '../../../../base/redux';
import { toggleScreenshotCaptureSummary } from '../../../../screenshot-capture';
import AbstractStopRecordingDialog, {
type Props,
_mapStateToProps
_mapStateToProps as abstractMapStateToProps
} from '../AbstractStopRecordingDialog';
/**
@@ -46,8 +46,25 @@ class StopRecordingDialog extends AbstractStopRecordingDialog<Props> {
* @returns {void}
*/
_toggleScreenshotCapture() {
this.props.dispatch(toggleScreenshotCaptureSummary(false));
const { dispatch, _screenshotCaptureEnabled } = this.props;
if (_screenshotCaptureEnabled) {
dispatch(toggleScreenshotCaptureSummary(false));
}
}
}
/**
* Maps redux state to component props.
*
* @param {Object} state - Redux state.
* @returns {Object}
*/
function _mapStateToProps(state) {
return {
...abstractMapStateToProps(state),
_screenshotCaptureEnabled: state['features/base/config'].enableScreenshotCapture
};
}
export default translate(connect(_mapStateToProps)(StopRecordingDialog));