Merge pull request #11138 from nextcloud/backport/11132/stable28

[stable28] Fix(File share authentication): Remove unnecessary options

src/PublicShareAuthRequestPasswordButton.vue

@@ -19,7 +19,7 @@
   -->
 
 <template>
-	<div>
+	<Fragment>
 		<!-- "submit-wrapper" is used to mimic the login button and thus get
 			automatic colouring of the confirm icon by the Theming app. -->
 		<div id="submit-wrapper" class="request-password-wrapper">
@@ -35,10 +35,11 @@
 		<p v-if="hasRequestFailed" class="warning error-message">
 			{{ t('spreed', 'Error requesting the password.') }}
 		</p>
-	</div>
+	</Fragment>
 </template>
 
 <script>
+import { Fragment } from 'vue-frag'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 import { getPublicShareAuthConversationToken } from './services/publicShareAuthService.js'
@@ -50,6 +51,7 @@ export default {
 
 	components: {
 		NcButton,
+		Fragment,
 	},
 
 	props: {

src/PublicShareAuthSidebar.vue

@@ -172,7 +172,7 @@ export default {
 				// has been set, which is done once the conversation has been
 				// fetched. MediaSettings are called to set up audio and video devices
 				// and also to give a consent to recording, if set up
-				emit('talk:media-settings:show')
+				emit('talk:media-settings:show', 'video-verification')
 			}
 		},
 
@@ -206,7 +206,7 @@ export default {
 			// Guest needs to add their display name right after joining conversation,
 			// before fetching and showing media settings. Then, this latter will be triggered
 			// by the guest name addition event.
-			emit('talk:media-settings:show')
+			emit('talk:media-settings:show', 'video-verification')
 			unsubscribe('talk:guest-name:added', this.showGuestMediaSettings)
 		}
 	},

src/components/MediaSettings/MediaSettings.vue

@@ -120,7 +120,8 @@
 				@update-background="handleUpdateVirtualBackground" />
 
 			<!-- "Always show" setting -->
-			<NcCheckboxRadioSwitch class="checkbox"
+			<NcCheckboxRadioSwitch v-if="!isPublicShareAuthSidebar"
+				class="checkbox"
 				:checked="showMediaSettings || showRecordingWarning"
 				:disabled="showRecordingWarning"
 				@update:checked="setShowMediaSettings">
@@ -296,6 +297,7 @@ export default {
 			audioDeviceStateChanged: false,
 			videoDeviceStateChanged: false,
 			isRecordingFromStart: false,
+			isPublicShareAuthSidebar: false,
 		}
 	},
 
@@ -381,7 +383,7 @@ export default {
 		},
 
 		showSilentCallOption() {
-			return !(this.hasCall && !this.isInLobby)
+			return !(this.hasCall && !this.isInLobby) && !this.isPublicShareAuthSidebar
 		},
 
 		showDeviceSelection() {
@@ -453,8 +455,11 @@ export default {
 	},
 
 	methods: {
-		showModal() {
+		showModal(page) {
 			this.modal = true
+			if (page === 'video-verification') {
+				this.isPublicShareAuthSidebar = true
+			}
 		},
 
 		closeModal() {
@@ -463,6 +468,7 @@ export default {
 			this.deviceIdChanged = false
 			this.audioDeviceStateChanged = false
 			this.videoDeviceStateChanged = false
+			this.isPublicShareAuthSidebar = false
 		},
 
 		toggleAudio() {
@@ -497,7 +503,6 @@ export default {
 			if (this.videoDeviceStateChanged) {
 				emit('local-video-control-button:toggle-video')
 			}
-
 			this.closeModal()
 		},