Skip to content

Commit

Permalink
Merge pull request #13953 from nextcloud/backport/13952/stable30
Browse files Browse the repository at this point in the history
[stable30] fix(SettingsDialog): check capability for start without media
  • Loading branch information
DorraJaouad authored Dec 6, 2024
2 parents 40e3dc3 + 542e2fb commit e98bbb1
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/components/SettingsDialog/SettingsDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
:name="t('spreed', 'Choose devices')"
class="app-settings-section">
<MediaDevicesPreview />
<NcCheckboxRadioSwitch id="call-media"
<NcCheckboxRadioSwitch v-if="supportStartWithoutMedia"
id="call-media"
:checked="startWithoutMediaEnabled"
:disabled="mediaLoading"
type="switch"
Expand Down Expand Up @@ -197,13 +198,12 @@
<script>
import { ref } from 'vue'

import axios from '@nextcloud/axios'
import { showError, showSuccess } from '@nextcloud/dialogs'
import { FilePickerVue } from '@nextcloud/dialogs/filepicker.js'
import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
import { loadState } from '@nextcloud/initial-state'
import { t } from '@nextcloud/l10n'
import { generateOcsUrl, generateUrl } from '@nextcloud/router'
import { generateUrl } from '@nextcloud/router'

import NcAppSettingsDialog from '@nextcloud/vue/dist/Components/NcAppSettingsDialog.js'
import NcAppSettingsSection from '@nextcloud/vue/dist/Components/NcAppSettingsSection.js'
Expand All @@ -229,6 +229,7 @@ const isBackgroundBlurredState = serverSupportsBackgroundBlurred
? loadState('spreed', 'force_enable_blur_filter', '') // 'yes', 'no', ''
: BrowserStorage.getItem('background-blurred') // 'true', 'false', null
const supportTypingStatus = getTalkConfig('local', 'chat', 'typing-privacy') !== undefined
const supportStartWithoutMedia = getTalkConfig('local', 'call', 'start-without-media')

export default {
name: 'SettingsDialog',
Expand Down Expand Up @@ -257,6 +258,7 @@ export default {
isBackgroundBlurred,
serverSupportsBackgroundBlurred,
customSettingsSections,
supportStartWithoutMedia,
}
},

Expand Down

0 comments on commit e98bbb1

Please sign in to comment.