fix(tests): Skip iframeAPI if it is disabled.

Used only for the first participant joining/creating the room.

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

@@ -30,12 +30,9 @@ import android.view.KeyEvent;
 
 import androidx.annotation.Nullable;
 
-import com.oney.WebRTCModule.WebRTCModuleOptions;
-
 import org.jitsi.meet.sdk.JitsiMeet;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
 import org.jitsi.meet.sdk.JitsiMeetConferenceOptions;
-import org.webrtc.Logging;
 
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -82,10 +79,6 @@ public class MainActivity extends JitsiMeetActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         JitsiMeet.showSplashScreen(this);
-
-        WebRTCModuleOptions options = WebRTCModuleOptions.getInstance();
-        options.loggingSeverity = Logging.Severity.LS_ERROR;
-
         super.onCreate(null);
     }
 

android/sdk/build.gradle

@@ -89,11 +89,9 @@ dependencies {
     implementation project(':react-native-splash-screen')
     implementation project(':react-native-svg')
     implementation project(':react-native-video')
+    implementation project(':react-native-webrtc')
     implementation project(':react-native-webview')
 
-    // Use `api` here so consumers can use WebRTCModuleOptions.
-    api project(':react-native-webrtc')
-
     testImplementation 'junit:junit:4.12'
 }
 

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

@@ -3,6 +3,12 @@ package org.jitsi.meet.sdk;
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.facebook.react.bridge.WritableNativeMap;
+
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+
+import java.util.HashMap;
+
 /**
  * Wraps the name and extra data for events that were broadcasted locally.
  */
@@ -10,21 +16,57 @@ public class BroadcastAction {
     private static final String TAG = BroadcastAction.class.getSimpleName();
 
     private final Type type;
-    private final Bundle data;
+    private final HashMap<String, Object> data;
 
     public BroadcastAction(Intent intent) {
         this.type = Type.buildTypeFromAction(intent.getAction());
-        this.data = intent.getExtras();
+        this.data = buildDataFromBundle(intent.getExtras());
     }
 
     public Type getType() {
         return this.type;
     }
 
-    public Bundle getData() {
+    public HashMap<String, Object> getData() {
         return this.data;
     }
 
+    public WritableNativeMap getDataAsWritableNativeMap() {
+        WritableNativeMap nativeMap = new WritableNativeMap();
+
+        for (String key : this.data.keySet()) {
+            try {
+                if (this.data.get(key) instanceof Boolean) {
+                    nativeMap.putBoolean(key, (Boolean) this.data.get(key));
+                } else if (this.data.get(key) instanceof Integer) {
+                    nativeMap.putInt(key, (Integer) this.data.get(key));
+                } else if (this.data.get(key) instanceof Double) {
+                    nativeMap.putDouble(key, (Double) this.data.get(key));
+                } else if (this.data.get(key) instanceof String) {
+                    nativeMap.putString(key, (String) this.data.get(key));
+                } else {
+                    throw new Exception("Unsupported extra data type");
+                }
+            } catch (Exception e) {
+                JitsiMeetLogger.w(TAG + " invalid extra data in event", e);
+            }
+        }
+
+        return nativeMap;
+    }
+
+    private static HashMap<String, Object> buildDataFromBundle(Bundle bundle) {
+        HashMap<String, Object> map = new HashMap<>();
+
+        if (bundle != null) {
+            for (String key : bundle.keySet()) {
+                map.put(key, bundle.get(key));
+            }
+        }
+
+        return map;
+    }
+
     enum Type {
         SET_AUDIO_MUTED("org.jitsi.meet.SET_AUDIO_MUTED"),
         HANG_UP("org.jitsi.meet.HANG_UP"),
@@ -40,9 +82,7 @@ public class BroadcastAction {
         SHOW_NOTIFICATION("org.jitsi.meet.SHOW_NOTIFICATION"),
         HIDE_NOTIFICATION("org.jitsi.meet.HIDE_NOTIFICATION"),
         START_RECORDING("org.jitsi.meet.START_RECORDING"),
-        STOP_RECORDING("org.jitsi.meet.STOP_RECORDING"),
-        OVERWRITE_CONFIG("org.jitsi.meet.OVERWRITE_CONFIG"),
-        SEND_CAMERA_FACING_MODE_MESSAGE("org.jitsi.meet.SEND_CAMERA_FACING_MODE_MESSAGE");
+        STOP_RECORDING("org.jitsi.meet.STOP_RECORDING");
 
         private final String action;
 

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

@@ -91,9 +91,7 @@ public class BroadcastEvent {
         VIDEO_MUTED_CHANGED("org.jitsi.meet.VIDEO_MUTED_CHANGED"),
         READY_TO_CLOSE("org.jitsi.meet.READY_TO_CLOSE"),
         TRANSCRIPTION_CHUNK_RECEIVED("org.jitsi.meet.TRANSCRIPTION_CHUNK_RECEIVED"),
-        CUSTOM_BUTTON_PRESSED("org.jitsi.meet.CUSTOM_BUTTON_PRESSED"),
-        CONFERENCE_UNIQUE_ID_SET("org.jitsi.meet.CONFERENCE_UNIQUE_ID_SET"),
-        RECORDING_STATUS_CHANGED("org.jitsi.meet.RECORDING_STATUS_CHANGED");
+        CUSTOM_BUTTON_PRESSED("org.jitsi.meet.CUSTOM_BUTTON_PRESSED");
 
         private static final String CONFERENCE_BLURRED_NAME = "CONFERENCE_BLURRED";
         private static final String CONFERENCE_FOCUSED_NAME = "CONFERENCE_FOCUSED";
@@ -112,8 +110,6 @@ public class BroadcastEvent {
         private static final String READY_TO_CLOSE_NAME = "READY_TO_CLOSE";
         private static final String TRANSCRIPTION_CHUNK_RECEIVED_NAME = "TRANSCRIPTION_CHUNK_RECEIVED";
         private static final String CUSTOM_BUTTON_PRESSED_NAME = "CUSTOM_BUTTON_PRESSED";
-        private static final String CONFERENCE_UNIQUE_ID_SET_NAME = "CONFERENCE_UNIQUE_ID_SET";
-        private static final String RECORDING_STATUS_CHANGED_NAME = "RECORDING_STATUS_CHANGED";
 
         private final String action;
 
@@ -170,10 +166,6 @@ public class BroadcastEvent {
                     return TRANSCRIPTION_CHUNK_RECEIVED;
                 case CUSTOM_BUTTON_PRESSED_NAME:
                     return CUSTOM_BUTTON_PRESSED;
-                case CONFERENCE_UNIQUE_ID_SET_NAME:
-                    return CONFERENCE_UNIQUE_ID_SET;
-                case RECORDING_STATUS_CHANGED_NAME:
-                    return RECORDING_STATUS_CHANGED;
             }
 
             return null;

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

@@ -139,19 +139,4 @@ public class BroadcastIntentHelper {
 
         return intent;
     }
-
-    public static Intent buildOverwriteConfigIntent(Bundle config) {
-        Intent intent = new Intent(BroadcastAction.Type.OVERWRITE_CONFIG.getAction());
-        intent.putExtra("config", config);
-
-        return intent;
-    }
-
-    public static Intent buildSendCameraFacingModeMessageIntent(String to, String facingMode) {
-        Intent intent = new Intent(BroadcastAction.Type.SEND_CAMERA_FACING_MODE_MESSAGE.getAction());
-        intent.putExtra("to", to);
-        intent.putExtra("facingMode", facingMode);
-
-        return intent;
-    }
 }

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

@@ -3,9 +3,6 @@ package org.jitsi.meet.sdk;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.Bundle;
-
-import com.facebook.react.bridge.Arguments;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
@@ -31,14 +28,7 @@ public class BroadcastReceiver extends android.content.BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         BroadcastAction action = new BroadcastAction(intent);
         String actionName = action.getType().getAction();
-        Bundle data = action.getData();
-            
-        // For actions without data bundle (like hangup), we create an empty map
-        // instead of attempting to convert a null bundle to avoid crashes.
-        if (data != null) {
-            ReactInstanceManagerHolder.emitEvent(actionName, Arguments.fromBundle(data));
-        } else {
-            ReactInstanceManagerHolder.emitEvent(actionName, Arguments.createMap());
-        }
+
+        ReactInstanceManagerHolder.emitEvent(actionName, action.getDataAsWritableNativeMap());
     }
 }

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

@@ -101,8 +101,6 @@ class ExternalAPIModule extends ReactContextBaseJavaModule {
         constants.put("HIDE_NOTIFICATION", BroadcastAction.Type.HIDE_NOTIFICATION.getAction());
         constants.put("START_RECORDING", BroadcastAction.Type.START_RECORDING.getAction());
         constants.put("STOP_RECORDING", BroadcastAction.Type.STOP_RECORDING.getAction());
-        constants.put("OVERWRITE_CONFIG", BroadcastAction.Type.OVERWRITE_CONFIG.getAction());
-        constants.put("SEND_CAMERA_FACING_MODE_MESSAGE", BroadcastAction.Type.SEND_CAMERA_FACING_MODE_MESSAGE.getAction());
 
         return constants;
     }

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

@@ -272,16 +272,8 @@ public class JitsiMeetActivity extends AppCompatActivity
 //    }
 
 //    protected void onCustomButtonPressed(HashMap<String, Object> extraData) {
-//         JitsiMeetLogger.i("Custom button pressed: " + extraData);
-//     }
-
-//     protected void onConferenceUniqueIdSet(HashMap<String, Object> extraData) {
-//         JitsiMeetLogger.i("Conference unique id set: " + extraData);
-//     }
-
-//     protected void onRecordingStatusChanged(HashMap<String, Object> extraData) {
-//       JitsiMeetLogger.i("Recording status changed: " + extraData);
-//     }
+//        JitsiMeetLogger.i("Custom button pressed: " + extraData);
+//    }
 
     // Activity lifecycle methods
     //
@@ -366,18 +358,12 @@ public class JitsiMeetActivity extends AppCompatActivity
                 case READY_TO_CLOSE:
                     onReadyToClose();
                     break;
-                // case TRANSCRIPTION_CHUNK_RECEIVED:
-                //    onTranscriptionChunkReceived(event.getData());
-                //    break;
-                // case CUSTOM_BUTTON_PRESSED:
-                //    onCustomButtonPressed(event.getData());
-                //    break;
-                // case CONFERENCE_UNIQUE_ID_SET:
-                //     onConferenceUniqueIdSet(event.getData());
-                //     break;
-                // case RECORDING_STATUS_CHANGED:
-                //     onRecordingStatusChanged(event.getData());
-                //     break;
+//                case TRANSCRIPTION_CHUNK_RECEIVED:
+//                    onTranscriptionChunkReceived(event.getData());
+//                    break;
+//                case CUSTOM_BUTTON_PRESSED:
+//                    onCustomButtonPressed(event.getData());
+//                    break;
             }
         }
     }

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

@@ -33,9 +33,10 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 public class JitsiMeetView extends FrameLayout {
 
     /**
-     * Background color. Should match the background color set in JS.
+     * Background color used by {@code BaseReactView} and the React Native root
+     * view.
      */
-    private static final int BACKGROUND_COLOR = 0xFF040404;
+    private static final int BACKGROUND_COLOR = 0xFF111111;
 
     /**
      * React Native root view.

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

@@ -1,80 +0,0 @@
-package org.jitsi.meet.sdk;
-
-/*
- *  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.
- */
-
-import androidx.annotation.Nullable;
-
-import com.oney.WebRTCModule.webrtcutils.SoftwareVideoDecoderFactoryProxy;
-
-import org.webrtc.EglBase;
-import org.webrtc.HardwareVideoDecoderFactory;
-import org.webrtc.PlatformSoftwareVideoDecoderFactory;
-import org.webrtc.VideoCodecInfo;
-import org.webrtc.VideoDecoder;
-import org.webrtc.VideoDecoderFactory;
-import org.webrtc.VideoDecoderFallback;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-
-/**
- * Custom decoder factory which uses HW decoders and falls back to SW.
- */
-public class JitsiVideoDecoderFactory implements VideoDecoderFactory {
-    private final VideoDecoderFactory hardwareVideoDecoderFactory;
-    private final VideoDecoderFactory softwareVideoDecoderFactory = new SoftwareVideoDecoderFactoryProxy();
-    private final @Nullable VideoDecoderFactory platformSoftwareVideoDecoderFactory;
-
-    /**
-     * Create decoder factory using default hardware decoder factory.
-     */
-    public JitsiVideoDecoderFactory(@Nullable EglBase.Context eglContext) {
-        this.hardwareVideoDecoderFactory = new HardwareVideoDecoderFactory(eglContext);
-        this.platformSoftwareVideoDecoderFactory = new PlatformSoftwareVideoDecoderFactory(eglContext);
-    }
-
-    /**
-     * Create decoder factory using explicit hardware decoder factory.
-     */
-    JitsiVideoDecoderFactory(VideoDecoderFactory hardwareVideoDecoderFactory) {
-        this.hardwareVideoDecoderFactory = hardwareVideoDecoderFactory;
-        this.platformSoftwareVideoDecoderFactory = null;
-    }
-
-    @Override
-    public @Nullable VideoDecoder createDecoder(VideoCodecInfo codecType) {
-        VideoDecoder softwareDecoder = softwareVideoDecoderFactory.createDecoder(codecType);
-        final VideoDecoder hardwareDecoder = hardwareVideoDecoderFactory.createDecoder(codecType);
-        if (softwareDecoder == null && platformSoftwareVideoDecoderFactory != null) {
-            softwareDecoder = platformSoftwareVideoDecoderFactory.createDecoder(codecType);
-        }
-        if (hardwareDecoder != null && softwareDecoder != null) {
-            // Both hardware and software supported, wrap it in a software fallback
-            return new VideoDecoderFallback(
-                /* fallback= */ softwareDecoder, /* primary= */ hardwareDecoder);
-        }
-        return hardwareDecoder != null ? hardwareDecoder : softwareDecoder;
-    }
-
-    @Override
-    public VideoCodecInfo[] getSupportedCodecs() {
-        LinkedHashSet<VideoCodecInfo> supportedCodecInfos = new LinkedHashSet<>();
-
-        supportedCodecInfos.addAll(Arrays.asList(softwareVideoDecoderFactory.getSupportedCodecs()));
-        supportedCodecInfos.addAll(Arrays.asList(hardwareVideoDecoderFactory.getSupportedCodecs()));
-        if (platformSoftwareVideoDecoderFactory != null) {
-            supportedCodecInfos.addAll(
-                Arrays.asList(platformSoftwareVideoDecoderFactory.getSupportedCodecs()));
-        }
-
-        return supportedCodecInfos.toArray(new VideoCodecInfo[supportedCodecInfos.size()]);
-    }
-}

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

@@ -1,16 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import androidx.annotation.Nullable;
-
-import com.oney.WebRTCModule.webrtcutils.H264AndSoftwareVideoEncoderFactory;
-
-import org.webrtc.EglBase;
-
-/**
- * Custom encoder factory which uses HW for H.264 and SW for everything else.
- */
-public class JitsiVideoEncoderFactory extends H264AndSoftwareVideoEncoderFactory {
-    public JitsiVideoEncoderFactory(@Nullable EglBase.Context eglContext) {
-        super(eglContext);
-    }
-}

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

@@ -16,8 +16,8 @@
 
 package org.jitsi.meet.sdk;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.util.Log;
 
 import androidx.annotation.Nullable;
 
@@ -32,10 +32,12 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.oney.WebRTCModule.EglUtils;
 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.jitsi.meet.sdk.log.JitsiMeetLogger;
 import org.webrtc.EglBase;
+import org.webrtc.Logging;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -124,31 +126,31 @@ class ReactInstanceManagerHolder {
         // AmplitudeReactNativePackage
         try {
             Class<?> amplitudePackageClass = Class.forName("com.amplitude.reactnative.AmplitudeReactNativePackage");
-            Constructor<?> constructor = amplitudePackageClass.getConstructor();
+            Constructor constructor = amplitudePackageClass.getConstructor();
             packages.add((ReactPackage)constructor.newInstance());
         } catch (Exception e) {
             // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            JitsiMeetLogger.d(TAG, "Not loading AmplitudeReactNativePackage");
+            Log.d(TAG, "Not loading AmplitudeReactNativePackage");
         }
 
         // GiphyReactNativeSdkPackage
         try {
             Class<?> giphyPackageClass = Class.forName("com.giphyreactnativesdk.GiphyReactNativeSdkPackage");
-            Constructor<?> constructor = giphyPackageClass.getConstructor();
+            Constructor constructor = giphyPackageClass.getConstructor();
             packages.add((ReactPackage)constructor.newInstance());
         } catch (Exception e) {
             // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            JitsiMeetLogger.d(TAG, "Not loading GiphyReactNativeSdkPackage");
+            Log.d(TAG, "Not loading GiphyReactNativeSdkPackage");
         }
 
         // RNGoogleSignInPackage
         try {
             Class<?> googlePackageClass = Class.forName("com.reactnativegooglesignin.RNGoogleSigninPackage");
-            Constructor<?> constructor = googlePackageClass.getConstructor();
+            Constructor constructor = googlePackageClass.getConstructor();
             packages.add((ReactPackage)constructor.newInstance());
         } catch (Exception e) {
             // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            JitsiMeetLogger.d(TAG, "Not loading RNGoogleSignInPackage");
+            Log.d(TAG, "Not loading RNGoogleSignInPackage");
         }
 
         return packages;
@@ -167,7 +169,7 @@ class ReactInstanceManagerHolder {
             = ReactInstanceManagerHolder.getReactInstanceManager();
 
         if (reactInstanceManager != null) {
-            @SuppressLint("VisibleForTests") ReactContext reactContext
+            ReactContext reactContext
                 = reactInstanceManager.getCurrentReactContext();
 
             if (reactContext != null) {
@@ -190,7 +192,7 @@ class ReactInstanceManagerHolder {
      */
     static <T extends NativeModule> T getNativeModule(
             Class<T> nativeModuleClass) {
-        @SuppressLint("VisibleForTests") ReactContext reactContext
+        ReactContext reactContext
             = reactInstanceManager != null
                 ? reactInstanceManager.getCurrentReactContext() : null;
 
@@ -217,18 +219,15 @@ class ReactInstanceManagerHolder {
 
         // Initialize the WebRTC module options.
         WebRTCModuleOptions options = WebRTCModuleOptions.getInstance();
-        options.enableMediaProjectionService = true;
-        if (options.videoDecoderFactory == null || options.videoEncoderFactory == null) {
-            EglBase.Context eglContext = EglUtils.getRootEglBaseContext();
-            if (options.videoDecoderFactory == null) {
-                options.videoDecoderFactory = new JitsiVideoDecoderFactory(eglContext);
-            }
-            if (options.videoEncoderFactory == null) {
-                options.videoEncoderFactory = new JitsiVideoEncoderFactory(eglContext);
-            }
-        }
 
-        JitsiMeetLogger.d(TAG, "initializing RN");
+        EglBase.Context eglContext = EglUtils.getRootEglBaseContext();
+
+        options.videoDecoderFactory = new H264AndSoftwareVideoDecoderFactory(eglContext);
+        options.videoEncoderFactory = new H264AndSoftwareVideoEncoderFactory(eglContext);
+        options.enableMediaProjectionService = true;
+//      options.loggingSeverity = Logging.Severity.LS_INFO;
+
+        Log.d(TAG, "initializing RN with Activity");
 
         reactInstanceManager
             = ReactInstanceManager.builder()

conference.js

@@ -2278,10 +2278,8 @@ export default {
      * @param {boolean} [requestFeedback=false] if user feedback should be
      * @param {string} [hangupReason] the reason for leaving the meeting
      * requested
-     * @param {boolean} [notifyOnConferenceTermination] whether to notify
-     * the user on conference termination
      */
-    hangup(requestFeedback = false, hangupReason, notifyOnConferenceTermination) {
+    hangup(requestFeedback = false, hangupReason) {
         APP.store.dispatch(disableReceiver());
 
         this._stopProxyConnection();
@@ -2300,7 +2298,7 @@ export default {
 
         if (requestFeedback) {
             const feedbackDialogClosed = (feedbackResult = {}) => {
-                if (!feedbackResult.wasDialogShown && hangupReason && notifyOnConferenceTermination) {
+                if (!feedbackResult.wasDialogShown && hangupReason) {
                     return APP.store.dispatch(
                         openLeaveReasonDialog(hangupReason)).then(() => feedbackResult);
                 }

config.js

@@ -393,9 +393,6 @@ var config = {
     //    // showPrejoinWarning: true,
     //    // If true, the notification for recording start will display a link to download the cloud recording.
     //    // showRecordingLink: true,
-    //    // If true, mutes audio and video when a recording begins and displays a dialog
-    //    // explaining the effect of unmuting.
-    //    // requireConsent: true,
     // },
 
     // recordingService: {
@@ -755,9 +752,6 @@ var config = {
     // and microsoftApiApplicationClientID
     // enableCalendarIntegration: false,
 
-    // Whether to notify when the conference is terminated because it was destroyed.
-    // notifyOnConferenceDestruction: true,
-
     // The client id for the google APIs used for the calendar integration, youtube livestreaming, etc.
     // googleApiApplicationClientID: '<client_id>',
 
@@ -1567,8 +1561,6 @@ var config = {
     // You can enable tokenAuthUrlAutoRedirect which will detect that you have logged in successfully before
     // and will automatically redirect to the token service to get the token for the meeting.
     // tokenAuthUrlAutoRedirect: false
-    // An option to respect the context.tenant jwt field compared to the current tenant from the url
-    // tokenRespectTenant: false,
 
     // You can put an array of values to target different entity types in the invite dialog.
     // Valid values are "phone", "room", "sip", "user", "videosipgw" and "email"

css/_base.scss

@@ -111,7 +111,7 @@ form {
     height: $watermarkHeight;
     background-size: contain;
     background-repeat: no-repeat;
-    z-index: $watermarkZ;
+    z-index: $zindex2;
 }
 
 .leftwatermark {
@@ -142,7 +142,7 @@ form {
     font-size: 11pt;
     color: rgba(255,255,255,.50);
     text-decoration: none;
-    z-index: $watermarkZ;
+    z-index: 100;
 }
 
 /**

css/_meetings_list.scss

@@ -7,8 +7,8 @@
     display: flex;
     flex-direction: column;
     position: relative;
-    overflow-y: auto;
-    flex-grow: 1;
+    overflow: auto;
+    width: 100%;
 
     .meetings-list-empty {
         text-align: center;
@@ -174,12 +174,4 @@
             }
         }
     }
-
-    @media (max-width: 1024px) {  /* Targets iPads and smaller devices */
-        .item {
-            .delete-meeting {
-                display: block !important;
-            }
-        }
-    }
 }

css/_variables.scss

@@ -38,8 +38,6 @@ $zindex1: 1;
 $zindex2: 2;
 $zindex3: 3;
 $toolbarZ: 250;
-$watermarkZ: 253;
-
 // Place filmstrip videos over toolbar in order
 // to make connection info visible.
 $filmstripVideosZ: $toolbarZ + 1;
@@ -77,12 +75,9 @@ $welcomePageHeaderBackground: linear-gradient(0deg, rgba(0, 0, 0, 0.2), rgba(0,
 $welcomePageHeaderBackgroundPosition: center;
 $welcomePageHeaderBackgroundRepeat: none;
 $welcomePageHeaderBackgroundSize: cover;
-$welcomePageHeaderPadding: 1rem;
+$welcomePageHeaderPaddingBottom: 15px;
 $welcomePageHeaderTitleMaxWidth: initial;
 $welcomePageHeaderTextAlign: center;
-$welcomePageButtonBg: #0074E0;
-$welcomePageButtonHoverBg: #4687ED;
-$welcomePageButtonFocusOutline: #00225A;
 
 $welcomePageHeaderContainerMarginTop: 104px;
 $welcomePageHeaderContainerDisplay: flex;

css/_welcome_page.scss

@@ -18,7 +18,7 @@ body.welcome-page {
         background-position: $welcomePageHeaderBackgroundPosition;
         background-repeat: $welcomePageHeaderBackgroundRepeat;
         background-size: $welcomePageHeaderBackgroundSize;
-        padding: $welcomePageHeaderPadding;
+        padding-bottom: $welcomePageHeaderPaddingBottom;
         background-color: #131519;
         overflow: hidden;
         position: relative;
@@ -219,18 +219,14 @@ body.welcome-page {
     .welcome-page-button {
         border: 0;
         font-size: 14px;
-        background: $welcomePageButtonBg;
+        background: #0074E0;
         border-radius: 3px;
         color: #FFFFFF;
         cursor: pointer;
         padding: 16px 20px;
-        transition: all 0.2s;
-        &:focus-within {
-            outline: auto 2px $welcomePageButtonFocusOutline;
-        }
 
-        &:hover {
-            background-color: $welcomePageButtonHoverBg;
+        &:focus-within {
+            outline: auto 2px #022e61;
         }
     }
 
@@ -268,7 +264,8 @@ body.welcome-page {
 
     &.without-content {
         .welcome-card {
-            max-width: 100dvw;
+            min-width: 500px;
+            max-width: 580px;
         }
     }
 

ios/Podfile

@@ -97,7 +97,4 @@ post_install do |installer|
       config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -no-verify-emitted-module-interface'
     end
   end
-
-  # Patch SocketRocket to support TLS 1.3
-  %x(patch Pods/SocketRocket/SocketRocket/SRSecurityPolicy.m -N < patches/ws-tls13.diff)
 end

ios/Podfile.lock

@@ -2209,6 +2209,6 @@ SPEC CHECKSUMS:
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   Yoga: 1dd9dabb9df8fe08f12cd522eae04a2da0e252eb
 
-PODFILE CHECKSUM: 4f6abcf3cec0d9e8e1d5f5d81a35d99adde9ae45
+PODFILE CHECKSUM: 8a3e5d019861b37d4159f2d178cc534be3ac528c
 
 COCOAPODS: 1.16.2

ios/app/app.xcodeproj/project.pbxproj

@@ -157,6 +157,7 @@
 		4EB0603B260E09D000F524C5 /* SampleUploader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SampleUploader.swift; sourceTree = "<group>"; };
 		4EC49B8625BED71300E76218 /* ReplayKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReplayKit.framework; path = System/Library/Frameworks/ReplayKit.framework; sourceTree = SDKROOT; };
 		5C1BE20ECD5DEEB48FED90B5 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = ../PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
 		B3B083EB1D4955FF0069CEE7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = app.entitlements; sourceTree = "<group>"; };
 		D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -301,6 +302,7 @@
 				0BEA5C351F7B8F73000D0AB4 /* WatchKit extension */,
 				4EB06025260E026600F524C5 /* JitsiMeetBroadcast Extension */,
 				CDD71F5E1157E9F283DF92A8 /* Pods */,
+				6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */,
 				5C1BE20ECD5DEEB48FED90B5 /* PrivacyInfo.xcprivacy */,
 			);
 			indentWidth = 2;

ios/app/src/ViewController.m

@@ -84,10 +84,6 @@
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_TERMINATED" withData:data];
 }
 
-// - (void)conferenceUniqueIdSet:(NSDictionary *)data {
-//     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_UNIQUE_ID_SET" withData:data];
-// }
-
 - (void)conferenceWillJoin:(NSDictionary *)data {
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_WILL_JOIN" withData:data];
 }
@@ -106,10 +102,6 @@
     [self _onJitsiMeetViewDelegateEvent:@"READY_TO_CLOSE" withData:data];
 }
 
-// - (void)recordingStatusChanged:(NSDictionary *)data {
-//     [self _onJitsiMeetViewDelegateEvent:@"RECORDING_STATUS_CHANGED" withData:data];
-// }
-
 // - (void)transcriptionChunkReceived:(NSDictionary *)data {
 //     [self _onJitsiMeetViewDelegateEvent:@"TRANSCRIPTION_CHUNK_RECEIVED" withData:data];
 // }

ios/patches/ws-tls13.diff

@@ -1,15 +0,0 @@
-diff --git a/SocketRocket/SRSecurityPolicy.m b/SocketRocket/SRSecurityPolicy.m
-index 3759d26e..271477e8 100644
---- a/SocketRocket/SRSecurityPolicy.m
-+++ b/SocketRocket/SRSecurityPolicy.m
-@@ -56,8 +56,8 @@ - (instancetype)init
- 
- - (void)updateSecurityOptionsInStream:(NSStream *)stream
- {
--    // Enforce TLS 1.2
--    [stream setProperty:(__bridge id)CFSTR("kCFStreamSocketSecurityLevelTLSv1_2") forKey:(__bridge id)kCFStreamPropertySocketSecurityLevel];
-+    // Enforce TLS >= 1.2
-+    [stream setProperty:(__bridge id)kCFStreamSocketSecurityLevelNegotiatedSSL forKey:(__bridge id)kCFStreamPropertySocketSecurityLevel];
- 
-     // Validate certificate chain for this stream if enabled.
-     NSDictionary<NSString *, id> *sslOptions = @{ (__bridge NSString *)kCFStreamSSLValidatesCertificateChain : @(self.certificateChainValidationEnabled) };

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -145,6 +145,7 @@
 		4ED4FFF12721B9B90074E620 /* JitsiAudioSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiAudioSession.h; sourceTree = "<group>"; };
 		4ED4FFF22721B9B90074E620 /* JitsiAudioSession.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiAudioSession.m; sourceTree = "<group>"; };
 		4ED4FFF52721BAE10074E620 /* JitsiAudioSession+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiAudioSession+Private.h"; sourceTree = "<group>"; };
+		6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = ../PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		86389F55993FAAF6AEB3FA3E /* Pods-JitsiMeetSDKLite.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDKLite.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDKLite/Pods-JitsiMeetSDKLite.release.xcconfig"; sourceTree = "<group>"; };
 		891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDK.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK.release.xcconfig"; sourceTree = "<group>"; };
 		8F48C340DE0D91D1012976C5 /* Pods-JitsiMeetSDKLite.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDKLite.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDKLite/Pods-JitsiMeetSDKLite.debug.xcconfig"; sourceTree = "<group>"; };
@@ -230,6 +231,7 @@
 				0BD906E61EC0C00300C8C18E /* Products */,
 				0BCA49681EC4BBE500B793EE /* Resources */,
 				0BD906E71EC0C00300C8C18E /* src */,
+				6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */,
 			);
 			sourceTree = "<group>";
 		};

ios/sdk/src/ExternalAPI.h

@@ -18,6 +18,11 @@
 
 static NSString * const sendEventNotificationName = @"org.jitsi.meet.SendEvent";
 
+typedef NS_ENUM(NSInteger, RecordingMode) {
+    RecordingModeFile,
+    RecordingModeStream
+};
+
 @interface ExternalAPI : RCTEventEmitter<RCTBridgeModule>
 
 - (void)sendHangUp;
@@ -33,9 +38,7 @@ static NSString * const sendEventNotificationName = @"org.jitsi.meet.SendEvent";
 - (void)toggleCamera;
 - (void)showNotification:(NSString*)appearance :(NSString*)description :(NSString*)timeout :(NSString*)title :(NSString*)uid;
 - (void)hideNotification:(NSString*)uid;
-- (void)startRecording:(NSString*)mode :(NSString*)dropboxToken :(BOOL)shouldShare :(NSString*)rtmpStreamKey :(NSString*)rtmpBroadcastID :(NSString*)youtubeStreamKey :(NSString*)youtubeBroadcastID :(NSDictionary*)extraMetadata :(BOOL)transcription;
-- (void)stopRecording:(NSString*)mode :(BOOL)transcription;
-- (void)overwriteConfig:(NSDictionary*)config;
-- (void)sendCameraFacingModeMessage:(NSString*)to :(NSString*)facingMode;
+- (void)startRecording:(RecordingMode)mode :(NSString*)dropboxToken :(BOOL)shouldShare :(NSString*)rtmpStreamKey :(NSString*)rtmpBroadcastID :(NSString*)youtubeStreamKey :(NSString*)youtubeBroadcastID :(NSDictionary*)extraMetadata :(BOOL)transcription;
+- (void)stopRecording:(RecordingMode)mode :(BOOL)transcription;
 
 @end

ios/sdk/src/ExternalAPI.m

@@ -32,15 +32,13 @@ static NSString * const showNotificationAction = @"org.jitsi.meet.SHOW_NOTIFICAT
 static NSString * const hideNotificationAction = @"org.jitsi.meet.HIDE_NOTIFICATION";
 static NSString * const startRecordingAction = @"org.jitsi.meet.START_RECORDING";
 static NSString * const stopRecordingAction = @"org.jitsi.meet.STOP_RECORDING";
-static NSString * const overwriteConfigAction = @"org.jitsi.meet.OVERWRITE_CONFIG";
-static NSString * const sendCameraFacingModeMessageAction = @"org.jitsi.meet.SEND_CAMERA_FACING_MODE_MESSAGE";
 
 @implementation ExternalAPI
 
 static NSMapTable<NSString*, void (^)(NSArray* participantsInfo)> *participantInfoCompletionHandlers;
 
 __attribute__((constructor))
-static void initializeViewsMap(void) {
+static void initializeViewsMap() {
     participantInfoCompletionHandlers = [NSMapTable strongToStrongObjectsMapTable];
 }
 
@@ -62,9 +60,7 @@ RCT_EXPORT_MODULE();
         @"SHOW_NOTIFICATION": showNotificationAction,
         @"HIDE_NOTIFICATION": hideNotificationAction,
         @"START_RECORDING": startRecordingAction,
-        @"STOP_RECORDING": stopRecordingAction,
-        @"OVERWRITE_CONFIG": overwriteConfigAction,
-        @"SEND_CAMERA_FACING_MODE_MESSAGE": sendCameraFacingModeMessageAction
+        @"STOP_RECORDING": stopRecordingAction
     };
 };
 
@@ -94,9 +90,7 @@ RCT_EXPORT_MODULE();
               showNotificationAction,
               hideNotificationAction,
               startRecordingAction,
-              stopRecordingAction,
-              overwriteConfigAction,
-              sendCameraFacingModeMessageAction
+              stopRecordingAction
     ];
 }
 
@@ -216,9 +210,21 @@ RCT_EXPORT_METHOD(sendEvent:(NSString *)name
     [self sendEventWithName:hideNotificationAction body:data];
 }
 
-- (void)startRecording:(NSString*)mode :(NSString*)dropboxToken :(BOOL)shouldShare :(NSString*)rtmpStreamKey :(NSString*)rtmpBroadcastID :(NSString*)youtubeStreamKey :(NSString*)youtubeBroadcastID :(NSDictionary*)extraMetadata :(BOOL)transcription {
+static inline NSString *RecordingModeToString(RecordingMode mode) {
+    switch (mode) {
+        case RecordingModeFile:
+            return @"file";
+        case RecordingModeStream:
+            return @"stream";
+        default:
+            return nil;
+    }
+}
+
+- (void)startRecording:(RecordingMode)mode :(NSString*)dropboxToken :(BOOL)shouldShare :(NSString*)rtmpStreamKey :(NSString*)rtmpBroadcastID :(NSString*)youtubeStreamKey :(NSString*)youtubeBroadcastID :(NSDictionary*)extraMetadata :(BOOL)transcription {
+    NSString *modeString = RecordingModeToString(mode);
     NSDictionary *data = @{
-        @"mode": mode,
+        @"mode": modeString,
         @"dropboxToken": dropboxToken,
         @"shouldShare": @(shouldShare),
         @"rtmpStreamKey": rtmpStreamKey,
@@ -232,29 +238,13 @@ RCT_EXPORT_METHOD(sendEvent:(NSString *)name
     [self sendEventWithName:startRecordingAction body:data];
 }
 
-- (void)stopRecording:(NSString*)mode :(BOOL)transcription {
+- (void)stopRecording:(RecordingMode)mode :(BOOL)transcription {
+    NSString *modeString = RecordingModeToString(mode);
     NSDictionary *data = @{
-        @"mode": mode,
+        @"mode": modeString,
         @"transcription": @(transcription)
     };
     
     [self sendEventWithName:stopRecordingAction body:data];
 }
-
-- (void)overwriteConfig:(NSDictionary*)config {
-    NSDictionary *data = @{
-        @"config": config
-    };
-
-    [self sendEventWithName:overwriteConfigAction body:data];
-}
-
-- (void)sendCameraFacingModeMessage:(NSString*)to :(NSString*)facingMode {
-    NSDictionary *data = @{
-        @"to": to,
-        @"facingMode": facingMode
-    };
-    
-    [self sendEventWithName:sendCameraFacingModeMessageAction body:data];
-}
 @end

ios/sdk/src/JitsiMeetView.h

@@ -21,10 +21,7 @@
 #import "JitsiMeetConferenceOptions.h"
 #import "JitsiMeetViewDelegate.h"
 
-typedef NS_ENUM(NSInteger, RecordingMode) {
-    RecordingModeFile,
-    RecordingModeStream
-};
+typedef NS_ENUM(NSInteger, RecordingMode);
 
 @interface JitsiMeetView : UIView
 
@@ -54,8 +51,7 @@ typedef NS_ENUM(NSInteger, RecordingMode) {
 - (void)toggleCamera;
 - (void)showNotification:(NSString * _Nonnull)appearance :(NSString * _Nullable)description :(NSString * _Nullable)timeout :(NSString * _Nullable)title :(NSString * _Nullable)uid;
 - (void)hideNotification:(NSString * _Nullable)uid;
-- (void)startRecording:(RecordingMode)mode :(NSString * _Nullable)dropboxToken :(BOOL)shouldShare :(NSString * _Nullable)rtmpStreamKey :(NSString * _Nullable)rtmpBroadcastID :(NSString * _Nullable)youtubeStreamKey :(NSString * _Nullable)youtubeBroadcastID :(NSDictionary * _Nullable)extraMetadata :(BOOL)transcription;
+- (void)startRecording:(RecordingMode)mode :(NSString * _Nullable)dropboxToken :(BOOL)shouldShare :(NSString * _Nullable)rtmpStreamKey :(NSString * _Nullable)rtmpBroadcastID :(NSString * _Nullable)youtubeStreamKey :(NSString * _Nullable)youtubeBroadcastID :(NSString * _Nullable)extraMetadata :(BOOL)transcription;
 - (void)stopRecording:(RecordingMode)mode :(BOOL)transcription;
-- (void)overwriteConfig:(NSDictionary * _Nonnull)config;
-- (void)sendCameraFacingModeMessage:(NSString * _Nonnull)to :(NSString * _Nullable)facingMode;
+
 @end

ios/sdk/src/JitsiMeetView.m

@@ -17,8 +17,6 @@
 
 #include <mach/mach_time.h>
 
-#import <UIKit/UIKit.h>
-
 #import "ExternalAPI.h"
 #import "JitsiMeet+Private.h"
 #import "JitsiMeetConferenceOptions+Private.h"
@@ -27,43 +25,11 @@
 #import "RNRootView.h"
 
 
-#pragma mark UIColor helpers
-
-@interface UIColor (Hex)
-
-+ (UIColor *)colorWithHex:(uint32_t)hex;
-+ (UIColor *)colorWithHex:(uint32_t)hex alpha:(CGFloat)alpha;
-
-@end
-
-@implementation UIColor (Hex)
-
-+ (UIColor *)colorWithHex:(uint32_t)hex {
-    return [self colorWithHex:hex alpha:1.0];
-}
-
-+ (UIColor *)colorWithHex:(uint32_t)hex alpha:(CGFloat)alpha {
-    CGFloat red   = ((hex >> 16) & 0xFF) / 255.0;
-    CGFloat green = ((hex >> 8) & 0xFF) / 255.0;
-    CGFloat blue  = (hex & 0xFF) / 255.0;
-
-    return [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
-}
-
-@end
-
-#pragma mark UIColor helpers end
-
 /**
  * Backwards compatibility: turn the boolean prop into a feature flag.
  */
 static NSString *const PiPEnabledFeatureFlag = @"pip.enabled";
 
-/**
- * Forward declarations.
- */
-static NSString *recordingModeToString(RecordingMode mode);
-
 
 @implementation JitsiMeetView {
     /**
@@ -99,8 +65,11 @@ static NSString *recordingModeToString(RecordingMode mode);
  * - registers necessary observers
  */
 - (void)doInitialize {
-    // Set a background color which matches the one used in JS.
-    self.backgroundColor = [UIColor colorWithHex:0x040404 alpha:1];
+    // Set a background color which is in accord with the JavaScript and Android
+    // parts of the application and causes less perceived visual flicker than
+    // the default background color.
+    self.backgroundColor
+        = [UIColor colorWithRed:.07f green:.07f blue:.07f alpha:1];
     
     [self registerObservers];
 }
@@ -184,25 +153,15 @@ static NSString *recordingModeToString(RecordingMode mode);
     [externalAPI hideNotification:uid];
 }
 
-- (void)startRecording:(RecordingMode)mode :(NSString * _Nullable)dropboxToken :(BOOL)shouldShare :(NSString * _Nullable)rtmpStreamKey :(NSString * _Nullable)rtmpBroadcastID :(NSString * _Nullable)youtubeStreamKey :(NSString * _Nullable)youtubeBroadcastID :(NSDictionary * _Nullable)extraMetadata :(BOOL)transcription {
+- (void)startRecording:(RecordingMode)mode :(NSString *)dropboxToken :(BOOL)shouldShare :(NSString *)rtmpStreamKey :(NSString *)rtmpBroadcastID :(NSString *)youtubeStreamKey :(NSString *)youtubeBroadcastID :(NSString *)extraMetadata :(BOOL)transcription {
     ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI startRecording:recordingModeToString(mode) :dropboxToken :shouldShare :rtmpStreamKey :rtmpBroadcastID :youtubeStreamKey :youtubeBroadcastID :extraMetadata :transcription];
+    [externalAPI startRecording:mode :dropboxToken :shouldShare :rtmpStreamKey :rtmpBroadcastID :youtubeStreamKey :youtubeBroadcastID :extraMetadata :transcription];
 }
 
 - (void)stopRecording:(RecordingMode)mode :(BOOL)transcription {
     ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI stopRecording:recordingModeToString(mode) :transcription];
-}
-
-- (void)overwriteConfig:(NSDictionary * _Nonnull)config {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI overwriteConfig:config];
-}
-
-- (void)sendCameraFacingModeMessage:(NSString * _Nonnull)to :(NSString * _Nullable)facingMode {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI sendCameraFacingModeMessage:to :facingMode];
-}
+    [externalAPI stopRecording:mode :transcription];
+}       
 
 #pragma mark Private methods
 
@@ -298,14 +257,3 @@ static NSString *recordingModeToString(RecordingMode mode);
 }
 
 @end
-
-static NSString *recordingModeToString(RecordingMode mode) {
-    switch (mode) {
-        case RecordingModeFile:
-            return @"file";
-        case RecordingModeStream:
-            return @"stream";
-        default:
-            return nil;
-    }
-}

ios/sdk/src/JitsiMeetViewDelegate.h

@@ -130,18 +130,4 @@
  */
 - (void)customButtonPressed:(NSDictionary *)data;
 
-/**
- * Called when the unique identifier for conference has been set.
- *
- * The `data` dictionary contains a `sessionId` key.
- */
-- (void)conferenceUniqueIdSet:(NSDictionary *)data;
-
-/**
- * Called when the recording status has changed.
- *
- * The `data` dictionary contains a `sessionData` key.
- */
-- (void)recordingStatusChanged:(NSDictionary *)data;
-
 @end

lang/languages.json

@@ -39,7 +39,6 @@
     "mr": "मराठी",
     "nb": "Norsk bokmål",
     "nl": "Nederlands",
-    "no": "Norsk",
     "oc": "Occitan",
     "pl": "Polski",
     "pt": "Português",

lang/main-ar.json

@@ -944,7 +944,6 @@
         "title": "خيارات الأمان"
     },
     "settings": {
-        "audio": "الصوت",
         "buttonLabel": "إعدادات",
         "calendar": {
             "about": "تُستعمَل الرزنامة {{appName}} المدمجة للوصل بأمان إلى رزنامتك، لذا بالإمكان معرفة الأحداث القادمة.",
@@ -968,7 +967,6 @@
         "more": "المزيد",
         "name": "الاسم",
         "noDevice": "لا يوجد",
-        "notifications": "الإشعارات",
         "participantJoined": "انضم مشارك",
         "participantKnocking": "دخل المشارك في الردهة",
         "participantLeft": "غادر المشارك",
@@ -979,15 +977,13 @@
         "selectCamera": "الكاميرا",
         "selectMic": "المايكروفون",
         "selfView": "عرض ذاتي",
-        "shortcuts": "اختصارات لوحة المفاتيح",
         "sounds": "اصوات",
         "speakers": "المذياع (مكبر الصوت)",
         "startAudioMuted": "بدء الجميع مكتومي الصوت",
         "startReactionsMuted": "كتم رد فعل الصوت للجميع",
         "startVideoMuted": "بدء الجميع دون فيديو",
         "talkWhileMuted": "تحدث أثناء كتم الصوت",
-        "title": "الإعدادات",
-        "video": "الفيديو"
+        "title": "الإعدادات"
     },
     "settingsView": {
         "advanced": "إعدادات متقدمة",

lang/main-de.json

@@ -70,14 +70,14 @@
         "breakoutList": "Breakout-Liste",
         "buttonLabel": "Breakout-Räume",
         "defaultName": "Breakout-Raum #{{index}}",
-        "hideParticipantList": "Personenliste ausblenden",
+        "hideParticipantList": "Teilnehmerliste ausblenden",
         "mainRoom": "Hauptraum",
         "notifications": {
             "joined": "Breakout-Raum \"{{name}}\" betreten",
             "joinedMainRoom": "Hauptraum betreten",
             "joinedTitle": "Breakout-Räume"
         },
-        "showParticipantList": "Personenliste anzeigen",
+        "showParticipantList": "Teilnehmerliste anzeigen",
         "title": "Breakout-Räume"
     },
     "calendarSync": {
@@ -89,7 +89,7 @@
             "notSignedIn": "Ein Fehler ist während der Authentifizierung zur Anzeige von Kalenderterminen aufgetreten. Prüfen Sie Ihre Kalendereinstellungen oder versuchen Sie, sich erneut anzumelden."
         },
         "join": "Teilnehmen",
-        "joinTooltip": "An Konferenz teilnehmen",
+        "joinTooltip": "Am Konferenz teilnehmen",
         "nextMeeting": "Nächste Konferenz",
         "noEvents": "Es gibt keine bevorstehenden Termine.",
         "ongoingMeeting": "Laufende Konferenz",
@@ -363,18 +363,18 @@
         "muteEveryoneDialogModerationOn": "Die Anwesenden können eine Anfrage zum Sprechen jederzeit senden.",
         "muteEveryoneElseDialog": "Einmal stummgeschaltet, können Sie deren Stummschaltung nicht mehr beenden, aber sie können ihre Stummschaltung jederzeit selbst beenden.",
         "muteEveryoneElseTitle": "Alle außer {{whom}} stummschalten?",
-        "muteEveryoneElsesVideoDialog": "Sobald die Kamera für alle anderen Personen deaktiviert ist, können Sie diese nicht wieder für alle einschalten, die anderen Personen können ihre Kamera aber jederzeit wieder einschalten.",
+        "muteEveryoneElsesVideoDialog": "Sobald die Kamera deaktiviert ist, können Sie sie nicht wieder aktivieren, die Teilnehmer können dies aber jederzeit wieder ändern.",
         "muteEveryoneElsesVideoTitle": "Die Kamera von allen außer {{whom}} ausschalten?",
         "muteEveryoneSelf": "sich selbst",
         "muteEveryoneStartMuted": "Alle beginnen von jetzt an stummgeschaltet",
         "muteEveryoneTitle": "Alle stummschalten?",
-        "muteEveryonesVideoDialog": "Sind Sie sicher, dass Sie die Kamera von allen Personen deaktivieren möchten? Sie können dies nicht wieder rückgängig machen, jede Personen kann ihre Kamera aber jederzeit wieder einschalten.",
+        "muteEveryonesVideoDialog": "Sind Sie sicher, dass Sie die Kamera von allen Teilnehmern deaktivieren möchten? Sie können sie nicht wieder aktivieren, die Teilnehmer können dies aber jederzeit wieder ändern.",
         "muteEveryonesVideoDialogModerationOn": "Die Anwesenden können jederzeit eine Anfrage senden, um ihre Kamera einzuschalten.",
         "muteEveryonesVideoDialogOk": "deaktivieren",
         "muteEveryonesVideoTitle": "Die Kamera von allen anderen ausschalten?",
         "muteParticipantBody": "Sie können die Stummschaltung anderer Personen nicht aufheben, aber eine Person kann ihre eigene Stummschaltung jederzeit beenden.",
         "muteParticipantButton": "Stummschalten",
-        "muteParticipantsVideoBody": "Sie können die Kamera nicht wieder einschalten, die Person kann ihre Kamera aber jederzeit wieder einschalten.",
+        "muteParticipantsVideoBody": "Sie können die Kamera nicht wieder aktivieren, die Teilnehmer können dies aber jederzeit wieder ändern.",
         "muteParticipantsVideoBodyModerationOn": "Sie können die Kamera nicht wieder aktivieren und die Person selbst auch nicht.",
         "muteParticipantsVideoButton": "Kamera ausschalten",
         "muteParticipantsVideoDialog": "Wollen Sie die Kamera dieser Person wirklich deaktivieren? Sie können die Kamera nicht wieder aktivieren, die Person kann dies aber jederzeit selbst tun.",
@@ -562,7 +562,7 @@
         "inviteTextiOSPhone": "Nutzen Sie folgende Nummer um via Telefon teilzunehmen: {{number}},,{{conferenceID}}#. Wenn Sie nach einer anderen Einwahlnummer suchen, finden Sie die vollständige Liste hier: {{didUrl}}.",
         "inviteURLFirstPartGeneral": "Sie wurden zur Teilnahme an einer Konferenz eingeladen.",
         "inviteURLFirstPartPersonal": "{{name}} lädt Sie zu einer Konferenz ein.\n",
-        "inviteURLSecondPart": "\nAn Konferenz teilnehmen:\n{{url}}\n",
+        "inviteURLSecondPart": "\nAm Konferenz teilnehmen:\n{{url}}\n",
         "label": "Einwahlinformationen",
         "liveStreamURL": "Livestream:",
         "moreNumbers": "Weitere Telefonnummern",
@@ -642,7 +642,6 @@
         "on": "Livestream",
         "onBy": "{{name}} startete den Livestream",
         "pending": "Livestream wird gestartet …",
-        "policyError": "Sie haben den Livestream zu schnell gestartet. Bitte versuchen Sie es später noch einmal!",
         "serviceName": "Livestreaming-Dienst",
         "sessionAlreadyActive": "Diese Konferenz wird bereits als Livestream übertragen.",
         "signIn": "Mit Google anmelden",
@@ -743,7 +742,7 @@
         "connectedOneMember": "{{name}} nimmt an der Konferenz teil",
         "connectedThreePlusMembers": "{{name}} und {{count}} andere Personen nehmen an der Konferenz teil",
         "connectedTwoMembers": "{{first}} und {{second}} nehmen an der Konferenz teil",
-        "connectionFailed": "Verbindung fehlgeschlagen. Bitte versuchen Sie es später noch einmal!",
+        "connectionFailed": "Verbindung fehlgeschlagen. Bitte versuchen Sie es später noch einmal.",
         "dataChannelClosed": "Schlechte Videoqualität",
         "dataChannelClosedDescription": "Die Steuerungsverbindung (Bridge Channel) wurde unterbrochen, daher ist die Videoqulität auf die schlechteste Stufe limitiert.",
         "dataChannelClosedDescriptionWithAudio": "Die Steuerungsverbindung (Bridge Channel) wurde unterbrochen, daher können Video- und Tonprobleme auftreten.",
@@ -758,9 +757,9 @@
         "gifsMenu": "GIPHY",
         "groupTitle": "Benachrichtigungen",
         "hostAskedUnmute": "Die Moderation bittet Sie, das Mikrofon zu aktivieren",
-        "invalidTenant": "Ungültiger Mandant",
-        "invalidTenantHyphenDescription": "Der gewählte Mandantenname ist ungültig (beginnt oder endet mit '-').",
-        "invalidTenantLengthDescription": "Der gewählte Mandantenname ist zu lang.",
+        "invalidTenant": "Ungültiger Tenant",
+        "invalidTenantHyphenDescription": "Der von Ihnen genutzte Tenantname ist unfültig (beginnt oder endet mit '-').",
+        "invalidTenantLengthDescription": "Der von Ihnen genutzte Tenantname ist zu lang.",
         "invitedOneMember": "{{name}} wurde eingeladen",
         "invitedThreePlusMembers": "{{name}} und {{count}} andere wurden eingeladen",
         "invitedTwoMembers": "{{first}} und {{second}} wurden eingeladen",
@@ -1060,7 +1059,7 @@
         "onBy": "{{name}} startete die Aufnahme",
         "onlyRecordSelf": "Nur eigenes Kamerabild und Ton aufzeichnen",
         "pending": "Aufzeichnung der Konferenz wird vorbereitet…",
-        "policyError": "Sie haben die Aufzeichnung zu schnell gestartet. Bitte versuchen Sie es später noch einmal.",
+        "policyError": "Sie haben die Aufzeichnung zu früh gestartet. Bitte versuchen Sie es später noch einmal.",
         "recordAudioAndVideo": "Kamera und Ton aufzeichnen",
         "recordTranscription": "Transkription aufzeichnen",
         "saveLocalRecording": "Aufzeichnung lokal abspeichern",
@@ -1083,10 +1082,10 @@
         "pullToRefresh": "Ziehen, um zu aktualisieren"
     },
     "security": {
-        "about": "Sie können Ihre Konferenz mit einem Passwort sichern. Personen müssen dieses eingeben, bevor sie an der Sitzung teilnehmen dürfen.",
+        "about": "Sie können Ihre Konferenz mit einem Passwort sichern. Teilnehmer müssen dieses eingeben, bevor sie an der Sitzung teilnehmen dürfen.",
         "aboutReadOnly": "Mit Moderationsrechten kann die Konferenz mit einem Passwort gesichert werden. Personen müssen dieses eingeben, bevor sie an der Sitzung teilnehmen dürfen.",
-        "insecureRoomNameWarningNative": "Der Raumname ist unsicher. Unerwünschte Personen könnten Ihrer Konferenz beitreten. {{recommendAction}} Lernen Sie mehr über die Absicherung Ihrer Konferenz ",
-        "insecureRoomNameWarningWeb": "Der Raumname ist unsicher. Unerwünschte Personen könnten Ihrer Konferenz beitreten {{recommendAction}} Lernen Sie <a href=\"{{securityUrl}}\" rel=\"security\" target=\"_blank\">hier</a> mehr über die Absicherung Ihrer Konferenz.",
+        "insecureRoomNameWarningNative": "Der Raumname ist unsicher. Unerwünschte Teilnehmer könnten Ihrer Konferenz beitreten. {{recommendAction}} Lernen Sie mehr über die Absicherung Ihrer Konferenz ",
+        "insecureRoomNameWarningWeb": "Der Raumname ist unsicher. Unerwünschte Teilnehmer könnten Ihrer Konferenz beitreten {{recommendAction}} Lernen Sie <a href=\"{{securityUrl}}\" rel=\"security\" target=\"_blank\">hier</a> mehr über die Absicherung Ihrer Konferenz.",
         "title": "Sicherheitsoptionen",
         "unsafeRoomActions": {
             "meeting": "Erwägen Sie die Absicherung Ihrer Konferenz über den Sicherheits-Button.",
@@ -1186,7 +1185,6 @@
         "fearful": "Ängstlich",
         "happy": "Fröhlich",
         "hours": "{{count}} Std. ",
-        "labelTooltip": "Anzahl der Personen: {{count}}",
         "minutes": "{{count}} Min. ",
         "name": "Name",
         "neutral": "Neutral",

lang/main.json

@@ -263,7 +263,6 @@
         "Remove": "Remove",
         "Share": "Share",
         "Submit": "Submit",
-        "Understand": "I understand",
         "WaitForHostMsg": "The conference has not yet started because no moderators have yet arrived. If you'd like to become a moderator please log-in. Otherwise, please wait.",
         "WaitForHostNoAuthMsg": "The conference has not yet started because no moderators have yet arrived. Please wait.",
         "WaitingForHostButton": "Wait for moderator",
@@ -359,7 +358,7 @@
         "micTimeoutError": "Could not start audio source. Timeout occurred!",
         "micUnknownError": "Cannot use microphone for an unknown reason.",
         "moderationAudioLabel": "Allow attendees to unmute themselves",
-        "moderationVideoLabel": "Allow non-moderators to start their video",
+        "moderationVideoLabel": "Allow attendees to start their video",
         "muteEveryoneDialog": "The participants can unmute themselves at any time.",
         "muteEveryoneDialogModerationOn": "The participants can send a request to speak at any time.",
         "muteEveryoneElseDialog": "Once muted, you won't be able to unmute them, but they can unmute themselves at any time.",
@@ -394,8 +393,6 @@
         "recentlyUsedObjects": "Your recently used objects",
         "recording": "Recording",
         "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Not possible while a live stream is active",
-        "recordingInProgressDescription": "This meeting is being recorded. Your audio and video have been muted. If you choose to unmute, you consent to being recorded.",
-        "recordingInProgressTitle": "Recording in progress",
         "rejoinNow": "Rejoin now",
         "remoteControlAllowedMessage": "{{user}} accepted your remote control request!",
         "remoteControlDeniedMessage": "{{user}} rejected your remote control request!",
@@ -848,7 +845,7 @@
         "actions": {
             "admit": "Admit",
             "admitAll": "Admit all",
-            "allow": "Allow non-moderators to:",
+            "allow": "Allow attendees to:",
             "allowVideo": "Allow video",
             "askUnmute": "Ask to unmute",
             "audioModeration": "Unmute themselves",

modules/API/API.js

@@ -1050,12 +1050,6 @@ function initCommands() {
             callback(getRoomsInfo(APP.store.getState()));
             break;
         }
-        case 'get-shared-document-url': {
-            const { etherpad } = APP.store.getState()['features/etherpad'];
-
-            callback(etherpad?.documentUrl || '');
-            break;
-        }
         case 'get-p2p-status': {
             callback(isP2pActive(APP.store.getState()));
             break;

modules/API/external/external_api.js

@@ -682,17 +682,6 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         });
     }
 
-    /**
-     * Returns the Shared Document Url of the conference.
-     *
-     * @returns {Object} Rooms info.
-     */
-    async getSharedDocumentUrl() {
-        return this._transport.sendRequest({
-            name: 'get-shared-document-url'
-        });
-    }
-
     /**
      * Returns whether the conference is P2P.
      *

package-lock.json

@@ -62,7 +62,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/v1922.0.0+25031534/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1915.0.0+6e9b9c01/lib-jitsi-meet.tgz",
         "lodash-es": "4.17.21",
         "moment": "2.29.4",
         "moment-duration-format": "2.2.2",
@@ -16909,8 +16909,8 @@
     },
     "node_modules/lib-jitsi-meet": {
       "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1922.0.0+25031534/lib-jitsi-meet.tgz",
-      "integrity": "sha512-ZjXYPyorF/fAqz8j4M+P+hN1evhoukrtZVPKa6jAROREh+TLRlS8uUd34llY7IGC4UlGyd30CfEhgsEmWd7/9g==",
+      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1915.0.0+6e9b9c01/lib-jitsi-meet.tgz",
+      "integrity": "sha512-erPBz93xzWDIvW9EdvSfiraHFi0TMo1W68zxe7rKvIQWX1DCjmKxWKnxdq5WirSD7MXwoSIxgdX4PB7Wz3aTmg==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -37637,8 +37637,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1922.0.0+25031534/lib-jitsi-meet.tgz",
-      "integrity": "sha512-ZjXYPyorF/fAqz8j4M+P+hN1evhoukrtZVPKa6jAROREh+TLRlS8uUd34llY7IGC4UlGyd30CfEhgsEmWd7/9g==",
+      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1915.0.0+6e9b9c01/lib-jitsi-meet.tgz",
+      "integrity": "sha512-erPBz93xzWDIvW9EdvSfiraHFi0TMo1W68zxe7rKvIQWX1DCjmKxWKnxdq5WirSD7MXwoSIxgdX4PB7Wz3aTmg==",
       "requires": {
         "@jitsi/js-utils": "2.2.1",
         "@jitsi/logger": "2.0.2",

package.json

@@ -68,7 +68,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/v1922.0.0+25031534/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1915.0.0+6e9b9c01/lib-jitsi-meet.tgz",
     "lodash-es": "4.17.21",
     "moment": "2.29.4",
     "moment-duration-format": "2.2.2",

react/features/always-on-top/AlwaysOnTop.tsx

@@ -205,7 +205,7 @@ export default class AlwaysOnTop extends Component<any, IState> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentDidMount() {
+    componentDidMount() {
         api.on('avatarChanged', this._avatarChangedListener);
         api.on('displayNameChange', this._displayNameChangedListener);
         api.on('largeVideoChanged', this._videoChangedListener);
@@ -231,7 +231,7 @@ export default class AlwaysOnTop extends Component<any, IState> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentDidUpdate(_prevProps: any, prevState: IState) {
+    componentDidUpdate(_prevProps: any, prevState: IState) {
         if (!prevState.visible && this.state.visible) {
             this._hideToolbarAfterTimeout();
         }
@@ -243,7 +243,7 @@ export default class AlwaysOnTop extends Component<any, IState> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         api.removeListener('avatarChanged', this._avatarChangedListener);
         api.removeListener(
             'displayNameChange',
@@ -267,7 +267,7 @@ export default class AlwaysOnTop extends Component<any, IState> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         return (
             <div id = 'alwaysOnTop'>
                 <Toolbar

react/features/always-on-top/AudioMuteButton.tsx

@@ -63,7 +63,7 @@ export default class AudioMuteButton extends Component<Props, IState> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentDidMount() {
+    componentDidMount() {
         api.on('audioAvailabilityChanged', this._audioAvailabilityListener);
         api.on('audioMuteStatusChanged', this._audioMutedListener);
 
@@ -86,7 +86,7 @@ export default class AudioMuteButton extends Component<Props, IState> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         api.removeListener(
             'audioAvailabilityChanged',
             this._audioAvailabilityListener);
@@ -165,7 +165,7 @@ export default class AudioMuteButton extends Component<Props, IState> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const toggled = this._isAudioMuted();
 
         return (

react/features/always-on-top/HangupButton.tsx

@@ -48,7 +48,7 @@ export default class HangupButton extends Component<Props> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         return (
             <ToolbarButton
                 accessibilityLabel = { this.accessibilityLabel }

react/features/always-on-top/Toolbar.tsx

@@ -73,7 +73,7 @@ export default class Toolbar extends Component<Props, IState> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentDidMount() {
+    componentDidMount() {
         api.on('videoConferenceJoined', this._videoConferenceJoinedListener);
 
         this._videoConferenceJoinedListener();
@@ -106,7 +106,7 @@ export default class Toolbar extends Component<Props, IState> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         api.removeListener('videoConferenceJoined', this._videoConferenceJoinedListener);
     }
 
@@ -116,7 +116,7 @@ export default class Toolbar extends Component<Props, IState> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const {
             className = '',
             onMouseOut,

react/features/always-on-top/VideoMuteButton.tsx

@@ -63,7 +63,7 @@ export default class VideoMuteButton extends Component<Props, State> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentDidMount() {
+    componentDidMount() {
         api.on('videoAvailabilityChanged', this._videoAvailabilityListener);
         api.on('videoMuteStatusChanged', this._videoMutedListener);
 
@@ -85,7 +85,7 @@ export default class VideoMuteButton extends Component<Props, State> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         api.removeListener(
             'videoAvailabilityChanged',
             this._videoAvailabilityListener);
@@ -165,7 +165,7 @@ export default class VideoMuteButton extends Component<Props, State> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const toggled = this._isVideoMuted();
 
         return (

react/features/app/components/AbstractApp.ts

@@ -31,7 +31,7 @@ export class AbstractApp<P extends IProps = IProps> extends BaseApp<P> {
      *
      * @inheritdoc
      */
-    override async componentDidMount() {
+    async componentDidMount() {
         await super.componentDidMount();
 
         // If a URL was explicitly specified to this React Component, then
@@ -44,7 +44,7 @@ export class AbstractApp<P extends IProps = IProps> extends BaseApp<P> {
      *
      * @inheritdoc
      */
-    override async componentDidUpdate(prevProps: IProps) {
+    async componentDidUpdate(prevProps: IProps) {
         const previousUrl = toURLString(prevProps.url);
         const currentUrl = toURLString(this.props.url);
         const previousTimestamp = prevProps.timestamp;

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

@@ -80,7 +80,7 @@ export class App extends AbstractApp<IProps> {
      *
      * @returns {void}
      */
-    override async componentDidMount() {
+    async componentDidMount() {
         await super.componentDidMount();
 
         SplashScreen.hide();
@@ -96,7 +96,7 @@ export class App extends AbstractApp<IProps> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         return (
             <JitsiThemePaperProvider>
                 { super.render() }

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

@@ -28,7 +28,7 @@ export class App extends AbstractApp {
      * @protected
      * @returns {ReactElement}
      */
-    override _createExtraElement() {
+    _createExtraElement() {
         return (
             <JitsiThemeProvider>
                 <OverlayContainer />
@@ -42,7 +42,7 @@ export class App extends AbstractApp {
      *
      * @override
      */
-    override _createMainElement(component: React.ComponentType, props?: Object) {
+    _createMainElement(component: React.ComponentType, props?: Object) {
         return (
             <JitsiThemeProvider>
                 <GlobalStyles />
@@ -57,7 +57,7 @@ export class App extends AbstractApp {
      *
      * @returns {React$Element}
      */
-    override _renderDialogContainer() {
+    _renderDialogContainer() {
         return (
             <JitsiThemeProvider>
                 <DialogContainer />

react/features/audio-level-indicator/components/AudioLevelIndicator.tsx

@@ -36,7 +36,7 @@ class AudioLevelIndicator extends Component<IProps> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { audioLevel: passedAudioLevel } = this.props;
 
         // First make sure we are sensitive enough.

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

@@ -132,7 +132,7 @@ class LoginDialog extends Component<IProps, IState> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const {
             _connecting: connecting,
             t

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

@@ -60,7 +60,7 @@ class WaitForOwnerDialog extends Component<IProps> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { _isConfirmHidden } = this.props;
 
         return (

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

@@ -220,7 +220,7 @@ class LoginDialog extends Component<IProps, IState> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const {
             _connecting: connecting,
             t

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

@@ -74,7 +74,7 @@ class WaitForOwnerDialog extends PureComponent<IProps> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const {
             t
         } = this.props;

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

@@ -67,7 +67,7 @@ export default class BaseApp<P> extends Component<P, IState> {
      *
      * @inheritdoc
     */
-    override async componentDidMount() {
+    async componentDidMount() {
         /**
          * Make the mobile {@code BaseApp} wait until the {@code AsyncStorage}
          * implementation of {@code Storage} initializes fully.
@@ -107,7 +107,7 @@ export default class BaseApp<P> extends Component<P, IState> {
      *
      * @inheritdoc
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         this.state.store?.dispatch(appWillUnmount(this));
     }
 
@@ -119,7 +119,7 @@ export default class BaseApp<P> extends Component<P, IState> {
      *
      * @returns {void}
      */
-    override componentDidCatch(error: Error, info: Object) {
+    componentDidCatch(error: Error, info: Object) {
         logger.error(error, info);
     }
 
@@ -153,7 +153,7 @@ export default class BaseApp<P> extends Component<P, IState> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { route: { component, props }, store } = this.state;
 
         if (store) {

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

@@ -148,7 +148,7 @@ class Avatar<P extends IProps> extends PureComponent<P, IState> {
      *
      * @inheritdoc
      */
-    override componentDidUpdate(prevProps: P) {
+    componentDidUpdate(prevProps: P) {
         const { _corsAvatarURLs, url } = this.props;
 
         if (prevProps.url !== url) {
@@ -170,7 +170,7 @@ class Avatar<P extends IProps> extends PureComponent<P, IState> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const {
             _customAvatarBackgrounds,
             _initialsBase,

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

@@ -51,7 +51,7 @@ export default class StatelessAvatar extends Component<IProps> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const { initials, size, style, url } = this.props;
 
         let avatar;

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

@@ -4,7 +4,7 @@ import { JitsiConferenceErrors } from '../lib-jitsi-meet';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
 
 import { CONFERENCE_FAILED } from './actionTypes';
-import { conferenceLeft } from './actions.native';
+import { conferenceLeft } from './actions';
 import { TRIGGER_READY_TO_CLOSE_REASONS } from './constants';
 
 import './middleware.any';
@@ -15,20 +15,10 @@ MiddlewareRegistry.register(store => next => action => {
 
     switch (action.type) {
     case CONFERENCE_FAILED: {
-        const { getState } = store;
-        const state = getState();
-        const { notifyOnConferenceDestruction = true } = state['features/base/config'];
-
         if (error?.name !== JitsiConferenceErrors.CONFERENCE_DESTROYED) {
             break;
         }
 
-        if (!notifyOnConferenceDestruction) {
-            dispatch(conferenceLeft(action.conference));
-            dispatch(appNavigate(undefined));
-            break;
-        }
-
         const [ reason ] = error.params;
 
         const reasonKey = Object.keys(TRIGGER_READY_TO_CLOSE_REASONS)[

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

@@ -122,14 +122,12 @@ MiddlewareRegistry.register(store => next => action => {
         }
 
         if (errorName === JitsiConferenceErrors.CONFERENCE_DESTROYED) {
-            const state = getState();
-            const { notifyOnConferenceDestruction = true } = state['features/base/config'];
             const [ reason ] = action.error.params;
             const titlekey = Object.keys(TRIGGER_READY_TO_CLOSE_REASONS)[
                 Object.values(TRIGGER_READY_TO_CLOSE_REASONS).indexOf(reason)
             ];
 
-            dispatch(hangup(true, i18next.t(titlekey) || reason, notifyOnConferenceDestruction));
+            dispatch(hangup(true, i18next.t(titlekey) || reason));
         }
 
         releaseScreenLock();

react/features/base/config/configType.ts

@@ -486,7 +486,6 @@ export interface IConfig {
         short?: number;
     };
     notifications?: Array<string>;
-    notifyOnConferenceDestruction?: boolean;
     openSharedDocumentOnJoin?: boolean;
     opusMaxAverageBitrate?: number;
     p2p?: {
@@ -543,7 +542,6 @@ export interface IConfig {
     recordingSharingUrl?: string;
     recordings?: {
         recordAudioAndVideo?: boolean;
-        requireConsent?: boolean;
         showPrejoinWarning?: boolean;
         showRecordingLink?: boolean;
         suggestRecording?: boolean;
@@ -604,7 +602,6 @@ export interface IConfig {
     tokenAuthUrl?: string;
     tokenAuthUrlAutoRedirect?: string;
     tokenLogoutUrl?: string;
-    tokenRespectTenant?: string;
     toolbarButtons?: Array<ToolbarButton>;
     toolbarConfig?: {
         alwaysVisible?: boolean;

react/features/base/config/configWhitelist.ts

@@ -182,7 +182,6 @@ export default [
     'mouseMoveCallbackInterval',
     'notifications',
     'notificationTimeouts',
-    'notifyOnConferenceDestruction',
     'openSharedDocumentOnJoin',
     'opusMaxAverageBitrate',
     'p2p.backToP2PDelay',
@@ -206,10 +205,7 @@ export default [
     'remoteVideoMenu',
     'roomPasswordNumberOfDigits',
     'readOnlyName',
-    'recordings.recordAudioAndVideo',
-    'recordings.showPrejoinWarning',
-    'recordings.showRecordingLink',
-    'recordings.suggestRecording',
+    'recordings',
     'replaceParticipant',
     'resolution',
     'screenshotCapture',

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

@@ -62,11 +62,9 @@ export function connect(id?: string, password?: string) {
  * @param {boolean} [requestFeedback] - Whether to attempt showing a
  * request for call feedback.
  * @param {string} [feedbackTitle] - The feedback title.
- * @param {boolean} [notifyOnConferenceTermination] - Whether to notify
- * the user on conference termination.
  * @returns {Function}
  */
-export function hangup(requestFeedback = false, feedbackTitle?: string, notifyOnConferenceTermination?: boolean) {
+export function hangup(requestFeedback = false, feedbackTitle?: string) {
     // XXX For web based version we use conference hanging up logic from the old app.
     return async (dispatch: IStore['dispatch']) => {
         if (LocalRecordingManager.isRecordingLocally()) {
@@ -82,6 +80,6 @@ export function hangup(requestFeedback = false, feedbackTitle?: string, notifyOn
             });
         }
 
-        return APP.conference.hangup(requestFeedback, feedbackTitle, notifyOnConferenceTermination);
+        return APP.conference.hangup(requestFeedback, feedbackTitle);
     };
 }

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

@@ -52,7 +52,7 @@ export default class AbstractDialog<P extends IProps, S extends IState = IState>
      *
      * @inheritdoc
      */
-    override componentDidMount() {
+    componentDidMount() {
         this._mounted = true;
     }
 
@@ -62,7 +62,7 @@ export default class AbstractDialog<P extends IProps, S extends IState = IState>
      *
      * @inheritdoc
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         this._mounted = false;
     }
 

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

@@ -31,7 +31,7 @@ class AlertDialog extends AbstractDialog<IProps> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const { contentKey, t } = this.props;
         const content
             = typeof contentKey === 'string'

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

@@ -100,7 +100,7 @@ class BottomSheet extends PureComponent<Props> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const {
             addScrollViewPadding,
             renderHeader,

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

@@ -36,11 +36,6 @@ interface IProps extends AbstractProps, WithTranslation {
      */
     descriptionKey?: string | { key: string; params: string; };
 
-    /**
-     * Whether the cancel button is hidden.
-     */
-    isCancelHidden?: Boolean;
-
     /**
      * Whether or not the nature of the confirm button is destructive.
      */
@@ -100,12 +95,11 @@ class ConfirmDialog extends AbstractDialog<IProps> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const {
             cancelLabel,
             children,
             confirmLabel,
-            isCancelHidden,
             isConfirmDestructive,
             isConfirmHidden,
             t,
@@ -127,12 +121,10 @@ class ConfirmDialog extends AbstractDialog<IProps> {
                 }
                 { this._renderDescription() }
                 { children }
-                {
-                    !isCancelHidden && <Dialog.Button
-                        label = { t(cancelLabel || 'dialog.confirmNo') }
-                        onPress = { this._onCancel }
-                        style = { styles.dialogButton } />
-                }
+                <Dialog.Button
+                    label = { t(cancelLabel || 'dialog.confirmNo') }
+                    onPress = { this._onCancel }
+                    style = { styles.dialogButton } />
                 {
                     !isConfirmHidden && <Dialog.Button
                         label = { t(confirmLabel || 'dialog.confirmYes') }

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

@@ -38,7 +38,7 @@ class DialogContainer extends AbstractDialogContainer {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         return (
             <Fragment>
                 {this._renderReactions()}

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

@@ -91,7 +91,7 @@ class InputDialog extends AbstractDialog<IProps, IState> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const {
             descriptionKey,
             messageKey,

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

@@ -71,7 +71,7 @@ class PageReloadDialog extends Component<IProps, IPageReloadDialogState> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentDidMount() {
+    componentDidMount() {
         const { timeLeft } = this.state;
 
         logger.info(
@@ -88,7 +88,7 @@ class PageReloadDialog extends Component<IProps, IPageReloadDialogState> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         if (this._interval) {
             clearInterval(this._interval);
             this._interval = undefined;
@@ -157,7 +157,7 @@ class PageReloadDialog extends Component<IProps, IPageReloadDialogState> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { isNetworkFailure, t } = this.props;
         const { timeLeft } = this.state;
 

react/features/base/flags/constants.ts

@@ -4,12 +4,6 @@
  */
 export const ADD_PEOPLE_ENABLED = 'add-people.enabled';
 
-/**
- * Flag indicating if the audio device button should be displayed.
- * Default: enabled (true).
- */
-export const AUDIO_DEVICE_BUTTON_ENABLED = 'audio-device-button.enabled';
-
 /**
  * Flag indicating if the SDK should not require the audio focus.
  * Used by apps that do not use Jitsi audio.
@@ -245,16 +239,10 @@ export const SETTINGS_ENABLED = 'settings.enabled';
 
 /**
  * Flag indicating if tile view feature should be enabled.
- * Default: enabled(true).
+ * Default: enabled.
  */
 export const TILE_VIEW_ENABLED = 'tile-view.enabled';
 
-/**
- * Flag indicating if the toggle camera button should be enabled
- * Default: enabled(true).
- */
-export const TOGGLE_CAMERA_BUTTON_ENABLED = 'toggle-camera-button.enabled';
-
 /**
  * Flag indicating if the toolbox should be always be visible
  * Default: disabled (false).

react/features/base/jwt/middleware.ts

@@ -3,14 +3,12 @@ import jwtDecode from 'jwt-decode';
 import { AnyAction } from 'redux';
 
 import { IStore } from '../../app/types';
-import { isVpaasMeeting } from '../../jaas/functions';
 import { SET_CONFIG } from '../config/actionTypes';
 import { SET_LOCATION_URL } from '../connection/actionTypes';
 import { participantUpdated } from '../participants/actions';
 import { getLocalParticipant } from '../participants/functions';
 import { IParticipant } from '../participants/types';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
-import { parseURIString } from '../util/uri';
 
 import { SET_JWT } from './actionTypes';
 import { setJWT } from './actions';
@@ -127,8 +125,6 @@ function _setJWT(store: IStore, next: Function, action: AnyAction) {
     const { jwt, type, ...actionPayload } = action;
 
     if (!Object.keys(actionPayload).length) {
-        const state = store.getState();
-
         if (jwt) {
             let jwtPayload;
 
@@ -154,22 +150,9 @@ function _setJWT(store: IStore, next: Function, action: AnyAction) {
 
                     const newUser = user ? { ...user } : {};
 
-                    let features = context.features;
-                    const { tokenRespectTenant } = state['features/base/config'];
-
-                    // eslint-disable-next-line max-depth
-                    if (!isVpaasMeeting(state) && tokenRespectTenant && context.tenant) {
-                        // we skip checking vpaas meetings as there are other backend rules in place
-                        // this way vpaas users can still use this field if needed
-                        const { locationURL = { href: '' } as URL } = state['features/base/connection'];
-                        const { tenant = '' } = parseURIString(locationURL.href) || {};
-
-                        features = context.tenant === tenant ? features : {};
-                    }
-
                     _overwriteLocalParticipant(
                         store, { ...newUser,
-                            features });
+                            features: context.features });
 
                     // eslint-disable-next-line max-depth
                     if (context.user && context.user.role === 'visitor') {
@@ -189,7 +172,7 @@ function _setJWT(store: IStore, next: Function, action: AnyAction) {
             // On Web it should eventually be restored from storage, but there's
             // no such use case yet.
 
-            const { user } = state['features/base/jwt'];
+            const { user } = store.getState()['features/base/jwt'];
 
             user && _undoOverwriteLocalParticipant(store, user);
         }

react/features/base/label/components/native/ExpandedLabel.tsx

@@ -48,7 +48,7 @@ export default abstract class ExpandedLabel<P extends IProps> extends Component<
      *
      * @inheritdoc
      */
-    override componentDidMount() {
+    componentDidMount() {
         Animated.decay(this.state.opacityAnimation, {
             toValue: 1,
             velocity: 1,
@@ -61,7 +61,7 @@ export default abstract class ExpandedLabel<P extends IProps> extends Component<
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         return (
             <Animated.View
                 style = { [ styles.expandedLabelContainer,

react/features/base/label/components/native/Label.tsx

@@ -89,7 +89,7 @@ export default class Label extends Component<IProps, State> {
      *
      * @inheritdoc
      */
-    override componentDidMount() {
+    componentDidMount() {
         this._maybeToggleAnimation({}, this.props);
     }
 
@@ -98,7 +98,7 @@ export default class Label extends Component<IProps, State> {
      *
      * @inheritdoc
      */
-    override componentDidUpdate(prevProps: IProps) {
+    componentDidUpdate(prevProps: IProps) {
         this._maybeToggleAnimation(prevProps, this.props);
     }
 
@@ -107,7 +107,7 @@ export default class Label extends Component<IProps, State> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const { icon, text, status, style, iconColor, textStyle } = this.props;
 
         let extraStyle = null;

react/features/base/logging/middleware.ts

@@ -165,6 +165,7 @@ function _initLogging({ dispatch, getState }: IStore,
         }
 
         Logger.addGlobalTransport(_logCollector);
+        JitsiMeetJS.addGlobalLogTransport(_logCollector);
         dispatch(setLogCollector(_logCollector));
 
         // The JitsiMeetInMemoryLogStorage can not be accessed on mobile through

react/features/base/media/components/AbstractVideoTrack.tsx

@@ -72,7 +72,7 @@ export default class AbstractVideoTrack<P extends IProps> extends Component<P> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const videoTrack = _falsy2null(this.props.videoTrack);
         let render;
 

react/features/base/media/components/native/Audio.ts

@@ -36,7 +36,7 @@ export default class Audio extends AbstractAudio {
      *
      * @inheritdoc
      */
-    override async componentDidUpdate(prevProps: IProps): Promise<void> {
+    async componentDidUpdate(prevProps: IProps): Promise<void> {
         // source is different !! call didunmount and call didmount
         if (prevProps.src !== this.props.src) {
             await this.componentWillUnmount();
@@ -49,7 +49,7 @@ export default class Audio extends AbstractAudio {
      *
      * @returns {void}
      */
-    override async componentDidMount() {
+    async componentDidMount() {
         this._sound
             = this.props.src
                 ? new Sound(
@@ -63,7 +63,7 @@ export default class Audio extends AbstractAudio {
      *
      * @returns {void}
      */
-    override async componentWillUnmount() {
+    async componentWillUnmount() {
         if (this._sound) {
             this._sound.release();
             this._sound = null;
@@ -94,7 +94,7 @@ export default class Audio extends AbstractAudio {
      * @inheritdoc
      * @returns {null}
      */
-    override render() {
+    render() {
         // TODO react-native-webrtc's RTCView doesn't do anything with the audio
         // MediaStream specified to it so it's easier at the time of this
         // writing to not render anything.

react/features/base/media/components/native/Video.tsx

@@ -64,7 +64,7 @@ export default class Video extends Component<IProps> {
      *
      * @inheritdoc
      */
-    override componentDidMount() {
+    componentDidMount() {
         // RTCView currently does not support media events, so just fire
         // onPlaying callback when <RTCView> is rendered.
         const { onPlaying } = this.props;
@@ -78,7 +78,7 @@ export default class Video extends Component<IProps> {
      * @inheritdoc
      * @returns {ReactElement|null}
      */
-    override render() {
+    render() {
         const { onPress, stream, zoomEnabled } = this.props;
 
         if (stream) {

react/features/base/media/components/native/VideoTrack.tsx

@@ -18,7 +18,7 @@ class VideoTrack extends AbstractVideoTrack<IProps> {
      * @override
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         return (
             <View style = { styles.video } >
                 { super.render() }

react/features/base/media/components/native/VideoTransform.tsx

@@ -197,7 +197,7 @@ class VideoTransform extends Component<IProps, IState> {
      *
      * @inheritdoc
      */
-    override componentDidUpdate(prevProps: IProps, prevState: IState) {
+    componentDidUpdate(prevProps: IProps, prevState: IState) {
         if (prevProps.streamId !== this.props.streamId) {
             this._storeTransform(prevProps.streamId, prevState.transform);
             this._restoreTransform(this.props.streamId);
@@ -209,7 +209,7 @@ class VideoTransform extends Component<IProps, IState> {
      *
      * @inheritdoc
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         this._storeTransform(this.props.streamId, this.state.transform);
     }
 
@@ -218,7 +218,7 @@ class VideoTransform extends Component<IProps, IState> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const { _aspectRatio, children, style } = this.props;
         const isAspectRatioWide = _aspectRatio === ASPECT_RATIO_WIDE;
 

react/features/base/media/components/web/Audio.tsx

@@ -37,7 +37,7 @@ export default class Audio extends AbstractAudio {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         return (
             <audio
                 loop = { Boolean(this.props.loop) }
@@ -53,7 +53,7 @@ export default class Audio extends AbstractAudio {
      *
      * @returns {void}
      */
-    override stop() {
+    stop() {
         if (this._ref) {
             this._ref.pause();
             this._ref.currentTime = 0;

react/features/base/media/components/web/AudioTrack.tsx

@@ -91,7 +91,7 @@ class AudioTrack extends Component<IProps> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentDidMount() {
+    componentDidMount() {
         this._attachTrack(this.props.audioTrack);
 
         if (this._ref?.current) {
@@ -120,7 +120,7 @@ class AudioTrack extends Component<IProps> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         this._detachTrack(this.props.audioTrack);
 
         // @ts-ignore
@@ -135,7 +135,7 @@ class AudioTrack extends Component<IProps> {
      * @returns {boolean} - False is always returned to blackbox this component
      * from React.
      */
-    override shouldComponentUpdate(nextProps: IProps) {
+    shouldComponentUpdate(nextProps: IProps) {
         const currentJitsiTrack = this.props.audioTrack?.jitsiTrack;
         const nextJitsiTrack = nextProps.audioTrack?.jitsiTrack;
 
@@ -175,7 +175,7 @@ class AudioTrack extends Component<IProps> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { autoPlay, id } = this.props;
 
         return (

react/features/base/media/components/web/Video.tsx

@@ -220,7 +220,7 @@ class Video extends Component<IProps> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentDidMount() {
+    componentDidMount() {
         this._mounted = true;
 
         if (this._videoElement) {
@@ -254,7 +254,7 @@ class Video extends Component<IProps> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         this._mounted = false;
         this._detachTrack(this.props.videoTrack);
     }
@@ -268,7 +268,7 @@ class Video extends Component<IProps> {
      * @returns {boolean} - False is always returned to blackbox this component
      * from React.
      */
-    override shouldComponentUpdate(nextProps: IProps) {
+    shouldComponentUpdate(nextProps: IProps) {
         const currentJitsiTrack = this.props.videoTrack?.jitsiTrack;
         const nextJitsiTrack = nextProps.videoTrack?.jitsiTrack;
 
@@ -295,7 +295,7 @@ class Video extends Component<IProps> {
      * @override
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const {
             autoPlay,
             className,

react/features/base/media/components/web/VideoTrack.tsx

@@ -150,7 +150,7 @@ class VideoTrack extends AbstractVideoTrack<IProps> {
      * @override
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const {
             _noAutoPlayVideo,
             className,

react/features/base/participants/components/ParticipantView.native.tsx

@@ -168,7 +168,7 @@ class ParticipantView extends Component<IProps> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const {
             _isConnectionInactive,
             _isSharedVideoParticipant,

react/features/base/participants/middleware.ts

@@ -30,7 +30,6 @@ import { MEDIA_TYPE } from '../media/constants';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
 import StateListenerRegistry from '../redux/StateListenerRegistry';
 import { playSound, registerSound, unregisterSound } from '../sounds/actions';
-import { isImageDataURL } from '../util/uri';
 
 import {
     DOMINANT_SPEAKER_CHANGED,
@@ -690,20 +689,15 @@ function _participantJoinedOrUpdated(store: IStore, next: Function, action: AnyA
     // even if disableThirdPartyRequests is set to true in config
     if (getState()['features/base/config']?.hosts) {
         const { disableThirdPartyRequests } = getState()['features/base/config'];
-        const participantId = !id && local ? getLocalParticipant(getState())?.id : id;
 
-        if (avatarURL || email || id || name) {
-            if (!disableThirdPartyRequests) {
-                const updatedParticipant = getParticipantById(getState(), participantId);
+        if (!disableThirdPartyRequests && (avatarURL || email || id || name)) {
+            const participantId = !id && local ? getLocalParticipant(getState())?.id : id;
+            const updatedParticipant = getParticipantById(getState(), participantId);
 
-                getFirstLoadableAvatarUrl(updatedParticipant ?? { id: '' }, store)
-                    .then((urlData?: { isUsingCORS: boolean; src: string; }) => {
-                        dispatch(setLoadableAvatarUrl(
-                            participantId, urlData?.src ?? '', Boolean(urlData?.isUsingCORS)));
-                    });
-            } else if (isImageDataURL(avatarURL)) {
-                dispatch(setLoadableAvatarUrl(participantId, avatarURL, false));
-            }
+            getFirstLoadableAvatarUrl(updatedParticipant ?? { id: '' }, store)
+                .then((urlData?: { isUsingCORS: boolean; src: string; }) => {
+                    dispatch(setLoadableAvatarUrl(participantId, urlData?.src ?? '', Boolean(urlData?.isUsingCORS)));
+                });
         }
     }
 

react/features/base/popover/components/Popover.web.tsx

@@ -184,7 +184,7 @@ class Popover extends Component<IProps, IState> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentDidMount() {
+    componentDidMount() {
         window.addEventListener('touchstart', this._onTouchStart);
         if (this.props.trigger === 'click') {
             // @ts-ignore
@@ -198,7 +198,7 @@ class Popover extends Component<IProps, IState> {
      * @inheritdoc
      * @returns {void}
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         window.removeEventListener('touchstart', this._onTouchStart);
         if (this.props.trigger === 'click') {
             // @ts-ignore
@@ -224,7 +224,7 @@ class Popover extends Component<IProps, IState> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { children,
             className,
             content,

react/features/base/react/components/native/AvatarListItem.tsx

@@ -86,7 +86,7 @@ export default class AvatarListItem extends Component<IProps> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const {
             avatarOnly,
             avatarSize = AVATAR_SIZE,

react/features/base/react/components/native/BaseIndicator.tsx

@@ -40,7 +40,7 @@ export default class BaseIndicator extends Component<IProps> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const { icon, iconStyle } = this.props;
 
         return (

react/features/base/react/components/native/Container.tsx

@@ -33,7 +33,7 @@ export default class Container extends AbstractContainer<IProps> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const {
             accessibilityLabel,
             accessible,

react/features/base/react/components/native/Image.tsx

@@ -29,7 +29,7 @@ export default class ImageImpl extends Component<IProps> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         return (
             <Image
                 source = { this.props.src }

react/features/base/react/components/native/Link.tsx

@@ -52,7 +52,7 @@ export default class Link extends Component<IProps> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         return (
             <Text
                 onPress = { this._onPress }

react/features/base/react/components/native/Linkify.tsx

@@ -45,7 +45,7 @@ export default class Linkify extends Component<IProps> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         return (
             <ReactLinkify
                 componentDecorator = { this._componentDecorator }>

react/features/base/react/components/native/LoadingIndicator.tsx

@@ -31,7 +31,7 @@ export default class LoadingIndicator extends PureComponent<IProps> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { color = ColorPalette.white } = this.props;
         let { size = 'large' } = this.props;
 

react/features/base/react/components/native/Modal.tsx

@@ -12,7 +12,7 @@ export default class Modal extends PureComponent {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         // eslint-disable-next-line react/prop-types
         const { children, ...props } = this.props;
 

react/features/base/react/components/native/NavigateSectionList.tsx

@@ -95,7 +95,7 @@ class NavigateSectionList extends Component<IProps> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const {
             renderListEmptyComponent = this._renderListEmptyComponent(),
             sections

react/features/base/react/components/native/NavigateSectionListEmptyComponent.tsx

@@ -21,7 +21,7 @@ class NavigateSectionListEmptyComponent extends Component<WithTranslation> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { t } = this.props;
 
         return (

react/features/base/react/components/native/NavigateSectionListItem.tsx

@@ -108,7 +108,7 @@ export default class NavigateSectionListItem extends Component<IProps> {
      *
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { item, onLongPress, onPress, secondaryAction } = this.props;
 
         return (

react/features/base/react/components/native/NavigateSectionListSectionHeader.tsx

@@ -27,7 +27,7 @@ export default class NavigateSectionListSectionHeader extends Component<IProps>
      *
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { section } = this.props.section;
 
         return (

react/features/base/react/components/native/Pressable.tsx

@@ -26,7 +26,7 @@ export default class Pressable extends Component<IProps> {
      * @inheritdoc
      * @returns {React$Node}
      */
-    override render() {
+    render() {
         // onPress
         const { children, onPress } = this.props;
 

react/features/base/react/components/native/SectionList.tsx

@@ -73,7 +73,7 @@ export default class SectionList extends Component<IProps> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         return (
             <SafeAreaView
                 style = { styles.container as ViewStyle } >

react/features/base/react/components/native/SlidingView.tsx

@@ -119,7 +119,7 @@ export default class SlidingView extends PureComponent<IProps, IState> {
      *
      * @inheritdoc
      */
-    override componentDidMount() {
+    componentDidMount() {
         BackHandler.addEventListener('hardwareBackPress', this._onHardwareBackPress);
 
         this._mounted = true;
@@ -131,7 +131,7 @@ export default class SlidingView extends PureComponent<IProps, IState> {
      *
      * @inheritdoc
      */
-    override componentDidUpdate(prevProps: IProps) {
+    componentDidUpdate(prevProps: IProps) {
         const { show } = this.props;
 
         if (prevProps.show !== show) {
@@ -144,7 +144,7 @@ export default class SlidingView extends PureComponent<IProps, IState> {
      *
      * @inheritdoc
      */
-    override componentWillUnmount() {
+    componentWillUnmount() {
         BackHandler.removeEventListener('hardwareBackPress', this._onHardwareBackPress);
 
         this._mounted = false;
@@ -155,7 +155,7 @@ export default class SlidingView extends PureComponent<IProps, IState> {
      *
      * @inheritdoc
      */
-    override render() {
+    render() {
         const { showOverlay } = this.state;
 
         if (!showOverlay) {

react/features/base/react/components/native/TintedView.tsx

@@ -39,7 +39,7 @@ export default class TintedView extends Component<IProps> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { children, style } = this.props;
 
         // XXX Don't tint the children, tint the background only.

react/features/base/react/components/web/Container.ts

@@ -12,7 +12,7 @@ export default class Container<P extends IProps> extends AbstractContainer<P> {
      * @inheritdoc
      * @returns {ReactElement}
      */
-    override render() {
+    render() {
         const { visible = true } = this.props;
 
         return visible ? super._render('div') : null;