feat: Caches is secure room checks.

Consider long room names secure.

android/app/build.gradle

@@ -81,7 +81,8 @@ dependencies {
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
 
     if (!rootProject.ext.libreBuild) {
-        implementation 'com.google.android.gms:play-services-auth:16.0.1'
+        // Sync with react-native-google-signin
+        implementation 'com.google.android.gms:play-services-auth:19.2.0'
 
         // Firebase
         //  - Crashlytics

android/scripts/release-sdk.sh

@@ -29,6 +29,10 @@ if [[ $MVN_HTTP == 1 ]]; then
     # Push React Native
     echo "Pushing React Native ${RN_VERSION} to the Maven repo"
     pushd ${THIS_DIR}/../../node_modules/react-native/android/com/facebook/react/react-native/${RN_VERSION}
+    cat react-native-${RN_VERSION}.pom \
+        | sed "s#<packaging>pom</packaging>#<packaging>aar</packaging>#" \
+        | sed "/<optional>/d" \
+        > react-native-${RN_VERSION}-fixed.pom
     mvn \
         deploy:deploy-file \
         -Durl=${MVN_REPO} \
@@ -36,7 +40,7 @@ if [[ $MVN_HTTP == 1 ]]; then
         -Dfile=react-native-${RN_VERSION}-release.aar \
         -Dpackaging=aar \
         -DgeneratePom=false \
-        -DpomFile=react-native-${RN_VERSION}.pom || true
+        -DpomFile=react-native-${RN_VERSION}-fixed.pom || true
     popd
     # Push JSC
     echo "Pushing JSC ${JSC_VERSION} to the Maven repo"
@@ -55,13 +59,17 @@ else
     if [[ ! -d ${MVN_REPO}/com/facebook/react/react-native/${RN_VERSION} ]]; then
         echo "Pushing React Native ${RN_VERSION} to the Maven repo"
         pushd ${THIS_DIR}/../../node_modules/react-native/android/com/facebook/react/react-native/${RN_VERSION}
+        cat react-native-${RN_VERSION}.pom \
+            | sed "s#<packaging>pom</packaging>#<packaging>aar</packaging>#" \
+            | sed "/<optional>/d" \
+            > react-native-${RN_VERSION}-fixed.pom
         mvn \
             deploy:deploy-file \
             -Durl=${MVN_REPO} \
             -Dfile=react-native-${RN_VERSION}-release.aar \
             -Dpackaging=aar \
             -DgeneratePom=false \
-            -DpomFile=react-native-${RN_VERSION}.pom
+            -DpomFile=react-native-${RN_VERSION}-fixed.pom
         popd
     fi
 

android/sdk/build.gradle

@@ -74,7 +74,7 @@ dependencies {
     }
     implementation project(':react-native-gesture-handler')
     implementation project(':react-native-get-random-values')
-    implementation project(':react-native-immersive')
+    implementation project(':react-native-immersive-mode')
     implementation project(':react-native-keep-awake')
     implementation project(':react-native-orientation-locker')
     implementation project(':react-native-pager-view')

android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastAction.java

@@ -77,7 +77,8 @@ public class BroadcastAction {
         CLOSE_CHAT("org.jitsi.meet.CLOSE_CHAT"),
         SEND_CHAT_MESSAGE("org.jitsi.meet.SEND_CHAT_MESSAGE"),
         SET_VIDEO_MUTED("org.jitsi.meet.SET_VIDEO_MUTED"),
-        SET_CLOSED_CAPTIONS_ENABLED("org.jitsi.meet.SET_CLOSED_CAPTIONS_ENABLED");
+        SET_CLOSED_CAPTIONS_ENABLED("org.jitsi.meet.SET_CLOSED_CAPTIONS_ENABLED"),
+        TOGGLE_CAMERA("org.jitsi.meet.TOGGLE_CAMERA");
 
         private final String action;
 

android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastEvent.java

@@ -75,6 +75,8 @@ public class BroadcastEvent {
     }
 
     public enum Type {
+        CONFERENCE_BLURRED("org.jitsi.meet.CONFERENCE_BLURRED"),
+        CONFERENCE_FOCUSED("org.jitsi.meet.CONFERENCE_FOCUSED"),
         CONFERENCE_JOINED("org.jitsi.meet.CONFERENCE_JOINED"),
         CONFERENCE_TERMINATED("org.jitsi.meet.CONFERENCE_TERMINATED"),
         CONFERENCE_WILL_JOIN("org.jitsi.meet.CONFERENCE_WILL_JOIN"),
@@ -89,6 +91,8 @@ public class BroadcastEvent {
         VIDEO_MUTED_CHANGED("org.jitsi.meet.VIDEO_MUTED_CHANGED"),
         READY_TO_CLOSE("org.jitsi.meet.READY_TO_CLOSE");
 
+        private static final String CONFERENCE_BLURRED_NAME = "CONFERENCE_BLURRED";
+        private static final String CONFERENCE_FOCUSED_NAME = "CONFERENCE_FOCUSED";
         private static final String CONFERENCE_WILL_JOIN_NAME = "CONFERENCE_WILL_JOIN";
         private static final String CONFERENCE_JOINED_NAME = "CONFERENCE_JOINED";
         private static final String CONFERENCE_TERMINATED_NAME = "CONFERENCE_TERMINATED";
@@ -124,6 +128,10 @@ public class BroadcastEvent {
 
         private static Type buildTypeFromName(String name) {
             switch (name) {
+                case CONFERENCE_BLURRED_NAME:
+                    return CONFERENCE_BLURRED;
+                case CONFERENCE_FOCUSED_NAME:
+                    return CONFERENCE_FOCUSED;
                 case CONFERENCE_WILL_JOIN_NAME:
                     return CONFERENCE_WILL_JOIN;
                 case CONFERENCE_JOINED_NAME:

android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastIntentHelper.java

@@ -54,4 +54,14 @@ public class BroadcastIntentHelper {
         intent.putExtra("enabled", enabled);
         return intent;
     }
+    
+    public static Intent buildRetrieveParticipantsInfo(String requestId) {
+        Intent intent = new Intent(BroadcastAction.Type.RETRIEVE_PARTICIPANTS_INFO.getAction());
+        intent.putExtra("requestId", requestId);
+        return intent;
+    }
+
+    public static Intent buildToggleCameraIntent() {
+        return new Intent(BroadcastAction.Type.TOGGLE_CAMERA.getAction());
+    }
 }

android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java

@@ -96,6 +96,7 @@ class ExternalAPIModule extends ReactContextBaseJavaModule {
         constants.put("SEND_CHAT_MESSAGE", BroadcastAction.Type.SEND_CHAT_MESSAGE.getAction());
         constants.put("SET_VIDEO_MUTED", BroadcastAction.Type.SET_VIDEO_MUTED.getAction());
         constants.put("SET_CLOSED_CAPTIONS_ENABLED", BroadcastAction.Type.SET_CLOSED_CAPTIONS_ENABLED.getAction());
+        constants.put("TOGGLE_CAMERA", BroadcastAction.Type.TOGGLE_CAMERA.getAction());
 
         return constants;
     }

android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java

@@ -26,7 +26,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.facebook.react.ReactRootView;
-import com.rnimmersive.RNImmersiveModule;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
@@ -229,22 +228,4 @@ public class JitsiMeetView extends FrameLayout {
         dispose();
         super.onDetachedFromWindow();
     }
-
-    /**
-     * Called when the window containing this view gains or loses focus.
-     *
-     * @param hasFocus If the window of this view now has focus, {@code true};
-     * otherwise, {@code false}.
-     */
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        super.onWindowFocusChanged(hasFocus);
-
-        // https://github.com/mockingbot/react-native-immersive#restore-immersive-state
-        RNImmersiveModule immersive = RNImmersiveModule.getInstance();
-
-        if (hasFocus && immersive != null) {
-            immersive.emitImmersiveStateChangeEvent();
-        }
-    }
 }

android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java

@@ -105,7 +105,7 @@ class ReactInstanceManagerHolder {
             new com.oney.WebRTCModule.WebRTCModulePackage(),
             new com.swmansion.gesturehandler.RNGestureHandlerPackage(),
             new org.linusu.RNGetRandomValuesPackage(),
-            new com.rnimmersive.RNImmersivePackage(),
+            new com.rnimmersivemode.RNImmersiveModePackage(),
             new com.swmansion.rnscreens.RNScreensPackage(),
             new com.zmxv.RNSound.RNSoundPackage(),
             new com.th3rdwave.safeareacontext.SafeAreaContextPackage(),

android/settings.gradle

@@ -27,8 +27,8 @@ include ':react-native-giphy'
 project(':react-native-giphy').projectDir = new File(rootProject.projectDir, '../node_modules/@giphy/react-native-sdk/android')
 include ':react-native-google-signin'
 project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-google-signin/google-signin/android')
-include ':react-native-immersive'
-project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
+include ':react-native-immersive-mode'
+project(':react-native-immersive-mode').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive-mode/android')
 include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
 include ':react-native-orientation-locker'

conference.js

@@ -4,12 +4,8 @@ import { jitsiLocalStorage } from '@jitsi/js-utils';
 import Logger from '@jitsi/logger';
 import EventEmitter from 'events';
 
-import { openConnection } from './connection';
 import { ENDPOINT_TEXT_MESSAGE_NAME } from './modules/API/constants';
 import { AUDIO_ONLY_SCREEN_SHARE_NO_TRACK } from './modules/UI/UIErrors';
-import AuthHandler from './modules/UI/authentication/AuthHandler';
-import UIUtil from './modules/UI/util/UIUtil';
-import VideoLayout from './modules/UI/videolayout/VideoLayout';
 import mediaDeviceHelper from './modules/devices/mediaDeviceHelper';
 import Recorder from './modules/recorder/Recorder';
 import { createTaskQueue } from './modules/util/helpers';
@@ -37,7 +33,7 @@ import {
     conferenceSubjectChanged,
     conferenceTimestampChanged,
     conferenceUniqueIdSet,
-    conferenceWillJoin,
+    conferenceWillInit,
     conferenceWillLeave,
     dataChannelClosed,
     dataChannelOpened,
@@ -57,12 +53,10 @@ import {
     commonUserJoinedHandling,
     commonUserLeftHandling,
     getConferenceOptions,
-    getVisitorOptions,
-    restoreConferenceOptions,
     sendLocalParticipant
 } from './react/features/base/conference/functions';
-import { overwriteConfig } from './react/features/base/config/actions';
 import { getReplaceParticipant } from './react/features/base/config/functions';
+import { connect } from './react/features/base/connection/actions.web';
 import {
     checkAndNotifyForNewDevice,
     getAvailableDevices,
@@ -77,15 +71,12 @@ import {
 import {
     JitsiConferenceErrors,
     JitsiConferenceEvents,
-    JitsiConnectionErrors,
-    JitsiConnectionEvents,
     JitsiE2ePingEvents,
     JitsiMediaDevicesEvents,
     JitsiTrackErrors,
     JitsiTrackEvents,
     browser
 } from './react/features/base/lib-jitsi-meet';
-import { isFatalJitsiConnectionError } from './react/features/base/lib-jitsi-meet/functions';
 import {
     gumPending,
     setAudioAvailable,
@@ -145,7 +136,12 @@ import { maybeOpenFeedbackDialog, submitFeedback } from './react/features/feedba
 import { initKeyboardShortcuts } from './react/features/keyboard-shortcuts/actions';
 import { maybeSetLobbyChatMessageListener } from './react/features/lobby/actions.any';
 import { setNoiseSuppressionEnabled } from './react/features/noise-suppression/actions';
-import { hideNotification, showNotification, showWarningNotification } from './react/features/notifications/actions';
+import {
+    hideNotification,
+    showErrorNotification,
+    showNotification,
+    showWarningNotification
+} from './react/features/notifications/actions';
 import {
     DATA_CHANNEL_CLOSED_NOTIFICATION_ID,
     NOTIFICATION_TIMEOUT_TYPE
@@ -153,7 +149,7 @@ import {
 import { isModerationNotificationDisplayed } from './react/features/notifications/functions';
 import { mediaPermissionPromptVisibilityChanged } from './react/features/overlay/actions';
 import { suspendDetected } from './react/features/power-monitor/actions';
-import { initPrejoin, makePrecallTest, setJoiningInProgress } from './react/features/prejoin/actions';
+import { initPrejoin, makePrecallTest } from './react/features/prejoin/actions';
 import { isPrejoinPageVisible } from './react/features/prejoin/functions';
 import { disableReceiver, stopReceiver } from './react/features/remote-control/actions';
 import { setScreenAudioShareState } from './react/features/screen-share/actions.web';
@@ -164,7 +160,6 @@ import { createRnnoiseProcessor } from './react/features/stream-effects/rnnoise'
 import { endpointMessageReceived } from './react/features/subtitles/actions.any';
 import { handleToggleVideoMuted } from './react/features/toolbox/actions.any';
 import { muteLocal } from './react/features/video-menu/actions.any';
-import { setIAmVisitor } from './react/features/visitors/actions';
 import { iAmVisitor } from './react/features/visitors/functions';
 import UIEvents from './service/UI/UIEvents';
 
@@ -173,25 +168,6 @@ const logger = Logger.getLogger(__filename);
 const eventEmitter = new EventEmitter();
 
 let room;
-let connection;
-
-/**
- * The promise is used when the prejoin screen is shown.
- * While the user configures the devices the connection can be made.
- *
- * @type {Promise<Object>}
- * @private
- */
-let _connectionPromise;
-
-/**
- * We are storing the resolve function of a Promise that waits for the _connectionPromise to be created. This is needed
- * when the prejoin button was pressed before the conference object was initialized and the _connectionPromise has not
- * been initialized when we tried to execute prejoinStart. In this case in prejoinStart we create a new Promise, assign
- * the resolve function to this variable and wait for the promise to resolve before we continue. The
- * _onConnectionPromiseCreated will be called once the _connectionPromise is created.
- */
-let _onConnectionPromiseCreated;
 
 /*
  * Logic to open a desktop picker put on the window global for
@@ -213,26 +189,6 @@ const commands = {
     ETHERPAD: 'etherpad'
 };
 
-/**
- * Open Connection. When authentication failed it shows auth dialog.
- * @param roomName the room name to use
- * @returns Promise<JitsiConnection>
- */
-function connect(roomName) {
-    return openConnection({
-        retry: true,
-        roomName
-    })
-    .catch(err => {
-        if (err === JitsiConnectionErrors.PASSWORD_REQUIRED) {
-            APP.UI.notifyTokenAuthFailed();
-        } else {
-            APP.UI.notifyConnectionFailed(err);
-        }
-        throw err;
-    });
-}
-
 /**
  * Share data to other users.
  * @param command the command
@@ -326,63 +282,25 @@ class ConferenceConnector {
             break;
         }
 
-        // not enough rights to create conference
-        case JitsiConferenceErrors.AUTHENTICATION_REQUIRED: {
-
-            const replaceParticipant = getReplaceParticipant(APP.store.getState());
-
-            // Schedule reconnect to check if someone else created the room.
-            this.reconnectTimeout = setTimeout(() => {
-                APP.store.dispatch(conferenceWillJoin(room));
-                room.join(null, replaceParticipant);
-            }, 5000);
-
-            const { password }
-                = APP.store.getState()['features/base/conference'];
-
-            AuthHandler.requireAuth(room, password);
-
-            break;
-        }
-
         case JitsiConferenceErrors.RESERVATION_ERROR: {
             const [ code, msg ] = params;
 
-            APP.UI.notifyReservationError(code, msg);
-            break;
-        }
-
-        case JitsiConferenceErrors.REDIRECTED: {
-            const newConfig = getVisitorOptions(APP.store.getState(), params);
-
-            if (!newConfig) {
-                logger.warn('Not redirected missing params');
-                break;
-            }
-
-            const [ vnode ] = params;
-
-            APP.store.dispatch(overwriteConfig(newConfig))
-                .then(() => this._conference.leaveRoom())
-                .then(() => APP.store.dispatch(setIAmVisitor(Boolean(vnode))))
-
-                // we do not clear local tracks on error, so we need to manually clear them
-                .then(() => APP.store.dispatch(destroyLocalTracks()))
-                .then(() => {
-                    // Reset VideoLayout. It's destroyed in features/video-layout/middleware.web.js so re-initialize it.
-                    VideoLayout.initLargeVideo();
-                    VideoLayout.resizeVideoArea();
-
-                    connect(this._conference.roomName).then(con => {
-                        this._conference.startConference(con, []);
-                    });
-                });
-
+            APP.store.dispatch(showErrorNotification({
+                descriptionArguments: {
+                    code,
+                    msg
+                },
+                descriptionKey: 'dialog.reservationErrorMsg',
+                titleKey: 'dialog.reservationError'
+            }, NOTIFICATION_TIMEOUT_TYPE.LONG));
             break;
         }
 
         case JitsiConferenceErrors.GRACEFUL_SHUTDOWN:
-            APP.UI.notifyGracefulShutdown();
+            APP.store.dispatch(showErrorNotification({
+                descriptionKey: 'dialog.gracefulShutdown',
+                titleKey: 'dialog.serviceUnavailable'
+            }, NOTIFICATION_TIMEOUT_TYPE.LONG));
             break;
 
         // FIXME FOCUS_DISCONNECTED is a confusing event name.
@@ -408,31 +326,9 @@ class ConferenceConnector {
             // FIXME the conference should be stopped by the library and not by
             // the app. Both the errors above are unrecoverable from the library
             // perspective.
-            room.leave(CONFERENCE_LEAVE_REASONS.UNRECOVERABLE_ERROR).then(() => connection.disconnect());
+            room.leave(CONFERENCE_LEAVE_REASONS.UNRECOVERABLE_ERROR).then(() => APP.connection.disconnect());
             break;
 
-        case JitsiConferenceErrors.CONFERENCE_MAX_USERS: {
-            APP.UI.notifyMaxUsersLimitReached();
-
-            // in case of max users(it can be from a visitor node), let's restore
-            // oldConfig if any as we will be back to the main prosody
-            const newConfig = restoreConferenceOptions(APP.store.getState());
-
-            if (newConfig) {
-                APP.store.dispatch(overwriteConfig(newConfig))
-                    .then(() => this._conference.leaveRoom())
-                    .then(() => {
-                        _connectionPromise = connect(this._conference.roomName);
-
-                        return _connectionPromise;
-                    })
-                    .then(con => {
-                        APP.connection = connection = con;
-                    });
-            }
-
-            break;
-        }
         case JitsiConferenceErrors.INCOMPATIBLE_SERVER_VERSIONS:
             APP.store.dispatch(reloadWithStoredParams());
             break;
@@ -488,11 +384,11 @@ function disconnect() {
         return Promise.resolve();
     };
 
-    if (!connection) {
+    if (!APP.connection) {
         return onDisconnected();
     }
 
-    return connection.disconnect().then(onDisconnected, onDisconnected);
+    return APP.connection.disconnect().then(onDisconnected, onDisconnected);
 }
 
 /**
@@ -510,25 +406,6 @@ function setGUMPendingStateOnFailedTracks(tracks) {
     APP.store.dispatch(gumPending(nonPendingTracks, IGUMPendingState.NONE));
 }
 
-/**
- * Handles CONNECTION_FAILED events from lib-jitsi-meet.
- *
- * @param {JitsiConnectionError} error - The reported error.
- * @returns {void}
- * @private
- */
-function _connectionFailedHandler(error) {
-    if (isFatalJitsiConnectionError(error)) {
-        APP.connection.removeEventListener(
-            JitsiConnectionEvents.CONNECTION_FAILED,
-            _connectionFailedHandler);
-        if (room) {
-            APP.store.dispatch(conferenceWillLeave(room));
-            room.leave(CONFERENCE_LEAVE_REASONS.UNRECOVERABLE_ERROR);
-        }
-    }
-}
-
 export default {
     /**
      * Flag used to delay modification of the muted status of local media tracks
@@ -547,7 +424,16 @@ export default {
     /**
      * Returns an object containing a promise which resolves with the created tracks &
      * the errors resulting from that process.
-     *
+     * @param {object} options
+     * @param {boolean} options.startAudioOnly=false - if <tt>true</tt> then
+     * only audio track will be created and the audio only mode will be turned
+     * on.
+     * @param {boolean} options.startScreenSharing=false - if <tt>true</tt>
+     * should start with screensharing instead of camera video.
+     * @param {boolean} options.startWithAudioMuted - will start the conference
+     * without any audio tracks.
+     * @param {boolean} options.startWithVideoMuted - will start the conference
+     * without any video tracks.
      * @returns {Promise<JitsiLocalTrack[]>, Object}
      */
     createInitialLocalTracks(options = {}) {
@@ -725,37 +611,7 @@ export default {
         }
     },
 
-    /**
-     * Creates local media tracks and connects to a room. Will show error
-     * dialogs in case accessing the local microphone and/or camera failed. Will
-     * show guidance overlay for users on how to give access to camera and/or
-     * microphone.
-     * @param {string} roomName
-     * @param {object} options
-     * @param {boolean} options.startAudioOnly=false - if <tt>true</tt> then
-     * only audio track will be created and the audio only mode will be turned
-     * on.
-     * @param {boolean} options.startScreenSharing=false - if <tt>true</tt>
-     * should start with screensharing instead of camera video.
-     * @param {boolean} options.startWithAudioMuted - will start the conference
-     * without any audio tracks.
-     * @param {boolean} options.startWithVideoMuted - will start the conference
-     * without any video tracks.
-     * @returns {Promise.<JitsiLocalTrack[], JitsiConnection>}
-     */
-    createInitialLocalTracksAndConnect(roomName, options = {}) {
-        const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(options);
-
-        return Promise.all([ tryCreateLocalTracks, connect(roomName) ])
-            .then(([ tracks, con ]) => {
-
-                this._displayErrorsForCreateInitialLocalTracks(errors);
-
-                return [ tracks, con ];
-            });
-    },
-
-    startConference(con, tracks) {
+    startConference(tracks) {
         tracks.forEach(track => {
             if ((track.isAudioTrack() && this.isLocalAudioMuted())
                 || (track.isVideoTrack() && this.isLocalVideoMuted())) {
@@ -768,9 +624,6 @@ export default {
             }
         });
 
-        con.addEventListener(JitsiConnectionEvents.CONNECTION_FAILED, _connectionFailedHandler);
-        APP.connection = connection = con;
-
         this._createRoom(tracks);
 
         // if user didn't give access to mic or camera or doesn't have
@@ -860,17 +713,6 @@ export default {
         };
 
         if (isPrejoinPageVisible(state)) {
-            _connectionPromise = connect(roomName).then(c => {
-                // We want to initialize it early, in case of errors to be able to gather logs.
-                APP.connection = c;
-
-                return c;
-            });
-
-            if (_onConnectionPromiseCreated) {
-                _onConnectionPromiseCreated();
-            }
-
             APP.store.dispatch(makePrecallTest(this._getConferenceOptions()));
 
             const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(initialOptions);
@@ -897,41 +739,26 @@ export default {
             return this._setLocalAudioVideoStreams(tracks);
         }
 
-        const [ tracks, con ] = await this.createInitialLocalTracksAndConnect(roomName, initialOptions);
+        const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(initialOptions);
 
-        this._initDeviceList(true);
+        return Promise.all([
+            tryCreateLocalTracks.then(tr => {
+                this._displayErrorsForCreateInitialLocalTracks(errors);
 
-        const filteredTracks = handleInitialTracks(initialOptions, tracks);
+                return tr;
+            }).then(tr => {
+                this._initDeviceList(true);
 
-        setGUMPendingStateOnFailedTracks(filteredTracks);
+                const filteredTracks = handleInitialTracks(initialOptions, tr);
 
-        return this.startConference(con, filteredTracks);
-    },
+                setGUMPendingStateOnFailedTracks(filteredTracks);
 
-    /**
-     * Joins conference after the tracks have been configured in the prejoin screen.
-     *
-     * @param {Object[]} tracks - An array with the configured tracks
-     * @returns {void}
-     */
-    async prejoinStart(tracks) {
-        if (!_connectionPromise) {
-            // The conference object isn't initialized yet. Wait for the promise to initialise.
-            await new Promise(resolve => {
-                _onConnectionPromiseCreated = resolve;
-            });
-            _onConnectionPromiseCreated = undefined;
-        }
-
-        let con;
-
-        try {
-            con = await _connectionPromise;
-            this.startConference(con, tracks);
-        } catch (error) {
-            logger.error(`An error occurred while trying to join a meeting from the prejoin screen: ${error}`);
-            APP.store.dispatch(setJoiningInProgress(false));
-        }
+                return filteredTracks;
+            }),
+            APP.store.dispatch(connect())
+        ]).then(([ tracks, _ ]) => {
+            this.startConference(tracks).catch(logger.error);
+        });
     },
 
     /**
@@ -1413,9 +1240,7 @@ export default {
      * Used by the Breakout Rooms feature to join a breakout room or go back to the main room.
      */
     async joinRoom(roomName, options) {
-        // Reset VideoLayout. It's destroyed in features/video-layout/middleware.web.js so re-initialize it.
-        VideoLayout.initLargeVideo();
-        VideoLayout.resizeVideoArea();
+        APP.store.dispatch(conferenceWillInit());
 
         // Restore initial state.
         this._localTracksInitialized = false;
@@ -1440,7 +1265,7 @@ export default {
     },
 
     _createRoom(localTracks) {
-        room = connection.initJitsiConference(APP.conference.roomName, this._getConferenceOptions());
+        room = APP.connection.initJitsiConference(APP.conference.roomName, this._getConferenceOptions());
 
         // Filter out the tracks that are muted (except on Safari).
         const tracks = browser.isWebKitBased() ? localTracks : localTracks.filter(track => !track.isMuted());
@@ -1787,10 +1612,10 @@ export default {
             titleKey = 'notify.screenShareNoAudioTitle';
         }
 
-        APP.UI.messageHandler.showError({
+        APP.store.dispatch(showErrorNotification({
             descriptionKey,
             titleKey
-        });
+        }, NOTIFICATION_TIMEOUT_TYPE.LONG));
     },
 
     /**
@@ -1821,10 +1646,14 @@ export default {
                 APP.store.dispatch(conferenceUniqueIdSet(room, ...args));
             });
 
-        room.on(
-            JitsiConferenceEvents.AUTH_STATUS_CHANGED,
-            (authEnabled, authLogin) =>
-                APP.store.dispatch(authStatusChanged(authEnabled, authLogin)));
+        // we want to ignore this event in case of tokenAuthUrl config
+        // we are deprecating this and at some point will get rid of it
+        if (!config.tokenAuthUrl) {
+            room.on(
+                JitsiConferenceEvents.AUTH_STATUS_CHANGED,
+                (authEnabled, authLogin) =>
+                    APP.store.dispatch(authStatusChanged(authEnabled, authLogin)));
+        }
 
         room.on(JitsiConferenceEvents.PARTCIPANT_FEATURES_CHANGED, user => {
             APP.store.dispatch(updateRemoteParticipantFeatures(user));
@@ -2184,21 +2013,6 @@ export default {
             this.hangup(true);
         });
 
-        // logout
-        APP.UI.addListener(UIEvents.LOGOUT, () => {
-            AuthHandler.logout(room).then(url => {
-                if (url) {
-                    UIUtil.redirect(url);
-                } else {
-                    this.hangup(true);
-                }
-            });
-        });
-
-        APP.UI.addListener(UIEvents.AUTH_CLICKED, () => {
-            AuthHandler.authenticate(room);
-        });
-
         APP.UI.addListener(
             UIEvents.VIDEO_DEVICE_CHANGED,
             cameraDeviceId => {

config.js

@@ -826,6 +826,42 @@ var config = {
     //     'whiteboard',
     // ],
 
+    // Participant context menu buttons which have their click/tap event exposed through the API on
+    // `participantMenuButtonClick`. Passing a string for the button key will
+    // prevent execution of the click/tap routine; passing an object with `key` and
+    // `preventExecution` flag on false will not prevent execution of the click/tap
+    // routine. Below array with mixed mode for passing the buttons.
+    // participantMenuButtonsWithNotifyClick: [
+    //     'allow-video',
+    //     {
+    //         key: 'ask-unmute',
+    //         preventExecution: false
+    //     },
+    //     'conn-status',
+    //     'flip-local-video',
+    //     'grant-moderator',
+    //     {
+    //         key: 'kick',
+    //         preventExecution: true
+    //     },
+    //     {
+    //         key: 'hide-self-view',
+    //         preventExecution: false
+    //     },
+    //     'mute',
+    //     'mute-others',
+    //     'mute-others-video',
+    //     'mute-video',
+    //     'pinToStage',
+    //     'privateMessage',
+    //     {
+    //         key: 'remote-control',
+    //         preventExecution: false
+    //     },
+    //     'send-participant-to-room',
+    //     'verify',
+    // ],
+
     // List of pre meeting screens buttons to hide. The values must be one or more of the 5 allowed buttons:
     // 'microphone', 'camera', 'select-background', 'invite', 'settings'
     // hiddenPremeetingButtons: [],
@@ -835,7 +871,7 @@ var config = {
     // customParticipantMenuButtons: [],
 
     // An array with custom option buttons for the toolbar
-    // type:  Array<{ icon: string; id: string; text: string; }>
+    // type:  Array<{ icon: string; id: string; text: string; backgroundColor?: string; }>
     // customToolbarButtons: [],
 
     // Stats
@@ -1008,6 +1044,11 @@ var config = {
         //      "libs/analytics-ga.min.js", // google-analytics
         //      "https://example.com/my-custom-analytics.js",
         // ],
+
+        // By enabling watchRTCEnabled option you would want to use watchRTC feature
+        // This would also require to configure watchRTCConfigParams.
+        // Please remember to keep rtcstatsEnabled disabled for watchRTC to work.
+        // watchRTCEnabled: false,
     },
 
     // Logs that should go be passed through the 'log' event if a handler is defined for it
@@ -1306,6 +1347,9 @@ var config = {
     //     hideJoinRoomButton: false,
     // },
 
+    // When true, virtual background feature will be disabled.
+    // disableVirtualBackground: false,
+
     // When true the user cannot add more images to be used as virtual background.
     // Only the default ones from will be available.
     // disableAddingBackgroundImages: false,
@@ -1403,6 +1447,8 @@ var config = {
      peopleSearchUrl
      requireDisplayName
      tokenAuthUrl
+     tokenAuthUrlAutoRedirect
+     tokenLogoutUrl
      */
 
     /**
@@ -1465,6 +1511,7 @@ var config = {
     //     'dialog.sessTerminated', // shown when there is a failed conference session
     //     'dialog.sessionRestarted', // show when a client reload is initiated because of bridge migration
     //     'dialog.tokenAuthFailed', // show when an invalid jwt is used
+    //     'dialog.tokenAuthFailedWithReasons', // show when an invalid jwt is used with the reason behind the error
     //     'dialog.transcribing', // transcribing notifications (pending, off)
     //     'dialOut.statusMessage', // shown when dial out status is updated.
     //     'liveStreaming.busy', // shown when livestreaming service is busy
@@ -1547,6 +1594,8 @@ var config = {
 
     // Tile view related config options.
     // tileView: {
+    //     // Whether tileview should be disabled.
+    //     disabled: false,
     //     // The optimal number of tiles that are going to be shown in tile view. Depending on the screen size it may
     //     // not be possible to show the exact number of participants specified here.
     //     numberOfVisibleTiles: 25,
@@ -1599,6 +1648,40 @@ var config = {
     //     // https://github.com/jitsi/excalidraw-backend
     //     collabServerBaseUrl: 'https://excalidraw-backend.example.com',
     // },
+
+    // The watchRTC initialize config params as described :
+    // https://testrtc.com/docs/installing-the-watchrtc-javascript-sdk/#h-set-up-the-sdk
+    // https://www.npmjs.com/package/@testrtc/watchrtc-sdk
+    // watchRTCConfigParams: {
+    //         /** Watchrtc api key */
+    //         rtcApiKey: string;
+    //         /** Identifier for the session */
+    //         rtcRoomId?: string;
+    //         /** Identifier for the current peer */
+    //         rtcPeerId?: string;
+    //         /**
+    //          * ["tag1", "tag2", "tag3"]
+    //          * @deprecated use 'keys' instead
+    //          */
+    //         rtcTags?: string[];
+    //         /** { "key1": "value1", "key2": "value2"} */
+    //         keys?: any;
+    //         /** Enables additional logging */
+    //         debug?: boolean;
+    //         rtcToken?: string;
+    //         /**
+    //          * @deprecated No longer needed. Use "proxyUrl" instead.
+    //          */
+    //         wsUrl?: string;
+    //         proxyUrl?: string;
+    //         console?: {
+    //             level: string;
+    //             override: boolean;
+    //         };
+    //         allowBrowserLogCollection?: boolean;
+    //         collectionInterval?: number;
+    //         logGetStats?: boolean;
+    // },
 };
 
 // Temporary backwards compatibility with old mobile clients.

connection.js

@@ -1,209 +0,0 @@
-/* global APP, JitsiMeetJS, config */
-
-import { jitsiLocalStorage } from '@jitsi/js-utils';
-import Logger from '@jitsi/logger';
-
-import { redirectToTokenAuthService } from './modules/UI/authentication/AuthHandler';
-import { LoginDialog } from './react/features/authentication/components';
-import { isTokenAuthEnabled } from './react/features/authentication/functions';
-import {
-    connectionEstablished,
-    connectionFailed,
-    constructOptions
-} from './react/features/base/connection/actions.web';
-import { openDialog } from './react/features/base/dialog/actions';
-import { setJWT } from './react/features/base/jwt/actions';
-import {
-    JitsiConnectionErrors,
-    JitsiConnectionEvents
-} from './react/features/base/lib-jitsi-meet';
-import { isFatalJitsiConnectionError } from './react/features/base/lib-jitsi-meet/functions';
-import { getCustomerDetails } from './react/features/jaas/actions.any';
-import { getJaasJWT, isVpaasMeeting } from './react/features/jaas/functions';
-import {
-    setPrejoinDisplayNameRequired
-} from './react/features/prejoin/actions';
-const logger = Logger.getLogger(__filename);
-
-/**
- * The feature announced so we can distinguish jibri participants.
- *
- * @type {string}
- */
-export const DISCO_JIBRI_FEATURE = 'http://jitsi.org/protocol/jibri';
-
-/**
- * Try to open connection using provided credentials.
- * @param {string} [id]
- * @param {string} [password]
- * @returns {Promise<JitsiConnection>} connection if
- * everything is ok, else error.
- */
-export async function connect(id, password) {
-    const state = APP.store.getState();
-    let { jwt } = state['features/base/jwt'];
-    const { iAmRecorder, iAmSipGateway } = state['features/base/config'];
-
-    if (!iAmRecorder && !iAmSipGateway && isVpaasMeeting(state)) {
-        await APP.store.dispatch(getCustomerDetails());
-
-        if (!jwt) {
-            jwt = await getJaasJWT(state);
-            APP.store.dispatch(setJWT(jwt));
-        }
-    }
-
-    const connection = new JitsiMeetJS.JitsiConnection(null, jwt, constructOptions(state));
-
-    if (config.iAmRecorder) {
-        connection.addFeature(DISCO_JIBRI_FEATURE);
-    }
-
-    return new Promise((resolve, reject) => {
-        connection.addEventListener(
-            JitsiConnectionEvents.CONNECTION_ESTABLISHED,
-            handleConnectionEstablished);
-        connection.addEventListener(
-            JitsiConnectionEvents.CONNECTION_FAILED,
-            handleConnectionFailed);
-        connection.addEventListener(
-            JitsiConnectionEvents.CONNECTION_FAILED,
-            connectionFailedHandler);
-        connection.addEventListener(
-            JitsiConnectionEvents.DISPLAY_NAME_REQUIRED,
-            displayNameRequiredHandler
-        );
-
-        /* eslint-disable max-params */
-        /**
-         *
-         */
-        function connectionFailedHandler(error, message, credentials, details) {
-        /* eslint-enable max-params */
-            APP.store.dispatch(
-                connectionFailed(
-                    connection, {
-                        credentials,
-                        details,
-                        message,
-                        name: error
-                    }));
-
-            if (isFatalJitsiConnectionError(error)) {
-                connection.removeEventListener(
-                    JitsiConnectionEvents.CONNECTION_FAILED,
-                    connectionFailedHandler);
-            }
-        }
-
-        /**
-         *
-         */
-        function unsubscribe() {
-            connection.removeEventListener(
-                JitsiConnectionEvents.CONNECTION_ESTABLISHED,
-                handleConnectionEstablished);
-            connection.removeEventListener(
-                JitsiConnectionEvents.CONNECTION_FAILED,
-                handleConnectionFailed);
-        }
-
-        /**
-         *
-         */
-        function handleConnectionEstablished() {
-            APP.store.dispatch(connectionEstablished(connection, Date.now()));
-            unsubscribe();
-            resolve(connection);
-        }
-
-        /**
-         *
-         */
-        function handleConnectionFailed(err) {
-            unsubscribe();
-            logger.error('CONNECTION FAILED:', err);
-            reject(err);
-        }
-
-        /**
-         * Marks the display name for the prejoin screen as required.
-         * This can happen if a user tries to join a room with lobby enabled.
-         */
-        function displayNameRequiredHandler() {
-            APP.store.dispatch(setPrejoinDisplayNameRequired());
-        }
-
-        connection.connect({
-            id,
-            password
-        });
-    });
-}
-
-/**
- * Open JitsiConnection using provided credentials.
- * If retry option is true it will show auth dialog on PASSWORD_REQUIRED error.
- *
- * @param {object} options
- * @param {string} [options.id]
- * @param {string} [options.password]
- * @param {string} [options.roomName]
- * @param {boolean} [retry] if we should show auth dialog
- * on PASSWORD_REQUIRED error.
- *
- * @returns {Promise<JitsiConnection>}
- */
-export function openConnection({ id, password, retry, roomName }) {
-    const usernameOverride
-        = jitsiLocalStorage.getItem('xmpp_username_override');
-    const passwordOverride
-        = jitsiLocalStorage.getItem('xmpp_password_override');
-
-    if (usernameOverride && usernameOverride.length > 0) {
-        id = usernameOverride; // eslint-disable-line no-param-reassign
-    }
-    if (passwordOverride && passwordOverride.length > 0) {
-        password = passwordOverride; // eslint-disable-line no-param-reassign
-    }
-
-    return connect(id, password).catch(err => {
-        if (retry) {
-            const { jwt } = APP.store.getState()['features/base/jwt'];
-
-            if (err === JitsiConnectionErrors.PASSWORD_REQUIRED && !jwt) {
-                return requestAuth(roomName);
-            }
-        }
-
-        throw err;
-    });
-}
-
-/**
- * Show Authentication Dialog and try to connect with new credentials.
- * If failed to connect because of PASSWORD_REQUIRED error
- * then ask for password again.
- * @param {string} [roomName] name of the conference room
- *
- * @returns {Promise<JitsiConnection>}
- */
-function requestAuth(roomName) {
-    const config = APP.store.getState()['features/base/config'];
-
-    if (isTokenAuthEnabled(config)) {
-        // This Promise never resolves as user gets redirected to another URL
-        return new Promise(() => redirectToTokenAuthService(roomName));
-    }
-
-    return new Promise(resolve => {
-        const onSuccess = connection => {
-            resolve(connection);
-        };
-
-        APP.store.dispatch(
-            openDialog(LoginDialog, { onSuccess,
-                roomName })
-        );
-    });
-}

css/_base.scss

@@ -66,10 +66,6 @@ body, input, textarea, keygen, select, button {
     font-family: $baseFontFamily !important;
 }
 
-#nowebrtc {
-    display:none;
-}
-
 button, input, select, textarea {
     margin: 0;
     vertical-align: baseline;
@@ -148,21 +144,6 @@ form {
     z-index: 100;
 }
 
-.connected {
-    color: #21B9FC;
-    font-size: 12px;
-}
-
-.lastN, .disconnected {
-    color: #a3a3a3;
-    font-size: 12px;
-}
-
-#inviteLinkRef {
-    -webkit-user-select: text;
-    user-select: text;
-}
-
 /**
  * Re-style default OS scrollbar.
  */
@@ -185,7 +166,7 @@ form {
 }
 
 ::-webkit-scrollbar-thumb {
-    background: rgba(0, 0, 0, .5);
+    background: #3D3D3D;
     border-radius: 4px;
 }
 
@@ -193,3 +174,16 @@ form {
 .jitsi-icon svg path {
     fill: inherit !important;
 }
+
+.sr-only {
+    border: 0 !important;
+    clip: rect(1px, 1px, 1px, 1px) !important;
+    clip-path: inset(50%) !important;
+    height: 1px !important;
+    margin: -1px !important;
+    overflow: hidden !important;
+    padding: 0 !important;
+    position: absolute !important;
+    width: 1px !important;
+    white-space: nowrap !important;
+}

css/_chat.scss

@@ -1,35 +1,3 @@
-#sideToolbarContainer {
-    background-color: $chatBackgroundColor;
-    flex-shrink: 0;
-    overflow: hidden;
-    position: relative;
-    transition: width .16s ease-in-out;
-    width: $sidebarWidth;
-    z-index: 300;
-
-    @media (max-width: 580px) {
-        height: 100vh;
-        height: -webkit-fill-available;
-        left: 0;
-        position: fixed;
-        right: 0;
-        top: 0;
-        width: auto;
-    }
-}
-
-.chat-panel {
-    display: flex;
-    flex-direction: column;
-    // extract header + tabs height
-    height: calc(100% - 119px);
-}
-
-.chat-panel-no-tabs {
-    // extract header height
-    height: calc(100% - 70px);
-}
-
 #chat-conversation-container {
     // extract message input height
     height: calc(100% - 64px);
@@ -76,27 +44,6 @@
     }
 }
 
-
-.chat-header {
-    height: 70px;
-    position: relative;
-    width: 100%;
-    z-index: 1;
-    display: flex;
-    justify-content: space-between;
-    padding: 16px;
-    align-items: center;
-    box-sizing: border-box;
-    color: #fff;
-    font-weight: 600;
-    font-size: 24px;
-    line-height: 32px;
-
-    .jitsi-icon {
-        cursor: pointer;
-    }
-}
-
 .chat-input-container {
     padding: 0 16px 24px;
 }
@@ -112,61 +59,6 @@
     margin-right: 8px;
 }
 
-.smiley-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 38px;
-    width: 38px;
-    margin: 2px;
-    border-radius: 3px;
-}
-
-#chat-input .smiley-button {
-    @media (hover: hover) and (pointer: fine) {
-        &:hover {
-            background-color: #484A4F;
-        }
-    }
-}
-
-.remoteuser {
-    color: #B8C7E0;
-}
-
-.usrmsg-form {
-    flex: 1;
-}
-
-#usermsg {
-    -ms-overflow-style: none;
-    border: 0px none;
-    border-radius:0;
-    box-shadow: none;
-    color: white;
-    font-size: 14px;
-    padding: 10px;
-    overflow-y: auto;
-    resize: none;
-    scrollbar-width: none;
-    width: 100%;
-    word-break: break-word;
-
-    &::-webkit-scrollbar {
-        display: none;
-    }
-}
-
-#usermsg:hover {
-    border: 0px none;
-    box-shadow: none;
-}
-#usermsg:focus,
-#usermsg:active {
-    border-bottom: 1px solid white;
-    padding-bottom: 8px;
- }
-
 #nickname {
     text-align: center;
     color: #9d9d9d;
@@ -174,11 +66,6 @@
     margin: auto 0;
     padding: 0 16px;
 
-    #nickname-title {
-        margin-bottom: 5px;
-        display: block;
-    }
-
     label[for="nickinput"] {
         > div > span {
             color: #B8C7E0;
@@ -191,24 +78,6 @@
     label {
         line-height: 24px;
     }
-
-    .enter-chat {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-top: 16px;
-        height: 40px;
-        background: #1B67EC;
-        border-radius: 3px;
-        color: #fff;
-        cursor: pointer;
-
-        &.disabled {
-            color: #AFB6BC;
-            background: #11336E;
-            pointer-events: none;
-        }
-    }
 }
 
 .mobile-browser {
@@ -216,14 +85,6 @@
         input {
             height: 48px;
         }
-
-        .enter-chat {
-            height: 48px;
-        }
-    }
-
-    #usermsg {
-        font-size: 16px;
     }
 
     .chatmessage .usermessage {
@@ -231,32 +92,7 @@
     }
 }
 
-.sideToolbarContainer {
-    * {
-        -webkit-user-select: text;
-        user-select: text;
-    }
-}
-
-.sr-only {
-    border: 0 !important;
-    clip: rect(1px, 1px, 1px, 1px) !important;
-    clip-path: inset(50%) !important;
-    height: 1px !important;
-    margin: -1px !important;
-    overflow: hidden !important;
-    padding: 0 !important;
-    position: absolute !important;
-    width: 1px !important;
-    white-space: nowrap !important;
-}
-
 .chatmessage {
-    &.localuser {
-        background-color: #484A4F;
-        border-radius: 6px 0px 6px 6px;
-    }
-
     &.error {
         border-radius: 0px;
 
@@ -288,13 +124,6 @@
     padding: 2px;
 }
 
-#smileysarea {
-    display: flex;
-    max-height: 150px;
-    min-height: 35px;
-    overflow: hidden;
-}
-
 .smiley-input {
     display: flex;
     position: absolute;
@@ -345,10 +174,6 @@
     cursor: pointer;
 }
 
-#usermsg::-webkit-scrollbar-track-piece {
-    background: #3a3a3a;
-}
-
 .chat-message-group {
     &.local {
         align-items: flex-end;

css/_drawer.scss

@@ -28,18 +28,6 @@
     margin-bottom: env(safe-area-inset-bottom, 0);
     width: 100%;
 
-    .drawer-toggle {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        height: 44px;
-        cursor: pointer;
-
-        svg {
-            fill: none;
-        }
-    }
-
     &#{&} .overflow-menu {
         margin: auto;
         font-size: 1.2em;
@@ -65,25 +53,10 @@
                 align-items: center;
             }
 
-            &.unclickable {
-                cursor: default;
-            }
-            @media (hover: hover) and (pointer: fine) {
-                &.unclickable:hover {
-                    background: inherit;
-                }
-            }
             &.disabled {
                 cursor: initial;
                 color: #3b475c;
             }
         }
-
-        .profile-text {
-            max-width: 100%;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            white-space: nowrap;
-        }
     }
 }

css/_e2ee.scss

@@ -1,21 +0,0 @@
-#e2ee-section {
-    display: flex;
-    flex-direction: column;
-
-    .description {
-        font-size: 13px;
-        margin: 15px 0;
-    }
-
-    .control-row {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        margin-top: 15px;
-
-        label {
-            font-size: 14px;
-            font-weight: bold;
-        }
-    }
-}

css/_login_menu.scss

@@ -1,18 +1,4 @@
-/*Initialize*/
-div.loginmenu {
-    position: absolute;
-    margin: 0;
-    padding: 5px;
-    top: 40px;
-    left: 20px;
-}
-
 a.disabled {
     color: gray !important;
     pointer-events: none;
 }
-
-.loginmenu.extendedToolbarPopup {
-    top: 20px;
-    left: 40px;
-}

css/_mini_toolbox.scss

@@ -1,4 +1,3 @@
-.filmstrip-toolbox,
 .always-on-top-toolbox {
     background-color: $newToolbarBackgroundColor;
     border-radius: 3px;
@@ -29,7 +28,3 @@
     transform: translateX(-50%);
     padding: 3px !important;
 }
-
-.filmstrip-toolbox {
-    flex-direction: column;
-}

css/_modaldialog.scss

@@ -1,29 +0,0 @@
-.jqistates {
-    font-size: 14px;
-}
-
-.jqistates h2 {
-    padding-bottom: 10px;
-    border-bottom: 1px solid #eee;
-    font-size: 18px;
-    line-height: 25px;
-    text-align: center;
-    color: #424242;
-}
-
-.jqistates input {
-    margin: 10px 0;
-}
-
-.jqistates input[type='text'], input[type='password'] {
-    width: 100%;
-}
-
-button.jqidefaultbutton #inviteLinkRef {
-    color: #2c8ad2;
-}
-
-#inviteLinkRef {
-    -webkit-user-select: text;
-    user-select: text;
-}

css/_navigate_section_list.scss

@@ -75,6 +75,3 @@
     margin-bottom: 36px;
     width: 100%;
 }
-.navigate-section-list-empty {
-    text-align: center;
-}

css/_notice.scss

@@ -1,15 +0,0 @@
-.notice {
-    position: absolute;
-    left: 50%;
-    z-index: $zindex3;
-    margin-top: 6px;
-
-    @include transform(translateX(-50%));
-
-    &__message {
-        background-color: #000000;
-        color: white;
-        padding: 3px;
-        border-radius: 5px;
-    }
-}

css/_polls.scss

@@ -1,3 +0,0 @@
-.polls-panel {
-    height: calc(100% - 119px);
-}

css/_recording.scss

@@ -1,7 +1,3 @@
-.recordingSpinner {
-    vertical-align: top;
-}
-
 .recording-dialog {
     flex: 0;
     flex-direction: column;
@@ -50,10 +46,6 @@
         }
     }
 
-    .recording-switch-disabled {
-        opacity: 0.5;
-    }
-
     .recording-icon-container {
         display: inline-flex;
         align-items: center;
@@ -156,8 +148,7 @@
      */
     font-size: 14px;
 
-    .broadcast-dropdown,
-    .broadcast-dropdown-trigger {
+    .broadcast-dropdown {
         text-align: left;
     }
 

css/_redirect_page.scss

@@ -14,7 +14,7 @@
             line-height: 24px;
         }
     }
-    .hint-msg{
+    .hint-msg {
         p {
             margin: 26px auto;
             font-weight: 600;
@@ -31,4 +31,10 @@
             background: transparent;
         }
     }
+    .forbidden-msg {
+        p {
+            font-size: 16px;
+            margin-top: 15px;
+        }
+    }
 }

css/_subject.scss

@@ -34,14 +34,6 @@
     }
 }
 
-.subject-info {
-    align-items: center;
-    display: flex;
-    margin-bottom: 4px;
-    max-width: 80%;
-    height: 28px;
-}
-
 .details-container {
     width: 100%;
     display: flex;

css/_toolbars.scss

@@ -58,21 +58,6 @@
     z-index: $toolbarZ;
     pointer-events: none;
 
-    .button-group-center,
-    .button-group-left,
-    .button-group-right {
-        display: flex;
-        width: 33%;
-    }
-
-    .button-group-center {
-        justify-content: center;
-    }
-
-    .button-group-right {
-        justify-content: flex-end;
-    }
-
     .toolbox-button-wth-dialog {
         display: inline-block;
     }
@@ -112,16 +97,6 @@
     padding-bottom: env(safe-area-inset-bottom, 0);
 }
 
-.beta-tag {
-    background: #36383C;
-    border-radius: 3px;
-    color: #fff;
-    font-size: 12px;
-    margin-left: 8px;
-    padding: 0 4px;
-    text-transform: uppercase;
-}
-
 .overflow-menu-hr {
     border-top: 1px solid #4C4D50;
     border-bottom: 0;

css/_utils.scss

@@ -3,7 +3,7 @@
 }
 
 .hidden {
-  display: none;
+    display: none;
 }
 
 /**
@@ -24,24 +24,6 @@
     display: block !important;
 }
 
-/**
- * Shows an inline element.
- */
-.show-inline {
-    display: inline-block !important;
-}
-
-/**
- * Shows a flex element.
- */
-.show-flex {
-    display: -webkit-box !important;
-    display: -moz-box !important;
-    display: -ms-flexbox !important;
-    display: -webkit-flex !important;
-    display: flex !important;
-}
-
 /**
  * resets default button styles,
  * mostly intended to be used on interactive elements that

css/_videolayout_default.scss

@@ -209,23 +209,6 @@
     }
 }
 
-#reloadPresentation {
-    display: none;
-    position: absolute;
-    color: #FFFFFF;
-    top: 0;
-    right:0;
-    padding: 10px 10px;
-    font-size: 11pt;
-    cursor: pointer;
-    background: rgba(0, 0, 0, 0.3);
-    border-radius: 5px;
-    background-clip: padding-box;
-    -webkit-border-radius: 5px;
-    -webkit-background-clip: padding-box;
-    z-index: 20; /*The reload button should appear on top of the header!*/
-}
-
 #dominantSpeaker {
     visibility: hidden;
     width: 300px;
@@ -236,10 +219,6 @@
     transform: translateY(-50%);
 }
 
-#mixedstream {
-    display:none !important;
-}
-
 #dominantSpeakerAvatarContainer,
 .dynamic-shadow {
     width: 200px;
@@ -309,11 +288,6 @@
     object-fit: cover;
 }
 
-.videoMessageFilter {
-    -webkit-filter: grayscale(.5) opacity(0.8);
-    filter: grayscale(.5) opacity(0.8);
-}
-
 #remotePresenceMessage,
 #remoteConnectionMessage {
     position: absolute;

css/main.scss

@@ -37,7 +37,6 @@ $flagsImagePath: "../images/";
 @import 'modals/screen-share/share-audio';
 @import 'modals/screen-share/share-screen-warning';
 @import 'videolayout_default';
-@import 'notice';
 @import 'subject';
 @import 'popup_menu';
 @import 'recording';
@@ -73,12 +72,10 @@ $flagsImagePath: "../images/";
 @import 'premeeting/main';
 @import 'modals/invite/invite_more';
 @import 'modals/security/security';
-@import 'e2ee';
 @import 'responsive';
 @import 'drawer';
 @import 'participants-pane';
 @import 'reactions-menu';
 @import 'plan-limit';
-@import 'polls';
 
 /* Modules END */

debian/jitsi-meet-tokens.postinst

@@ -38,6 +38,11 @@ case "$1" in
         if [ "$RET" = "false" ] ; then
             echo "Application secret is mandatory"
         fi
+        # Not allowed unix special characters in secret: /, \, ", ', `
+        if echo "$RET" | grep -q '[/\\\"\`]' ; then
+            echo "Application secret contains invalid characters: /, \\, \", ', \`"
+            exit 1
+        fi
         APP_SECRET=$RET
 
         PROSODY_HOST_CONFIG="/etc/prosody/conf.avail/$JVB_HOSTNAME.cfg.lua"

globals.d.ts

@@ -19,6 +19,8 @@ declare global {
         interfaceConfig?: any;
         JitsiMeetJS?: any;
         JitsiMeetElectron?: any;
+        PressureObserver?: any;
+        PressureRecord?: any;
         // selenium tests handler
         _sharedVideoPlayer: any;
         alwaysOnTop: { api: any };

globals.native.d.ts

@@ -17,6 +17,8 @@ interface IWindow {
     innerWidth: number;
     interfaceConfig: any;
     location: ILocation;
+    PressureObserver?: any;
+    PressureRecord?: any;
     self: any;
     top: any;
 

ios/Podfile.lock

@@ -14,14 +14,14 @@ PODS:
     - CocoaLumberjack/Core (= 3.7.2)
   - CocoaLumberjack/Core (3.7.2)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.69.10)
-  - FBReactNativeSpec (0.69.10):
+  - FBLazyVector (0.69.11)
+  - FBReactNativeSpec (0.69.11):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.69.10)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Core (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
+    - RCTRequired (= 0.69.11)
+    - RCTTypeSafety (= 0.69.11)
+    - React-Core (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - ReactCommon/turbomodule/core (= 0.69.11)
   - Firebase/Analytics (8.15.0):
     - Firebase/Core
   - Firebase/Core (8.15.0):
@@ -164,203 +164,203 @@ PODS:
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
-  - RCTRequired (0.69.10)
-  - RCTTypeSafety (0.69.10):
-    - FBLazyVector (= 0.69.10)
-    - RCTRequired (= 0.69.10)
-    - React-Core (= 0.69.10)
-  - React (0.69.10):
-    - React-Core (= 0.69.10)
-    - React-Core/DevSupport (= 0.69.10)
-    - React-Core/RCTWebSocket (= 0.69.10)
-    - React-RCTActionSheet (= 0.69.10)
-    - React-RCTAnimation (= 0.69.10)
-    - React-RCTBlob (= 0.69.10)
-    - React-RCTImage (= 0.69.10)
-    - React-RCTLinking (= 0.69.10)
-    - React-RCTNetwork (= 0.69.10)
-    - React-RCTSettings (= 0.69.10)
-    - React-RCTText (= 0.69.10)
-    - React-RCTVibration (= 0.69.10)
-  - React-bridging (0.69.10):
+  - RCTRequired (0.69.11)
+  - RCTTypeSafety (0.69.11):
+    - FBLazyVector (= 0.69.11)
+    - RCTRequired (= 0.69.11)
+    - React-Core (= 0.69.11)
+  - React (0.69.11):
+    - React-Core (= 0.69.11)
+    - React-Core/DevSupport (= 0.69.11)
+    - React-Core/RCTWebSocket (= 0.69.11)
+    - React-RCTActionSheet (= 0.69.11)
+    - React-RCTAnimation (= 0.69.11)
+    - React-RCTBlob (= 0.69.11)
+    - React-RCTImage (= 0.69.11)
+    - React-RCTLinking (= 0.69.11)
+    - React-RCTNetwork (= 0.69.11)
+    - React-RCTSettings (= 0.69.11)
+    - React-RCTText (= 0.69.11)
+    - React-RCTVibration (= 0.69.11)
+  - React-bridging (0.69.11):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi (= 0.69.10)
-  - React-callinvoker (0.69.10)
-  - React-Codegen (0.69.10):
-    - FBReactNativeSpec (= 0.69.10)
+    - React-jsi (= 0.69.11)
+  - React-callinvoker (0.69.11)
+  - React-Codegen (0.69.11):
+    - FBReactNativeSpec (= 0.69.11)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.69.10)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Core (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-Core (0.69.10):
+    - RCTRequired (= 0.69.11)
+    - RCTTypeSafety (= 0.69.11)
+    - React-Core (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - ReactCommon/turbomodule/core (= 0.69.11)
+  - React-Core (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.69.10)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-Core/Default (= 0.69.11)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.69.10):
+  - React-Core/CoreModulesHeaders (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/Default (0.69.10):
+  - React-Core/Default (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/DevSupport (0.69.10):
+  - React-Core/DevSupport (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.69.10)
-    - React-Core/RCTWebSocket (= 0.69.10)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-jsinspector (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-Core/Default (= 0.69.11)
+    - React-Core/RCTWebSocket (= 0.69.11)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-jsinspector (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.69.10):
+  - React-Core/RCTActionSheetHeaders (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.69.10):
+  - React-Core/RCTAnimationHeaders (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.69.10):
+  - React-Core/RCTBlobHeaders (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/RCTImageHeaders (0.69.10):
+  - React-Core/RCTImageHeaders (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.69.10):
+  - React-Core/RCTLinkingHeaders (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.69.10):
+  - React-Core/RCTNetworkHeaders (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.69.10):
+  - React-Core/RCTSettingsHeaders (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/RCTTextHeaders (0.69.10):
+  - React-Core/RCTTextHeaders (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.69.10):
+  - React-Core/RCTVibrationHeaders (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-Core/RCTWebSocket (0.69.10):
+  - React-Core/RCTWebSocket (0.69.11):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.69.10)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-Core/Default (= 0.69.11)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsiexecutor (= 0.69.11)
+    - React-perflogger (= 0.69.11)
     - Yoga
-  - React-CoreModules (0.69.10):
+  - React-CoreModules (0.69.11):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Codegen (= 0.69.10)
-    - React-Core/CoreModulesHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-RCTImage (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-cxxreact (0.69.10):
+    - RCTTypeSafety (= 0.69.11)
+    - React-Codegen (= 0.69.11)
+    - React-Core/CoreModulesHeaders (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-RCTImage (= 0.69.11)
+    - ReactCommon/turbomodule/core (= 0.69.11)
+  - React-cxxreact (0.69.11):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsinspector (= 0.69.10)
-    - React-logger (= 0.69.10)
-    - React-perflogger (= 0.69.10)
-    - React-runtimeexecutor (= 0.69.10)
-  - React-jsi (0.69.10):
+    - React-callinvoker (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-jsinspector (= 0.69.11)
+    - React-logger (= 0.69.11)
+    - React-perflogger (= 0.69.11)
+    - React-runtimeexecutor (= 0.69.11)
+  - React-jsi (0.69.11):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi/Default (= 0.69.10)
-  - React-jsi/Default (0.69.10):
+    - React-jsi/Default (= 0.69.11)
+  - React-jsi/Default (0.69.11):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-  - React-jsiexecutor (0.69.10):
+  - React-jsiexecutor (0.69.11):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-perflogger (= 0.69.10)
-  - React-jsinspector (0.69.10)
-  - React-logger (0.69.10):
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-perflogger (= 0.69.11)
+  - React-jsinspector (0.69.11)
+  - React-logger (0.69.11):
     - glog
   - react-native-background-timer (2.4.1):
     - React-Core
@@ -395,72 +395,72 @@ PODS:
     - React-Core
   - react-native-webview (11.15.1):
     - React-Core
-  - React-perflogger (0.69.10)
-  - React-RCTActionSheet (0.69.10):
-    - React-Core/RCTActionSheetHeaders (= 0.69.10)
-  - React-RCTAnimation (0.69.10):
+  - React-perflogger (0.69.11)
+  - React-RCTActionSheet (0.69.11):
+    - React-Core/RCTActionSheetHeaders (= 0.69.11)
+  - React-RCTAnimation (0.69.11):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTAnimationHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTBlob (0.69.10):
+    - RCTTypeSafety (= 0.69.11)
+    - React-Codegen (= 0.69.11)
+    - React-Core/RCTAnimationHeaders (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - ReactCommon/turbomodule/core (= 0.69.11)
+  - React-RCTBlob (0.69.11):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTBlobHeaders (= 0.69.10)
-    - React-Core/RCTWebSocket (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-RCTNetwork (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTImage (0.69.10):
+    - React-Codegen (= 0.69.11)
+    - React-Core/RCTBlobHeaders (= 0.69.11)
+    - React-Core/RCTWebSocket (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-RCTNetwork (= 0.69.11)
+    - ReactCommon/turbomodule/core (= 0.69.11)
+  - React-RCTImage (0.69.11):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTImageHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-RCTNetwork (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTLinking (0.69.10):
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTLinkingHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTNetwork (0.69.10):
+    - RCTTypeSafety (= 0.69.11)
+    - React-Codegen (= 0.69.11)
+    - React-Core/RCTImageHeaders (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-RCTNetwork (= 0.69.11)
+    - ReactCommon/turbomodule/core (= 0.69.11)
+  - React-RCTLinking (0.69.11):
+    - React-Codegen (= 0.69.11)
+    - React-Core/RCTLinkingHeaders (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - ReactCommon/turbomodule/core (= 0.69.11)
+  - React-RCTNetwork (0.69.11):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTNetworkHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTSettings (0.69.10):
+    - RCTTypeSafety (= 0.69.11)
+    - React-Codegen (= 0.69.11)
+    - React-Core/RCTNetworkHeaders (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - ReactCommon/turbomodule/core (= 0.69.11)
+  - React-RCTSettings (0.69.11):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTSettingsHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTText (0.69.10):
-    - React-Core/RCTTextHeaders (= 0.69.10)
-  - React-RCTVibration (0.69.10):
+    - RCTTypeSafety (= 0.69.11)
+    - React-Codegen (= 0.69.11)
+    - React-Core/RCTSettingsHeaders (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - ReactCommon/turbomodule/core (= 0.69.11)
+  - React-RCTText (0.69.11):
+    - React-Core/RCTTextHeaders (= 0.69.11)
+  - React-RCTVibration (0.69.11):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTVibrationHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-runtimeexecutor (0.69.10):
-    - React-jsi (= 0.69.10)
-  - ReactCommon/turbomodule/core (0.69.10):
+    - React-Codegen (= 0.69.11)
+    - React-Core/RCTVibrationHeaders (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - ReactCommon/turbomodule/core (= 0.69.11)
+  - React-runtimeexecutor (0.69.11):
+    - React-jsi (= 0.69.11)
+  - ReactCommon/turbomodule/core (0.69.11):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-bridging (= 0.69.10)
-    - React-callinvoker (= 0.69.10)
-    - React-Core (= 0.69.10)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-logger (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-bridging (= 0.69.11)
+    - React-callinvoker (= 0.69.11)
+    - React-Core (= 0.69.11)
+    - React-cxxreact (= 0.69.11)
+    - React-jsi (= 0.69.11)
+    - React-logger (= 0.69.11)
+    - React-perflogger (= 0.69.11)
   - RNCalendarEvents (2.2.0):
     - React
   - RNCAsyncStorage (1.17.3):
@@ -706,8 +706,8 @@ SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  FBLazyVector: a8af91c2b5a0029d12ff6b32e428863d63c48991
-  FBReactNativeSpec: ec5e878f6452a3de5430e0b2324a4d4ae6ac63f6
+  FBLazyVector: 5c0975e66853436589eae7542f4b956c7e2ef465
+  FBReactNativeSpec: bb062293e84c33200005312d1807d8cb94a0d66a
   Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
   FirebaseAnalytics: 7761cbadb00a717d8d0939363eb46041526474fa
   FirebaseCore: 5743c5785c074a794d35f2fff7ecc254a91e08b1
@@ -732,19 +732,19 @@ SPEC CHECKSUMS:
   PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
   PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959
   RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a
-  RCTRequired: 3581db0757e7ff9be10718a56b3d79b6a6bd3bdf
-  RCTTypeSafety: ce13e630c48340401ebfb28710959913f74b8b36
-  React: cca8f2b7cce018f79847ca79847fa367b206e8a1
-  React-bridging: b893643f09d3964afba6c347e00dd86cf10691e5
-  React-callinvoker: 9ac7cba30428eddf7a06d1253f8e7561b5c97334
-  React-Codegen: 65ff9fbddf8a17a6d4f495f71d365288f934a93a
-  React-Core: 550b694774bc778b5c7bf7608fc12a484e01ec05
-  React-CoreModules: c332d5b416cb3ccf972e7af79d496498a700e073
-  React-cxxreact: c5c4106bfd2d0cee80b848e33b7ff4e35a721b16
-  React-jsi: 6ff3fb9b9764a499c959e0096c0d384fa2b4beef
-  React-jsiexecutor: 388f1c99404c848141d7ea162f61233d04829ede
-  React-jsinspector: a4463b3411b8b9b37153255ef694a84c77ba3c7f
-  React-logger: 2a0497622cbabc47fb769d97620952df14c1f814
+  RCTRequired: 8e9a57dddc8f8e9e816c67c2d2537271a997137a
+  RCTTypeSafety: 2b19e268e2036a2c2f6db6deb1ac03e28b1d607a
+  React: f9478e6390f177ee6b67b87a3c6afea42b39523e
+  React-bridging: d405ecd3ff80e1d0a4059a11063eaa9ed7a00c58
+  React-callinvoker: c8ffa61f3f06f486ba6647769fc98f19e25d165a
+  React-Codegen: 73acfdac1495b91ad5efdd3ab005568263c5def6
+  React-Core: 7b7c75af4b73fe0ed4e5c3cdb7d79979e81148dc
+  React-CoreModules: cd6e7efb38162884f08c7afa16fffaf15ff28ae4
+  React-cxxreact: 51157cc600c9f436a7e623913a03b775305ef86c
+  React-jsi: 3eeb345c4828d7b132fd38064a305f31b46d4ec3
+  React-jsiexecutor: 5813455a4a908fb7284aa13307a9e0386e93b0bb
+  React-jsinspector: 9ca5bf73ed0a195397e45fdbcd507cf7d503c428
+  React-logger: 700340e325f21ba2a2d6413a61ef14268c7360aa
   react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
   react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
   react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
@@ -757,18 +757,18 @@ SPEC CHECKSUMS:
   react-native-video: bb6f12a7198db53b261fefb5d609dc77417acc8b
   react-native-webrtc: 4d1669c2ed29767fe70b0169428b4466589ecf8b
   react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
-  React-perflogger: bc57c4a953c1ec913b0d984cf4f2b9842a12bde0
-  React-RCTActionSheet: 3efa3546119a1050f6c34a461b386dd9e36eaf0b
-  React-RCTAnimation: e58fb9f1adf7b38af329881ea2740f43ffeea854
-  React-RCTBlob: d2238645553c3ec787324268c0676148d86e6cc4
-  React-RCTImage: e6d7c9ab978cae99364fcc96b9238fc7740a13da
-  React-RCTLinking: 329e88ce217dad464ef34b5d0c40b3ceaac6c9ec
-  React-RCTNetwork: c8967f2382aac31761ddb750fee53fa34cf7a4ee
-  React-RCTSettings: 8a825b4b5ea58f6713a7c97eea6cc82e9895188b
-  React-RCTText: ffcaac5c66bc065f2ccf79b6fe34585adb9e589b
-  React-RCTVibration: 0039c986626b78242401931bb23c803935fae9d1
-  React-runtimeexecutor: 5ebf1ddaa706bf2986123f22d2cad905443c2c5f
-  ReactCommon: 65754b8932ea80272714988268bbfb9f303264a5
+  React-perflogger: fdee2a0c512167ae4c19c4e230ccf6aa66a6aff0
+  React-RCTActionSheet: 1cf5fef4e372f1c877969710a51bea4bb25e78fe
+  React-RCTAnimation: 73816e3acd1f5e3f00166fc7eedb34f6b112f734
+  React-RCTBlob: 6976c838fb14a1daf75d7c8bb23bae9cbbf726bb
+  React-RCTImage: ab8a7498f215117f32271698591e4bd932dcf812
+  React-RCTLinking: e8e78aed2744ab9946cc8ba5716b4938c2efb1e0
+  React-RCTNetwork: 796f5aed4d932655d292bdc6b40f9502dcdb9542
+  React-RCTSettings: 7e1cd2a384b45c90caf67464572abe3833b9da3b
+  React-RCTText: fd6162890828f0761e03c59058fa23c3a21b2e10
+  React-RCTVibration: 302cfd5cc33669d7abdb7ec6790123baba66e62e
+  React-runtimeexecutor: 59407514818b2afbb1d7507e4e1ac834d24b0fbd
+  ReactCommon: b8487da74723562d7368dab27135fd182f00a91c
   RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3
   RNCAsyncStorage: 005c0e2f09575360f142d0d1f1f15e4ec575b1af
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
@@ -780,8 +780,8 @@ SPEC CHECKSUMS:
   RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
   RNSVG: f3b60aeeaa81960e2e0536c3a9eef50b667ef3a9
   RNWatch: dae6c858a2051dbdcfb00b9a86cf4d90400263b4
-  Yoga: d24d6184b6b85f742536bd93bd07d69d7b9bb4c1
+  Yoga: 7f5ad94937ba3fc58c151ad1b7bbada2c275b28e
 
 PODFILE CHECKSUM: e3579df5272b8b697c9fdc0e55aa0845b189c4dd
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

ios/app/src/AppDelegate.m

@@ -39,11 +39,6 @@
         [builder setFeatureFlag:@"ios.screensharing.enabled" withBoolean:YES];
         [builder setFeatureFlag:@"ios.recording.enabled" withBoolean:YES];
         builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"];
-#if TARGET_IPHONE_SIMULATOR
-        // CallKit has started to create problems starting with the iOS 16 simulator.
-        // Disable it since it never worked in the simulator anyway.
-        [builder setFeatureFlag:@"call-integration.enabled" withBoolean:NO];
-#endif
     }];
 
   [jitsiMeet application:application didFinishLaunchingWithOptions:launchOptions];

ios/sdk/src/AppInfo.m

@@ -70,10 +70,7 @@ RCT_EXPORT_MODULE();
         = [[NSBundle bundleForClass:self.class] infoDictionary];
     NSString *sdkVersion = sdkInfoDictionary[@"CFBundleShortVersionString"];
     if (sdkVersion == nil) {
-        sdkVersion = sdkInfoDictionary[@"CFBundleVersion"];
-        if (sdkVersion == nil) {
-            sdkVersion = @"";
-        }
+        sdkVersion = @"";
     }
 
     // build number

ios/sdk/src/ExternalAPI.h

@@ -30,5 +30,6 @@ static NSString * const sendEventNotificationName = @"org.jitsi.meet.SendEvent";
 - (void)sendChatMessage:(NSString*)message :(NSString*)to ;
 - (void)sendSetVideoMuted:(BOOL)muted;
 - (void)sendSetClosedCaptionsEnabled:(BOOL)enabled;
+- (void)toggleCamera;
 
 @end

ios/sdk/src/ExternalAPI.m

@@ -27,6 +27,7 @@ static NSString * const closeChatAction = @"org.jitsi.meet.CLOSE_CHAT";
 static NSString * const sendChatMessageAction = @"org.jitsi.meet.SEND_CHAT_MESSAGE";
 static NSString * const setVideoMutedAction = @"org.jitsi.meet.SET_VIDEO_MUTED";
 static NSString * const setClosedCaptionsEnabledAction = @"org.jitsi.meet.SET_CLOSED_CAPTIONS_ENABLED";
+static NSString * const toggleCameraAction = @"org.jitsi.meet.TOGGLE_CAMERA";
 
 @implementation ExternalAPI
 
@@ -50,7 +51,8 @@ RCT_EXPORT_MODULE();
         @"CLOSE_CHAT": closeChatAction,
         @"SEND_CHAT_MESSAGE": sendChatMessageAction,
         @"SET_VIDEO_MUTED" : setVideoMutedAction,
-        @"SET_CLOSED_CAPTIONS_ENABLED": setClosedCaptionsEnabledAction
+        @"SET_CLOSED_CAPTIONS_ENABLED": setClosedCaptionsEnabledAction,
+        @"TOGGLE_CAMERA": toggleCameraAction
     };
 };
 
@@ -75,7 +77,8 @@ RCT_EXPORT_MODULE();
               closeChatAction,
               sendChatMessageAction,
               setVideoMutedAction,
-              setClosedCaptionsEnabledAction
+              setClosedCaptionsEnabledAction,
+              toggleCameraAction
     ];
 }
 
@@ -173,4 +176,8 @@ RCT_EXPORT_METHOD(sendEvent:(NSString *)name
     [self sendEventWithName:setClosedCaptionsEnabledAction body:data];
 }
 
+- (void)toggleCamera {
+    [self sendEventWithName:toggleCameraAction body:nil];
+}
+
 @end

ios/sdk/src/JitsiMeetView.h

@@ -46,5 +46,6 @@
 - (void)sendChatMessage:(NSString * _Nonnull)message :(NSString * _Nullable)to;
 - (void)setVideoMuted:(BOOL)muted;
 - (void)setClosedCaptionsEnabled:(BOOL)enabled;
+- (void)toggleCamera;
 
 @end

ios/sdk/src/JitsiMeetView.m

@@ -138,6 +138,11 @@ static NSString *const PiPEnabledFeatureFlag = @"pip.enabled";
     [externalAPI sendSetClosedCaptionsEnabled:enabled];
 }
 
+- (void)toggleCamera {
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI toggleCamera];
+}
+
 #pragma mark Private methods
 
 - (void)registerObservers {

lang/languages.json

@@ -10,7 +10,6 @@
     "dsb": "Dolnoserbšćina",
     "el": "Ελληνικά",
     "en": "English",
-    "enGB": "English (United Kingdom)",
     "eo": "Esperanto",
     "es": "Español",
     "esUS": "Español (Latinoamérica)",

lang/main-de.json

@@ -63,6 +63,8 @@
             "leaveBreakoutRoom": "Breakout-Raum verlassen",
             "more": "Mehr",
             "remove": "Entfernen",
+            "rename": "Umbenennen",
+            "renameBreakoutRoom": "Breakout-Raum umbenennen",
             "sendToBreakoutRoom": "Anwesende in Breakout-Raum verschieben:"
         },
         "defaultName": "Breakout-Raum #{{index}}",
@@ -370,8 +372,6 @@
         "permissionCameraRequiredError": "Der Zugriff auf die Kamera wird benötigt, um in Videokonferenzen teilzunehmen. Bitte in den Einstellungen zulassen",
         "permissionErrorTitle": "Berechtigung benötigt",
         "permissionMicRequiredError": "Der Zugriff auf das Mikrofon wird benötigt, um an Konferenzen mit Ton teilzunehmen. Bitte in den Einstellungen zulassen",
-        "popupError": "Ihr Browser blockiert Pop-ups von dieser Website. Bitte aktivieren Sie Pop-ups in den Sicherheitseinstellungen des Browsers und versuchen Sie es erneut.",
-        "popupErrorTitle": "Pop-up blockiert",
         "readMore": "mehr",
         "recentlyUsedObjects": "Ihre zuletzt verwendeten Objekte",
         "recording": "Aufnahme",
@@ -388,6 +388,8 @@
         "removePassword": "$t(lockRoomPasswordUppercase) entfernen",
         "removeSharedVideoMsg": "Sind Sie sicher, dass Sie das geteilte Video entfernen möchten?",
         "removeSharedVideoTitle": "Freigegebenes Video entfernen",
+        "renameBreakoutRoomLabel": "Raumname",
+        "renameBreakoutRoomTitle": "Breakout-Raum umbenennen",
         "reservationError": "Fehler im Reservierungssystem",
         "reservationErrorMsg": "Fehler, Nummer: {{code}}, Nachricht: {{msg}}",
         "retry": "Wiederholen",
@@ -439,6 +441,7 @@
         "token": "Token",
         "tokenAuthFailed": "Sie sind nicht berechtigt, dieser Konferenz beizutreten.",
         "tokenAuthFailedTitle": "Authentifizierung fehlgeschlagen",
+        "tokenAuthUnsupported": "Token-Authentifizierung wird nicht unterstützt.",
         "transcribing": "Wird transkribiert",
         "unlockRoom": "Konferenz$t(lockRoomPassword) entfernen",
         "user": "Anmeldename",
@@ -742,7 +745,6 @@
         "newDeviceCameraTitle": "Neue Kamera erkannt",
         "noiseSuppressionDesktopAudioDescription": "Die Rauschunterdrückung kann nicht genutzt werden, wenn der Computersound geteilt wird, bitte zuerst deaktivieren und dann nochmals versuchen.",
         "noiseSuppressionFailedTitle": "Rauschunterdrückung konnte nicht gestartet werden",
-        "noiseSuppressionNoTrackDescription": "Bitte eigenes Mikrofon zuerst aktivieren.",
         "noiseSuppressionStereoDescription": "Rauschunterdrückung unterstützt aktuell keinen Stereoton.",
         "oldElectronClientDescription1": "Sie scheinen eine alte Version des Jitsi-Meet-Clients zu nutzen. Diese hat bekannte Schwachstellen. Bitte aktualisieren Sie auf unsere ",
         "oldElectronClientDescription2": "aktuelle Version",

lang/main-enGB.json

@@ -1,760 +0,0 @@
-{
-    "addPeople": {
-        "add": "Invite",
-        "countryNotSupported": "We do not support this destination yet.",
-        "countryReminder": "Calling outside the US? Please make sure you start with the country code!",
-        "disabled": "You can't invite people.",
-        "failedToAdd": "Failed to add members",
-        "footerText": "Dialling out is disabled.",
-        "loading": "Searching for people and phone numbers",
-        "loadingNumber": "Validating phone number",
-        "loadingPeople": "Searching for people to invite",
-        "noResults": "No matching search results",
-        "noValidNumbers": "Please enter a phone number",
-        "searchNumbers": "Add phone numbers",
-        "searchPeople": "Search for people",
-        "searchPeopleAndNumbers": "Search for people or add their phone numbers",
-        "telephone": "Telephone: {{number}}",
-        "title": "Invite people to this meeting"
-    },
-    "audioDevices": {
-        "bluetooth": "Bluetooth",
-        "headphones": "Headphones",
-        "none": "",
-        "phone": "Phone",
-        "speaker": "Speaker"
-    },
-    "audioOnly": {
-        "audioOnly": "Audio only"
-    },
-    "calendarSync": {
-        "addMeetingURL": "Add a meeting link",
-        "confirmAddLink": "Do you want to add a Jitsi link to this event?",
-        "error": {
-            "appConfiguration": "Calendar integration is not properly configured.",
-            "generic": "An error has occurred. Please check your calendar settings or try refreshing the calendar.",
-            "notSignedIn": "An error occurred while authenticating to see calendar events. Please check your calendar settings and try logging in again."
-        },
-        "join": "Join",
-        "joinTooltip": "Join the meeting",
-        "nextMeeting": "next meeting",
-        "noEvents": "There are no upcoming events scheduled.",
-        "ongoingMeeting": "ongoing meeting",
-        "permissionButton": "Open settings",
-        "permissionMessage": "The Calendar permission is required to see your meetings in the app.",
-        "refresh": "Refresh calendar",
-        "today": "Today"
-    },
-    "chat": {
-        "messagebox": "Type a message",
-        "nickname": {
-            "popover": "Choose a nickname",
-            "title": "Enter a nickname to use chat",
-            "titleWithPolls": "Enter a nickname to use chat"
-        },
-        "sendButton": "Send",
-        "title": "Chat",
-        "titleWithPolls": "Chat"
-    },
-    "chromeExtensionBanner": {
-        "buttonText": "",
-        "dontShowAgain": "",
-        "installExtensionText": ""
-    },
-    "connectingOverlay": {
-        "joiningRoom": "Connecting you to your meeting…"
-    },
-    "connection": {
-        "ATTACHED": "Attached",
-        "AUTHENTICATING": "Authenticating",
-        "AUTHFAIL": "Authentication failed",
-        "CONNECTED": "Connected",
-        "CONNECTING": "Connecting",
-        "CONNFAIL": "Connection failed",
-        "DISCONNECTED": "Disconnected",
-        "DISCONNECTING": "Disconnecting",
-        "ERROR": "Error",
-        "FETCH_SESSION_ID": "",
-        "GET_SESSION_ID_ERROR": "",
-        "GOT_SESSION_ID": "",
-        "LOW_BANDWIDTH": "",
-        "RECONNECTING": "A network problem occurred. Reconnecting..."
-    },
-    "connectionindicator": {
-        "address": "Address:",
-        "bandwidth": "Estimated bandwidth:",
-        "bitrate": "Bitrate:",
-        "bridgeCount": "Server count: ",
-        "codecs": "Codecs (A/V): ",
-        "connectedTo": "Connected to:",
-        "framerate": "Frame rate:",
-        "less": "Show less",
-        "localaddress": "Local address:",
-        "localaddress_plural": "Local addresses:",
-        "localport": "Local port:",
-        "localport_plural": "Local ports:",
-        "more": "Show more",
-        "packetloss": "Packet loss:",
-        "quality": {
-            "good": "Good",
-            "inactive": "Inactive",
-            "lost": "Lost",
-            "nonoptimal": "Nonoptimal",
-            "poor": "Poor"
-        },
-        "remoteaddress": "Remote address:",
-        "remoteaddress_plural": "Remote addresses:",
-        "remoteport": "Remote port:",
-        "remoteport_plural": "Remote ports:",
-        "resolution": "Resolution:",
-        "status": "Connection:",
-        "transport": "Transport:",
-        "transport_plural": "Transports:",
-        "turn": " (turn)"
-    },
-    "dateUtils": {
-        "earlier": "Earlier",
-        "today": "Today",
-        "yesterday": "Yesterday"
-    },
-    "deepLinking": {
-        "appNotInstalled": "You need the {{app}} mobile app to join this meeting on your phone.",
-        "description": "Nothing happened? We tried launching your meeting in the {{app}} desktop app. Try again or launch it in the {{app}} web app.",
-        "descriptionWithoutWeb": "",
-        "downloadApp": "Download the app",
-        "ifDoNotHaveApp": "If you don't have the app yet:",
-        "ifHaveApp": "If you already have the app:",
-        "joinInApp": "Join this meeting using the app",
-        "launchWebButton": "Launch in web",
-        "title": "Launching your meeting in {{app}}…",
-        "tryAgainButton": "Try again in desktop"
-    },
-    "defaultLink": "e.g. {{url}}",
-    "defaultNickname": "",
-    "deviceError": {
-        "cameraError": "Failed to access your camera",
-        "cameraPermission": "Error obtaining camera permission",
-        "microphoneError": "Failed to access your microphone",
-        "microphonePermission": "Error obtaining microphone permission"
-    },
-    "deviceSelection": {
-        "noPermission": "Permission not granted",
-        "previewUnavailable": "Preview unavailable",
-        "selectADevice": "Select a device",
-        "testAudio": "Play a test sound"
-    },
-    "dialOut": {
-        "statusMessage": "is now {{status}}"
-    },
-    "dialog": {
-        "Back": "Back",
-        "Cancel": "Cancel",
-        "IamHost": "I am the host",
-        "Ok": "Ok",
-        "Remove": "Remove",
-        "Share": "Share",
-        "Submit": "Submit",
-        "WaitForHostMsg": "The conference has not yet started. If you are the host then please authenticate. Otherwise, please wait for the host to arrive.",
-        "WaitingForHost": "Waiting for the host …",
-        "Yes": "Yes",
-        "accessibilityLabel": {
-            "liveStreaming": "Live Stream"
-        },
-        "allow": "Allow",
-        "alreadySharedVideoMsg": "Another member is already sharing a video. This conference allows only one shared video at a time.",
-        "alreadySharedVideoTitle": "Only one shared video is allowed at a time",
-        "applicationWindow": "Application window",
-        "cameraConstraintFailedError": "Your camera does not satisfy some of the required constraints.",
-        "cameraNotFoundError": "Camera was not found.",
-        "cameraNotSendingData": "We are unable to access your camera. Please check if another application is using this device, select another device from the settings menu or try to reload the application.",
-        "cameraNotSendingDataTitle": "Unable to access camera",
-        "cameraPermissionDeniedError": "You have not granted permission to use your camera. You can still join the conference but others won't see you. Use the camera button in the address bar to fix this.",
-        "cameraUnknownError": "Cannot use camera for an unknown reason.",
-        "cameraUnsupportedResolutionError": "Your camera does not support required video resolution.",
-        "close": "Close",
-        "conferenceDisconnectMsg": "You may want to check your network connection. Reconnecting in {{seconds}} sec…",
-        "conferenceDisconnectTitle": "You have been disconnected.",
-        "conferenceReloadMsg": "We're trying to fix this. Reconnecting in {{seconds}} sec…",
-        "conferenceReloadTitle": "Unfortunately, something went wrong.",
-        "confirm": "Confirm",
-        "confirmNo": "No",
-        "confirmYes": "Yes",
-        "connectError": "Oops! Something went wrong and we couldn't connect to the conference.",
-        "connectErrorWithMsg": "Oops! Something went wrong and we couldn't connect to the conference: {{msg}}",
-        "connecting": "Connecting",
-        "contactSupport": "Contact support",
-        "copy": "Copy",
-        "dismiss": "Dismiss",
-        "displayNameRequired": "Display name is required",
-        "done": "Done",
-        "enterDisplayName": "Please enter your display name",
-        "error": "Error",
-        "externalInstallationMsg": "You need to install our desktop sharing extension.",
-        "externalInstallationTitle": "Extension required",
-        "goToStore": "Go to the webstore",
-        "gracefulShutdown": "Our service is currently down for maintenance. Please try again later.",
-        "incorrectPassword": "Incorrect username or password",
-        "incorrectRoomLockPassword": "",
-        "inlineInstallExtension": "Install now",
-        "inlineInstallationMsg": "You need to install our desktop sharing extension.",
-        "internalError": "Oops! Something went wrong. The following error occurred: {{error}}",
-        "internalErrorTitle": "Internal error",
-        "kickMessage": "Ouch! You have been kicked out of the meet!",
-        "kickParticipantButton": "Kick",
-        "kickParticipantDialog": "Are you sure you want to kick this participant?",
-        "kickParticipantTitle": "Kick this member?",
-        "kickTitle": "Kicked from meeting",
-        "liveStreaming": "Live Streaming",
-        "liveStreamingDisabledForGuestTooltip": "Guests can't start live streaming.",
-        "liveStreamingDisabledTooltip": "Start live stream disabled.",
-        "lockMessage": "Failed to lock the conference.",
-        "lockRoom": "Add meeting password",
-        "lockTitle": "Lock failed",
-        "logoutQuestion": "Are you sure you want to logout and stop the conference?",
-        "logoutTitle": "Log out",
-        "maxUsersLimitReached": "The limit for maximum number of members has been reached. The conference is full. Please contact the meeting owner or try again later!",
-        "maxUsersLimitReachedTitle": "Maximum members limit reached",
-        "micConstraintFailedError": "Your microphone does not satisfy some of the required constraints.",
-        "micNotFoundError": "Microphone was not found.",
-        "micNotSendingData": "We are unable to access your microphone. Please select another device from the settings menu or try to reload the application.",
-        "micNotSendingDataTitle": "Unable to access microphone",
-        "micPermissionDeniedError": "You have not granted permission to use your microphone. You can still join the conference but others won't hear you. Use the camera button in the address bar to fix this.",
-        "micUnknownError": "Cannot use microphone for an unknown reason.",
-        "muteEveryoneDialog": "",
-        "muteEveryoneElseDialog": "",
-        "muteEveryoneElseTitle": "",
-        "muteEveryoneSelf": "",
-        "muteEveryoneStartMuted": "",
-        "muteEveryoneTitle": "",
-        "muteParticipantBody": "You won't be able to unmute them, but they can unmute themselves at any time.",
-        "muteParticipantButton": "Mute",
-        "muteParticipantDialog": "Are you sure you want to mute this participant? You won't be able to unmute them, but they can unmute themselves at any time.",
-        "muteParticipantTitle": "Mute this member?",
-        "passwordLabel": "Password",
-        "passwordNotSupported": "Setting a meeting password is not supported.",
-        "passwordNotSupportedTitle": "Password not supported",
-        "passwordRequired": "Password required",
-        "popupError": "Your browser is blocking pop-up windows from this site. Please enable pop-ups in your browser's security settings and try again.",
-        "popupErrorTitle": "Pop-up blocked",
-        "recording": "Recording",
-        "recordingDisabledForGuestTooltip": "Guests can't start recordings.",
-        "recordingDisabledTooltip": "Start recording disabled.",
-        "rejoinNow": "Rejoin now",
-        "remoteControlAllowedMessage": "{{user}} accepted your remote control request!",
-        "remoteControlDeniedMessage": "{{user}} rejected your remote control request!",
-        "remoteControlErrorMessage": "An error occurred while trying to request remote control permissions from {{user}}!",
-        "remoteControlRequestMessage": "Will you allow {{user}} to remotely control your desktop?",
-        "remoteControlShareScreenWarning": "Note that if you press \"Allow\" you will share your screen!",
-        "remoteControlStopMessage": "The remote control session ended!",
-        "remoteControlTitle": "Remote desktop control",
-        "removePassword": "Remove password",
-        "removeSharedVideoMsg": "Are you sure you would like to remove your shared video?",
-        "removeSharedVideoTitle": "Remove shared video",
-        "reservationError": "Reservation system error",
-        "reservationErrorMsg": "Error code: {{code}}, message: {{msg}}",
-        "retry": "Retry",
-        "screenSharingAudio": "",
-        "screenSharingFailedToInstall": "Oops! Your screen sharing extension failed to install.",
-        "screenSharingFailedToInstallTitle": "Screen sharing extension failed to install",
-        "screenSharingFirefoxPermissionDeniedError": "Something went wrong while we were trying to share your screen. Please make sure that you have given us permission to do so. ",
-        "screenSharingFirefoxPermissionDeniedTitle": "Oops! We weren’t able to start screen sharing!",
-        "screenSharingPermissionDeniedError": "Oops! Something went wrong with your screen sharing extension permissions. Please reload and try again.",
-        "sendPrivateMessage": "",
-        "sendPrivateMessageCancel": "",
-        "sendPrivateMessageOk": "",
-        "sendPrivateMessageTitle": "",
-        "serviceUnavailable": "Service unavailable",
-        "sessTerminated": "Call terminated",
-        "shareVideoLinkError": "Please provide a correct video link.",
-        "shareVideoTitle": "Share a video",
-        "shareYourScreen": "Share your screen",
-        "shareYourScreenDisabled": "Screen sharing disabled.",
-        "shareYourScreenDisabledForGuest": "Guests can't screen share.",
-        "startLiveStreaming": "Start live stream",
-        "startRecording": "Start recording",
-        "startRemoteControlErrorMessage": "An error occurred while trying to start the remote control session!",
-        "stopLiveStreaming": "Stop live stream",
-        "stopRecording": "Stop recording",
-        "stopRecordingWarning": "Are you sure you would like to stop the recording?",
-        "stopStreamingWarning": "Are you sure you would like to stop the live streaming?",
-        "streamKey": "Live stream key",
-        "thankYou": "Thank you for using {{appName}}!",
-        "token": "token",
-        "tokenAuthFailed": "Sorry, you're not allowed to join this call.",
-        "tokenAuthFailedTitle": "Authentication failed",
-        "transcribing": "Transcribing",
-        "unlockRoom": "Remove meeting password",
-        "userPassword": "user password",
-        "yourEntireScreen": "Your entire screen"
-    },
-    "documentSharing": {
-        "title": ""
-    },
-    "feedback": {
-        "average": "Average",
-        "bad": "Bad",
-        "detailsLabel": "Tell us more about it.",
-        "good": "Good",
-        "rateExperience": "Rate your meeting experience",
-        "veryBad": "Very Bad",
-        "veryGood": "Very Good"
-    },
-    "incomingCall": {
-        "answer": "Answer",
-        "audioCallTitle": "Incoming call",
-        "decline": "Dismiss",
-        "productLabel": "from Jitsi Meet",
-        "videoCallTitle": "Incoming video call"
-    },
-    "info": {
-        "accessibilityLabel": "Show info",
-        "addPassword": "Add password",
-        "cancelPassword": "Cancel password",
-        "conferenceURL": "Link:",
-        "country": "Country",
-        "dialANumber": "To join your meeting, dial one of these numbers and then enter the pin.",
-        "dialInConferenceID": "PIN:",
-        "dialInNotSupported": "Sorry, dialling in is currently not supported.",
-        "dialInNumber": "Dial-in:",
-        "dialInSummaryError": "Error fetching dial-in info now. Please try again later.",
-        "dialInTollFree": "Toll Free",
-        "genericError": "Whoops, something went wrong.",
-        "inviteLiveStream": "To view the live stream of this meeting, click this link: {{url}}",
-        "invitePhone": "One tap audio Dial In: {{number}},,{{conferenceID}}#\n",
-        "invitePhoneAlternatives": "",
-        "inviteURLFirstPartGeneral": "You are invited to join a meeting.",
-        "inviteURLFirstPartPersonal": "{{name}} is inviting you to a meeting.\n",
-        "inviteURLSecondPart": "\nJoin the meeting:\n{{url}}\n",
-        "label": "Meeting info",
-        "liveStreamURL": "Live stream:",
-        "moreNumbers": "More numbers",
-        "noNumbers": "No dial-in numbers.",
-        "noPassword": "None",
-        "noRoom": "No room was specified to dial-in into.",
-        "numbers": "Dial-in Numbers",
-        "password": "Password:",
-        "title": "Share",
-        "tooltip": "Share link and dial-in info for this meeting"
-    },
-    "inlineDialogFailure": {
-        "msg": "We stumbled a bit.",
-        "retry": "Try again",
-        "support": "Support",
-        "supportMsg": "If this keeps happening, reach out to"
-    },
-    "inviteDialog": {
-        "alertText": "Failed to invite some participants.",
-        "header": "Invite",
-        "searchCallOnlyPlaceholder": "Enter phone number",
-        "searchPeopleOnlyPlaceholder": "Search for participants",
-        "searchPlaceholder": "Participant or phone number",
-        "send": "Send"
-    },
-    "keyboardShortcuts": {
-        "focusLocal": "Focus on your video",
-        "focusRemote": "Focus on another person's video",
-        "fullScreen": "View or exit full screen",
-        "keyboardShortcuts": "Keyboard shortcuts",
-        "localRecording": "Show or hide local recording controls",
-        "mute": "Mute or unmute your microphone",
-        "pushToTalk": "Press to transmit",
-        "raiseHand": "Raise or lower your hand",
-        "showSpeakerStats": "Show participants stats",
-        "toggleChat": "Open or close the chat",
-        "toggleFilmstrip": "Show or hide video thumbnails",
-        "toggleScreensharing": "Switch between camera and screen sharing",
-        "toggleShortcuts": "Show or hide keyboard shortcuts",
-        "videoMute": "Start or stop your camera",
-        "videoQuality": ""
-    },
-    "liveStreaming": {
-        "busy": "We're working on freeing streaming resources. Please try again in a few minutes.",
-        "busyTitle": "All streamers are currently busy",
-        "changeSignIn": "Switch accounts.",
-        "choose": "Choose a live stream",
-        "chooseCTA": "Choose a streaming option. You're currently logged in as {{email}}.",
-        "enterStreamKey": "Enter your YouTube live stream key here.",
-        "error": "Live Streaming failed. Please try again.",
-        "errorAPI": "An error occurred while accessing your YouTube broadcasts. Please try logging in again.",
-        "errorLiveStreamNotEnabled": "Live Streaming is not enabled on {{email}}. Please enable live streaming or log into an account with live streaming enabled.",
-        "expandedOff": "The live streaming has stopped",
-        "expandedOn": "The meeting is currently being streamed to YouTube.",
-        "expandedPending": "The live streaming is being started…",
-        "failedToStart": "Live Streaming failed to start",
-        "getStreamKeyManually": "We weren’t able to fetch any live streams. Try getting your live stream key from YouTube.",
-        "googlePrivacyPolicy": "Google Privacy Policy",
-        "invalidStreamKey": "Live stream key may be incorrect.",
-        "off": "Live Streaming stopped",
-        "offBy": "",
-        "on": "Live Streaming started",
-        "onBy": "",
-        "pending": "Starting Live Stream…",
-        "serviceName": "Live Streaming service",
-        "signIn": "Sign in with Google",
-        "signInCTA": "Sign in or enter your live stream key from YouTube.",
-        "signOut": "Sign out",
-        "signedInAs": "You are currently signed in as:",
-        "start": "Start a live stream",
-        "streamIdHelp": "What's this?",
-        "title": "Live Stream",
-        "unavailableTitle": "Live Streaming unavailable",
-        "youtubeTerms": "YouTube terms of services"
-    },
-    "localRecording": {
-        "clientState": {
-            "off": "Off",
-            "on": "On",
-            "unknown": "Unknown"
-        },
-        "dialogTitle": "Local Recording Controls",
-        "duration": "Duration",
-        "durationNA": "N/A",
-        "encoding": "Encoding",
-        "label": "LOR",
-        "labelToolTip": "Local recording is engaged",
-        "localRecording": "Local Recording",
-        "me": "Me",
-        "messages": {
-            "engaged": "Local recording engaged.",
-            "finished": "Recording session {{token}} finished. Please send the recorded file to the moderator.",
-            "finishedModerator": "Recording session {{token}} finished. The recording of the local track has been saved. Please ask the other participants to submit their recordings.",
-            "notModerator": "You are not the moderator. You cannot start or stop local recording."
-        },
-        "moderator": "Moderator",
-        "no": "No",
-        "participant": "Participant",
-        "participantStats": "Participant Stats",
-        "sessionToken": "Session Token",
-        "start": "Start Recording",
-        "stop": "Stop Recording",
-        "yes": "Yes"
-    },
-    "lockRoomPassword": "password",
-    "lockRoomPasswordUppercase": "Password",
-    "me": "me",
-    "notify": {
-        "connectedOneMember": "{{name}} joined the meeting",
-        "connectedThreePlusMembers": "{{name}} and {{count}} others joined the meeting",
-        "connectedTwoMembers": "{{first}} and {{second}} joined the meeting",
-        "disconnected": "disconnected",
-        "focus": "Conference focus",
-        "focusFail": "{{component}} not available - retry in {{ms}} sec",
-        "grantedTo": "Moderator rights granted to {{to}}!",
-        "invitedOneMember": "{{name}} has been invited",
-        "invitedThreePlusMembers": "{{name}} and {{count}} others have been invited",
-        "invitedTwoMembers": "{{first}} and {{second}} have been invited",
-        "kickParticipant": "{{kicked}} was kicked by {{kicker}}",
-        "me": "Me",
-        "moderator": "Moderator rights granted!",
-        "muted": "You have started the conversation muted.",
-        "mutedRemotelyDescription": "You can always unmute when you're ready to speak. Mute back when you're done to keep noise away from the meeting.",
-        "mutedRemotelyTitle": "You have been muted by {{participantDisplayName}}!",
-        "mutedTitle": "You're muted!",
-        "newDeviceAction": "Use",
-        "newDeviceAudioTitle": "New audio device detected",
-        "newDeviceCameraTitle": "New camera detected",
-        "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) removed by another participant",
-        "passwordSetRemotely": "$t(lockRoomPasswordUppercase) set by another participant",
-        "raisedHand": "{{name}} would like to speak.",
-        "somebody": "Somebody",
-        "startSilentDescription": "Rejoin the meeting to enable audio",
-        "startSilentTitle": "You joined with no audio output!",
-        "suboptimalBrowserWarning": "We are afraid your meeting experience isn't going to be that great here. We are looking for ways to improve this, but until then please try using one of the <a href='{{recommendedBrowserPageLink}}' target='_blank'>fully supported browsers</a>.",
-        "suboptimalExperienceDescription": "Eer... we are afraid your experience with {{appName}} isn't going to be that great here. We are looking for ways to improve this but, until then, please try using one of the <a href='{{recommendedBrowserPageLink}}' target='_blank'>fully supported browsers</a>.",
-        "suboptimalExperienceTitle": "Browser Warning",
-        "unmute": "Unmute"
-    },
-    "passwordDigitsOnly": "Up to {{number}} digits",
-    "passwordSetRemotely": "set by another member",
-    "poweredby": "powered by",
-    "presenceStatus": {
-        "busy": "Busy",
-        "calling": "Calling…",
-        "connected": "Connected",
-        "connecting": "Connecting…",
-        "connecting2": "Connecting*...",
-        "disconnected": "Disconnected",
-        "expired": "Expired",
-        "ignored": "Ignored",
-        "initializingCall": "Initialising Call…",
-        "invited": "Invited",
-        "rejected": "Rejected",
-        "ringing": "Ringing…"
-    },
-    "profile": {
-        "setDisplayNameLabel": "Set your display name",
-        "setEmailInput": "Enter email",
-        "setEmailLabel": "Set your Gravatar email",
-        "title": "Profile"
-    },
-    "raisedHand": "Would like to speak",
-    "recording": {
-        "authDropboxText": "Upload to Dropbox",
-        "availableSpace": "Available space: {{spaceLeft}} MB (approximately {{duration}} minutes of recording)",
-        "beta": "BETA",
-        "busy": "We're working on freeing recording resources. Please try again in a few minutes.",
-        "busyTitle": "All recorders are currently busy",
-        "error": "Recording failed. Please try again.",
-        "expandedOff": "Recording has stopped",
-        "expandedOn": "The meeting is currently being recorded.",
-        "expandedPending": "Recording is being started…",
-        "failedToStart": "Recording failed to start",
-        "fileSharingdescription": "Share recording with meeting participants",
-        "live": "LIVE",
-        "loggedIn": "Logged in as {{userName}}",
-        "off": "Recording stopped",
-        "offBy": "{{name}} stopped the recording",
-        "on": "Recording started",
-        "onBy": "{{name}} started the recording",
-        "pending": "Preparing to record the meeting…",
-        "rec": "REC",
-        "serviceDescription": "Your recording will be saved by the recording service",
-        "serviceName": "Recording service",
-        "signIn": "Sign in",
-        "signOut": "Sign out",
-        "title": "Recording",
-        "unavailable": "Oops! The {{serviceName}} is currently unavailable. We're working on resolving the issue. Please try again later.",
-        "unavailableTitle": "Recording unavailable"
-    },
-    "sectionList": {
-        "pullToRefresh": "Pull to refresh"
-    },
-    "settings": {
-        "calendar": {
-            "about": "The {{appName}} calendar integration is used to securely access your calendar so it can read upcoming events.",
-            "disconnect": "Disconnect",
-            "microsoftSignIn": "Sign in with Microsoft",
-            "signedIn": "Currently accessing calendar events for {{email}}. Click the Disconnect button below to stop accessing calendar events.",
-            "title": "Calendar"
-        },
-        "devices": "Devices",
-        "followMe": "Everyone follows me",
-        "language": "Language",
-        "loggedIn": "Logged in as {{name}}",
-        "microphones": "Microphones",
-        "moderator": "Moderator",
-        "more": "More",
-        "name": "Name",
-        "noDevice": "None",
-        "selectAudioOutput": "Audio output",
-        "selectCamera": "Camera",
-        "selectMic": "Microphone",
-        "speakers": "Speakers",
-        "startAudioMuted": "Everyone starts muted",
-        "startVideoMuted": "Everyone starts hidden",
-        "title": "Settings"
-    },
-    "settingsView": {
-        "advanced": "Advanced",
-        "alertOk": "OK",
-        "alertTitle": "Warning",
-        "alertURLText": "The entered server URL is invalid",
-        "buildInfoSection": "Build Information",
-        "conferenceSection": "Conference",
-        "disableCallIntegration": "Disable native call integration",
-        "disableP2P": "Disable Peer-To-Peer mode",
-        "displayName": "Display name",
-        "email": "Email",
-        "header": "Settings",
-        "profileSection": "Profile",
-        "serverURL": "Server URL",
-        "showAdvanced": "Show advanced settings",
-        "startWithAudioMuted": "Start with audio muted",
-        "startWithVideoMuted": "Start with video muted",
-        "version": "Version"
-    },
-    "share": {
-        "dialInfoText": "\n\n=====\n\nJust want to dial in on your phone?\n\n{{defaultDialInNumber}}Click this link to see the dial in phone numbers for this meeting\n{{dialInfoPageUrl}}",
-        "mainText": "Click the following link to join the meeting:\n{{roomUrl}}"
-    },
-    "speaker": "Speaker",
-    "speakerStats": {
-        "hours": "{{count}}h",
-        "minutes": "{{count}}m",
-        "name": "Name",
-        "seconds": "{{count}}s",
-        "speakerStats": "Participants Stats",
-        "speakerTime": "Speaker Time"
-    },
-    "startupoverlay": {
-        "policyText": " ",
-        "title": "{{app}} needs to use your microphone and camera."
-    },
-    "suspendedoverlay": {
-        "rejoinKeyTitle": "Rejoin",
-        "text": "Press the <i>Rejoin</i> button to reconnect.",
-        "title": "Your video call was interrupted because this computer went to sleep."
-    },
-    "toolbar": {
-        "Settings": "Settings",
-        "accessibilityLabel": {
-            "Settings": "Toggle settings",
-            "audioOnly": "Toggle audio only",
-            "audioRoute": "Select the sound device",
-            "callQuality": "Manage call quality",
-            "cc": "Toggle subtitles",
-            "chat": "Toggle chat window",
-            "document": "Toggle shared document",
-            "download": "Download our apps",
-            "feedback": "Leave feedback",
-            "fullScreen": "Toggle full screen",
-            "hangup": "Leave the call",
-            "help": "Help",
-            "invite": "Invite people",
-            "kick": "Kick participant",
-            "localRecording": "Toggle local recording controls",
-            "lockRoom": "Toggle meeting password",
-            "moreActions": "Toggle more actions menu",
-            "moreActionsMenu": "More actions menu",
-            "moreOptions": "Show more options",
-            "mute": "Toggle mute audio",
-            "muteEveryone": "Mute everyone",
-            "pip": "Toggle Picture-in-Picture mode",
-            "privateMessage": "Send private message",
-            "profile": "Edit your profile",
-            "raiseHand": "Toggle raise hand",
-            "recording": "Toggle recording",
-            "remoteMute": "Mute participant",
-            "shareRoom": "Invite someone",
-            "shareYourScreen": "Toggle screenshare",
-            "sharedvideo": "Toggle video sharing",
-            "shortcuts": "Toggle shortcuts",
-            "show": "Show on stage",
-            "speakerStats": "Toggle participants statistics",
-            "tileView": "Toggle tile view",
-            "toggleCamera": "Toggle camera",
-            "videoblur": "",
-            "videomute": "Toggle mute video"
-        },
-        "addPeople": "Add people to your call",
-        "audioOnlyOff": "Disable audio only mode",
-        "audioOnlyOn": "Enable audio only mode",
-        "audioRoute": "Select the sound device",
-        "authenticate": "Authenticate",
-        "callQuality": "Manage call quality",
-        "chat": "Open / Close chat",
-        "closeChat": "Close chat",
-        "documentClose": "Close shared document",
-        "documentOpen": "Open shared document",
-        "enterFullScreen": "View full screen",
-        "enterTileView": "Enter tile view",
-        "exitFullScreen": "Exit full screen",
-        "exitTileView": "Exit tile view",
-        "feedback": "Leave feedback",
-        "hangup": "Leave",
-        "invite": "Invite people",
-        "login": "Log in",
-        "logout": "Log out",
-        "lowerYourHand": "Lower your hand",
-        "moreActions": "More actions",
-        "mute": "Mute / Unmute",
-        "openChat": "Open chat",
-        "pip": "Enter Picture-in-Picture mode",
-        "profile": "Edit your profile",
-        "raiseHand": "Raise / Lower your hand",
-        "raiseYourHand": "Raise your hand",
-        "shareRoom": "Invite someone",
-        "sharedvideo": "Share video",
-        "shortcuts": "View shortcuts",
-        "speakerStats": "Participants stats",
-        "startScreenSharing": "Start screen sharing",
-        "startSubtitles": "Start subtitles",
-        "startvideoblur": "",
-        "stopScreenSharing": "Stop screen sharing",
-        "stopSharedVideo": "Stop video",
-        "stopSubtitles": "Stop subtitles",
-        "stopvideoblur": "",
-        "talkWhileMutedPopup": "Trying to speak? You are muted.",
-        "tileViewToggle": "Toggle tile view",
-        "toggleCamera": "Toggle camera",
-        "videomute": "Start / Stop camera"
-    },
-    "transcribing": {
-        "ccButtonTooltip": "Start / Stop subtitles",
-        "error": "Transcribing failed. Please try again.",
-        "expandedLabel": "Transcribing is currently on",
-        "failedToStart": "Transcribing failed to start",
-        "labelToolTip": "The meeting is being transcribed",
-        "off": "Transcribing stopped",
-        "pending": "Preparing to transcribe the meeting…",
-        "start": "Start showing subtitles",
-        "stop": "Stop showing subtitles",
-        "tr": "TR"
-    },
-    "userMedia": {
-        "androidGrantPermissions": "Select <b><i>Allow</i></b> when your browser asks for permissions.",
-        "chromeGrantPermissions": "Select <b><i>Allow</i></b> when your browser asks for permissions.",
-        "edgeGrantPermissions": "Select <b><i>Yes</i></b> when your browser asks for permissions.",
-        "electronGrantPermissions": "Please grant permissions to use your camera and microphone",
-        "firefoxGrantPermissions": "Select <b><i>Share Selected Device</i></b> when your browser asks for permissions.",
-        "iexplorerGrantPermissions": "Select <b><i>OK</i></b> when your browser asks for permissions.",
-        "nwjsGrantPermissions": "Please grant permissions to use your camera and microphone",
-        "operaGrantPermissions": "Select <b><i>Allow</i></b> when your browser asks for permissions.",
-        "react-nativeGrantPermissions": "Select <b><i>Allow</i></b> when your browser asks for permissions.",
-        "safariGrantPermissions": "Select <b><i>OK</i></b> when your browser asks for permissions."
-    },
-    "videoSIPGW": {
-        "busy": "We're working on freeing resources. Please try again in a few minutes.",
-        "busyTitle": "The Room service is currently busy",
-        "errorAlreadyInvited": "{{displayName}} already invited",
-        "errorInvite": "Conference not established yet. Please try again later.",
-        "errorInviteFailed": "We're working on resolving the issue. Please try again later.",
-        "errorInviteFailedTitle": "Inviting {{displayName}} failed",
-        "errorInviteTitle": "Error inviting room",
-        "pending": "{{displayName}} has been invited"
-    },
-    "videoStatus": {
-        "audioOnly": "AUD",
-        "audioOnlyExpanded": "You are in audio only mode. This mode saves bandwidth but you won't see videos of others.",
-        "callQuality": "Call Quality",
-        "hd": "HD",
-        "highDefinition": "High definition",
-        "labelTooiltipNoVideo": "No video",
-        "labelTooltipAudioOnly": "Audio-only mode enabled",
-        "ld": "LD",
-        "lowDefinition": "Low definition",
-        "onlyAudioAvailable": "Only audio is available",
-        "onlyAudioSupported": "We only support audio in this browser.",
-        "sd": "SD",
-        "standardDefinition": "Standard definition"
-    },
-    "videothumbnail": {
-        "domute": "Mute",
-        "flip": "Flip",
-        "kick": "Kick out",
-        "moderator": "Moderator",
-        "mute": "Member is muted",
-        "muted": "Muted",
-        "remoteControl": "Remote control",
-        "show": "",
-        "videomute": "Member has stopped the camera"
-    },
-    "welcomepage": {
-        "accessibilityLabel": {
-            "join": "Tap to join",
-            "roomname": "Enter room name"
-        },
-        "appDescription": "Go ahead, video chat with the whole team. In fact, invite everyone you know. {{app}} is a fully encrypted, 100% open source video conferencing solution that you can use all day, every day, for free — with no account needed.",
-        "audioVideoSwitch": {
-            "audio": "Voice",
-            "video": "Video"
-        },
-        "calendar": "Calendar",
-        "connectCalendarButton": "Connect your calendar",
-        "connectCalendarText": "",
-        "enterRoomTitle": "Start a new meeting",
-        "go": "GO",
-        "info": "Info",
-        "join": "JOIN",
-        "privacy": "Privacy",
-        "recentList": "Recent",
-        "recentListDelete": "Delete",
-        "recentListEmpty": "Your recent list is currently empty. Chat with your team and you will find all your recent meetings here.",
-        "reducedUIText": "",
-        "roomname": "Enter room name",
-        "roomnameHint": "Enter the name or URL of the room you want to join. You may make a name up, just let the people you are meeting know it so that they enter the same name.",
-        "sendFeedback": "Send feedback",
-        "terms": "Terms",
-        "title": "Secure, fully featured, and completely free video conferencing"
-    }
-}

lang/main-pt.json

@@ -63,6 +63,8 @@
             "leaveBreakoutRoom": "Sair da sala",
             "more": "Mais",
             "remove": "Eliminar sala",
+            "rename": "Renomear",
+            "renameBreakoutRoom": "Renomear sala",
             "sendToBreakoutRoom": "Enviar participante para:"
         },
         "defaultName": "Sala #{{index}}",
@@ -370,8 +372,6 @@
         "permissionCameraRequiredError": "É necessária a autorização da câmara para participar em conferências com vídeo. Por favor, conceda-a em Definições",
         "permissionErrorTitle": "Permissão necessária",
         "permissionMicRequiredError": "É necessária a permissão do microfone para participar em conferências com áudio. Por favor, conceda-a em Definições",
-        "popupError": "O seu navegador está a bloquear janelas pop-up a partir deste site. Por favor, active os pop-ups nas definições de segurança do seu browser e tente novamente.",
-        "popupErrorTitle": "Pop-up bloqueado",
         "readMore": "mais",
         "recentlyUsedObjects": "Os seus objetos recentemente utilizados",
         "recording": "A gravar",
@@ -388,6 +388,8 @@
         "removePassword": "Remover $t(lockRoomPassword)",
         "removeSharedVideoMsg": "Tem a certeza de que gostaria de remover o seu vídeo partilhado?",
         "removeSharedVideoTitle": "Remover vídeo partilhado",
+        "renameBreakoutRoomLabel": "Nome da sala",
+        "renameBreakoutRoomTitle": "Mudar o nome da sala",
         "reservationError": "Erro no sistema de reservas",
         "reservationErrorMsg": "Código de erro: {{code}}, mensagem: {{msg}}",
         "retry": "Tentativa",
@@ -439,6 +441,7 @@
         "token": "token",
         "tokenAuthFailed": "Desculpe, não está autorizado a juntar-se a esta chamada.",
         "tokenAuthFailedTitle": "A autenticação falhou",
+        "tokenAuthUnsupported": "O URL de token não é suportado.",
         "transcribing": "Transcrição",
         "unlockRoom": "Retirar reunião $t(lockRoomPassword)",
         "user": "Utilizador",
@@ -674,6 +677,8 @@
         "sessionToken": "Token de Sessão",
         "start": "Iniciar gravação",
         "stop": "Parar gravação",
+        "stopping": "A parar a gravação",
+        "wait": "Aguarde enquanto guardamos a sua gravação",
         "yes": "Sim"
     },
     "lockRoomPassword": "senha",
@@ -742,7 +747,6 @@
         "newDeviceCameraTitle": "Nova câmara detetada",
         "noiseSuppressionDesktopAudioDescription": "A supressão de ruído não pode ser ativada enquanto se partilha o áudio do ambiente de trabalho, por favor desative-o e tente novamente.",
         "noiseSuppressionFailedTitle": "Falha ao iniciar a supressão de ruído",
-        "noiseSuppressionNoTrackDescription": "Por favor, ligue primeiro o seu microfone.",
         "noiseSuppressionStereoDescription": "A supressão do ruído de áudio estéreo não é atualmente suportada.",
         "oldElectronClientDescription1": "Parece estar a utilizar uma versão antiga do cliente Jitsi Meet que tem vulnerabilidades de segurança conhecidas. Por favor, certifique-se de que actualiza a nossa ",
         "oldElectronClientDescription2": "compilação mais recente",
@@ -1073,13 +1077,14 @@
         "links": "Links",
         "privacy": "Privacidade",
         "profileSection": "Perfil",
+        "sdkVersion": "Versão do SDK",
         "serverURL": "URL do servidor",
         "showAdvanced": "Mostrar definições avançadas",
         "startCarModeInLowBandwidthMode": "Iniciar o modo de condução em modo de baixa largura de banda",
         "startWithAudioMuted": "Iniciar sem áudio",
         "startWithVideoMuted": "Iniciar sem vídeo",
         "terms": "Termos",
-        "version": "Versão"
+        "version": "Versão da App"
     },
     "share": {
         "dialInfoText": "\n\n=====\n\nDeseja apenas discar no seu telefone?\n\n{{defaultDialInNumber}}Clique neste link para ver os números de telefone para esta reunião\n{{dialInfoPageUrl}}",
@@ -1124,7 +1129,7 @@
             "audioOnly": "Mudar para apenas áudio",
             "audioRoute": "Selecionar o dispositivo de som",
             "boo": "Vaia",
-            "breakoutRoom": "Entrar/Sair salas instantâneas",
+            "breakoutRoom": "Entrar/Sair da sala",
             "callQuality": "Gerir a qualidade do vídeo",
             "carmode": "Modo de condução",
             "cc": "Mudar legendas",
@@ -1240,7 +1245,7 @@
         "help": "Ajuda",
         "hideWhiteboard": "Esconder quadro branco",
         "invite": "Convidar pessoas",
-        "joinBreakoutRoom": "Entrar na sala",
+        "joinBreakoutRoom": "Entar na sala",
         "laugh": "Risos",
         "leaveBreakoutRoom": "Sair da sala",
         "leaveConference": "Sair da reunião",

lang/main-ptBR.json

@@ -11,7 +11,6 @@
         "defaultEmail": "Seu email padrão",
         "disabled": "Você não pode convidar pessoas.",
         "failedToAdd": "Falha em adicionar participantes",
-        "footerText": "Discagem está desativada.",
         "googleEmail": "Email Google",
         "inviteMoreHeader": "Você é o único na reunião",
         "inviteMoreMailSubject": "Entre na reunião {{appName}}",
@@ -31,6 +30,7 @@
     },
     "audioDevices": {
         "bluetooth": "Bluetooth",
+        "car": "Áudio do carro",
         "headphones": "Fones de ouvido",
         "none": "Sem dispositivos de áudio disponível",
         "phone": "Celular",
@@ -39,6 +39,25 @@
     "audioOnly": {
         "audioOnly": "Largura de banda baixa"
     },
+    "breakoutRooms": {
+        "actions": {
+            "add": "Adicionar sala de apoio",
+            "autoAssign": "Atribuir a salas de apoio automaticamente",
+            "close": "Fechar",
+            "join": "Participar",
+            "leaveBreakoutRoom": "Sair da sala de apoio",
+            "more": "Mais",
+            "remove": "Remover",
+            "sendToBreakoutRoom": "Enviar participante para:"
+        },
+        "defaultName": "Sala de apoio #{{index}}",
+        "mainRoom": "Sala principal",
+        "notifications": {
+            "joined": "Entrando na sala de apoio \"{{name}}\"",
+            "joinedMainRoom": "Entrando na sala principal",
+            "joinedTitle": "Salas de apoio"
+        }
+    },
     "calendarSync": {
         "addMeetingURL": "Adicionar um link da reunião",
         "confirmAddLink": "Gostaria de adicionar um link do Jitsi a esse evento?",
@@ -57,15 +76,27 @@
         "refresh": "Atualizar calendário",
         "today": "Hoje"
     },
+    "carmode": {
+        "actions": {
+            "selectSoundDevice": "Selecionar dispositivo de som"
+        },
+        "labels": {
+            "buttonLabel": "Modo carro",
+            "title": "Modo carro",
+            "videoStopped": "Seu vídeo está parado"
+        }
+    },
     "chat": {
         "enter": "Entrar no bate-papo",
         "error": "Erro: sua mensagem não foi enviada. Motivo: {{error}}",
         "fieldPlaceHolder": "Digite sua mensagem aqui",
+        "lobbyChatMessageTo": "Mensagem para {{recipient}}",
         "message": "Mensagem",
         "messageAccessibleTitle": "{{user}} disse:",
         "messageAccessibleTitleMe": "Você disse:",
         "messageTo": "Mensagem privada para {{recipient}}",
         "messagebox": "Digite uma mensagem",
+        "newMessages": "Novas mensagens",
         "nickname": {
             "popover": "Escolha um apelido",
             "title": "Digite um apelido para usar o bate-papo",
@@ -85,6 +116,7 @@
     },
     "chromeExtensionBanner": {
         "buttonText": "Instalar extensão do Chrome",
+        "buttonTextEdge": "Instalar extensão do Edge",
         "close": "Fechar",
         "dontShowAgain": "Não me mostre isso de novo",
         "installExtensionText": "Instale a extensão para integrar com Google Calendar e Office 365"
@@ -115,6 +147,7 @@
         "bridgeCount": "Servidores: ",
         "codecs": "Codecs (A/V): ",
         "connectedTo": "Conectado a:",
+        "e2eeVerified": "Verificado via E2EE",
         "framerate": "Taxa de quadros:",
         "less": "Mostrar menos",
         "localaddress": "Endereço local:",
@@ -123,6 +156,7 @@
         "localport_plural": "Portas locais:",
         "maxEnabledResolution": "envio máx",
         "more": "Mostrar mais",
+        "no": "não",
         "packetloss": "Perda de pacote:",
         "participant_id": "Id participante:",
         "quality": {
@@ -141,7 +175,8 @@
         "status": "Conexão:",
         "transport": "Transporte:",
         "transport_plural": "Transportes:",
-        "video_ssrc": "Video SSRC:"
+        "video_ssrc": "Video SSRC:",
+        "yes": "sim"
     },
     "dateUtils": {
         "earlier": "Mais cedo",
@@ -151,14 +186,23 @@
     "deepLinking": {
         "appNotInstalled": "Você precisa do aplicativo móvel {{app}} para participar da reunião no seu telefone.",
         "description": "Nada acontece? Estamos tentando iniciar sua reunião no aplicativo desktop {{app}}. Tente novamente ou inicie ele na aplicação web {{app}}.",
+        "descriptionNew": "Nada aconteceu? Tentamos iniciar sua reunião no aplicativo de desktop {{app}}. <br /><br /> Você pode tentar novamente ou abrir pela web.",
         "descriptionWithoutWeb": "Nada aconteceu? Tentamos iniciar sua reunião no aplicativo de desktop {{app}}.",
         "downloadApp": "Baixe o Aplicativo",
+        "downloadMobileApp": "Baixar o app",
         "ifDoNotHaveApp": "Se você não tem o app ainda:",
         "ifHaveApp": "Se você já tem o app:",
         "joinInApp": "Entrar na reunião usando o app",
+        "joinInAppNew": "Entrar usando o app",
+        "joinInBrowser": "Entrar usando o navegador",
+        "launchMeetingLabel": "Como deseja entrar nesta reunião?",
         "launchWebButton": "Iniciar na web",
+        "noMobileApp": "Não tem o app?",
+        "termsAndConditions": "Ao continuar você estará aceitando nossos <a href='{{termsAndConditionsLink}}' rel='noopener noreferrer' target='_blank'>termos e condições.</a>",
         "title": "Iniciando sua reunião no {{app}}...",
-        "tryAgainButton": "Tente novamente no desktop"
+        "titleNew": "Iniciando sua reunião ...",
+        "tryAgainButton": "Tente novamente no desktop",
+        "unsupportedBrowser": "Parece que você está usando um navegador ao qual não temos suporte."
     },
     "defaultLink": "ex.: {{url}}",
     "defaultNickname": "ex.: João Pedro",
@@ -169,11 +213,20 @@
         "microphonePermission": "Erro ao obter permissão para o microfone"
     },
     "deviceSelection": {
+        "hid": {
+            "callControl": "Controle de chamada",
+            "connectedDevices": "Dispositivos conectados:",
+            "deleteDevice": "Remover dispositivo",
+            "pairDevice": "Emparelhar dispositivo"
+        },
         "noPermission": "Permissão não concedida",
         "previewUnavailable": "Visualização indisponível",
         "selectADevice": "Selecione um dispositivo",
         "testAudio": "Tocar um som de teste"
     },
+    "dialIn": {
+        "screenTitle": "Sumário de discagem"
+    },
     "dialOut": {
         "statusMessage": "está agora {{status}}"
     },
@@ -189,9 +242,13 @@
         "WaitingForHostTitle": "Esperando o anfitrião...",
         "Yes": "Sim",
         "accessibilityLabel": {
-            "liveStreaming": "Transmissão ao vivo"
+            "close": "Fechar janela",
+            "liveStreaming": "Transmissão ao vivo",
+            "sharingTabs": "Opções de compartilhamento"
         },
         "add": "Adicionar",
+        "addMeetingNote": "Adicionar uma anotação para esta reunião",
+        "addOptionalNote": "Adicionar uma anotação (opcional):",
         "allow": "Permitir",
         "alreadySharedVideoMsg": "Outro participante já está compartilhando um vídeo. Esta conferência permite apenas um vídeo compartilhado por vez.",
         "alreadySharedVideoTitle": "Somente um vídeo compartilhado é permitido por vez",
@@ -233,6 +290,7 @@
         "gracefulShutdown": "Nosso serviço está em manutenção. Tente novamente mais tarde.",
         "grantModeratorDialog": "Tem certeza que quer participar como moderador da reunião?",
         "grantModeratorTitle": "Permitir moderador",
+        "hide": "Ocultar",
         "hideShareAudioHelper": "Não mostre este diálogo novamente",
         "incorrectPassword": "Usuário ou senha incorretos",
         "incorrectRoomLockPassword": "Senha incorreta",
@@ -243,9 +301,10 @@
         "kickParticipantDialog": "Tem certeza de que deseja remover este participante?",
         "kickParticipantTitle": "Remover este participante?",
         "kickTitle": "{{participantDisplayName}} removeu você da reunião",
+        "linkMeeting": "Vincular reunião",
+        "linkMeetingTitle": "Vincular reunião ao Salesforce",
         "liveStreaming": "Transmissão ao Vivo",
         "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Não é possível transmitir enquanto a gravação está ativa",
-        "liveStreamingDisabledTooltip": "Iniciar transmissão ao vivo desativada.",
         "localUserControls": "Controles de usuários locais",
         "lockMessage": "Falha ao bloquear a conferência.",
         "lockRoom": "Adicionar reunião $t(lockRoomPasswordUppercase)",
@@ -279,11 +338,11 @@
         "muteEveryonesVideoTitle": "Desativar a câmera de todos?",
         "muteParticipantBody": "Você não está habilitado para tirar o mudo deles, mas eles podem tirar o mudo deles mesmos a qualquer tempo.",
         "muteParticipantButton": "Mudo",
-        "muteParticipantDialog": "Tem certeza de que deseja silenciar este participante? Você não poderá desfazer isso, mas o participante pode reabilitar o áudio a qualquer momento.",
-        "muteParticipantTitle": "Deixar mudo este participante?",
         "muteParticipantsVideoBody": "Você não poderá reativar posteriormente, mas o participante pode ativar sua própria câmera a qualquer momento.",
+        "muteParticipantsVideoBodyModerationOn": "Você e o participante não poderão reativar a câmera posteriormente.",
         "muteParticipantsVideoButton": "Desativar a câmera",
         "muteParticipantsVideoDialog": "Tem certeza de que deseja desativar a câmera deste participante? Você não poderá reativar posteriormente, mas o participante pode ativar sua própria câmera a qualquer momento.",
+        "muteParticipantsVideoDialogModerationOn": "Tem certeza de que deseja desativar a câmera deste participante? Você e o participante não poderão reativar posteriormente.",
         "muteParticipantsVideoTitle": "Desativar a câmera deste participante?",
         "noDropboxToken": "Nenhum token do Dropbox válido",
         "password": "Senha",
@@ -297,9 +356,9 @@
         "popupError": "Seu navegador está bloqueando janelas popup deste site. Habilite os popups nas configurações de segurança no seu navegador e tente novamente.",
         "popupErrorTitle": "Popup bloqueado",
         "readMore": "mais...",
+        "recentlyUsedObjects": "Seus objetos usados recentemente",
         "recording": "Gravando",
         "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Não é possível transmitir enquanto a gravação está ativa",
-        "recordingDisabledTooltip": "Iniciar gravação desativada.",
         "rejoinNow": "Reconectar agora",
         "remoteControlAllowedMessage": "{{user}} aceitou sua requisição de controle remoto!",
         "remoteControlDeniedMessage": "{{user}} rejeitou sua requisição de controle remoto!",
@@ -319,6 +378,12 @@
         "screenSharingFailed": "Oops! Alguma coisa de errado aconteceu, não é possível habilitar o compartilhamento de tela!",
         "screenSharingFailedTitle": "Falha ao compartilhar a tela!",
         "screenSharingPermissionDeniedError": "Oops! Alguma coisa está errada com suas permissões de compartilhamento de tela. Recarregue e tente de novo.",
+        "searchInSalesforce": "Pesquisar no Salesforce",
+        "searchResults": "Resultados da pesquisa({{count}})",
+        "searchResultsDetailsError": "Algo de errado ocorreu ao recuperar os dados do proprietário.",
+        "searchResultsError": "Algo de errado ocorreu ao recuperar os dados.",
+        "searchResultsNotFound": "A pesquisa não trouxe resultados.",
+        "searchResultsTryAgain": "Tente usar termos diferentes.",
         "sendPrivateMessage": "Você enviou uma mensagem privada recentemente. Tem intenção de responder em privado, ou deseja enviar sua mensagem para o grupo?",
         "sendPrivateMessageCancel": "Enviar para o grupo",
         "sendPrivateMessageOk": "Enviar em privado",
@@ -341,7 +406,10 @@
         "shareVideoTitle": "Compartilhar um vídeo",
         "shareYourScreen": "Compartilhar sua tela",
         "shareYourScreenDisabled": "Compartilhamento de tela desativada.",
+        "sharedVideoDialogError": "Erro: URL inválida",
         "sharedVideoLinkPlaceholder": "link do YouTube ou link direto de vídeo",
+        "show": "Exibir",
+        "start": "Iniciar ",
         "startLiveStreaming": "Iniciar transmissão ao vivo",
         "startRecording": "Iniciar gravação",
         "startRemoteControlErrorMessage": "Um erro ocorreu enquanto tentava iniciar uma sessão de controle remoto!",
@@ -359,6 +427,10 @@
         "user": "Usuário",
         "userIdentifier": "identificação do usuário",
         "userPassword": "senha do usuário",
+        "verifyParticipantConfirm": "Coincidem",
+        "verifyParticipantDismiss": "Não coincidem",
+        "verifyParticipantQuestion": "EXPERIMENTAL: Pergunta ao participante {{participantName}} se ele vê o mesmo conteúdo na mesma ordem.",
+        "verifyParticipantTitle": "Verificação de usuário",
         "videoLink": "Link do vídeo",
         "viewUpgradeOptions": "Ver opções de atualização",
         "viewUpgradeOptionsContent": "Para obter acesso ilimitado a recursos premium tais como gravação, transcrição, streaming RTMP e muito mais, você precisa atualizar seu plano.",
@@ -384,8 +456,14 @@
         "veryBad": "Muito ruim",
         "veryGood": "Muito boa"
     },
-    "helpView": {
-        "title": "Centro de ajuda"
+    "filmstrip": {
+        "accessibilityLabel": {
+            "heading": "Miniaturas de vídeo"
+        }
+    },
+    "giphy": {
+        "noResults": "Nenhum resultado encontrado :(",
+        "search": "Buscar GIPHY"
     },
     "incomingCall": {
         "answer": "Responder",
@@ -427,9 +505,11 @@
         "noRoom": "Nenhuma sala foi especificada para entrar.",
         "numbers": "Números de discagem",
         "password": "$t(lockRoomPasswordUppercase):",
+        "reachedLimit": "Você atingiu o limite do seu plano.",
         "sip": "endereço SIP",
         "title": "Compartilhar",
-        "tooltip": "Compartilhar link e discagem para esta reunião"
+        "tooltip": "Compartilhar link e discagem para esta reunião",
+        "upgradeOptions": "Por favor, verifique as opções de upgrade em"
     },
     "inlineDialogFailure": {
         "msg": "Tivemos um pequeno problema.",
@@ -450,6 +530,7 @@
         "focusLocal": "Focar no seu vídeo",
         "focusRemote": "Focar no vídeo de outro participante",
         "fullScreen": "Entrar ou sair da tela cheia",
+        "giphyMenu": "Alternar menu do GIPHY",
         "keyboardShortcuts": "Atalhos de teclado",
         "localRecording": "Mostrar ou ocultar controles de gravação local",
         "mute": "Deixar mudo ou não o microfone",
@@ -463,6 +544,10 @@
         "toggleShortcuts": "Mostrar ou ocultar atalhos de teclado",
         "videoMute": "Iniciar ou parar sua câmera"
     },
+    "largeVideo": {
+        "screenIsShared": "Você está compartilhando sua tela",
+        "showMeWhatImSharing": "Me mostre o que estou compartilhando"
+    },
     "liveStreaming": {
         "busy": "Estamos trabalhando para liberar os recursos de transmissão. Tente novamente em alguns minutos.",
         "busyTitle": "Todas as transmissões estão atualmente ocupadas",
@@ -479,6 +564,7 @@
         "failedToStart": "Falha ao iniciar a transmissão ao vivo",
         "getStreamKeyManually": "Não conseguimos buscar nenhuma transmissão ao vivo. Tente obter sua chave de transmissão ao vivo no YouTube.",
         "googlePrivacyPolicy": "Política de Privacidade do Google",
+        "inProgress": "Gravação ou live streaming em andamento",
         "invalidStreamKey": "A senha para transmissão ao vivo pode estar incorreta.",
         "limitNotificationDescriptionNative": "Sua transmissão será limitada a {{limit}} minutos. Para transmissão ilimitada tente {{app}}.",
         "limitNotificationDescriptionWeb": "Devido a alta demanda sua transmissão será limitada a {{limit}} minutos. Para transmissão ilimitada tente <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
@@ -488,6 +574,7 @@
         "onBy": "{{name}} iniciou a transmissão ao vivo",
         "pending": "Iniciando Transmissão ao Vivo...",
         "serviceName": "Serviço de Transmissão ao Vivo",
+        "sessionAlreadyActive": "Esta sessão já está sendo gravada ou em live streaming.",
         "signIn": "Faça login no Google",
         "signInCTA": "Faça login ou insira sua chave de transmissão ao vivo do YouTube.",
         "signOut": "Sair",
@@ -501,8 +588,8 @@
     "lobby": {
         "admit": "Aceitar",
         "admitAll": "Aceitar todos",
-        "allow": "Permitir",
         "backToKnockModeButton": "Sem senha, peça para se juntar",
+        "chat": "Chat",
         "dialogTitle": "Modo sala de espera",
         "disableDialogContent": "O modo sala de espera está habilitado. Este recurso evita que particpantes não convidados juntem-se à sua conferência. Deseja desabilitar?",
         "disableDialogSubmit": "Desabilitar",
@@ -515,6 +602,7 @@
         "errorMissingPassword": "Por favor informe a senha da conferência",
         "invalidPassword": "Senha inválida",
         "joinRejectedMessage": "Sua solicitação de participação foi rejeitada pelo moderador.",
+        "joinRejectedTitle": "Solicitação de participação recusada",
         "joinTitle": "Junte-se à conferência",
         "joinWithPasswordMessage": "Tentando entrar com a senha, por favor aguarde...",
         "joiningMessage": "Você se juntará à conferência tão logo alguém aprove sua solicitação",
@@ -523,6 +611,8 @@
         "knockButton": "Peça para participar",
         "knockTitle": "Alguém deseja participar da conferência",
         "knockingParticipantList": "Remover lista de participantes",
+        "lobbyChatStartedNotification": "{{moderator}} iniciou uma conversa na sala de espera com {{attendee}}",
+        "lobbyChatStartedTitle": "{{moderator}} iniciou uma conversa na sala de espera com você.",
         "nameField": "Informe seu nome",
         "notificationLobbyAccessDenied": "{{targetParticipantName}} foi rejeitado por {{originParticipantName}}",
         "notificationLobbyAccessGranted": "{{targetParticipantName}} foi aceito por {{originParticipantName}}",
@@ -560,6 +650,7 @@
         "no": "Não",
         "participant": "Participante",
         "participantStats": "Estatísticas dos Participantes",
+        "selectTabTitle": "🎥 Por favor selecione esta aba para gravar",
         "sessionToken": "Token de Sessão",
         "start": "Iniciar gravação",
         "stop": "Parar a Gravação",
@@ -576,18 +667,39 @@
         "OldElectronAPPTitle": "Vulnerabilidade de segurança!",
         "allowAction": "Permitir",
         "allowedUnmute": "Você pode religar seu microfone, ativar sua câmera ou compartilhar sua tela.",
+        "audioUnmuteBlockedDescription": "A liberação do microfone foi temporariamente bloqueada devido a limites do sistema.",
+        "audioUnmuteBlockedTitle": "Microfone bloqueado!",
+        "chatMessages": "Mensagens do chat",
         "connectedOneMember": "{{name}} entrou na reunião",
         "connectedThreePlusMembers": "{{name}} e outros {{count}} entraram na reunião",
         "connectedTwoMembers": "{{first}} e {{second}} entraram na reunião",
+        "dataChannelClosed": "Qualidade do vídeo prejudicada",
+        "dataChannelClosedDescription": "O canal da ponte foi desconectado, assim a qualidade do vídeo foi limitada a sua configuração mais baixa.",
+        "disabledIframe": "Incorporação destina-se apenas a fins de demonstração, assim esta chamada será desconectada em {{timeout}} minutos.",
         "disconnected": "desconectado",
+        "displayNotifications": "Exibir notificações para",
+        "dontRemindMe": "Não me lembrar",
         "focus": "Foco da conferência",
         "focusFail": "{{component}} não disponível - tente em {{ms}} seg",
+        "gifsMenu": "GIPHY",
         "groupTitle": "Notificações",
         "hostAskedUnmute": "O anfitrião deseja que você ative o som",
         "invitedOneMember": "{{name}} foi convidado(a)",
         "invitedThreePlusMembers": "{{name}} e {{count}} outros foram convidados",
         "invitedTwoMembers": "{{first}} e {{second}} foram convidados",
+        "joinMeeting": "Participar",
         "kickParticipant": "{{kicked}} foi removido por {{kicker}}",
+        "leftOneMember": "{{name}} saiu da reunião",
+        "leftThreePlusMembers": "{{name}} e muitos outros saíram da reunião",
+        "leftTwoMembers": "{{first}} e {{second}} saíram da reunião",
+        "linkToSalesforce": "Link para Salesforce",
+        "linkToSalesforceDescription": "Você pode vincular o sumário da reunião a um objeto do Salesforce.",
+        "linkToSalesforceError": "Falha ao vincular reunião ao Salesforce",
+        "linkToSalesforceKey": "Vincular esta reunião",
+        "linkToSalesforceProgress": "Vinculando reunião ao Salesforce...",
+        "linkToSalesforceSuccess": "A reunião foi vinculada ao Salesforce",
+        "localRecordingStarted": "{{name}} iniciou uma gravação local.",
+        "localRecordingStopped": "{{name}} parou uma gravação local.",
         "me": "Eu",
         "moderationInEffectCSDescription": "Levante a mão se quiser compartilhar seu vídeo",
         "moderationInEffectCSTitle": "O compartilhamento de conteúdo foi desativado pelo moderador",
@@ -608,16 +720,27 @@
         "newDeviceAction": "Usar",
         "newDeviceAudioTitle": "Novo dispositivo de áudio detectado",
         "newDeviceCameraTitle": "Nova câmera detectada",
+        "noiseSuppressionDesktopAudioDescription": "A supressão de ruído não pode ser habilitada enquanto compartilha o áudio da área de trabalho. Por favor desabilite e tente novamente.",
+        "noiseSuppressionFailedTitle": "Falha ao iniciar a supressão de ruído",
+        "noiseSuppressionNoTrackDescription": "Por favor ative o microfone antes.",
+        "noiseSuppressionStereoDescription": "Supressão de ruído de áudio estéreo não é suportado no momento.",
         "oldElectronClientDescription1": "Você está usando um versão antiga do cliente Jitsi Meet que possui uma conhecida vulnerabilidade de segurança. Por favor tenha certeza de atulizar para a nossa ",
         "oldElectronClientDescription2": "última versão",
         "oldElectronClientDescription3": " agora!",
+        "participantWantsToJoin": "Deseja entrar na reunião",
+        "participantsWantToJoin": "Desejam entrar na reunião",
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) removido por outro participante",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) definido por outro participante",
         "raiseHandAction": "Levantar a mão",
         "raisedHand": "{{name}} gostaria de falar.",
+        "raisedHands": "{{participantName}} e {{raisedHands}} outras pessoas",
         "reactionSounds": "Desabilitar sons",
+        "reactionSoundsForAll": "Desabilitar sons para todos",
         "screenShareNoAudio": "O compartilhamento de áudio não foi selecionado na tela de escolha de janela.",
         "screenShareNoAudioTitle": "Compartilhamento de áudio não selecionado",
+        "screenSharingAudioOnlyDescription": "Por favor perceba que ao compartilhar sua tela você estará afetando o modo de \"Melhor performance\" e irá usar mais banda de rede.",
+        "screenSharingAudioOnlyTitle": "Modo de \"Melhor performance\"",
+        "selfViewTitle": "Você pode habilitar a auto-visualização nas configurações a qualquer momento",
         "somebody": "Alguém",
         "startSilentDescription": "Volte à reunião para habilitar o áudio",
         "startSilentTitle": "Você entrou sem saída de áudio!",
@@ -625,7 +748,11 @@
         "suboptimalExperienceTitle": "Alerta do navegador",
         "unmute": "Ativar som",
         "videoMutedRemotelyDescription": "Você pode ativar sua câmera a qualquer momento.",
-        "videoMutedRemotelyTitle": "Sua câmera foi desativada por {{participantDisplayName}}!"
+        "videoMutedRemotelyTitle": "Sua câmera foi desativada por {{participantDisplayName}}!",
+        "videoUnmuteBlockedDescription": "A liberação da câmera e compartilhamento de tela foram temporariamente bloqueados devido a limites do sistema.",
+        "videoUnmuteBlockedTitle": "Câmera e compartilhamento de tela bloqueados!",
+        "viewLobby": "Ver sala de espera",
+        "waitingParticipants": "{{waitingParticipants}} pessoas"
     },
     "participantsPane": {
         "actions": {
@@ -635,6 +762,9 @@
             "audioModeration": "Reativarem seus sons",
             "blockEveryoneMicCamera": "Bloquear microfone e câmera de todos",
             "invite": "Convidar alguém",
+            "moreModerationActions": "Mais opções de moderação",
+            "moreModerationControls": "Mais controles de moderação",
+            "moreParticipantOptions": "Mais opções de participante",
             "mute": "Silenciar",
             "muteAll": "Silenciar todos",
             "muteEveryoneElse": "Silenciar todos os demais",
@@ -647,17 +777,22 @@
         "headings": {
             "lobby": "Sala de espera ({{count}})",
             "participantsList": "Participantes da reunião ({{count}})",
+            "visitors": "Visitantes ({{count}})",
             "waitingLobby": "Aguardando na sala de espera ({{count}})"
         },
+        "search": "Buscar participantes",
         "title": "Participantes"
     },
     "passwordDigitsOnly": "Até {{number}} dígitos",
     "passwordSetRemotely": "Definido por outro participante",
+    "pinParticipant": "{{participantName}} - Fixar",
+    "pinnedParticipant": "O participante está fixado",
     "polls": {
         "answer": {
             "skip": "Desistir",
             "submit": "Enviar"
         },
+        "by": "Por {{ name }}",
         "create": {
             "addOption": "Adicionar opção",
             "answerPlaceholder": "Opção {{index}}",
@@ -728,15 +863,18 @@
         "initiated": "Chamada iniciada",
         "joinAudioByPhone": "Participar com o áudio via ligação",
         "joinMeeting": "Participar da reunião",
+        "joinMeetingInLowBandwidthMode": "Participar no modo de banda baixa",
         "joinWithoutAudio": "Participar sem áudio",
         "keyboardShortcuts": "Habilitar atalhos de teclado",
         "linkCopied": "Link copiado para a área de transferência",
         "lookGood": "Seu microfone está funcionando corretamente",
         "or": "ou",
         "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:",
         "videoTrackError": "Não é possível criar faixa de vídeo.",
         "viewAllNumbers": "veja todos os números"
@@ -763,6 +901,19 @@
         "title": "Perfil"
     },
     "raisedHand": "Gostaria de falar",
+    "raisedHandsLabel": "Número de mãos levantadas",
+    "record": {
+        "already": {
+            "linked": "A reunião já está vinculada a este objeto do Salesforce"
+        },
+        "type": {
+            "account": "Conta",
+            "contact": "Contato",
+            "lead": "Lead",
+            "opportunity": "Oportunidade",
+            "owner": "Proprietário"
+        }
+    },
     "recording": {
         "authDropboxText": "Enviar para o Dropbox",
         "availableSpace": "Espaço disponível: {{spaceLeft}} MB (aproximadamente {{duration}} minutos de gravação)",
@@ -777,37 +928,66 @@
         "expandedPending": "Iniciando gravação...",
         "failedToStart": "Falha ao iniciar a gravação",
         "fileSharingdescription": "Compartilhar gravação com participantes da reunião",
+        "highlight": "Destaque",
+        "highlightMoment": "Momento de destaque",
+        "highlightMomentDisabled": "Você pode destacar momentos quando a gravação começar",
+        "highlightMomentSuccess": "Momento destacado",
+        "highlightMomentSucessDescription": "Seu momento destacado será adicionado ao sumário da reunião.",
+        "inProgress": "Gravação ou live streaming em andamento",
         "limitNotificationDescriptionNative": "Devido a demanda, sua gravação ficará limitada a {{limit}} minutos. Para gravação ilimitada tente <3>{{app}}</3>.",
         "limitNotificationDescriptionWeb": "Devido a demanda, sua gravação ficará limitada a {{limit}} minutos. Para gravação ilimitada tente <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
         "linkGenerated": "Geramos um link para sua gravação.",
         "live": "AOVIVO",
+        "localRecordingNoNotificationWarning": "A gravação não será anunciada aos outros participantes. Você precisará avisá-los que a reunião está sendo gravada.",
+        "localRecordingNoVideo": "O vídeo não está sendo gravado",
+        "localRecordingStartWarning": "Por favor, certifique-se de ter parado a gravação antes de sair da reunião para garantir que será salva.",
+        "localRecordingStartWarningTitle": "Parar a gravação para salvá-la",
+        "localRecordingVideoStop": "Ao parar o seu vídeo a gravação local também será parada. Tem certeza que deseja continuar?",
+        "localRecordingVideoWarning": "Para gravar o seu vídeo você precisa ativá-lo antes de inicar a gravação",
+        "localRecordingWarning": "Tenha certeza de selecionar a aba atual para usar o áudio e vídeo corretos. A gravação está atualmente limitada a 1GB, que corresponde a aproximadamente 100 minutos.",
         "loggedIn": "Conectado como {{userName}}",
+        "noMicPermission": "Trilha para o microfone não pôde ser criada. Por favor conceda permissão para usar o microfone.",
+        "noStreams": "Nenhum fluxo de áudio ou vídeo detectado.",
         "off": "Gravação parada",
         "offBy": "{{name}} parou a gravação",
         "on": "Gravando",
         "onBy": "{{name}} iniciou a gravação",
+        "onlyRecordSelf": "Gravar apenas o meu fluxo de áudio e vídeo",
         "pending": "Preparando para gravar a reunião...",
         "rec": "REC",
+        "saveLocalRecording": "Salvar o arquivo de gravação localmente (Beta)",
         "serviceDescription": "Sua gravação será salva pelo serviço de gravação",
         "serviceDescriptionCloud": "Gravação na nuvem",
+        "serviceDescriptionCloudInfo": "Reuniões gravadas são removidas automaticamente 24h após a hora da gravação.",
         "serviceName": "Serviço de gravação",
+        "sessionAlreadyActive": "Esta sessão já está sendo gravada ou em live streaming",
         "signIn": "Entrar",
         "signOut": "Sair",
+        "surfaceError": "Por favor selecione a aba atual.",
         "title": "Gravando",
         "unavailable": "Oops! O {{serviceName}} está indisponível. Estamos trabalhando para resolver o problema. Por favor, tente mais tarde.",
         "unavailableTitle": "Gravação indisponível",
         "uploadToCloud": "Enviar para a nuvem"
     },
+    "screenshareDisplayName": "Tela: {{name}}",
     "sectionList": {
         "pullToRefresh": "Puxe para atualizar"
     },
     "security": {
-        "about": "Voce pode adicionar $t(lockRoomPassword) a sua reunião. Participantes terão que fornecer $t(lockRoomPassword) antes de entrar na reunião.",
+        "about": "Você pode adicionar $t(lockRoomPassword) a sua reunião. Participantes terão que fornecer $t(lockRoomPassword) antes de entrar na reunião.",
         "aboutReadOnly": "Moderadores podem adicionar $t(lockRoomPassword) à reunião. Participantes terão que fornecer $t(lockRoomPassword) antes de entrar na reunião.",
-        "insecureRoomNameWarning": "A sala é insegura. Participantes não desejados podem entrar na reunião. Considere adicionar seguança no botão segurança.",
-        "securityOptions": "Opções de segurança"
+        "insecureRoomNameWarningNative": "O nome da sala é não é seguro. Participantes não desejados podem ingressar na reunião. {{recommendAction}} Saiba mais sobre como proteger sua reunião ",
+        "insecureRoomNameWarningWeb": "O nome da sala é não é seguro. Participantes não desejados podem ingressar na reunião. {{recommendAction}} Saiba mais sobre como proteger sua reunião <a href=\"{{securityUrl}}\" rel=\"security\" target=\"_blank\">aqui</a>.",
+        "title": "Opções de segurança",
+        "unsafeRoomActions": {
+            "meeting": "Considere usar o botão de segurança para proteger sua reunião.",
+            "prejoin": "Considere usar um nome de reunião não-comum.",
+            "welcome": "Considere usar um nome de reunião não-comum ou selecione um das sugestões."
+        }
     },
     "settings": {
+        "audio": "Áudio",
+        "buttonLabel": "Configurações",
         "calendar": {
             "about": "A integração do calendário {{appName}} é usada para acessar com segurança o seu calendário para que ele possa ler os próximos eventos.",
             "disconnect": "Desconectar",
@@ -824,25 +1004,32 @@
         "incomingMessage": "Mensagem recebida",
         "language": "Idioma",
         "loggedIn": "Conectado como {{name}}",
+        "maxStageParticipants": "Número máximo de participantes que podem ser fixados no palco principal (EXPERIMENTAL)",
         "microphones": "Microfones",
         "moderator": "Moderador",
+        "moderatorOptions": "Opções de moderador",
         "more": "Mais",
         "name": "Nome",
         "noDevice": "Nenhum",
-        "participantJoined": "Participante Entrou",
-        "participantLeft": "Participante Saiu",
+        "notifications": "Notificações",
+        "participantJoined": "Participante entrou",
+        "participantKnocking": "Participante entrou na sala de espera",
+        "participantLeft": "Participante saiu",
         "playSounds": "Tocar sons",
         "reactions": "Reações da reunião",
         "sameAsSystem": "Igual ao sistema ({{label}})",
         "selectAudioOutput": "Saída de áudio",
         "selectCamera": "Câmera",
         "selectMic": "Microfone",
-        "sounds": "Sons",
+        "selfView": "Auto-visualização",
+        "shortcuts": "Atalhos",
         "speakers": "Alto-faltantes",
         "startAudioMuted": "Todos iniciam mudos",
+        "startReactionsMuted": "Silenciar sons de reações para todos",
         "startVideoMuted": "Todos iniciam ocultos",
         "talkWhileMuted": "Falar mesmo silenciado",
-        "title": "Configurações"
+        "title": "Configurações",
+        "video": "Vídeo"
     },
     "settingsView": {
         "advanced": "Avançado",
@@ -857,13 +1044,21 @@
         "disableCrashReportingWarning": "Tem certeza eue quer desabilitar o aviso de falha? A opção será habilitada após reiniciar o app.",
         "disableP2P": "Desativar modo ponto a ponto",
         "displayName": "Nome de exibição",
+        "displayNamePlaceholderText": "Ex: João Silva",
         "email": "Email",
+        "emailPlaceholderText": "email@exemplo.com.br",
+        "goTo": "Ir para",
         "header": "Configurações",
+        "help": "Ajuda",
+        "links": "Links",
+        "privacy": "Privacidade",
         "profileSection": "Perfil",
         "serverURL": "URL do servidor",
         "showAdvanced": "Mostrar configurações avançadas",
+        "startCarModeInLowBandwidthMode": "Iniciar modo carro em modo de banda baixa",
         "startWithAudioMuted": "Iniciar sem áudio",
         "startWithVideoMuted": "Iniciar sem vídeo",
+        "terms": "Termos",
         "version": "Versão"
     },
     "share": {
@@ -872,13 +1067,21 @@
     },
     "speaker": "Alto-falantes",
     "speakerStats": {
+        "angry": "Zangado",
+        "disgusted": "Com nojo",
+        "displayEmotions": "Exibir emoções",
+        "fearful": "Com medo",
+        "happy": "Feliz",
         "hours": "{{count}}h",
         "minutes": "{{count}}m",
         "name": "Nome",
+        "neutral": "Neutro",
+        "sad": "Triste",
         "search": "Busca",
         "seconds": "{{count}}s",
-        "speakerStats": "Estatísticas do Apresentador",
-        "speakerTime": "Tempo do Apresentador"
+        "speakerStats": "Estatísticas do apresentador",
+        "speakerTime": "Tempo do apresentador",
+        "surprised": "Surpreso"
     },
     "startupoverlay": {
         "genericTitle": "A reunião precisa usar seu microfone e câmera.",
@@ -890,6 +1093,10 @@
         "text": "Pressione o botão <i>Reentrar</i> para reconectar.",
         "title": "Sua chamada de vídeo foi interrompida, porque seu computador foi dormir."
     },
+    "termsView": {
+        "title": "Termos"
+    },
+    "toggleTopPanelLabel": "Alternar painel superior",
     "toolbar": {
         "Settings": "Configurações",
         "accessibilityLabel": {
@@ -897,60 +1104,89 @@
             "audioOnly": "Alternar para apenas áudio",
             "audioRoute": "Selecionar o dispositivo de som",
             "boo": "Vaia",
+            "breakoutRoom": "Entrar/sair da sala de apoio",
             "callQuality": "Gerenciar qualidade do vídeo",
+            "carmode": "Modo carro",
             "cc": "Alternar legendas",
             "chat": "Alternar para janela de chat",
             "clap": "Aplauso",
+            "closeChat": "Fechar chat",
+            "closeMoreActions": "Fechar o menu de mais ações",
+            "closeParticipantsPane": "Fechar painel de participantes",
             "collapse": "Recolher",
             "document": "Alternar para documento compartilhado",
+            "documentClose": "Fechar documento compartilhado",
+            "documentOpen": "Abrir documento compartilhado",
             "download": "Baixe nossos aplicativos",
             "embedMeeting": "Reunião em formato compacto",
+            "endConference": "Terminar para todos",
+            "enterFullScreen": "Ver em tela-cheia",
+            "enterTileView": "Entrar na visualização em blocos",
+            "exitFullScreen": "Sair da tela-cheia",
+            "exitTileView": "Sair da visualização em blocos",
             "expand": "Expandir",
             "feedback": "Deixar feedback",
             "fullScreen": "Alternar para tela cheia",
+            "giphy": "Alternar menu do GIPHY",
             "grantModerator": "Atribuir Moderador",
             "hangup": "Sair da chamada",
+            "heading": "Barra de ferramentas",
             "help": "Ajuda",
+            "hideWhiteboard": "Ocultar quadro branco",
             "invite": "Convidar pessoas",
             "kick": "Remover participante",
             "laugh": "Risada",
+            "leaveConference": "Sair da reunião",
             "like": "Gostei",
+            "linkToSalesforce": "Link com o Salesforce",
             "lobbyButton": "Habilitar/desabilitar sala de espera",
             "localRecording": "Alternar controles de gravação local",
             "lockRoom": "Ativar/desativar senha de reunião",
+            "lowerHand": "Abaixar a mão",
             "moreActions": "Alternar mais menu de ações",
             "moreActionsMenu": "Menu de mais ações",
             "moreOptions": "Mostrar mais opções",
             "mute": "Alternar mudo do áudio",
             "muteEveryone": "Silenciar todos",
             "muteEveryoneElse": "Silenciar todos os demais",
-            "muteEveryoneElsesVideo": "Desativar a câmera de todos os demais",
-            "muteEveryonesVideo": "Desativar a câmera de todos",
+            "muteEveryoneElsesVideoStream": "Parar o vídeo de todos os outros",
+            "muteEveryonesVideoStream": "Parar o vídeo de todos",
+            "muteGUMPending": "Conectando seu microfone",
+            "noiseSuppression": "Supressão de ruído",
+            "openChat": "Abrir chat",
             "participants": "Participantes",
             "pip": "Alternar modo Picture-in-Picture",
             "privateMessage": "Enviar mensagem privada",
             "profile": "Editar seu perfil",
             "raiseHand": "Alternar levantar a mão",
+            "reactions": "Reações",
             "reactionsMenu": "Abrir / fechar menu de reações",
             "recording": "Alternar gravação",
             "remoteMute": "Silenciar participante",
             "remoteVideoMute": "Desativar a câmera do participante",
             "security": "Opções de segurança",
             "selectBackground": "Selecionar Fundo",
+            "selfView": "Alternar auto-visualização",
             "shareRoom": "Convidar alguém",
             "shareYourScreen": "Alternar compartilhamento de tela",
             "shareaudio": "Compartilhar áudio",
             "sharedvideo": "Alternar compartilhamento de vídeo",
             "shortcuts": "Alternar atalhos",
             "show": "Mostrar no palco",
+            "showWhiteboard": "Exibir quadro branco",
             "silence": "Silenciar",
             "speakerStats": "Alternar estatísticas do apresentador",
+            "stopScreenSharing": "Parar de compartilhar sua tela",
+            "stopSharedVideo": "Parar vídeo",
             "surprised": "Surpresa",
             "tileView": "Alternar visualização em blocos",
             "toggleCamera": "Alternar câmera",
             "toggleFilmstrip": "Alterar tira de filme",
+            "unmute": "Ativar som",
             "videoblur": "Alternar desfoque de vídeo",
-            "videomute": "Alternar mudo do vídeo"
+            "videomute": "Alternar mudo do vídeo",
+            "videomuteGUMPending": "Conectando sua câmera",
+            "videounmute": "Ativar câmera"
         },
         "addPeople": "Adicionar pessoas à sua chamada",
         "audioOnlyOff": "Desabilitar modo de largura de banda baixa",
@@ -963,23 +1199,33 @@
         "chat": "Abrir ou fechar o bate-papo",
         "clap": "Aplauso",
         "closeChat": "Fechar chat",
+        "closeParticipantsPane": "Fechar painel de participantes",
         "closeReactionsMenu": "Fechar menu de reações",
+        "disableNoiseSuppression": "Desabilitar supressão de ruído",
         "disableReactionSounds": "Você pode desabilitar os sons de reação para esta reunião",
         "documentClose": "Fechar documento compartilhado",
         "documentOpen": "Abrir documento compartilhado",
         "download": "Baixe nossos aplicativos",
         "e2ee": "Encriptação ponto a ponto",
         "embedMeeting": "Reunião em formato compacto",
+        "enableNoiseSuppression": "Habilitar supressão de ruído",
+        "endConference": "Terminar para todos",
         "enterFullScreen": "Ver em tela cheia",
         "enterTileView": "Entrar em exibição de bloco",
         "exitFullScreen": "Sair da tela cheia",
         "exitTileView": "Sair de exibição de bloco",
         "feedback": "Deixar feedback",
+        "giphy": "Alternar menu do GIPHY",
         "hangup": "Sair",
         "help": "Ajuda",
+        "hideWhiteboard": "Ocultar quadro branco",
         "invite": "Convidar pessoas",
+        "joinBreakoutRoom": "Ingressar na sala de apoio",
         "laugh": "Risada",
+        "leaveBreakoutRoom": "Sair da sala de apoio",
+        "leaveConference": "Sair da reunião",
         "like": "Gostei",
+        "linkToSalesforce": "Link com o Salesforce",
         "lobbyButtonDisable": "Desabilitar sala de espera",
         "lobbyButtonEnable": "Habilitar sala de espera",
         "login": "Iniciar sessão",
@@ -990,11 +1236,13 @@
         "mute": "Mudo / Não mudo",
         "muteEveryone": "Silenciar todos",
         "muteEveryonesVideo": "Desativar a câmera de todos",
+        "muteGUMPending": "Conectando seu microfone",
         "noAudioSignalDesc": "Se você não o desativou propositalmente das configurações do sistema ou do hardware, considere trocar o dispositivo.",
         "noAudioSignalDescSuggestion": "Se você não o desativou propositalmente das configurações do sistema ou do hardware, considere trocar para o dispositivo sugerido.",
         "noAudioSignalDialInDesc": "Você também pode discar usando:",
         "noAudioSignalDialInLinkDesc": "Discar números",
         "noAudioSignalTitle": "Não há entrada de áudio vindo do seu microfone!",
+        "noiseSuppression": "Supressão de ruído",
         "noisyAudioInputDesc": "Parece que o microfone está fazendo barulho, considere silenciar ou alterar o dispositivo.",
         "noisyAudioInputTitle": "O seu microfone parece estar barulhento!",
         "openChat": "Abrir chat",
@@ -1011,12 +1259,14 @@
         "reactionLike": "Enviar reação de gostei",
         "reactionSilence": "Enviar reação de silêncio",
         "reactionSurprised": "Enviar reação de surpresa",
+        "reactions": "Reações",
         "security": "Opções de segurança",
         "selectBackground": "Selecionar fundo",
         "shareRoom": "Convidar alguém",
         "shareaudio": "Compartilhar áudio",
         "sharedvideo": "Compartilhar um vídeo",
         "shortcuts": "Ver atalhos",
+        "showWhiteboard": "Exibir quadro branco",
         "silence": "Silêncio",
         "speakerStats": "Estatísticas do Apresentador",
         "startScreenSharing": "Iniciar compart. de tela",
@@ -1029,8 +1279,11 @@
         "talkWhileMutedPopup": "Tentando falar? Você está em mudo.",
         "tileViewToggle": "Alternar visualização em blocos",
         "toggleCamera": "Alternar câmera",
+        "unmute": "Ativar som",
         "videoSettings": "Configurações de vídeo",
-        "videomute": "Iniciar ou parar a câmera"
+        "videomute": "Iniciar ou parar a câmera",
+        "videomuteGUMPending": "Conectando sua câmera",
+        "videounmute": "Ativar câmera"
     },
     "transcribing": {
         "ccButtonTooltip": "Iniciar/parar legendas",
@@ -1040,10 +1293,15 @@
         "labelToolTip": "A reunião esta sendo transcrita",
         "off": "Transcrição parada",
         "pending": "Preparando a transcrição da reunião...",
+        "sourceLanguageDesc": "No momento o idioma da reunião está definido para <b>{{sourceLanguage}}</b>. <br/> Você pode alterar-lo ",
+        "sourceLanguageHere": "aqui",
         "start": "Exibir legendas",
         "stop": "Não exibir legendas",
+        "subtitles": "Legendas",
+        "subtitlesOff": "Desativadas",
         "tr": "TR"
     },
+    "unpinParticipant": "{{participantName}} - Desafixar",
     "userMedia": {
         "androidGrantPermissions": "Selecione <b><i>Permitir</i></b> quando seu navegador perguntar pelas permissões.",
         "chromeGrantPermissions": "Selecione <b><i>Permitir</i></b> quando seu navegador perguntar pelas permissões.",
@@ -1067,20 +1325,26 @@
         "pending": "{{displayName}} foi convidado"
     },
     "videoStatus": {
+        "adjustFor": "Ajustar para:",
         "audioOnly": "AUD",
         "audioOnlyExpanded": "Você está em modo de banda baixa. Neste modo, se recebe somente áudio e compartilhamento de tela.",
+        "bestPerformance": "Melhor performance",
         "callQuality": "Qualidade de vídeo",
         "hd": "HD",
         "hdTooltip": "Ver vídeo em alta definição",
         "highDefinition": "Alta definição (HD)",
+        "highestQuality": "Alta qualidade",
         "labelTooiltipNoVideo": "Sem vídeo",
         "labelTooltipAudioOnly": "Modo de largura de banda baixa habilitada",
         "ld": "LD",
         "ldTooltip": "Ver vídeo em baixa definição",
         "lowDefinition": "Baixa definição (LD)",
+        "performanceSettings": "Configurações de performance",
+        "recording": "Gravação em andamento",
         "sd": "SD",
         "sdTooltip": "Ver vídeo em definição padrão",
-        "standardDefinition": "Definição padrão"
+        "standardDefinition": "Definição padrão",
+        "streaming": "Streaming em andamento"
     },
     "videothumbnail": {
         "connectionInfo": "Informações da Conexão",
@@ -1090,12 +1354,19 @@
         "domuteVideoOfOthers": "Desativar a câmera de todos os demais",
         "flip": "Inverter",
         "grantModerator": "Atribuir Moderador",
+        "hideSelfView": "Ocultar auto-visualização",
         "kick": "Remover",
+        "mirrorVideo": "Espelhar meu vídeo",
         "moderator": "Moderador",
         "mute": "Participante está mudo",
         "muted": "Mudo",
+        "pinToStage": "Fixar no palco",
         "remoteControl": "Controle remoto",
+        "screenSharing": "O participante está compartilhando sua tela",
         "show": "Mostrar no palco",
+        "showSelfView": "Exibir auto-visualização",
+        "unpinFromStage": "Desafixar",
+        "verify": "Verificar participante",
         "videoMuted": "Câmera desativada",
         "videomute": "O participante parou a câmera"
     },
@@ -1120,7 +1391,16 @@
         "slightBlur": "Desfoque suave",
         "title": "Fundos virtuais",
         "uploadedImage": "Imagem enviada {{index}}",
-        "webAssemblyWarning": "Não há suporte para WebAssembly"
+        "webAssemblyWarning": "Não há suporte para WebAssembly",
+        "webAssemblyWarningDescription": "WebAssembly desativado ou não suportado neste navegador"
+    },
+    "visitors": {
+        "chatIndicator": "(visitante)",
+        "labelTooltip": "Número de visitantes: {{count}}",
+        "notification": {
+            "description": "Para participar levante a mão",
+            "title": "Você é um visitante na reunião"
+        }
     },
     "volumeSlider": "Controle de volume",
     "welcomepage": {
@@ -1154,6 +1434,7 @@
             "microsoftLogo": "Logo da Microsoft",
             "policyLogo": "Logo da Política de Privacidade"
         },
+        "meetingsAccessibilityLabel": "Reuniões",
         "mobileDownLoadLinkAndroid": "Baixar aplicativo móvel para Android",
         "mobileDownLoadLinkFDroid": "Baixar aplicativo móvel para F-Droid",
         "mobileDownLoadLinkIos": "Baixar aplicativo móvel para iOS",
@@ -1162,13 +1443,21 @@
         "recentList": "Recente",
         "recentListDelete": "Remover",
         "recentListEmpty": "Sua lista recente está vazia. As reuniões que você realizar serão exibidas aqui.",
+        "recentMeetings": "Suas reuniões recentes",
         "reducedUIText": "Bem-vindo ao {{app}}!",
         "roomNameAllowedChars": "Nome da reunião não deve conter qualquer um destes caracteres: ?. &, :, ', \", %, #.",
         "roomname": "Digite o nome da sala",
         "roomnameHint": "Digite o nome ou a URL da sala que você deseja entrar. Você pode digitar um nome, e apenas deixe para as pessoas que você quer se reunir digitem o mesmo nome.",
         "sendFeedback": "Enviar comentários",
+        "settings": "Configurações",
         "startMeeting": "Iniciar reunião",
         "terms": "Termos",
-        "title": "Videoconferências mais seguras, flexíveis e totalmente gratuitas"
+        "title": "Videoconferências mais seguras, flexíveis e totalmente gratuitas",
+        "upcomingMeetings": "Suas próximas reuniões"
+    },
+    "whiteboard": {
+        "accessibilityLabel": {
+            "heading": "Quadro branco"
+        }
     }
 }

lang/main.json

@@ -63,6 +63,8 @@
             "leaveBreakoutRoom": "Leave breakout room",
             "more": "More",
             "remove": "Remove",
+            "rename": "Rename",
+            "renameBreakoutRoom": "Rename breakout room",
             "sendToBreakoutRoom": "Send participant to:"
         },
         "defaultName": "Breakout room #{{index}}",
@@ -370,8 +372,6 @@
         "permissionCameraRequiredError": "Camera permission is required to participate in conferences with video. Please grant it in Settings",
         "permissionErrorTitle": "Permission required",
         "permissionMicRequiredError": "Microphone permission is required to participate in conferences with audio. Please grant it in Settings",
-        "popupError": "Your browser is blocking pop-up windows from this site. Please enable pop-ups in your browser's security settings and try again.",
-        "popupErrorTitle": "Pop-up blocked",
         "readMore": "more",
         "recentlyUsedObjects": "Your recently used objects",
         "recording": "Recording",
@@ -388,6 +388,8 @@
         "removePassword": "Remove $t(lockRoomPassword)",
         "removeSharedVideoMsg": "Are you sure you would like to remove your shared video?",
         "removeSharedVideoTitle": "Remove shared video",
+        "renameBreakoutRoomLabel": "Room name",
+        "renameBreakoutRoomTitle": "Rename breakout room",
         "reservationError": "Reservation system error",
         "reservationErrorMsg": "Error code: {{code}}, message: {{msg}}",
         "retry": "Retry",
@@ -438,7 +440,25 @@
         "thankYou": "Thank you for using {{appName}}!",
         "token": "token",
         "tokenAuthFailed": "Sorry, you're not allowed to join this call.",
+        "tokenAuthFailedReason": {
+            "audInvalid": "Ivalid `aud` value. It should be `jitsi`.",
+            "contextNotFound": "The `context` object is missing from the payload.",
+            "expInvalid": "Invalid `exp` value.",
+            "featureInvalid": "Invalid feature: {{feature}}, most likely not implemented yet.",
+            "featureValueInvalid": "Invalid value for feature: {{feature}}.",
+            "featuresNotFound": "The `features` object is missing from the payload.",
+            "headerNotFound": "Missing the header.",
+            "issInvalid": "Invalid `iss` value. It should be `chat`.",
+            "kidMismatch": "Key ID (kid) does not match sub.",
+            "kidNotFound": "Missing Key ID (kid).",
+            "nbfFuture": "The `nbf` value is in the future.",
+            "nbfInvalid": "Invalid `nbf` value.",
+            "payloadNotFound": "Missing the payload.",
+            "tokenExpired": "Token is expired."
+        },
         "tokenAuthFailedTitle": "Authentication failed",
+        "tokenAuthFailedWithReasons": "Sorry, you're not allowed to join this call. Possible reasons: {{reason}}",
+        "tokenAuthUnsupported": "Token URL is not supported.",
         "transcribing": "Transcribing",
         "unlockRoom": "Remove meeting $t(lockRoomPassword)",
         "user": "User",
@@ -674,6 +694,8 @@
         "sessionToken": "Session Token",
         "start": "Start Recording",
         "stop": "Stop Recording",
+        "stopping": "Stopping Recording",
+        "wait": "Please wait while we save your recording",
         "yes": "Yes"
     },
     "lockRoomPassword": "password",
@@ -742,7 +764,6 @@
         "newDeviceCameraTitle": "New camera detected",
         "noiseSuppressionDesktopAudioDescription": "Noise suppression can't be enabled while sharing desktop audio, please disable it and try again.",
         "noiseSuppressionFailedTitle": "Failed to start noise suppression",
-        "noiseSuppressionNoTrackDescription": "Please unmute your microphone first.",
         "noiseSuppressionStereoDescription": "Stereo audio noise suppression is not currently supported.",
         "oldElectronClientDescription1": "You appear to be using an old version of the Jitsi Meet client which has known security vulnerabilities. Please make sure you update to our ",
         "oldElectronClientDescription2": "latest build",

modules/API/API.js

@@ -2002,14 +2002,16 @@ class API {
      * Notify external application ( if API is enabled) that a participant menu button was clicked.
      *
      * @param {string} key - The key of the participant menu button.
-     * @param {string} participantId - The ID of the participant for with the participant menu button was clicked.
+     * @param {string} participantId - The ID of the participant for whom the participant menu button was clicked.
+     * @param {boolean} preventExecution - Whether execution of the button click was prevented or not.
      * @returns {void}
      */
-    notifyParticipantMenuButtonClicked(key, participantId) {
+    notifyParticipantMenuButtonClicked(key, participantId, preventExecution) {
         this._sendEvent({
             name: 'participant-menu-button-clicked',
             key,
-            participantId
+            participantId,
+            preventExecution
         });
     }
 
@@ -2057,6 +2059,19 @@ class API {
         });
     }
 
+    /**
+     * Notify the external application (if API is enabled) when the compute pressure changed.
+     *
+     * @param {Array} records - The new pressure records.
+     * @returns {void}
+     */
+    notifyComputePressureChanged(records) {
+        this._sendEvent({
+            name: 'compute-pressure-changed',
+            records
+        });
+    }
+
     /**
      * Disposes the allocated resources.
      *

modules/API/constants.js

@@ -8,8 +8,15 @@ import { parseURLParams } from '../../react/features/base/util/parseURLParams';
 
 /**
  * JitsiMeetExternalAPI id - unique for a webpage.
+ * TODO: This shouldn't be computed here.
  */
-export const API_ID = parseURLParams(window.location).jitsi_meet_external_api_id;
+let _apiID;
+
+try {
+    _apiID = parseURLParams(window.location).jitsi_meet_external_api_id;
+} catch (_) { /* Ignore. */ }
+
+export const API_ID = _apiID;
 
 /**
  * The payload name for the datachannel/endpoint text message event.

modules/API/external/external_api.js

@@ -106,6 +106,7 @@ const events = {
     'browser-support': 'browserSupport',
     'camera-error': 'cameraError',
     'chat-updated': 'chatUpdated',
+    'compute-pressure-changed': 'computePressureChanged',
     'content-sharing-participants-changed': 'contentSharingParticipantsChanged',
     'data-channel-closed': 'dataChannelClosed',
     'data-channel-opened': 'dataChannelOpened',

modules/UI/UI.js

@@ -6,6 +6,9 @@ const UI = {};
 import Logger from '@jitsi/logger';
 import EventEmitter from 'events';
 
+import {
+    conferenceWillInit
+} from '../../react/features/base/conference/actions';
 import { isMobileBrowser } from '../../react/features/base/environment/utils';
 import { setColorAlpha } from '../../react/features/base/util/helpers';
 import { setDocumentUrl } from '../../react/features/etherpad/actions';
@@ -24,14 +27,11 @@ import {
 import UIEvents from '../../service/UI/UIEvents';
 
 import EtherpadManager from './etherpad/Etherpad';
-import messageHandler from './util/MessageHandler';
 import UIUtil from './util/UIUtil';
 import VideoLayout from './videolayout/VideoLayout';
 
 const logger = Logger.getLogger(__filename);
 
-UI.messageHandler = messageHandler;
-
 const eventEmitter = new EventEmitter();
 
 UI.eventEmitter = eventEmitter;
@@ -58,30 +58,6 @@ UI.isFullScreen = function() {
     return UIUtil.isFullScreen();
 };
 
-/**
- * Notify user that server has shut down.
- */
-UI.notifyGracefulShutdown = function() {
-    messageHandler.showError({
-        descriptionKey: 'dialog.gracefulShutdown',
-        titleKey: 'dialog.serviceUnavailable'
-    });
-};
-
-/**
- * Notify user that reservation error happened.
- */
-UI.notifyReservationError = function(code, msg) {
-    messageHandler.showError({
-        descriptionArguments: {
-            code,
-            msg
-        },
-        descriptionKey: 'dialog.reservationErrorMsg',
-        titleKey: 'dialog.reservationError'
-    });
-};
-
 /**
  * Initialize conference UI.
  */
@@ -91,18 +67,9 @@ UI.initConference = function() {
 
 /**
  * Starts the UI module and initializes all related components.
- *
- * @returns {boolean} true if the UI is ready and the conference should be
- * established, false - otherwise (for example in the case of welcome page)
  */
 UI.start = function() {
-    VideoLayout.initLargeVideo();
-
-    // Do not animate the video area on UI start (second argument passed into
-    // resizeVideoArea) because the animation is not visible anyway. Plus with
-    // the current dom layout, the quality label is part of the video layout and
-    // will be seen animating in.
-    VideoLayout.resizeVideoArea();
+    APP.store.dispatch(conferenceWillInit());
 
     if (isMobileBrowser()) {
         document.body.classList.add('mobile-browser');
@@ -292,40 +259,6 @@ UI.showToolbar = timeout => APP.store.dispatch(showToolbox(timeout));
 // Used by torture.
 UI.dockToolbar = dock => APP.store.dispatch(dockToolbox(dock));
 
-/**
- * Notify user that connection failed.
- * @param {string} stropheErrorMsg raw Strophe error message
- */
-UI.notifyConnectionFailed = function(stropheErrorMsg) {
-    let descriptionKey;
-    let descriptionArguments;
-
-    if (stropheErrorMsg) {
-        descriptionKey = 'dialog.connectErrorWithMsg';
-        descriptionArguments = { msg: stropheErrorMsg };
-    } else {
-        descriptionKey = 'dialog.connectError';
-    }
-
-    messageHandler.showError({
-        descriptionArguments,
-        descriptionKey,
-        titleKey: 'connection.CONNFAIL'
-    });
-};
-
-
-/**
- * Notify user that maximum users limit has been reached.
- */
-UI.notifyMaxUsersLimitReached = function() {
-    messageHandler.showError({
-        hideErrorSupportLink: true,
-        descriptionKey: 'dialog.maxUsersLimitReached',
-        titleKey: 'dialog.maxUsersLimitReachedTitle'
-    });
-};
-
 UI.handleLastNEndpoints = function(leavingIds, enteringIds) {
     VideoLayout.onLastNEndpointsChanged(leavingIds, enteringIds);
 };
@@ -337,13 +270,6 @@ UI.handleLastNEndpoints = function(leavingIds, enteringIds) {
  */
 UI.setAudioLevel = (id, lvl) => VideoLayout.setAudioLevel(id, lvl);
 
-UI.notifyTokenAuthFailed = function() {
-    messageHandler.showError({
-        descriptionKey: 'dialog.tokenAuthFailed',
-        titleKey: 'dialog.tokenAuthFailedTitle'
-    });
-};
-
 /**
  * Update list of available physical devices.
  */

modules/UI/authentication/AuthHandler.js

@@ -1,227 +0,0 @@
-/* global APP */
-import Logger from '@jitsi/logger';
-
-import { openConnection } from '../../../connection';
-import {
-    openAuthDialog,
-    openLoginDialog } from '../../../react/features/authentication/actions.web';
-import {
-    LoginDialog,
-    WaitForOwnerDialog
-} from '../../../react/features/authentication/components';
-import {
-    getTokenAuthUrl,
-    isTokenAuthEnabled
-} from '../../../react/features/authentication/functions';
-import { getReplaceParticipant } from '../../../react/features/base/config/functions';
-import { isDialogOpen } from '../../../react/features/base/dialog/functions';
-import { setJWT } from '../../../react/features/base/jwt/actions';
-import UIUtil from '../util/UIUtil';
-
-import ExternalLoginDialog from './LoginDialog';
-
-
-let externalAuthWindow;
-
-const logger = Logger.getLogger(__filename);
-
-
-/**
- * Authenticate using external service or just focus
- * external auth window if there is one already.
- *
- * @param {JitsiConference} room
- * @param {string} [lockPassword] password to use if the conference is locked
- */
-function doExternalAuth(room, lockPassword) {
-    const config = APP.store.getState()['features/base/config'];
-
-    if (externalAuthWindow) {
-        externalAuthWindow.focus();
-
-        return;
-    }
-
-    if (room.isJoined()) {
-        let getUrl;
-
-        if (isTokenAuthEnabled(config)) {
-            getUrl = Promise.resolve(getTokenAuthUrl(config)(room.getName(), true));
-            initJWTTokenListener(room);
-        } else {
-            getUrl = room.getExternalAuthUrl(true);
-        }
-        getUrl.then(url => {
-            externalAuthWindow = ExternalLoginDialog.showExternalAuthDialog(
-                url,
-                () => {
-                    externalAuthWindow = null;
-                    if (!isTokenAuthEnabled(config)) {
-                        room.join(lockPassword);
-                    }
-                }
-            );
-        });
-    } else if (isTokenAuthEnabled(config)) {
-        redirectToTokenAuthService(room.getName());
-    } else {
-        room.getExternalAuthUrl().then(UIUtil.redirect);
-    }
-}
-
-/**
- * Redirect the user to the token authentication service for the login to be
- * performed. Once complete it is expected that the service will bring the user
- * back with "?jwt={the JWT token}" query parameter added.
- * @param {string} [roomName] the name of the conference room.
- */
-export function redirectToTokenAuthService(roomName) {
-    const config = APP.store.getState()['features/base/config'];
-
-    // FIXME: This method will not preserve the other URL params that were
-    // originally passed.
-    UIUtil.redirect(getTokenAuthUrl(config)(roomName, false));
-}
-
-/**
- * Initializes 'message' listener that will wait for a JWT token to be received
- * from the token authentication service opened in a popup window.
- * @param room the name of the conference room.
- */
-function initJWTTokenListener(room) {
-    /**
-     *
-     */
-    function listener({ data, source }) {
-        if (externalAuthWindow !== source) {
-            logger.warn('Ignored message not coming '
-                + 'from external authnetication window');
-
-            return;
-        }
-
-        let jwt;
-
-        if (data && (jwt = data.jwtToken)) {
-            logger.info('Received JSON Web Token (JWT):', jwt);
-
-            APP.store.dispatch(setJWT(jwt));
-
-            const roomName = room.getName();
-
-            openConnection({
-                retry: false,
-                roomName
-            }).then(connection => {
-                // Start new connection
-                const newRoom = connection.initJitsiConference(
-                    roomName, APP.conference._getConferenceOptions());
-
-                // Authenticate from the new connection to get
-                // the session-ID from the focus, which will then be used
-                // to upgrade current connection's user role
-
-                newRoom.room.moderator.authenticate()
-                .then(() => {
-                    connection.disconnect();
-
-                    // At this point we'll have session-ID stored in
-                    // the settings. It will be used in the call below
-                    // to upgrade user's role
-                    room.room.moderator.authenticate()
-                        .then(() => {
-                            logger.info('User role upgrade done !');
-                            // eslint-disable-line no-use-before-define
-                            unregister();
-                        })
-                        .catch((err, errCode) => {
-                            logger.error('Authentication failed: ',
-                                err, errCode);
-                            unregister();
-                        });
-                })
-                .catch((error, code) => {
-                    unregister();
-                    connection.disconnect();
-                    logger.error(
-                        'Authentication failed on the new connection',
-                        error, code);
-                });
-            }, err => {
-                unregister();
-                logger.error('Failed to open new connection', err);
-            });
-        }
-    }
-
-    /**
-     *
-     */
-    function unregister() {
-        window.removeEventListener('message', listener);
-    }
-
-    if (window.addEventListener) {
-        window.addEventListener('message', listener, false);
-    }
-}
-
-/**
- * Authenticate for the conference.
- * Uses external service for auth if conference supports that.
- * @param {JitsiConference} room
- * @param {string} [lockPassword] password to use if the conference is locked
- */
-function authenticate(room, lockPassword) {
-    const config = APP.store.getState()['features/base/config'];
-
-    if (isTokenAuthEnabled(config) || room.isExternalAuthEnabled()) {
-        doExternalAuth(room, lockPassword);
-    } else {
-        APP.store.dispatch(openLoginDialog());
-    }
-}
-
-/**
- * Notify user that authentication is required to create the conference.
- * @param {JitsiConference} room
- * @param {string} [lockPassword] password to use if the conference is locked
- */
-function requireAuth(room, lockPassword) {
-    if (isDialogOpen(APP.store, WaitForOwnerDialog) || isDialogOpen(APP.store, LoginDialog)) {
-        return;
-    }
-
-    APP.store.dispatch(
-        openAuthDialog(
-        room.getName(), authenticate.bind(null, room, lockPassword))
-    );
-}
-
-/**
- * De-authenticate local user.
- *
- * @param {JitsiConference} room
- * @param {string} [lockPassword] password to use if the conference is locked
- * @returns {Promise}
- */
-function logout(room) {
-    return new Promise(resolve => {
-        room.room.moderator.logout(resolve);
-    }).then(url => {
-        // de-authenticate conference on the fly
-        if (room.isJoined()) {
-            const replaceParticipant = getReplaceParticipant(APP.store.getState());
-
-            room.join(null, replaceParticipant);
-        }
-
-        return url;
-    });
-}
-
-export default {
-    authenticate,
-    logout,
-    requireAuth
-};

modules/UI/authentication/LoginDialog.js

@@ -1,28 +0,0 @@
-/* global APP */
-
-export default {
-
-    /**
-     * Show notification that external auth is required (using provided url).
-     * @param {string} url - URL to use for external auth.
-     * @param {function} callback - callback to invoke when auth popup is closed.
-     * @returns auth dialog
-     */
-    showExternalAuthDialog(url, callback) {
-        const dialog = APP.UI.messageHandler.openCenteredPopup(
-            url, 910, 660,
-
-            // On closed
-            callback
-        );
-
-        if (!dialog) {
-            APP.UI.messageHandler.showWarning({
-                descriptionKey: 'dialog.popupError',
-                titleKey: 'dialog.popupErrorTitle'
-            });
-        }
-
-        return dialog;
-    }
-};

modules/UI/util/MessageHandler.js

@@ -1,61 +0,0 @@
-/* global APP */
-
-import { showErrorNotification, showWarningNotification } from '../../../react/features/notifications/actions';
-import { NOTIFICATION_TIMEOUT_TYPE } from '../../../react/features/notifications/constants';
-
-const messageHandler = {
-    /**
-     * Opens new popup window for given <tt>url</tt> centered over current
-     * window.
-     *
-     * @param url the URL to be displayed in the popup window
-     * @param w the width of the popup window
-     * @param h the height of the popup window
-     * @param onPopupClosed optional callback function called when popup window
-     *        has been closed.
-     *
-     * @returns {object} popup window object if opened successfully or undefined
-     *          in case we failed to open it(popup blocked)
-     */
-    // eslint-disable-next-line max-params
-    openCenteredPopup(url, w, h, onPopupClosed) {
-        const l = window.screenX + (window.innerWidth / 2) - (w / 2);
-        const t = window.screenY + (window.innerHeight / 2) - (h / 2);
-        const popup = window.open(
-            url, '_blank',
-            String(`top=${t}, left=${l}, width=${w}, height=${h}`));
-
-        if (popup && onPopupClosed) {
-            const pollTimer = window.setInterval(() => {
-                if (popup.closed !== false) {
-                    window.clearInterval(pollTimer);
-                    onPopupClosed();
-                }
-            }, 200);
-        }
-
-        return popup;
-    },
-
-    /**
-     * Shows an error dialog to the user.
-     *
-     * @param {object} props - The properties to pass to the
-     * showErrorNotification action.
-     */
-    showError(props) {
-        APP.store.dispatch(showErrorNotification(props, NOTIFICATION_TIMEOUT_TYPE.LONG));
-    },
-
-    /**
-     * Shows a warning dialog to the user.
-     *
-     * @param {object} props - The properties to pass to the
-     * showWarningNotification action.
-     */
-    showWarning(props) {
-        APP.store.dispatch(showWarningNotification(props, NOTIFICATION_TIMEOUT_TYPE.LONG));
-    }
-};
-
-export default messageHandler;

modules/UI/util/UIUtil.js

@@ -31,18 +31,6 @@ const UIUtil = {
         return result;
     },
 
-    /**
-     * Redirects to a given URL.
-     *
-     * @param {string} url - The redirect URL.
-     * NOTE: Currently used to redirect to 3rd party location for
-     * authentication. In most cases redirectWithStoredParams action must be
-     * used instead of this method in order to preserve current URL params.
-     */
-    redirect(url) {
-        window.location.href = url;
-    },
-
     /**
      * Indicates if we're currently in full screen mode.
      *

package-lock.json

@@ -16,9 +16,8 @@
         "@giphy/js-fetch-api": "4.7.1",
         "@giphy/react-components": "6.8.1",
         "@giphy/react-native-sdk": "2.3.0",
-        "@hapi/bourne": "2.0.0",
         "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.14/jitsi-excalidraw-0.0.14.tgz",
-        "@jitsi/js-utils": "2.0.5",
+        "@jitsi/js-utils": "2.1.2",
         "@jitsi/logger": "2.0.0",
         "@jitsi/rnnoise-wasm": "0.1.0",
         "@jitsi/rtcstats": "9.5.1",
@@ -60,7 +59,7 @@
         "js-md5": "0.6.1",
         "js-sha512": "0.8.0",
         "jwt-decode": "2.2.0",
-        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1656.0.0+e0d3459a/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1676.0.0+486efad8/lib-jitsi-meet.tgz",
         "lodash": "4.17.21",
         "moment": "2.29.4",
         "moment-duration-format": "2.2.2",
@@ -74,7 +73,7 @@
         "react-focus-on": "3.8.1",
         "react-i18next": "10.11.4",
         "react-linkify": "1.0.0-alpha",
-        "react-native": "0.69.10",
+        "react-native": "0.69.11",
         "react-native-background-timer": "2.4.1",
         "react-native-calendar-events": "2.2.0",
         "react-native-callstats": "3.73.7",
@@ -83,7 +82,7 @@
         "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz",
         "react-native-gesture-handler": "2.9.0",
         "react-native-get-random-values": "1.7.2",
-        "react-native-immersive": "2.0.0",
+        "react-native-immersive-mode": "2.0.1",
         "react-native-keep-awake": "4.0.0",
         "react-native-orientation-locker": "1.5.0",
         "react-native-pager-view": "5.4.9",
@@ -102,7 +101,7 @@
         "react-native-webrtc": "111.0.3",
         "react-native-webview": "11.15.1",
         "react-native-youtube-iframe": "2.2.1",
-        "react-redux": "7.1.0",
+        "react-redux": "7.2.9",
         "react-textarea-autosize": "8.3.0",
         "react-window": "1.8.6",
         "react-youtube": "10.1.0",
@@ -2949,9 +2948,9 @@
       }
     },
     "node_modules/@hapi/bourne": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-2.0.0.tgz",
-      "integrity": "sha512-WEezM1FWztfbzqIUbsDzFRVMxSoLy3HugVcux6KDDtTqzPsLE8NDRHfXvev66aH1i2oOKKar3/XDjbvh/OUBdg=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-3.0.0.tgz",
+      "integrity": "sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w=="
     },
     "node_modules/@hapi/hoek": {
       "version": "9.3.0",
@@ -3110,10 +3109,11 @@
       }
     },
     "node_modules/@jitsi/js-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-2.0.5.tgz",
-      "integrity": "sha512-Aa7lt/sGsDymWnKJtM1RePmR2b2J5TwY3QLv5iOmzMDYR+5RE0NyYc/vKW51JeatDVSkj+LT7kpUDvtJua0rmQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-2.1.2.tgz",
+      "integrity": "sha512-KT6rIr+kJ1AoKf7freQzOH3+ltOyrhe1vyhNukTM/UMStvtrXZyZmNNywhgqegpt0d0DNaHOYLmjj7186AXVcw==",
       "dependencies": {
+        "@hapi/bourne": "^3.0.0",
         "bowser": "2.7.0",
         "js-md5": "0.7.3"
       }
@@ -5526,6 +5526,11 @@
         "yarn": ">= 1.3.2"
       }
     },
+    "node_modules/@testrtc/watchrtc-sdk": {
+      "version": "1.36.3",
+      "resolved": "https://registry.npmjs.org/@testrtc/watchrtc-sdk/-/watchrtc-sdk-1.36.3.tgz",
+      "integrity": "sha512-JtcTvvh20t553n8q5ZHpWQeSUTENkQrZbGNvQ05jD8SA2V5PHBok/7my1ZDuA44sgT0y1OfUA8VT7dhcs0VxWg=="
+    },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -5661,7 +5666,6 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
       "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
-      "dev": true,
       "dependencies": {
         "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
@@ -5842,7 +5846,6 @@
       "version": "7.1.24",
       "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz",
       "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==",
-      "dev": true,
       "dependencies": {
         "@types/hoist-non-react-statics": "^3.3.0",
         "@types/react": "*",
@@ -7111,6 +7114,11 @@
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
       "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
     },
+    "node_modules/async-es": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async-es/-/async-es-3.2.4.tgz",
+      "integrity": "sha512-GFHAAfmW7GzEiHFR6DvE5WMm6+js9pb+RLm+m1UpsyMX+I4j/R4QVw2Te664q+fvDVOz7Y0bORPDNvQS7BJ3Hw=="
+    },
     "node_modules/async-limiter": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
@@ -12762,16 +12770,17 @@
     },
     "node_modules/lib-jitsi-meet": {
       "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1656.0.0+e0d3459a/lib-jitsi-meet.tgz",
-      "integrity": "sha512-kBgLXiPap7PGP7Ip+3NMwE7Us+FDaFOpmhAopylRfZKm/Didhpbd7w8PJ2+YsXKzx6aNN1azWKHTWY1Wu9WNFg==",
+      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1676.0.0+486efad8/lib-jitsi-meet.tgz",
+      "integrity": "sha512-HGkW7sg8LGdNl8d0v8hKdET62C0N2BFHF+SXiJUvfzkJSgJrgtTk6JApZ5EgjLjy5nv+u4gAHuMrI5Fyzm1kJw==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@jitsi/js-utils": "2.0.0",
+        "@jitsi/js-utils": "2.1.2",
         "@jitsi/logger": "2.0.0",
         "@jitsi/sdp-interop": "git+https://github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b",
         "@jitsi/sdp-simulcast": "0.4.0",
-        "async": "3.2.3",
+        "@testrtc/watchrtc-sdk": "1.36.3",
+        "async-es": "3.2.4",
         "base64-js": "1.3.1",
         "current-executing-script": "0.1.3",
         "jquery": "3.6.1",
@@ -12788,15 +12797,6 @@
         "webrtc-adapter": "8.1.1"
       }
     },
-    "node_modules/lib-jitsi-meet/node_modules/@jitsi/js-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-2.0.0.tgz",
-      "integrity": "sha512-Rk1JFGdXEJ5+eALVRTMohfn3pdMDQqlCJQEkCMLXKlCpEo+JhsOrB4KzlPo1rV9U8PnRfrf0j5N9uf/0C2a8Gw==",
-      "dependencies": {
-        "bowser": "2.7.0",
-        "js-md5": "0.7.3"
-      }
-    },
     "node_modules/lib-jitsi-meet/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -12879,11 +12879,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/lib-jitsi-meet/node_modules/js-md5": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
-      "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
-    },
     "node_modules/lib-jitsi-meet/node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -15667,9 +15662,10 @@
       }
     },
     "node_modules/react-native": {
-      "version": "0.69.10",
-      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.69.10.tgz",
-      "integrity": "sha512-zBsJmFsjyx9zC0JDRH6F6hib3BWbIu65EYPsJBQMDHMSGJ9fL7C6ZV49O7Abockn/dbCHhIWpiSyCuda/bhV8g==",
+      "version": "0.69.11",
+      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.69.11.tgz",
+      "integrity": "sha512-lYSzyDicrE5FLag+Vaq1XmPscQFKFqiUCsDMNkgd+wW9139u3hDEnbEWnXfM/kgF3vrKQUfyLMwfkuLV8EQfug==",
+      "deprecated": "Issues and pull requests filed against this version are not supported. See the React Native release support policy to learn more: https://github.com/reactwg/react-native-releases#releases-support-policy",
       "dependencies": {
         "@jest/create-cache-key-function": "^27.0.1",
         "@react-native-community/cli": "^8.0.4",
@@ -15808,12 +15804,12 @@
       "resolved": "https://registry.npmjs.org/react-native-gradle-plugin/-/react-native-gradle-plugin-0.0.7.tgz",
       "integrity": "sha512-+4JpbIx42zGTONhBTIXSyfyHICHC29VTvhkkoUOJAh/XHPEixpuBduYgf6Y4y9wsN1ARlQhBBoptTvXvAFQf5g=="
     },
-    "node_modules/react-native-immersive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/react-native-immersive/-/react-native-immersive-2.0.0.tgz",
-      "integrity": "sha512-9TL05nTHN/x9sN1wbUlBoGyzH4NCuZ/7WEEUp5CvOoKuUABvdYosov0O0SAMbm/5J913RRoy98VB6tGNi9lRSw==",
+    "node_modules/react-native-immersive-mode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/react-native-immersive-mode/-/react-native-immersive-mode-2.0.1.tgz",
+      "integrity": "sha512-2wlL7VIHl4rr4gwgnUp9K1UvsN7J5VCGqoAvBWQXvB4xn7XaoDEl6z9vqaqOiEdC6aAh2d/7zqcJz+dfcR2ELw==",
       "peerDependencies": {
-        "react-native": ">=0.47.0"
+        "react-native": ">=0.60.5"
       }
     },
     "node_modules/react-native-keep-awake": {
@@ -16123,27 +16119,29 @@
       }
     },
     "node_modules/react-redux": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.1.0.tgz",
-      "integrity": "sha512-hyu/PoFK3vZgdLTg9ozbt7WF3GgX5+Yn3pZm5/96/o4UueXA+zj08aiSC9Mfj2WtD1bvpIb3C5yvskzZySzzaw==",
+      "version": "7.2.9",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
+      "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
       "dependencies": {
-        "@babel/runtime": "^7.4.5",
-        "hoist-non-react-statics": "^3.3.0",
-        "invariant": "^2.2.4",
+        "@babel/runtime": "^7.15.4",
+        "@types/react-redux": "^7.1.20",
+        "hoist-non-react-statics": "^3.3.2",
         "loose-envify": "^1.4.0",
         "prop-types": "^15.7.2",
-        "react-is": "^16.8.6"
+        "react-is": "^17.0.2"
       },
       "peerDependencies": {
-        "react": "^16.8.3",
-        "redux": "^2.0.0 || ^3.0.0 || ^4.0.0-0"
+        "react": "^16.8.3 || ^17 || ^18"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
       }
     },
-    "node_modules/react-redux/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
     "node_modules/react-refresh": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
@@ -19716,9 +19714,9 @@
       "integrity": "sha512-rCPf3AakAAgvapnbYVvG2bQyI3g6EDbPpjDJ72fdAu+XTzB1qvX4ZC6OnZ0I2+thaspjTb+8KwdyhdBl8Lt/QA=="
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -21903,9 +21901,9 @@
       }
     },
     "@hapi/bourne": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-2.0.0.tgz",
-      "integrity": "sha512-WEezM1FWztfbzqIUbsDzFRVMxSoLy3HugVcux6KDDtTqzPsLE8NDRHfXvev66aH1i2oOKKar3/XDjbvh/OUBdg=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-3.0.0.tgz",
+      "integrity": "sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w=="
     },
     "@hapi/hoek": {
       "version": "9.3.0",
@@ -22019,10 +22017,11 @@
       "integrity": "sha512-iK7p7i6qJFOkjTVZhWDvurDW1u+eMoOhAVgpab9CZEqCTX+W4Ih4AOPrUpf+mjaAHK5XqmQZSc5nVEpMg+xIGQ=="
     },
     "@jitsi/js-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-2.0.5.tgz",
-      "integrity": "sha512-Aa7lt/sGsDymWnKJtM1RePmR2b2J5TwY3QLv5iOmzMDYR+5RE0NyYc/vKW51JeatDVSkj+LT7kpUDvtJua0rmQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-2.1.2.tgz",
+      "integrity": "sha512-KT6rIr+kJ1AoKf7freQzOH3+ltOyrhe1vyhNukTM/UMStvtrXZyZmNNywhgqegpt0d0DNaHOYLmjj7186AXVcw==",
       "requires": {
+        "@hapi/bourne": "^3.0.0",
         "bowser": "2.7.0",
         "js-md5": "0.7.3"
       },
@@ -23719,6 +23718,11 @@
         "seedrandom": "2.4.3"
       }
     },
+    "@testrtc/watchrtc-sdk": {
+      "version": "1.36.3",
+      "resolved": "https://registry.npmjs.org/@testrtc/watchrtc-sdk/-/watchrtc-sdk-1.36.3.tgz",
+      "integrity": "sha512-JtcTvvh20t553n8q5ZHpWQeSUTENkQrZbGNvQ05jD8SA2V5PHBok/7my1ZDuA44sgT0y1OfUA8VT7dhcs0VxWg=="
+    },
     "@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -23851,7 +23855,6 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
       "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
-      "dev": true,
       "requires": {
         "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
@@ -24032,7 +24035,6 @@
       "version": "7.1.24",
       "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz",
       "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==",
-      "dev": true,
       "requires": {
         "@types/hoist-non-react-statics": "^3.3.0",
         "@types/react": "*",
@@ -24990,6 +24992,11 @@
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
       "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
     },
+    "async-es": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async-es/-/async-es-3.2.4.tgz",
+      "integrity": "sha512-GFHAAfmW7GzEiHFR6DvE5WMm6+js9pb+RLm+m1UpsyMX+I4j/R4QVw2Te664q+fvDVOz7Y0bORPDNvQS7BJ3Hw=="
+    },
     "async-limiter": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
@@ -29269,14 +29276,15 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1656.0.0+e0d3459a/lib-jitsi-meet.tgz",
-      "integrity": "sha512-kBgLXiPap7PGP7Ip+3NMwE7Us+FDaFOpmhAopylRfZKm/Didhpbd7w8PJ2+YsXKzx6aNN1azWKHTWY1Wu9WNFg==",
+      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1676.0.0+486efad8/lib-jitsi-meet.tgz",
+      "integrity": "sha512-HGkW7sg8LGdNl8d0v8hKdET62C0N2BFHF+SXiJUvfzkJSgJrgtTk6JApZ5EgjLjy5nv+u4gAHuMrI5Fyzm1kJw==",
       "requires": {
-        "@jitsi/js-utils": "2.0.0",
+        "@jitsi/js-utils": "2.1.2",
         "@jitsi/logger": "2.0.0",
         "@jitsi/sdp-interop": "git+https://github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b",
         "@jitsi/sdp-simulcast": "0.4.0",
-        "async": "3.2.3",
+        "@testrtc/watchrtc-sdk": "1.36.3",
+        "async-es": "3.2.4",
         "base64-js": "1.3.1",
         "current-executing-script": "0.1.3",
         "jquery": "3.6.1",
@@ -29293,15 +29301,6 @@
         "webrtc-adapter": "8.1.1"
       },
       "dependencies": {
-        "@jitsi/js-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-2.0.0.tgz",
-          "integrity": "sha512-Rk1JFGdXEJ5+eALVRTMohfn3pdMDQqlCJQEkCMLXKlCpEo+JhsOrB4KzlPo1rV9U8PnRfrf0j5N9uf/0C2a8Gw==",
-          "requires": {
-            "bowser": "2.7.0",
-            "js-md5": "0.7.3"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -29360,11 +29359,6 @@
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
-        "js-md5": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
-          "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
-        },
         "jsonfile": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -31460,9 +31454,9 @@
       }
     },
     "react-native": {
-      "version": "0.69.10",
-      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.69.10.tgz",
-      "integrity": "sha512-zBsJmFsjyx9zC0JDRH6F6hib3BWbIu65EYPsJBQMDHMSGJ9fL7C6ZV49O7Abockn/dbCHhIWpiSyCuda/bhV8g==",
+      "version": "0.69.11",
+      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.69.11.tgz",
+      "integrity": "sha512-lYSzyDicrE5FLag+Vaq1XmPscQFKFqiUCsDMNkgd+wW9139u3hDEnbEWnXfM/kgF3vrKQUfyLMwfkuLV8EQfug==",
       "requires": {
         "@jest/create-cache-key-function": "^27.0.1",
         "@react-native-community/cli": "^8.0.4",
@@ -31578,10 +31572,10 @@
       "resolved": "https://registry.npmjs.org/react-native-gradle-plugin/-/react-native-gradle-plugin-0.0.7.tgz",
       "integrity": "sha512-+4JpbIx42zGTONhBTIXSyfyHICHC29VTvhkkoUOJAh/XHPEixpuBduYgf6Y4y9wsN1ARlQhBBoptTvXvAFQf5g=="
     },
-    "react-native-immersive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/react-native-immersive/-/react-native-immersive-2.0.0.tgz",
-      "integrity": "sha512-9TL05nTHN/x9sN1wbUlBoGyzH4NCuZ/7WEEUp5CvOoKuUABvdYosov0O0SAMbm/5J913RRoy98VB6tGNi9lRSw=="
+    "react-native-immersive-mode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/react-native-immersive-mode/-/react-native-immersive-mode-2.0.1.tgz",
+      "integrity": "sha512-2wlL7VIHl4rr4gwgnUp9K1UvsN7J5VCGqoAvBWQXvB4xn7XaoDEl6z9vqaqOiEdC6aAh2d/7zqcJz+dfcR2ELw=="
     },
     "react-native-keep-awake": {
       "version": "4.0.0",
@@ -31776,23 +31770,16 @@
       }
     },
     "react-redux": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.1.0.tgz",
-      "integrity": "sha512-hyu/PoFK3vZgdLTg9ozbt7WF3GgX5+Yn3pZm5/96/o4UueXA+zj08aiSC9Mfj2WtD1bvpIb3C5yvskzZySzzaw==",
+      "version": "7.2.9",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
+      "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
       "requires": {
-        "@babel/runtime": "^7.4.5",
-        "hoist-non-react-statics": "^3.3.0",
-        "invariant": "^2.2.4",
+        "@babel/runtime": "^7.15.4",
+        "@types/react-redux": "^7.1.20",
+        "hoist-non-react-statics": "^3.3.2",
         "loose-envify": "^1.4.0",
         "prop-types": "^15.7.2",
-        "react-is": "^16.8.6"
-      },
-      "dependencies": {
-        "react-is": {
-          "version": "16.13.1",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-        }
+        "react-is": "^17.0.2"
       }
     },
     "react-refresh": {
@@ -34423,9 +34410,9 @@
       "integrity": "sha512-rCPf3AakAAgvapnbYVvG2bQyI3g6EDbPpjDJ72fdAu+XTzB1qvX4ZC6OnZ0I2+thaspjTb+8KwdyhdBl8Lt/QA=="
     },
     "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "dev": true
     },
     "wrap-ansi": {

package.json

@@ -2,6 +2,7 @@
   "name": "jitsi-meet",
   "version": "0.0.0",
   "description": "A sample app for the Jitsi Videobridge",
+  "private": true,
   "repository": {
     "type": "git",
     "url": "git://github.com/jitsi/jitsi-meet"
@@ -21,9 +22,8 @@
     "@giphy/js-fetch-api": "4.7.1",
     "@giphy/react-components": "6.8.1",
     "@giphy/react-native-sdk": "2.3.0",
-    "@hapi/bourne": "2.0.0",
     "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.14/jitsi-excalidraw-0.0.14.tgz",
-    "@jitsi/js-utils": "2.0.5",
+    "@jitsi/js-utils": "2.1.2",
     "@jitsi/logger": "2.0.0",
     "@jitsi/rnnoise-wasm": "0.1.0",
     "@jitsi/rtcstats": "9.5.1",
@@ -65,7 +65,7 @@
     "js-md5": "0.6.1",
     "js-sha512": "0.8.0",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1656.0.0+e0d3459a/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1676.0.0+486efad8/lib-jitsi-meet.tgz",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "moment-duration-format": "2.2.2",
@@ -79,7 +79,7 @@
     "react-focus-on": "3.8.1",
     "react-i18next": "10.11.4",
     "react-linkify": "1.0.0-alpha",
-    "react-native": "0.69.10",
+    "react-native": "0.69.11",
     "react-native-background-timer": "2.4.1",
     "react-native-calendar-events": "2.2.0",
     "react-native-callstats": "3.73.7",
@@ -88,7 +88,7 @@
     "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz",
     "react-native-gesture-handler": "2.9.0",
     "react-native-get-random-values": "1.7.2",
-    "react-native-immersive": "2.0.0",
+    "react-native-immersive-mode": "2.0.1",
     "react-native-keep-awake": "4.0.0",
     "react-native-orientation-locker": "1.5.0",
     "react-native-pager-view": "5.4.9",
@@ -107,7 +107,7 @@
     "react-native-webrtc": "111.0.3",
     "react-native-webview": "11.15.1",
     "react-native-youtube-iframe": "2.2.1",
-    "react-redux": "7.1.0",
+    "react-redux": "7.2.9",
     "react-textarea-autosize": "8.3.0",
     "react-window": "1.8.6",
     "react-youtube": "10.1.0",
@@ -179,9 +179,7 @@
     "webpack-dev-server": "4.7.3"
   },
   "overrides": {
-    "strophe.js@1.5.0": {
-      "@xmldom/xmldom": "0.8.7"
-    }
+    "@xmldom/xmldom": "0.8.7"
   },
   "engines": {
     "node": ">=14.0.0",

react-native-sdk/.npmignore

@@ -0,0 +1 @@
+*.tgz

react-native-sdk/README.md

@@ -2,20 +2,23 @@
 
 
 ## Installation
-Inside your project, run `npm i @jitsi/react-native-sdk`.<br/><br/>Additionally, if not already installed, some dependencies will need to be added.
+Inside your project, run;
+```console
+npm i @jitsi/react-native-sdk
+```
+<br/><br/>Additionally, if not already installed, some dependencies will need to be added.
 
 This can be done by running the following script:
-```
-"update-deps": "node node_modules/@jitsi/react-native-sdk/update_dependencies.js"
+```console
+node node_modules/@jitsi/react-native-sdk/update_dependencies.js
 ```
 This will check and update all your dependencies.<br/><br/>
 
-
  [comment]: # (These deps definitely need to be added manually, more could be neccesary)
 
 Because of SVG use in react native, you need to update metro.config your project's file:
 
-```
+```javascript
 const { getDefaultConfig } = require('metro-config');
 
 module.exports = (async () => {
@@ -56,31 +59,31 @@ module.exports = (async () => {
         - Audio
         - Voice over IP
         - Background fetch
-- Add Copy Sounds step:
-1. Open XCode, go to Build Phases and add this step and the script below.
 
+Run;
+```console
+cd ios && pod install && cd ..
 ```
-    SOUNDS_DIR="${PROJECT_DIR}/../node_modules/@jitsi/react-native-sdk/sounds"
-    cp $SOUNDS_DIR/* ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/
-```
-#### Podfile
-- At the beginning of your target step add `pod 'ObjectiveDropboxOfficial', :modular_headers => true`
-
-Run `cd ios && pod install && cd ..`
 
 ### Android
 
 - In your build.gradle have at least `minSdkVersion = 24`
-- TODO: HOW TO ADD COPY SOUNDS STEP
 - In `android/app/src/debug/AndroidManifest.xml` and `android/app/src/main/AndroidManifest.xml`, under the `</application>` tag, include
-  ```
+  ```xml
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
   ```
 
-### TODOS
-- Ref ConnectionService to not rely on ReactInstanceHolder anymore
-- Add Copy Sounds step to build.gradle
-- Include copy sounds step in podspec (if possible)
-- Add ranges for dependencies
-- Add Build_Config for react native to AppInfoModule
+If you want to test all the steps before applying them to your app, you can check our React Native SDK sample app here:
+https://github.com/jitsi/jitsi-meet-sdk-samples/tree/master/react-native
+
+
+### Using JWT tokens
+- If you are planning to use tokens or another domain you can do that by updating the following props, as shown below.
+- For example:
+```javascript
+  <JitsiMeeting
+    room={'ThisIsNotATestRoomName'}
+    serverURL={'https://meet.jit.si/'}
+    token={'dkhalhfajhflahlfaahalhfahfsl'} />
+```

react-native-sdk/android/build.gradle

@@ -138,3 +138,19 @@ if (isNewArchitectureEnabled()) {
     codegenJavaPackageName = "org.jitsi.meet.sdk"
   }
 }
+
+// Copy sounds to assets directory
+android.libraryVariants.all { def variant ->
+    def mergeAssetsTask = variant.mergeAssetsProvider.get()
+    def mergeResourcesTask = variant.mergeResourcesProvider.get()
+    mergeAssetsTask.doLast {
+        def assetsDir = mergeAssetsTask.outputDir.get()
+        def soundsDir = "${projectDir}/../sounds"
+        copy {
+            from("${soundsDir}")
+            include("*.wav")
+            include("*.mp3")
+            into("${assetsDir}/sounds")
+        }
+    }
+}

react-native-sdk/index.tsx

@@ -1,47 +1,67 @@
 /* eslint-disable lines-around-comment,  no-undef, no-unused-vars  */
 
-import 'react-native-gesture-handler';
-// Apply all necessary polyfills as early as possible
-// to make sure anything imported henceforth sees them.
-import 'react-native-get-random-values';
-import './react/features/mobile/polyfills';
+// NB: This import must always come first.
+import './react/bootstrap.native';
 
-// @ts-ignore
-import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
-import { View } from 'react-native';
+import React, {
+    forwardRef,
+    useEffect,
+    useImperativeHandle,
+    useLayoutEffect,
+    useRef,
+    useState
+} from 'react';
+import { View, ViewStyle } from 'react-native';
 
 import { appNavigate } from './react/features/app/actions.native';
 import { App } from './react/features/app/components/App.native';
 import { setAudioMuted, setVideoMuted } from './react/features/base/media/actions';
-// @ts-ignore
-import JitsiThemePaperProvider from './react/features/base/ui/components/JitsiThemeProvider.native';
 
 
+interface IEventListeners {
+    onConferenceBlurred?: Function;
+    onConferenceFocused?: Function;
+    onConferenceJoined?: Function;
+    onConferenceLeft?: Function;
+    onConferenceWillJoin?: Function;
+    onEnterPictureInPicture?: Function;
+    onParticipantJoined?: Function;
+    onReadyToClose?: Function;
+}
+
+interface IUserInfo {
+    avatarURL: string;
+    displayName: string;
+    email: string;
+}
+
 interface IAppProps {
-    flags: [];
-    meetingOptions: {
-        domain: string;
-        roomName: string;
-        onReadyToClose?: Function;
-        onConferenceJoined?: Function;
-        onConferenceWillJoin?: Function;
-        onConferenceLeft?: Function;
-        onParticipantJoined?: Function;
-        settings?: {
-            startWithAudioMuted?: boolean;
-            startAudioOnly?: boolean;
-            startWithVideoMuted?: boolean;
-        }
-    };
+    config: object;
+    eventListeners?: IEventListeners;
+    flags?: object;
+    room: string;
+    serverURL?: string;
     style?: Object;
+    token?: string;
+    userInfo?: IUserInfo;
 }
 
 /**
  * Main React Native SDK component that displays a Jitsi Meet conference and gets all required params as props
  */
-export const JitsiMeeting = forwardRef(({ flags, meetingOptions, style }: IAppProps, ref) => {
+export const JitsiMeeting = forwardRef((props: IAppProps, ref) => {
     const [ appProps, setAppProps ] = useState({});
     const app = useRef(null);
+    const {
+        config,
+        eventListeners,
+        flags,
+        room,
+        serverURL,
+        style,
+        token,
+        userInfo
+    } = props;
 
     // eslint-disable-next-line arrow-body-style
     useImperativeHandle(ref, () => ({
@@ -64,33 +84,63 @@ export const JitsiMeeting = forwardRef(({ flags, meetingOptions, style }: IAppPr
 
     useEffect(
         () => {
-            const url = `${meetingOptions.domain}/${meetingOptions.roomName}`;
+            const urlObj = {
+                config,
+                jwt: token
+            };
+
+            let urlProps;
+
+            if (room.includes('://')) {
+                urlProps = {
+                    ...urlObj,
+                    url: room
+                };
+            } else {
+                urlProps = {
+                    ...urlObj,
+                    room,
+                    serverURL
+                };
+            }
 
             setAppProps({
-                'url': {
-                    url,
-                    config: meetingOptions.settings
-                },
+                'flags': flags,
                 'rnSdkHandlers': {
-                    onReadyToClose: meetingOptions.onReadyToClose,
-                    onConferenceJoined: meetingOptions.onConferenceJoined,
-                    onConferenceWillJoin: meetingOptions.onConferenceWillJoin,
-                    onConferenceLeft: meetingOptions.onConferenceLeft,
-                    onParticipantJoined: meetingOptions.onParticipantJoined
+                    onConferenceBlurred: eventListeners?.onConferenceBlurred,
+                    onConferenceFocused: eventListeners?.onConferenceFocused,
+                    onConferenceJoined: eventListeners?.onConferenceJoined,
+                    onConferenceWillJoin: eventListeners?.onConferenceWillJoin,
+                    onConferenceLeft: eventListeners?.onConferenceLeft,
+                    onEnterPictureInPicture: eventListeners?.onEnterPictureInPicture,
+                    onParticipantJoined: eventListeners?.onParticipantJoined,
+                    onReadyToClose: eventListeners?.onReadyToClose
                 },
-                'flags': { ...flags }
+                'url': urlProps,
+                'userInfo': userInfo
             });
         }, []
     );
 
+    // eslint-disable-next-line arrow-body-style
+    useLayoutEffect(() => {
+        /**
+         * When you close the component you need to reset it.
+         * In some cases it needs to be added as the parent component may have been destroyed.
+         * Without this change the call remains active without having the jitsi screen.
+        */
+        return () => {
+            const dispatch = app.current?.state?.store?.dispatch;
+
+            dispatch && dispatch(appNavigate(undefined));
+        };
+    }, []);
+
     return (
-        <View style = { style }>
-            <JitsiThemePaperProvider>
-                {/* @ts-ignore */}
-                <App
-                    { ...appProps }
-                    ref = { app } />
-            </JitsiThemePaperProvider>
+        <View style = { style as ViewStyle }>
+            <App
+                { ...appProps }
+                ref = { app } />
         </View>
     );
 });

react-native-sdk/jitsi-meet-rnsdk.podspec

@@ -16,11 +16,20 @@ Pod::Spec.new do |s|
   s.platform       = :ios, '12.4'
 
   s.preserve_paths = 'ios/**/*'
-  s.source_files   =  'ios/**/*.{h,m,swift}'
-
+  s.source_files   =  'ios/**/*.{h,m}'
 
   s.dependency 'React-Core'
-  s.dependency 'ObjectiveDropboxOfficial', '6.2.3'
-  s.dependency 'JitsiWebRTC', '~> 111.0.0'
+  s.dependency 'react-native-webrtc'
 
+  s.dependency 'ObjectiveDropboxOfficial', '6.2.3'
+
+  s.script_phase = {
+      :name => 'Copy Sound Files',
+      :script => '
+          SOURCE_PATH="${PODS_TARGET_SRCROOT}/sounds"
+          TARGET_PATH="$(dirname ${CONFIGURATION_BUILD_DIR})"
+          PROJECT_NAME=$(basename $(dirname $(dirname ${PROJECT_DIR}))).app
+          cp -R "${PODS_TARGET_SRCROOT}/sounds/" "${TARGET_PATH}/${PROJECT_NAME}"
+      ',
+  }
 end

react-native-sdk/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "@jitsi/react-native-sdk",
-    "version": "0.1.0",
+    "version": "0.2.2",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@jitsi/react-native-sdk",
-            "version": "0.1.0",
+            "version": "0.2.2",
             "hasInstallScript": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -28,7 +28,7 @@
                 "js-md5": "0.6.1",
                 "js-sha512": "0.8.0",
                 "jwt-decode": "2.2.0",
-                "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1652.0.0+90da4884/lib-jitsi-meet.tgz",
+                "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1670.0.0+10ebc843/lib-jitsi-meet.tgz",
                 "lodash": "4.17.21",
                 "moment": "2.29.4",
                 "moment-duration-format": "2.2.2",
@@ -44,7 +44,7 @@
                 "react-native-tab-view": "3.1.1",
                 "react-native-url-polyfill": "1.3.0",
                 "react-native-youtube-iframe": "2.2.1",
-                "react-redux": "7.1.0",
+                "react-redux": "7.2.9",
                 "redux": "4.0.4",
                 "redux-thunk": "2.4.1",
                 "unorm": "1.6.0",
@@ -68,7 +68,7 @@
                 "react-native-device-info": "8.4.8",
                 "react-native-gesture-handler": "2.9.0",
                 "react-native-get-random-values": "1.7.2",
-                "react-native-immersive": "2.0.0",
+                "react-native-immersive-mode": "2.0.1",
                 "react-native-keep-awake": "4.0.0",
                 "react-native-orientation-locker": "https://git@github.com/wonday/react-native-orientation-locker#f483520ea6b64b97002374a9e9f053a5299a062a",
                 "react-native-pager-view": "5.4.9",
@@ -823,6 +823,11 @@
                 "@svgr/core": "*"
             }
         },
+        "node_modules/@testrtc/watchrtc-sdk": {
+            "version": "1.36.3",
+            "resolved": "https://registry.npmjs.org/@testrtc/watchrtc-sdk/-/watchrtc-sdk-1.36.3.tgz",
+            "integrity": "sha512-JtcTvvh20t553n8q5ZHpWQeSUTENkQrZbGNvQ05jD8SA2V5PHBok/7my1ZDuA44sgT0y1OfUA8VT7dhcs0VxWg=="
+        },
         "node_modules/@trysound/sax": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -831,11 +836,51 @@
                 "node": ">=10.13.0"
             }
         },
+        "node_modules/@types/hoist-non-react-statics": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+            "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+            "dependencies": {
+                "@types/react": "*",
+                "hoist-non-react-statics": "^3.3.0"
+            }
+        },
         "node_modules/@types/parse-json": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
             "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
         },
+        "node_modules/@types/prop-types": {
+            "version": "15.7.5",
+            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+            "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+        },
+        "node_modules/@types/react": {
+            "version": "18.2.15",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.15.tgz",
+            "integrity": "sha512-oEjE7TQt1fFTFSbf8kkNuc798ahTUzn3Le67/PWjE8MAfYAD/qB7O8hSTcromLFqHCt9bcdOg5GXMokzTjJ5SA==",
+            "dependencies": {
+                "@types/prop-types": "*",
+                "@types/scheduler": "*",
+                "csstype": "^3.0.2"
+            }
+        },
+        "node_modules/@types/react-redux": {
+            "version": "7.1.25",
+            "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.25.tgz",
+            "integrity": "sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==",
+            "dependencies": {
+                "@types/hoist-non-react-statics": "^3.3.0",
+                "@types/react": "*",
+                "hoist-non-react-statics": "^3.3.0",
+                "redux": "^4.0.0"
+            }
+        },
+        "node_modules/@types/scheduler": {
+            "version": "0.16.3",
+            "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
+            "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
+        },
         "node_modules/@xmldom/xmldom": {
             "version": "0.8.7",
             "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.7.tgz",
@@ -920,10 +965,10 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/async": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
+        "node_modules/async-es": {
+            "version": "3.2.4",
+            "resolved": "https://registry.npmjs.org/async-es/-/async-es-3.2.4.tgz",
+            "integrity": "sha512-GFHAAfmW7GzEiHFR6DvE5WMm6+js9pb+RLm+m1UpsyMX+I4j/R4QVw2Te664q+fvDVOz7Y0bORPDNvQS7BJ3Hw=="
         },
         "node_modules/at-least-node": {
             "version": "1.0.0",
@@ -1300,6 +1345,11 @@
                 "node": ">=8.0.0"
             }
         },
+        "node_modules/csstype": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+            "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+        },
         "node_modules/current-executing-script": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/current-executing-script/-/current-executing-script-0.1.3.tgz",
@@ -2398,8 +2448,8 @@
         },
         "node_modules/lib-jitsi-meet": {
             "version": "0.0.0",
-            "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1652.0.0+90da4884/lib-jitsi-meet.tgz",
-            "integrity": "sha512-QLXzAvGwQLpqpQmnbW9wOeScEf3WoBH+osLywzil6FAMsf3URoHR4jFLmkSUAvoxsLbpUSI1ziFFIprbYPnWuQ==",
+            "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1670.0.0+10ebc843/lib-jitsi-meet.tgz",
+            "integrity": "sha512-kTHkhQiuLn28wrDhzcgDwJTJ106bgWMgARxgVZpFM1FyRjgJt2e9pn6mZtjEKT5FZeUcUtpy9cDuU6+yLusZEw==",
             "hasInstallScript": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -2407,7 +2457,8 @@
                 "@jitsi/logger": "2.0.0",
                 "@jitsi/sdp-interop": "git+https://github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b",
                 "@jitsi/sdp-simulcast": "0.4.0",
-                "async": "3.2.3",
+                "@testrtc/watchrtc-sdk": "1.36.3",
+                "async-es": "3.2.4",
                 "base64-js": "1.3.1",
                 "current-executing-script": "0.1.3",
                 "jquery": "3.6.1",
@@ -3023,22 +3074,34 @@
             }
         },
         "node_modules/react-redux": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.1.0.tgz",
-            "integrity": "sha512-hyu/PoFK3vZgdLTg9ozbt7WF3GgX5+Yn3pZm5/96/o4UueXA+zj08aiSC9Mfj2WtD1bvpIb3C5yvskzZySzzaw==",
+            "version": "7.2.9",
+            "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
+            "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
             "dependencies": {
-                "@babel/runtime": "^7.4.5",
-                "hoist-non-react-statics": "^3.3.0",
-                "invariant": "^2.2.4",
+                "@babel/runtime": "^7.15.4",
+                "@types/react-redux": "^7.1.20",
+                "hoist-non-react-statics": "^3.3.2",
                 "loose-envify": "^1.4.0",
                 "prop-types": "^15.7.2",
-                "react-is": "^16.8.6"
+                "react-is": "^17.0.2"
             },
             "peerDependencies": {
-                "react": "^16.8.3",
-                "redux": "^2.0.0 || ^3.0.0 || ^4.0.0-0"
+                "react": "^16.8.3 || ^17 || ^18"
+            },
+            "peerDependenciesMeta": {
+                "react-dom": {
+                    "optional": true
+                },
+                "react-native": {
+                    "optional": true
+                }
             }
         },
+        "node_modules/react-redux/node_modules/react-is": {
+            "version": "17.0.2",
+            "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+            "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+        },
         "node_modules/readdirp": {
             "version": "3.6.0",
             "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -4143,16 +4206,61 @@
                 "svgo": "^2.8.0"
             }
         },
+        "@testrtc/watchrtc-sdk": {
+            "version": "1.36.3",
+            "resolved": "https://registry.npmjs.org/@testrtc/watchrtc-sdk/-/watchrtc-sdk-1.36.3.tgz",
+            "integrity": "sha512-JtcTvvh20t553n8q5ZHpWQeSUTENkQrZbGNvQ05jD8SA2V5PHBok/7my1ZDuA44sgT0y1OfUA8VT7dhcs0VxWg=="
+        },
         "@trysound/sax": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
             "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="
         },
+        "@types/hoist-non-react-statics": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+            "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+            "requires": {
+                "@types/react": "*",
+                "hoist-non-react-statics": "^3.3.0"
+            }
+        },
         "@types/parse-json": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
             "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
         },
+        "@types/prop-types": {
+            "version": "15.7.5",
+            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+            "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+        },
+        "@types/react": {
+            "version": "18.2.15",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.15.tgz",
+            "integrity": "sha512-oEjE7TQt1fFTFSbf8kkNuc798ahTUzn3Le67/PWjE8MAfYAD/qB7O8hSTcromLFqHCt9bcdOg5GXMokzTjJ5SA==",
+            "requires": {
+                "@types/prop-types": "*",
+                "@types/scheduler": "*",
+                "csstype": "^3.0.2"
+            }
+        },
+        "@types/react-redux": {
+            "version": "7.1.25",
+            "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.25.tgz",
+            "integrity": "sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==",
+            "requires": {
+                "@types/hoist-non-react-statics": "^3.3.0",
+                "@types/react": "*",
+                "hoist-non-react-statics": "^3.3.0",
+                "redux": "^4.0.0"
+            }
+        },
+        "@types/scheduler": {
+            "version": "0.16.3",
+            "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
+            "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
+        },
         "@xmldom/xmldom": {
             "version": "0.8.7",
             "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.7.tgz",
@@ -4221,10 +4329,10 @@
                 "is-string": "^1.0.7"
             }
         },
-        "async": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
+        "async-es": {
+            "version": "3.2.4",
+            "resolved": "https://registry.npmjs.org/async-es/-/async-es-3.2.4.tgz",
+            "integrity": "sha512-GFHAAfmW7GzEiHFR6DvE5WMm6+js9pb+RLm+m1UpsyMX+I4j/R4QVw2Te664q+fvDVOz7Y0bORPDNvQS7BJ3Hw=="
         },
         "at-least-node": {
             "version": "1.0.0",
@@ -4480,6 +4588,11 @@
                 "css-tree": "^1.1.2"
             }
         },
+        "csstype": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+            "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+        },
         "current-executing-script": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/current-executing-script/-/current-executing-script-0.1.3.tgz",
@@ -5247,14 +5360,15 @@
             }
         },
         "lib-jitsi-meet": {
-            "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1652.0.0+90da4884/lib-jitsi-meet.tgz",
-            "integrity": "sha512-QLXzAvGwQLpqpQmnbW9wOeScEf3WoBH+osLywzil6FAMsf3URoHR4jFLmkSUAvoxsLbpUSI1ziFFIprbYPnWuQ==",
+            "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1670.0.0+10ebc843/lib-jitsi-meet.tgz",
+            "integrity": "sha512-kTHkhQiuLn28wrDhzcgDwJTJ106bgWMgARxgVZpFM1FyRjgJt2e9pn6mZtjEKT5FZeUcUtpy9cDuU6+yLusZEw==",
             "requires": {
                 "@jitsi/js-utils": "2.0.0",
                 "@jitsi/logger": "2.0.0",
                 "@jitsi/sdp-interop": "git+https://github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b",
                 "@jitsi/sdp-simulcast": "0.4.0",
-                "async": "3.2.3",
+                "@testrtc/watchrtc-sdk": "1.36.3",
+                "async-es": "3.2.4",
                 "base64-js": "1.3.1",
                 "current-executing-script": "0.1.3",
                 "jquery": "3.6.1",
@@ -5705,16 +5819,23 @@
             }
         },
         "react-redux": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.1.0.tgz",
-            "integrity": "sha512-hyu/PoFK3vZgdLTg9ozbt7WF3GgX5+Yn3pZm5/96/o4UueXA+zj08aiSC9Mfj2WtD1bvpIb3C5yvskzZySzzaw==",
+            "version": "7.2.9",
+            "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
+            "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
             "requires": {
-                "@babel/runtime": "^7.4.5",
-                "hoist-non-react-statics": "^3.3.0",
-                "invariant": "^2.2.4",
+                "@babel/runtime": "^7.15.4",
+                "@types/react-redux": "^7.1.20",
+                "hoist-non-react-statics": "^3.3.2",
                 "loose-envify": "^1.4.0",
                 "prop-types": "^15.7.2",
-                "react-is": "^16.8.6"
+                "react-is": "^17.0.2"
+            },
+            "dependencies": {
+                "react-is": {
+                    "version": "17.0.2",
+                    "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+                    "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+                }
             }
         },
         "readdirp": {

react-native-sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jitsi/react-native-sdk",
-    "version": "0.1.0",
+    "version": "0.0.0",
     "description": "React Native SDK for Jitsi Meet.",
     "main": "index.tsx",
     "license": "Apache-2.0",
@@ -29,7 +29,7 @@
         "js-md5": "0.6.1",
         "js-sha512": "0.8.0",
         "jwt-decode": "2.2.0",
-        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1652.0.0+90da4884/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1670.0.0+10ebc843/lib-jitsi-meet.tgz",
         "lodash": "4.17.21",
         "moment": "2.29.4",
         "moment-duration-format": "2.2.2",
@@ -45,7 +45,7 @@
         "react-native-tab-view": "3.1.1",
         "react-native-url-polyfill": "1.3.0",
         "react-native-youtube-iframe": "2.2.1",
-        "react-redux": "7.1.0",
+        "react-redux": "7.2.9",
         "redux": "4.0.4",
         "redux-thunk": "2.4.1",
         "unorm": "1.6.0",
@@ -69,7 +69,7 @@
         "react-native-device-info": "8.4.8",
         "react-native-get-random-values": "1.7.2",
         "react-native-gesture-handler": "2.9.0",
-        "react-native-immersive": "2.0.0",
+        "react-native-immersive-mode": "2.0.1",
         "react-native-keep-awake": "4.0.0",
         "react-native-pager-view": "5.4.9",
         "react-native-paper": "4.11.1",
@@ -86,9 +86,7 @@
         "react-native-webview": "11.15.1"
     },
     "overrides": {
-        "strophe.js@1.5.0": {
-            "@xmldom/xmldom": "0.8.7"
-        }
+        "@xmldom/xmldom": "0.8.7"
     },
     "scripts": {
         "postinstall": "node sdk_instructions.js",
@@ -100,4 +98,4 @@
     "keywords": [
         "react-native"
     ]
-}
+}

react-native-sdk/prepare_sdk.js

@@ -107,10 +107,6 @@ copyFolderRecursiveSync(
     `${iosSrcPath}/dropbox`,
     iosDestPath
 );
-copyFolderRecursiveSync(
-    '../ios/sdk/src/picture-in-picture',
-    iosDestPath
-);
 fs.copyFileSync(
     `${iosSrcPath}/AppInfo.m`,
     `${iosDestPath}/AppInfo.m`

react-native-sdk/update_dependencies.js

@@ -23,18 +23,24 @@ function updateDependencies() {
         }
     }
 
+    packageJSON.overrides = packageJSON.overrides || {};
+
+    for (const key in RNSDKpackageJSON.overrides) {
+        if (!packageJSON.overrides.hasOwnProperty(key)) {
+            packageJSON.overrides[key] = RNSDKpackageJSON.overrides[key];
+            updated = true;
+        }
+    }
+
     if (!updated) {
         return;
     }
 
     console.log(`
 =========================
-The following dependencies were added to your package.json:
-\n
-${Object.keys(packageJSON.dependencies)}
-\n
-Make sure you run npm install
-If you are building for ios run cd ios && pod install to link them.
+🚀 Your project was updated!
+🛠 Make sure you run npm install
+📱 If you are building for iOS run cd ios && pod install to link them.
 =========================
 `);
 
@@ -46,9 +52,7 @@ If you are building for ios run cd ios && pod install to link them.
             return item;
         }, {});
 
-    const data = JSON.stringify(packageJSON, null, 2);
-
-    fs.writeFileSync(pathToPackageJSON, data);
+    fs.writeFileSync(pathToPackageJSON, JSON.stringify(packageJSON, null, 2));
 
     console.log(
         'All needed dependencies have been updated. \nPlease run npm install.'

react/bootstrap.native.js

@@ -0,0 +1,7 @@
+// https://github.com/software-mansion/react-native-gesture-handler/issues/320#issuecomment-443815828
+import 'react-native-gesture-handler';
+
+// Apply all necessary polyfills as early as possible to make sure anything imported henceforth
+// sees them.
+import 'react-native-get-random-values';
+import './features/mobile/polyfills';

react/features/app/actions.native.ts

@@ -8,10 +8,10 @@ import {
 import {
     createFakeConfig,
     restoreConfig
-} from '../base/config/functions';
-import { connect, disconnect, setLocationURL } from '../base/connection/actions';
+} from '../base/config/functions.native';
+import { connect, disconnect, setLocationURL } from '../base/connection/actions.native';
 import { loadConfig } from '../base/lib-jitsi-meet/functions.native';
-import { createDesiredLocalTracks } from '../base/tracks/actions';
+import { createDesiredLocalTracks } from '../base/tracks/actions.native';
 import isInsecureRoomName from '../base/util/isInsecureRoomName';
 import { parseURLParams } from '../base/util/parseURLParams';
 import {
@@ -27,6 +27,7 @@ import {
 } from '../mobile/navigation/rootNavigationContainerRef';
 import { screen } from '../mobile/navigation/routes';
 import { clearNotifications } from '../notifications/actions';
+import { isUnsafeRoomWarningEnabled } from '../prejoin/functions';
 
 import { addTrackStateToURL, getDefaultURL } from './functions.native';
 import logger from './logger';
@@ -136,25 +137,24 @@ export function appNavigate(uri?: string, options: IReloadNowOptions = {}) {
         dispatch(setConfig(config));
         dispatch(setRoom(room));
 
-        if (room) {
-            if (isInsecureRoomName(room)) {
+        if (!room) {
+            goBackToRoot(getState(), dispatch);
+
+            return;
+        }
+
+        dispatch(createDesiredLocalTracks());
+        dispatch(clearNotifications());
+
+        if (!options.hidePrejoin && isPrejoinPageEnabled(getState())) {
+            if (isUnsafeRoomWarningEnabled(getState()) && isInsecureRoomName(room)) {
                 navigateRoot(screen.unsafeRoomWarning);
-
-                return;
-            }
-            dispatch(createDesiredLocalTracks());
-            dispatch(clearNotifications());
-
-            const { hidePrejoin } = options;
-
-            if (!hidePrejoin && isPrejoinPageEnabled(getState())) {
-                navigateRoot(screen.preJoin);
             } else {
-                dispatch(connect());
-                navigateRoot(screen.conference.root);
+                navigateRoot(screen.preJoin);
             }
         } else {
-            goBackToRoot(getState(), dispatch);
+            dispatch(connect());
+            navigateRoot(screen.conference.root);
         }
     };
 }

react/features/app/components/App.native.tsx

@@ -1,5 +1,6 @@
 import React, { ComponentType } from 'react';
 import { NativeModules, Platform, StyleSheet, View } from 'react-native';
+import DeviceInfo from 'react-native-device-info';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import SplashScreen from 'react-native-splash-screen';
 
@@ -11,6 +12,7 @@ import { getFeatureFlag } from '../../base/flags/functions';
 import { clientResized, setSafeAreaInsets } from '../../base/responsive-ui/actions';
 import DimensionsDetector from '../../base/responsive-ui/components/DimensionsDetector.native';
 import { updateSettings } from '../../base/settings/actions';
+import JitsiThemePaperProvider from '../../base/ui/components/JitsiThemeProvider.native';
 import { _getRouteToRender } from '../getRouteToRender.native';
 import logger from '../logger';
 
@@ -36,7 +38,7 @@ interface IProps extends AbstractAppProps {
     /**
      * An object with the feature flags.
      */
-    flags: Object;
+    flags: any;
 
     /**
      * An object with user information (display name, email, avatar URL).
@@ -88,6 +90,20 @@ export class App extends AbstractApp<IProps> {
         logger.info(`Loaded SDK ${AppInfo.sdkVersion}${liteTxt}`);
     }
 
+    /**
+     * Implements React's {@link Component#render()}.
+     *
+     * @inheritdoc
+     * @returns {ReactElement}
+     */
+    render() {
+        return (
+            <JitsiThemePaperProvider>
+                { super.render() }
+            </JitsiThemePaperProvider>
+        );
+    }
+
     /**
      * Initializes feature flags and updates settings.
      *
@@ -95,7 +111,13 @@ export class App extends AbstractApp<IProps> {
      */
     async _extraInit() {
         const { dispatch, getState } = this.state.store ?? {};
-        const { flags } = this.props;
+        const { flags = {} } = this.props;
+
+        // CallKit does not work on the simulator, make sure we disable it.
+        if (Platform.OS === 'ios' && DeviceInfo.isEmulatorSync()) {
+            flags['call-integration.enabled'] = false;
+            logger.info('Disabling CallKit because this is a simulator');
+        }
 
         // We set these early enough so then we avoid any unnecessary re-renders.
         dispatch?.(updateFlags(flags));

react/features/app/getRouteToRender.web.ts

@@ -1,6 +1,7 @@
 // @ts-expect-error
 import { generateRoomWithoutSeparator } from '@jitsi/js-utils/random';
 
+import { getTokenAuthUrl } from '../authentication/functions';
 import { IStateful } from '../base/app/types';
 import { isRoomValid } from '../base/conference/functions';
 import { isSupportedBrowser } from '../base/environment/environment';
@@ -36,11 +37,24 @@ export function _getRouteToRender(stateful: IStateful) {
  * @returns {Promise|undefined}
  */
 function _getWebConferenceRoute(state: IReduxState) {
-    if (!isRoomValid(state['features/base/conference'].room)) {
+    const room = state['features/base/conference'].room;
+
+    if (!isRoomValid(room)) {
         return;
     }
 
     const route = _getEmptyRoute();
+    const config = state['features/base/config'];
+
+    // if we have auto redirect enabled, and we have previously logged in successfully
+    // let's redirect to the auth url to get the token and login again
+    if (config.tokenAuthUrl && config.tokenAuthUrlAutoRedirect
+        && state['features/authentication'].tokenAuthUrlSuccessful
+        && !state['features/base/jwt'].jwt && room) {
+        route.href = getTokenAuthUrl(config, room);
+
+        return Promise.resolve(route);
+    }
 
     // Update the location if it doesn't match. This happens when a room is
     // joined from the welcome page. The reason for doing this instead of using

react/features/app/middleware.ts

@@ -2,6 +2,7 @@ import { AnyAction } from 'redux';
 
 import { createConnectionEvent } from '../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../analytics/functions';
+import { appWillNavigate } from '../base/app/actions';
 import { SET_ROOM } from '../base/conference/actionTypes';
 import { CONNECTION_ESTABLISHED, CONNECTION_FAILED } from '../base/connection/actionTypes';
 import { getURLWithoutParams } from '../base/connection/utils';
@@ -146,11 +147,15 @@ function _isMaybeSplitBrainError(getState: IStore['getState'], action: AnyAction
  * @private
  * @returns {void}
  */
-function _navigate({ getState }: IStore) {
+function _navigate({ dispatch, getState }: IStore) {
     const state = getState();
     const { app } = state['features/base/app'];
 
-    _getRouteToRender(state).then(route => app._navigate(route));
+    _getRouteToRender(state).then((route: Object) => {
+        dispatch(appWillNavigate(app, route));
+
+        return app._navigate(route);
+    });
 }
 
 /**

react/features/app/middlewares.any.ts

@@ -1,5 +1,7 @@
 import '../analytics/middleware';
+import '../authentication/middleware';
 import '../av-moderation/middleware';
+import '../base/app/middleware';
 import '../base/conference/middleware';
 import '../base/config/middleware';
 import '../base/jwt/middleware';

react/features/app/middlewares.native.ts

@@ -1,4 +1,3 @@
-import '../authentication/middleware';
 import '../dynamic-branding/middleware';
 import '../gifs/middleware';
 import '../mobile/audio-mode/middleware';

react/features/app/middlewares.web.ts

@@ -1,4 +1,4 @@
-import '../authentication/middleware';
+import '../base/connection/middleware';
 import '../base/i18n/middleware';
 import '../base/devices/middleware';
 import '../base/media/middleware';

react/features/authentication/actionTypes.ts

@@ -8,6 +8,34 @@
  */
 export const CANCEL_LOGIN = 'CANCEL_LOGIN';
 
+/**
+ * The type of (redux) action which signals to login.
+ *
+ * {
+ *     type: LOGOUT
+ * }
+ */
+export const LOGIN = 'LOGIN';
+
+/**
+ * The type of (redux) action which signals to logout.
+ *
+ * {
+ *     type: LOGOUT
+ * }
+ */
+export const LOGOUT = 'LOGOUT';
+
+/**
+ * The type of (redux) action which signals that we have authenticated successful when
+ * tokenAuthUrl is set.
+ *
+ * {
+ *     type: SET_TOKEN_AUTH_URL_SUCCESS
+ * }
+ */
+export const SET_TOKEN_AUTH_URL_SUCCESS = 'SET_TOKEN_AUTH_URL_SUCCESS';
+
 /**
  * The type of (redux) action which signals that the cyclic operation of waiting
  * for conference owner has been aborted.

react/features/authentication/actions.any.ts

@@ -1,9 +1,10 @@
 import { IStore } from '../app/types';
 import { checkIfCanJoin } from '../base/conference/actions';
 import { IJitsiConference } from '../base/conference/reducer';
-import { openDialog } from '../base/dialog/actions';
+import { hideDialog, openDialog } from '../base/dialog/actions';
 
 import {
+    SET_TOKEN_AUTH_URL_SUCCESS,
     STOP_WAIT_FOR_OWNER,
     UPGRADE_ROLE_FINISHED,
     UPGRADE_ROLE_STARTED, WAIT_FOR_OWNER
@@ -126,6 +127,16 @@ function _upgradeRoleStarted(thenableWithCancel: Object) {
     };
 }
 
+/**
+ * Hides an authentication dialog where the local participant
+ * should authenticate.
+ *
+ * @returns {Function}.
+ */
+export function hideLoginDialog() {
+    return hideDialog(LoginDialog);
+}
+
 /**
  * Opens {@link WaitForOnwerDialog}.
  *
@@ -175,3 +186,16 @@ export function waitForOwner() {
 export function openLoginDialog() {
     return openDialog(LoginDialog);
 }
+
+/**
+ * Updates the config with new options.
+ *
+ * @param {boolean} value - The new value.
+ * @returns {Function}
+ */
+export function setTokenAuthUrlSuccess(value: boolean) {
+    return {
+        type: SET_TOKEN_AUTH_URL_SUCCESS,
+        value
+    };
+}

react/features/authentication/actions.native.ts

@@ -1,4 +1,4 @@
-import { appNavigate } from '../app/actions';
+import { appNavigate } from '../app/actions.native';
 import { IStore } from '../app/types';
 import { conferenceLeft } from '../base/conference/actions';
 import { connectionFailed } from '../base/connection/actions.native';
@@ -55,10 +55,21 @@ export function cancelWaitForOwner() {
         // clients/consumers need an event.
         const { authRequired } = getState()['features/base/conference'];
 
-        authRequired && dispatch(conferenceLeft(authRequired));
+        if (authRequired) {
+            dispatch(conferenceLeft(authRequired));
 
-        dispatch(appNavigate(undefined));
+            // in case we are showing lobby and on top of it wait for owner
+            // we do not want to navigate away from the conference
+            dispatch(appNavigate(undefined));
+        }
     };
 }
 
-
+/** .
+ * Redirect to the default location (e.g. Welcome page).
+ *
+ * @returns {Function}
+ */
+export function redirectToDefaultLocation() {
+    return (dispatch: IStore['dispatch']) => dispatch(appNavigate(undefined));
+}

react/features/authentication/actions.web.ts

@@ -1,12 +1,11 @@
 import { maybeRedirectToWelcomePage } from '../app/actions.web';
 import { IStore } from '../app/types';
-import { hideDialog, openDialog } from '../base/dialog/actions';
 
 import {
-    CANCEL_LOGIN
+    CANCEL_LOGIN,
+    LOGIN,
+    LOGOUT
 } from './actionTypes';
-import LoginDialog from './components/web/LoginDialog';
-import WaitForOwnerDialog from './components/web/WaitForOwnerDialog';
 
 export * from './actions.any';
 
@@ -25,41 +24,51 @@ export function cancelLogin() {
 
 /**
  * Cancels authentication, closes {@link WaitForOwnerDialog}
- * and navigates back to the welcome page.
+ * and navigates back to the welcome page only in the case of authentication required error.
+ * We can be showing the dialog while lobby is enabled and participant is still waiting there and hiding this dialog
+ * should do nothing.
  *
  * @returns {Function}
  */
 export function cancelWaitForOwner() {
-    return (dispatch: IStore['dispatch']) => {
-        dispatch(maybeRedirectToWelcomePage());
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+        const { authRequired } = getState()['features/base/conference'];
+
+        authRequired && dispatch(maybeRedirectToWelcomePage());
+    };
+}
+
+/** .
+ * Redirect to the default location (e.g. Welcome page).
+ *
+ * @returns {Function}
+ */
+export function redirectToDefaultLocation() {
+    return (dispatch: IStore['dispatch']) => dispatch(maybeRedirectToWelcomePage());
+}
+
+/**
+ * Login.
+ *
+ * @returns {{
+ *     type: LOGIN
+ * }}
+ */
+export function login() {
+    return {
+        type: LOGIN
     };
 }
 
 /**
- * Hides a authentication dialog where the local participant
- * should authenticate.
+ * Logout.
  *
- * @returns {Function}.
+ * @returns {{
+ *     type: LOGOUT
+ * }}
  */
-export function hideLoginDialog() {
-    return hideDialog(LoginDialog);
+export function logout() {
+    return {
+        type: LOGOUT
+    };
 }
-
-/**
- * Shows a notification dialog that authentication is required to create the.
- * Conference.
- * This is used for external auth.
- *
- * @param {string} room - The room name.
- * @param {Function} onAuthNow - The function to be invoked when external authentication.
- *
- * @returns {Function}.
- */
-export function openAuthDialog(room: String, onAuthNow?: Function) {
-    return openDialog(WaitForOwnerDialog, {
-        room,
-        onAuthNow
-    });
-}
-
-

react/features/authentication/components/web/LoginDialog.tsx

@@ -2,8 +2,6 @@ import React, { Component } from 'react';
 import { WithTranslation } from 'react-i18next';
 import { connect as reduxConnect } from 'react-redux';
 
-// @ts-expect-error
-import { connect } from '../../../../../connection';
 import { IReduxState, IStore } from '../../../app/types';
 import { IJitsiConference } from '../../../base/conference/reducer';
 import { IConfig } from '../../../base/config/configType';
@@ -12,6 +10,7 @@ import { translate, translateToHTML } from '../../../base/i18n/functions';
 import { JitsiConnectionErrors } from '../../../base/lib-jitsi-meet';
 import Dialog from '../../../base/ui/components/web/Dialog';
 import Input from '../../../base/ui/components/web/Input';
+import { joinConference } from '../../../prejoin/actions.web';
 import {
     authenticateAndUpgradeRole,
     cancelLogin
@@ -54,11 +53,6 @@ interface IProps extends WithTranslation {
      */
     dispatch: IStore['dispatch'];
 
-    /**
-     * Invoked when username and password are submitted.
-     */
-    onSuccess: Function;
-
     /**
      * Conference room name.
      */
@@ -70,11 +64,6 @@ interface IProps extends WithTranslation {
  */
 interface IState {
 
-    /**
-     * Authentication process starts before joining the conference room.
-     */
-    loginStarted: boolean;
-
     /**
      * The user entered password for the conference.
      */
@@ -102,8 +91,7 @@ class LoginDialog extends Component<IProps, IState> {
 
         this.state = {
             username: '',
-            password: '',
-            loginStarted: false
+            password: ''
         };
 
         this._onCancelLogin = this._onCancelLogin.bind(this);
@@ -135,8 +123,6 @@ class LoginDialog extends Component<IProps, IState> {
         const {
             _conference: conference,
             _configHosts: configHosts,
-            roomName,
-            onSuccess,
             dispatch
         } = this.props;
         const { password, username } = this.state;
@@ -148,19 +134,9 @@ class LoginDialog extends Component<IProps, IState> {
         if (conference) {
             dispatch(authenticateAndUpgradeRole(jid, password, conference));
         } else {
-            this.setState({
-                loginStarted: true
-            });
-
-            connect(jid, password, roomName)
-                .then((connection: any) => {
-                    onSuccess?.(connection);
-                })
-                .catch(() => {
-                    this.setState({
-                        loginStarted: false
-                    });
-                });
+            // dispatch(connect(jid, password));
+            // FIXME: Workaround for the web version. To be removed once we get rid of conference.js
+            dispatch(joinConference(undefined, false, jid, password));
         }
     }
 
@@ -249,7 +225,7 @@ class LoginDialog extends Component<IProps, IState> {
             _connecting: connecting,
             t
         } = this.props;
-        const { password, loginStarted, username } = this.state;
+        const { password, username } = this.state;
 
         return (
             <Dialog
@@ -258,7 +234,6 @@ class LoginDialog extends Component<IProps, IState> {
                 hideCloseButton = { true }
                 ok = {{
                     disabled: connecting
-                        || loginStarted
                         || !password
                         || !username,
                     translationKey: 'dialog.login'
@@ -315,7 +290,7 @@ function mapStateToProps(state: IReduxState) {
     return {
         _conference: authRequired || conference,
         _configHosts: configHosts,
-        _connecting: connecting || thenableWithCancel,
+        _connecting: Boolean(connecting) || Boolean(thenableWithCancel),
         _error: connectionError || authenticateAndUpgradeRoleError,
         _progress: progress
     };

react/features/authentication/components/web/WaitForOwnerDialog.tsx

@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { IStore } from '../../../app/types';
 import { translate } from '../../../base/i18n/functions';
 import Dialog from '../../../base/ui/components/web/Dialog';
-import { cancelWaitForOwner } from '../../actions.web';
+import { cancelWaitForOwner, login } from '../../actions.web';
 
 /**
  * The type of the React {@code Component} props of {@link WaitForOwnerDialog}.
@@ -16,11 +16,6 @@ interface IProps extends WithTranslation {
      * Redux store dispatch method.
      */
     dispatch: IStore['dispatch'];
-
-    /**
-     * Function to be invoked after click.
-     */
-    onAuthNow?: Function;
 }
 
 /**
@@ -61,9 +56,7 @@ class WaitForOwnerDialog extends PureComponent<IProps> {
      * @returns {void}
      */
     _onIAmHost() {
-        const { onAuthNow } = this.props;
-
-        onAuthNow?.();
+        this.props.dispatch(login());
     }
 
     /**

react/features/authentication/functions.ts

@@ -1,6 +1,4 @@
 import { IConfig } from '../base/config/configType';
-import JitsiMeetJS from '../base/lib-jitsi-meet';
-
 
 /**
  * Checks if the token for authentication is available.
@@ -12,13 +10,30 @@ export const isTokenAuthEnabled = (config: IConfig) =>
     typeof config.tokenAuthUrl === 'string'
     && config.tokenAuthUrl.length;
 
-
 /**
- * Token url.
+ * Creates the URL pointing to JWT token authentication service. It is
+ * formatted from the 'urlPattern' argument which can contain the following
+ * constants:
+ * '{room}' - name of the conference room passed as <tt>roomName</tt>
+ * argument to this method.
+ * '{roleUpgrade}' - will contain 'true' if the URL will be used for
+ * the role upgrade scenario, where user connects from anonymous domain and
+ * then gets upgraded to the moderator by logging-in from the popup window.
  *
- * @param {Object} config - Configuration state object from store.
- * @returns {string}
+ * @param {Object} config - Configuration state object from store. A URL pattern pointing to the login service.
+ * @param {string} roomName - The name of the conference room for which the user will be authenticated.
+ *
+ * @returns {string|undefined} - The URL pointing to JWT login service or
+ * <tt>undefined</tt> if the pattern stored in config is not a string and the URL can not be
+ * constructed.
  */
-export const getTokenAuthUrl = (config: IConfig) =>
-    JitsiMeetJS.util.AuthUtil.getTokenAuthUrl.bind(null,
-        config.tokenAuthUrl);
+export const getTokenAuthUrl = (config: IConfig, roomName: string) => {
+
+    const url = config.tokenAuthUrl;
+
+    if (typeof url !== 'string' || !roomName) {
+        return undefined;
+    }
+
+    return url.replace('{room}', roomName);
+};

react/features/authentication/middleware.native.ts

@@ -1,190 +0,0 @@
-import { appNavigate } from '../app/actions.native';
-import { IStore } from '../app/types';
-import {
-    CONFERENCE_FAILED,
-    CONFERENCE_JOINED,
-    CONFERENCE_LEFT
-} from '../base/conference/actionTypes';
-import { CONNECTION_ESTABLISHED, CONNECTION_FAILED } from '../base/connection/actionTypes';
-import { hideDialog } from '../base/dialog/actions';
-import { isDialogOpen } from '../base/dialog/functions';
-import {
-    JitsiConferenceErrors,
-    JitsiConnectionErrors
-} from '../base/lib-jitsi-meet';
-import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
-
-import {
-    CANCEL_LOGIN,
-    STOP_WAIT_FOR_OWNER,
-    UPGRADE_ROLE_FINISHED,
-    WAIT_FOR_OWNER
-} from './actionTypes';
-import {
-    openLoginDialog,
-    openWaitForOwnerDialog,
-    stopWaitForOwner,
-    waitForOwner } from './actions.native';
-import { LoginDialog, WaitForOwnerDialog } from './components';
-
-/**
- * Middleware that captures connection or conference failed errors and controls
- * {@link WaitForOwnerDialog} and {@link LoginDialog}.
- *
- * FIXME Some of the complexity was introduced by the lack of dialog stacking.
- *
- * @param {Store} store - Redux store.
- * @returns {Function}
- */
-MiddlewareRegistry.register(store => next => action => {
-    switch (action.type) {
-    case CANCEL_LOGIN: {
-        const { dispatch, getState } = store;
-        const { thenableWithCancel } = getState()['features/authentication'];
-
-        thenableWithCancel?.cancel();
-
-        // The LoginDialog can be opened on top of "wait for owner". The app
-        // should navigate only if LoginDialog was open without the
-        // WaitForOwnerDialog.
-        if (!isDialogOpen(store, WaitForOwnerDialog)) {
-            if (_isWaitingForOwner(store)) {
-                // Instead of hiding show the new one.
-                const result = next(action);
-
-                dispatch(openWaitForOwnerDialog());
-
-                return result;
-            }
-
-            // Go back to the app's entry point.
-            _hideLoginDialog(store);
-
-            const state = getState();
-            const { authRequired, conference } = state['features/base/conference'];
-            const { passwordRequired } = state['features/base/connection'];
-
-            // Only end the meeting if we are not already inside and trying to upgrade.
-            // NOTE: Despite it's confusing name, `passwordRequired` implies an XMPP
-            // connection auth error.
-            if ((passwordRequired || authRequired) && !conference) {
-                dispatch(appNavigate(undefined));
-            }
-        }
-        break;
-    }
-
-    case CONFERENCE_FAILED: {
-        const { error } = action;
-
-        // XXX The feature authentication affords recovery from
-        // CONFERENCE_FAILED caused by
-        // JitsiConferenceErrors.AUTHENTICATION_REQUIRED.
-        let recoverable;
-
-        if (error.name === JitsiConferenceErrors.AUTHENTICATION_REQUIRED) {
-            if (typeof error.recoverable === 'undefined') {
-                error.recoverable = true;
-            }
-            recoverable = error.recoverable;
-        }
-        if (recoverable) {
-            store.dispatch(waitForOwner());
-        } else {
-            store.dispatch(stopWaitForOwner());
-        }
-        break;
-    }
-
-    case CONFERENCE_JOINED:
-        if (_isWaitingForOwner(store)) {
-            store.dispatch(stopWaitForOwner());
-        }
-        _hideLoginDialog(store);
-        break;
-
-    case CONFERENCE_LEFT:
-        store.dispatch(stopWaitForOwner());
-        break;
-
-    case CONNECTION_ESTABLISHED:
-        _hideLoginDialog(store);
-        break;
-
-    case CONNECTION_FAILED: {
-        const { error } = action;
-
-        if (error
-                && error.name === JitsiConnectionErrors.PASSWORD_REQUIRED
-                && typeof error.recoverable === 'undefined') {
-            error.recoverable = true;
-            store.dispatch(openLoginDialog());
-        }
-        break;
-    }
-
-    case STOP_WAIT_FOR_OWNER:
-        _clearExistingWaitForOwnerTimeout(store);
-        store.dispatch(hideDialog(WaitForOwnerDialog));
-        break;
-
-    case UPGRADE_ROLE_FINISHED: {
-        const { error, progress } = action;
-
-        if (!error && progress === 1) {
-            _hideLoginDialog(store);
-        }
-        break;
-    }
-
-    case WAIT_FOR_OWNER: {
-        _clearExistingWaitForOwnerTimeout(store);
-
-        const { handler, timeoutMs }: { handler: () => void; timeoutMs: number; } = action;
-
-        action.waitForOwnerTimeoutID = setTimeout(handler, timeoutMs);
-
-        // The WAIT_FOR_OWNER action is cyclic and we don't want to hide the
-        // login dialog every few seconds.
-        isDialogOpen(store, LoginDialog)
-            || store.dispatch(openWaitForOwnerDialog());
-        break;
-    }
-    }
-
-    return next(action);
-});
-
-/**
- * Will clear the wait for conference owner timeout handler if any is currently
- * set.
- *
- * @param {Object} store - The redux store.
- * @returns {void}
- */
-function _clearExistingWaitForOwnerTimeout(
-        { getState }: IStore) {
-    const { waitForOwnerTimeoutID } = getState()['features/authentication'];
-
-    waitForOwnerTimeoutID && clearTimeout(waitForOwnerTimeoutID);
-}
-
-/**
- * Hides {@link LoginDialog} if it's currently displayed.
- *
- * @param {Object} store - The redux store.
- * @returns {void}
- */
-function _hideLoginDialog({ dispatch }: IStore) {
-    dispatch(hideDialog(LoginDialog));
-}
-
-/**
- * Checks if the cyclic "wait for conference owner" task is currently scheduled.
- *
- * @param {Object} store - The redux store.
- * @returns {boolean}
- */
-function _isWaitingForOwner({ getState }: IStore) {
-    return Boolean(getState()['features/authentication'].waitForOwnerTimeoutID);
-}

react/features/authentication/middleware.ts

@@ -0,0 +1,312 @@
+import { IStore } from '../app/types';
+import { APP_WILL_NAVIGATE } from '../base/app/actionTypes';
+import {
+    CONFERENCE_FAILED,
+    CONFERENCE_JOINED,
+    CONFERENCE_LEFT
+} from '../base/conference/actionTypes';
+import { isRoomValid } from '../base/conference/functions';
+import { CONNECTION_ESTABLISHED, CONNECTION_FAILED } from '../base/connection/actionTypes';
+import { hangup } from '../base/connection/actions';
+import { hideDialog } from '../base/dialog/actions';
+import { isDialogOpen } from '../base/dialog/functions';
+import {
+    JitsiConferenceErrors,
+    JitsiConnectionErrors
+} from '../base/lib-jitsi-meet';
+import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
+import { getBackendSafeRoomName } from '../base/util/uri';
+import { showErrorNotification } from '../notifications/actions';
+import { NOTIFICATION_TIMEOUT_TYPE } from '../notifications/constants';
+import { openLogoutDialog } from '../settings/actions';
+
+import {
+    CANCEL_LOGIN,
+    LOGIN,
+    LOGOUT,
+    STOP_WAIT_FOR_OWNER,
+    UPGRADE_ROLE_FINISHED,
+    WAIT_FOR_OWNER
+} from './actionTypes';
+import {
+    hideLoginDialog,
+    openLoginDialog,
+    openWaitForOwnerDialog,
+    redirectToDefaultLocation,
+    setTokenAuthUrlSuccess,
+    stopWaitForOwner,
+    waitForOwner
+} from './actions';
+import { LoginDialog, WaitForOwnerDialog } from './components';
+import { getTokenAuthUrl, isTokenAuthEnabled } from './functions';
+
+/**
+ * Middleware that captures connection or conference failed errors and controls
+ * {@link WaitForOwnerDialog} and {@link LoginDialog}.
+ *
+ * FIXME Some of the complexity was introduced by the lack of dialog stacking.
+ *
+ * @param {Store} store - Redux store.
+ * @returns {Function}
+ */
+MiddlewareRegistry.register(store => next => action => {
+    switch (action.type) {
+    case CANCEL_LOGIN: {
+        const { dispatch, getState } = store;
+        const state = getState();
+        const { thenableWithCancel } = state['features/authentication'];
+
+        thenableWithCancel?.cancel();
+
+        // The LoginDialog can be opened on top of "wait for owner". The app
+        // should navigate only if LoginDialog was open without the
+        // WaitForOwnerDialog.
+        if (!isDialogOpen(store, WaitForOwnerDialog)) {
+            if (_isWaitingForOwner(store)) {
+                // Instead of hiding show the new one.
+                const result = next(action);
+
+                dispatch(openWaitForOwnerDialog());
+
+                return result;
+            }
+
+            dispatch(hideLoginDialog());
+
+            const { authRequired, conference } = state['features/base/conference'];
+            const { passwordRequired } = state['features/base/connection'];
+
+            // Only end the meeting if we are not already inside and trying to upgrade.
+            // NOTE: Despite it's confusing name, `passwordRequired` implies an XMPP
+            // connection auth error.
+            if ((passwordRequired || authRequired) && !conference) {
+                dispatch(redirectToDefaultLocation());
+            }
+        }
+        break;
+    }
+
+    case CONFERENCE_FAILED: {
+        const { error } = action;
+
+        // XXX The feature authentication affords recovery from
+        // CONFERENCE_FAILED caused by
+        // JitsiConferenceErrors.AUTHENTICATION_REQUIRED.
+        let recoverable;
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const [ _lobbyJid, lobbyWaitingForHost ] = error.params;
+
+        if (error.name === JitsiConferenceErrors.AUTHENTICATION_REQUIRED
+            || (error.name === JitsiConferenceErrors.MEMBERS_ONLY_ERROR && lobbyWaitingForHost)) {
+            if (typeof error.recoverable === 'undefined') {
+                error.recoverable = true;
+            }
+            recoverable = error.recoverable;
+        }
+        if (recoverable) {
+            store.dispatch(waitForOwner());
+        } else {
+            store.dispatch(stopWaitForOwner());
+        }
+        break;
+    }
+
+    case CONFERENCE_JOINED: {
+        const { dispatch, getState } = store;
+        const state = getState();
+        const config = state['features/base/config'];
+
+        if (isTokenAuthEnabled(config)
+            && config.tokenAuthUrlAutoRedirect
+            && state['features/base/jwt'].jwt) {
+            // auto redirect is turned on and we have succesfully logged in
+            // let's mark that
+            dispatch(setTokenAuthUrlSuccess(true));
+        }
+
+        if (_isWaitingForOwner(store)) {
+            store.dispatch(stopWaitForOwner());
+        }
+        store.dispatch(hideLoginDialog());
+        break;
+    }
+
+    case CONFERENCE_LEFT:
+        store.dispatch(stopWaitForOwner());
+        break;
+
+    case CONNECTION_ESTABLISHED:
+        store.dispatch(hideLoginDialog());
+        break;
+
+    case CONNECTION_FAILED: {
+        const { error } = action;
+        const state = store.getState();
+        const { jwt } = state['features/base/jwt'];
+
+        if (error
+                && error.name === JitsiConnectionErrors.PASSWORD_REQUIRED
+                && typeof error.recoverable === 'undefined'
+                && !jwt) {
+            error.recoverable = true;
+
+            _handleLogin(store);
+        }
+
+        break;
+    }
+
+    case LOGIN: {
+        _handleLogin(store);
+
+        break;
+    }
+
+    case LOGOUT: {
+        const { dispatch, getState } = store;
+        const state = getState();
+        const config = state['features/base/config'];
+        const { conference } = store.getState()['features/base/conference'];
+
+        if (!conference) {
+            break;
+        }
+
+        dispatch(openLogoutDialog(() => {
+            const logoutUrl = config.tokenLogoutUrl;
+
+            if (isTokenAuthEnabled(config)
+                && config.tokenAuthUrlAutoRedirect
+                && state['features/base/jwt'].jwt) {
+                // user is logging out remove auto redirect indication
+                dispatch(setTokenAuthUrlSuccess(false));
+            }
+
+            if (logoutUrl) {
+                window.location.href = logoutUrl;
+
+                return;
+            }
+
+            conference.room.moderator.logout(() => dispatch(hangup(true)));
+        }));
+
+        break;
+    }
+
+    case APP_WILL_NAVIGATE: {
+        const { dispatch, getState } = store;
+        const state = getState();
+        const config = state['features/base/config'];
+        const room = state['features/base/conference'].room;
+
+        if (isRoomValid(room)
+            && config.tokenAuthUrl && config.tokenAuthUrlAutoRedirect
+            && state['features/authentication'].tokenAuthUrlSuccessful
+            && !state['features/base/jwt'].jwt) {
+            // if we have auto redirect enabled, and we have previously logged in successfully
+            // we will redirect to the auth url to get the token and login again
+            // we want to mark token auth success to false as if login is unsuccessful
+            // the participant can join anonymously and not go in login loop
+            dispatch(setTokenAuthUrlSuccess(false));
+        }
+
+        break;
+    }
+
+    case STOP_WAIT_FOR_OWNER:
+        _clearExistingWaitForOwnerTimeout(store);
+        store.dispatch(hideDialog(WaitForOwnerDialog));
+        break;
+
+    case UPGRADE_ROLE_FINISHED: {
+        const { error, progress } = action;
+
+        if (!error && progress === 1) {
+            store.dispatch(hideLoginDialog());
+        }
+        break;
+    }
+
+    case WAIT_FOR_OWNER: {
+        _clearExistingWaitForOwnerTimeout(store);
+
+        const { handler, timeoutMs }: { handler: () => void; timeoutMs: number; } = action;
+
+        action.waitForOwnerTimeoutID = setTimeout(handler, timeoutMs);
+
+        // The WAIT_FOR_OWNER action is cyclic, and we don't want to hide the
+        // login dialog every few seconds.
+        isDialogOpen(store, LoginDialog)
+            || store.dispatch(openWaitForOwnerDialog());
+        break;
+    }
+    }
+
+    return next(action);
+});
+
+/**
+ * Will clear the wait for conference owner timeout handler if any is currently
+ * set.
+ *
+ * @param {Object} store - The redux store.
+ * @returns {void}
+ */
+function _clearExistingWaitForOwnerTimeout({ getState }: IStore) {
+    const { waitForOwnerTimeoutID } = getState()['features/authentication'];
+
+    waitForOwnerTimeoutID && clearTimeout(waitForOwnerTimeoutID);
+}
+
+
+/**
+ * Checks if the cyclic "wait for conference owner" task is currently scheduled.
+ *
+ * @param {Object} store - The redux store.
+ * @returns {boolean}
+ */
+function _isWaitingForOwner({ getState }: IStore) {
+    return Boolean(getState()['features/authentication'].waitForOwnerTimeoutID);
+}
+
+/**
+ * Handles login challenge. Opens login dialog or redirects to token auth URL.
+ *
+ * @param {Store} store - The redux store in which the specified {@code action}
+ * is being dispatched.
+ * @returns {void}
+ */
+function _handleLogin({ dispatch, getState }: IStore) {
+    const state = getState();
+    const config = state['features/base/config'];
+    const room = getBackendSafeRoomName(state['features/base/conference'].room);
+
+    if (isTokenAuthEnabled(config)) {
+        if (typeof APP === 'undefined') {
+            dispatch(showErrorNotification({
+                descriptionKey: 'dialog.tokenAuthUnsupported',
+                titleKey: 'dialog.tokenAuthFailedTitle'
+            }, NOTIFICATION_TIMEOUT_TYPE.LONG));
+
+            dispatch(redirectToDefaultLocation());
+
+            return;
+        }
+
+        if (!room) {
+            return;
+        }
+
+        // FIXME: This method will not preserve the other URL params that were originally passed.
+        const tokenAuthServiceUrl = getTokenAuthUrl(config, room);
+
+        if (tokenAuthServiceUrl) {
+            // we have already shown the prejoin screen, so no need to show it again after obtaining the token
+            window.location.href = `${tokenAuthServiceUrl}${
+                tokenAuthServiceUrl.includes('#') ? '&' : '#'}skipPrejoin=true`;
+        }
+    } else {
+        dispatch(openLoginDialog());
+    }
+}

react/features/authentication/middleware.web.ts

@@ -1,152 +0,0 @@
-import { maybeRedirectToWelcomePage } from '../app/actions.web';
-import { IStore } from '../app/types';
-import {
-    CONFERENCE_FAILED,
-    CONFERENCE_JOINED,
-    CONFERENCE_LEFT
-} from '../base/conference/actionTypes';
-import { CONNECTION_ESTABLISHED } from '../base/connection/actionTypes';
-import { hideDialog } from '../base/dialog/actions';
-import { isDialogOpen } from '../base/dialog/functions';
-import {
-    JitsiConferenceErrors
-} from '../base/lib-jitsi-meet';
-import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
-
-import {
-    CANCEL_LOGIN,
-    STOP_WAIT_FOR_OWNER,
-    UPGRADE_ROLE_FINISHED,
-    WAIT_FOR_OWNER
-} from './actionTypes';
-import {
-    hideLoginDialog,
-    openWaitForOwnerDialog,
-    stopWaitForOwner
-} from './actions.web';
-import LoginDialog from './components/web/LoginDialog';
-import WaitForOwnerDialog from './components/web/WaitForOwnerDialog';
-
-/**
- * Middleware that captures connection or conference failed errors and controls
- * {@link WaitForOwnerDialog} and {@link LoginDialog}.
- *
- * FIXME Some of the complexity was introduced by the lack of dialog stacking.
- *
- * @param {Store} store - Redux store.
- * @returns {Function}
- */
-MiddlewareRegistry.register(store => next => action => {
-    switch (action.type) {
-
-    case CANCEL_LOGIN: {
-        const { dispatch, getState } = store;
-
-        if (!isDialogOpen(store, WaitForOwnerDialog)) {
-            if (_isWaitingForOwner(store)) {
-                dispatch(openWaitForOwnerDialog());
-
-                return next(action);
-            }
-
-            dispatch(hideLoginDialog());
-
-            const { authRequired, conference } = getState()['features/base/conference'];
-            const { passwordRequired } = getState()['features/base/connection'];
-
-            // Only end the meeting if we are not already inside and trying to upgrade.
-            if ((authRequired && !conference) || passwordRequired) {
-                dispatch(maybeRedirectToWelcomePage());
-            }
-        }
-        break;
-    }
-
-    case CONFERENCE_FAILED: {
-        const { error } = action;
-        let recoverable;
-
-        if (error.name === JitsiConferenceErrors.AUTHENTICATION_REQUIRED) {
-            if (typeof error.recoverable === 'undefined') {
-                error.recoverable = true;
-            }
-            recoverable = error.recoverable;
-        }
-        if (recoverable) {
-            // we haven't migrated all the code from AuthHandler, and we need for now conference.js to trigger
-            // the dialog to pass all required parameters to WaitForOwnerDialog
-            // keep it commented, so we do not trigger sending iqs to jicofo twice
-            // and showing the broken dialog with no handler
-            // store.dispatch(waitForOwner());
-        } else {
-            store.dispatch(stopWaitForOwner());
-        }
-        break;
-    }
-
-    case CONFERENCE_JOINED:
-        store.dispatch(stopWaitForOwner());
-        store.dispatch(hideLoginDialog());
-        break;
-
-    case CONFERENCE_LEFT:
-        store.dispatch(stopWaitForOwner());
-        break;
-
-    case CONNECTION_ESTABLISHED:
-        store.dispatch(hideLoginDialog());
-        break;
-
-    case STOP_WAIT_FOR_OWNER:
-        _clearExistingWaitForOwnerTimeout(store);
-        store.dispatch(hideDialog(WaitForOwnerDialog));
-        break;
-
-    case UPGRADE_ROLE_FINISHED: {
-        const { error, progress } = action;
-
-        if (!error && progress === 1) {
-            store.dispatch(hideLoginDialog());
-        }
-        break;
-    }
-
-    case WAIT_FOR_OWNER: {
-        _clearExistingWaitForOwnerTimeout(store);
-
-        const { handler, timeoutMs }: { handler: () => void; timeoutMs: number; } = action;
-
-        action.waitForOwnerTimeoutID = setTimeout(handler, timeoutMs);
-
-        isDialogOpen(store, LoginDialog)
-            || store.dispatch(openWaitForOwnerDialog());
-        break;
-    }
-    }
-
-    return next(action);
-});
-
-/**
- * Will clear the wait for conference owner timeout handler if any is currently
- * set.
- *
- * @param {Object} store - The redux store.
- * @returns {void}
- */
-function _clearExistingWaitForOwnerTimeout(
-        { getState }: IStore) {
-    const { waitForOwnerTimeoutID } = getState()['features/authentication'];
-
-    waitForOwnerTimeoutID && clearTimeout(waitForOwnerTimeoutID);
-}
-
-/**
- * Checks if the cyclic "wait for conference owner" task is currently scheduled.
- *
- * @param {Object} store - The redux store.
- * @returns {void}
- */
-function _isWaitingForOwner({ getState }: IStore) {
-    return getState()['features/authentication'].waitForOwnerTimeoutID;
-}

react/features/authentication/reducer.ts

@@ -1,8 +1,10 @@
+import PersistenceRegistry from '../base/redux/PersistenceRegistry';
 import ReducerRegistry from '../base/redux/ReducerRegistry';
 import { assign } from '../base/redux/functions';
 
 import {
     CANCEL_LOGIN,
+    SET_TOKEN_AUTH_URL_SUCCESS,
     STOP_WAIT_FOR_OWNER,
     UPGRADE_ROLE_FINISHED,
     UPGRADE_ROLE_STARTED,
@@ -15,9 +17,17 @@ export interface IAuthenticationState {
     thenableWithCancel?: {
         cancel: Function;
     };
+    tokenAuthUrlSuccessful?: boolean;
     waitForOwnerTimeoutID?: number;
 }
 
+/**
+ * Sets up the persistence of the feature {@code authentication}.
+ */
+PersistenceRegistry.register('features/authentication', {
+    tokenAuthUrlSuccessful: true
+});
+
 /**
  * Listens for actions which change the state of the authentication feature.
  *
@@ -35,6 +45,10 @@ ReducerRegistry.register<IAuthenticationState>('features/authentication',
             progress: undefined,
             thenableWithCancel: undefined
         });
+    case SET_TOKEN_AUTH_URL_SUCCESS:
+        return assign(state, {
+            tokenAuthUrlSuccessful: action.value
+        });
 
     case STOP_WAIT_FOR_OWNER:
         return assign(state, {

react/features/base/app/actionTypes.ts

@@ -19,3 +19,15 @@ export const APP_WILL_MOUNT = 'APP_WILL_MOUNT';
  * }
  */
 export const APP_WILL_UNMOUNT = 'APP_WILL_UNMOUNT';
+
+/**
+ * The type of (redux) action which signals that a specific App will navigate using a route (in
+ * React terms).
+ *
+ * {
+ *     type: APP_WILL_NAVIGATE,
+ *     app: App,
+ *     route: Route
+ * }
+ */
+export const APP_WILL_NAVIGATE = 'APP_WILL_NAVIGATE';

react/features/base/app/actions.ts

@@ -1,6 +1,10 @@
 import { IStore } from '../../app/types';
 
-import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from './actionTypes';
+import {
+    APP_WILL_MOUNT,
+    APP_WILL_NAVIGATE,
+    APP_WILL_UNMOUNT
+} from './actionTypes';
 
 /**
  * Signals that a specific App will mount (in the terms of React).
@@ -44,3 +48,22 @@ export function appWillUnmount(app: Object) {
         app
     };
 }
+
+/**
+ * Signals that a specific App will navigate (in the terms of React).
+ *
+ * @param {App} app - The App which will navigate.
+ * @param {Object} route - The route which will be used.
+ * @returns {{
+ *     type: APP_WILL_NAVIGATE,
+ *     app: App,
+ *     route: Object
+ * }}
+ */
+export function appWillNavigate(app: Object, route: Object) {
+    return {
+        type: APP_WILL_NAVIGATE,
+        app,
+        route
+    };
+}

react/features/base/app/middleware.ts

@@ -0,0 +1,54 @@
+import { AnyAction } from 'redux';
+
+import MiddlewareRegistry from '../../base/redux/MiddlewareRegistry';
+
+import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from './actionTypes';
+import logger from './logger';
+
+
+/**
+ * Experimental feature to monitor CPU pressure.
+ */
+let pressureObserver: typeof window.PressureObserver;
+
+/**
+ * Middleware which intercepts app actions to handle changes to the related state.
+ *
+ * @param {Store} store - The redux store.
+ * @returns {Function}
+ */
+MiddlewareRegistry.register(() => (next: Function) => async (action: AnyAction) => {
+
+    switch (action.type) {
+    case APP_WILL_MOUNT: {
+        if ('PressureObserver' in globalThis) {
+            pressureObserver = new window.PressureObserver(
+                    (records: typeof window.PressureRecord) => {
+                        logger.info('Compute pressure state changed:', JSON.stringify(records));
+                        if (typeof APP !== 'undefined') {
+                            APP.API.notifyComputePressureChanged(records);
+                        }
+                    },
+                    { sampleRate: 1 }
+            );
+
+            try {
+                pressureObserver
+                    .observe('cpu')
+                    .catch((e: any) => logger.error('CPU pressure observer failed to start', e));
+            } catch (e: any) {
+                logger.error('CPU pressure observer failed to start', e);
+            }
+        }
+        break;
+    }
+    case APP_WILL_UNMOUNT: {
+        if (pressureObserver) {
+            pressureObserver.unobserve('cpu');
+        }
+        break;
+    }
+    }
+
+    return next(action);
+});

react/features/base/conference/actionTypes.ts

@@ -53,6 +53,25 @@ export const CONFERENCE_JOIN_IN_PROGRESS = 'CONFERENCE_JOIN_IN_PROGRESS';
  */
 export const CONFERENCE_LEFT = 'CONFERENCE_LEFT';
 
+/**
+ * The type of (redux) action which signals that the conference is out of focus.
+ * For example, if the user navigates to the Chat screen.
+ * 
+ * {
+ *      type: CONFERENCE_BLURRED,
+ * }
+ */
+export const CONFERENCE_BLURRED = 'CONFERENCE_BLURRED';
+
+/**
+ * The type of (redux) action which signals that the conference is in focus.
+ * 
+ * {
+ *      type: CONFERENCE_FOCUSED,
+ * }
+ */
+export const CONFERENCE_FOCUSED = 'CONFERENCE_FOCUSED';
+
 /**
  * The type of (redux) action, which indicates conference local subject changes.
  *
@@ -106,6 +125,15 @@ export const CONFERENCE_UNIQUE_ID_SET = 'CONFERENCE_UNIQUE_ID_SET';
  */
 export const E2E_RTT_CHANGED = 'E2E_RTT_CHANGED'
 
+/**
+ * The type of (redux) action which signals that a conference will be initialized.
+ *
+ * {
+ *     type: CONFERENCE_WILL_INIT
+ * }
+ */
+export const CONFERENCE_WILL_INIT = 'CONFERENCE_WILL_INIT';
+
 /**
  * The type of (redux) action which signals that a specific conference will be
  * joined.

react/features/base/conference/actions.ts

@@ -1,11 +1,10 @@
 import { createStartMutedConfigurationEvent } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';
-import { appNavigate } from '../../app/actions';
 import { IReduxState, IStore } from '../../app/types';
 import { endpointMessageReceived } from '../../subtitles/actions.any';
 import { iAmVisitor } from '../../visitors/functions';
 import { getReplaceParticipant } from '../config/functions';
-import { disconnect } from '../connection/actions';
+import { hangup } from '../connection/actions';
 import { JITSI_CONNECTION_CONFERENCE_KEY } from '../connection/constants';
 import { JitsiConferenceEvents, JitsiE2ePingEvents } from '../lib-jitsi-meet';
 import { setAudioMuted, setAudioUnmutePermissions, setVideoMuted, setVideoUnmutePermissions } from '../media/actions';
@@ -41,6 +40,7 @@ import {
     CONFERENCE_SUBJECT_CHANGED,
     CONFERENCE_TIMESTAMP_CHANGED,
     CONFERENCE_UNIQUE_ID_SET,
+    CONFERENCE_WILL_INIT,
     CONFERENCE_WILL_JOIN,
     CONFERENCE_WILL_LEAVE,
     DATA_CHANNEL_CLOSED,
@@ -95,9 +95,14 @@ function _addConferenceListeners(conference: IJitsiConference, dispatch: IStore[
 
     // Dispatches into features/base/conference follow:
 
-    conference.on(
-        JitsiConferenceEvents.AUTH_STATUS_CHANGED,
-        (authEnabled: boolean, authLogin: string) => dispatch(authStatusChanged(authEnabled, authLogin)));
+    // we want to ignore this event in case of tokenAuthUrl config
+    // we are deprecating this and at some point will get rid of it
+    if (!state['features/base/config'].tokenAuthUrl) {
+        conference.on(
+            JitsiConferenceEvents.AUTH_STATUS_CHANGED,
+            (authEnabled: boolean, authLogin: string) => dispatch(authStatusChanged(authEnabled, authLogin)));
+    }
+
     conference.on(
         JitsiConferenceEvents.CONFERENCE_FAILED,
         (err: string, ...args: any[]) => dispatch(conferenceFailed(conference, err, ...args)));
@@ -463,6 +468,19 @@ export function _conferenceWillJoin(conference: IJitsiConference) {
     };
 }
 
+/**
+ * Signals the intention of the application to have a conference initialized.
+ *
+ * @returns {{
+ *     type: CONFERENCE_WILL_INIT
+ * }}
+ */
+export function conferenceWillInit() {
+    return {
+        type: CONFERENCE_WILL_INIT
+    };
+}
+
 /**
  * Signals the intention of the application to have the local participant
  * join the specified conference.
@@ -647,18 +665,9 @@ export function kickedOut(conference: IJitsiConference, participant: Object) {
  * @returns {Function}
  */
 export function leaveConference() {
-    return async (dispatch: IStore['dispatch']) => {
-
-        // FIXME: these should be unified.
-        if (navigator.product === 'ReactNative') {
-            dispatch(appNavigate(undefined));
-        } else {
-            dispatch(disconnect(true));
-        }
-    };
+    return async (dispatch: IStore['dispatch']) => dispatch(hangup(true));
 }
 
-
 /**
  * Signals that the lock state of a specific JitsiConference changed.
  *

react/features/base/conference/functions.ts

@@ -304,10 +304,7 @@ export function getVisitorOptions(stateful: IStateful, params: Array<string>) {
         // and the visitor will be redirected back to a vnode from jicofo
         if (config.oldConfig && username) {
             return {
-                hosts: {
-                    domain: config.oldConfig.hosts.domain,
-                    muc: config.oldConfig.hosts.muc
-                },
+                hosts: config.oldConfig.hosts,
                 focusUserJid: focusJid,
                 disableLocalStats: false,
                 bosh: config.oldConfig.bosh && appendURLParam(config.oldConfig.bosh, 'customusername', username),
@@ -323,8 +320,7 @@ export function getVisitorOptions(stateful: IStateful, params: Array<string>) {
 
     const oldConfig = {
         hosts: {
-            domain: config.hosts.domain,
-            muc: config.hosts.muc
+            domain: ''
         },
         focusUserJid: config.focusUserJid,
         bosh: config.bosh,
@@ -332,6 +328,9 @@ export function getVisitorOptions(stateful: IStateful, params: Array<string>) {
         websocket: config.websocket
     };
 
+    // copy original hosts, to make sure we do not use a modified one later
+    Object.assign(oldConfig.hosts, config.hosts);
+
     const domain = `${vnode}.meet.jitsi`;
 
     return {

react/features/base/conference/middleware.any.ts

@@ -1,3 +1,4 @@
+import i18n from 'i18next';
 import { AnyAction } from 'redux';
 
 // @ts-ignore
@@ -10,19 +11,21 @@ import {
 } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';
 import { reloadNow } from '../../app/actions';
-import { IReduxState, IStore } from '../../app/types';
+import { IStore } from '../../app/types';
 import { removeLobbyChatParticipant } from '../../chat/actions.any';
 import { openDisplayNamePrompt } from '../../display-name/actions';
 import { readyToClose } from '../../mobile/external-api/actions';
 import { showErrorNotification, showWarningNotification } from '../../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
+import { stopLocalVideoRecording } from '../../recording/actions.any';
+import LocalRecordingManager from '../../recording/components/Recording/LocalRecordingManager';
 import { setIAmVisitor } from '../../visitors/actions';
 import { iAmVisitor } from '../../visitors/functions';
 import { overwriteConfig } from '../config/actions';
 import { CONNECTION_ESTABLISHED, CONNECTION_FAILED } from '../connection/actionTypes';
 import { connect, connectionDisconnected, disconnect } from '../connection/actions';
 import { validateJwt } from '../jwt/functions';
-import { JitsiConferenceErrors } from '../lib-jitsi-meet';
+import { JitsiConferenceErrors, JitsiConnectionErrors } from '../lib-jitsi-meet';
 import { PARTICIPANT_UPDATED, PIN_PARTICIPANT } from '../participants/actionTypes';
 import { PARTICIPANT_ROLE } from '../participants/constants';
 import {
@@ -33,6 +36,7 @@ import {
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
 import { TRACK_ADDED, TRACK_REMOVED } from '../tracks/actionTypes';
 import { destroyLocalTracks } from '../tracks/actions.any';
+import { getLocalTracks } from '../tracks/functions.any';
 
 import {
     CONFERENCE_FAILED,
@@ -46,7 +50,9 @@ import {
     SET_ROOM
 } from './actionTypes';
 import {
+    authStatusChanged,
     conferenceFailed,
+    conferenceWillInit,
     conferenceWillLeave,
     createConference,
     leaveConference,
@@ -71,7 +77,7 @@ import logger from './logger';
 /**
  * Handler for before unload event.
  */
-let beforeUnloadHandler: (() => void) | undefined;
+let beforeUnloadHandler: ((e?: any) => void) | undefined;
 
 /**
  * Implements the middleware of the feature base/conference.
@@ -142,12 +148,6 @@ MiddlewareRegistry.register(store => next => action => {
 function _conferenceFailed({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
     const { conference, error } = action;
 
-    if (error.name === JitsiConferenceErrors.REDIRECTED) {
-        if (typeof error.recoverable === 'undefined') {
-            error.recoverable = true;
-        }
-    }
-
     const result = next(action);
     const { enableForcedReload } = getState()['features/base/config'];
 
@@ -195,18 +195,31 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
         break;
     }
     case JitsiConferenceErrors.CONFERENCE_MAX_USERS: {
-        if (typeof APP === 'undefined') {
-            // in case of max users(it can be from a visitor node), let's restore
-            // oldConfig if any as we will be back to the main prosody
-            const newConfig = restoreConferenceOptions(getState);
+        dispatch(showErrorNotification({
+            hideErrorSupportLink: true,
+            descriptionKey: 'dialog.maxUsersLimitReached',
+            titleKey: 'dialog.maxUsersLimitReachedTitle'
+        }, NOTIFICATION_TIMEOUT_TYPE.LONG));
 
-            if (newConfig) {
-                dispatch(overwriteConfig(newConfig)) // @ts-ignore
-                    .then(dispatch(conferenceWillLeave(conference)))
-                    .then(conference.leave())
-                    .then(dispatch(disconnect()))
-                    .then(dispatch(connect()));
-            }
+        // In case of max users(it can be from a visitor node), let's restore
+        // oldConfig if any as we will be back to the main prosody.
+        const newConfig = restoreConferenceOptions(getState);
+
+        if (newConfig) {
+            dispatch(overwriteConfig(newConfig)) // @ts-ignore
+                .then(() => dispatch(conferenceWillLeave(conference)))
+                .then(() => conference.leave())
+                .then(() => dispatch(disconnect()))
+                .then(() => dispatch(connect()))
+                .then(() => {
+                    // FIXME: Workaround for the web version. To be removed once we get rid of conference.js
+                    if (typeof APP !== 'undefined') {
+                        const localTracks = getLocalTracks(getState()['features/base/tracks']);
+                        const jitsiTracks = localTracks.map((t: any) => t.jitsiTrack);
+
+                        APP.conference.startConference(jitsiTracks).catch(logger.error);
+                    }
+                });
         }
 
         break;
@@ -214,45 +227,48 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
     case JitsiConferenceErrors.OFFER_ANSWER_FAILED:
         sendAnalytics(createOfferAnswerFailedEvent());
         break;
+
     case JitsiConferenceErrors.REDIRECTED: {
-        // once conference.js is gone this can be removed and both
-        // redirect logics to be merged
-        if (typeof APP === 'undefined') {
-            const newConfig = getVisitorOptions(getState, error.params);
+        const newConfig = getVisitorOptions(getState, error.params);
 
-            if (!newConfig) {
-                logger.warn('Not redirected missing params');
-                break;
-            }
-
-            const [ vnode ] = error.params;
-
-            dispatch(overwriteConfig(newConfig)) // @ts-ignore
-                .then(dispatch(conferenceWillLeave(conference)))
-                .then(conference.leave())
-                .then(dispatch(disconnect()))
-                .then(dispatch(setIAmVisitor(Boolean(vnode))))
-
-                // we do not clear local tracks on error, so we need to manually clear them
-                .then(dispatch(destroyLocalTracks()))
-                .then(dispatch(connect()));
+        if (!newConfig) {
+            logger.warn('Not redirected missing params');
+            break;
         }
+
+        const [ vnode ] = error.params;
+
+        dispatch(overwriteConfig(newConfig)) // @ts-ignore
+            .then(() => dispatch(conferenceWillLeave(conference)))
+            .then(() => dispatch(disconnect()))
+            .then(() => dispatch(setIAmVisitor(Boolean(vnode))))
+
+            // we do not clear local tracks on error, so we need to manually clear them
+            .then(() => dispatch(destroyLocalTracks()))
+            .then(() => dispatch(conferenceWillInit()))
+            .then(() => dispatch(connect()))
+            .then(() => {
+                // FIXME: Workaround for the web version. To be removed once we get rid of conference.js
+                if (typeof APP !== 'undefined') {
+                    APP.conference.startConference([]);
+                }
+            });
         break;
     }
     }
 
-    if (typeof APP === 'undefined') {
-        !error.recoverable
-        && conference
-        && conference.leave(CONFERENCE_LEAVE_REASONS.UNRECOVERABLE_ERROR).catch((reason: Error) => {
-            // Even though we don't care too much about the failure, it may be
-            // good to know that it happen, so log it (on the info level).
-            logger.info('JitsiConference.leave() rejected with:', reason);
-        });
-    } else {
-        // FIXME: Workaround for the web version. Currently, the creation of the
-        // conference is handled by /conference.js and appropriate failure handlers
-        // are set there.
+    !error.recoverable
+    && conference
+    && conference.leave(CONFERENCE_LEAVE_REASONS.UNRECOVERABLE_ERROR).catch((reason: Error) => {
+        // Even though we don't care too much about the failure, it may be
+        // good to know that it happen, so log it (on the info level).
+        logger.info('JitsiConference.leave() rejected with:', reason);
+    });
+
+    // FIXME: Workaround for the web version. Currently, the creation of the
+    // conference is handled by /conference.js and appropriate failure handlers
+    // are set there.
+    if (typeof APP !== 'undefined') {
         _removeUnloadHandler(getState);
     }
 
@@ -295,7 +311,14 @@ function _conferenceJoined({ dispatch, getState }: IStore, next: Function, actio
     // handles the process of leaving the conference. This is temporary solution
     // that should cover the described use case as part of the effort to
     // implement the conferenceWillLeave action for web.
-    beforeUnloadHandler = () => {
+    beforeUnloadHandler = (e?: any) => {
+        if (LocalRecordingManager.isRecordingLocally()) {
+            dispatch(stopLocalVideoRecording());
+            if (e) {
+                e.preventDefault();
+                e.returnValue = null;
+            }
+        }
         dispatch(conferenceWillLeave(conference));
     };
 
@@ -330,12 +353,30 @@ function _conferenceJoined({ dispatch, getState }: IStore, next: Function, actio
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _connectionEstablished({ dispatch }: IStore, next: Function, action: AnyAction) {
+async function _connectionEstablished({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
     const result = next(action);
 
+    const { tokenAuthUrl = false } = getState()['features/base/config'];
+
+    // if there is token auth URL defined and local participant is using jwt
+    // this means it is logged in when connection is established, so we can change the state
+    if (tokenAuthUrl) {
+        let email;
+
+        if (getState()['features/base/jwt'].jwt) {
+            email = getLocalParticipant(getState())?.email;
+        }
+
+        dispatch(authStatusChanged(true, email || ''));
+    }
+
     // FIXME: Workaround for the web version. Currently, the creation of the
     // conference is handled by /conference.js.
-    typeof APP === 'undefined' && dispatch(createConference());
+    if (typeof APP === 'undefined') {
+        dispatch(createConference());
+
+        return result;
+    }
 
     return result;
 }
@@ -343,21 +384,13 @@ function _connectionEstablished({ dispatch }: IStore, next: Function, action: An
 /**
  * Logs jwt validation errors from xmpp and from the client-side validator.
  *
- * @param {string} message -The error message from xmpp.
- * @param {Object} state - The redux state.
+ * @param {string} message - The error message from xmpp.
+ * @param {string} errors - The detailed errors.
  * @returns {void}
  */
-function _logJwtErrors(message: string, state: IReduxState) {
-    const { jwt } = state['features/base/jwt'];
-
-    if (!jwt) {
-        return;
-    }
-
-    const errorKeys = validateJwt(jwt);
-
+function _logJwtErrors(message: string, errors: string) {
     message && logger.error(`JWT error: ${message}`);
-    errorKeys.length && logger.error('JWT parsing error:', errorKeys);
+    errors && logger.error('JWT parsing errors:', errors);
 }
 
 /**
@@ -375,47 +408,58 @@ function _logJwtErrors(message: string, state: IReduxState) {
  * @returns {Object} The value returned by {@code next(action)}.
  */
 function _connectionFailed({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
-    _logJwtErrors(action.error.message, getState());
+    const { connection, error } = action;
+    const { jwt } = getState()['features/base/jwt'];
+
+    if (jwt) {
+        const errors: string = validateJwt(jwt).map((err: any) =>
+            i18n.t(`dialog.tokenAuthFailedReason.${err.key}`, err.args))
+        .join(' ');
+
+        _logJwtErrors(error.message, errors);
+
+        // do not show the notification when we will prompt the user
+        // for username and password
+        if (error.name === JitsiConnectionErrors.PASSWORD_REQUIRED) {
+            dispatch(showErrorNotification({
+                descriptionKey: errors ? 'dialog.tokenAuthFailedWithReasons' : 'dialog.tokenAuthFailed',
+                descriptionArguments: { reason: errors },
+                titleKey: 'dialog.tokenAuthFailedTitle'
+            }, NOTIFICATION_TIMEOUT_TYPE.LONG));
+        }
+    }
 
     const result = next(action);
 
     _removeUnloadHandler(getState);
 
-    // FIXME: Workaround for the web version. Currently, the creation of the
-    // conference is handled by /conference.js and appropriate failure handlers
-    // are set there.
-    if (typeof APP === 'undefined') {
-        const { connection } = action;
-        const { error } = action;
+    forEachConference(getState, conference => {
+        // TODO: revisit this
+        // It feels that it would make things easier if JitsiConference
+        // in lib-jitsi-meet would monitor it's connection and emit
+        // CONFERENCE_FAILED when it's dropped. It has more knowledge on
+        // whether it can recover or not. But because the reload screen
+        // and the retry logic is implemented in the app maybe it can be
+        // left this way for now.
+        if (conference.getConnection() === connection) {
+            // XXX Note that on mobile the error type passed to
+            // connectionFailed is always an object with .name property.
+            // This fact needs to be checked prior to enabling this logic on
+            // web.
+            const conferenceAction = conferenceFailed(conference, error.name);
 
-        forEachConference(getState, conference => {
-            // It feels that it would make things easier if JitsiConference
-            // in lib-jitsi-meet would monitor it's connection and emit
-            // CONFERENCE_FAILED when it's dropped. It has more knowledge on
-            // whether it can recover or not. But because the reload screen
-            // and the retry logic is implemented in the app maybe it can be
-            // left this way for now.
-            if (conference.getConnection() === connection) {
-                // XXX Note that on mobile the error type passed to
-                // connectionFailed is always an object with .name property.
-                // This fact needs to be checked prior to enabling this logic on
-                // web.
-                const conferenceAction
-                    = conferenceFailed(conference, error.name);
-
-                // Copy the recoverable flag if set on the CONNECTION_FAILED
-                // action to not emit recoverable action caused by
-                // a non-recoverable one.
-                if (typeof error.recoverable !== 'undefined') {
-                    conferenceAction.error.recoverable = error.recoverable;
-                }
-
-                dispatch(conferenceAction);
+            // Copy the recoverable flag if set on the CONNECTION_FAILED
+            // action to not emit recoverable action caused by
+            // a non-recoverable one.
+            if (typeof error.recoverable !== 'undefined') {
+                conferenceAction.error.recoverable = error.recoverable;
             }
 
-            return true;
-        });
-    }
+            dispatch(conferenceAction);
+        }
+
+        return true;
+    });
 
     return result;
 }

react/features/base/conference/middleware.web.ts

@@ -9,7 +9,8 @@ import {
     CONFERENCE_FAILED,
     CONFERENCE_JOINED,
     CONFERENCE_JOIN_IN_PROGRESS,
-    CONFERENCE_LEFT, KICKED_OUT
+    CONFERENCE_LEFT,
+    KICKED_OUT
 } from './actionTypes';
 import logger from './logger';
 import './middleware.any';

react/features/base/conference/reducer.ts

@@ -155,6 +155,9 @@ export interface IConferenceState {
 
 export interface IJitsiConferenceRoom {
     locked: boolean;
+    moderator: {
+        logout: Function;
+    };
     myroomjid: string;
     roomjid: string;
 }

react/features/base/config/configType.ts

@@ -68,6 +68,33 @@ type ButtonsWithNotifyClick = 'camera' |
     'add-passcode' |
     '__end';
 
+type ParticipantMenuButtonsWithNotifyClick = 'allow-video' |
+    'ask-unmute' |
+    'conn-status' |
+    'flip-local-video' |
+    'grant-moderator' |
+    'hide-self-view' |
+    'kick' |
+    'mute' |
+    'mute-others' |
+    'mute-others-video' |
+    'mute-video' |
+    'pinToStage' |
+    'privateMessage' |
+    'remote-control' |
+    'send-participant-to-room' |
+    'verify';
+
+type NotifyClickButtonKey = string |
+    ButtonsWithNotifyClick |
+    ParticipantMenuButtonsWithNotifyClick;
+
+export type NotifyClickButton = NotifyClickButtonKey |
+    {
+        key: NotifyClickButtonKey;
+        preventExecution: boolean;
+    };
+
 export type Sounds = 'ASKED_TO_UNMUTE_SOUND' |
     'E2EE_OFF_SOUND' |
     'E2EE_ON_SOUND' |
@@ -126,6 +153,25 @@ export interface INoiseSuppressionConfig {
     };
 }
 
+export interface IWatchRTCConfiguration {
+    allowBrowserLogCollection?: boolean;
+    collectionInterval?: number;
+    console?: {
+        level: string;
+        override: boolean;
+    };
+    debug?: boolean;
+    keys?: any;
+    logGetStats?: boolean;
+    proxyUrl?: string;
+    rtcApiKey: string;
+    rtcPeerId?: string;
+    rtcRoomId?: string;
+    rtcTags?: string[];
+    rtcToken?: string;
+    wsUrl?: string;
+}
+
 export interface IConfig {
     _desktopSharingSourceDevice?: string;
     _immediateReloadThreshold?: string;
@@ -145,6 +191,7 @@ export interface IConfig {
         rtcstatsStoreLogs?: boolean;
         rtcstatsUseLegacy?: boolean;
         scriptURLs?: Array<string>;
+        watchRTCEnabled?: boolean;
         whiteListedEvents?: string[];
     };
     apiLogLevels?: Array<'warn' | 'log' | 'error' | 'info' | 'debug'>;
@@ -223,7 +270,7 @@ export interface IConfig {
     };
     corsAvatarURLs?: Array<string>;
     customParticipantMenuButtons?: Array<{ icon: string; id: string; text: string; }>;
-    customToolbarButtons?: Array<{ icon: string; id: string; text: string; }>;
+    customToolbarButtons?: Array<{ backgroundColor?: string; icon: string; id: string; text: string; }>;
     deeplinking?: IDeeplinkingConfig;
     defaultLanguage?: string;
     defaultLocalDisplayName?: string;
@@ -283,6 +330,7 @@ export interface IConfig {
     disableThirdPartyRequests?: boolean;
     disableTileEnlargement?: boolean;
     disableTileView?: boolean;
+    disableVirtualBackground?: boolean;
     disabledNotifications?: Array<string>;
     disabledSounds?: Array<Sounds>;
     doNotFlipLocalVideo?: boolean;
@@ -447,6 +495,10 @@ export interface IConfig {
         mobileCodecPreferenceOrder?: Array<string>;
         stunServers?: Array<{ urls: string; }>;
     };
+    participantMenuButtonsWithNotifyClick?: Array<string | ParticipantMenuButtonsWithNotifyClick | {
+        key: string | ParticipantMenuButtonsWithNotifyClick;
+        preventExecution: boolean;
+    }>;
     participantsPane?: {
         hideModeratorSettingsTab?: boolean;
         hideMoreActionsButton?: boolean;
@@ -521,9 +573,12 @@ export interface IConfig {
         testMode?: boolean;
     };
     tileView?: {
+        disabled?: boolean;
         numberOfVisibleTiles?: number;
     };
     tokenAuthUrl?: string;
+    tokenAuthUrlAutoRedirect?: string;
+    tokenLogoutUrl?: string;
     toolbarButtons?: Array<ToolbarButtons>;
     toolbarConfig?: {
         alwaysVisible?: boolean;
@@ -559,6 +614,7 @@ export interface IConfig {
         mobileCodecPreferenceOrder?: Array<string>;
         persist?: boolean;
     };
+    watchRTCConfigParams?: IWatchRTCConfiguration;
     webhookProxyUrl?: string;
     webrtcIceTcpDisable?: boolean;
     webrtcIceUdpDisable?: boolean;

react/features/base/config/configWhitelist.ts

@@ -15,6 +15,7 @@ export default [
     '_peerConnStatusRtcMuteTimeout',
     'analytics.disabled',
     'analytics.rtcstatsEnabled',
+    'analytics.watchRTCEnabled',
     'audioLevelsInterval',
     'audioQuality',
     'autoKnockLobby',
@@ -193,6 +194,7 @@ export default [
     'openSharedDocumentOnJoin',
     'opusMaxAverageBitrate',
     'p2p',
+    'participantMenuButtonsWithNotifyClick',
     'participantsPane',
     'pcStatsInterval',
     'prejoinConfig',
@@ -227,6 +229,7 @@ export default [
     'useHostPageLocalStorage',
     'useTurnUdp',
     'videoQuality',
+    'watchRTCConfigParams',
     'webrtcIceTcpDisable',
     'webrtcIceUdpDisable',
     'whiteboard.enabled'

react/features/base/config/functions.any.ts

@@ -1,8 +1,8 @@
-// @ts-expect-error
-import Bourne from '@hapi/bourne';
-// eslint-disable-next-line lines-around-comment
-// @ts-expect-error
+// @ts-ignore
 import { jitsiLocalStorage } from '@jitsi/js-utils';
+// eslint-disable-next-line lines-around-comment
+// @ts-ignore
+import { safeJsonParse } from '@jitsi/js-utils/json';
 import _ from 'lodash';
 
 import { IReduxState } from '../../app/types';
@@ -223,7 +223,7 @@ export function restoreConfig(baseURL: string) {
 
     if (config) {
         try {
-            return Bourne.parse(config) || undefined;
+            return safeJsonParse(config) || undefined;
         } catch (e) {
             // Somehow incorrect data ended up in the storage. Clean it up.
             jitsiLocalStorage.removeItem(key);

react/features/base/config/functions.native.ts

@@ -27,8 +27,10 @@ export function _cleanupConfig(config: IConfig) {
         delete config.analytics?.rtcstatsSendSdp;
         delete config.analytics?.rtcstatsUseLegacy;
         delete config.analytics?.obfuscateRoomName;
+        delete config.analytics?.watchRTCEnabled;
         delete config.callStatsID;
         delete config.callStatsSecret;
+        delete config.watchRTCConfigParams;
         config.giphy = { enabled: false };
     }
 }