feat(android) bump minimum API level to 24

Some of our dependencies (most notably WebRTC) have dropped it and we
can no longer claim to support API level 23).

Makefile

@@ -63,10 +63,7 @@ deploy-appbundle:
 
 deploy-lib-jitsi-meet:
 	cp \
-		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.min.js \
-		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.min.map \
-		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.e2ee-worker.js \
-		$(LIBJITSIMEET_DIR)/modules/browser/capabilities.json \
+		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.* \
 		$(DEPLOY_DIR)
 
 deploy-olm:

android/app/src/main/AndroidManifest.xml

@@ -7,7 +7,6 @@
       android:extractNativeLibs="true"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
-      android:name=".MainApplication"
       android:networkSecurityConfig="@xml/network_security_config"
       android:theme="@style/AppTheme">
     <meta-data

android/app/src/main/java/org/jitsi/meet/MainApplication.java

@@ -1,47 +0,0 @@
-/*
- * Copyright @ 2022-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet;
-
-import android.app.Application;
-import android.util.Log;
-
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactNativeHost;
-
-import org.jitsi.meet.sdk.JitsiReactNativeHost;
-
-/**
- * Application class for Jitsi Meet. The only reason why this exists is for Detox
- * to believe our app is a "greenfield" app. SDK users need not use this.
- */
-public class MainApplication extends Application implements ReactApplication {
-    private final ReactNativeHost mReactNativeHost = new JitsiReactNativeHost(this);
-
-    @Override
-    public ReactNativeHost getReactNativeHost() {
-        return mReactNativeHost;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        // Initialize RN
-        Log.d(this.getClass().getCanonicalName(), "app onCreate");
-        getReactNativeHost().getReactInstanceManager();
-    }
-}

android/build.gradle

@@ -19,7 +19,7 @@ buildscript {
 ext {
     buildToolsVersion = "31.0.0"
     compileSdkVersion = 32
-    minSdkVersion    = 23
+    minSdkVersion    = 24
     targetSdkVersion = 32
     supportLibVersion = "28.0.0"
 

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

@@ -1,46 +0,0 @@
-/*
- *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-package org.jitsi.meet.sdk;
-
-import org.webrtc.VideoCodecInfo;
-
-import java.util.Map;
-import java.util.HashMap;
-
-/** Container for static helper functions related to dealing with H264 codecs. */
-class H264Utils {
-    public static final String H264_FMTP_PROFILE_LEVEL_ID = "profile-level-id";
-    public static final String H264_FMTP_LEVEL_ASYMMETRY_ALLOWED = "level-asymmetry-allowed";
-    public static final String H264_FMTP_PACKETIZATION_MODE = "packetization-mode";
-
-    public static final String H264_PROFILE_CONSTRAINED_BASELINE = "42e0";
-    public static final String H264_PROFILE_CONSTRAINED_HIGH = "640c";
-    public static final String H264_LEVEL_3_1 = "1f"; // 31 in hex.
-    public static final String H264_CONSTRAINED_HIGH_3_1 =
-        H264_PROFILE_CONSTRAINED_HIGH + H264_LEVEL_3_1;
-    public static final String H264_CONSTRAINED_BASELINE_3_1 =
-        H264_PROFILE_CONSTRAINED_BASELINE + H264_LEVEL_3_1;
-
-    public static Map<String, String> getDefaultH264Params(boolean isHighProfile) {
-        final Map<String, String> params = new HashMap<>();
-        params.put(VideoCodecInfo.H264_FMTP_LEVEL_ASYMMETRY_ALLOWED, "1");
-        params.put(VideoCodecInfo.H264_FMTP_PACKETIZATION_MODE, "1");
-        params.put(VideoCodecInfo.H264_FMTP_PROFILE_LEVEL_ID,
-            isHighProfile ? VideoCodecInfo.H264_CONSTRAINED_HIGH_3_1
-                : VideoCodecInfo.H264_CONSTRAINED_BASELINE_3_1);
-        return params;
-    }
-
-    public static VideoCodecInfo DEFAULT_H264_BASELINE_PROFILE_CODEC =
-        new VideoCodecInfo("H264", getDefaultH264Params(/* isHighProfile= */ false));
-    public static VideoCodecInfo DEFAULT_H264_HIGH_PROFILE_CODEC =
-        new VideoCodecInfo("H264", getDefaultH264Params(/* isHighProfile= */ true));
-}

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

@@ -16,6 +16,7 @@
 
 package org.jitsi.meet.sdk;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -177,8 +178,11 @@ public class JitsiMeetActivity extends AppCompatActivity
     }
 
     protected void leave() {
-        Intent hangupBroadcastIntent = BroadcastIntentHelper.buildHangUpIntent();
-        LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(hangupBroadcastIntent);
+        if (this.jitsiView != null) {
+            this.jitsiView.abort();
+        } else {
+            JitsiMeetLogger.w("Cannot leave, view is null");
+        }
     }
 
     private @Nullable
@@ -295,6 +299,7 @@ public class JitsiMeetActivity extends AppCompatActivity
         JitsiMeetActivityDelegate.requestPermissions(this, permissions, requestCode, listener);
     }
 
+    @SuppressLint("MissingSuperCall")
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);

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

@@ -157,6 +157,14 @@ public class JitsiMeetView extends FrameLayout {
         setProps(options != null ? options.asProps() : new Bundle());
     }
 
+    /**
+     * Internal method which aborts running RN by passing empty props.
+     * This is only meant to be used from the enclosing Activity's onDestroy.
+     */
+    public void abort() {
+        setProps(new Bundle());
+    }
+
     /**
      * Creates the {@code ReactRootView} for the given app name with the given
      * props. Once created it's set as the view of this {@code FrameLayout}.

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

@@ -1,41 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.app.Application;
-
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-
-import java.util.List;
-
-/**
- * This is the minimal implementation of ReactNativeHost that will make things like the
- * Detox testing framework believe we are a "greenfield" app.
- *
- * Generally speaking, apps using the SDK (other than the Jitsi Meet app itself) should not
- * need to use this because the
- */
-public class JitsiReactNativeHost extends ReactNativeHost {
-    public JitsiReactNativeHost(Application application) {
-        super(application);
-    }
-
-    @Override
-    public boolean getUseDeveloperSupport() {
-        // Unused since we override `createReactInstanceManager`.
-        return false;
-    }
-
-    @Override
-    protected List<ReactPackage> getPackages() {
-        // Unused since we override `createReactInstanceManager`.
-        return null;
-    }
-
-    @Override
-    protected ReactInstanceManager createReactInstanceManager() {
-        ReactInstanceManagerHolder.initReactInstanceManager(this.getApplication());
-
-        return ReactInstanceManagerHolder.getReactInstanceManager();
-    }
-}

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

@@ -17,7 +17,6 @@
 package org.jitsi.meet.sdk;
 
 import android.app.Activity;
-import android.app.Application;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
@@ -32,17 +31,17 @@ import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.oney.WebRTCModule.EglUtils;
-import com.oney.WebRTCModule.RTCVideoViewManager;
-import com.oney.WebRTCModule.WebRTCModule;
+import com.oney.WebRTCModule.WebRTCModuleOptions;
+import com.oney.WebRTCModule.webrtcutils.H264AndSoftwareVideoDecoderFactory;
+import com.oney.WebRTCModule.webrtcutils.H264AndSoftwareVideoEncoderFactory;
 
 import org.devio.rn.splashscreen.SplashScreenModule;
 import org.webrtc.EglBase;
-import org.webrtc.audio.AudioDeviceModule;
-import org.webrtc.audio.JavaAudioDeviceModule;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 class ReactInstanceManagerHolder {
@@ -79,30 +78,11 @@ class ReactInstanceManagerHolder {
             nativeModules.add(new RNConnectionService(reactContext));
         }
 
-        // Initialize the WebRTC module by hand, since we want to override some
-        // initialization options.
-        WebRTCModule.Options options = new WebRTCModule.Options();
-
-        AudioDeviceModule adm = JavaAudioDeviceModule.builder(reactContext)
-            .setEnableVolumeLogger(false)
-            .createAudioDeviceModule();
-        options.setAudioDeviceModule(adm);
-
-        EglBase.Context eglContext = EglUtils.getRootEglBaseContext();
-
-        options.setVideoDecoderFactory(new WebRTCVideoDecoderFactory(eglContext));
-        options.setVideoEncoderFactory(new WebRTCVideoEncoderFactory(eglContext));
-
-        nativeModules.add(new WebRTCModule(reactContext, options));
-
         return nativeModules;
     }
 
     private static List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Arrays.<ViewManager>asList(
-            // WebRTC, see createNativeModules for details.
-            new RTCVideoViewManager()
-        );
+        return Collections.emptyList();
     }
 
     static List<ReactPackage> getReactNativePackages() {
@@ -122,6 +102,7 @@ class ReactInstanceManagerHolder {
             new com.reactnativecommunity.webview.RNCWebViewPackage(),
             new com.kevinresol.react_native_default_preference.RNDefaultPreferencePackage(),
             new com.learnium.RNDeviceInfo.RNDeviceInfo(),
+            new com.oney.WebRTCModule.WebRTCModulePackage(),
             new com.swmansion.gesturehandler.RNGestureHandlerPackage(),
             new org.linusu.RNGetRandomValuesPackage(),
             new com.rnimmersive.RNImmersivePackage(),
@@ -239,35 +220,6 @@ class ReactInstanceManagerHolder {
         return reactInstanceManager;
     }
 
-    /**
-     * Internal method to initialize the React Native instance manager. We
-     * create a single instance in order to load the JavaScript bundle a single
-     * time. All {@code ReactRootView} instances will be tied to the one and
-     * only {@code ReactInstanceManager}.
-     *
-     * This method is only meant to be called when integrating with {@code JitsiReactNativeHost}.
-     *
-     * @param app {@code Application} current running Application.
-     */
-    static void initReactInstanceManager(Application app) {
-        if (reactInstanceManager != null) {
-            return;
-        }
-
-        Log.d(TAG, "initializing RN with Application");
-
-        reactInstanceManager
-            = ReactInstanceManager.builder()
-                .setApplication(app)
-                .setBundleAssetName("index.android.bundle")
-                .setJSMainModulePath("index.android")
-                .setJavaScriptExecutorFactory(getReactNativeJSFactory())
-                .addPackages(getReactNativePackages())
-                .setUseDeveloperSupport(BuildConfig.DEBUG)
-                .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
-                .build();
-    }
-
     /**
      * Internal method to initialize the React Native instance manager. We
      * create a single instance in order to load the JavaScript bundle a single
@@ -281,7 +233,15 @@ class ReactInstanceManagerHolder {
             return;
         }
 
-        Log.d(ReactInstanceManagerHolder.class.getCanonicalName(), "initializing RN with Activity");
+        // Initialize the WebRTC module options.
+        WebRTCModuleOptions options = WebRTCModuleOptions.getInstance();
+
+        EglBase.Context eglContext = EglUtils.getRootEglBaseContext();
+
+        options.videoDecoderFactory = new H264AndSoftwareVideoDecoderFactory(eglContext);
+        options.videoEncoderFactory = new H264AndSoftwareVideoEncoderFactory(eglContext);
+
+        Log.d(TAG, "initializing RN with Activity");
 
         reactInstanceManager
             = ReactInstanceManager.builder()

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

@@ -1,19 +0,0 @@
-package org.jitsi.meet.sdk;
-
-/** Enumeration of supported video codec types. */
-public enum VideoCodecMimeType {
-    VP8("video/x-vnd.on2.vp8"),
-    VP9("video/x-vnd.on2.vp9"),
-    H264("video/avc"),
-    AV1("video/av01");
-
-    private final String mimeType;
-
-    private VideoCodecMimeType(String mimeType) {
-        this.mimeType = mimeType;
-    }
-
-    String mimeType() {
-        return mimeType;
-    }
-}

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

@@ -1,52 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import androidx.annotation.Nullable;
-
-import org.webrtc.EglBase;
-import org.webrtc.HardwareVideoDecoderFactory;
-import org.webrtc.SoftwareVideoDecoderFactory;
-import org.webrtc.VideoCodecInfo;
-import org.webrtc.VideoDecoder;
-import org.webrtc.VideoDecoderFactory;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * This is a custom video decoder factory for WebRTC which behaves similarly
- * to the default one in iOS. It supports the following codecs:
- *
- * - In hardware: H.264 (baseline)
- * - In software: VP8, VP9, AV1
- */
-public class WebRTCVideoDecoderFactory implements VideoDecoderFactory {
-    private final VideoDecoderFactory hardwareVideoDecoderFactory;
-    private final VideoDecoderFactory softwareVideoDecoderFactory = new SoftwareVideoDecoderFactory();
-
-    public WebRTCVideoDecoderFactory(@Nullable EglBase.Context eglContext) {
-        this.hardwareVideoDecoderFactory = new HardwareVideoDecoderFactory(eglContext);
-    }
-
-    @Nullable
-    @Override
-    public VideoDecoder createDecoder(VideoCodecInfo codecInfo) {
-        if (codecInfo.name.equalsIgnoreCase(VideoCodecMimeType.H264.name())) {
-            return this.hardwareVideoDecoderFactory.createDecoder(codecInfo);
-        }
-
-        return this.softwareVideoDecoderFactory.createDecoder(codecInfo);
-    }
-
-    @Override
-    public VideoCodecInfo[] getSupportedCodecs() {
-        List<VideoCodecInfo> codecs = new ArrayList<>();
-
-        codecs.add(H264Utils.DEFAULT_H264_BASELINE_PROFILE_CODEC);
-        codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP8.name(), new HashMap<>()));
-        codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP9.name(), new HashMap<>()));
-        codecs.add(new VideoCodecInfo(VideoCodecMimeType.AV1.name(), new HashMap<>()));
-
-        return codecs.toArray(new VideoCodecInfo[codecs.size()]);
-    }
-}

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

@@ -1,53 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import androidx.annotation.Nullable;
-
-import org.webrtc.EglBase;
-import org.webrtc.HardwareVideoEncoderFactory;
-import org.webrtc.SoftwareVideoEncoderFactory;
-import org.webrtc.VideoCodecInfo;
-import org.webrtc.VideoEncoder;
-import org.webrtc.VideoEncoderFactory;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * This is a custom video encoder factory for WebRTC which behaves similarly
- * to the default one in iOS. It supports the following codecs:
- *
- * - In hardware: H.264 (baseline)
- * - In software: VP8, VP9, AV1
- */
-public class WebRTCVideoEncoderFactory implements VideoEncoderFactory {
-    private final VideoEncoderFactory hardwareVideoEncoderFactory;
-    private final VideoEncoderFactory softwareVideoEncoderFactory = new SoftwareVideoEncoderFactory();
-
-    public WebRTCVideoEncoderFactory(@Nullable EglBase.Context eglContext) {
-        this.hardwareVideoEncoderFactory =
-            new HardwareVideoEncoderFactory(eglContext, false, false);
-    }
-
-    @Nullable
-    @Override
-    public VideoEncoder createEncoder(VideoCodecInfo codecInfo) {
-        if (codecInfo.name.equalsIgnoreCase(VideoCodecMimeType.H264.name())) {
-            return this.hardwareVideoEncoderFactory.createEncoder(codecInfo);
-        }
-
-        return this.softwareVideoEncoderFactory.createEncoder(codecInfo);
-    }
-
-    @Override
-    public VideoCodecInfo[] getSupportedCodecs() {
-        List<VideoCodecInfo> codecs = new ArrayList<>();
-
-        codecs.add(H264Utils.DEFAULT_H264_BASELINE_PROFILE_CODEC);
-        codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP8.name(), new HashMap<>()));
-        codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP9.name(), new HashMap<>()));
-        codecs.add(new VideoCodecInfo(VideoCodecMimeType.AV1.name(), new HashMap<>()));
-
-        return codecs.toArray(new VideoCodecInfo[codecs.size()]);
-    }
-}

app.js

@@ -18,7 +18,6 @@ import './react/features/base/jitsi-local-storage/setup';
 import conference from './conference';
 import API from './modules/API';
 import UI from './modules/UI/UI';
-import keyboardshortcut from './modules/keyboardshortcut/keyboardshortcut';
 import translation from './modules/translation/translation';
 
 // Initialize Olm as early as possible.
@@ -38,7 +37,6 @@ window.APP = {
         'index.loaded': window.indexLoadedTime
     },
 
-    keyboardshortcut,
     translation,
     UI
 };

conference.js

@@ -140,6 +140,7 @@ import { downloadJSON } from './react/features/base/util/downloadJSON';
 import { showDesktopPicker } from './react/features/desktop-picker/actions';
 import { appendSuffix } from './react/features/display-name/functions';
 import { maybeOpenFeedbackDialog, submitFeedback } from './react/features/feedback/actions';
+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';
@@ -162,6 +163,7 @@ 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';
 
 const logger = Logger.getLogger(__filename);
@@ -804,13 +806,14 @@ export default {
      * @returns {Promise}
      */
     async init({ roomName }) {
+        const state = APP.store.getState();
         const initialOptions = {
             startAudioOnly: config.startAudioOnly,
             startScreenSharing: config.startScreenSharing,
-            startWithAudioMuted: getStartWithAudioMuted(APP.store.getState())
-                || isUserInteractionRequiredForUnmute(APP.store.getState()),
-            startWithVideoMuted: getStartWithVideoMuted(APP.store.getState())
-                || isUserInteractionRequiredForUnmute(APP.store.getState())
+            startWithAudioMuted: getStartWithAudioMuted(state)
+                || isUserInteractionRequiredForUnmute(state),
+            startWithVideoMuted: getStartWithVideoMuted(state)
+                || isUserInteractionRequiredForUnmute(state)
         };
 
         this.roomName = roomName;
@@ -840,7 +843,7 @@ export default {
             return tracks;
         };
 
-        if (isPrejoinPageVisible(APP.store.getState())) {
+        if (isPrejoinPageVisible(state)) {
             _connectionPromise = connect(roomName).then(c => {
                 // we want to initialize it early, in case of errors to be able
                 // to gather logs
@@ -863,7 +866,7 @@ export default {
             // they may remain as empty strings.
             this._initDeviceList(true);
 
-            if (isPrejoinPageVisible(APP.store.getState())) {
+            if (isPrejoinPageVisible(state)) {
                 return APP.store.dispatch(initPrejoin(tracks, errors));
             }
 
@@ -873,7 +876,7 @@ export default {
 
             let localTracks = handleStartAudioMuted(initialOptions, tracks);
 
-            // in case where gum is slow and resolves after the startAudio/VideoMuted coming from jicofo, we can be
+            // In case where gUM is slow and resolves after the startAudio/VideoMuted coming from jicofo, we can be
             // join unmuted even though jicofo had instruct us to mute, so let's respect that before passing the tracks
             if (!browser.isWebKitBased()) {
                 if (room?.isStartAudioMuted()) {
@@ -885,6 +888,11 @@ export default {
                 localTracks = localTracks.filter(track => track.getType() !== MEDIA_TYPE.VIDEO);
             }
 
+            // Do not add the tracks if the user has joined the call as a visitor.
+            if (iAmVisitor(state)) {
+                return Promise.resolve();
+            }
+
             return this._setLocalAudioVideoStreams(localTracks);
         }
 
@@ -2301,10 +2309,7 @@ export default {
 
         APP.UI.initConference();
 
-        if (!config.disableShortcuts) {
-            APP.keyboardshortcut.init();
-        }
-
+        dispatch(initKeyboardShortcuts());
         dispatch(conferenceJoined(room));
 
         const jwt = APP.store.getState()['features/base/jwt'];

config.js

@@ -1406,6 +1406,7 @@ var config = {
      disableAGC
      disableAP
      disableHPF
+     disableLocalStats
      disableNS
      enableTalkWhileMuted
      forceJVB121Ratio

css/_audio-preview.scss

@@ -1,100 +0,0 @@
-.audio-preview {
-    display: inline-block;
-
-    &-content {
-        position: relative;
-        right: auto;
-        margin: 0;
-        margin-bottom: 4px;
-        max-height: calc(100vh - 100px);
-        overflow: auto;
-        width: 300px;
-
-        &-ul {
-            margin:0;
-            padding:0;
-            list-style-type: none;
-        }
-    }
-
-    &-header:hover {
-        background-color: initial;
-        cursor: initial;
-    }
-
-    &-entry-text {
-        max-width: 213px;
-
-        &.left-margin {
-            margin-left: 36px;
-        }
-    }
-
-    &-speaker {
-        position: relative;
-
-        &:hover, &:focus-within, &:focus {
-            .audio-preview-test-button {
-                display: inline-block;
-            }
-
-            .audio-preview-entry-text {
-                max-width: 178px;
-                margin-right: 0;
-            }
-        }
-
-        .audio-preview-entry-text {
-            max-width: 238px;
-        }
-    }
-
-    &-microphone {
-        position: relative;
-
-        &--nometer {
-            .audio-preview-entry-text {
-                max-width: 238px;
-            }
-        }
-
-        &--withmeter {
-            .audio-preview-entry-text {
-                max-width: 178px;
-            }
-        }
-
-    }
-
-    &-icon {
-        border-radius: 50%;
-        display: inline-block;
-        width: 14px;
-
-        &--exclamation {
-            margin-left: 6px;
-
-            & svg {
-                fill: #E54B4B;
-            }
-        }
-    }
-
-    &-test-button {
-        display: none;
-        padding: 4px 10px;
-        position: absolute;
-        right: 16px;
-        top: 6px;
-    }
-
-    &-meter-mic {
-        position: absolute;
-        right: 16px;
-        top: 14px;
-    }
-
-    &-checkbox-container {
-        padding: 10px 16px;
-    }
-}

css/_chat.scss

@@ -74,6 +74,10 @@
     a:active {
         color: black;
     }
+
+    &::-webkit-scrollbar-corner {
+        background: #3a3a3a;
+    }
 }
 
 

css/_recording.scss

@@ -197,14 +197,6 @@
         padding-bottom: 10px;
     }
 
-    .helper-link {
-        cursor: pointer;
-        font-weight: bold;
-        display: inline-block;
-        flex-shrink: 0;
-        margin-left: auto;
-    }
-
     .warning-text {
         color:#FFD740;
         font-size: 12px;

css/_video-preview.scss

@@ -1,76 +0,0 @@
-.video-preview {
-    background: none;
-    display: inline-block;
-
-    &-container {
-        max-height: 456px;
-        overflow: auto;
-        margin: 0;
-        margin-bottom: 4px;
-        position: relative;
-        right: auto;
-    }
-
-    &-entry {
-        cursor: pointer;
-        height: 138px;
-        width: 244px;
-        position: relative;
-        margin: 0 7px 4px;
-        border-radius: 6px;
-        box-sizing: border-box;
-        overflow: hidden;
-
-        &:last-child {
-            margin-bottom: 0;
-        }
-
-        &--selected {
-            border: 2px solid #4687ED;
-        }
-    }
-
-    &-video {
-        height: 100%;
-        object-fit: cover;
-        width: 100%;
-    }
-
-    &-error {
-        align-items: center;
-        display: flex;
-        height: 100%;
-        justify-content: center;
-        position: absolute;
-        width: 100%;
-    }
-
-    &-label {
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        max-width: 100%;
-        padding: 8px;
-        z-index: 2;
-
-        &-text {
-            background-color: rgba(0, 0, 0, 0.7);
-            border-radius: 4px;
-            padding: 4px 8px;
-            color: #fff;
-            font-size: 12px;
-            line-height: 16px;
-            font-weight: 600;
-            max-width: calc(100% - 16px);
-            overflow: hidden;
-            text-overflow: ellipsis;
-            width: fit-content;
-            white-space: nowrap;
-        }
-    }
-
-    &-checkbox-container {
-        padding: 10px 14px;
-    }
-}

css/_videolayout_default.scss

@@ -108,6 +108,10 @@
 #largeVideoContainer {
     height: 100%;
     width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    margin: 0 !important;
 }
 
 #largeVideoWrapper {

css/components/_button-control.scss

@@ -1,101 +0,0 @@
-.button-control {
-    box-sizing: border-box;
-    display: inline-block;
-    border: 1px solid $buttonBorder;
-    vertical-align: baseline;
-    height: 30px;
-    min-width: 60px;
-    padding: 4px 10px;
-    margin: 0;
-    line-height: 1.5em;
-    outline: none;
-    background-color: transparent;
-    float: right;
-    font-size: 14px;
-    margin-left: 10px;
-    color: $buttonColor;
-    font-weight: $buttonFontWeight;
-    @include transition(background-color .1s ease-out);
-
-    &[disabled] {
-        color: #666;
-        cursor: default;
-    }
-
-    &_full-width {
-        margin: 0;
-        width: 100%;
-    }
-
-    &:hover {
-        border: 1px solid $buttonHoverBorder;
-        background-color: $buttonHoverBackground;
-        @include transition(background-color .1s ease-in);
-    }
-
-    &:active {
-        @include box-shadow(0, 0, 1px, $buttonShadowColor, true);
-    }
-
-    &_light {
-        color: $defaultDarkColor;
-        background-color: $buttonLightBackground;
-        border: 1px solid $buttonLightBorder;
-
-        &:hover {
-            border: 1px solid $buttonLightHoverBorder;
-            background-color: $buttonLightHoverBackground;
-        }
-    }
-
-    &_link {
-        color: $buttonLinkColor;
-        background-color: $buttonLinkBackground;
-
-        &:hover {
-            background-color: $buttonLinkBackground;
-        }
-    }
-
-    &_overlay {
-        color: $primaryButtonColor;
-        background-color: $overlayButtonBg;
-        border-radius: 2px;
-        border: none;
-
-        &:hover {
-            background-color: $primaryButtonBackground;
-            border: none;
-        }
-    }
-
-    &_primary {
-        background-color: $primaryButtonBackground;
-        border: 1px solid $primaryButtonBackground;
-        color: $primaryButtonColor !important;
-        font-weight: $primaryButtonFontWeight;
-
-        &:hover {
-            border: 1px solid $primaryButtonHoverBackground;
-            background-color: $primaryButtonHoverBackground;
-        }
-
-        &[disabled] {
-            color: $primaryButtonColor;
-        }
-    }
-
-    &_close {
-        color: $defaultFontColor;
-    }
-    &_submit {
-        color: $linkFontColor;
-        &:hover {
-            color: $linkHoverFontColor;
-        }
-    }
-
-    &_center {
-        float: none !important;
-    }
-}

css/components/_form-control.scss

@@ -1,49 +0,0 @@
-.form-control {
-    padding: $formPadding 0;
-
-    &:first-child {
-        padding-top: 0;
-    }
-
-    &:last-child {
-        padding-bottom: 0;
-    }
-
-    &__text {
-        margin: 8px 0;
-        font-size: 1em
-    }
-
-    &__label {
-        font-size: 1em;
-        font-weight: $labelFontWeight;
-    }
-
-    &__em {
-        color: $inputControlEmColor;
-    }
-
-    &__container {
-        position: relative;
-        width: 100%;
-        margin-top: 5px;
-        margin-bottom: 5px;
-        @include flex();
-
-        .button-control {
-            margin: 1px 0 1px 10px;
-        }
-    }
-
-    &__right {
-        position: absolute;
-        right: 0;
-    }
-}
-
-/**
- * Set a specific color for read only style.
- */
-input:read-only {
-    color: $readOnlyInputColor;
-}

css/components/_input-control.scss

@@ -1,29 +0,0 @@
-.input-control {
-    @include transition(all .2s ease-in);
-    display: inline-block;
-    width: 100%;
-    padding: 5px 7px;
-    border-radius: $borderRadius;
-    line-height: 32px;
-    height: 32px;
-    text-align: left;
-    margin-bottom: 8px;
-
-    &:last-child {
-        margin-bottom: inherit;
-    }
-
-    &::selection {
-        background-color: $defaultDarkSelectionColor;
-    }
-
-
-    &.error {
-        color: $errorColor;
-        border-color: $errorColor;
-    }
-}
-
-@include placeholder {
-    color: $placeHolderColor;
-}

css/components/_link.scss

@@ -1,20 +0,0 @@
-.link {
-    cursor: pointer;
-    color: $linkFontColor;
-    @include transition(color .1s ease-out);
-
-    &:hover {
-        color: $linkHoverFontColor;
-        text-decoration: underline;
-        @include transition(color .1s ease-in);
-    }
-}
-
-/**
- * Helper links are links that are meant to open a documentation page or more
- * detailed info.
- */
-.helper-link {
-    @extend .link;
-    font-size: 12px;
-}

css/main.scss

@@ -33,8 +33,6 @@ $flagsImagePath: "../images/";
 @import 'mini_toolbox';
 @import 'modals/desktop-picker/desktop-picker';
 @import 'modals/dialog';
-@import 'modals/embed-meeting/embed-meeting';
-@import 'modals/feedback/feedback';
 @import 'modals/invite/info';
 @import 'modals/screen-share/share-audio';
 @import 'modals/screen-share/share-screen-warning';
@@ -51,10 +49,6 @@ $flagsImagePath: "../images/";
 @import 'welcome_page_settings_toolbar';
 @import 'toolbars';
 @import 'redirect_page';
-@import 'components/form-control';
-@import 'components/link';
-@import 'components/button-control';
-@import 'components/input-control';
 @import 'components/input-slider';
 @import '404';
 @import 'policy';
@@ -66,7 +60,6 @@ $flagsImagePath: "../images/";
 @import 'filmstrip/vertical_filmstrip';
 @import 'filmstrip/vertical_filmstrip_overrides';
 @import 'unsupported-browser/main';
-@import 'modals/invite/add-people';
 @import 'deep-linking/main';
 @import 'transcription-subtitles';
 @import '_meetings_list.scss';
@@ -77,8 +70,6 @@ $flagsImagePath: "../images/";
 @import 'chrome-extension-banner';
 @import 'settings-button';
 @import 'meter';
-@import 'audio-preview';
-@import 'video-preview';
 @import 'premeeting/main';
 @import 'modals/invite/invite_more';
 @import 'modals/security/security';

css/modals/_dialog.scss

@@ -12,24 +12,6 @@
     }
 }
 
-/**
- * Styling inline dialog errors.
- */
-.inline-dialog-error {
-    margin-top: 16px;
-
-    &-text {
-        color: $dialogErrorText;
-        margin-bottom: 8px;
-        text-align: center;
-    }
-
-    &-button {
-        display: block;
-        margin: 16px auto 0 auto;
-    }
-}
-
 /**
  * Styling shared video dialog errors.
  */

css/modals/embed-meeting/_embed-meeting.scss

@@ -1,42 +0,0 @@
-.embed-meeting {
-    &-dialog {
-        display: flex;
-        flex-direction: column;
-    }
-
-    &-copy {
-        color: white;
-        font-size: 15px;
-        margin-left: auto;
-        margin-top: 16px;
-    }
-
-    &-code {
-        background: transparent;
-        border: 1px solid #A4B8D1;
-        color: white;
-        font-size: 15px;
-        height: 165px;
-        line-height: 24px;
-        padding: 8px;
-        width: 100%;
-        resize: vertical;
-    }
-
-    &-trigger {
-        display: flex;
-        align-items: center;
-        padding: 8px 8px 8px 16px;
-        margin-top: 24px;
-        width: calc(100% - 24px);
-        height: 24px;
-        background: #2A3A4B;
-        border: 1px solid #5E6D7A;
-        border-radius: 4px;
-        cursor: pointer;
-
-        .jitsi-icon {
-            margin-right: 20px;
-        }
-    }
-}

css/modals/feedback/_feedback.scss

@@ -1,46 +0,0 @@
-@-webkit-keyframes shake-rotate {
-    0% {
-        -webkit-transform:scale(1) rotate(0deg);
-        transform:scale(1) rotate(0deg)
-    }
-
-    50% {
-        -webkit-transform:scale(.8) rotate(-5deg);
-        transform:scale(.8) rotate(-5deg)
-    }
-
-    to {
-        -webkit-transform:scale(1) rotate(3deg);
-        transform:scale(1) rotate(3deg)
-    }
-}
-
-@keyframes shake-rotate {
-    0% {
-        -webkit-transform:scale(1) rotate(0deg);
-        transform:scale(1) rotate(0deg)
-    }
-
-    50% {
-        -webkit-transform:scale(.8) rotate(-5deg);
-        transform:scale(.8) rotate(-5deg)
-    }
-
-    to {
-        -webkit-transform:scale(1) rotate(3deg);
-        transform:scale(1) rotate(3deg)
-    }
-}
-
-.shake-rotate {
-    display: inline-block;
-
-    -webkit-animation-duration: .4s;
-    animation-duration: .4s;
-    -webkit-animation-iteration-count: infinite;
-    animation-iteration-count: infinite;
-    -webkit-animation-name: shake-rotate;
-    animation-name: shake-rotate;
-    -webkit-animation-timing-function: ease-in-out;
-    animation-timing-function: ease-in-out
-}

css/modals/invite/_add-people.scss

@@ -41,10 +41,3 @@
         }
     }
 }
-
-/**
- * Styles errors in the MultiSelectAutocomplete.
- */
-.autocomplete-error {
-    min-width: 260px;
-}

css/modals/invite/_info.scss

@@ -57,6 +57,10 @@
     line-height: 24px;
     border-collapse: collapse;
 
+    * {
+        user-select: text;
+    }
+
     thead {
         text-align: left;
     }

css/modals/invite/_invite_more.scss

@@ -1,57 +1,4 @@
 .invite-more {
-    &-container {
-        margin-bottom: 8px;
-        transition: margin-bottom 0.3s;
-
-        &.elevated {
-            margin-bottom: 36px;
-        }
-    }
-
-    &-content {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        padding: 16px;
-        background: rgba(0, 0, 0, 0.7);
-        border-radius: 8px;
-        color: #fff;
-        font-size: 14px;
-        line-height: 24px;
-        font-weight: 600;
-    }
-
-    &-header {
-        max-width: 100%;
-        margin-bottom: 16px;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-    }
-
-    &-button {
-        display: flex;
-        max-width: 100%;
-        height: 40px;
-        box-sizing: border-box;
-        padding: 8px 16px;
-        background: #0376DA;
-        border-radius: 3px;
-        cursor: pointer;
-
-        @media (hover: hover) and (pointer: fine) {
-            &:hover {
-                background: #278ADF;
-            }
-        }
-
-        &-text {
-            margin-left: 8px;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            white-space: nowrap;
-        }
-    }
     &-dialog {
         color: #fff;
         font-size: 15px;
@@ -65,59 +12,6 @@
             background: #5E6D7A;
         }
 
-        &.email-container {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            padding: 8px 8px 8px 16px;
-            margin-top: 24px;
-            width: calc(100% - 26px);
-            height: 22px;
-
-            background: #2A3A4B;
-            border: 1px solid #5E6D7A;
-            border-radius: 3px;
-            cursor: pointer;
-
-            &.active {
-                border-radius: 3px 3px 0 0;
-            }
-        }
-
-        &.invite-buttons {
-            width: 100%;
-            text-align: right;
-            margin-top: 8px;
-
-            & > a {
-                display: inline-block;
-                height: 24px;
-                min-width: 48px;
-                border-radius: 3px;
-                text-align: center;
-                text-decoration: none;
-                cursor: pointer;
-            }
-
-            &-cancel {
-                margin-right: 16px;
-                padding: 7px 15px;
-                background: #2A3A4B;
-                border: 1px solid #5E6D7A;
-            }
-
-            &-add {
-                padding: 8px 16px;
-                background: #0376DA;
-            }
-
-            &.disabled {
-                & > a {
-                    pointer-events: none;
-                }
-            }
-        }
-
         &.stream {
             display: flex;
             justify-content: space-between;
@@ -158,14 +52,3 @@
         }
     }
 }
-
-.mobile-browser {
-    .invite-more-content {
-        font-size: 16px;
-    }
-
-    .invite-more-button {
-        height: 48px;
-        padding: 12px 16px;
-    }
-}

doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example

@@ -78,13 +78,18 @@ Component "conference.jitmeet.example.com" "muc"
     restrict_room_creation = true
     storage = "memory"
     modules_enabled = {
+        "muc_hide_all";
         "muc_meeting_id";
         "muc_domain_mapper";
         "polls";
         --"token_verification";
         "muc_rate_limit";
+        "muc_password_whitelist";
     }
     admins = { "focusUser@auth.jitmeet.example.com" }
+    muc_password_whitelist = {
+        "focusUser@auth.jitmeet.example.com"
+    }
     muc_room_locking = false
     muc_room_default_public_jids = true
 
@@ -92,6 +97,7 @@ Component "breakout.jitmeet.example.com" "muc"
     restrict_room_creation = true
     storage = "memory"
     modules_enabled = {
+        "muc_hide_all";
         "muc_meeting_id";
         "muc_domain_mapper";
         "muc_rate_limit";
@@ -105,6 +111,7 @@ Component "breakout.jitmeet.example.com" "muc"
 Component "internal.auth.jitmeet.example.com" "muc"
     storage = "memory"
     modules_enabled = {
+        "muc_hide_all";
         "ping";
     }
     admins = { "focusUser@auth.jitmeet.example.com", "jvb@auth.jitmeet.example.com" }
@@ -139,6 +146,7 @@ Component "lobby.jitmeet.example.com" "muc"
     muc_room_locking = false
     muc_room_default_public_jids = true
     modules_enabled = {
+        "muc_hide_all";
         "muc_rate_limit";
         "polls";
     }

globals.d.ts

@@ -10,12 +10,6 @@ declare global {
         API: any;
         conference: any;
         debugLogs: any;
-        keyboardshortcut: {
-            registerShortcut: Function;
-            unregisterShortcut: Function;
-            openDialog: Function;
-            enable: Function;
-        }
     };
     const interfaceConfig: any;
 

interface_config.js

@@ -70,7 +70,8 @@ var interfaceConfig = {
 
     ENABLE_DIAL_OUT: true,
 
-    ENABLE_FEEDBACK_ANIMATION: false, // Enables feedback star animation.
+    // DEPRECATED. Animation no longer supported.
+    // ENABLE_FEEDBACK_ANIMATION: false,
 
     FILM_STRIP_MAX_HEIGHT: 120,
 

ios/Podfile

@@ -42,7 +42,7 @@ target 'JitsiMeetSDK' do
 
   pod 'CocoaLumberjack', '3.7.2'
   pod 'ObjectiveDropboxOfficial', '6.2.3'
-  pod 'JitsiWebRTC', '~> 106.0.0'
+  pod 'JitsiWebRTC', '~> 111.0.0'
 end
 
 target 'JitsiMeetSDKLite' do

ios/Podfile.lock

@@ -3,11 +3,12 @@ PODS:
   - amplitude-react-native (2.7.0):
     - Amplitude (= 8.7.1)
     - React-Core
-  - AppAuth (1.4.0):
-    - AppAuth/Core (= 1.4.0)
-    - AppAuth/ExternalUserAgent (= 1.4.0)
-  - AppAuth/Core (1.4.0)
-  - AppAuth/ExternalUserAgent (1.4.0)
+  - AppAuth (1.6.1):
+    - AppAuth/Core (= 1.6.1)
+    - AppAuth/ExternalUserAgent (= 1.6.1)
+  - AppAuth/Core (1.6.1)
+  - AppAuth/ExternalUserAgent (1.6.1):
+    - AppAuth/Core
   - boost (1.76.0)
   - CocoaLumberjack (3.7.2):
     - CocoaLumberjack/Core (= 3.7.2)
@@ -102,56 +103,56 @@ PODS:
     - GoogleUtilities/Network (~> 7.7)
     - "GoogleUtilities/NSData+zlib (~> 7.7)"
     - nanopb (~> 2.30908.0)
-  - GoogleDataTransport (9.1.4):
+  - GoogleDataTransport (9.2.2):
     - GoogleUtilities/Environment (~> 7.7)
     - nanopb (< 2.30910.0, >= 2.30908.0)
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleSignIn (6.0.2):
-    - AppAuth (~> 1.4)
-    - GTMAppAuth (~> 1.0)
-    - GTMSessionFetcher/Core (~> 1.1)
-  - GoogleUtilities/AppDelegateSwizzler (7.7.0):
+  - GoogleSignIn (6.2.4):
+    - AppAuth (~> 1.5)
+    - GTMAppAuth (~> 1.3)
+    - GTMSessionFetcher/Core (< 3.0, >= 1.1)
+  - GoogleUtilities/AppDelegateSwizzler (7.11.1):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.7.0):
+  - GoogleUtilities/Environment (7.11.1):
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.7.0):
+  - GoogleUtilities/Logger (7.11.1):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (7.7.0):
+  - GoogleUtilities/MethodSwizzler (7.11.1):
     - GoogleUtilities/Logger
-  - GoogleUtilities/Network (7.7.0):
+  - GoogleUtilities/Network (7.11.1):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.7.0)"
-  - GoogleUtilities/Reachability (7.7.0):
+  - "GoogleUtilities/NSData+zlib (7.11.1)"
+  - GoogleUtilities/Reachability (7.11.1):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.7.0):
+  - GoogleUtilities/UserDefaults (7.11.1):
     - GoogleUtilities/Logger
-  - GTMAppAuth (1.2.2):
-    - AppAuth/Core (~> 1.4)
-    - GTMSessionFetcher/Core (~> 1.5)
-  - GTMSessionFetcher/Core (1.7.0)
-  - JitsiWebRTC (106.0.0)
-  - libwebp (1.2.1):
-    - libwebp/demux (= 1.2.1)
-    - libwebp/mux (= 1.2.1)
-    - libwebp/webp (= 1.2.1)
-  - libwebp/demux (1.2.1):
+  - GTMAppAuth (1.3.1):
+    - AppAuth/Core (~> 1.6)
+    - GTMSessionFetcher/Core (< 3.0, >= 1.5)
+  - GTMSessionFetcher/Core (2.3.0)
+  - JitsiWebRTC (111.0.1)
+  - libwebp (1.2.4):
+    - libwebp/demux (= 1.2.4)
+    - libwebp/mux (= 1.2.4)
+    - libwebp/webp (= 1.2.4)
+  - libwebp/demux (1.2.4):
     - libwebp/webp
-  - libwebp/mux (1.2.1):
+  - libwebp/mux (1.2.4):
     - libwebp/demux
-  - libwebp/webp (1.2.1)
+  - libwebp/webp (1.2.4)
   - nanopb (2.30908.0):
     - nanopb/decode (= 2.30908.0)
     - nanopb/encode (= 2.30908.0)
   - nanopb/decode (2.30908.0)
   - nanopb/encode (2.30908.0)
   - ObjectiveDropboxOfficial (6.2.3)
-  - PromisesObjC (2.1.1)
-  - PromisesSwift (2.1.1):
-    - PromisesObjC (= 2.1.1)
+  - PromisesObjC (2.2.0)
+  - PromisesSwift (2.2.0):
+    - PromisesObjC (= 2.2.0)
   - RCT-Folly (2021.06.28.00-v2):
     - boost
     - DoubleConversion
@@ -389,8 +390,8 @@ PODS:
   - react-native-video/Video (6.0.0-alpha.1):
     - PromisesSwift
     - React-Core
-  - react-native-webrtc (106.0.7):
-    - JitsiWebRTC (~> 106.0.0)
+  - react-native-webrtc (111.0.0):
+    - JitsiWebRTC (~> 111.0.0)
     - React-Core
   - react-native-webview (11.15.1):
     - React-Core
@@ -471,8 +472,8 @@ PODS:
     - React-Core
   - RNGestureHandler (2.9.0):
     - React-Core
-  - RNGoogleSignin (7.0.4):
-    - GoogleSignIn (~> 6.0.0)
+  - RNGoogleSignin (9.0.2):
+    - GoogleSignIn (~> 6.2)
     - React-Core
   - RNScreens (3.13.1):
     - React-Core
@@ -500,7 +501,7 @@ DEPENDENCIES:
   - Firebase/DynamicLinks (~> 8.0)
   - "giphy-react-native-sdk (from `../node_modules/@giphy/react-native-sdk`)"
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
-  - JitsiWebRTC (~> 106.0.0)
+  - JitsiWebRTC (~> 111.0.0)
   - ObjectiveDropboxOfficial (= 6.2.3)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -701,7 +702,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Amplitude: 834c7332dfb9640a751e21c13efb22a07c0c12d4
   amplitude-react-native: 0ed8cab759aafaa94961b82122bf56297da607ad
-  AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
+  AppAuth: e48b432bb4ba88b10cb2bcc50d7f3af21e78b9c2
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
   DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
@@ -719,17 +720,17 @@ SPEC CHECKSUMS:
   giphy-react-native-sdk: 7abccf2b52123a0f30ce99da895ab6288023680c
   glog: 476ee3e89abb49e07f822b48323c51c57124b572
   GoogleAppMeasurement: 4c19f031220c72464d460c9daa1fb5d1acce958e
-  GoogleDataTransport: 5fffe35792f8b96ec8d6775f5eccd83c998d5a3b
-  GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
-  GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
-  GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
-  GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91
-  JitsiWebRTC: f441eb0e2d67f0588bf24e21c5162e97342714fb
-  libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
+  GoogleDataTransport: 8378d1fa8ac49753ea6ce70d65a7cb70ce5f66e6
+  GoogleSignIn: 5651ce3a61e56ca864160e79b484cd9ed3f49b7a
+  GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
+  GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd
+  GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2
+  JitsiWebRTC: 9619c1f71cc16eeca76df68aa2d213c6d63274a8
+  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   ObjectiveDropboxOfficial: fe206ce8c0bc49976c249d472db7fdbc53ebbd53
-  PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
-  PromisesSwift: 99fddfe4a0ec88a56486644c0da106694c92a604
+  PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
+  PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959
   RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
   RCTRequired: 92cbd71369a2de6add25fd2403ac39838f1b694f
   RCTTypeSafety: 494e8af41d7410ed0b877210859ee3984f37e6b4
@@ -754,7 +755,7 @@ SPEC CHECKSUMS:
   react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
   react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
   react-native-video: bb6f12a7198db53b261fefb5d609dc77417acc8b
-  react-native-webrtc: 0df36747802476e758af6b6dceccdeaed8c826c2
+  react-native-webrtc: a9d4d8ef61adb634e006ffd956c494ad8318d95c
   react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
   React-perflogger: 46620fc6d1c3157b60ed28434e08f7fd7f3f3353
   React-RCTActionSheet: b1f7e72a0ba760ec684df335c61f730b5179f5ff
@@ -774,13 +775,13 @@ SPEC CHECKSUMS:
   RNDefaultPreference: 08bdb06cfa9188d5da97d4642dac745218d7fb31
   RNDeviceInfo: 0400a6d0c94186d1120c3cbd97b23abc022187a9
   RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
-  RNGoogleSignin: c4381751eefd73c552b923ba347a9bfc6f18771c
+  RNGoogleSignin: 22e468a9474dbcb8618d8847205ad4f0b2575d13
   RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
   RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
   RNSVG: f3b60aeeaa81960e2e0536c3a9eef50b667ef3a9
   RNWatch: dae6c858a2051dbdcfb00b9a86cf4d90400263b4
   Yoga: 7929b92b1828675c1bebeb114dae8cb8fa7ef6a3
 
-PODFILE CHECKSUM: e671cdcdb80fab67e305861c36bfae8ed5a5b0ef
+PODFILE CHECKSUM: d9116cb59cd7e921956e45de7cbbd75bef3862c1
 
 COCOAPODS: 1.11.3

ios/app/src/AppDelegate.m

@@ -39,6 +39,11 @@
         [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/JitsiMeet.m

@@ -15,7 +15,7 @@
  */
 
 #import <Intents/Intents.h>
-#import <WebRTC/RTCLogging.h>
+
 #import "Orientation.h"
 
 #import "JitsiMeet+Private.h"
@@ -26,6 +26,8 @@
 #import "RNSplashScreen.h"
 #import "ScheenshareEventEmiter.h"
 
+#import <react-native-webrtc/WebRTCModuleOptions.h>
+
 #if !defined(JITSI_MEET_SDK_LITE)
 #import <RNGoogleSignin/RNGoogleSignin.h>
 #import "Dropbox.h"
@@ -52,6 +54,12 @@
 
 - (instancetype)init {
     if (self = [super init]) {
+#if 0
+        // Initialize WebRTC options.
+        WebRTCModuleOptions *options = [WebRTCModuleOptions sharedInstance];
+        options.loggingSeverity = RTCLoggingSeverityInfo;
+#endif
+
         // Initialize the one and only bridge for interfacing with React Native.
         _bridgeWrapper = [[RCTBridgeWrapper alloc] init];
         
@@ -63,11 +71,6 @@
 
         // Register a log handler for React.
         registerReactLogHandler();
-
-#if 0
-        // Enable WebRTC logs
-        RTCSetMinDebugLogLevel(RTCLoggingSeverityInfo);
-#endif
     }
 
     return self;

lang/main.json

@@ -675,6 +675,7 @@
         "connectedTwoMembers": "{{first}} and {{second}} joined the meeting",
         "dataChannelClosed": "Video quality impaired",
         "dataChannelClosedDescription": "The bridge channel has been disconnected and thus video quality is limited to its lowest setting.",
+        "disabledIframe": "Embedding is only meant for demo purposes, so this call will disconnect in {{timeout}} minutes.",
         "disconnected": "disconnected",
         "displayNotifications": "Display notifications for",
         "dontRemindMe": "Do not remind me",

modules/API/API.js

@@ -115,7 +115,11 @@ import { muteAllParticipants } from '../../react/features/video-menu/actions';
 import { setVideoQuality } from '../../react/features/video-quality/actions';
 import { getJitsiMeetTransport } from '../transport';
 
-import { API_ID, ENDPOINT_TEXT_MESSAGE_NAME } from './constants';
+import {
+    API_ID,
+    ASSUMED_BANDWIDTH_BPS,
+    ENDPOINT_TEXT_MESSAGE_NAME
+} from './constants';
 
 const logger = Logger.getLogger(__filename);
 
@@ -310,6 +314,23 @@ function initCommands() {
 
             APP.store.dispatch(sendTones(tones, duration, pause));
         },
+        'set-assumed-bandwidth-bps': value => {
+            logger.debug('Set assumed bandwidth bps command received', value);
+
+            if (typeof value !== 'number' || isNaN(value)) {
+                logger.error('Assumed bandwidth bps must be a number.');
+
+                return;
+            }
+
+            const { conference } = APP.store.getState()['features/base/conference'];
+
+            if (conference) {
+                conference.setAssumedBandwidthBps(value < ASSUMED_BANDWIDTH_BPS
+                    ? ASSUMED_BANDWIDTH_BPS
+                    : value);
+            }
+        },
         'set-follow-me': value => {
             logger.debug('Set follow me command received');
 

modules/API/constants.js

@@ -15,3 +15,10 @@ export const API_ID = parseURLParams(window.location).jitsi_meet_external_api_id
  * The payload name for the datachannel/endpoint text message event.
  */
 export const ENDPOINT_TEXT_MESSAGE_NAME = 'endpoint-text-message';
+
+/**
+ * The min value that can be set for the assumed bandwidth.
+ * Setting it to this value means not assuming any bandwidth,
+ * but rather allowing the estimations to take place.
+ */
+export const ASSUMED_BANDWIDTH_BPS = -1;

modules/API/external/external_api.js

@@ -59,6 +59,7 @@ const commands = {
     sendEndpointTextMessage: 'send-endpoint-text-message',
     sendParticipantToRoom: 'send-participant-to-room',
     sendTones: 'send-tones',
+    setAssumedBandwidthBps: 'set-assumed-bandwidth-bps',
     setFollowMe: 'set-follow-me',
     setLargeVideoParticipant: 'set-large-video-participant',
     setMediaEncryptionKey: 'set-media-encryption-key',
@@ -393,14 +394,6 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         this._frame.name = frameName;
         this._frame.id = frameName;
         this._setSize(height, width);
-        this._frame.sandbox = [
-            'allow-scripts',
-            'allow-same-origin',
-            'allow-popups',
-            'allow-forms',
-            'allow-downloads',
-            'allow-top-navigation-by-user-activation'
-        ].join(' ');
         this._frame.setAttribute('allowFullScreen', 'true');
         this._frame.style.border = 0;
 

modules/UI/UI.js

@@ -11,11 +11,11 @@ import { setColorAlpha } from '../../react/features/base/util/helpers';
 import { setDocumentUrl } from '../../react/features/etherpad/actions';
 import { setFilmstripVisible } from '../../react/features/filmstrip/actions.any';
 import {
-    joinLeaveNotificationsDisabled,
     setNotificationsEnabled,
     showNotification
 } from '../../react/features/notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../../react/features/notifications/constants';
+import { joinLeaveNotificationsDisabled } from '../../react/features/notifications/functions';
 import {
     dockToolbox,
     setToolboxEnabled,

modules/keyboardshortcut/keyboardshortcut.js

@@ -1,261 +0,0 @@
-/* global APP */
-import { jitsiLocalStorage } from '@jitsi/js-utils';
-import Logger from '@jitsi/logger';
-
-import {
-    ACTION_SHORTCUT_PRESSED as PRESSED,
-    ACTION_SHORTCUT_RELEASED as RELEASED,
-    createShortcutEvent
-} from '../../react/features/analytics/AnalyticsEvents';
-import { sendAnalytics } from '../../react/features/analytics/functions';
-import { clickOnVideo } from '../../react/features/filmstrip/actions';
-import { openSettingsDialog } from '../../react/features/settings/actions';
-import { SETTINGS_TABS } from '../../react/features/settings/constants';
-
-const logger = Logger.getLogger(__filename);
-
-/**
- * Map of shortcuts. When a shortcut is registered it enters the mapping.
- * @type {Map}
- */
-const _shortcuts = new Map();
-
-/**
- * Map of registered keyboard keys and translation keys describing the
- * action performed by the key.
- * @type {Map}
- */
-const _shortcutsHelp = new Map();
-
-/**
- * The key used to save in local storage if keyboard shortcuts are enabled.
- */
-const _enableShortcutsKey = 'enableShortcuts';
-
-/**
- * Prefer keyboard handling of these elements over global shortcuts.
- * If a button is triggered using the Spacebar it should not trigger PTT.
- * If an input element is focused and M is pressed it should not mute audio.
- */
-const _elementsBlacklist = [
-    'input',
-    'textarea',
-    'button',
-    '[role=button]',
-    '[role=menuitem]',
-    '[role=radio]',
-    '[role=tab]',
-    '[role=option]',
-    '[role=switch]',
-    '[role=range]',
-    '[role=log]'
-];
-
-/**
- * An element selector for elements that have their own keyboard handling.
- */
-const _focusedElementsSelector = `:focus:is(${_elementsBlacklist.join(',')})`;
-
-/**
- * Maps keycode to character, id of popover for given function and function.
- */
-const KeyboardShortcut = {
-
-    init() {
-        this._initGlobalShortcuts();
-
-        window.onkeyup = e => {
-            if (!this.getEnabled()) {
-                return;
-            }
-            const key = this._getKeyboardKey(e).toUpperCase();
-            const num = parseInt(key, 10);
-
-            if (!document.querySelector(_focusedElementsSelector)) {
-                if (_shortcuts.has(key)) {
-                    _shortcuts.get(key).function(e);
-                } else if (!isNaN(num) && num >= 0 && num <= 9) {
-                    APP.store.dispatch(clickOnVideo(num));
-                }
-            }
-        };
-
-        window.onkeydown = e => {
-            if (!this.getEnabled()) {
-                return;
-            }
-            const focusedElement = document.querySelector(_focusedElementsSelector);
-
-            if (!focusedElement) {
-                if (this._getKeyboardKey(e).toUpperCase() === ' ') {
-                    if (APP.conference.isLocalAudioMuted()) {
-                        sendAnalytics(createShortcutEvent(
-                            'push.to.talk',
-                            PRESSED));
-                        logger.log('Talk shortcut pressed');
-                        APP.conference.muteAudio(false);
-                    }
-                }
-            } else if (this._getKeyboardKey(e).toUpperCase() === 'ESCAPE') {
-                // Allow to remove focus from selected elements using ESC key.
-                if (focusedElement && focusedElement.blur) {
-                    focusedElement.blur();
-                }
-            }
-        };
-    },
-
-    /**
-     * Enables/Disables the keyboard shortcuts.
-     * @param {boolean} value - the new value.
-     */
-    enable(value) {
-        jitsiLocalStorage.setItem(_enableShortcutsKey, value);
-    },
-
-    getEnabled() {
-        // Should be enabled if not explicitly set to false
-        // eslint-disable-next-line no-unneeded-ternary
-        return jitsiLocalStorage.getItem(_enableShortcutsKey) === 'false' ? false : true;
-    },
-
-    getShortcutsDescriptions() {
-        return _shortcutsHelp;
-    },
-
-    /**
-     * Opens the {@SettingsDialog} dialog on the  Shortcuts page.
-     *
-     * @returns {void}
-     */
-    openDialog() {
-        APP.store.dispatch(openSettingsDialog(SETTINGS_TABS.SHORTCUTS, false));
-    },
-
-    /**
-     * Registers a new shortcut.
-     *
-     * @param shortcutChar the shortcut character triggering the action
-     * @param shortcutAttr the "shortcut" html element attribute mapping an
-     * element to this shortcut and used to show the shortcut character on the
-     * element tooltip
-     * @param exec the function to be executed when the shortcut is pressed
-     * @param helpDescription the description of the shortcut that would appear
-     * in the help menu
-     * @param altKey whether or not the alt key must be pressed.
-     */
-    registerShortcut(// eslint-disable-line max-params
-            shortcutChar,
-            shortcutAttr,
-            exec,
-            helpDescription,
-            altKey = false) {
-        _shortcuts.set(altKey ? `:${shortcutChar}` : shortcutChar, {
-            character: shortcutChar,
-            function: exec,
-            shortcutAttr,
-            altKey
-        });
-
-        if (helpDescription) {
-            this._addShortcutToHelp(altKey ? `:${shortcutChar}` : shortcutChar, helpDescription);
-        }
-    },
-
-    /**
-     * Unregisters a shortcut.
-     *
-     * @param shortcutChar unregisters the given shortcut, which means it will
-     * no longer be usable
-     * @param altKey whether or not shortcut is combo with alt key
-     */
-    unregisterShortcut(shortcutChar, altKey = false) {
-        _shortcuts.delete(altKey ? `:${shortcutChar}` : shortcutChar);
-        _shortcutsHelp.delete(shortcutChar);
-    },
-
-    /**
-     * @param e a KeyboardEvent
-     * @returns {string} e.key or something close if not supported
-     */
-    _getKeyboardKey(e) {
-        // If alt is pressed a different char can be returned so this takes
-        // the char from the code. It also prefixes with a colon to differentiate
-        // alt combo from simple keypress.
-        if (e.altKey) {
-            const key = e.code.replace('Key', '');
-
-            return `:${key}`;
-        }
-
-        // If e.key is a string, then it is assumed it already plainly states
-        // the key pressed. This may not be true in all cases, such as with Edge
-        // and "?", when the browser cannot properly map a key press event to a
-        // keyboard key. To be safe, when a key is "Unidentified" it must be
-        // further analyzed by jitsi to a key using e.which.
-        if (typeof e.key === 'string' && e.key !== 'Unidentified') {
-            return e.key;
-        }
-        if (e.type === 'keypress'
-                && ((e.which >= 32 && e.which <= 126)
-                    || (e.which >= 160 && e.which <= 255))) {
-            return String.fromCharCode(e.which);
-        }
-
-        // try to fallback (0-9A-Za-z and QWERTY keyboard)
-        switch (e.which) {
-        case 27:
-            return 'Escape';
-        case 191:
-            return e.shiftKey ? '?' : '/';
-        }
-        if (e.shiftKey || e.type === 'keypress') {
-            return String.fromCharCode(e.which);
-        }
-
-        return String.fromCharCode(e.which).toLowerCase();
-
-    },
-
-    /**
-     * Adds the given shortcut to the help dialog.
-     *
-     * @param shortcutChar the shortcut character
-     * @param shortcutDescriptionKey the description of the shortcut
-     * @private
-     */
-    _addShortcutToHelp(shortcutChar, shortcutDescriptionKey) {
-        _shortcutsHelp.set(shortcutChar, shortcutDescriptionKey);
-    },
-
-    /**
-     * Initialise global shortcuts.
-     * Global shortcuts are shortcuts for features that don't have a button or
-     * link associated with the action. In other words they represent actions
-     * triggered _only_ with a shortcut.
-     */
-    _initGlobalShortcuts() {
-        this.registerShortcut('?', null, () => {
-            sendAnalytics(createShortcutEvent('help'));
-            this.openDialog();
-        }, 'keyboardShortcuts.toggleShortcuts');
-
-        // register SPACE shortcut in two steps to insure visibility of help
-        // message
-        this.registerShortcut(' ', null, () => {
-            sendAnalytics(createShortcutEvent('push.to.talk', RELEASED));
-            logger.log('Talk shortcut released');
-            APP.conference.muteAudio(true);
-        });
-        this._addShortcutToHelp('SPACE', 'keyboardShortcuts.pushToTalk');
-
-        /**
-         * FIXME: Currently focus keys are directly implemented below in
-         * onkeyup. They should be moved to the SmallVideo instead.
-         */
-        this._addShortcutToHelp('0', 'keyboardShortcuts.focusLocal');
-        this._addShortcutToHelp('1-9', 'keyboardShortcuts.focusRemote');
-    }
-};
-
-export default KeyboardShortcut;

package.json

@@ -16,14 +16,10 @@
   "readmeFilename": "README.md",
   "dependencies": {
     "@amplitude/react-native": "2.7.0",
-    "@atlaskit/inline-dialog": "13.0.9",
-    "@atlaskit/inline-message": "11.0.8",
-    "@atlaskit/multi-select": "15.0.5",
-    "@atlaskit/theme": "11.0.2",
-    "@emotion/react": "11.10.0",
-    "@emotion/styled": "11.10.0",
+    "@emotion/react": "11.10.6",
+    "@emotion/styled": "11.10.6",
     "@giphy/js-fetch-api": "4.7.1",
-    "@giphy/react-components": "5.6.0",
+    "@giphy/react-components": "6.8.1",
     "@giphy/react-native-sdk": "1.7.0",
     "@hapi/bourne": "2.0.0",
     "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.12/jitsi-excalidraw-0.0.12.tgz",
@@ -33,13 +29,13 @@
     "@jitsi/rtcstats": "9.5.1",
     "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
     "@microsoft/microsoft-graph-client": "3.0.1",
-    "@mui/material": "5.10.2",
-    "@mui/styles": "5.10.2",
+    "@mui/material": "5.12.1",
+    "@mui/styles": "5.12.0",
     "@react-native-async-storage/async-storage": "1.17.3",
     "@react-native-community/clipboard": "1.5.1",
     "@react-native-community/netinfo": "7.1.7",
     "@react-native-community/slider": "4.1.12",
-    "@react-native-google-signin/google-signin": "7.0.4",
+    "@react-native-google-signin/google-signin": "9.0.2",
     "@react-navigation/bottom-tabs": "6.5.3",
     "@react-navigation/elements": "1.3.13",
     "@react-navigation/material-top-tabs": "6.5.2",
@@ -48,13 +44,9 @@
     "@svgr/webpack": "6.3.1",
     "@tensorflow/tfjs-backend-wasm": "3.13.0",
     "@tensorflow/tfjs-core": "3.13.0",
-    "@types/amplitude-js": "8.16.2",
-    "@types/audioworklet": "0.0.29",
-    "@types/w3c-image-capture": "1.0.6",
-    "@types/w3c-web-hid": "1.0.3",
     "@vladmandic/human": "2.6.5",
     "@vladmandic/human-models": "2.5.9",
-    "@xmldom/xmldom": "0.7.9",
+    "@xmldom/xmldom": "0.8.7",
     "amplitude-js": "8.2.1",
     "base64-js": "1.3.1",
     "bc-css-flags": "3.0.0",
@@ -73,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/v1614.0.0+5d3ce8c2/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1626.0.0+a41aa571/lib-jitsi-meet.tgz",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "moment-duration-format": "2.2.2",
@@ -112,7 +104,7 @@
     "react-native-url-polyfill": "1.3.0",
     "react-native-video": "https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
     "react-native-watch-connectivity": "1.0.11",
-    "react-native-webrtc": "106.0.7",
+    "react-native-webrtc": "111.0.0",
     "react-native-webview": "11.15.1",
     "react-native-youtube-iframe": "2.2.1",
     "react-redux": "7.1.0",
@@ -123,7 +115,6 @@
     "redux-thunk": "2.4.1",
     "resemblejs": "4.0.0",
     "seamless-scroll-polyfill": "2.1.8",
-    "styled-components": "3.4.9",
     "tss-react": "4.4.4",
     "util": "0.12.1",
     "uuid": "8.3.2",
@@ -140,17 +131,23 @@
     "@babel/preset-flow": "7.16.0",
     "@babel/preset-react": "7.16.0",
     "@jitsi/eslint-config": "4.1.5",
+    "@types/amplitude-js": "8.16.2",
+    "@types/audioworklet": "0.0.29",
     "@types/js-md5": "0.4.3",
     "@types/lodash": "4.14.182",
+    "@types/punycode": "2.1.0",
     "@types/react": "17.0.14",
     "@types/react-dom": "17.0.14",
     "@types/react-linkify": "1.0.1",
     "@types/react-native": "0.68.9",
+    "@types/react-native-video": "5.0.14",
     "@types/react-redux": "7.1.24",
     "@types/react-window": "1.8.5",
     "@types/resemblejs": "^4.1.0",
     "@types/unorm": "1.3.28",
     "@types/uuid": "8.3.4",
+    "@types/w3c-image-capture": "1.0.6",
+    "@types/w3c-web-hid": "1.0.3",
     "@types/zxcvbn": "4.4.1",
     "@typescript-eslint/eslint-plugin": "5.30.5",
     "@typescript-eslint/parser": "5.30.4",
@@ -176,11 +173,16 @@
     "ts-loader": "9.4.1",
     "typescript": "4.7.4",
     "unorm": "1.6.0",
-    "webpack": "5.57.1",
+    "webpack": "5.76.0",
     "webpack-bundle-analyzer": "4.4.2",
     "webpack-cli": "4.9.0",
     "webpack-dev-server": "4.7.3"
   },
+  "overrides": {
+    "strophe.js@1.6.0": {
+      "@xmldom/xmldom": "0.8.7"
+    }
+  },
   "engines": {
     "node": ">=14.0.0",
     "npm": ">=7.0.0"
@@ -197,6 +199,8 @@
     "lint-fix": "eslint --ext .js,.ts,.tsx --max-warnings 0 --fix .",
     "postinstall": "patch-package --error-on-fail && jetify",
     "validate": "npm ls",
+    "tsc-test:web": "tsc --project tsconfig.web.json --listFilesOnly | grep -v node_modules | grep native",
+    "tsc-test:native": "tsc --project tsconfig.native.json --listFilesOnly | grep -v node_modules | grep web",
     "start": "make dev"
   },
   "resolutions": {

patches/@giphy+js-analytics+4.2.0.patch

@@ -1,14 +1,14 @@
 diff --git a/node_modules/@giphy/js-analytics/dist/send-pingback.js b/node_modules/@giphy/js-analytics/dist/send-pingback.js
-index 001345a..f303443 100644
+index 989f0ff..149e77c 100644
 --- a/node_modules/@giphy/js-analytics/dist/send-pingback.js
 +++ b/node_modules/@giphy/js-analytics/dist/send-pingback.js
 @@ -10,6 +10,9 @@ var global_1 = __importDefault(require("./global"));
  var environment = (global_1.default === null || global_1.default === void 0 ? void 0 : global_1.default.GIPHY_PINGBACK_URL) || 'https://pingback.giphy.com';
- var pingBackUrl = environment + "/v2/pingback?apikey=l0HlIwPWyBBUDAUgM";
+ var pingBackUrl = "".concat(environment, "/v2/pingback?apikey=l0HlIwPWyBBUDAUgM");
  var sendPingback = function (events) {
 +    // Disabled.
 +    return Promise.resolve();
 +
-     var headers = js_util_1.getGiphySDKRequestHeaders();
+     var headers = (0, js_util_1.getGiphySDKRequestHeaders)();
      /* istanbul ignore next */
      headers === null || headers === void 0 ? void 0 : headers.set('Content-Type', 'application/json');

patches/@giphy+js-brand+2.0.4.patch

@@ -1,12 +0,0 @@
-diff --git a/node_modules/@giphy/js-brand/dist/typography.js b/node_modules/@giphy/js-brand/dist/typography.js
-index af796bc..585fa00 100644
---- a/node_modules/@giphy/js-brand/dist/typography.js
-+++ b/node_modules/@giphy/js-brand/dist/typography.js
-@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
- exports.css = exports.fontSize = exports.fontFamily = void 0;
- var emotion_1 = require("emotion");
- // eslint-disable-next-line
--emotion_1.injectGlobal(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: normal;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Rg.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Rg.woff') format('woff');\n}\n\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: bold;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Bd.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Bd.woff') format('woff');\n}\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: 900;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_XBd.woff') format('woff');\n}\n@font-face {\n    font-family: 'nexablack'; \n    font-style: normal;\n    font-weight: normal;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/nexa_black-webfont.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/nexa_black-webfont.woff') format('woff');\n}\n@font-face {\n    font-family: 'SSStandard'; \n    font-style: normal;\n    font-weight: normal;\n    src:  url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/ss-standard.woff') format('woff');\n}\n@font-face {\n    font-family: 'SSSocial'; \n    font-style: normal;\n    font-weight: normal;\n    src:  url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/ss-social.woff') format('woff');\n}\n"], ["\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: normal;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Rg.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Rg.woff') format('woff');\n}\n\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: bold;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Bd.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Bd.woff') format('woff');\n}\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: 900;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_XBd.woff') format('woff');\n}\n@font-face {\n    font-family: 'nexablack'; \n    font-style: normal;\n    font-weight: normal;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/nexa_black-webfont.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/nexa_black-webfont.woff') format('woff');\n}\n@font-face {\n    font-family: 'SSStandard'; \n    font-style: normal;\n    font-weight: normal;\n    src:  url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/ss-standard.woff') format('woff');\n}\n@font-face {\n    font-family: 'SSSocial'; \n    font-style: normal;\n    font-weight: normal;\n    src:  url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/ss-social.woff') format('woff');\n}\n"])));
- exports.fontFamily = {
-     title: "'nexablack', sans-serif",
-     body: 'interface, Helvetica Neue, helvetica, sans-serif;',

patches/@giphy+js-brand+2.2.2.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@giphy/js-brand/dist/typography.js b/node_modules/@giphy/js-brand/dist/typography.js
+index 75ad96b..815cb8b 100644
+--- a/node_modules/@giphy/js-brand/dist/typography.js
++++ b/node_modules/@giphy/js-brand/dist/typography.js
+@@ -6,7 +6,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
+ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.css = exports.fontSize = exports.fontFamily = exports.addFonts = void 0;
+ var emotion_1 = require("emotion");
+-var addFonts = function () { return (0, emotion_1.injectGlobal)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: normal;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Rg.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Rg.woff') format('woff');\n}\n\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: bold;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Bd.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Bd.woff') format('woff');\n}\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: 900;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_XBd.woff') format('woff');\n}\n@font-face {\n    font-family: 'nexablack'; \n    font-style: normal;\n    font-weight: normal;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/nexa_black-webfont.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/nexa_black-webfont.woff') format('woff');\n}\n@font-face {\n    font-family: 'SSStandard'; \n    font-style: normal;\n    font-weight: normal;\n    src:  url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/ss-standard.woff') format('woff');\n}\n@font-face {\n    font-family: 'SSSocial'; \n    font-style: normal;\n    font-weight: normal;\n    src:  url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/ss-social.woff') format('woff');\n}\n"], ["\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: normal;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Rg.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Rg.woff') format('woff');\n}\n\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: bold;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Bd.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_Bd.woff') format('woff');\n}\n@font-face {\n    font-family: 'interface';\n    font-style: normal;\n    font-weight: 900;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/InterFace_W_XBd.woff') format('woff');\n}\n@font-face {\n    font-family: 'nexablack'; \n    font-style: normal;\n    font-weight: normal;\n    src: url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/nexa_black-webfont.woff2') format('woff2'),\n        url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/nexa_black-webfont.woff') format('woff');\n}\n@font-face {\n    font-family: 'SSStandard'; \n    font-style: normal;\n    font-weight: normal;\n    src:  url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/ss-standard.woff') format('woff');\n}\n@font-face {\n    font-family: 'SSSocial'; \n    font-style: normal;\n    font-weight: normal;\n    src:  url('https://s3.amazonaws.com/giphyscripts/react-giphy-brand/fonts/ss-social.woff') format('woff');\n}\n"]))); };
++var addFonts = function () { };
+ exports.addFonts = addFonts;
+ try {
+     // in an env where process.env exists,

react/features/analytics/actionTypes.ts

@@ -1,5 +1,3 @@
-// @flow
-
 /**
  * The type of (redux) action which signals that local media duration has changed.
  *

react/features/app/components/AbstractApp.ts

@@ -25,7 +25,7 @@ export interface IProps {
  *
  * @abstract
  */
-export class AbstractApp extends BaseApp<IProps> {
+export class AbstractApp<P extends IProps = IProps> extends BaseApp<P> {
     /**
      * The deferred for the initialisation {{promise, resolve, reject}}.
      */

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ComponentType } from 'react';
 import { NativeModules, Platform, StyleSheet, View } from 'react-native';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import SplashScreen from 'react-native-splash-screen';
@@ -14,14 +14,13 @@ import { updateSettings } from '../../base/settings/actions';
 import { _getRouteToRender } from '../getRouteToRender.native';
 import logger from '../logger';
 
-import { AbstractApp } from './AbstractApp';
-import type { Props as AbstractAppProps } from './AbstractApp';
+import { AbstractApp, IProps as AbstractAppProps } from './AbstractApp';
 
 // Register middlewares and reducers.
-import '../middlewares';
-import '../reducers';
+import '../middlewares.native';
+import '../reducers.native';
 
-declare var __DEV__;
+declare let __DEV__: any;
 
 const { AppInfo } = NativeModules;
 
@@ -32,37 +31,33 @@ const DialogContainerWrapper = Platform.select({
 /**
  * The type of React {@code Component} props of {@link App}.
  */
-type Props = AbstractAppProps & {
+interface IProps extends AbstractAppProps {
 
     /**
      * An object with the feature flags.
      */
-    flags: Object,
+    flags: Object;
 
     /**
      * An object with user information (display name, email, avatar URL).
      */
-    userInfo: ?Object
-};
+    userInfo?: Object;
+}
 
 /**
  * Root app {@code Component} on mobile/React Native.
  *
  * @augments AbstractApp
  */
-export class App extends AbstractApp {
-    /**
-     * The deferred for the initialisation {{promise, resolve, reject}}.
-     */
-    _init: Object;
+export class App extends AbstractApp<IProps> {
 
     /**
      * Initializes a new {@code App} instance.
      *
-     * @param {Props} props - The read-only React {@code Component} props with
+     * @param {IProps} props - The read-only React {@code Component} props with
      * which the new instance is to be initialized.
      */
-    constructor(props: Props) {
+    constructor(props: IProps) {
         super(props);
 
         // In the Release configuration, React Native will (intentionally) throw
@@ -99,10 +94,11 @@ export class App extends AbstractApp {
      * @returns {void}
      */
     async _extraInit() {
-        const { dispatch, getState } = this.state.store;
+        const { dispatch, getState } = this.state.store ?? {};
+        const { flags } = this.props;
 
         // We set these early enough so then we avoid any unnecessary re-renders.
-        dispatch(updateFlags(this.props.flags));
+        dispatch?.(updateFlags(flags));
 
         const route = await _getRouteToRender();
 
@@ -113,8 +109,9 @@ export class App extends AbstractApp {
         // Wait until the root navigator is ready.
         // We really need to break the inheritance relationship between App,
         // AbstractApp and BaseApp, it's very inflexible and cumbersome right now.
-        const rootNavigationReady = new Promise(resolve => {
+        const rootNavigationReady = new Promise<void>(resolve => {
             const i = setInterval(() => {
+                // @ts-ignore
                 const { ready } = getState()['features/app'] || {};
 
                 if (ready) {
@@ -127,26 +124,27 @@ export class App extends AbstractApp {
         await rootNavigationReady;
 
         // Check if serverURL is configured externally and not allowed to change.
-        const serverURLChangeEnabled = getFeatureFlag(getState(), SERVER_URL_CHANGE_ENABLED, true);
+        const serverURLChangeEnabled = getState && getFeatureFlag(getState(), SERVER_URL_CHANGE_ENABLED, true);
 
         if (!serverURLChangeEnabled) {
             // As serverURL is provided externally, so we push it to settings.
             if (typeof this.props.url !== 'undefined') {
+                // @ts-ignore
                 const { serverURL } = this.props.url;
 
                 if (typeof serverURL !== 'undefined') {
-                    dispatch(updateSettings({ serverURL }));
+                    dispatch?.(updateSettings({ serverURL }));
                 }
             }
         }
 
-        dispatch(updateSettings(this.props.userInfo || {}));
+        dispatch?.(updateSettings(this.props.userInfo || {}));
 
         // Update settings with feature-flag.
-        const callIntegrationEnabled = this.props.flags[CALL_INTEGRATION_ENABLED];
+        const callIntegrationEnabled = flags[CALL_INTEGRATION_ENABLED as keyof typeof flags];
 
         if (typeof callIntegrationEnabled !== 'undefined') {
-            dispatch(updateSettings({ disableCallIntegration: !callIntegrationEnabled }));
+            dispatch?.(updateSettings({ disableCallIntegration: !callIntegrationEnabled }));
         }
     }
 
@@ -156,7 +154,7 @@ export class App extends AbstractApp {
      *
      * @override
      */
-    _createMainElement(component, props) {
+    _createMainElement(component: ComponentType<any>, props: Object) {
         return (
             <SafeAreaProvider>
                 <DimensionsDetector
@@ -196,17 +194,19 @@ export class App extends AbstractApp {
             return;
         }
 
+        // @ts-ignore
         const oldHandler = global.ErrorUtils.getGlobalHandler();
         const newHandler = _handleException;
 
         if (!oldHandler || oldHandler !== newHandler) {
+            // @ts-ignore
             newHandler.next = oldHandler;
+
+            // @ts-ignore
             global.ErrorUtils.setGlobalHandler(newHandler);
         }
     }
 
-    _onDimensionsChanged: (width: number, height: number) => void;
-
     /**
      * Updates the known available size for the app to occupy.
      *
@@ -216,9 +216,9 @@ export class App extends AbstractApp {
      * @returns {void}
      */
     _onDimensionsChanged(width: number, height: number) {
-        const { dispatch } = this.state.store;
+        const { dispatch } = this.state.store ?? {};
 
-        dispatch(clientResized(width, height));
+        dispatch?.(clientResized(width, height));
     }
 
     /**
@@ -232,10 +232,10 @@ export class App extends AbstractApp {
      * @private
      * @returns {void}
      */
-    _onSafeAreaInsetsChanged(insets) {
-        const { dispatch } = this.state.store;
+    _onSafeAreaInsetsChanged(insets: Object) {
+        const { dispatch } = this.state.store ?? {};
 
-        dispatch(setSafeAreaInsets(insets));
+        dispatch?.(setSafeAreaInsets(insets));
     }
 
     /**
@@ -266,7 +266,7 @@ export class App extends AbstractApp {
  * @private
  * @returns {void}
  */
-function _handleException(error, fatal) {
+function _handleException(error: Error, fatal: boolean) {
     if (fatal) {
         // In the Release configuration, React Native will (intentionally) throw
         // an unhandled JavascriptException for an unhandled JavaScript error.
@@ -275,6 +275,7 @@ function _handleException(error, fatal) {
         logger.error(error);
     } else {
         // Forward to the next globalHandler of ErrorUtils.
+        // @ts-ignore
         const { next } = _handleException;
 
         typeof next === 'function' && next(error, fatal);

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

@@ -1,5 +1,4 @@
-import { AtlasKitThemeProvider } from '@atlaskit/theme';
-import React, { Fragment } from 'react';
+import React from 'react';
 
 import GlobalStyles from '../../base/ui/components/GlobalStyles.web';
 import JitsiThemeProvider from '../../base/ui/components/JitsiThemeProvider.web';
@@ -31,9 +30,9 @@ export class App extends AbstractApp {
      */
     _createExtraElement() {
         return (
-            <Fragment>
+            <JitsiThemeProvider>
                 <OverlayContainer />
-            </Fragment>
+            </JitsiThemeProvider>
         );
     }
 
@@ -46,11 +45,9 @@ export class App extends AbstractApp {
     _createMainElement(component: React.ComponentType, props: any) {
         return (
             <JitsiThemeProvider>
-                <AtlasKitThemeProvider mode = 'dark'>
-                    <GlobalStyles />
-                    <ChromeExtensionBanner />
-                    { super._createMainElement(component, props) }
-                </AtlasKitThemeProvider>
+                <GlobalStyles />
+                <ChromeExtensionBanner />
+                { super._createMainElement(component, props) }
             </JitsiThemeProvider>
         );
     }
@@ -63,9 +60,7 @@ export class App extends AbstractApp {
     _renderDialogContainer() {
         return (
             <JitsiThemeProvider>
-                <AtlasKitThemeProvider mode = 'dark'>
-                    <DialogContainer />
-                </AtlasKitThemeProvider>
+                <DialogContainer />
             </JitsiThemeProvider>
         );
     }

react/features/app/getRouteToRender.native.ts

@@ -13,6 +13,6 @@ const route = {
  * @param {any} _stateful - Used on web.
  * @returns {Promise<Object>}
  */
-export function _getRouteToRender(_stateful: any) {
+export function _getRouteToRender(_stateful?: any) {
     return Promise.resolve(route);
 }

react/features/app/middlewares.web.ts

@@ -5,6 +5,7 @@ import '../base/media/middleware';
 import '../dynamic-branding/middleware';
 import '../e2ee/middleware';
 import '../external-api/middleware';
+import '../keyboard-shortcuts/middleware';
 import '../no-audio-signal/middleware';
 import '../notifications/middleware';
 import '../noise-detection/middleware';

react/features/app/reducer.native.ts

@@ -9,7 +9,7 @@ import { _ROOT_NAVIGATION_READY } from '../mobile/navigation/actionTypes';
  * @param {string} action.type - Type of action.
  * @returns {Object}
  */
-ReducerRegistry.register('features/app', (state = {}, action) => {
+ReducerRegistry.register('features/app', (state: Object = {}, action) => {
     switch (action.type) {
     case _ROOT_NAVIGATION_READY:
         return {

react/features/app/reducers.any.ts

@@ -1,5 +1,3 @@
-// @flow
-
 import '../analytics/reducer';
 import '../authentication/reducer';
 import '../av-moderation/reducer';

react/features/app/reducers.native.ts

@@ -1,5 +1,3 @@
-// @flow
-
 import '../mobile/audio-mode/reducer';
 import '../mobile/background/reducer';
 import '../mobile/call-integration/reducer';

react/features/app/reducers.web.ts

@@ -3,6 +3,7 @@ import '../base/tooltip/reducer';
 import '../e2ee/reducer';
 import '../face-landmarks/reducer';
 import '../feedback/reducer';
+import '../keyboard-shortcuts/reducer';
 import '../no-audio-signal/reducer';
 import '../noise-detection/reducer';
 import '../participants-pane/reducer';

react/features/app/types.ts

@@ -43,6 +43,7 @@ import { IGifsState } from '../gifs/reducer';
 import { IGoogleApiState } from '../google-api/reducer';
 import { IInviteState } from '../invite/reducer';
 import { IJaaSState } from '../jaas/reducer';
+import { IKeyboardShortcutsState } from '../keyboard-shortcuts/types';
 import { ILargeVideoState } from '../large-video/reducer';
 import { ILobbyState } from '../lobby/reducer';
 import { IMobileAudioModeState } from '../mobile/audio-mode/reducer';
@@ -133,6 +134,7 @@ export interface IReduxState {
     'features/google-api': IGoogleApiState;
     'features/invite': IInviteState;
     'features/jaas': IJaaSState;
+    'features/keyboard-shortcuts': IKeyboardShortcutsState;
     'features/large-video': ILargeVideoState;
     'features/lobby': ILobbyState;
     'features/mobile/audio-mode': IMobileAudioModeState;

react/features/authentication/actions.any.ts

@@ -8,8 +8,6 @@ import {
     UPGRADE_ROLE_FINISHED,
     UPGRADE_ROLE_STARTED, WAIT_FOR_OWNER
 } from './actionTypes';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { LoginDialog, WaitForOwnerDialog } from './components';
 import logger from './logger';
 

react/features/authentication/components/index.native.ts

@@ -1,4 +1,3 @@
-// @ts-ignore
 export { default as LoginDialog } from './native/LoginDialog';
 // eslint-disable-next-line lines-around-comment
 // @ts-ignore

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

@@ -1,8 +1,9 @@
 import React, { Component } from 'react';
 import Dialog from 'react-native-dialog';
 import { connect as reduxConnect } from 'react-redux';
-import type { Dispatch } from 'redux';
 
+import { IReduxState, IStore } from '../../../app/types';
+import { IJitsiConference } from '../../../base/conference/reducer';
 import { connect } from '../../../base/connection/actions.native';
 import { toJid } from '../../../base/connection/functions';
 import { _abstractMapStateToProps } from '../../../base/dialog/functions';
@@ -13,61 +14,68 @@ import { authenticateAndUpgradeRole, cancelLogin } from '../../actions.native';
 /**
  * The type of the React {@link Component} props of {@link LoginDialog}.
  */
-type Props = {
+interface IProps {
 
     /**
      * {@link JitsiConference} That needs authentication - will hold a valid
      * value in XMPP login + guest access mode.
      */
-    _conference: Object,
+    _conference?: IJitsiConference;
 
     /**
      * The server hosts specified in the global config.
      */
-    _configHosts: Object,
+    _configHosts?: {
+        anonymousdomain?: string;
+        authdomain?: string;
+        domain: string;
+        focus?: string;
+        muc: string;
+        visitorFocus: string;
+    };
 
     /**
      * Indicates if the dialog should display "connecting" status message.
      */
-    _connecting: boolean,
+    _connecting: boolean;
 
     /**
      * The error which occurred during login/authentication.
      */
-    _error: Object,
+    _error: any;
 
     /**
      * The progress in the floating range between 0 and 1 of the authenticating
      * and upgrading the role of the local participant/user.
      */
-    _progress: number,
+    _progress?: number;
 
     /**
      * Redux store dispatch method.
      */
-    dispatch: Dispatch<any>,
+    dispatch: IStore['dispatch'];
 
     /**
      * Invoked to obtain translated strings.
      */
-    t: Function
-};
+    t: Function;
+}
 
 /**
  * The type of the React {@link Component} state of {@link LoginDialog}.
  */
-type State = {
+interface IState {
 
     /**
      * The user entered password for the conference.
      */
-    password: string,
+    password: string;
 
     /**
      * The user entered local participant name.
      */
-    username: string
-};
+    username: string;
+}
 
 /**
  * Dialog asks user for username and password.
@@ -96,14 +104,14 @@ type State = {
  * See {@link https://github.com/jitsi/jicofo#secure-domain} for a description
  * of the configuration parameters.
  */
-class LoginDialog extends Component<Props, State> {
+class LoginDialog extends Component<IProps, IState> {
     /**
      * Initializes a new LoginDialog instance.
      *
      * @param {Object} props - The read-only properties with which the new
      * instance is to be initialized.
      */
-    constructor(props: Props) {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
@@ -179,7 +187,7 @@ class LoginDialog extends Component<Props, State> {
         } = this.props;
 
         let messageKey;
-        const messageOptions = {};
+        const messageOptions = { msg: '' };
 
         if (progress && progress < 1) {
             messageKey = 'connection.FETCH_SESSION_ID';
@@ -196,7 +204,7 @@ class LoginDialog extends Component<Props, State> {
                         && credentials.jid
                             === toJid(
                                 this.state.username,
-                                this.props._configHosts)
+                                this.props._configHosts ?? {})
                         && credentials.password === this.state.password) {
                     messageKey = 'dialog.incorrectPassword';
                 }
@@ -222,7 +230,7 @@ class LoginDialog extends Component<Props, State> {
      * @returns {void}
      * @private
      */
-    _onUsernameChange(text) {
+    _onUsernameChange(text: string) {
         this.setState({
             username: text.trim()
         });
@@ -235,7 +243,7 @@ class LoginDialog extends Component<Props, State> {
      * @returns {void}
      * @private
      */
-    _onPasswordChange(text) {
+    _onPasswordChange(text: string) {
         this.setState({
             password: text
         });
@@ -261,7 +269,7 @@ class LoginDialog extends Component<Props, State> {
     _onLogin() {
         const { _conference: conference, dispatch } = this.props;
         const { password, username } = this.state;
-        const jid = toJid(username, this.props._configHosts);
+        const jid = toJid(username, this.props._configHosts ?? {});
         let r;
 
         // If there's a conference it means that the connection has succeeded,
@@ -282,9 +290,9 @@ class LoginDialog extends Component<Props, State> {
  *
  * @param {Object} state - The Redux state.
  * @private
- * @returns {Props}
+ * @returns {IProps}
  */
-function _mapStateToProps(state) {
+function _mapStateToProps(state: IReduxState) {
     const {
         error: authenticateAndUpgradeRoleError,
         progress,

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

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import type { Dispatch } from 'redux';
 
+import { IStore } from '../../../app/types';
 import ConfirmDialog from '../../../base/dialog/components/native/ConfirmDialog';
 import { translate } from '../../../base/i18n/functions';
 import { cancelWaitForOwner, openLoginDialog } from '../../actions.native';
@@ -9,18 +9,18 @@ import { cancelWaitForOwner, openLoginDialog } from '../../actions.native';
 /**
  * The type of the React {@code Component} props of {@link WaitForOwnerDialog}.
  */
-type Props = {
+interface IProps {
 
     /**
      * Redux store dispatch function.
      */
-    dispatch: Dispatch<any>,
+    dispatch: IStore['dispatch'];
 
     /**
      * Invoked to obtain translated strings.
      */
-    t: Function
-};
+    t: Function;
+}
 
 /**
  * The dialog is display in XMPP password + guest access configuration, after
@@ -28,14 +28,14 @@ type Props = {
  *
  * See {@link LoginDialog} description for more details.
  */
-class WaitForOwnerDialog extends Component<Props> {
+class WaitForOwnerDialog extends Component<IProps> {
     /**
      * Initializes a new WaitForWonderDialog instance.
      *
      * @param {Object} props - The read-only properties with which the new
      * instance is to be initialized.
      */
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
         // Bind event handlers so they are only bound once per instance.

react/features/base/app/components/BaseApp.tsx

@@ -250,7 +250,7 @@ export default class BaseApp<P> extends Component<P, IState> {
      * @returns {Promise}
      */
     _navigate(route: {
-        component?: ComponentType;
+        component?: ComponentType<any>;
         href?: string;
         props?: Object;
     }): Promise<any> {

react/features/base/audio-only/actionTypes.ts

@@ -1,5 +1,3 @@
-// @flow
-
 /**
  * The type of (redux) action which sets the audio-only flag for the current
  * conference.

react/features/base/avatar/components/Avatar.tsx

@@ -71,7 +71,7 @@ export interface IProps {
     /**
      * The size of the avatar.
      */
-    size: number;
+    size?: number;
 
     /**
      * One of the expected status strings (e.g. 'available') to render a badge on the avatar, if necessary.
@@ -185,6 +185,7 @@ class Avatar<P extends IProps> extends PureComponent<P, IState> {
             id?: string;
             status?: string;
             testId?: string;
+            url?: string;
             useCORS?: boolean;
         } = {
             className,

react/features/base/avatar/components/native/StatelessAvatar.tsx

@@ -1,12 +1,11 @@
 import React, { Component } from 'react';
-import { Image, Text, View } from 'react-native';
+import { Image, Text, TextStyle, View, ViewStyle } from 'react-native';
 
 import Icon from '../../../icons/components/Icon';
 import { StyleType } from '../../../styles/functions.native';
 import { isIcon } from '../../functions';
 import { IAvatarProps } from '../../types';
 
-// @ts-ignore
 import styles from './styles';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -23,6 +22,11 @@ interface IProps extends IAvatarProps {
      * External style passed to the component.
      */
     style?: StyleType;
+
+    /**
+     * The URL of the avatar to render.
+     */
+    url?: string;
 }
 
 /**
@@ -66,7 +70,7 @@ export default class StatelessAvatar extends Component<IProps> {
             <View>
                 <View
                     style = { [
-                        styles.avatarContainer(size),
+                        styles.avatarContainer(size) as ViewStyle,
                         style
                     ] }>
                     { avatar }
@@ -90,7 +94,7 @@ export default class StatelessAvatar extends Component<IProps> {
 
         return (
             <View style = { styles.badgeContainer }>
-                <View style = { styles.badge(size, status) } />
+                <View style = { styles.badge(size, status) as ViewStyle } />
             </View>
         );
     }
@@ -125,7 +129,7 @@ export default class StatelessAvatar extends Component<IProps> {
         return (
             <View
                 style = { [
-                    styles.initialsContainer,
+                    styles.initialsContainer as ViewStyle,
                     {
                         backgroundColor: color
                     }
@@ -148,12 +152,12 @@ export default class StatelessAvatar extends Component<IProps> {
         return (
             <View
                 style = { [
-                    styles.initialsContainer,
+                    styles.initialsContainer as ViewStyle,
                     {
                         backgroundColor: color
                     }
                 ] }>
-                <Text style = { styles.initialsText(size) }> { initials } </Text>
+                <Text style = { styles.initialsText(size) as TextStyle }> { initials } </Text>
             </View>
         );
     }
@@ -166,9 +170,11 @@ export default class StatelessAvatar extends Component<IProps> {
     _renderURLAvatar() {
         const { onAvatarLoadError, size, url } = this.props;
 
-        return ( // @ts-ignore
+        return (
             <Image
                 defaultSource = { DEFAULT_AVATAR }
+
+                // @ts-ignore
                 onError = { onAvatarLoadError }
                 resizeMode = 'cover'
                 source = {{ uri: url }}

react/features/base/avatar/components/native/styles.ts

@@ -1,5 +1,3 @@
-// @flow
-
 import { StyleSheet } from 'react-native';
 
 import { ColorPalette } from '../../../styles/components/styles/ColorPalette';

react/features/base/avatar/components/web/StatelessAvatar.tsx

@@ -35,6 +35,11 @@ interface IProps extends IAvatarProps {
      */
     testId?: string;
 
+    /**
+     * The URL of the avatar to render.
+     */
+    url?: string | Function;
+
     /**
      * Indicates whether to load the avatar using CORS or not.
      */

react/features/base/avatar/types.ts

@@ -24,9 +24,4 @@ export interface IAvatarProps {
      * Expected size of the avatar.
      */
     size?: number;
-
-    /**
-     * The URL of the avatar to render.
-     */
-    url?: string | Function;
 }

react/features/base/color-scheme/ColorSchemeRegistry.ts

@@ -65,7 +65,7 @@ class ColorSchemeRegistry {
      * @param {StyleType} style - The style definition to register.
      * @returns {void}
      */
-    register(componentName: string, style: StyleType): void {
+    register(componentName: string, style: any): void {
         this._styleTemplates.set(componentName, style);
 
         // If this is a style overwrite, we need to delete the processed version
@@ -120,7 +120,6 @@ class ColorSchemeRegistry {
                 } else if (typeof styleValue === 'function') {
                     // The value is a function, which indicates that it's a
                     // dynamic, schemed color we need to resolve.
-                    // $FlowExpectedError
                     const value = styleValue();
 
                     schemedStyle[styleName]

react/features/base/conference/actions.ts

@@ -3,6 +3,7 @@ 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 { JITSI_CONNECTION_CONFERENCE_KEY } from '../connection/constants';
@@ -450,11 +451,12 @@ export function conferenceUniqueIdSet(conference: IJitsiConference) {
  */
 export function _conferenceWillJoin(conference: IJitsiConference) {
     return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+        const state = getState();
         const localTracks
-            = getLocalTracks(getState()['features/base/tracks'])
+            = getLocalTracks(state['features/base/tracks'])
                 .map(t => t.jitsiTrack);
 
-        if (localTracks.length) {
+        if (localTracks.length && !iAmVisitor(state)) {
             _addLocalTracksToConference(conference, localTracks);
         }
 
@@ -530,8 +532,6 @@ export function createConference(overrideRoom?: string | String) {
         if (tmp.domain) {
             // eslint-disable-next-line no-new-wrappers
             _room = new String(tmp);
-
-            // $FlowExpectedError
             _room.domain = tmp.domain;
         }
 
@@ -808,7 +808,7 @@ export function setStartReactionsMuted(muted: boolean, updateBackend = false) {
 export function setPassword(
         conference: IJitsiConference | undefined,
         method: Function | undefined,
-        password: string) {
+        password?: string) {
     return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
         if (!conference) {
             return;

react/features/base/conference/functions.ts

@@ -159,7 +159,6 @@ export function forEachConference(
         // Does the value of the base/conference's property look like a
         // JitsiConference?
         if (v && typeof v === 'object') {
-            // $FlowFixMe
             const url: URL = v[JITSI_CONFERENCE_URL_KEY];
 
             // XXX The Web version of Jitsi Meet does not utilize
@@ -309,6 +308,7 @@ export function getVisitorOptions(stateful: IStateful, params: Array<string>) {
                     muc: config.oldConfig.hosts.muc
                 },
                 focusUserJid: focusJid,
+                disableLocalStats: false,
                 bosh: config.oldConfig.bosh && appendURLParam(config.oldConfig.bosh, 'customusername', username),
                 websocket: config.oldConfig.websocket
                     && appendURLParam(config.oldConfig.websocket, 'customusername', username),
@@ -339,6 +339,7 @@ export function getVisitorOptions(stateful: IStateful, params: Array<string>) {
         },
         focusUserJid: focusJid,
         disableFocus: true, // This flag disables sending the initial conference request
+        disableLocalStats: true,
         bosh: config.bosh && appendURLParam(config.bosh, 'vnode', vnode),
         websocket: config.websocket && appendURLParam(config.websocket, 'vnode', vnode)
     };

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

@@ -1,6 +1,5 @@
-// @flow
+import { AnyAction } from 'redux';
 
-import { readyToClose } from '../../../features/mobile/external-api/actions';
 import {
     ACTION_PINNED,
     ACTION_UNPINNED,
@@ -9,11 +8,14 @@ import {
 } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';
 import { reloadNow } from '../../app/actions';
+import { IReduxState, 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 { 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';
@@ -62,12 +64,10 @@ import {
 } from './functions';
 import logger from './logger';
 
-declare var APP: Object;
-
 /**
  * Handler for before unload event.
  */
-let beforeUnloadHandler;
+let beforeUnloadHandler: Function | undefined;
 
 /**
  * Implements the middleware of the feature base/conference.
@@ -129,7 +129,7 @@ MiddlewareRegistry.register(store => next => action => {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _conferenceFailed({ dispatch, getState }, next, action) {
+function _conferenceFailed({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
     const { conference, error } = action;
 
     if (error.name === JitsiConferenceErrors.REDIRECTED) {
@@ -191,7 +191,7 @@ function _conferenceFailed({ dispatch, getState }, next, action) {
             const newConfig = restoreConferenceOptions(getState);
 
             if (newConfig) {
-                dispatch(overwriteConfig(newConfig))
+                dispatch(overwriteConfig(newConfig)) // @ts-ignore
                     .then(dispatch(conferenceWillLeave(conference)))
                     .then(conference.leave())
                     .then(dispatch(disconnect()))
@@ -217,7 +217,7 @@ function _conferenceFailed({ dispatch, getState }, next, action) {
 
             const [ vnode ] = error.params;
 
-            dispatch(overwriteConfig(newConfig))
+            dispatch(overwriteConfig(newConfig)) // @ts-ignore
                 .then(dispatch(conferenceWillLeave(conference)))
                 .then(conference.leave())
                 .then(dispatch(disconnect()))
@@ -234,7 +234,7 @@ function _conferenceFailed({ dispatch, getState }, next, action) {
     if (typeof APP === 'undefined') {
         !error.recoverable
         && conference
-        && conference.leave(CONFERENCE_LEAVE_REASONS.UNRECOVERABLE_ERROR).catch(reason => {
+        && 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);
@@ -267,7 +267,7 @@ function _conferenceFailed({ dispatch, getState }, next, action) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _conferenceJoined({ dispatch, getState }, next, action) {
+function _conferenceJoined({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
     const result = next(action);
     const { conference } = action;
     const { pendingSubjectChange } = getState()['features/base/conference'];
@@ -288,6 +288,8 @@ function _conferenceJoined({ dispatch, getState }, next, action) {
     beforeUnloadHandler = () => {
         dispatch(conferenceWillLeave(conference));
     };
+
+    // @ts-ignore
     window.addEventListener(disableBeforeUnloadHandlers ? 'unload' : 'beforeunload', beforeUnloadHandler);
 
     if (requireDisplayName
@@ -313,7 +315,7 @@ function _conferenceJoined({ dispatch, getState }, next, action) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _connectionEstablished({ dispatch }, next, action) {
+function _connectionEstablished({ dispatch }: IStore, next: Function, action: AnyAction) {
     const result = next(action);
 
     // FIXME: Workaround for the web version. Currently, the creation of the
@@ -330,7 +332,7 @@ function _connectionEstablished({ dispatch }, next, action) {
  * @param {Object} state - The redux state.
  * @returns {void}
  */
-function _logJwtErrors(message, state) {
+function _logJwtErrors(message: string, state: IReduxState) {
     const { jwt } = state['features/base/jwt'];
 
     if (!jwt) {
@@ -357,7 +359,7 @@ function _logJwtErrors(message, state) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _connectionFailed({ dispatch, getState }, next, action) {
+function _connectionFailed({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
     _logJwtErrors(action.error.message, getState());
 
     const result = next(action);
@@ -417,7 +419,7 @@ function _connectionFailed({ dispatch, getState }, next, action) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _conferenceSubjectChanged({ dispatch, getState }, next, action) {
+function _conferenceSubjectChanged({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
     const result = next(action);
     const { subject } = getState()['features/base/conference'];
 
@@ -442,7 +444,7 @@ function _conferenceSubjectChanged({ dispatch, getState }, next, action) {
  * @param {Object} store - The redux store.
  * @returns {void}
  */
-function _conferenceWillLeave({ getState }: { getState: Function }) {
+function _conferenceWillLeave({ getState }: IStore) {
     _removeUnloadHandler(getState);
 }
 
@@ -460,7 +462,7 @@ function _conferenceWillLeave({ getState }: { getState: Function }) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _pinParticipant({ getState }, next, action) {
+function _pinParticipant({ getState }: IStore, next: Function, action: AnyAction) {
     const state = getState();
     const { conference } = state['features/base/conference'];
 
@@ -473,7 +475,7 @@ function _pinParticipant({ getState }, next, action) {
     const pinnedParticipant = getPinnedParticipant(state);
     const actionName = id ? ACTION_PINNED : ACTION_UNPINNED;
     const local
-        = (participantById && participantById.local)
+        = participantById?.local
             || (!id && pinnedParticipant && pinnedParticipant.local);
     let participantIdForEvent;
 
@@ -481,7 +483,7 @@ function _pinParticipant({ getState }, next, action) {
         participantIdForEvent = local;
     } else {
         participantIdForEvent
-            = actionName === ACTION_PINNED ? id : pinnedParticipant && pinnedParticipant.id;
+            = actionName === ACTION_PINNED ? id : pinnedParticipant?.id;
     }
 
     sendAnalytics(createPinnedEvent(
@@ -501,10 +503,11 @@ function _pinParticipant({ getState }, next, action) {
  * @param {Function} getState - The redux getState function.
  * @returns {void}
  */
-function _removeUnloadHandler(getState) {
+function _removeUnloadHandler(getState: IStore['getState']) {
     if (typeof beforeUnloadHandler !== 'undefined') {
         const { disableBeforeUnloadHandlers = false } = getState()['features/base/config'];
 
+        // @ts-ignore
         window.removeEventListener(disableBeforeUnloadHandlers ? 'unload' : 'beforeunload', beforeUnloadHandler);
         beforeUnloadHandler = undefined;
     }
@@ -522,7 +525,7 @@ function _removeUnloadHandler(getState) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _sendTones({ getState }, next, action) {
+function _sendTones({ getState }: IStore, next: Function, action: AnyAction) {
     const state = getState();
     const { conference } = state['features/base/conference'];
 
@@ -549,15 +552,15 @@ function _sendTones({ getState }, next, action) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _setRoom({ dispatch, getState }, next, action) {
+function _setRoom({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
     const state = getState();
     const { localSubject, subject } = state['features/base/config'];
     const { room } = action;
 
     if (room) {
         // Set the stored subject.
-        dispatch(setLocalSubject(localSubject));
-        dispatch(setSubject(subject));
+        dispatch(setLocalSubject(localSubject ?? ''));
+        dispatch(setSubject(subject ?? ''));
     }
 
     return next(action);
@@ -572,15 +575,20 @@ function _setRoom({ dispatch, getState }, next, action) {
  * @private
  * @returns {Promise}
  */
-function _syncConferenceLocalTracksWithState({ getState }, action) {
-    const conference = getCurrentConference(getState);
+function _syncConferenceLocalTracksWithState({ getState }: IStore, action: AnyAction) {
+    const state = getState();
+    const conference = getCurrentConference(state);
     let promise;
 
     if (conference) {
         const track = action.track.jitsiTrack;
 
         if (action.type === TRACK_ADDED) {
-            promise = _addLocalTracksToConference(conference, [ track ]);
+            // If gUM is slow and tracks are created after the user has already joined the conference, avoid
+            // adding the tracks to the conference if the user is a visitor.
+            if (!iAmVisitor(state)) {
+                promise = _addLocalTracksToConference(conference, [ track ]);
+            }
         } else {
             promise = _removeLocalTracksFromConference(conference, [ track ]);
         }
@@ -603,7 +611,7 @@ function _syncConferenceLocalTracksWithState({ getState }, action) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _trackAddedOrRemoved(store, next, action) {
+function _trackAddedOrRemoved(store: IStore, next: Function, action: AnyAction) {
     const track = action.track;
 
     // TODO All track swapping should happen here instead of conference.js.
@@ -628,7 +636,7 @@ function _trackAddedOrRemoved(store, next, action) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _updateLocalParticipantInConference({ dispatch, getState }, next, action) {
+function _updateLocalParticipantInConference({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
     const { conference } = getState()['features/base/conference'];
     const { participant } = action;
     const result = next(action);

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

@@ -1,4 +1,3 @@
-
 import {
     setPrejoinPageVisibility,
     setSkipPrejoinOnReload

react/features/base/conference/reducer.ts

@@ -60,6 +60,7 @@ export interface IJitsiConference {
     getMetadataHandler: Function;
     getName: Function;
     getParticipantById: Function;
+    getParticipantCount: Function;
     getParticipants: Function;
     getRole: Function;
     getSpeakerStats: () => ISpeakerStats;
@@ -101,7 +102,9 @@ export interface IJitsiConference {
     sendMessage: Function;
     sendPrivateTextMessage: Function;
     sendTextMessage: Function;
+    sendTones: Function;
     sessionId: string;
+    setAssumedBandwidthBps: (value: number) => void;
     setDesktopSharingFrameRate: Function;
     setDisplayName: Function;
     setLocalParticipantProperty: Function;

react/features/base/config/configType.ts

@@ -253,6 +253,7 @@ export interface IConfig {
     disableDeepLinking?: boolean;
     disableFilmstripAutohiding?: boolean;
     disableFocus?: boolean;
+    disableIframeAPI?: boolean;
     disableIncomingMessageSound?: boolean;
     disableInitialGUM?: boolean;
     disableInviteFunctions?: boolean;

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

@@ -7,6 +7,7 @@ import _ from 'lodash';
 
 import { IReduxState } from '../../app/types';
 import { browser } from '../lib-jitsi-meet';
+import { IMediaState } from '../media/reducer';
 import { parseURLParams } from '../util/parseURLParams';
 
 import { IConfig } from './configType';
@@ -65,7 +66,7 @@ export function getMeetingRegion(state: IReduxState) {
  * @param {Object} _state - The global state.
  * @returns {boolean}
  */
-export function getMultipleVideoSendingSupportFeatureFlag(_state: IReduxState) {
+export function getMultipleVideoSendingSupportFeatureFlag(_state: IReduxState | IMediaState) {
     return browser.supportsUnifiedPlan();
 }
 

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

@@ -1,4 +1,5 @@
 import { IReduxState } from '../../app/types';
+import JitsiMeetJS from '../../base/lib-jitsi-meet';
 
 import { IConfig, IDeeplinkingConfig, IDeeplinkingMobileConfig, IDeeplinkingPlatformConfig } from './configType';
 import { TOOLBAR_BUTTONS } from './constants';
@@ -75,8 +76,7 @@ export function isToolbarButtonEnabled(buttonName: string, state: IReduxState |
  * @returns {boolean}
  */
 export function areAudioLevelsEnabled(state: IReduxState): boolean {
-    // Default to false for React Native as audio levels are of no interest to the mobile app.
-    return navigator.product !== 'ReactNative' && !state['features/base/config'].disableAudioLevels;
+    return !state['features/base/config'].disableAudioLevels && JitsiMeetJS.isCollectingLocalStats();
 }
 
 /**

react/features/base/config/reducer.ts

@@ -45,25 +45,18 @@ const INITIAL_NON_RN_STATE: IConfig = {
 const INITIAL_RN_STATE: IConfig = {
     analytics: {},
 
-    // FIXME The support for audio levels in lib-jitsi-meet polls the statistics
-    // of WebRTC at a short interval multiple times a second. Unfortunately,
-    // React Native is slow to fetch these statistics from the native WebRTC
-    // API, through the React Native bridge and eventually to JavaScript.
-    // Because the audio levels are of no interest to the mobile app, it is
-    // fastest to merely disable them.
-    disableAudioLevels: true,
-
     // FIXME: Mobile codecs should probably be configurable separately, rather
-    // than requiring this override here...
+    // FIXME: than requiring this override here...
 
+    // TODO: Remove comments later, after next release, so that the fix is applied
     p2p: {
-        disabledCodec: 'vp9',
-        preferredCodec: 'vp8'
+        // disabledCodec: 'vp9',
+        // preferredCodec: 'vp8'
     },
 
     videoQuality: {
-        disabledCodec: 'vp9',
-        preferredCodec: 'vp8'
+        // disabledCodec: 'vp9',
+        // preferredCodec: 'vp8'
     }
 };
 

react/features/base/connection/actionTypes.ts

@@ -1,5 +1,3 @@
-// @flow
-
 /**
  * The type of (redux) action which signals that a connection disconnected.
  *

react/features/base/connection/actions.any.ts

@@ -72,7 +72,7 @@ export type ConnectionFailedError = {
  *     connection: JitsiConnection
  * }}
  */
-export function connectionDisconnected(connection: Object) {
+export function connectionDisconnected(connection?: Object) {
     return {
         type: CONNECTION_DISCONNECTED,
         connection

react/features/base/connection/functions.ts

@@ -89,6 +89,13 @@ export function isInviteURLReady(stateOrGetState: IStateful): boolean {
  * @returns {string} A string in the form of a JID (i.e.
  * {@code user@server.com}).
  */
-export function toJid(id: string, { authdomain, domain }: { authdomain?: string; domain?: string; }): string {
+export function toJid(id: string, { authdomain, domain }: {
+    anonymousdomain?: string;
+    authdomain?: string;
+    domain?: string;
+    focus?: string;
+    muc?: string;
+    visitorFocus?: string;
+}): string {
     return id.indexOf('@') >= 0 ? id : `${id}@${authdomain || domain}`;
 }

react/features/base/dialog/components/AbstractDialogContainer.ts

@@ -11,12 +11,12 @@ interface IProps {
     /**
      * The component to render.
      */
-    _component: ComponentType;
+    _component?: ComponentType<any>;
 
     /**
      * The props to pass to the component that will be rendered.
      */
-    _componentProps: Object;
+    _componentProps?: Object;
 
     /**
      * Array of reactions to be displayed.

react/features/base/dialog/components/functions.native.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Text } from 'react-native';
+import { Text, TextStyle } from 'react-native';
 
 import { brandedDialog as styles } from './native/styles';
 
@@ -10,7 +10,7 @@ import { brandedDialog as styles } from './native/styles';
  * contain HTML to render.
  * @returns {ReactElement[]|string}
  */
-export function renderHTML(html) {
+export function renderHTML(html?: string) {
     if (typeof html === 'string') {
         // At the time of this writing, the specified HTML contains a couple
         // of spaces one after the other. They do not cause a visible
@@ -36,7 +36,7 @@ export function renderHTML(html) {
             if (c = closing.exec(html)) {
                 r.push(html.substring(prevClosingLastIndex, o.index));
                 r.push(
-                    <Text style = { styles.boldDialogText }>
+                    <Text style = { (styles.boldDialogText as TextStyle) }>
                         { html.substring(opening.lastIndex, c.index) }
                     </Text>);
                 opening.lastIndex

react/features/base/dialog/components/native/AbstractDialog.ts

@@ -25,7 +25,7 @@ export interface IState {
 /**
  * An abstract implementation of a dialog on Web/React and mobile/react-native.
  */
-export default class AbstractDialog<P extends IProps, S extends IState>
+export default class AbstractDialog<P extends IProps, S extends IState = IState>
     extends Component<P, S> {
 
     _mounted: boolean;

react/features/base/dialog/components/native/AlertDialog.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { WithTranslation } from 'react-i18next';
 import Dialog from 'react-native-dialog';
 import { connect } from 'react-redux';
 
@@ -6,10 +7,9 @@ import { translate } from '../../../i18n/functions';
 import { _abstractMapStateToProps } from '../../functions';
 import { renderHTML } from '../functions.native';
 
-import AbstractDialog, { type Props as AbstractProps } from './AbstractDialog';
+import AbstractDialog, { IProps as AbstractProps } from './AbstractDialog';
 
-
-type Props = AbstractProps & {
+interface IProps extends AbstractProps, WithTranslation {
 
     /**
      * Untranslated i18n key of the content to be displayed.
@@ -18,19 +18,14 @@ type Props = AbstractProps & {
      * translated using the provided params. See i18n function
      * {@code translate(string, Object)} for more details.
      */
-    contentKey: string | { key: string, params: Object},
-
-    /**
-     * Translation function.
-     */
-    t: Function
-};
+    contentKey: string | { key: string; params: Object; };
+}
 
 /**
  * Implements an alert dialog, to simply show an error or a message,
  * then disappear on dismiss.
  */
-class AlertDialog extends AbstractDialog<Props> {
+class AlertDialog extends AbstractDialog<IProps> {
     /**
      * Implements React's {@link Component#render}.
      *
@@ -56,8 +51,6 @@ class AlertDialog extends AbstractDialog<Props> {
             </Dialog.Container>
         );
     }
-
-    _onSubmit: () => boolean;
 }
 
 export default translate(connect(_abstractMapStateToProps)(AlertDialog));

react/features/base/dialog/components/native/BottomSheet.tsx

@@ -1,5 +1,5 @@
-import React, { type Node, PureComponent } from 'react';
-import { SafeAreaView, ScrollView, View } from 'react-native';
+import React, { PureComponent, ReactNode } from 'react';
+import { SafeAreaView, ScrollView, View, ViewStyle } from 'react-native';
 import { connect } from 'react-redux';
 
 import SlidingView from '../../../react/components/native/SlidingView';
@@ -15,43 +15,43 @@ type Props = {
     /**
      * Whether to add padding to scroll view.
      */
-    addScrollViewPadding?: boolean,
+    addScrollViewPadding?: boolean;
 
     /**
      * The children to be displayed within this component.
      */
-    children: Node,
+    children: ReactNode;
 
     /**
      * Redux Dispatch function.
      */
-    dispatch: Function,
+    dispatch: Function;
 
     /**
      * Handler for the cancel event, which happens when the user dismisses
      * the sheet.
      */
-    onCancel: ?Function,
-
-    /**
-     * Function to render a bottom sheet header element, if necessary.
-     */
-    renderHeader: ?Function,
+    onCancel?: Function;
 
     /**
      * Function to render a bottom sheet footer element, if necessary.
      */
-    renderFooter: ?Function,
+    renderFooter?: Function;
+
+    /**
+     * Function to render a bottom sheet header element, if necessary.
+     */
+    renderHeader?: Function;
 
     /**
      * Whether to show sliding view or not.
      */
-    showSlidingView?: boolean,
+    showSlidingView?: boolean;
 
     /**
      * The component's external style.
      */
-    style: Object
+    style?: Object;
 };
 
 /**
@@ -109,19 +109,19 @@ class BottomSheet extends PureComponent<Props> {
         } = this.props;
 
         return (
-            <SlidingView
+            <SlidingView // @ts-ignore
                 accessibilityRole = 'menu'
                 accessibilityViewIsModal = { true }
                 onHide = { this._onCancel }
                 position = 'bottom'
-                show = { showSlidingView }>
+                show = { Boolean(showSlidingView) }>
                 <View
                     pointerEvents = 'box-none'
-                    style = { styles.sheetContainer }>
+                    style = { styles.sheetContainer as ViewStyle }>
                     <View
                         pointerEvents = 'box-none'
                         style = { styles.sheetAreaCover } />
-                    { renderHeader && renderHeader() }
+                    { renderHeader?.() }
                     <SafeAreaView
                         style = { [
                             styles.sheetItemContainer,
@@ -140,7 +140,7 @@ class BottomSheet extends PureComponent<Props> {
                             ] } >
                             { this.props.children }
                         </ScrollView>
-                        { renderFooter && renderFooter() }
+                        { renderFooter?.() }
                     </SafeAreaView>
                 </View>
             </SlidingView>

react/features/base/dialog/components/native/ConfirmDialog.tsx

@@ -1,11 +1,12 @@
 import React from 'react';
+import { WithTranslation } from 'react-i18next';
 import Dialog from 'react-native-dialog';
 import { connect } from 'react-redux';
 
 import { translate } from '../../../i18n/functions';
 import { renderHTML } from '../functions.native';
 
-import AbstractDialog from './AbstractDialog';
+import AbstractDialog, { IProps as AbstractProps } from './AbstractDialog';
 import styles from './styles';
 
 
@@ -13,43 +14,38 @@ import styles from './styles';
  * The type of the React {@code Component} props of
  * {@link ConfirmDialog}.
  */
-type Props = {
+interface IProps extends AbstractProps, WithTranslation {
 
     /**
      * The i18n key of the text label for the cancel button.
      */
-    cancelLabel: string,
+    cancelLabel?: string;
 
     /**
      * The React {@code Component} children.
      */
-    children?: Node,
+    children?: React.ReactNode;
 
     /**
      * The i18n key of the text label for the confirm button.
      */
-    confirmLabel: string,
+    confirmLabel?: string;
 
     /**
      * Dialog description key for translations.
      */
-    descriptionKey?: string | Object,
+    descriptionKey?: string | { key: string; params: string; };
 
     /**
      * Whether or not the nature of the confirm button is destructive.
      */
-    isConfirmDestructive?: Boolean,
-
-    /**
-     * Invoked to obtain translated strings.
-     */
-    t: Function,
+    isConfirmDestructive?: Boolean;
 
     /**
      * Dialog title.
      */
-    title?: string
-};
+    title?: string;
+}
 
 /**
  * React Component for getting confirmation to stop a file recording session in
@@ -57,7 +53,7 @@ type Props = {
  *
  * @augments Component
  */
-class ConfirmDialog extends AbstractDialog<Props> {
+class ConfirmDialog extends AbstractDialog<IProps> {
     /**
      * Default values for {@code ConfirmDialog} component's properties.
      *
@@ -78,7 +74,7 @@ class ConfirmDialog extends AbstractDialog<Props> {
             = typeof descriptionKey === 'string'
                 ? t(descriptionKey)
                 : renderHTML(
-                    t(descriptionKey?.key, descriptionKey?.params)
+                    t(descriptionKey?.key ?? '', descriptionKey?.params)
                 );
 
         return (
@@ -129,10 +125,6 @@ class ConfirmDialog extends AbstractDialog<Props> {
             </Dialog.Container>
         );
     }
-
-    _onCancel: () => void;
-
-    _onSubmit: (?string) => void;
 }
 
 export default translate(connect()(ConfirmDialog));

react/features/base/dialog/components/native/DialogContainer.tsx

@@ -1,6 +1,7 @@
 import React, { Fragment } from 'react';
 import { connect } from 'react-redux';
 
+import { IReduxState } from '../../../../app/types';
 import ReactionEmoji from '../../../../reactions/components/native/ReactionEmoji';
 import { getReactionsQueue } from '../../../../reactions/functions.native';
 import AbstractDialogContainer, {
@@ -47,7 +48,7 @@ class DialogContainer extends AbstractDialogContainer {
     }
 }
 
-const mapStateToProps = state => {
+const mapStateToProps = (state: IReduxState) => {
     return {
         ...abstractMapStateToProps(state),
         _reactionsQueue: getReactionsQueue(state)

react/features/base/dialog/components/native/InputDialog.tsx

@@ -1,4 +1,6 @@
 import React from 'react';
+import { WithTranslation } from 'react-i18next';
+import { TextStyle } from 'react-native';
 import Dialog from 'react-native-dialog';
 import { connect } from 'react-redux';
 
@@ -6,67 +8,62 @@ import { translate } from '../../../i18n/functions';
 import { _abstractMapStateToProps } from '../../functions';
 
 import AbstractDialog, {
-    type Props as AbstractProps,
-    type State as AbstractState
+    IProps as AbstractProps,
+    IState as AbstractState
 } from './AbstractDialog';
 import { inputDialog as styles } from './styles';
 
-type Props = AbstractProps & {
+interface IProps extends AbstractProps, WithTranslation {
 
     /**
      * The dialog descriptionKey.
      */
-    descriptionKey: string,
+    descriptionKey: string;
 
     /**
      * An optional initial value to initiate the field with.
      */
-    initialValue?: ?string,
+    initialValue?: string;
 
     /**
      * A message key to be shown for the user (e.g. An error that is defined after submitting the form).
      */
-    messageKey?: string,
-
-    /**
-     * The translate function.
-     */
-    t: Function,
+    messageKey?: string;
 
     /**
      * Props for the text input.
      */
-    textInputProps: ?Object,
+    textInputProps?: Object;
 
     /**
      * The untranslated i18n key for the dialog title.
      */
-    titleKey?: string,
+    titleKey?: string;
 
     /**
      * Validating of the input.
      */
-    validateInput: ?Function
+    validateInput?: Function;
 }
 
-type State = AbstractState & {
+interface IState extends AbstractState {
 
     /**
      * The current value of the field.
      */
-    fieldValue: ?string
-};
+    fieldValue?: string;
+}
 
 /**
  * Implements a single field input dialog component.
  */
-class InputDialog<P: Props, S: State> extends AbstractDialog<P, S> {
+class InputDialog extends AbstractDialog<IProps, IState> {
     /**
      * Instantiates a new {@code InputDialog}.
      *
      * @inheritdoc
      */
-    constructor(props: Props) {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
@@ -96,7 +93,7 @@ class InputDialog<P: Props, S: State> extends AbstractDialog<P, S> {
                 coverScreen = { false }
                 visible = { true }>
                 <Dialog.Title>
-                    { t(titleKey) }
+                    { t(titleKey ?? '') }
                 </Dialog.Title>
                 {
                     descriptionKey && (
@@ -113,7 +110,7 @@ class InputDialog<P: Props, S: State> extends AbstractDialog<P, S> {
                 {
                     messageKey && (
                         <Dialog.Description
-                            style = { styles.formMessage }>
+                            style = { styles.formMessage as TextStyle }>
                             { t(messageKey) }
                         </Dialog.Description>
                     )
@@ -128,17 +125,13 @@ class InputDialog<P: Props, S: State> extends AbstractDialog<P, S> {
         );
     }
 
-    _onCancel: () => void;
-
-    _onChangeText: string => void;
-
     /**
      * Callback to be invoked when the text in the field changes.
      *
      * @param {string} fieldValue - The updated field value.
      * @returns {void}
      */
-    _onChangeText(fieldValue) {
+    _onChangeText(fieldValue: string) {
         if (this.props.validateInput && !this.props.validateInput(fieldValue)) {
             return;
         }
@@ -148,10 +141,6 @@ class InputDialog<P: Props, S: State> extends AbstractDialog<P, S> {
         });
     }
 
-    _onSubmit: (?string) => boolean;
-
-    _onSubmitValue: () => boolean;
-
     /**
      * Callback to be invoked when the value of this dialog is submitted.
      *

react/features/base/dialog/components/native/styles.ts

@@ -1,9 +1,9 @@
 import { StyleSheet } from 'react-native';
 
-import BaseTheme from '../../../../base/ui/components/BaseTheme.native';
 import ColorSchemeRegistry from '../../../color-scheme/ColorSchemeRegistry';
 import { schemeColor } from '../../../color-scheme/functions';
 import { BoxModel } from '../../../styles/components/styles/BoxModel';
+import BaseTheme from '../../../ui/components/BaseTheme.native';
 import { PREFERRED_DIALOG_SIZE } from '../../constants';
 
 const BORDER_RADIUS = 5;

react/features/base/dialog/constants.ts

@@ -30,12 +30,12 @@ export type DialogProps = {
     /**
      * The handler for onCancel event.
      */
-    onCancel: Function;
+    onCancel?: Function;
 
     /**
      * The handler for the event when submitting the dialog.
      */
-    onSubmit: Function;
+    onSubmit?: Function;
 
     /**
      * Additional style to be applied on the dialog.

react/features/base/flags/constants.ts

@@ -1,5 +1,3 @@
-// @flow
-
 /**
  * Flag indicating if add-people functionality should be enabled.
  * Default: enabled (true).

react/features/base/i18n/actionTypes.ts

@@ -1,5 +1,3 @@
-// @flow
-
 /**
  * The type of (redux) action which signals that i18next has been initialized.
  */

react/features/base/icons/components/Icon.tsx

@@ -3,7 +3,9 @@ import React, { useCallback } from 'react';
 import { Container } from '../../react/components/index';
 import { StyleType, styleTypeToObject } from '../../styles/functions';
 
-interface IProps {
+import { IIconProps } from './types';
+
+interface IProps extends IIconProps {
 
     /**
      * The id of the element this button icon controls.
@@ -60,11 +62,6 @@ interface IProps {
      */
     id?: string;
 
-    /**
-     * Function to invoke on click.
-     */
-    onClick?: Function;
-
     /**
      * Keydown handler.
      */
@@ -93,7 +90,7 @@ interface IProps {
     /**
      * Style object to be applied.
      */
-    style?: StyleType;
+    style?: StyleType | StyleType[];
 
     /**
      * TabIndex  for the Icon.