From 2e7c06d0454ebb494c74c7d745c661a637d9af48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Tue, 23 Nov 2021 11:56:29 +0100 Subject: [PATCH] fix(rn,welcome-page) don't create video track unnecessarily We are no longer rendering it, so skip creating it altogether and make sure it's destroyed on meeting end. --- react/features/base/settings/middleware.js | 2 +- .../welcome/components/WelcomePage.native.js | 21 ++----------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/react/features/base/settings/middleware.js b/react/features/base/settings/middleware.js index 9980805c3..8545a010e 100644 --- a/react/features/base/settings/middleware.js +++ b/react/features/base/settings/middleware.js @@ -118,7 +118,7 @@ function _maybeSetAudioOnly( { dispatch }, { settings: { startAudioOnly } }) { if (typeof startAudioOnly === 'boolean') { - dispatch(setAudioOnly(startAudioOnly, true)); + dispatch(setAudioOnly(startAudioOnly)); } } diff --git a/react/features/welcome/components/WelcomePage.native.js b/react/features/welcome/components/WelcomePage.native.js index 5e39888cf..b719a50d0 100644 --- a/react/features/welcome/components/WelcomePage.native.js +++ b/react/features/welcome/components/WelcomePage.native.js @@ -15,15 +15,10 @@ import { getName } from '../../app/functions'; import { ColorSchemeRegistry } from '../../base/color-scheme'; import { translate } from '../../base/i18n'; import { Icon, IconMenu, IconWarning } from '../../base/icons'; -import { MEDIA_TYPE } from '../../base/media'; import JitsiStatusBar from '../../base/modal/components/JitsiStatusBar'; import { LoadingIndicator, Text } from '../../base/react'; import { connect } from '../../base/redux'; -import { - createDesiredLocalTracks, - destroyLocalDesktopTrackIfExists, - destroyLocalTracks -} from '../../base/tracks'; +import { destroyLocalTracks } from '../../base/tracks'; import BaseTheme from '../../base/ui/components/BaseTheme.native'; import { @@ -135,19 +130,7 @@ class WelcomePage extends AbstractWelcomePage<*> { }); - if (this.props._settings.startAudioOnly) { - dispatch(destroyLocalTracks()); - } else { - dispatch(destroyLocalDesktopTrackIfExists()); - - // Make sure we don't request the permission for the camera from - // the start. We will, however, create a video track iff the user - // already granted the permission. - navigator.permissions.query({ name: 'camera' }).then(response => { - response === 'granted' - && dispatch(createDesiredLocalTracks(MEDIA_TYPE.VIDEO)); - }); - } + dispatch(destroyLocalTracks()); } /**