Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(SettingsDialog): check capability for start without media #13952

Merged
merged 2 commits into from
Dec 6, 2024
Merged

fix(SettingsDialog): check capability for start without media #13952

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab61d89
fix: cleanup
DorraJaouad Dec 6, 2024
4f8a3fe
fix: wrap with capability check
DorraJaouad Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/components/SettingsDialog/SettingsDialog.vue
View file
Open in desktop
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
Loading