From 1ab33093235a0a2870afaae6a5f1073846a2654d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=8F=D0=BD=20=D0=9C=D0=B8=D0=BD=D0=BA?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Mon, 5 May 2025 08:35:16 -0500 Subject: [PATCH] feat(pre-join): Drops skip pre-join option. (#15989) --- lang/main-ar.json | 1 - lang/main-ca.json | 1 - lang/main-cs.json | 1 - lang/main-de.json | 1 - lang/main-dsb.json | 1 - lang/main-el.json | 1 - lang/main-eo.json | 1 - lang/main-es.json | 1 - lang/main-esUS.json | 1 - lang/main-eu.json | 1 - lang/main-fa.json | 1 - lang/main-fr.json | 1 - lang/main-frCA.json | 1 - lang/main-hi.json | 1 - lang/main-hr.json | 1 - lang/main-hsb.json | 1 - lang/main-hu.json | 1 - lang/main-id.json | 1 - lang/main-is.json | 1 - lang/main-it.json | 1 - lang/main-ja.json | 1 - lang/main-kab.json | 1 - lang/main-ko.json | 1 - lang/main-lv.json | 1 - lang/main-ml.json | 1 - lang/main-mn.json | 1 - lang/main-nb.json | 1 - lang/main-nl.json | 1 - lang/main-no.json | 1 - lang/main-oc.json | 1 - lang/main-pl.json | 1 - lang/main-pt.json | 1 - lang/main-ptBR.json | 1 - lang/main-ru.json | 1 - lang/main-sc.json | 1 - lang/main-sl.json | 1 - lang/main-sq.json | 1 - lang/main-sr.json | 1 - lang/main-sv.json | 1 - lang/main-te.json | 1 - lang/main-tr.json | 1 - lang/main-uk.json | 1 - lang/main-vi.json | 1 - lang/main-zhCN.json | 1 - lang/main-zhTW.json | 1 - lang/main.json | 1 - .../features/base/settings/middleware.web.ts | 20 -------- react/features/base/settings/reducer.ts | 4 +- react/features/prejoin/functions.any.ts | 3 +- react/features/settings/actions.web.ts | 8 ---- .../components/native/GeneralSection.tsx | 16 ------- .../settings/components/web/MoreTab.tsx | 46 ------------------- .../components/web/SettingsDialog.tsx | 1 - react/features/settings/functions.any.ts | 3 -- 54 files changed, 2 insertions(+), 145 deletions(-) diff --git a/lang/main-ar.json b/lang/main-ar.json index 2ae7f75c05..bbb34dacd4 100644 --- a/lang/main-ar.json +++ b/lang/main-ar.json @@ -835,7 +835,6 @@ "or": "أو", "premeeting": "ما قبل المُلتقى", "screenSharingError": "خطأ في مشاركة الشاشة:", - "showScreen": "تفعيل واجهة ما قبل المُلتقى", "startWithPhone": "البدء مع جهاز الصوت من الجوال", "videoOnlyError": "خطأ في الفيديو:", "videoTrackError": "لم نتمكن من إنشاء ملف الفيديو", diff --git a/lang/main-ca.json b/lang/main-ca.json index 80766d198e..e152bf9177 100644 --- a/lang/main-ca.json +++ b/lang/main-ca.json @@ -842,7 +842,6 @@ "or": "o", "premeeting": "Prereunió", "screenSharingError": "Error en compartir la pantalla:", - "showScreen": "Activa la pantalla de prereunió", "startWithPhone": "Comença amb àudio de telèfon", "videoOnlyError": "Error del vídeo:", "videoTrackError": "No s'ha pogut crear la pista de vídeo.", diff --git a/lang/main-cs.json b/lang/main-cs.json index 435caf8175..7a12fe882e 100644 --- a/lang/main-cs.json +++ b/lang/main-cs.json @@ -976,7 +976,6 @@ "proceedAnyway": "Přesto pokračujte", "recordingWarning": "Ostatní účastníci mohou tento hovor nahrávat", "screenSharingError": "Chyba sdílení obrazovky:", - "showScreen": "Zapnout obrazovku před setkáním", "startWithPhone": "Začít se zvukem přes telefon", "unsafeRoomConsent": "Chápu rizika, chci se připojit k setkání", "videoOnlyError": "Chyba videa:", diff --git a/lang/main-de.json b/lang/main-de.json index 61a19fac13..66c3532a76 100644 --- a/lang/main-de.json +++ b/lang/main-de.json @@ -984,7 +984,6 @@ "proceedAnyway": "Trotzdem fortsetzen", "recordingWarning": "Diese Konferenz wird möglicherweise von anderen Personen aufgezeichnet", "screenSharingError": "Fehler bei Bildschirmfreigabe:", - "showScreen": "Konferenzvorschau aktivieren", "startWithPhone": "Mit Telefonaudio starten", "unsafeRoomConsent": "Ich verstehe das Risiko und möchte der Konferenz beitreten", "videoOnlyError": "Videofehler:", diff --git a/lang/main-dsb.json b/lang/main-dsb.json index 8615c821f3..f262257d28 100644 --- a/lang/main-dsb.json +++ b/lang/main-dsb.json @@ -845,7 +845,6 @@ "or": "abo", "premeeting": "naglěd", "screenSharingError": "zmólenje pśi sobuźělenju monitora:", - "showScreen": "naglěd konferency aktiwěrowaś", "startWithPhone": "zachopiś z telefonowym audio", "videoOnlyError": "zmólenje wideo:", "videoTrackError": "Sćažka wideo njejo mógła se załožyś.", diff --git a/lang/main-el.json b/lang/main-el.json index 832a774a8b..4286ba12dc 100644 --- a/lang/main-el.json +++ b/lang/main-el.json @@ -862,7 +862,6 @@ "or": "ή", "premeeting": "Προ σύσκεψη", "screenSharingError": "Σφάλμα διαμοιρασμού οθόνης:", - "showScreen": "Ενεργοποίηση οθόνης προ σύσκεψης", "startWithPhone": "Ξεκινήστε με ήχο τηλεφώνου", "videoOnlyError": "Σφάλμα βίντεο:", "videoTrackError": "Δεν ήταν δυνατή η δημιουργία κομματιού βίντεο.", diff --git a/lang/main-eo.json b/lang/main-eo.json index 9b0e549542..4db83c5a48 100644 --- a/lang/main-eo.json +++ b/lang/main-eo.json @@ -935,7 +935,6 @@ "premeeting": "Antaŭkunveno", "proceedAnyway": "Daŭrigi", "screenSharingError": "Eraro kun la ekrandividado:", - "showScreen": "Ebligu antaŭkunvenon ekranon", "startWithPhone": "Komencu kun la telefona sono", "unsafeRoomConsent": "Akceptu la riskojn, kaj daŭrigi", "videoOnlyError": "Eraro kun la videaĵo:", diff --git a/lang/main-es.json b/lang/main-es.json index ee6e253d8f..431632c36f 100644 --- a/lang/main-es.json +++ b/lang/main-es.json @@ -886,7 +886,6 @@ "premeeting": "Pre-reunión", "proceedAnyway": "Continuar de todos modos", "screenSharingError": "Error al compartir pantalla:", - "showScreen": "Habilitar pantalla pre-reunión", "startWithPhone": "Iniciar con audio de llamada telefónica", "unsafeRoomConsent": "Comprendo los riesgos, quiero unirme a la reunión", "videoOnlyError": "Error con el vídeo:", diff --git a/lang/main-esUS.json b/lang/main-esUS.json index 3b01db049b..8613220bde 100644 --- a/lang/main-esUS.json +++ b/lang/main-esUS.json @@ -759,7 +759,6 @@ "or": "o", "premeeting": "Pre-reunión", "screenSharingError": "Error al compartir pantalla:", - "showScreen": "Habilitar pantalla pre-reunión", "startWithPhone": "Iniciar con audio de llamada telefónica", "videoOnlyError": "Error con el video:", "videoTrackError": "No se pudo crear la pista de video.", diff --git a/lang/main-eu.json b/lang/main-eu.json index 7a92bf34ed..2ba0fd127b 100644 --- a/lang/main-eu.json +++ b/lang/main-eu.json @@ -646,7 +646,6 @@ "or": "edo", "premeeting": "Aurre-bilera", "screenSharingError": "Errorea pantaila partekatzean:", - "showScreen": "Aktibatu bileraren aurreko pantaila", "startWithPhone": "Telefono diearen audioarekin hasi", "videoOnlyError": "Errorea bideoan:", "videoTrackError": "Ezin izan da bideo pista sortu.", diff --git a/lang/main-fa.json b/lang/main-fa.json index 7824cd0c5a..026f9e50da 100644 --- a/lang/main-fa.json +++ b/lang/main-fa.json @@ -894,7 +894,6 @@ "premeeting": "پیش‌جلسه", "proceedAnyway": "در هر صورت انجام شود", "screenSharingError": "خطا در هم‌رسانی صفحه:", - "showScreen": "فعال‌سازی صفحهٔ پیش‌جلسه", "startWithPhone": "شروع با صدای گوشی", "unsafeRoomConsent": "من خطر احتمالی را درک می‌کنم؛ می‌خواهم به جلسه بپیوندم", "videoOnlyError": "خطای ویدیو:", diff --git a/lang/main-fr.json b/lang/main-fr.json index dbbf3c1b7e..840c7f0157 100644 --- a/lang/main-fr.json +++ b/lang/main-fr.json @@ -976,7 +976,6 @@ "proceedAnyway": "Continuer quand même", "recordingWarning": "D'autres participants peuvent enregistrer cet appel", "screenSharingError": "Erreur de partage d'écran:", - "showScreen": "Activer l'écran de pré-séance", "startWithPhone": "Commencez avec l'audio du téléphone", "unsafeRoomConsent": "Je comprends les risques et je veux quand même rejoindre cette réunion", "videoOnlyError": "Erreur vidéo:", diff --git a/lang/main-frCA.json b/lang/main-frCA.json index dbfeebdb86..000ad7c1ca 100644 --- a/lang/main-frCA.json +++ b/lang/main-frCA.json @@ -954,7 +954,6 @@ "premeeting": "Pré-séance", "proceedAnyway": "Continuer quand même", "screenSharingError": "Erreur de partage d'écran:", - "showScreen": "Activer l'écran de pré-séance", "startWithPhone": "Commencez avec l'audio du téléphone", "unsafeRoomConsent": "Je comprends les risques et je veux quand même rejoindre cette réunion", "videoOnlyError": "Erreur vidéo:", diff --git a/lang/main-hi.json b/lang/main-hi.json index 4477bd48e7..23138a0326 100644 --- a/lang/main-hi.json +++ b/lang/main-hi.json @@ -622,7 +622,6 @@ "or": "या", "premeeting": "प्री मीटिंग", "screenSharingError": "स्क्रीन शेयरिंग त्रुटि:", - "showScreen": "प्री मीटिंग स्क्रीन सक्षम करें", "startWithPhone": "फोन ऑडियो से शुरू करें", "videoOnlyError": "वीडियो त्रुटि:", "videoTrackError": "वीडियो ट्रैक नहीं बना सका", diff --git a/lang/main-hr.json b/lang/main-hr.json index d18956f36a..b7ae952323 100644 --- a/lang/main-hr.json +++ b/lang/main-hr.json @@ -840,7 +840,6 @@ "or": "ili", "premeeting": "Predsastanak", "screenSharingError": "Greška dijeljenja ekrana:", - "showScreen": "Uključi ekran predsastanka", "startWithPhone": "Počni s telefonom", "videoOnlyError": "Greška videa:", "videoTrackError": "Nije bilo moguće stvoriti videosnimku.", diff --git a/lang/main-hsb.json b/lang/main-hsb.json index 206fe5d030..6992513292 100644 --- a/lang/main-hsb.json +++ b/lang/main-hsb.json @@ -824,7 +824,6 @@ "or": "abo", "premeeting": "předstwa", "screenSharingError": "zmylk při dopušćenju wužiwanja monitora:", - "showScreen": "konferencnu předstwu aktiwěrować", "startWithPhone": "z telefoniskim awdijom startować", "videoOnlyError": "widejowy zmylk:", "videoTrackError": "widejowy trak njebě móžny", diff --git a/lang/main-hu.json b/lang/main-hu.json index a438e30bb7..93539b8e88 100644 --- a/lang/main-hu.json +++ b/lang/main-hu.json @@ -683,7 +683,6 @@ "or": "vagy", "premeeting": "Csatlakozás előtt", "screenSharingError": "Képernyő megosztás hiba:", - "showScreen": "Csatlakozás előtti kamerakép", "startWithPhone": "Kezdés telefonhanggal", "videoOnlyError": "Videó hiba:", "videoTrackError": "Nem sikerült a videó megjelenítés.", diff --git a/lang/main-id.json b/lang/main-id.json index 0545e0fa71..9a49c36f38 100644 --- a/lang/main-id.json +++ b/lang/main-id.json @@ -955,7 +955,6 @@ "proceedAnyway": "Lanjutkan saja", "recordingWarning": "Peserta lain mungkin sedang merekam panggilan ini", "screenSharingError": "Kesalahan berbagi layar:", - "showScreen": "Aktifkan layar pra pertemuan", "startWithPhone": "Mulai dengan audio ponsel", "unsafeRoomConsent": "Saya memahami risikonya, saya ingin bergabung dengan pertemuan", "videoOnlyError": "Kesalahan video:", diff --git a/lang/main-is.json b/lang/main-is.json index 5ae1daf5d2..ec4cfa740a 100644 --- a/lang/main-is.json +++ b/lang/main-is.json @@ -936,7 +936,6 @@ "premeeting": "Á undan fundi", "proceedAnyway": "Halda samt áfram", "screenSharingError": "Villa í skjádeilingu:", - "showScreen": "Virkja skjá á undan fundi", "startWithPhone": "Byrja með símahljóði", "unsafeRoomConsent": "Ég skil áhættuna, ég vil taka þátt í fundinum", "videoOnlyError": "Villa í myndmerki:", diff --git a/lang/main-it.json b/lang/main-it.json index bff6b3876d..22901dd57a 100644 --- a/lang/main-it.json +++ b/lang/main-it.json @@ -993,7 +993,6 @@ "proceedAnyway": "Procedi comunque", "recordingWarning": "Gli altri partecipanti potrebbero registrare la riunione", "screenSharingError": "Errore di condivisione dello schermo:", - "showScreen": "Attiva schermata pre-riunione", "startWithPhone": "Avvia usando l'audio del telefono", "unsafeRoomConsent": "Accetto i rischi, voglio entrare nella riunione.", "videoOnlyError": "Errore video:", diff --git a/lang/main-ja.json b/lang/main-ja.json index a437245780..2c2ab62b8c 100644 --- a/lang/main-ja.json +++ b/lang/main-ja.json @@ -784,7 +784,6 @@ "or": "または", "premeeting": "プレミーティング", "screenSharingError": "画面共有のエラー:", - "showScreen": "プレミーティング画面を有効", "startWithPhone": "音声通話を開始", "videoOnlyError": "ビデオのエラー:", "videoTrackError": "ビデオトラックを生成できませんでした。", diff --git a/lang/main-kab.json b/lang/main-kab.json index 3e4a1b166d..c7dc0573ad 100644 --- a/lang/main-kab.json +++ b/lang/main-kab.json @@ -736,7 +736,6 @@ "or": "neɣ", "premeeting": "Timlilit tuzwirt", "screenSharingError": "Tuccḍa deg beṭṭu n ugdil:", - "showScreen": "Rmed agdil n temlilit tuzwirt", "startWithPhone": "Bdu s umeslaw n tiliɣri", "videoOnlyError": "Tuccḍa deg tvidyut:", "videoTrackError": "Asnulfu n track n tvidyut ulamek.", diff --git a/lang/main-ko.json b/lang/main-ko.json index e005518f41..ef7a7286e7 100644 --- a/lang/main-ko.json +++ b/lang/main-ko.json @@ -975,7 +975,6 @@ "proceedAnyway": "그래도 진행", "recordingWarning": "다른 참가자가 이 통화를 녹화하고 있을 수 있습니다", "screenSharingError": "화면 공유 오류:", - "showScreen": "회의 전 화면 활성화", "startWithPhone": "전화 오디오로 시작", "unsafeRoomConsent": "위험을 이해하며 회의에 참여하고 싶습니다", "videoOnlyError": "비디오 오류:", diff --git a/lang/main-lv.json b/lang/main-lv.json index b855724af4..d545a9701a 100644 --- a/lang/main-lv.json +++ b/lang/main-lv.json @@ -982,7 +982,6 @@ "proceedAnyway": "Tik un tā turpināt", "recordingWarning": "Citi dalībnieki var ierakstīt šo zvanu", "screenSharingError": "Ekrāna koplietošanas kļūda:", - "showScreen": "Iespējot ekrānu pirms sapulces", "startWithPhone": "Sākt ar tālruņa audio", "unsafeRoomConsent": "Es saprotu riskus, vēlos pievienoties sapulcei", "videoOnlyError": "Video kļūda:", diff --git a/lang/main-ml.json b/lang/main-ml.json index 1cb9af1a8e..2e31026128 100644 --- a/lang/main-ml.json +++ b/lang/main-ml.json @@ -602,7 +602,6 @@ "or": "അല്ലെങ്കിൽ", "premeeting": "പ്രീ മീറ്റിംഗ്", "screenSharingError": "സ്ക്രീൻ പങ്കിടൽ പിശക്:", - "showScreen": "പ്രീ മീറ്റിംഗ് സ്ക്രീൻ പ്രാപ്തമാക്കുക", "startWithPhone": "ഫോൺ ഓഡിയോ ഉപയോഗിച്ച് ആരംഭിക്കുക", "videoOnlyError": "വീഡിയോ പിശക്:", "videoTrackError": "വീഡിയോ ട്രാക്ക് സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല.", diff --git a/lang/main-mn.json b/lang/main-mn.json index 9f77be44bb..e020a39784 100644 --- a/lang/main-mn.json +++ b/lang/main-mn.json @@ -872,7 +872,6 @@ "or": "эсвэл", "premeeting": "Уулзалтын өмнө", "screenSharingError": "Дэлгэц хуваалцахын алдаа:", - "showScreen": "Уулзалтын өмгөх дэлгэц идэвхижүүлэх", "startWithPhone": "Утасны дуугаар холбогдох", "videoOnlyError": "Видео дамжуулалтын алдаа:", "videoTrackError": "Видео бичлэг үүсгэж чадсангүй.", diff --git a/lang/main-nb.json b/lang/main-nb.json index 1906bbad8d..4aa731e2c6 100644 --- a/lang/main-nb.json +++ b/lang/main-nb.json @@ -976,7 +976,6 @@ "proceedAnyway": "Fortsett likevel", "recordingWarning": "Andre deltakere kan ta opp denne samtalen", "screenSharingError": "Feil ved skjermdeling:", - "showScreen": "Aktiver skjerm før møtet", "startWithPhone": "Start med telefonlyd", "unsafeRoomConsent": "Jeg forstår risikoen, jeg vil bli med i møtet", "videoOnlyError": "Video feil:", diff --git a/lang/main-nl.json b/lang/main-nl.json index f3fa46cd9d..68f0077092 100644 --- a/lang/main-nl.json +++ b/lang/main-nl.json @@ -723,7 +723,6 @@ "or": "of", "premeeting": "Voorbeeldscherm", "screenSharingError": "Fout bij schermdeling:", - "showScreen": "Voorbeeldscherm inschakelen", "startWithPhone": "Starten met telefoonaudio", "videoOnlyError": "Videofout:", "videoTrackError": "Kon videotrack niet aanmaken.", diff --git a/lang/main-no.json b/lang/main-no.json index 1906bbad8d..4aa731e2c6 100644 --- a/lang/main-no.json +++ b/lang/main-no.json @@ -976,7 +976,6 @@ "proceedAnyway": "Fortsett likevel", "recordingWarning": "Andre deltakere kan ta opp denne samtalen", "screenSharingError": "Feil ved skjermdeling:", - "showScreen": "Aktiver skjerm før møtet", "startWithPhone": "Start med telefonlyd", "unsafeRoomConsent": "Jeg forstår risikoen, jeg vil bli med i møtet", "videoOnlyError": "Video feil:", diff --git a/lang/main-oc.json b/lang/main-oc.json index 0c40e54b6a..cf11242a8f 100644 --- a/lang/main-oc.json +++ b/lang/main-oc.json @@ -976,7 +976,6 @@ "proceedAnyway": "Contunhar malgrat tot", "recordingWarning": "D'autres participants pòdon enregistrar aquesta sonada", "screenSharingError": "Error de partatge d’ecran :", - "showScreen": "Activar l'ecran de prereünion", "startWithPhone": "Començar amb l’àudio del telefòn", "unsafeRoomConsent": "Compreni lo risc e vòli çaquelà participar a la reünion", "videoOnlyError": "Error vidèo :", diff --git a/lang/main-pl.json b/lang/main-pl.json index 5a5be6a3dd..8c8cb53fa1 100644 --- a/lang/main-pl.json +++ b/lang/main-pl.json @@ -874,7 +874,6 @@ "premeeting": "Przed spotkaniem", "proceedAnyway": "Kontynuuj mimo to", "screenSharingError": "Błąd udostępniania ekranu:", - "showScreen": "Tryb osobistej poczekalni przed spotkaniem", "startWithPhone": "Uruchom przez telefon", "unsafeRoomConsent": "Rozumiem ryzyko, chcę dołączyć do spotkania", "videoOnlyError": "Błąd wideo:", diff --git a/lang/main-pt.json b/lang/main-pt.json index 6213aacf4f..4c02ab4b6f 100644 --- a/lang/main-pt.json +++ b/lang/main-pt.json @@ -964,7 +964,6 @@ "proceedAnyway": "Continuar na mesma", "recordingWarning": "Outros participantes podem estar a gravar esta chamada", "screenSharingError": "Erro de partilha de ecrã:", - "showScreen": "Ativar o ecrã de pré-reunião", "startWithPhone": "Iniciar com o áudio do telefone", "unsafeRoomConsent": "Compreendo os riscos, quero participar na reunião", "videoOnlyError": "Erro de vídeo:", diff --git a/lang/main-ptBR.json b/lang/main-ptBR.json index bf2e0e4dab..af15412470 100644 --- a/lang/main-ptBR.json +++ b/lang/main-ptBR.json @@ -935,7 +935,6 @@ "premeeting": "Pré-reunião", "proceedAnyway": "Prosseguir mesmo assim", "screenSharingError": "Erro de compartilhamento de tela:", - "showScreen": "Habilitar tela pré-reunião", "startWithPhone": "Iniciar com o áudio da ligação", "unsafeRoomConsent": "Eu entendo os riscos, desejo ingressar na reunião", "videoOnlyError": "Erro de vídeo:", diff --git a/lang/main-ru.json b/lang/main-ru.json index 6af141099c..ee43590305 100644 --- a/lang/main-ru.json +++ b/lang/main-ru.json @@ -950,7 +950,6 @@ "proceedAnyway": "Продолжить в любом случае", "recordingWarning": "Другие участники могут записывать этот звонок", "screenSharingError": "Ошибка показа экрана:", - "showScreen": "Включить экран перед подключением", "startWithPhone": "Начать с телефонной связью", "unsafeRoomConsent": "Я понимаю риски и хочу присоединиться к встрече", "videoOnlyError": "Ошибка видео:", diff --git a/lang/main-sc.json b/lang/main-sc.json index 5fea3acb75..e83c38d58c 100644 --- a/lang/main-sc.json +++ b/lang/main-sc.json @@ -842,7 +842,6 @@ "or": "opuru", "premeeting": "Pre-riunione", "screenSharingError": "Faddina in sa cumpartzidura de s'ischermu", - "showScreen": "Ativa ischermu de pre-riunione", "startWithPhone": "Avia imperende s'àudio de su telèfonu", "videoOnlyError": "Faddina de vìdeu:", "videoTrackError": "Impossìbile creare una rasta de vìdeu.", diff --git a/lang/main-sl.json b/lang/main-sl.json index 626ba78aaa..fb9aa76a79 100644 --- a/lang/main-sl.json +++ b/lang/main-sl.json @@ -737,7 +737,6 @@ "or": "ali", "premeeting": "Pred sestanek", "screenSharingError": "Napaka deljenja zaslona:", - "showScreen": "Omogoči zaslon pred sestankom", "startWithPhone": "Začni z zvokom telefona", "videoOnlyError": "Napaka videa:", "videoTrackError": "Ni bilo mogoče ustvariti videa.", diff --git a/lang/main-sq.json b/lang/main-sq.json index a0dc3a5575..a5290b0f27 100644 --- a/lang/main-sq.json +++ b/lang/main-sq.json @@ -975,7 +975,6 @@ "proceedAnyway": "Vazhdo, sido qoftë", "recordingWarning": "Këtë thirrje pjesëmarrës të tjerë mund ta regjistrojnë", "screenSharingError": "Gabim ndarjeje ekrani me të tjerë:", - "showScreen": "Aktivizoni skenë para takimit", "startWithPhone": "Nise me audio telefoni", "unsafeRoomConsent": "I kuptoj rreziqet, dëshiroj të marr pjesë te takimi", "videoOnlyError": "Gabim video:", diff --git a/lang/main-sr.json b/lang/main-sr.json index cf0b10f2c4..5f0c4f1138 100644 --- a/lang/main-sr.json +++ b/lang/main-sr.json @@ -483,7 +483,6 @@ "or": "или", "premeeting": "Пред придруживањем", "screenSharingError": "Грешка дијељења екрана:", - "showScreen": "Укључити екран 'пред придруживњем'.", "startWithPhone": "Започети са телефонском везом.", "videoOnlyError": "Грешка видеа:", "videoTrackError": "Креирање видео траке није успјело.", diff --git a/lang/main-sv.json b/lang/main-sv.json index 1546f158b2..8babe09615 100644 --- a/lang/main-sv.json +++ b/lang/main-sv.json @@ -976,7 +976,6 @@ "proceedAnyway": "Fortsätt ändå", "recordingWarning": "", "screenSharingError": "Skärmdelningsfel:", - "showScreen": "Aktivera skärmen före mötet", "startWithPhone": "Börja med telefonljud", "unsafeRoomConsent": "Jag förstår riskerna, jag vill vara med på mötet", "videoOnlyError": "Videofel:", diff --git a/lang/main-te.json b/lang/main-te.json index 63d6fecf8a..d6bc18bb0e 100644 --- a/lang/main-te.json +++ b/lang/main-te.json @@ -634,7 +634,6 @@ "or": "లేదా", "premeeting": "Pre meeting", "screenSharingError": "Screen sharing error:", - "showScreen": "Enable pre meeting screen", "startWithPhone": "Start with phone audio", "videoOnlyError": "Video error:", "videoTrackError": "Could not create video track.", diff --git a/lang/main-tr.json b/lang/main-tr.json index c151928953..dca307461d 100644 --- a/lang/main-tr.json +++ b/lang/main-tr.json @@ -970,7 +970,6 @@ "proceedAnyway": "Yine de devam et", "recordingWarning": "Diğer katılımcılar bu çağrıyı kaydediyor olabilir", "screenSharingError": "Ekran paylaşma hatası:", - "showScreen": "Toplantı öncesi ekranını etkinleştir", "startWithPhone": "Telefon sesiyle başlayın", "unsafeRoomConsent": "Riskleri anlıyorum, toplantıya katılmak istiyorum", "videoOnlyError": "Video hatası:", diff --git a/lang/main-uk.json b/lang/main-uk.json index 9df633b7b6..d7f2db89df 100644 --- a/lang/main-uk.json +++ b/lang/main-uk.json @@ -870,7 +870,6 @@ "or": "або", "premeeting": "Перед приєднанням", "screenSharingError": "Помилка спільного перегляду екрана:", - "showScreen": "Увімкнути вхідну панель", "startWithPhone": "Почати в режимі телефону", "videoOnlyError": "Помилка відео:", "videoTrackError": "Не вдалося створити трек відео.", diff --git a/lang/main-vi.json b/lang/main-vi.json index 1375660391..3415d6f50e 100644 --- a/lang/main-vi.json +++ b/lang/main-vi.json @@ -948,7 +948,6 @@ "proceedAnyway": "Tiếp tục dù sao", "recordingWarning": "Có thể có người tham gia khác đang ghi lại cuộc gọi này", "screenSharingError": "Lỗi chia sẻ màn hình:", - "showScreen": "Kích hoạt màn hình trước cuộc họp", "startWithPhone": "Bắt đầu với âm thanh điện thoại", "unsafeRoomConsent": "Tôi hiểu rủi ro, tôi muốn tham gia cuộc họp", "videoOnlyError": "Lỗi video:", diff --git a/lang/main-zhCN.json b/lang/main-zhCN.json index ac3d632b9a..4d461eb14b 100644 --- a/lang/main-zhCN.json +++ b/lang/main-zhCN.json @@ -917,7 +917,6 @@ "premeeting": "会前", "proceedAnyway": "仍然继续", "screenSharingError": "共享屏幕错误：", - "showScreen": "开启会前屏幕", "startWithPhone": "以电话音频开始", "unsafeRoomConsent": "我了解风险，我想加入会议", "videoOnlyError": "视频错误：", diff --git a/lang/main-zhTW.json b/lang/main-zhTW.json index b7805e7476..a854171a9a 100644 --- a/lang/main-zhTW.json +++ b/lang/main-zhTW.json @@ -934,7 +934,6 @@ "premeeting": "會議前", "proceedAnyway": "仍然繼續", "screenSharingError": "螢幕分享錯誤：", - "showScreen": "啟用會議前螢幕", "startWithPhone": "使用手機音訊開始", "unsafeRoomConsent": "我了解風險，我想要加入會議", "videoOnlyError": "視訊錯誤：", diff --git a/lang/main.json b/lang/main.json index 7ff0981d23..12b7a99808 100644 --- a/lang/main.json +++ b/lang/main.json @@ -993,7 +993,6 @@ "proceedAnyway": "Proceed anyway", "recordingWarning": "Other participants may be recording this call", "screenSharingError": "Screen sharing error:", - "showScreen": "Enable pre meeting screen", "startWithPhone": "Start with phone audio", "unsafeRoomConsent": "I understand the risks, I want to join the meeting", "videoOnlyError": "Video error:", diff --git a/react/features/base/settings/middleware.web.ts b/react/features/base/settings/middleware.web.ts index d0da7d86e7..15bccac950 100644 --- a/react/features/base/settings/middleware.web.ts +++ b/react/features/base/settings/middleware.web.ts @@ -1,7 +1,5 @@ import { IStore } from '../../app/types'; import { PREJOIN_INITIALIZED } from '../../prejoin/actionTypes'; -import { setPrejoinPageVisibility } from '../../prejoin/actions'; -import { APP_WILL_MOUNT } from '../app/actionTypes'; import { getJwtName } from '../jwt/functions'; import { MEDIA_TYPE } from '../media/constants'; import MiddlewareRegistry from '../redux/MiddlewareRegistry'; @@ -26,9 +24,6 @@ MiddlewareRegistry.register(store => next => action => { const result = next(action); switch (action.type) { - case APP_WILL_MOUNT: - _initializeShowPrejoin(store); - break; case PREJOIN_INITIALIZED: _maybeUpdateDisplayName(store); break; @@ -40,21 +35,6 @@ MiddlewareRegistry.register(store => next => action => { return result; }); -/** - * Overwrites the showPrejoin flag based on cached used selection for showing prejoin screen. - * - * @param {Store} store - The redux store. - * @private - * @returns {void} - */ -function _initializeShowPrejoin({ dispatch, getState }: IStore) { - const { userSelectedSkipPrejoin } = getState()['features/base/settings']; - - if (userSelectedSkipPrejoin) { - dispatch(setPrejoinPageVisibility(false)); - } -} - /** * Updates the display name to the one in JWT if there is one. * diff --git a/react/features/base/settings/reducer.ts b/react/features/base/settings/reducer.ts index b74030a7f7..766770bee2 100644 --- a/react/features/base/settings/reducer.ts +++ b/react/features/base/settings/reducer.ts @@ -48,8 +48,7 @@ const DEFAULT_STATE: ISettingsState = { userSelectedNotifications: { 'notify.chatMessages': true }, - userSelectedMicDeviceLabel: undefined, - userSelectedSkipPrejoin: undefined + userSelectedMicDeviceLabel: undefined }; export interface ISettingsState { @@ -88,7 +87,6 @@ export interface ISettingsState { userSelectedNotifications?: { [key: string]: boolean; }; - userSelectedSkipPrejoin?: boolean; videoSettingsVisible?: boolean; visible?: boolean; } diff --git a/react/features/prejoin/functions.any.ts b/react/features/prejoin/functions.any.ts index 3932883522..677fd496e4 100644 --- a/react/features/prejoin/functions.any.ts +++ b/react/features/prejoin/functions.any.ts @@ -182,10 +182,9 @@ export function isPrejoinPageVisible(state: IReduxState): boolean { */ export function shouldAutoKnock(state: IReduxState): boolean { const { iAmRecorder, iAmSipGateway } = state['features/base/config']; - const { userSelectedSkipPrejoin } = state['features/base/settings']; const { autoKnock } = getLobbyConfig(state); - return Boolean(((isPrejoinEnabledInConfig(state) && !userSelectedSkipPrejoin) + return Boolean(((isPrejoinEnabledInConfig(state)) || autoKnock || (iAmRecorder && iAmSipGateway)) && !state['features/lobby'].knocking); } diff --git a/react/features/settings/actions.web.ts b/react/features/settings/actions.web.ts index f2698a5669..b7152dd3a3 100644 --- a/react/features/settings/actions.web.ts +++ b/react/features/settings/actions.web.ts @@ -132,14 +132,6 @@ export function submitMoreTab(newState: any) { const state = getState(); const currentState = getMoreTabProps(state); - const showPrejoinPage = newState.showPrejoinPage; - - if (showPrejoinPage !== currentState.showPrejoinPage) { - dispatch(updateSettings({ - userSelectedSkipPrejoin: !showPrejoinPage - })); - } - if (newState.maxStageParticipants !== currentState.maxStageParticipants) { dispatch(updateSettings({ maxStageParticipants: Number(newState.maxStageParticipants) })); } diff --git a/react/features/settings/components/native/GeneralSection.tsx b/react/features/settings/components/native/GeneralSection.tsx index 50d9c3c91d..f30a5ce806 100644 --- a/react/features/settings/components/native/GeneralSection.tsx +++ b/react/features/settings/components/native/GeneralSection.tsx @@ -11,7 +11,6 @@ import { updateSettings } from '../../../base/settings/actions'; import Switch from '../../../base/ui/components/native/Switch'; import { navigate } from '../../../mobile/navigation/components/settings/SettingsNavigationContainerRef'; import { screen } from '../../../mobile/navigation/routes'; -import { isPrejoinEnabledInConfig } from '../../../prejoin/functions.native'; import FormRow from './FormRow'; import FormSection from './FormSection'; @@ -23,24 +22,14 @@ const GeneralSection = () => { const dispatch = useDispatch(); const { disableSelfView, - userSelectedSkipPrejoin } = useSelector((state: IReduxState) => state['features/base/settings']); - const showPrejoinPage = !userSelectedSkipPrejoin; - - const showPrejoinSettings = useSelector(isPrejoinEnabledInConfig); - const { language = DEFAULT_LANGUAGE } = i18next; const onSelfViewToggled = useCallback((enabled?: boolean) => dispatch(updateSettings({ disableSelfView: enabled })) , [ dispatch, updateSettings ]); - const onShowPejoinToggled = useCallback((enabled?: boolean) => { - dispatch(updateSettings({ userSelectedSkipPrejoin: !enabled })); - } - , [ dispatch, updateSettings ]); - const navigateToLanguageSelect = useCallback(() => { navigate(screen.settings.language); }, [ navigate, screen ]); @@ -52,11 +41,6 @@ const GeneralSection = () => { checked = { Boolean(disableSelfView) } onChange = { onSelfViewToggled } /> - {showPrejoinSettings && - - } diff --git a/react/features/settings/components/web/MoreTab.tsx b/react/features/settings/components/web/MoreTab.tsx index cb34f06d1f..4dfad64819 100644 --- a/react/features/settings/components/web/MoreTab.tsx +++ b/react/features/settings/components/web/MoreTab.tsx @@ -73,16 +73,6 @@ export interface IProps extends AbstractDialogTabProps, WithTranslation { */ showModeratorSettings: boolean; - /** - * Whether or not to show prejoin screen. - */ - showPrejoinPage: boolean; - - /** - * Whether or not to display the prejoin settings section. - */ - showPrejoinSettings: boolean; - /** * Whether or not to show subtitles on stage. */ @@ -132,7 +122,6 @@ class MoreTab extends AbstractDialogTab { super(props); // Bind event handler so it is only bound once for every instance. - this._onShowPrejoinPageChanged = this._onShowPrejoinPageChanged.bind(this); this._renderMaxStageParticipantsSelect = this._renderMaxStageParticipantsSelect.bind(this); this._onMaxStageParticipantsSelect = this._onMaxStageParticipantsSelect.bind(this); this._onHideSelfViewChanged = this._onHideSelfViewChanged.bind(this); @@ -149,7 +138,6 @@ class MoreTab extends AbstractDialogTab { override render() { const { areClosedCaptionsEnabled, - showPrejoinSettings, disableHideSelfView, iAmVisitor, hideSelfView, @@ -163,10 +151,6 @@ class MoreTab extends AbstractDialogTab {
- {showPrejoinSettings && <> - {this._renderPrejoinScreenSettings()} -
- } {this._renderMaxStageParticipantsSelect()} {!disableHideSelfView && !iAmVisitor && ( { ); } - /** - * Callback invoked to select if the lobby - * should be shown. - * - * @param {Object} e - The key event to handle. - * - * @returns {void} - */ - _onShowPrejoinPageChanged({ target: { checked } }: React.ChangeEvent) { - super._onChange({ showPrejoinPage: checked }); - } - /** * Callback invoked to select a max number of stage participants from the select dropdown. * @@ -247,24 +219,6 @@ class MoreTab extends AbstractDialogTab { super._onChange({ currentLanguage: language }); } - /** - * Returns the React Element for modifying prejoin screen settings. - * - * @private - * @returns {ReactElement} - */ - _renderPrejoinScreenSettings() { - const { t, showPrejoinPage } = this.props; - - return ( - - ); - } - /** * Returns the React Element for the max stage participants dropdown. * diff --git a/react/features/settings/components/web/SettingsDialog.tsx b/react/features/settings/components/web/SettingsDialog.tsx index 7a05139008..1b8b500b60 100644 --- a/react/features/settings/components/web/SettingsDialog.tsx +++ b/react/features/settings/components/web/SettingsDialog.tsx @@ -315,7 +315,6 @@ function _mapStateToProps(state: IReduxState, ownProps: any) { ...newProps, currentLanguage: tabState?.currentLanguage, hideSelfView: tabState?.hideSelfView, - showPrejoinPage: tabState?.showPrejoinPage, showSubtitlesOnStage: tabState?.showSubtitlesOnStage, maxStageParticipants: tabState?.maxStageParticipants }; diff --git a/react/features/settings/functions.any.ts b/react/features/settings/functions.any.ts index 0a89e1b795..5d7abd141b 100644 --- a/react/features/settings/functions.any.ts +++ b/react/features/settings/functions.any.ts @@ -10,7 +10,6 @@ import { getHideSelfView } from '../base/settings/functions.any'; import { parseStandardURIString } from '../base/util/uri'; import { isStageFilmstripEnabled } from '../filmstrip/functions'; import { isFollowMeActive, isFollowMeRecorderActive } from '../follow-me/functions'; -import { isPrejoinEnabledInConfig } from '../prejoin/functions'; import { isReactionsEnabled } from '../reactions/functions.any'; import { areClosedCaptionsEnabled } from '../subtitles/functions.any'; import { iAmVisitor } from '../visitors/functions'; @@ -116,8 +115,6 @@ export function getMoreTabProps(stateful: IStateful) { languages: LANGUAGES, maxStageParticipants: state['features/base/settings'].maxStageParticipants, showLanguageSettings: configuredTabs.includes('language'), - showPrejoinPage: !state['features/base/settings'].userSelectedSkipPrejoin, - showPrejoinSettings: isPrejoinEnabledInConfig(state), showSubtitlesOnStage: state['features/base/settings'].showSubtitlesOnStage, stageFilmstripEnabled };