fix(trackOpQueue):setEffect &_turnScreenSharingOff

Use JitsiPortal on mobile

.devcontainer/devcontainer.json

@@ -0,0 +1,15 @@
+{
+  "name": "Jitsi Meet Dev Container",
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "16"
+    }
+  },
+  "hostRequirements": {
+    "cpus": 4,
+    "memory": "8gb",
+    "storage": "32gb" 
+  },
+  "postCreateCommand": "bash -i -c 'nvm use && npm install && cp tsconfig.web.json tsconfig.json'"
+}

android/app/build.gradle

@@ -76,7 +76,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
 

android/build.gradle

@@ -1,5 +1,4 @@
 import groovy.json.JsonSlurper
-import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.util.VersionNumber
 
 // Top-level build file where you can add configuration options common to all
@@ -12,16 +11,16 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.4'
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
+        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
     }
 }
 
 ext {
     buildToolsVersion = "31.0.0"
-    compileSdkVersion = 31
+    compileSdkVersion = 32
     minSdkVersion    = 23
-    targetSdkVersion = 31
+    targetSdkVersion = 32
     supportLibVersion = "28.0.0"
 
     if (System.properties['os.arch'] == "aarch64") {

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

@@ -42,10 +42,10 @@ public class WebRTCVideoDecoderFactory implements VideoDecoderFactory {
     public VideoCodecInfo[] getSupportedCodecs() {
         List<VideoCodecInfo> codecs = new ArrayList<>();
 
+        codecs.add(H264Utils.DEFAULT_H264_BASELINE_PROFILE_CODEC);
         codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP8.name(), new HashMap<>()));
         codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP9.name(), new HashMap<>()));
         codecs.add(new VideoCodecInfo(VideoCodecMimeType.AV1.name(), new HashMap<>()));
-        codecs.add(H264Utils.DEFAULT_H264_BASELINE_PROFILE_CODEC);
 
         return codecs.toArray(new VideoCodecInfo[codecs.size()]);
     }

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

@@ -43,10 +43,10 @@ public class WebRTCVideoEncoderFactory implements VideoEncoderFactory {
     public VideoCodecInfo[] getSupportedCodecs() {
         List<VideoCodecInfo> codecs = new ArrayList<>();
 
+        codecs.add(H264Utils.DEFAULT_H264_BASELINE_PROFILE_CODEC);
         codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP8.name(), new HashMap<>()));
         codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP9.name(), new HashMap<>()));
         codecs.add(new VideoCodecInfo(VideoCodecMimeType.AV1.name(), new HashMap<>()));
-        codecs.add(H264Utils.DEFAULT_H264_BASELINE_PROFILE_CODEC);
 
         return codecs.toArray(new VideoCodecInfo[codecs.size()]);
     }

css/_polls.scss

@@ -121,13 +121,6 @@ ol.poll-result-list {
     display: flex;
 }
 
-.poll-dragged {
-    opacity: 0.5;
-    * {
-        cursor: grabbing !important;
-    }
-}
-
 .poll-question {
     font-size: 16px;
     font-weight: 600;

globals.d.ts

@@ -13,6 +13,8 @@ declare global {
         keyboardshortcut: {
             registerShortcut: Function;
             unregisterShortcut: Function;
+            openDialog: Function;
+            enable: Function;
         }
     };
     const interfaceConfig: any;

globals.native.d.ts

@@ -23,6 +23,8 @@ interface IWindow {
     onerror: (event: string, source: any, lineno: any, colno: any, e: Error) => void;
     onunhandledrejection: (event: any) => void;
 
+    setInterval: typeof setInterval;
+    clearInterval: typeof clearInterval;
     setTimeout: typeof setTimeout;
     clearTimeout: typeof clearTimeout;
     setImmediate: typeof setImmediate;

ios/Podfile.lock

@@ -13,14 +13,14 @@ PODS:
     - CocoaLumberjack/Core (= 3.7.2)
   - CocoaLumberjack/Core (3.7.2)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.68.4)
-  - FBReactNativeSpec (0.68.4):
+  - FBLazyVector (0.68.5)
+  - FBReactNativeSpec (0.68.5):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.68.4)
-    - RCTTypeSafety (= 0.68.4)
-    - React-Core (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - ReactCommon/turbomodule/core (= 0.68.4)
+    - RCTRequired (= 0.68.5)
+    - RCTTypeSafety (= 0.68.5)
+    - React-Core (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - ReactCommon/turbomodule/core (= 0.68.5)
   - Firebase/Analytics (8.15.0):
     - Firebase/Core
   - Firebase/Core (8.15.0):
@@ -163,201 +163,201 @@ PODS:
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
-  - RCTRequired (0.68.4)
-  - RCTTypeSafety (0.68.4):
-    - FBLazyVector (= 0.68.4)
+  - RCTRequired (0.68.5)
+  - RCTTypeSafety (0.68.5):
+    - FBLazyVector (= 0.68.5)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.68.4)
-    - React-Core (= 0.68.4)
-  - React (0.68.4):
-    - React-Core (= 0.68.4)
-    - React-Core/DevSupport (= 0.68.4)
-    - React-Core/RCTWebSocket (= 0.68.4)
-    - React-RCTActionSheet (= 0.68.4)
-    - React-RCTAnimation (= 0.68.4)
-    - React-RCTBlob (= 0.68.4)
-    - React-RCTImage (= 0.68.4)
-    - React-RCTLinking (= 0.68.4)
-    - React-RCTNetwork (= 0.68.4)
-    - React-RCTSettings (= 0.68.4)
-    - React-RCTText (= 0.68.4)
-    - React-RCTVibration (= 0.68.4)
-  - React-callinvoker (0.68.4)
-  - React-Codegen (0.68.4):
-    - FBReactNativeSpec (= 0.68.4)
+    - RCTRequired (= 0.68.5)
+    - React-Core (= 0.68.5)
+  - React (0.68.5):
+    - React-Core (= 0.68.5)
+    - React-Core/DevSupport (= 0.68.5)
+    - React-Core/RCTWebSocket (= 0.68.5)
+    - React-RCTActionSheet (= 0.68.5)
+    - React-RCTAnimation (= 0.68.5)
+    - React-RCTBlob (= 0.68.5)
+    - React-RCTImage (= 0.68.5)
+    - React-RCTLinking (= 0.68.5)
+    - React-RCTNetwork (= 0.68.5)
+    - React-RCTSettings (= 0.68.5)
+    - React-RCTText (= 0.68.5)
+    - React-RCTVibration (= 0.68.5)
+  - React-callinvoker (0.68.5)
+  - React-Codegen (0.68.5):
+    - FBReactNativeSpec (= 0.68.5)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.68.4)
-    - RCTTypeSafety (= 0.68.4)
-    - React-Core (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - ReactCommon/turbomodule/core (= 0.68.4)
-  - React-Core (0.68.4):
+    - RCTRequired (= 0.68.5)
+    - RCTTypeSafety (= 0.68.5)
+    - React-Core (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - ReactCommon/turbomodule/core (= 0.68.5)
+  - React-Core (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.68.4)
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-Core/Default (= 0.68.5)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.68.4):
+  - React-Core/CoreModulesHeaders (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/Default (0.68.4):
+  - React-Core/Default (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/DevSupport (0.68.4):
+  - React-Core/DevSupport (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.68.4)
-    - React-Core/RCTWebSocket (= 0.68.4)
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-jsinspector (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-Core/Default (= 0.68.5)
+    - React-Core/RCTWebSocket (= 0.68.5)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-jsinspector (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.68.4):
+  - React-Core/RCTActionSheetHeaders (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.68.4):
+  - React-Core/RCTAnimationHeaders (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.68.4):
+  - React-Core/RCTBlobHeaders (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/RCTImageHeaders (0.68.4):
+  - React-Core/RCTImageHeaders (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.68.4):
+  - React-Core/RCTLinkingHeaders (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.68.4):
+  - React-Core/RCTNetworkHeaders (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.68.4):
+  - React-Core/RCTSettingsHeaders (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/RCTTextHeaders (0.68.4):
+  - React-Core/RCTTextHeaders (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.68.4):
+  - React-Core/RCTVibrationHeaders (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-Core/RCTWebSocket (0.68.4):
+  - React-Core/RCTWebSocket (0.68.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.68.4)
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsiexecutor (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-Core/Default (= 0.68.5)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsiexecutor (= 0.68.5)
+    - React-perflogger (= 0.68.5)
     - Yoga
-  - React-CoreModules (0.68.4):
+  - React-CoreModules (0.68.5):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.4)
-    - React-Codegen (= 0.68.4)
-    - React-Core/CoreModulesHeaders (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-RCTImage (= 0.68.4)
-    - ReactCommon/turbomodule/core (= 0.68.4)
-  - React-cxxreact (0.68.4):
+    - RCTTypeSafety (= 0.68.5)
+    - React-Codegen (= 0.68.5)
+    - React-Core/CoreModulesHeaders (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-RCTImage (= 0.68.5)
+    - ReactCommon/turbomodule/core (= 0.68.5)
+  - React-cxxreact (0.68.5):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-jsinspector (= 0.68.4)
-    - React-logger (= 0.68.4)
-    - React-perflogger (= 0.68.4)
-    - React-runtimeexecutor (= 0.68.4)
-  - React-jsi (0.68.4):
+    - React-callinvoker (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-jsinspector (= 0.68.5)
+    - React-logger (= 0.68.5)
+    - React-perflogger (= 0.68.5)
+    - React-runtimeexecutor (= 0.68.5)
+  - React-jsi (0.68.5):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi/Default (= 0.68.4)
-  - React-jsi/Default (0.68.4):
+    - React-jsi/Default (= 0.68.5)
+  - React-jsi/Default (0.68.5):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-  - React-jsiexecutor (0.68.4):
+  - React-jsiexecutor (0.68.5):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-perflogger (= 0.68.4)
-  - React-jsinspector (0.68.4)
-  - React-logger (0.68.4):
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-perflogger (= 0.68.5)
+  - React-jsinspector (0.68.5)
+  - React-logger (0.68.5):
     - glog
   - react-native-background-timer (2.4.1):
     - React-Core
@@ -390,71 +390,71 @@ PODS:
     - React-Core
   - react-native-webview (11.15.1):
     - React-Core
-  - React-perflogger (0.68.4)
-  - React-RCTActionSheet (0.68.4):
-    - React-Core/RCTActionSheetHeaders (= 0.68.4)
-  - React-RCTAnimation (0.68.4):
+  - React-perflogger (0.68.5)
+  - React-RCTActionSheet (0.68.5):
+    - React-Core/RCTActionSheetHeaders (= 0.68.5)
+  - React-RCTAnimation (0.68.5):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.4)
-    - React-Codegen (= 0.68.4)
-    - React-Core/RCTAnimationHeaders (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - ReactCommon/turbomodule/core (= 0.68.4)
-  - React-RCTBlob (0.68.4):
+    - RCTTypeSafety (= 0.68.5)
+    - React-Codegen (= 0.68.5)
+    - React-Core/RCTAnimationHeaders (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - ReactCommon/turbomodule/core (= 0.68.5)
+  - React-RCTBlob (0.68.5):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.68.4)
-    - React-Core/RCTBlobHeaders (= 0.68.4)
-    - React-Core/RCTWebSocket (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-RCTNetwork (= 0.68.4)
-    - ReactCommon/turbomodule/core (= 0.68.4)
-  - React-RCTImage (0.68.4):
+    - React-Codegen (= 0.68.5)
+    - React-Core/RCTBlobHeaders (= 0.68.5)
+    - React-Core/RCTWebSocket (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-RCTNetwork (= 0.68.5)
+    - ReactCommon/turbomodule/core (= 0.68.5)
+  - React-RCTImage (0.68.5):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.4)
-    - React-Codegen (= 0.68.4)
-    - React-Core/RCTImageHeaders (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-RCTNetwork (= 0.68.4)
-    - ReactCommon/turbomodule/core (= 0.68.4)
-  - React-RCTLinking (0.68.4):
-    - React-Codegen (= 0.68.4)
-    - React-Core/RCTLinkingHeaders (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - ReactCommon/turbomodule/core (= 0.68.4)
-  - React-RCTNetwork (0.68.4):
+    - RCTTypeSafety (= 0.68.5)
+    - React-Codegen (= 0.68.5)
+    - React-Core/RCTImageHeaders (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-RCTNetwork (= 0.68.5)
+    - ReactCommon/turbomodule/core (= 0.68.5)
+  - React-RCTLinking (0.68.5):
+    - React-Codegen (= 0.68.5)
+    - React-Core/RCTLinkingHeaders (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - ReactCommon/turbomodule/core (= 0.68.5)
+  - React-RCTNetwork (0.68.5):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.4)
-    - React-Codegen (= 0.68.4)
-    - React-Core/RCTNetworkHeaders (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - ReactCommon/turbomodule/core (= 0.68.4)
-  - React-RCTSettings (0.68.4):
+    - RCTTypeSafety (= 0.68.5)
+    - React-Codegen (= 0.68.5)
+    - React-Core/RCTNetworkHeaders (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - ReactCommon/turbomodule/core (= 0.68.5)
+  - React-RCTSettings (0.68.5):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.4)
-    - React-Codegen (= 0.68.4)
-    - React-Core/RCTSettingsHeaders (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - ReactCommon/turbomodule/core (= 0.68.4)
-  - React-RCTText (0.68.4):
-    - React-Core/RCTTextHeaders (= 0.68.4)
-  - React-RCTVibration (0.68.4):
+    - RCTTypeSafety (= 0.68.5)
+    - React-Codegen (= 0.68.5)
+    - React-Core/RCTSettingsHeaders (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - ReactCommon/turbomodule/core (= 0.68.5)
+  - React-RCTText (0.68.5):
+    - React-Core/RCTTextHeaders (= 0.68.5)
+  - React-RCTVibration (0.68.5):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.68.4)
-    - React-Core/RCTVibrationHeaders (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - ReactCommon/turbomodule/core (= 0.68.4)
-  - React-runtimeexecutor (0.68.4):
-    - React-jsi (= 0.68.4)
-  - ReactCommon/turbomodule/core (0.68.4):
+    - React-Codegen (= 0.68.5)
+    - React-Core/RCTVibrationHeaders (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - ReactCommon/turbomodule/core (= 0.68.5)
+  - React-runtimeexecutor (0.68.5):
+    - React-jsi (= 0.68.5)
+  - ReactCommon/turbomodule/core (0.68.5):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.68.4)
-    - React-Core (= 0.68.4)
-    - React-cxxreact (= 0.68.4)
-    - React-jsi (= 0.68.4)
-    - React-logger (= 0.68.4)
-    - React-perflogger (= 0.68.4)
+    - React-callinvoker (= 0.68.5)
+    - React-Core (= 0.68.5)
+    - React-cxxreact (= 0.68.5)
+    - React-jsi (= 0.68.5)
+    - React-logger (= 0.68.5)
+    - React-perflogger (= 0.68.5)
   - RNCalendarEvents (2.2.0):
     - React
   - RNCAsyncStorage (1.17.3):
@@ -706,8 +706,8 @@ SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
   DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
-  FBLazyVector: 023a2028f218d648b588348bfa9261b4914b93db
-  FBReactNativeSpec: 9f4902cc009389d3704ff75de2aa513dee34d5c2
+  FBLazyVector: 2b47ff52037bd9ae07cc9b051c9975797814b736
+  FBReactNativeSpec: 0e0d384ef17a33b385f13f0c7f97702c7cd17858
   Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
   FirebaseAnalytics: 7761cbadb00a717d8d0939363eb46041526474fa
   FirebaseCore: 5743c5785c074a794d35f2fff7ecc254a91e08b1
@@ -732,18 +732,18 @@ SPEC CHECKSUMS:
   PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
   PromisesSwift: 99fddfe4a0ec88a56486644c0da106694c92a604
   RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
-  RCTRequired: e6003505912d056f21f64465063cf4b79418f2b9
-  RCTTypeSafety: d7ef4745c8d9c9faa65c26b4b6230fc5cd4c4424
-  React: 6692c30fb74ab29078b25c31c9841d863e08cdd9
-  React-callinvoker: fe2b234fa518d8bb7600707c536ab0a3e1f5edba
-  React-Codegen: 9964bb2422c7014894182ac50068caae05f68551
-  React-Core: a07bcd2f15ff93cddc9ceb07eddeec3d2ff8d990
-  React-CoreModules: 7fb4ee0fc35ad2b7daf775f0ef6309efdd8d3d82
-  React-cxxreact: 51a8058a35a2f02ad4175334a7cd24aa5558ced4
-  React-jsi: 69b974b418d2658a3f1799903be7cbcb8ac59755
-  React-jsiexecutor: 4f35a29798ba9d0d892a84001d11f626688dbb8e
-  React-jsinspector: 6f75220cd4b6020976d340ab21c63458dd3cad9e
-  React-logger: 7013d2499df6346e6a72802d4084badaaa82543b
+  RCTRequired: 0f06b6068f530932d10e1a01a5352fad4eaacb74
+  RCTTypeSafety: b0ee81f10ef1b7d977605a2b266823dabd565e65
+  React: 3becd12bd51ea8a43bdde7e09d0f40fba7820e03
+  React-callinvoker: 11abfff50e6bf7a55b3a90b4dc2187f71f224593
+  React-Codegen: f8946ce0768fb8e92e092e30944489c4b2955b2d
+  React-Core: 203cdb6ee2657b198d97d41031c249161060e6ca
+  React-CoreModules: 6eb0c06a4a223fde2cb6a8d0f44f58b67e808942
+  React-cxxreact: afb0c6c07d19adbd850747fedeac20c6832d40b9
+  React-jsi: 14d37a6db2af2c1a49f6f5c2e4ee667c364ae45c
+  React-jsiexecutor: 45c0496ca8cef6b02d9fa0274c25cf458fe91a56
+  React-jsinspector: eb202e43b3879aba9a14f3f65788aec85d4e1ea9
+  React-logger: 98f663b292a60967ebbc6d803ae96c1381183b6d
   react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
   react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
   react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
@@ -757,18 +757,18 @@ SPEC CHECKSUMS:
   react-native-video: bb6f12a7198db53b261fefb5d609dc77417acc8b
   react-native-webrtc: 4a4c31be61f88d1d3356526eebce72f462a6760e
   react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
-  React-perflogger: 0b0500685176e53ea582c45179a653aa82e4ae49
-  React-RCTActionSheet: 38469be9d20242f9c717e43c2983e8e3e6c640c4
-  React-RCTAnimation: 93774f3e8857e7c3c1cbbd277056d02be4496be1
-  React-RCTBlob: 6d0567d7a6561b62feb8c3b1cc33b3c591ba85ab
-  React-RCTImage: 1006a91318a6181a0256b89d2e321b6ea0e2e6e3
-  React-RCTLinking: 0b2300493c879c3bcac2d4c6b0178e8d0e5e2202
-  React-RCTNetwork: b9a33a95703651abed92490e50396d54b7270a17
-  React-RCTSettings: e6464123e5b5062fc23bb5adb51188a6061e9601
-  React-RCTText: 188d6f0ae20cd28891f59ecad41028ee2f793757
-  React-RCTVibration: a67beb7d2f3c73e9b74c4124ef61b84c601be649
-  React-runtimeexecutor: 088723cf020113e64736a709f52719dbb359c73e
-  ReactCommon: 1a4f19f3b4366feec03a98bdbb200b6085c5000f
+  React-perflogger: 0458a87ea9a7342079e7a31b0d32b3734fb8415f
+  React-RCTActionSheet: 22538001ea2926dea001111dd2846c13a0730bc9
+  React-RCTAnimation: 732ce66878d4aa151d56a0d142b1105aa12fd313
+  React-RCTBlob: 9cb9e3e9a41d27be34aaf89b0e0f52c7ca415d57
+  React-RCTImage: 6bd16627eb9c4bb79903c4cdec7c551266ee1a5b
+  React-RCTLinking: e9edfc8919c8fa9a3f3c7b34362811f58a2ebba4
+  React-RCTNetwork: 880eccd21bbe2660a0b63da5ccba75c46eceeaa6
+  React-RCTSettings: 8c85d8188c97d6c6bd470af6631a6c4555b79bb3
+  React-RCTText: bbd275ee287730c5acbab1aadc0db39c25c5c64e
+  React-RCTVibration: 9819a3bf6230e4b2a99877c21268b0b2416157a1
+  React-runtimeexecutor: b1f1995089b90696dbc2a7ffe0059a80db5c8eb1
+  ReactCommon: 149e2c0acab9bac61378da0db5b2880a1b5ff59b
   RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3
   RNCAsyncStorage: 005c0e2f09575360f142d0d1f1f15e4ec575b1af
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
@@ -781,7 +781,7 @@ SPEC CHECKSUMS:
   RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
   RNSVG: f3b60aeeaa81960e2e0536c3a9eef50b667ef3a9
   RNWatch: dae6c858a2051dbdcfb00b9a86cf4d90400263b4
-  Yoga: c926c8eec5c78a788b51e6c8a604825d00d694d7
+  Yoga: c4d61225a466f250c35c1ee78d2d0b3d41fe661c
 
 PODFILE CHECKSUM: e671cdcdb80fab67e305861c36bfae8ed5a5b0ef
 

ios/app/Widgets Extension/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,11 +0,0 @@
-{
-  "colors" : [
-    {
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

ios/app/Widgets Extension/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,13 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

ios/app/Widgets Extension/Assets.xcassets/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

ios/app/Widgets Extension/Assets.xcassets/WidgetBackground.colorset/Contents.json

@@ -1,11 +0,0 @@
-{
-  "colors" : [
-    {
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

ios/app/Widgets Extension/Assets.xcassets/leave_meeting.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "end_call_button.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

ios/app/Widgets Extension/Assets.xcassets/microphone_off.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "microphone_off_button.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

ios/app/Widgets Extension/Assets.xcassets/microphone_on.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "microphone_on_button.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

ios/app/Widgets Extension/DarwinNotificationsObserver.swift

@@ -1,101 +0,0 @@
-//
-//  DarwinNotificationsObserver.swift
-//  WidgetsExtension
-//
-//  Created by Alex Bumbu on 17.10.2022.
-//
-
-import Foundation
-
-enum DarwinNotification: String {
-    case meetingMutedChanged = "iOS_MeetingMutedChanged"
-}
-
-extension DarwinNotification {
-    
-    var name: String { rawValue }
-}
-
-class DarwinNotificationsObserver {
-    
-    private static var observers = Array<ProxyObserver>()
-    
-    private let queue = DispatchQueue(label: "org.jitsi.meet.darwinNotificationObserver", qos: .default, autoreleaseFrequency: .workItem)
-    private var notificationCenter: CFNotificationCenter
-    
-    init() {
-        notificationCenter = CFNotificationCenterGetDarwinNotifyCenter()
-    }
-    
-    func observe(notification: DarwinNotification, handler: @escaping () -> Void) {
-        let proxyObserver = ProxyObserver(observer: self, notificationName: notification.name, handler: handler)
-        queue.async {
-            DarwinNotificationsObserver.observers.append(proxyObserver)
-        }
-        
-        let callback: CFNotificationCallback = { _, observer, name, _, _ in
-            guard let observer = observer else {
-                return
-            }
-            
-            // Extract pointer to `observer` from void pointer:
-            let proxyObserver = Unmanaged<ProxyObserver>.fromOpaque(observer).takeUnretainedValue()
-            var observers = DarwinNotificationsObserver.observers
-            if !proxyObserver.forwardNotification(), let index = observers.firstIndex(of: proxyObserver) {
-                // cleanup if `forwardNotification` fails
-                observers.remove(at: index)
-            }
-        }
-        
-        CFNotificationCenterAddObserver(notificationCenter,
-                                        Unmanaged.passUnretained(proxyObserver).toOpaque(),
-                                        callback,
-                                        notification.name as CFString,
-                                        nil,
-                                        .deliverImmediately)
-    }
-    
-    func stopObserving(notification: DarwinNotification) {
-        queue.sync {
-            DarwinNotificationsObserver.observers.removeAll { $0.observer == nil }
-        }
-        
-        if let index = DarwinNotificationsObserver.observers.firstIndex(where: { $0.observer === self && $0.notificationName == notification.name }) {
-            let proxyObserver = DarwinNotificationsObserver.observers[index]
-            CFNotificationCenterRemoveObserver(notificationCenter,
-                                               Unmanaged.passUnretained(proxyObserver).toOpaque(),
-                                               CFNotificationName(notification.name as CFString),
-                                               nil)
-            queue.async {
-                DarwinNotificationsObserver.observers.remove(at: index)
-            }
-        }
-    }
-}
-
-private class ProxyObserver: Equatable {
-    
-    let notificationName: String
-    weak var observer: AnyObject?
-    
-    private let handler: () -> (Void)
-    
-    static func == (lhs: ProxyObserver, rhs: ProxyObserver) -> Bool {
-        lhs.observer === rhs.observer && lhs.notificationName == rhs.notificationName
-    }
-    
-    init(observer: AnyObject? = nil, notificationName: String, handler: @escaping () -> Void) {
-        self.notificationName = notificationName
-        self.handler = handler
-        self.observer = observer
-    }
-    
-    func forwardNotification() -> Bool {
-        guard observer != nil else {
-            return false
-        }
-        
-        handler()
-        return true
-    }
-}

ios/app/Widgets Extension/Info.plist

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.widgetkit-extension</string>
-	</dict>
-</dict>
-</plist>

ios/app/Widgets Extension/LockScreenLeaveMeetingWidget.swift

@@ -1,54 +0,0 @@
-//
-//  LockScreenLeaveMeetingWidget.swift
-//  WidgetsExtension
-//
-//  Created by Alex Bumbu on 31.10.2022.
-//
-
-import SwiftUI
-import WidgetKit
-
-struct LockScreenLeaveMeetingWidget: Widget {
-    let kind: String = "LockScreenLeaveMeetingWidget"
-    
-    var body: some WidgetConfiguration {
-        StaticConfiguration(kind: kind, provider: Provider()) { entry in
-            WidgetsEntryView(entry: entry)
-        }
-        .configurationDisplayName("Leave Jitsi Meeting Widget")
-        .description("This is a lockscreen widget for leaving the ongoing Jitsi meeting.")
-        .supportedFamilies([.accessoryCircular])
-    }
-}
-
-//struct LockScreenLeaveMeetingWidget_Preview: PreviewProvider {
-//    static var previews: some View {
-//        let meetingState = MeetingState(audioMuted: true)
-//
-//        WidgetsEntryView(entry: CurrentMeetingEntry(date: Date(), meetingState: meetingState))
-//            .previewContext(WidgetPreviewContext(family: .accessoryCircular))
-//            .previewDisplayName("Circular")
-//    }
-//}
-
-private struct WidgetsEntryView: View {
-    @Environment(\.widgetFamily) var widgetFamily
-    var entry: Provider.Entry
-        
-    var body: some View {
-        if entry.meetingState != nil, widgetFamily == .accessoryCircular {
-            AccessoryCircularWidgetView()
-        } else {
-            EmptyView()
-        }
-    }
-}
-
-private struct AccessoryCircularWidgetView: View {
-    var body: some View {
-        Image("leave_meeting")
-            .resizable()
-            .aspectRatio(contentMode: .fit)
-            .widgetURL(URL(string: "meet/leaveMeeting")!)
-    }
-}

ios/app/Widgets Extension/LockScreenMuteAudioWidget.swift

@@ -1,89 +0,0 @@
-//
-//  LockScreenMuteAudioWidget.swift
-//  WidgetsExtension
-//
-//  Created by Alex Bumbu on 31.10.2022.
-//
-
-import SwiftUI
-import WidgetKit
-
-struct LockScreenMuteAudioWidget: Widget {
-    let kind: String = "LockScreenMuteAudioWidget"
-    
-    var body: some WidgetConfiguration {
-        StaticConfiguration(kind: kind, provider: Provider()) { entry in
-            WidgetsEntryView(entry: entry)
-        }
-        .configurationDisplayName("Mute Jitsi Audio Widget")
-        .description("This is a lockscreen widget for muting or unmuting the audio for the ongoing Jitsi meeting.")
-        .supportedFamilies([.accessoryCircular])
-    }
-}
-
-//struct LockScreenMuteAudioWidget_Preview: PreviewProvider {
-//    static var previews: some View {
-//        let meetingState = MeetingState(audioMuted: true)
-//        
-//        WidgetsEntryView(entry: CurrentMeetingEntry(date: Date(), meetingState: meetingState))
-//            .previewContext(WidgetPreviewContext(family: .accessoryInline))
-//            .previewDisplayName("Inline")
-//        
-//        WidgetsEntryView(entry: CurrentMeetingEntry(date: Date(), meetingState: meetingState))
-//            .previewContext(WidgetPreviewContext(family: .accessoryCircular))
-//            .previewDisplayName("Circular")
-//        
-//        WidgetsEntryView(entry: CurrentMeetingEntry(date: Date(), meetingState: meetingState))
-//            .previewContext(WidgetPreviewContext(family: .accessoryRectangular))
-//            .previewDisplayName("Rectangular")
-//    }
-//}
-
-private struct WidgetsEntryView: View {
-    @Environment(\.widgetFamily) var widgetFamily
-    var entry: Provider.Entry
-        
-    var body: some View {
-        if let meetingState = entry.meetingState {
-            switch widgetFamily {
-            case .accessoryInline:
-                Text("Some meeting name")
-            case .accessoryRectangular:
-                AccessoryCircularWidgetView(audioMuted: meetingState.audioMuted)
-            case .accessoryCircular:
-                AccessoryCircularWidgetView(audioMuted: meetingState.audioMuted)
-            default:
-                EmptyView()
-            }
-        } else {
-            EmptyView()
-        }
-    }
-}
-
-private struct AccessoryRectangularWidgetView: View {
-    var audioMuted: Bool
-    
-    var body: some View {
-        let imageName: String = audioMuted ? "microphone_on" : "microphone_off"
-        let caption: String = audioMuted ? "Unmute \naudio" : "Mute \naudio"
-        HStack {
-            Image(imageName)
-                .resizable()
-                .aspectRatio(contentMode: .fit)
-            Text(caption)
-        }.widgetURL(URL(string: "meet/toggleAudioMute")!)
-    }
-}
-
-private struct AccessoryCircularWidgetView: View {
-    var audioMuted: Bool
-    
-    var body: some View {
-        let imageName: String = audioMuted ? "microphone_on" : "microphone_off"
-        Image(imageName)
-            .resizable()
-            .aspectRatio(contentMode: .fit)
-            .widgetURL(URL(string: "meet/toggleAudioMute")!)
-    }
-}

ios/app/Widgets Extension/MeetingState.swift

@@ -1,30 +0,0 @@
-//
-//  MeetingState.swift
-//  WidgetsExtension
-//
-//  Created by Alex Bumbu on 28.10.2022.
-//
-
-import Foundation
-
-struct MeetingState: Decodable {
-    var audioMuted: Bool
-}
-
-extension MeetingState {
-    private static var stateFileURL: URL? {
-        return FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.org.jitsi.meet.appgroup")?.appending(component: "widgetState")
-    }
-        
-    static func load() -> MeetingState? {
-        guard
-            let stateFileURL = stateFileURL,
-            let data = try? Data(contentsOf: stateFileURL)
-        else {
-            return nil
-        }
-        
-        let decoder = PropertyListDecoder()
-        return try? decoder.decode(MeetingState.self, from: data)
-    }
-}

ios/app/Widgets Extension/Provider.swift

@@ -1,44 +0,0 @@
-//
-//  Provider.swift
-//  WidgetsExtension
-//
-//  Created by Alex Bumbu on 31.10.2022.
-//
-
-import WidgetKit
-import SwiftUI
-
-struct CurrentMeetingEntry: TimelineEntry {
-    let date: Date
-    var meetingState: MeetingState?
-}
-
-class Provider: TimelineProvider { 
-    private var currentMeetingState: MeetingState? {
-        return MeetingState.load()
-    }
-    
-    func placeholder(in context: Context) -> CurrentMeetingEntry {
-        CurrentMeetingEntry(date: Date(),
-                            meetingState: MeetingState(audioMuted: false))
-    }
-    
-    func getSnapshot(in context: Context, completion: @escaping (CurrentMeetingEntry) -> ()) {
-        var meetingState = currentMeetingState
-        if context.isPreview {
-            meetingState = MeetingState(audioMuted: false)
-        }
-        
-        let entry = CurrentMeetingEntry(date: Date(), meetingState: meetingState)
-        completion(entry)
-    }
-
-    func getTimeline(in context: Context, completion: @escaping (Timeline<CurrentMeetingEntry>) -> ()) {
-        var entries: [CurrentMeetingEntry] = []
-        let entry = CurrentMeetingEntry(date: Date(), meetingState: currentMeetingState)
-        entries.append(entry)
-        
-        let timeline = Timeline(entries: entries, policy: .atEnd)
-        completion(timeline)
-    }
-}

ios/app/Widgets Extension/Widgets.swift

@@ -1,19 +0,0 @@
-//
-//  Widgets.swift
-//  Widgets
-//
-//  Created by Alex Bumbu on 17.10.2022.
-//  Copyright © 2022 Facebook. All rights reserved.
-//
-
-import WidgetKit
-import SwiftUI
-
-@main
-struct Widgets: WidgetBundle {
-    @WidgetBundleBuilder
-    var body: some Widget {
-        LockScreenMuteAudioWidget()
-        LockScreenLeaveMeetingWidget()
-    }
-}

ios/app/WidgetsExtension.entitlements

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.org.jitsi.meet.appgroup</string>
-	</array>
-</dict>
-</plist>

ios/app/app.xcodeproj/project.pbxproj

@@ -23,26 +23,14 @@
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		4E46D952290FF39E00761DEF /* LockScreenMuteAudioWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E46D951290FF39E00761DEF /* LockScreenMuteAudioWidget.swift */; };
-		4E46D954290FF55600761DEF /* LockScreenLeaveMeetingWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E46D953290FF55600761DEF /* LockScreenLeaveMeetingWidget.swift */; };
-		4E6920B828FD84D700645D9E /* DarwinNotificationsObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E6920B728FD84D700645D9E /* DarwinNotificationsObserver.swift */; };
-		4E6A3E17291024B900E6B0B5 /* Provider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E6A3E16291024B900E6B0B5 /* Provider.swift */; };
+		2681BB562C7A0B42CFBA6719 /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */; };
 		4E90F9402632D1AB001102D4 /* Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E90F93F2632D1AB001102D4 /* Atomic.swift */; };
-		4EA73DA3290C1D6C00A16FF8 /* MeetingState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EA73DA2290C1D6C00A16FF8 /* MeetingState.swift */; };
 		4EB06024260E026600F524C5 /* ReplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EC49B8625BED71300E76218 /* ReplayKit.framework */; };
 		4EB06027260E026600F524C5 /* SampleHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB06026260E026600F524C5 /* SampleHandler.swift */; };
 		4EB0602B260E026600F524C5 /* JitsiMeetBroadcastExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		4EB0603C260E09D000F524C5 /* SocketConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB06039260E09D000F524C5 /* SocketConnection.swift */; };
 		4EB0603D260E09D000F524C5 /* DarwinNotificationCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603A260E09D000F524C5 /* DarwinNotificationCenter.swift */; };
 		4EB0603E260E09D000F524C5 /* SampleUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603B260E09D000F524C5 /* SampleUploader.swift */; };
-		4EBB458A28FFFD4100855769 /* RoutesHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EBB458928FFFD4100855769 /* RoutesHandler.m */; };
-		4EBB458E2902E85B00855769 /* WidgetKitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EBB458D2902E85B00855769 /* WidgetKitHelper.swift */; };
-		4ECA496628FD590000085365 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ECA496528FD590000085365 /* WidgetKit.framework */; };
-		4ECA496828FD590000085365 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ECA496728FD590000085365 /* SwiftUI.framework */; };
-		4ECA496B28FD590000085365 /* Widgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4ECA496A28FD590000085365 /* Widgets.swift */; };
-		4ECA496D28FD590000085365 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4ECA496C28FD590000085365 /* Assets.xcassets */; };
-		4ECA497128FD590000085365 /* WidgetsExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 4ECA496428FD590000085365 /* WidgetsExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		C2116A7673E01A1CCD5DC1F4 /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BF9FEBA4DEAB800AD735681 /* libPods-JitsiMeet.a */; };
 		DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */; };
 		DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; };
 		DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -76,13 +64,6 @@
 			remoteGlobalIDString = 4EB06022260E026600F524C5;
 			remoteInfo = "JitsiMeetBroadcast Extension";
 		};
-		4ECA496F28FD590000085365 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 4ECA496328FD590000085365;
-			remoteInfo = WidgetsExtension;
-		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -127,7 +108,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
-				4ECA497128FD590000085365 /* WidgetsExtension.appex in Embed App Extensions */,
 				4EB0602B260E026600F524C5 /* JitsiMeetBroadcastExtension.appex in Embed App Extensions */,
 			);
 			name = "Embed App Extensions";
@@ -154,7 +134,6 @@
 		0BEA5C3A1F7B8F73000D0AB4 /* ComplicationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComplicationController.swift; sourceTree = "<group>"; };
 		0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		0BEA5C3E1F7B8F73000D0AB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		0BF9FEBA4DEAB800AD735681 /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07F961A680F5B00A75B9A /* jitsi-meet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "jitsi-meet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -162,12 +141,8 @@
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		4E46D951290FF39E00761DEF /* LockScreenMuteAudioWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockScreenMuteAudioWidget.swift; sourceTree = "<group>"; };
-		4E46D953290FF55600761DEF /* LockScreenLeaveMeetingWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockScreenLeaveMeetingWidget.swift; sourceTree = "<group>"; };
-		4E6920B728FD84D700645D9E /* DarwinNotificationsObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DarwinNotificationsObserver.swift; sourceTree = "<group>"; };
-		4E6A3E16291024B900E6B0B5 /* Provider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Provider.swift; sourceTree = "<group>"; };
+		3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
 		4E90F93F2632D1AB001102D4 /* Atomic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Atomic.swift; sourceTree = "<group>"; };
-		4EA73DA2290C1D6C00A16FF8 /* MeetingState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingState.swift; sourceTree = "<group>"; };
 		4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = JitsiMeetBroadcastExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		4EB06026260E026600F524C5 /* SampleHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleHandler.swift; sourceTree = "<group>"; };
 		4EB06028260E026600F524C5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -175,21 +150,10 @@
 		4EB06039260E09D000F524C5 /* SocketConnection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketConnection.swift; sourceTree = "<group>"; };
 		4EB0603A260E09D000F524C5 /* DarwinNotificationCenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DarwinNotificationCenter.swift; sourceTree = "<group>"; };
 		4EB0603B260E09D000F524C5 /* SampleUploader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SampleUploader.swift; sourceTree = "<group>"; };
-		4EBB458828FFFD4100855769 /* RoutesHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoutesHandler.h; sourceTree = "<group>"; };
-		4EBB458928FFFD4100855769 /* RoutesHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoutesHandler.m; sourceTree = "<group>"; };
-		4EBB458B2902A94700855769 /* WidgetsExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WidgetsExtension.entitlements; sourceTree = "<group>"; };
-		4EBB458C2902E85B00855769 /* JitsiMeet-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeet-Bridging-Header.h"; sourceTree = "<group>"; };
-		4EBB458D2902E85B00855769 /* WidgetKitHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetKitHelper.swift; sourceTree = "<group>"; };
 		4EC49B8625BED71300E76218 /* ReplayKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReplayKit.framework; path = System/Library/Frameworks/ReplayKit.framework; sourceTree = SDKROOT; };
-		4ECA496428FD590000085365 /* WidgetsExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetsExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
-		4ECA496528FD590000085365 /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
-		4ECA496728FD590000085365 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
-		4ECA496A28FD590000085365 /* Widgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Widgets.swift; sourceTree = "<group>"; };
-		4ECA496C28FD590000085365 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		4ECA496E28FD590000085365 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		7052390E12D7319D36D8E4CA /* 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>"; };
-		8CAA3C5A38E868335D1C1EC1 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; 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; };
 		DE050388256E904600DEE3A5 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/apple/WebRTC.xcframework"; sourceTree = "<group>"; };
 		DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRUtilities.m; sourceTree = "<group>"; };
 		DE4C456021DE1E4E00EA0709 /* FIRUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRUtilities.h; sourceTree = "<group>"; };
@@ -216,7 +180,7 @@
 				DED016F128ECBC9D009D5E8D /* WebRTC.xcframework in Frameworks */,
 				DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */,
 				FD572B9827EDF32300A800FB /* GiphyUISDK.xcframework in Frameworks */,
-				C2116A7673E01A1CCD5DC1F4 /* libPods-JitsiMeet.a in Frameworks */,
+				2681BB562C7A0B42CFBA6719 /* libPods-JitsiMeet.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -235,15 +199,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		4ECA496128FD590000085365 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4ECA496828FD590000085365 /* SwiftUI.framework in Frameworks */,
-				4ECA496628FD590000085365 /* WidgetKit.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -258,9 +213,7 @@
 				DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */,
 				0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */,
 				4EC49B8625BED71300E76218 /* ReplayKit.framework */,
-				4ECA496528FD590000085365 /* WidgetKit.framework */,
-				4ECA496728FD590000085365 /* SwiftUI.framework */,
-				0BF9FEBA4DEAB800AD735681 /* libPods-JitsiMeet.a */,
+				D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -308,10 +261,6 @@
 				0BBD021F212EB69D00CCB19F /* Types.h */,
 				0B412F1D1EDEE6E800B1A0A6 /* ViewController.h */,
 				0B412F1E1EDEE6E800B1A0A6 /* ViewController.m */,
-				4EBB458828FFFD4100855769 /* RoutesHandler.h */,
-				4EBB458928FFFD4100855769 /* RoutesHandler.m */,
-				4EBB458D2902E85B00855769 /* WidgetKitHelper.swift */,
-				4EBB458C2902E85B00855769 /* JitsiMeet-Bridging-Header.h */,
 			);
 			path = src;
 			sourceTree = "<group>";
@@ -333,25 +282,9 @@
 			sourceTree = "<group>";
 			tabWidth = 4;
 		};
-		4ECA496928FD590000085365 /* Widgets Extension */ = {
-			isa = PBXGroup;
-			children = (
-				4ECA496A28FD590000085365 /* Widgets.swift */,
-				4E46D951290FF39E00761DEF /* LockScreenMuteAudioWidget.swift */,
-				4E46D953290FF55600761DEF /* LockScreenLeaveMeetingWidget.swift */,
-				4E6A3E16291024B900E6B0B5 /* Provider.swift */,
-				4EA73DA2290C1D6C00A16FF8 /* MeetingState.swift */,
-				4E6920B728FD84D700645D9E /* DarwinNotificationsObserver.swift */,
-				4ECA496C28FD590000085365 /* Assets.xcassets */,
-				4ECA496E28FD590000085365 /* Info.plist */,
-			);
-			path = "Widgets Extension";
-			sourceTree = "<group>";
-		};
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
-				4EBB458B2902A94700855769 /* WidgetsExtension.entitlements */,
 				B3B083EB1D4955FF0069CEE7 /* app.entitlements */,
 				0B26BE711EC5BC4D00EEFB41 /* Frameworks */,
 				83CBBA001A601CBA00E9B192 /* Products */,
@@ -359,12 +292,11 @@
 				0BEA5C261F7B8F73000D0AB4 /* Watch app */,
 				0BEA5C351F7B8F73000D0AB4 /* WatchKit extension */,
 				4EB06025260E026600F524C5 /* JitsiMeetBroadcast Extension */,
-				4ECA496928FD590000085365 /* Widgets Extension */,
-				BD4E28FA984EA7018FD927DF /* Pods */,
+				CDD71F5E1157E9F283DF92A8 /* Pods */,
 			);
-			indentWidth = 4;
+			indentWidth = 2;
 			sourceTree = "<group>";
-			tabWidth = 4;
+			tabWidth = 2;
 		};
 		83CBBA001A601CBA00E9B192 /* Products */ = {
 			isa = PBXGroup;
@@ -373,16 +305,15 @@
 				0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */,
 				0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */,
 				4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */,
-				4ECA496428FD590000085365 /* WidgetsExtension.appex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		BD4E28FA984EA7018FD927DF /* Pods */ = {
+		CDD71F5E1157E9F283DF92A8 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				7052390E12D7319D36D8E4CA /* Pods-JitsiMeet.debug.xcconfig */,
-				8CAA3C5A38E868335D1C1EC1 /* Pods-JitsiMeet.release.xcconfig */,
+				756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */,
+				3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */,
 			);
 			name = Pods;
 			path = ../Pods;
@@ -430,7 +361,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */;
 			buildPhases = (
-				58E2CB346F2C2A873294F481 /* [CP] Check Pods Manifest.lock */,
+				69BC5020DBE393B56BD76636 /* [CP] Check Pods Manifest.lock */,
 				0BBA83C41EC9F7600075A103 /* Run React packager */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
@@ -449,7 +380,6 @@
 			dependencies = (
 				0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */,
 				4EB0602A260E026600F524C5 /* PBXTargetDependency */,
-				4ECA497028FD590000085365 /* PBXTargetDependency */,
 			);
 			name = JitsiMeet;
 			productName = "Jitsi Meet";
@@ -473,32 +403,15 @@
 			productReference = 4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */;
 			productType = "com.apple.product-type.app-extension";
 		};
-		4ECA496328FD590000085365 /* WidgetsExtension */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 4ECA497428FD590100085365 /* Build configuration list for PBXNativeTarget "WidgetsExtension" */;
-			buildPhases = (
-				4ECA496028FD590000085365 /* Sources */,
-				4ECA496128FD590000085365 /* Frameworks */,
-				4ECA496228FD590000085365 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = WidgetsExtension;
-			productName = WidgetsExtension;
-			productReference = 4ECA496428FD590000085365 /* WidgetsExtension.appex */;
-			productType = "com.apple.product-type.app-extension";
-		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 1400;
+				LastSwiftUpdateCheck = 1240;
 				LastUpgradeCheck = 1020;
-				ORGANIZATIONNAME = "";
+				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					0BEA5C241F7B8F73000D0AB4 = {
 						CreatedOnToolsVersion = 9.0;
@@ -511,7 +424,6 @@
 						ProvisioningStyle = Automatic;
 					};
 					13B07F861A680F5B00A75B9A = {
-						LastSwiftMigration = 1400;
 						SystemCapabilities = {
 							com.apple.SafariKeychain = {
 								enabled = 1;
@@ -524,9 +436,6 @@
 					4EB06022260E026600F524C5 = {
 						CreatedOnToolsVersion = 12.4;
 					};
-					4ECA496328FD590000085365 = {
-						CreatedOnToolsVersion = 14.0.1;
-					};
 				};
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "app" */;
@@ -546,7 +455,6 @@
 				0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */,
 				0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */,
 				4EB06022260E026600F524C5 /* JitsiMeetBroadcastExtension */,
-				4ECA496328FD590000085365 /* WidgetsExtension */,
 			);
 		};
 /* End PBXProject section */
@@ -586,14 +494,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		4ECA496228FD590000085365 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4ECA496D28FD590000085365 /* Assets.xcassets in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -643,7 +543,7 @@
 			shellPath = /bin/sh;
 			shellScript = "if test \"$PRODUCT_BUNDLE_IDENTIFIER\" = \"com.atlassian.JitsiMeet.ios\"; then\n    ENTITLEMENTS_PLIST=\"$PROJECT_DIR/app.entitlements\"\n    \n    /usr/libexec/PlistBuddy -c \"Add :com.apple.developer.avfoundation.multitasking-camera-access bool 1\" $ENTITLEMENTS_PLIST\nfi\n";
 		};
-		58E2CB346F2C2A873294F481 /* [CP] Check Pods Manifest.lock */ = {
+		69BC5020DBE393B56BD76636 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -742,10 +642,8 @@
 			files = (
 				0B412F1F1EDEE6E800B1A0A6 /* ViewController.m in Sources */,
 				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
-				4EBB458E2902E85B00855769 /* WidgetKitHelper.swift in Sources */,
 				DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
-				4EBB458A28FFFD4100855769 /* RoutesHandler.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -761,19 +659,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		4ECA496028FD590000085365 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4ECA496B28FD590000085365 /* Widgets.swift in Sources */,
-				4E6920B828FD84D700645D9E /* DarwinNotificationsObserver.swift in Sources */,
-				4E46D954290FF55600761DEF /* LockScreenLeaveMeetingWidget.swift in Sources */,
-				4EA73DA3290C1D6C00A16FF8 /* MeetingState.swift in Sources */,
-				4E6A3E17291024B900E6B0B5 /* Provider.swift in Sources */,
-				4E46D952290FF39E00761DEF /* LockScreenMuteAudioWidget.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
@@ -792,11 +677,6 @@
 			target = 4EB06022260E026600F524C5 /* JitsiMeetBroadcastExtension */;
 			targetProxy = 4EB06029260E026600F524C5 /* PBXContainerItemProxy */;
 		};
-		4ECA497028FD590000085365 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 4ECA496328FD590000085365 /* WidgetsExtension */;
-			targetProxy = 4ECA496F28FD590000085365 /* PBXContainerItemProxy */;
-		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -965,12 +845,11 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7052390E12D7319D36D8E4CA /* Pods-JitsiMeet.debug.xcconfig */;
+			baseConfigurationReference = 756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
-				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -992,20 +871,16 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
 				PRODUCT_NAME = "jitsi-meet";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "src/JitsiMeet-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8CAA3C5A38E868335D1C1EC1 /* Pods-JitsiMeet.release.xcconfig */;
+			baseConfigurationReference = 3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease;
-				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -1026,8 +901,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
 				PRODUCT_NAME = "jitsi-meet";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "src/JitsiMeet-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1100,91 +973,6 @@
 			};
 			name = Release;
 		};
-		4ECA497228FD590100085365 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = WidgetsExtension.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = FC967L3QRG;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = "Widgets Extension/Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = Widgets;
-				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Facebook. All rights reserved.";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@executable_path/../../Frameworks",
-				);
-				MARKETING_VERSION = 1.0;
-				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.widgets.extension;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		4ECA497328FD590100085365 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = WidgetsExtension.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = FC967L3QRG;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = "Widgets Extension/Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = Widgets;
-				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Facebook. All rights reserved.";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@executable_path/../../Frameworks",
-				);
-				MARKETING_VERSION = 1.0;
-				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.widgets.extension;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
 		83CBBA201A601CBA00E9B192 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1338,15 +1126,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		4ECA497428FD590100085365 /* Build configuration list for PBXNativeTarget "WidgetsExtension" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				4ECA497228FD590100085365 /* Debug */,
-				4ECA497328FD590100085365 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "app" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

ios/app/app.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1400"
-   wasCreatedForAppExtension = "YES"
-   version = "2.0">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4ECA496328FD590000085365"
-               BuildableName = "WidgetsExtension.appex"
-               BlueprintName = "WidgetsExtension"
-               ReferencedContainer = "container:app.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-               BuildableName = "jitsi-meet.app"
-               BlueprintName = "JitsiMeet"
-               ReferencedContainer = "container:app.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      launchStyle = "0"
-      askForAppToLaunch = "Yes"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      launchAutomaticallySubstyle = "2">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.springboard">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4ECA496328FD590000085365"
-            BuildableName = "WidgetsExtension.appex"
-            BlueprintName = "WidgetsExtension"
-            ReferencedContainer = "container:app.xcodeproj">
-         </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "jitsi-meet.app"
-            BlueprintName = "JitsiMeet"
-            ReferencedContainer = "container:app.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "_XCWidgetKind"
-            value = "LockScreenLeaveMeetingWidget"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "_XCWidgetDefaultView"
-            value = "timeline"
-            isEnabled = "NO">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "_XCWidgetFamily"
-            value = "medium"
-            isEnabled = "NO">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      askForAppToLaunch = "Yes"
-      launchAutomaticallySubstyle = "2">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "jitsi-meet.app"
-            BlueprintName = "JitsiMeet"
-            ReferencedContainer = "container:app.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

ios/app/src/AppDelegate.m

@@ -17,7 +17,6 @@
 
 #import "AppDelegate.h"
 #import "FIRUtilities.h"
-#import "RoutesHandler.h"
 #import "Types.h"
 #import "ViewController.h"
 
@@ -70,7 +69,7 @@
 -    (BOOL)application:(UIApplication *)application
   continueUserActivity:(NSUserActivity *)userActivity
     restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> *restorableObjects))restorationHandler {
-    
+
     if ([FIRUtilities appContainsRealServiceInfoPlist]) {
         // 1. Attempt to handle Universal Links through Firebase in order to support
         //    its Dynamic Links (which we utilize for the purposes of deferred deep
@@ -108,10 +107,6 @@
     if ([[url absoluteString] containsString:@"google/link/?dismiss=1&is_weak_match=1"]) {
         return NO;
     }
-    
-    if ([[RoutesHandler sharedInstance] routeURL:url]) {
-        return YES;
-    }
 
     NSURL *openUrl = url;
 

ios/app/src/Images.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "author" : "xcode",
-    "version" : 1
+    "version" : 1,
+    "author" : "xcode"
   }
-}
+}

ios/app/src/JitsiMeet-Bridging-Header.h

@@ -1,4 +0,0 @@
-//
-//  Use this file to import your target's public headers that you would like to expose to Swift.
-//
-

ios/app/src/RoutesHandler.h

@@ -1,27 +0,0 @@
-//
-//  RoutesHandler.h
-//  JitsiMeet
-//
-//  Created by Alex Bumbu on 19.10.2022.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol RouteObserving <NSObject>
-
-@property (nonatomic, readonly) void (^didRouteCallback)(NSString *route);
-
-@end
-
-@interface RoutesHandler : NSObject
-
-+ (instancetype)sharedInstance;
-- (void)registerObserver:(id<RouteObserving>)observer forRoute:(NSString *)route;
-- (void)unregisterObserver:(id<RouteObserving>)observer;
-- (BOOL)routeURL:(NSURL *)url;
-
-@end
-
-NS_ASSUME_NONNULL_END

ios/app/src/RoutesHandler.m

@@ -1,123 +0,0 @@
-//
-//  RoutesHandler.m
-//  JitsiMeet
-//
-//  Created by Alex Bumbu on 19.10.2022.
-//
-
-#import "RoutesHandler.h"
-
-@protocol Routing <NSObject>
-
-@property (nonatomic, readonly) NSString *route;
-@property (nonatomic, readonly) id<RouteObserving> observer;
-
-@end
-
-@interface Route: NSObject <Routing>
-
-@property (nonatomic, readonly) NSString *route;
-@property (nonatomic, readonly, weak) id<RouteObserving> observer;
-
-+ (instancetype)routeWithString:(nonnull NSString *)route observer:(id<RouteObserving>)observer;
-
-@end
-
-#pragma mark -
-
-@implementation RoutesHandler {
-    NSMutableArray *routes;
-}
-
-+ (instancetype)sharedInstance {
-    static RoutesHandler *sharedInstance = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sharedInstance = [[self alloc] init];
-    });
-    
-    return sharedInstance;
-}
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        routes = [[NSMutableArray alloc] init];
-    }
-    
-    return self;
-}
-
-- (void)registerObserver:(id<RouteObserving>)observer forRoute:(NSString *)route {
-    [routes addObject:[Route routeWithString:route observer:observer]];
-}
-
-- (void)unregisterObserver:(id<RouteObserving>)observer {
-    NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<Routing> _Nullable evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
-        return evaluatedObject.observer == nil || evaluatedObject.observer == observer;
-    }];
-    NSArray *routesToClear = [routes filteredArrayUsingPredicate:predicate];
-    [routes removeObjectsInArray:routesToClear];
-}
-
-- (BOOL)routeURL:(NSURL *)url {
-    [self clearRoutes];
-    
-    NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:false];
-    if (!components) {
-        return false;
-    }
-        
-    NSString *route = components.path;
-    NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<Routing> _Nullable evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
-        return [evaluatedObject.route isEqualToString:route];
-    }];
-    NSArray *routesToHandle = [routes filteredArrayUsingPredicate:predicate];
-    if ([routesToHandle count] == 0) {
-        return false;
-    }
-    
-    for (id<Routing> route in routesToHandle) {
-        route.observer.didRouteCallback(route.route);
-    }
-    
-    return true;
-}
-
-- (void)clearRoutes {
-    NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<Routing> _Nullable evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
-        return evaluatedObject.observer == nil;
-    }];
-    NSArray *routesToClear = [routes filteredArrayUsingPredicate:predicate];
-    [routes removeObjectsInArray:routesToClear];
-}
-
-@end
-
-
-#pragma mark -
-
-@interface Route()
-
-@property (nonatomic, nonnull, copy) NSString *route;
-@property (nonatomic, weak) id<RouteObserving> observer;
-
-@end
-
-@implementation Route
-
-+ (instancetype)routeWithString:(nonnull NSString *)route observer:(nonnull id<RouteObserving>)observer {
-    return [[Route alloc] initWithString:route observer:observer];
-}
-
-- (instancetype)initWithString:(nonnull NSString *)route observer:(nonnull id<RouteObserving>)observer {
-    self = [super init];
-    if (self) {
-        self.route = route;
-        self.observer = observer;
-    }
-    
-    return self;
-}
-
-@end

ios/app/src/ViewController.m

@@ -21,16 +21,8 @@
 @import JitsiMeetSDK;
 
 #import "Types.h"
-#import "RoutesHandler.h"
 #import "ViewController.h"
-#import "jitsi_meet-Swift.h"
 
-@interface ViewController() <RouteObserving>
-
-@property (nonatomic, nonnull, copy) void (^didRouteCallback)(NSString *);
-@property (nonatomic, assign) BOOL audioMuted;
-
-@end
 
 @implementation ViewController
 
@@ -41,8 +33,6 @@
     view.delegate = self;
 
     [view join:[[JitsiMeet sharedInstance] getInitialConferenceOptions]];
-
-    [self registerRouteObserver];
 }
 
 // JitsiMeetViewDelegate
@@ -63,10 +53,6 @@
 
 - (void)conferenceJoined:(NSDictionary *)data {
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_JOINED" withData:data];
-    
-    self.audioMuted = [[data objectForKey:@"isAudioMuted"] boolValue];
-    
-    [self refreshWidgetState:self.audioMuted];
 
     // Register a NSUserActivity for this conference so it can be invoked as a
     // Siri shortcut.
@@ -96,12 +82,6 @@
 
 - (void)conferenceTerminated:(NSDictionary *)data {
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_TERMINATED" withData:data];
-    
-    NSURL *sharedContainer = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:@"group.org.jitsi.meet.appgroup"];
-    NSURL *widgetStateFileURL = [sharedContainer URLByAppendingPathComponent:@"widgetState"];
-    [[NSFileManager defaultManager] removeItemAtURL:widgetStateFileURL error:nil];
-    
-    [WidgetKitHelper reloadAllWidgets];
 }
 
 - (void)conferenceWillJoin:(NSDictionary *)data {
@@ -127,16 +107,7 @@
 }
 
 - (void)audioMutedChanged:(NSDictionary *)data {
-    NSLog(@"%@%@", @"Audio muted changed: ", data[@"muted"]);
-//    CFNotificationCenterRef notificationCenter = CFNotificationCenterGetDarwinNotifyCenter();
-//    CFNotificationCenterPostNotification(notificationCenter,
-//                                         (__bridge CFStringRef)@"iOS_MeetingMutedChanged",
-//                                         NULL,
-//                                         NULL,
-//                                         true);
-    
-    self.audioMuted = [[data objectForKey:@"muted"] boolValue];
-    [self refreshWidgetState:self.audioMuted];
+  NSLog(@"%@%@", @"Audio muted changed: ", data[@"muted"]);
 }
 
 - (void)endpointTextMessageReceived:(NSDictionary *)data {
@@ -161,40 +132,9 @@
 
 #pragma mark - Helpers
 
-- (void)registerRouteObserver {
-    __weak typeof(self) weakSelf = self;
-    __weak JitsiMeetView *view = (JitsiMeetView *)self.view;
-    self.didRouteCallback = ^(NSString *route) {
-        if ([route isEqual:@"meet/toggleAudioMute"]) {
-            weakSelf.audioMuted = !weakSelf.audioMuted;
-            [view setAudioMuted:weakSelf.audioMuted];
-        } else if ([route isEqualToString:@"meet/leaveMeeting"]) {
-            [weakSelf terminate];
-        }
-    };
-    
-    [[RoutesHandler sharedInstance] registerObserver:self forRoute:@"meet/toggleAudioMute"];
-    [[RoutesHandler sharedInstance] registerObserver:self forRoute:@"meet/leaveMeeting"];
-}
-
 - (void)terminate {
     JitsiMeetView *view = (JitsiMeetView *) self.view;
     [view leave];
 }
 
-- (void)refreshWidgetState:(BOOL)audioMuted {
-//    let sharedContainer = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: Constants.appGroupIdentifier)
-//    return sharedContainer?.appendingPathComponent("rtc_SSFD").path ?? ""
-    
-    NSURL *sharedContainer = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:@"group.org.jitsi.meet.appgroup"];
-    NSURL *widgetStateFileURL = [sharedContainer URLByAppendingPathComponent:@"widgetState"];
-    
-    NSDictionary *meetingState = @{@"audioMuted": @(audioMuted)};
-    if (![meetingState writeToURL:widgetStateFileURL atomically:true]) {
-        NSLog(@"error saving state file");
-    }
-    
-    [WidgetKitHelper reloadAllWidgets];
-}
-
 @end

ios/app/src/WidgetKitHelper.swift

@@ -1,20 +0,0 @@
-//
-//  WidgetKitHelper.swift
-//  JitsiMeet
-//
-//  Created by Alex Bumbu on 21.10.2022.
-//
-
-import WidgetKit
-
-@available(iOS 14.0, *)
-@objcMembers final class WidgetKitHelper: NSObject {
-
-    class func reloadAllWidgets(){
-
-        #if arch(arm64) || arch(i386) || arch(x86_64)
-        WidgetCenter.shared.reloadAllTimelines()
-        #endif
-
-    }
-}

ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift

@@ -46,7 +46,7 @@ public class PiPViewCoordinator {
         }
     }
 
-    public let initialPositionInSuperView: Position = .lowerRightCorner
+    public var initialPositionInSuperView: Position = .lowerRightCorner
 
     // Unused. Remove on the next major release.
     @available(*, deprecated, message: "The PiP window size is now fixed to 150px.")

lang/main-enGB.json

@@ -365,7 +365,7 @@
         "mute": "Mute or unmute your microphone",
         "pushToTalk": "Press to transmit",
         "raiseHand": "Raise or lower your hand",
-        "showSpeakerStats": "Show speaker stats",
+        "showSpeakerStats": "Show participants stats",
         "toggleChat": "Open or close the chat",
         "toggleFilmstrip": "Show or hide video thumbnails",
         "toggleScreensharing": "Switch between camera and screen sharing",
@@ -579,7 +579,7 @@
         "minutes": "{{count}}m",
         "name": "Name",
         "seconds": "{{count}}s",
-        "speakerStats": "Speaker Stats",
+        "speakerStats": "Participants Stats",
         "speakerTime": "Speaker Time"
     },
     "startupoverlay": {
@@ -626,7 +626,7 @@
             "sharedvideo": "Toggle video sharing",
             "shortcuts": "Toggle shortcuts",
             "show": "Show on stage",
-            "speakerStats": "Toggle speaker statistics",
+            "speakerStats": "Toggle participants statistics",
             "tileView": "Toggle tile view",
             "toggleCamera": "Toggle camera",
             "videoblur": "",
@@ -662,7 +662,7 @@
         "shareRoom": "Invite someone",
         "sharedvideo": "Share video",
         "shortcuts": "View shortcuts",
-        "speakerStats": "Speaker stats",
+        "speakerStats": "Participants stats",
         "startScreenSharing": "Start screen sharing",
         "startSubtitles": "Start subtitles",
         "startvideoblur": "",

lang/main-hu.json

@@ -27,6 +27,25 @@
     "audioOnly": {
         "audioOnly": "Alacsony sávszélesség"
     },
+    "breakoutRooms": {
+        "actions": {
+            "add": "Pihenőszoba hozzáadása",
+            "autoAssign": "Automatikus hozzárendelés a pihenőszobákhoz",
+            "close": "Bezárás",
+            "join": "Csatlakozás",
+            "leaveBreakoutRoom": "Pihenőszoba elhagyása",
+            "more": "Bővebben",
+            "remove": "Eltávolítás",
+            "sendToBreakoutRoom": "Résztvevő áthelyezése ide:"
+        },
+        "defaultName": "Pihenőszoba #{{index}}",
+        "mainRoom": "Fő szoba",
+        "notifications": {
+            "joined": "Csatlakozva a \"{{name}}\" pihenőszobához",
+            "joinedMainRoom": "Csatlakozva a fő szobához",
+            "joinedTitle": "Pihenőszobák"
+        }
+    },
     "calendarSync": {
         "addMeetingURL": "Értekezlet hivatkozásának hozzáadása",
         "confirmAddLink": "Hozzáadható egy Jitsi hivatkozás az eseményhez?",
@@ -46,6 +65,7 @@
         "today": "Ma"
     },
     "chat": {
+        "enter": "Belépés a szobába",
         "error": "Hiba: az üzenetet nem sikerült elküldeni. Hiba oka: {{error}}",
         "fieldPlaceHolder": "Írja ide az üzenetét",
         "messageTo": "Privát üzenet a felhasználónak: {{recipient}}",
@@ -58,14 +78,21 @@
         "noMessagesMessage": "A találkozón még nincsenek üzenetek. Itt kezdhet beszélgetést!",
         "privateNotice": "Privát üzenet a felhasználónak: {{recipient}}",
         "sendButton": "Küldés",
+        "tabs": {
+            "chat": "Csevegés",
+            "polls": "Szavazás"
+        },
         "title": "Csevegés",
-        "titleWithPolls": "Csevegés",
-        "you": "neked"
+        "titleWithPolls": "Csevegés és szavazás",
+        "you": "te"
     },
     "chromeExtensionBanner": {
         "buttonText": "Chrome kiterjesztés telepítése",
         "dontShowAgain": "Ne jelenjen meg újra",
-        "installExtensionText": "Kiterjesztés telepítése a Google Calendar és az Office 365 integrációjához"
+        "installExtensionText": "Kiterjesztés telepítése a Google Calendar és az Office 365 integrációjához",
+        "raiseHandAction": "Kéz felemelése",
+        "reactionSounds": "Hangok kikapcsolása",
+        "reactionSoundsForAll": "Hangok kikapcsolása mindenkinek"
     },
     "connectingOverlay": {
         "joiningRoom": "Kapcsolódás az értekezlethez…"
@@ -189,12 +216,18 @@
         "dismiss": "Elutasítás",
         "displayNameRequired": "Helló! Mi a neve?",
         "done": "Kész",
-        "enterDisplayName": "Adja meg itt a nevét",
+        "e2eeDescription": "A végpontok közötti titkosítás jelenleg KÍSÉRLETES. Ne feledje, hogy a végpontok közötti titkosítás bekapcsolása hatékonyan letiltja a szerveroldali szolgáltatásokat, például: telefonos részvételt. Ne feledje azt is, hogy az értekezlet csak olyan felhasználók számára működik, akik olyan böngészőkből csatlakoznak, amelyek támogatják a beilleszthető adatfolyamokat.",
+        "e2eeLabel": "Végpontok közötti titkosítás engedélyezése",
+        "embedMeeting": "Meeting beágyazása",
+        "enterDisplayName": "Adja meg a nevét",
         "error": "Hiba",
         "externalInstallationMsg": "Telepíteni kell a munkaasztal megosztására való kiterjesztést.",
         "externalInstallationTitle": "Kiterjesztésre van szükség",
         "goToStore": "Ugrás az alkalmazásbolthoz",
         "gracefulShutdown": "Jelenleg a szolgáltatás karbantartás miatt nem elérhető. Később próbálja meg ismét.",
+        "grantModeratorDialog": "Biztos, hogy moderátori jogokat kíván adni a következőnek: {{participantName}}?",
+        "grantModeratorTitle": "Moderátori jogok megadása",
+        "hideShareAudioHelper": "Ne mutassa ezt az ablakot többé",
         "incorrectPassword": "Helytelen felhasználói név és jelszó",
         "incorrectRoomLockPassword": "Helytelen jelszó",
         "inlineInstallExtension": "Telepítés azonnal",
@@ -217,21 +250,34 @@
         "maxUsersLimitReached": "A lehetséges résztvevők maximális száma elérve. A konferencia tele van. Lépjen kapcsolatba az értekezlet tulajdonosával vagy próbálkozzon később!",
         "maxUsersLimitReachedTitle": "A lehetséges résztvevők maximális száma elérve",
         "micConstraintFailedError": "A mikrofon nem felel meg bizonyos kikötéseknek.",
-        "micNotFoundError": "Nem található mikrofon.",
+        "micNotFoundError": "A mikrofon nem található.",
         "micNotSendingData": "A számítógép beállításai között kell visszahangosítani a mikrofont vagy beállítani a hangfelvétel szintjét",
         "micNotSendingDataTitle": "A mikrofon le van némítva a rendszerbeállításokban",
         "micPermissionDeniedError": "Nem adott engedélyt a mikrofon használatához. Csatlakozhat a beszélgetéshez, de a többiek nem fogják Önt hallani. A címsorban lévő kamera ikonnal lehet ezt helyrehozni.",
         "micUnknownError": "Ismeretlen ok miatt nem lehet a mikrofont használni.",
+        "moderationAudioLabel": "Engedélyezze a résztvevőknek saját némításuk feloldását",
+        "moderationVideoLabel": "Engedélyezze a résztvevőknek saját kamerájuk elindítását",
         "muteEveryoneDialog": "Valóban mindenki elnémítható? Nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja majd hangosítani.",
         "muteEveryoneElseDialog": "Némítás után már nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja hangosítani.",
         "muteEveryoneElseTitle": "Mindenki elnémítása, kivéve: {{whom}}?",
+        "muteEveryoneElsesVideoDialog": "A kamera letiltása után nem tudja újra bekapcsolni, de ők bármikor újra bekapcsolhatják.",
+        "muteEveryoneElsesVideoTitle": "Mindenki kamerájának tilátsa, kivéve {{whom}}?",
         "muteEveryoneSelf": "önmagamat",
         "muteEveryoneStartMuted": "Mindenki elnémítva kezd ezután",
         "muteEveryoneTitle": "Mindenki elnémítása?",
+        "muteEveryonesVideoDialog": "A résztvevők bármikor be tudják kapcsolni a kamerájukat.",
+        "muteEveryonesVideoDialogModerationOn": "A résztvevők bármikor kérhetik videójuk bekapcsolását.",
+        "muteEveryonesVideoTitle": "Minden résztvevő kameráját leállítja?",
         "muteParticipantBody": "Nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja majd hangosítani.",
         "muteParticipantButton": "Némítás",
         "muteParticipantDialog": "Valóban elnémítható ez a résztvevő? Nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja majd hangosítani.",
         "muteParticipantTitle": "Elnémítható a résztvevő?",
+        "muteParticipantsVideoBody": "Ön nem tudja újra bekapcsolni a kamerát, de ők bármikor újra bekapcsolhatják.",
+        "muteParticipantsVideoButton": "Kamera leállítása",
+        "muteParticipantsVideoDialog": "Biztosan le akarja tiltani ennek a résztvevőnek a kameráját? Ön nem tudja újra bekapcsolni a kamerát, de ők bármikor újra bekapcsolhatják.",
+        "muteParticipantsVideoDialogModerationOn": "Are you sure you want to turn off this participant's camera? You won't be able to turn the camera back on and neither will they.",
+        "muteParticipantsVideoTitle": "Letiltja ennek a résztvevőnek a kameráját?",
+        "password": "Jelszó",
         "passwordLabel": "Az értekezletet zárolta egy résztvevő. Csatlakozáshoz adja meg a $t(lockRoomPassword).",
         "passwordNotSupported": "Az értekezlet $t(lockRoomPassword) beállítása nem támogatott.",
         "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) nem támogatott",
@@ -249,6 +295,7 @@
         "remoteControlShareScreenWarning": "Vegye figyelembe, hogy ha megnyomja az „Engedélyezés” lehetőséget, akkor megosztja a képernyőt!",
         "remoteControlStopMessage": "A távoli munkamenet irányítása befejeződött!",
         "remoteControlTitle": "Távoli asztal vezérlése",
+        "remoteUserControls": "{{username}} vezérlői",
         "removePassword": "$t(lockRoomPassword) eltávolítása",
         "removeSharedVideoMsg": "Valóban eltávolítható a megosztott videó?",
         "removeSharedVideoTitle": "Megosztott videó eltávolítása",
@@ -267,11 +314,14 @@
         "sendPrivateMessageTitle": "Privátban legyen elküldve?",
         "serviceUnavailable": "Szolgáltatás nem elérhető",
         "sessTerminated": "Hívás megszakadt",
+        "shareAudio": "Tovább",
+        "shareAudioTitle": "Hang megosztása",
         "shareVideoLinkError": "Adjon meg egy helyes linket.",
         "shareVideoTitle": "Videó megosztása",
         "shareYourScreen": "Képernyő megosztása",
         "shareYourScreenDisabled": "Képernyőmegosztás letiltva.",
         "shareYourScreenDisabledForGuest": "Vendég nem végezhet képernyőmegosztást.",
+        "sharedVideoLinkPlaceholder": "YouTube link vagy közvetlen videó link",
         "startLiveStreaming": "Élő közvetítés kezdése",
         "startRecording": "Felvétel indítása",
         "startRemoteControlErrorMessage": "Hiba történt a távoli vezérlés munkamenetének indítása közben!",
@@ -287,6 +337,7 @@
         "transcribing": "Átirat készítése",
         "unlockRoom": "Értekezlet $t(lockRoomPassword) eltávolítása",
         "userPassword": "felhasználói jelszó",
+        "videoLink": "Videó link",
         "yourEntireScreen": "A teljes képernyő"
     },
     "documentSharing": {
@@ -367,11 +418,16 @@
         "showSpeakerStats": "Beszéd statisztikák megjelenítése",
         "toggleChat": "Csevegés megnyitása vagy bezárása",
         "toggleFilmstrip": "Videó bélyegképek megjelenítése vagy elrejtése",
+        "toggleParticipantsPane": "A résztvevők panel megjelenítése vagy elrejtése",
         "toggleScreensharing": "Váltás kamera és képernyőmegosztás között",
         "toggleShortcuts": "Gyorsbillentyűk megjelenítése vagy elrejtése",
         "videoMute": "Kamera elindítása vagy leállítása",
         "videoQuality": "Hívás minőségének kezelése"
     },
+    "largeVideo": {
+        "screenIsShared": "Ön megosztja a képernyőjét",
+        "showMeWhatImSharing": "Látni szeretném mit osztok meg"
+    },
     "liveStreaming": {
         "busy": "Dolgozunk a közvetítési erőforrások felszabadításán. Kísérelje meg újra néhány perc múlva.",
         "busyTitle": "Jelenleg minden közvetítő foglalt",
@@ -405,6 +461,44 @@
         "unavailableTitle": "Élő közvetítés elérhetetlen",
         "youtubeTerms": "YouTube szolgáltatási feltételek"
     },
+    "lobby": {
+        "admit": "Engedélyezés",
+        "admitAll": "Mindet engedélyez",
+        "allow": "Engedélyez",
+        "backToKnockModeButton": "Csatlakozási kérelem küldése",
+        "chat": "Chat",
+        "dialogTitle": "Lobby mód",
+        "disableDialogContent": "A lobby mód jelenleg elérhető. Lehetőséged van csak azokat behívni a megbeszélésre, akik erre jogosultak általad. Szeretnéd kikapcsolni?",
+        "disableDialogSubmit": "Elutasítás",
+        "emailField": "Írd be az email címed",
+        "enableDialogPasswordField": "Jelszó megadása (választható)",
+        "enableDialogSubmit": "Elfogadás",
+        "enableDialogText": "A Lobby mód lehetővé teszi a megbeszélés védelmét azáltal, hogy csak a moderátor hivatalos jóváhagyása után engedi be az embereket.",
+        "enterPasswordButton": "Adja meg az értekezlet jelszavát",
+        "enterPasswordTitle": "Adja meg a jelszót az értekezlethez való csatlakozáshoz",
+        "errorMissingPassword": "Kérjük, adja meg az értekezlet jelszavát",
+        "invalidPassword": "Helytelen jelszó",
+        "joinRejectedMessage": "Csatlakozási kérelmét egy moderátor elutasította.",
+        "joinRejectedTitle": "Csatlakozási kérelem elutasítva.",
+        "joinTitle": "Csatlakozás az értekezlethez",
+        "joinWithPasswordMessage": "Csatlakozás jelszóval, kérjük várjon...",
+        "joiningMessage": "Amint valaki elfogadja kérését, csatlakoztatjuk az értekezlethez",
+        "joiningTitle": "Értekezlethez csatlakozás kérése...",
+        "joiningWithPasswordTitle": "Csatlakozás jelszóval...",
+        "knockButton": "Csatlakozási kérelem küldése",
+        "knockTitle": "Valaki szeretne csatlakozni az értekezlethez",
+        "nameField": "Adja meg a nevét",
+        "notificationLobbyAccessDenied": "{{targetParticipantName}} elutasításra került a csatlakozásod {{originParticipantName}} által",
+        "notificationLobbyAccessGranted": "{{targetParticipantName}} a csatlakozozásod elfogadva lett {{originParticipantName}} által",
+        "notificationLobbyDisabled": "Lobby tiltva lett {{originParticipantName}} által.",
+        "notificationLobbyEnabled": "Lobby engedélyezve lett {{originParticipantName}} által.",
+        "notificationTitle": "Lobby",
+        "passwordField": "Adja meg az értekezlet jelszavát",
+        "passwordJoinButton": "Csatlakozás",
+        "reject": "Elutasít",
+        "rejectAll": "Mindet elutasít",
+        "toggleLabel": "Lobby engedélyezése"
+    },
     "localRecording": {
         "clientState": {
             "off": "Kikapcsolva",
@@ -449,11 +543,18 @@
         "focus": "Konferencia fókusza",
         "focusFail": "{{component}} nem elérhető – újrapróbálkozás {{ms}} másodperc múlva",
         "grantedTo": "Moderátori jogok biztosítva {{to}} számára!",
+        "hostAskedUnmute": "Kérlek hangosítsd vissza a mikrofonod.",
         "invitedOneMember": "{{name}} meg lett hívva",
         "invitedThreePlusMembers": "{{name}} és {{count}} másik felhasználó meg lett hívva",
         "invitedTwoMembers": "{{first}} és {{second}} lett meghívva",
         "kickParticipant": "{{kicked}} résztvevőt kirúgta {{kicker}}",
+        "leftOneMember": "{{name}} elhagyta az értekezletet",
+        "leftThreePlusMembers": "{{name}} és mások elhagyták az értekezletet",
+        "leftTwoMembers": "{{first}} és {{second}} elhagyták az értekezletet",
+        "localRecordingStarted": "{{name}} elkezdte rögzíteni az értekezletet.",
+        "localRecordingStopped": "{{name}} leállította a rögzítést.",
         "me": "Én",
+        "moderationInEffectTitle": "A moderátor elnémította a mikrofonját",
         "moderator": "Moderátori jogok biztosítva!",
         "muted": "A beszélgetést elnémítva kezdte meg.",
         "mutedRemotelyDescription": "Bármikor visszahangosíthatja magát, ha készen áll a beszédre. Némítsa le magát ismét, ha a felesleges zajoktól meg kívánja védeni az értekezletet.",
@@ -462,6 +563,10 @@
         "newDeviceAction": "Alkalmaz",
         "newDeviceAudioTitle": "Új hangeszköz észlelve",
         "newDeviceCameraTitle": "Új kamera észlelve",
+        "noiseSuppressionFailedTitle": "Nem sikerült elindítani a zajcsökkentést",
+        "noiseSuppressionNoTrackDescription": "Kérjük, először kapcsolja ki a mikrofon némítását.",
+        "noiseSuppressionStereoDescription": "A sztereó zajcsökkentés jelenleg nem támogatott.",
+        "participantWantsToJoin": "Csatlakozni szeretne az értekezlethez",
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) egy másik résztvevő által eltávolítva",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) egy másik résztvevő által beállítva",
         "raisedHand": "{{name}} beszélni szeretne.",
@@ -472,9 +577,115 @@
         "suboptimalExperienceTitle": "Böngészőhiba",
         "unmute": "Visszahangosítás"
     },
+    "participantsPane": {
+        "actions": {
+            "allow": "Engedélyezés a résztvevőknek, hogy:",
+            "allowVideo": "Videó engedélyezése",
+            "askUnmute": "Kérje a némítás feloldását",
+            "audioModeration": "A némítást feloldhassák",
+            "blockEveryoneMicCamera": "Block everyone's mic and camera",
+            "invite": "Meghívás",
+            "moreModerationActions": "További moderálási opciók",
+            "moreModerationControls": "További moderálási vezérlők",
+            "moreParticipantOptions": "Résztvevő további beállításai",
+            "mute": "Némítás",
+            "muteAll": "Mindenkit elnémít",
+            "muteEveryoneElse": "Mute everyone else",
+            "stopEveryonesVideo": "Mindenki videójának leállítása",
+            "stopVideo": "Videó leállítása",
+            "unblockEveryoneMicCamera": "Unblock everyone's mic and camera",
+            "videoModeration": "Elindíthassák a videójukat"
+        },
+        "close": "Bezár",
+        "header": "Résztvevők",
+        "headings": {
+            "lobby": "Lobby ({{count}})",
+            "participantsList": "Résztvevők ({{count}})",
+            "waitingLobby": "Lobby-ban várakozók ({{count}})"
+        },
+        "search": "Résztvevők keresése"
+    },
     "passwordDigitsOnly": "Legfeljebb {{number}} szám",
     "passwordSetRemotely": "egy másik résztvevő által beállítva",
+    "polls": {
+        "answer": {
+            "skip": "Kihagyás",
+            "submit": "Küldés"
+        },
+        "by": "Létrehozta: {{ name }}",
+        "create": {
+            "addOption": "Opció hozzáadása",
+            "answerPlaceholder": "Opció {{index}}",
+            "cancel": "Mégsem",
+            "create": "Szavazás létrehozása",
+            "pollOption": "Opció {{index}}",
+            "pollQuestion": "Szavazás kérdése",
+            "questionPlaceholder": "Írja le a kérdést",
+            "removeOption": "Opció eltávolítása",
+            "send": "Küldés"
+        },
+        "notification": {
+            "description": "Szavazás megnyitása",
+            "title": "Új szavazás létrehozva"
+        },
+        "results": {
+            "changeVote": "Módosítás",
+            "empty": "Még nincsenek szavazások. Indítson szavazást itt!",
+            "hideDetailedResults": "Részletek elrejtése",
+            "showDetailedResults": "Részletek",
+            "vote": "Szavazás"
+        }
+    },
     "poweredby": "Működteti a",
+    "prejoin": {
+        "audioAndVideoError": "Hang és videó hiba:",
+        "audioDeviceProblem": "Hiba lépett fel az hangeszközzel",
+        "audioOnlyError": "Hang hiba:",
+        "audioTrackError": "Nem lehet a hangot rögzíteni.",
+        "callMe": "Hívj fel",
+        "callMeAtNumber": "Hívj fel ezen a számon:",
+        "calling": "Hívás",
+        "configuringDevices": "Eszköz beállítás...",
+        "connectedWithAudioQ": "Csak hanggal szeretne csatlakozni?",
+        "connection": {
+            "good": "Az internet kapcsolat jónak tűnik!",
+            "nonOptimal": "Az internet kapcsolat nem optimális",
+            "poor": "Az internet kapcsolat nagyon gyenge!"
+        },
+        "connectionDetails": {
+            "goodQuality": "Fantasztikus! A média minősége kiváló lesz."
+        },
+        "copyAndShare": "Másolom és megosztom az értekezlet linkjét",
+        "dialInMeeting": "Behívás az értekezletbe",
+        "dialInPin": "Behívás az értkezeletbe és megadom a PIN kódot:",
+        "dialing": "Tárcsázás",
+        "doNotShow": "Ne mutassa mégegyszer ezt a képernyőt",
+        "errorDialOut": "Nem sikerült a behívás",
+        "errorDialOutDisconnected": "Nem sikerült a behívás. Kapcsolat bontása",
+        "errorDialOutFailed": "Nem sikerült a behívás. Hiba a hívásban",
+        "errorDialOutStatus": "Hiba a hívás státusz megadásában",
+        "errorMissingName": "Kérlet add meg a neved, hogy csatlakozhass a megbeszéléshez",
+        "errorNoPermissions": "Engedélyeznie kell a mikrofonhoz és a kamerához való hozzáférést",
+        "errorStatusCode": "Hiba a hiváskor, hiba kód: {{status}}",
+        "errorValidation": "Hívószám validációs hiba",
+        "iWantToDialIn": "Hívni szeretném",
+        "initiated": "Hívás felépítés",
+        "joinAudioByPhone": "Csatlakozás telefon beszélgetéssel",
+        "joinMeeting": "Csatlakozás",
+        "joinMeetingInLowBandwidthMode": "Csatlakozás alacsony sávszélességi módban",
+        "joinWithoutAudio": "Csatlakozás hang nélkül",
+        "keyboardShortcuts": "Gyorsbillentyűk engedélyezése",
+        "linkCopied": "A link a vágólapra másolva",
+        "lookGood": "A mikrofon megfelelően működik",
+        "or": "vagy",
+        "premeeting": "Csatlakozás előtt",
+        "screenSharingError": "Képernyő megosztás hiba:",
+        "showScreen": "Csatlakozás előtti kamerakép",
+        "startWithPhone": "Kezdés telefonhanggal",
+        "videoOnlyError": "Videó hiba:",
+        "videoTrackError": "Nem sikerült a videó megjelenítés.",
+        "viewAllNumbers": "Összes szám megjelenítése"
+    },
     "presenceStatus": {
         "busy": "Foglalt",
         "calling": "Hívás…",
@@ -509,13 +720,19 @@
         "failedToStart": "A felvétel indítása meghiúsult",
         "fileSharingdescription": "Felvétel megosztása az értekezlet résztvevőivel",
         "live": "ÉLŐ",
+        "localRecordingNoNotificationWarning": "A felvételt nem közöljük más résztvevőkkel. Értesítenie kell velük, hogy a találkozót rögzítették.",
+        "localRecordingStartWarning": "A megbeszélésből való kilépés előtt feltétlenül állítsa le a felvételt, hogy elmentse azt.",
+        "localRecordingStartWarningTitle": "Állítsa le a felvételt a mentéshez",
+        "localRecordingWarning": "Győződjön meg arról, hogy az aktuális lapot választotta a megfelelő videó és hang használatához. A felvétel jelenleg 1 GB-ra van korlátozva, ami körülbelül 100 perc.",
         "loggedIn": "Belépve mint {{userName}}",
         "off": "Felvétel leállítva",
         "offBy": "{{name}} leállította a felvételt",
         "on": "Felvétel",
         "onBy": "{{name}} elindította a felvételt",
+        "onlyRecordSelf": "Csak az én hang- és videófolyamomat rögzítse",
         "pending": "Értekezlet rögzítésének előkészítése…",
         "rec": "REC",
+        "saveLocalRecording": "Felvétel mentése helyileg (béta)",
         "serviceDescription": "A felvételt a rögzítési szolgáltatás veszi fel",
         "serviceName": "Felvétel szolgáltatás",
         "signIn": "Belépés",
@@ -527,6 +744,12 @@
     "sectionList": {
         "pullToRefresh": "Húzás a frissítéshez"
     },
+    "security": {
+        "about": "Hozzáadhat jelszót az értekezlethez. A résztvevőknek meg kell adniuk a jelszót, mielőtt csatlakozhatnak az értekezlethez.",
+        "aboutReadOnly": "A moderátor résztvevői hozzáadhatnak egy jelszót az értekezlethez. A résztvevőknek meg kell adniuk a jelszót, mielőtt csatlakozhatnak az értekezlethez.",
+        "header": "Biztonsági beállítások",
+        "insecureRoomNameWarning": "The room name is unsafe. Unwanted participants may join your conference. Consider securing your meeting using the security button."
+    },
     "settings": {
         "calendar": {
             "about": "A {{appName}} naptárintegráció a naptár biztonságos elérésére szolgál, így olvasni tudja a soron következő eseményeket.",
@@ -535,8 +758,13 @@
             "signedIn": "Jelenleg ehhez az címhez tartozó naptár eseményei érhetőek el: {{email}}. Alább a „szétkapcsolás” gombra kattintva lehet leállítani a naptár eseményeinek elérését.",
             "title": "Naptár"
         },
+        "desktopShareFramerate": "Képernyőmegosztás sebessége (FPS)",
+        "desktopShareHighFpsWarning": "A nagyobb képkockasebesség az asztali megosztásnál hatással lehet a sávszélességre. Az új beállítások érvénybe léptetéséhez újra kell indítania a képernyőmegosztást.",
+        "desktopShareWarning": "Az új beállítások érvénybe léptetéséhez újra kell indítania a képernyőmegosztást.",
         "devices": "Eszközök",
         "followMe": "Mindenki engem kövessen",
+        "framesPerSecond": "képkocka / másodperc",
+        "incomingMessage": "Bejövő üzenet",
         "language": "Nyelv",
         "loggedIn": "Belépve mint {{name}}",
         "microphones": "Mikrofonok",
@@ -544,12 +772,22 @@
         "more": "Továbbiak",
         "name": "Név",
         "noDevice": "Nincs",
+        "participantJoined": "Résztvevő csatlakozott",
+        "participantKnocking": "Résztvevő belépett a lobby-ba",
+        "participantLeft": "Résztvevő kilépett",
+        "playSounds": "Hangok lejátszása a következőkhöz:",
+        "reactions": "Meeting reakciók",
+        "sameAsSystem": "Rendszerhang ({{label}})",
         "selectAudioOutput": "Hangkimenet",
         "selectCamera": "Kamera",
         "selectMic": "Mikrofon",
+        "selfView": "Saját kép",
+        "sounds": "Hangok",
         "speakers": "Hangszórók",
         "startAudioMuted": "Mindenki elnémítva kezd",
+        "startReactionsMuted": "Reakció hangok némítása mindenki számára",
         "startVideoMuted": "Mindenki videó nélkül kezd",
+        "talkWhileMuted": "Lenémított beszéd",
         "title": "Beállítások"
     },
     "settingsView": {
@@ -577,14 +815,23 @@
     },
     "speaker": "Hangszóró",
     "speakerStats": {
+        "angry": "Mérges",
+        "disgusted": "Felháborodott",
+        "fearful": "Félelmetes",
+        "happy": "Boldog",
         "hours": "{{count}} h",
         "minutes": "{{count}} perc",
         "name": "Név",
+        "neutral": "Semleges",
+        "sad": "Szomorú",
+        "search": "Keresés",
         "seconds": "{{count}} mp",
         "speakerStats": "Beszélő statisztika",
-        "speakerTime": "Beszélő ideje"
+        "speakerTime": "Beszélő ideje",
+        "surprised": "Meglepett"
     },
     "startupoverlay": {
+        "genericTitle": "Az értekezlethez engedélyezni kell a mikrofont és kamerát.",
         "policyText": " ",
         "title": "A {{app}} használni szeretné a mikrofont és a kamerát."
     },
@@ -599,36 +846,49 @@
             "Settings": "Beállítások átváltása",
             "audioOnly": "Csak a hang átváltása",
             "audioRoute": "Hangeszköz kijelölése",
+            "boo": "Szomorú",
             "callQuality": "Videóminőség kezelése",
             "cc": "Feliratok átváltása",
             "chat": "Csevegés ablak átváltása",
+            "clap": "Taps",
             "document": "Megosztott dokumentum átváltása",
             "download": "Alkalmazás letöltése",
+            "embedMeeting": "Meeting beágyazása",
             "feedback": "Visszajelzés küldése",
             "fullScreen": "Teljes képernyő átváltása",
+            "grantModerator": "Moderátori jogok megadása",
             "hangup": "Beszélgetés elhagyása",
             "help": "Súgó",
             "invite": "Személyek meghívása",
             "kick": "Résztvevő kirúgása",
+            "laugh": "Nevetés",
+            "like": "Hüvelykujj fel",
             "localRecording": "Helyi felvétel vezérlőelemeinek átváltása",
             "lockRoom": "Értekezlet jelszavának átváltása",
-            "moreActions": "További műveltek menü átváltása",
-            "moreActionsMenu": "További műveltek menü",
+            "moreActions": "További műveletek menü átváltása",
+            "moreActionsMenu": "További műveletek menü",
             "moreOptions": "További beállítások megjelenítése",
             "mute": "Hang némításának átváltása",
             "muteEveryone": "Mindenki elnémítása",
+            "muteEveryonesVideoStream": "Mindenki videójának leállítása",
+            "noiseSuppression": "Zajcsökkentés",
+            "participants": "Résztvevők",
             "pip": "Kép és képben mód átváltása",
             "privateMessage": "Privát üzenet küldése",
             "profile": "Adja meg a profilját",
             "raiseHand": "Kéz felemelésének átváltása",
             "recording": "Felvétel átváltása",
             "remoteMute": "Résztvevők némítása",
+            "security": "Biztonsági Beállítások",
             "shareRoom": "Valaki meghívása",
             "shareYourScreen": "Képernyőmegosztás átváltása",
+            "shareaudio": "Hang megosztása",
             "sharedvideo": "Videó megosztásának átváltása",
             "shortcuts": "Gyorsbillentyűk átváltása",
             "show": "Megjelenítés a színpadon",
+            "silence": "Néma",
             "speakerStats": "Beszélő statisztika átváltása",
+            "surprised": "Meglepett",
             "tileView": "Mozaikos nézet átváltása",
             "toggleCamera": "Kamera átváltása",
             "toggleFilmstrip": "Filmszalag átváltása",
@@ -639,13 +899,18 @@
         "audioOnlyOff": "Alacsony sávszélességű mód letiltása",
         "audioOnlyOn": "Alacsony sávszélességű mód engedélyezése",
         "audioRoute": "Hangeszköz kijelölése",
+        "audioSettings": "Hangbeállítások",
         "authenticate": "Hitelesítés",
+        "boo": "Szomorú",
         "callQuality": "Videominőség kezelése",
         "chat": "Csevegés megnyitása / bezárása",
+        "clap": "Taps",
         "closeChat": "Csevegés bezárása",
+        "disableReactionSounds": "Kikapcsolhatja a reakcióhangokat a Meeting-en",
         "documentClose": "Megosztott dokumentum bezárása",
         "documentOpen": "Megosztott dokumentum megnyitása",
         "download": "Alkalmazás letöltése",
+        "embedMeeting": "Meeting beágyazása",
         "enterFullScreen": "Teljes képernyős megtekintés",
         "enterTileView": "Mozaikos nézet indítása",
         "exitFullScreen": "Kilépés a teljes képernyőből",
@@ -654,10 +919,14 @@
         "hangup": "Kilépés",
         "help": "Súgó",
         "invite": "Személyek meghívása",
+        "joinBreakoutRoom": "Csatlakozás a pihenőszobához",
+        "laugh": "Nevetés",
+        "leaveBreakoutRoom": "Pihenőszoba elhagyása",
+        "like": "Hüvelykujj fel",
         "login": "Bejelentkezés",
         "logout": "Kijelentkezés",
         "lowerYourHand": "Kéz leengedése",
-        "moreActions": "További műveltek",
+        "moreActions": "További műveletek",
         "moreOptions": "További beállítások",
         "mute": "Némítás / Visszahangosítás",
         "muteEveryone": "Mindenki elnémítása",
@@ -666,28 +935,42 @@
         "noAudioSignalDialInDesc": "Be is tárcsázhat:",
         "noAudioSignalDialInLinkDesc": "Betárcsázási számok",
         "noAudioSignalTitle": "Nincs bemenet a mikrofonjáról!",
+        "noiseSuppression": "Zajcsökkentés",
         "noisyAudioInputDesc": "Úgy tűnik, hogy ez a mikrofon zajos. Le kellene némítani vagy cserélni az eszközt.",
         "noisyAudioInputTitle": "Zajosnak tűnik a mikrofonja!",
         "openChat": "Csevegés megnyitása",
+        "participants": "Résztvevők",
         "pip": "Belépés kép a képben módba",
         "privateMessage": "Privát üzenet küldése",
         "profile": "Adja meg a profilját",
         "raiseHand": "Kéz felemelése / leengedése",
         "raiseYourHand": "Kéz felemelése",
+        "reactionBoo": "Boo reakció küldése",
+        "reactionClap": "Tapsolás reakció küldése",
+        "reactionLaugh": "Nevetés reakció küldése",
+        "reactionLike": "Hüvelykujj fel reakció küldése",
+        "reactionSilence": "Néma arc reakció küldése",
+        "reactionSurprised": "Meglepett reakció küldése",
+        "security": "Biztonsági Beállítások",
+        "selectBackground": "Háttér beállítása",
         "shareRoom": "Valaki meghívása",
+        "shareaudio": "Hang megosztása",
         "sharedvideo": "Videó megosztása",
         "shortcuts": "Gyorsbillentyűk megtekintése",
+        "silence": "Néma",
         "speakerStats": "Beszélő statisztika",
         "startScreenSharing": "Képernyőmegosztás kezdése",
         "startSubtitles": "Feliratok kezdése",
         "startvideoblur": "Háttér elhomályosítása",
         "stopScreenSharing": "Képernyőmegosztás leállítása",
-        "stopSharedVideo": "Videó leállítása",
+        "stopSharedVideo": "Kamera leállítása",
         "stopSubtitles": "Felirat leállítása",
         "stopvideoblur": "Háttér elhomályosításának letiltása",
+        "surprised": "Meglepett",
         "talkWhileMutedPopup": "Úgy tűnik beszélni szeretne, de le van némítva.",
         "tileViewToggle": "Mozaikos nézet átváltása",
         "toggleCamera": "Kamera átváltása",
+        "videoSettings": "Videóbeállítások",
         "videomute": "Kamera indítása / leállítása"
     },
     "transcribing": {
@@ -725,12 +1008,15 @@
         "pending": "{{displayName}} -t meghívta"
     },
     "videoStatus": {
+        "adjustFor": "Igazítsa a legjobb:",
         "audioOnly": "CsH",
         "audioOnlyExpanded": "Jelenleg az alacsony sávszélességű mód az aktív, vagyis csak hangot lehet fogadni és képernyőmegosztást.",
+        "bestPerformance": "Teljesítményhez",
         "callQuality": "Videominőség",
         "hd": "MF",
         "hdTooltip": "Magas felbontású videó megtekintése",
         "highDefinition": "Magas felbontású",
+        "highestQuality": "Minőséghez",
         "labelTooiltipNoVideo": "Nincs videó",
         "labelTooltipAudioOnly": "Alacsony sávszélességű mód aktiválva",
         "ld": "AF",
@@ -738,6 +1024,7 @@
         "lowDefinition": "Alacsony felbontású",
         "onlyAudioAvailable": "„Csak hang” mód elérhető",
         "onlyAudioSupported": "Csak a hang támogatott ebben a böngészőben.",
+        "performanceSettings": "Teljesítménybeállítások",
         "sd": "SF",
         "sdTooltip": "Szabványos felbontású videó megtekintése",
         "standardDefinition": "Szabványos felbontású"
@@ -745,7 +1032,10 @@
     "videothumbnail": {
         "domute": "Némítás",
         "domuteOthers": "Mindenki más elnémítása",
+        "domuteVideoOfOthers": "Mindenki más kamerájának letiltása",
         "flip": "Tükrözés",
+        "grantModerator": "Moderátori jogok megadása",
+        "hideSelfView": "Saját kép elrejtése",
         "kick": "Kirúgás",
         "moderator": "Moderátor",
         "mute": "A résztvevő le van némítva",
@@ -754,6 +1044,29 @@
         "show": "Megjelenítés a színpadon",
         "videomute": "A résztvevő leállította a kameráját"
     },
+    "virtualBackground": {
+        "addBackground": "Háttér hozzáadása",
+        "apply": "Alkalmaz",
+        "backgroundEffectError": "Hiba a háttér effekt hozzáadásnál.",
+        "blur": "Elmosódott",
+        "deleteImage": "Delete image",
+        "desktopShare": "Asztal megosztása",
+        "desktopShareError": "Nem lehet asztalt megosztani",
+        "image1": "Tengerpart",
+        "image2": "Fehér semleges fal",
+        "image3": "Fehér üres szoba",
+        "image4": "Fekete állólámpa",
+        "image5": "Hegy",
+        "image6": "Erdő",
+        "image7": "Napfelkelte",
+        "none": "Nincs",
+        "pleaseWait": "Kérjük várjon...",
+        "removeBackground": "Háttér eltávolítása",
+        "slightBlur": "Enyhén elmosódott",
+        "title": "Virtuális háttérképek",
+        "uploadedImage": "Feltöltött kép {{index}}"
+    },
+    "volumeSlider": "Hangerő szabályzó",
     "welcomepage": {
         "accessibilityLabel": {
             "join": "Koppintson a csatlakozáshoz",
@@ -771,17 +1084,20 @@
         "getHelp": "Segítség kérése",
         "go": "Indítás",
         "goSmall": "Indítás",
+        "headerSubtitle": "Biztonságos és magas színvonalú konferenciák",
         "info": "Információ",
+        "jitsiOnMobile": "Jitsi Mobil – töltse le az app-ot, és indítson megbeszélést bárhonnan",
         "join": "LÉTREHOZ /HOZZÁAD",
         "privacy": "Adatvédelem",
         "recentList": "Legutóbbi",
-        "recentListDelete": "Törlés",
+        "recentListDelete": "Lista törlés",
         "recentListEmpty": "A legutóbbi lista jelenleg üres. Csevegjen a csapattal és minden előző értekezlet itt lesz megtalálható.",
         "reducedUIText": "Üdvözlet a {{app}} programban!",
         "roomNameAllowedChars": "Az értekezlet neve nem tartalmazhatja a következő karaktereket: ?, &, :, ', \", %, #.",
         "roomname": "Adja meg a szoba nevét",
         "roomnameHint": "Adja meg a kívánt nevet vagy URL-t, amelyhez csatlakozni szeretne. Bármiképp elnevezheti, csak ossza meg az értekezlet résztvevőivel, hogy ők ugyanezt a nevet tudják majd megadni.",
         "sendFeedback": "Visszajelzés küldése",
+        "startMeeting": "Csatlakozás",
         "terms": "Feltételek",
         "title": "Biztonságos, maradéktalanul felszerelt és teljesen ingyenes videokonferencia"
     }

lang/main.json

@@ -147,6 +147,7 @@
         "bridgeCount": "Server count: ",
         "codecs": "Codecs (A/V): ",
         "connectedTo": "Connected to:",
+        "e2eeVerified": "E2EE verified:",
         "framerate": "Frame rate:",
         "less": "Show less",
         "localaddress": "Local address:",
@@ -408,6 +409,10 @@
         "user": "User",
         "userIdentifier": "User identifier",
         "userPassword": "User password",
+        "verifyParticipantConfirm": "They match",
+        "verifyParticipantDismiss": "They do not match",
+        "verifyParticipantQuestion": "EXPERIMENTAL: Ask participant {{participantName}} if they see the same content, in the same order.",
+        "verifyParticipantTitle": "User verification",
         "videoLink": "Video link",
         "viewUpgradeOptions": "View upgrade options",
         "viewUpgradeOptionsContent": "To get unlimited access to premium features like recording, transcriptions, RTMP Streaming & more, you'll need to upgrade your plan.",
@@ -511,7 +516,7 @@
         "mute": "Mute or unmute your microphone",
         "pushToTalk": "Push to talk",
         "raiseHand": "Raise or lower your hand",
-        "showSpeakerStats": "Show speaker stats",
+        "showSpeakerStats": "Show participants stats",
         "toggleChat": "Open or close the chat",
         "toggleFilmstrip": "Show or hide video thumbnails",
         "toggleParticipantsPane": "Show or hide the participants pane",
@@ -563,7 +568,6 @@
     "lobby": {
         "admit": "Admit",
         "admitAll": "Admit all",
-        "allow": "Allow",
         "backToKnockModeButton": "Ask to join",
         "chat": "Chat",
         "dialogTitle": "Lobby mode",
@@ -649,6 +653,8 @@
         "connectedOneMember": "{{name}} joined the meeting",
         "connectedThreePlusMembers": "{{name}} and many others joined the meeting",
         "connectedTwoMembers": "{{first}} and {{second}} joined the meeting",
+        "dataChannelClosed": "Video quality impaired",
+        "dataChannelClosedDescription": "The bridge channel has been disconnected and thus video quality is limited to its lowest setting.",
         "disconnected": "disconnected",
         "displayNotifications": "Display notifications for",
         "focus": "Conference focus",
@@ -1036,7 +1042,7 @@
         "sad": "Sad",
         "search": "Search",
         "seconds": "{{count}}s",
-        "speakerStats": "Speaker Stats",
+        "speakerStats": "Participants Stats",
         "speakerTime": "Speaker Time",
         "surprised": "Surprised"
     },
@@ -1117,7 +1123,7 @@
             "shortcuts": "Toggle shortcuts",
             "show": "Show on stage",
             "silence": "Silence",
-            "speakerStats": "Toggle speaker statistics",
+            "speakerStats": "Toggle participants statistics",
             "surprised": "Surprised",
             "tileView": "Toggle tile view",
             "toggleCamera": "Toggle camera",
@@ -1204,7 +1210,7 @@
         "shortcuts": "View shortcuts",
         "showWhiteboard": "Show whiteboard",
         "silence": "Silence",
-        "speakerStats": "Speaker stats",
+        "speakerStats": "Participants stats",
         "startScreenSharing": "Start screen sharing",
         "startSubtitles": "Subtitles • {{language}}",
         "stopAudioSharing": "Stop audio sharing",
@@ -1296,6 +1302,7 @@
         "show": "Show on stage",
         "showSelfView": "Show self view",
         "unpinFromStage": "Unpin",
+        "verify": "Verify participant",
         "videoMuted": "Camera disabled",
         "videomute": "Participant has stopped the camera"
     },

modules/API/API.js

@@ -1450,6 +1450,22 @@ class API {
         });
     }
 
+    /**
+     * Notify external application that the data channel has been closed.
+     *
+     * @param {number} code - The close code.
+     * @param {string} reason - The close reason.
+     *
+     * @returns {void}
+     */
+    notifyDataChannelClosed(code: number, reason: string) {
+        this._sendEvent({
+            name: 'data-channel-closed',
+            code,
+            reason
+        });
+    }
+
     /**
      * Notify external application that the data channel has been opened.
      *
@@ -1920,6 +1936,27 @@ class API {
         });
     }
 
+    /**
+     * Notify the external application that a PeerConnection lost connectivity. This event is fired only if
+     * a PC `failed` but connectivity to the rtcstats server is still maintained signaling that there is a
+     * problem establishing a link between the app and the JVB server or the remote peer in case of P2P.
+     * Will only fire if rtcstats is enabled.
+     *
+     * @param {boolean} isP2P - Type of PC.
+     * @param {boolean} wasConnected - Was this connection previously connected. If it was it could mean
+     * that connectivity was disrupted, if not it most likely means that the app could not reach
+     * the JVB server, or the other peer in case of P2P.
+     *
+     * @returns {void}
+     */
+    notifyPeerConnectionFailure(isP2P, wasConnected) {
+        this._sendEvent({
+            name: 'peer-connection-failure',
+            isP2P,
+            wasConnected
+        });
+    }
+
     /**
      * Disposes the allocated resources.
      *

modules/API/external/external_api.js

@@ -106,6 +106,7 @@ const events = {
     'camera-error': 'cameraError',
     'chat-updated': 'chatUpdated',
     'content-sharing-participants-changed': 'contentSharingParticipantsChanged',
+    'data-channel-closed': 'dataChannelClosed',
     'data-channel-opened': 'dataChannelOpened',
     'device-list-changed': 'deviceListChanged',
     'display-name-change': 'displayNameChange',
@@ -134,6 +135,7 @@ const events = {
     'participant-role-changed': 'participantRoleChanged',
     'participants-pane-toggled': 'participantsPaneToggled',
     'password-required': 'passwordRequired',
+    'peer-connection-failure': 'peerConnectionFailure',
     'prejoin-screen-loaded': 'prejoinScreenLoaded',
     'proxy-connection-event': 'proxyConnectionEvent',
     'raise-hand-updated': 'raiseHandUpdated',

modules/UI/videolayout/LargeVideoManager.js

@@ -23,6 +23,7 @@ import {
     getVideoTrackByParticipant,
     trackStreamingStatusChanged
 } from '../../../react/features/base/tracks';
+import { createDeferred } from '../../../react/features/base/util/helpers';
 import { CHAT_SIZE } from '../../../react/features/chat';
 import {
     isTrackStreamingStatusActive,
@@ -38,7 +39,6 @@ import { getParticipantsPaneOpen } from '../../../react/features/participants-pa
 import { PresenceLabel } from '../../../react/features/presence-status';
 import { shouldDisplayTileView } from '../../../react/features/video-layout';
 /* eslint-enable no-unused-vars */
-import { createDeferred } from '../../util/helpers';
 import AudioLevels from '../audio_levels/AudioLevels';
 
 import { VIDEO_CONTAINER_TYPE, VideoContainer } from './VideoContainer';

modules/util/TaskQueue.js

@@ -1,71 +0,0 @@
-const logger = require('@jitsi/logger').getLogger(__filename);
-
-/**
- * Manages a queue of functions where the current function in progress will
- * automatically execute the next queued function.
- */
-export class TaskQueue {
-    /**
-     * Creates a new instance of {@link TaskQueue} and sets initial instance
-     * variable values.
-     */
-    constructor() {
-        this._queue = [];
-        this._currentTask = null;
-
-        this._onTaskComplete = this._onTaskComplete.bind(this);
-    }
-
-    /**
-     * Adds a new function to the queue. It will be immediately invoked if no
-     * other functions are queued.
-     *
-     * @param {Function} taskFunction - The function to be queued for execution.
-     * @private
-     * @returns {void}
-     */
-    enqueue(taskFunction) {
-        this._queue.push(taskFunction);
-        this._executeNext();
-    }
-
-    /**
-     * If no queued task is currently executing, invokes the first task in the
-     * queue if any.
-     *
-     * @private
-     * @returns {void}
-     */
-    _executeNext() {
-        if (this._currentTask) {
-            logger.warn('Task queued while a task is in progress.');
-
-            return;
-        }
-
-        this._currentTask = this._queue.shift() || null;
-
-        if (this._currentTask) {
-            logger.debug('Executing a task.');
-
-            try {
-                this._currentTask(this._onTaskComplete);
-            } catch (error) {
-                logger.error(`Task execution failed: ${error}`);
-                this._onTaskComplete();
-            }
-        }
-    }
-
-    /**
-     * Prepares to invoke the next function in the queue.
-     *
-     * @private
-     * @returns {void}
-     */
-    _onTaskComplete() {
-        this._currentTask = null;
-        logger.debug('Task completed.');
-        this._executeNext();
-    }
-}

modules/util/helpers.js

@@ -1,26 +0,0 @@
-import { TaskQueue } from './TaskQueue';
-
-/**
- * Create deferred object.
- *
- * @returns {{promise, resolve, reject}}
- */
-export function createDeferred() {
-    const deferred = {};
-
-    deferred.promise = new Promise((resolve, reject) => {
-        deferred.resolve = resolve;
-        deferred.reject = reject;
-    });
-
-    return deferred;
-}
-
-/**
- * Returns an instance of {@link TaskQueue}.
- *
- * @returns {Object}
- */
-export function createTaskQueue() {
-    return new TaskQueue();
-}

package-lock.json

@@ -27,11 +27,11 @@
         "@giphy/react-components": "5.6.0",
         "@giphy/react-native-sdk": "1.7.0",
         "@hapi/bourne": "2.0.0",
-        "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.11/jitsi-excalidraw-0.0.11.tgz",
+        "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.12/jitsi-excalidraw-0.0.12.tgz",
         "@jitsi/js-utils": "2.0.4",
         "@jitsi/logger": "2.0.0",
         "@jitsi/rnnoise-wasm": "0.1.0",
-        "@jitsi/rtcstats": "9.4.1",
+        "@jitsi/rtcstats": "9.5.0",
         "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
         "@microsoft/microsoft-graph-client": "3.0.1",
         "@mui/material": "5.10.2",
@@ -55,7 +55,7 @@
         "@types/w3c-image-capture": "1.0.6",
         "@vladmandic/human": "2.6.5",
         "@vladmandic/human-models": "2.5.9",
-        "@xmldom/xmldom": "0.7.6",
+        "@xmldom/xmldom": "0.7.9",
         "amplitude-js": "8.2.1",
         "base64-js": "1.3.1",
         "bc-css-flags": "3.0.0",
@@ -74,7 +74,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/v1535.0.0+e6263e7c/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1549.0.0+877c4546/lib-jitsi-meet.tgz",
         "lodash": "4.17.21",
         "moment": "2.29.4",
         "moment-duration-format": "2.2.2",
@@ -88,7 +88,7 @@
         "react-focus-lock": "2.5.1",
         "react-i18next": "10.11.4",
         "react-linkify": "1.0.0-alpha",
-        "react-native": "0.68.4",
+        "react-native": "0.68.5",
         "react-native-background-timer": "2.4.1",
         "react-native-calendar-events": "2.2.0",
         "react-native-callstats": "3.73.7",
@@ -147,7 +147,7 @@
         "@types/js-md5": "0.4.3",
         "@types/lodash": "4.14.182",
         "@types/react": "17.0.14",
-        "@types/react-native": "0.68.7",
+        "@types/react-native": "0.68.9",
         "@types/react-redux": "7.1.24",
         "@types/react-window": "1.8.5",
         "@types/unorm": "1.3.28",
@@ -3746,9 +3746,9 @@
       }
     },
     "node_modules/@jitsi/excalidraw": {
-      "version": "0.0.11",
-      "resolved": "https://github.com/jitsi/excalidraw/releases/download/v0.0.11/jitsi-excalidraw-0.0.11.tgz",
-      "integrity": "sha512-R0om5mYmjjozmJ6i5PXPSQy8/kiMTCqk/QVxOVryEUlHps4UeLNx+Gb/tjzNBN/C6db6ea+Vxt/l27nh9frphg==",
+      "version": "0.0.12",
+      "resolved": "https://github.com/jitsi/excalidraw/releases/download/v0.0.12/jitsi-excalidraw-0.0.12.tgz",
+      "integrity": "sha512-WFzaH5GCZLA5DTSZ6ReqAz9g53mSgi+211zTC7AFZUYZme5tzKpPg55AKkJZA3ZIRikkbKaEfP/dC4QOH5NMmA==",
       "license": "MIT",
       "peerDependencies": {
         "react": "^17.0.2",
@@ -3780,9 +3780,9 @@
       "integrity": "sha512-JujivPbOUvdRYa2xqByHYKfKGNGa7ZPyNLaNuh8hEp9XsiNfjaJAHdboq6M1VY9TP+765nyxC0LjpAw1VkikOQ=="
     },
     "node_modules/@jitsi/rtcstats": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/@jitsi/rtcstats/-/rtcstats-9.4.1.tgz",
-      "integrity": "sha512-JrRBk9xLAnRgBP9aqTjR41DBAQYMkupOfy8XMIumdjxlDqf8dQygvYRc253xdHejr/kSHCvnaFoVIM3hHfeooQ==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/@jitsi/rtcstats/-/rtcstats-9.5.0.tgz",
+      "integrity": "sha512-jKB+1IzKuqynA2etmWAA4uDFF0oAFUZWxRq+m+rOt8FfBp6pXojWbWA7xblcjxerj/3njGc8nEQbcK9qck1How==",
       "dependencies": {
         "@jitsi/js-utils": "^2.0.0",
         "sdp": "^3.0.3",
@@ -6493,9 +6493,9 @@
       }
     },
     "node_modules/@types/react-native": {
-      "version": "0.68.7",
-      "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.68.7.tgz",
-      "integrity": "sha512-icGr0/iTPLsvIrUoLvu5uluDFBMZEir+DbwgrHnvazO3fJv1C/kpZZLGplQ3noYyDLjuBynwOUgoaZpGyFI4Iw==",
+      "version": "0.68.9",
+      "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.68.9.tgz",
+      "integrity": "sha512-/1nbdoynVMjNsudurxHiEf9rSdviKAkV+pVgwpNk21v7gKJfzoHyT3nFunPuMoDgvvdZR5ofUrOJuCPbzF2GUw==",
       "dev": true,
       "dependencies": {
         "@types/react": "^17"
@@ -7349,9 +7349,9 @@
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.6.tgz",
-      "integrity": "sha512-HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ==",
+      "version": "0.7.9",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.9.tgz",
+      "integrity": "sha512-yceMpm/xd4W2a85iqZyO09gTnHvXF6pyiWjD2jcOJs7hRoZtNNOO1eJlhHj1ixA+xip2hOyGn+LgcvLCMo5zXA==",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -13497,8 +13497,8 @@
     },
     "node_modules/lib-jitsi-meet": {
       "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1535.0.0+e6263e7c/lib-jitsi-meet.tgz",
-      "integrity": "sha512-RgMoesoWyscWi2fL9Hxp8PUwDlUtHbo+GhXosD3GeKR0zmihu/kxTONMUifGQnF8XdtcjaZfL2jCJynLwYKlkw==",
+      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1549.0.0+877c4546/lib-jitsi-meet.tgz",
+      "integrity": "sha512-cxzr8vnJ6RyqWYzJ4LO09PqblJ6nIrJFFmzW8kPQgC1Nhq7sDAD896827q/shd+FE6bSoK0xVjDP+gW+JInS9A==",
       "license": "Apache-2.0",
       "dependencies": {
         "@jitsi/js-utils": "2.0.0",
@@ -16128,9 +16128,9 @@
       }
     },
     "node_modules/react-native": {
-      "version": "0.68.4",
-      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.68.4.tgz",
-      "integrity": "sha512-Hp5qwztQ1XNnV43QTz1kUx33iZHmJqbbe7L19V9psaWtX/h9j6SEtZ3UHBrigIPlppkIP1E5x3CDr9FdD4d6CA==",
+      "version": "0.68.5",
+      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.68.5.tgz",
+      "integrity": "sha512-t3kiQ/gumFV+0r/NRSIGtYxanjY4da0utFqHgkMcRPJVwXFWC0Fr8YiOeRGYO1dp8EfrSsOjtfWic/inqVYlbQ==",
       "dependencies": {
         "@jest/create-cache-key-function": "^27.0.1",
         "@react-native-community/cli": "^7.0.3",
@@ -23178,8 +23178,8 @@
       "dev": true
     },
     "@jitsi/excalidraw": {
-      "version": "https://github.com/jitsi/excalidraw/releases/download/v0.0.11/jitsi-excalidraw-0.0.11.tgz",
-      "integrity": "sha512-R0om5mYmjjozmJ6i5PXPSQy8/kiMTCqk/QVxOVryEUlHps4UeLNx+Gb/tjzNBN/C6db6ea+Vxt/l27nh9frphg=="
+      "version": "https://github.com/jitsi/excalidraw/releases/download/v0.0.12/jitsi-excalidraw-0.0.12.tgz",
+      "integrity": "sha512-WFzaH5GCZLA5DTSZ6ReqAz9g53mSgi+211zTC7AFZUYZme5tzKpPg55AKkJZA3ZIRikkbKaEfP/dC4QOH5NMmA=="
     },
     "@jitsi/js-utils": {
       "version": "2.0.4",
@@ -23208,9 +23208,9 @@
       "integrity": "sha512-JujivPbOUvdRYa2xqByHYKfKGNGa7ZPyNLaNuh8hEp9XsiNfjaJAHdboq6M1VY9TP+765nyxC0LjpAw1VkikOQ=="
     },
     "@jitsi/rtcstats": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/@jitsi/rtcstats/-/rtcstats-9.4.1.tgz",
-      "integrity": "sha512-JrRBk9xLAnRgBP9aqTjR41DBAQYMkupOfy8XMIumdjxlDqf8dQygvYRc253xdHejr/kSHCvnaFoVIM3hHfeooQ==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/@jitsi/rtcstats/-/rtcstats-9.5.0.tgz",
+      "integrity": "sha512-jKB+1IzKuqynA2etmWAA4uDFF0oAFUZWxRq+m+rOt8FfBp6pXojWbWA7xblcjxerj/3njGc8nEQbcK9qck1How==",
       "requires": {
         "@jitsi/js-utils": "^2.0.0",
         "sdp": "^3.0.3",
@@ -25178,9 +25178,9 @@
       }
     },
     "@types/react-native": {
-      "version": "0.68.7",
-      "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.68.7.tgz",
-      "integrity": "sha512-icGr0/iTPLsvIrUoLvu5uluDFBMZEir+DbwgrHnvazO3fJv1C/kpZZLGplQ3noYyDLjuBynwOUgoaZpGyFI4Iw==",
+      "version": "0.68.9",
+      "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.68.9.tgz",
+      "integrity": "sha512-/1nbdoynVMjNsudurxHiEf9rSdviKAkV+pVgwpNk21v7gKJfzoHyT3nFunPuMoDgvvdZR5ofUrOJuCPbzF2GUw==",
       "dev": true,
       "requires": {
         "@types/react": "^17"
@@ -25794,9 +25794,9 @@
       "dev": true
     },
     "@xmldom/xmldom": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.6.tgz",
-      "integrity": "sha512-HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ=="
+      "version": "0.7.9",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.9.tgz",
+      "integrity": "sha512-yceMpm/xd4W2a85iqZyO09gTnHvXF6pyiWjD2jcOJs7hRoZtNNOO1eJlhHj1ixA+xip2hOyGn+LgcvLCMo5zXA=="
     },
     "@xobotyi/scrollbar-width": {
       "version": "1.9.5",
@@ -30510,8 +30510,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1535.0.0+e6263e7c/lib-jitsi-meet.tgz",
-      "integrity": "sha512-RgMoesoWyscWi2fL9Hxp8PUwDlUtHbo+GhXosD3GeKR0zmihu/kxTONMUifGQnF8XdtcjaZfL2jCJynLwYKlkw==",
+      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1549.0.0+877c4546/lib-jitsi-meet.tgz",
+      "integrity": "sha512-cxzr8vnJ6RyqWYzJ4LO09PqblJ6nIrJFFmzW8kPQgC1Nhq7sDAD896827q/shd+FE6bSoK0xVjDP+gW+JInS9A==",
       "requires": {
         "@jitsi/js-utils": "2.0.0",
         "@jitsi/logger": "2.0.0",
@@ -32535,9 +32535,9 @@
       }
     },
     "react-native": {
-      "version": "0.68.4",
-      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.68.4.tgz",
-      "integrity": "sha512-Hp5qwztQ1XNnV43QTz1kUx33iZHmJqbbe7L19V9psaWtX/h9j6SEtZ3UHBrigIPlppkIP1E5x3CDr9FdD4d6CA==",
+      "version": "0.68.5",
+      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.68.5.tgz",
+      "integrity": "sha512-t3kiQ/gumFV+0r/NRSIGtYxanjY4da0utFqHgkMcRPJVwXFWC0Fr8YiOeRGYO1dp8EfrSsOjtfWic/inqVYlbQ==",
       "requires": {
         "@jest/create-cache-key-function": "^27.0.1",
         "@react-native-community/cli": "^7.0.3",

package.json

@@ -32,11 +32,11 @@
     "@giphy/react-components": "5.6.0",
     "@giphy/react-native-sdk": "1.7.0",
     "@hapi/bourne": "2.0.0",
-    "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.11/jitsi-excalidraw-0.0.11.tgz",
+    "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.12/jitsi-excalidraw-0.0.12.tgz",
     "@jitsi/js-utils": "2.0.4",
     "@jitsi/logger": "2.0.0",
     "@jitsi/rnnoise-wasm": "0.1.0",
-    "@jitsi/rtcstats": "9.4.1",
+    "@jitsi/rtcstats": "9.5.0",
     "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
     "@microsoft/microsoft-graph-client": "3.0.1",
     "@mui/material": "5.10.2",
@@ -60,7 +60,7 @@
     "@types/w3c-image-capture": "1.0.6",
     "@vladmandic/human": "2.6.5",
     "@vladmandic/human-models": "2.5.9",
-    "@xmldom/xmldom": "0.7.6",
+    "@xmldom/xmldom": "0.7.9",
     "amplitude-js": "8.2.1",
     "base64-js": "1.3.1",
     "bc-css-flags": "3.0.0",
@@ -79,7 +79,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/v1535.0.0+e6263e7c/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1549.0.0+877c4546/lib-jitsi-meet.tgz",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "moment-duration-format": "2.2.2",
@@ -93,7 +93,7 @@
     "react-focus-lock": "2.5.1",
     "react-i18next": "10.11.4",
     "react-linkify": "1.0.0-alpha",
-    "react-native": "0.68.4",
+    "react-native": "0.68.5",
     "react-native-background-timer": "2.4.1",
     "react-native-calendar-events": "2.2.0",
     "react-native-callstats": "3.73.7",
@@ -152,7 +152,7 @@
     "@types/js-md5": "0.4.3",
     "@types/lodash": "4.14.182",
     "@types/react": "17.0.14",
-    "@types/react-native": "0.68.7",
+    "@types/react-native": "0.68.9",
     "@types/react-redux": "7.1.24",
     "@types/react-window": "1.8.5",
     "@types/unorm": "1.3.28",

react/features/analytics/handlers/AmplitudeHandler.ts

@@ -1,5 +1,3 @@
-/* eslint-disable lines-around-comment */
-
 import logger from '../logger';
 
 import AbstractHandler, { IEvent } from './AbstractHandler';
@@ -103,8 +101,10 @@ export default class AmplitudeHandler extends AbstractHandler {
 
         return {
             sessionId: amplitude.getInstance().getSessionId(),
+
             // @ts-ignore
             deviceId: amplitude.getInstance().options.deviceId,
+
             // @ts-ignore
             userId: amplitude.getInstance().options.userId
         };

react/features/app/types.ts

@@ -24,7 +24,7 @@ import { IResponsiveUIState } from '../base/responsive-ui/reducer';
 import { ISettingsState } from '../base/settings/reducer';
 import { ISoundsState } from '../base/sounds/reducer';
 import { ITestingState } from '../base/testing/reducer';
-import { INoSrcDataState, ITracksState } from '../base/tracks/reducer';
+import { INoSrcDataState, ITrackOperations, ITracksState } from '../base/tracks/reducer';
 import { IUserInteractionState } from '../base/user-interaction/reducer';
 import { IBreakoutRoomsState } from '../breakout-rooms/reducer';
 import { ICalendarSyncState } from '../calendar-sync/reducer';
@@ -107,6 +107,7 @@ export interface IReduxState {
     'features/base/responsive-ui': IResponsiveUIState;
     'features/base/settings': ISettingsState;
     'features/base/sounds': ISoundsState;
+    'features/base/track-operations': ITrackOperations;
     'features/base/tracks': ITracksState;
     'features/base/user-interaction': IUserInteractionState;
     'features/breakout-rooms': IBreakoutRoomsState;

react/features/base/color-scheme/defaultScheme.js

@@ -1,5 +1,3 @@
-// @flow
-
 import { ColorPalette, getRGBAFormat } from '../styles';
 
 /**
@@ -14,21 +12,6 @@ export default {
         icon: 'rgb(28, 32, 37)',
         text: 'rgb(28, 32, 37)'
     },
-    'Chat': {
-        displayName: 'rgb(94, 109, 121)',
-        localMsgBackground: 'rgb(215, 230, 249)',
-        lobbyMsgBackground: 'rgb(106, 80, 211)',
-        lobbyMsgNotice: 'rgb(16, 10, 41)',
-        privateMsgBackground: 'rgb(250, 219, 219)',
-        privateMsgNotice: 'rgb(186, 39, 58)',
-        remoteMsgBackground: 'rgb(241, 242, 246)',
-        replyBorder: 'rgb(219, 197, 200)',
-        replyIcon: 'rgb(94, 109, 121)'
-    },
-    'Conference': {
-        inviteButtonBackground: 'rgb(0, 119, 225)',
-        onVideoText: 'white'
-    },
     'Dialog': {},
     'Header': {
         background: ColorPalette.blue,

react/features/base/conference/actionTypes.ts

@@ -138,6 +138,18 @@ export const CONFERENCE_WILL_LEAVE = 'CONFERENCE_WILL_LEAVE';
  */
 export const DATA_CHANNEL_OPENED = 'DATA_CHANNEL_OPENED';
 
+/**
+ * The type of (redux) action which signals that the data channel with the
+ * bridge has been closed.
+ *
+ * {
+ *     type: DATA_CHANNEL_CLOSED,
+ *     code: number,
+ *     reason: string
+ * }
+ */
+export const DATA_CHANNEL_CLOSED = 'DATA_CHANNEL_CLOSED';
+
 /**
  * The type of action which signals that the user has been kicked out from
  * the conference.

react/features/base/conference/actions.ts

@@ -1,4 +1,3 @@
-/* eslint-disable lines-around-comment */
 import { createStartMutedConfigurationEvent } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';
 import { appNavigate } from '../../app/actions';
@@ -22,11 +21,13 @@ import { getNormalizedDisplayName } from '../participants/functions';
 import { toState } from '../redux/functions';
 import {
     destroyLocalTracks,
-    replaceLocalTrack,
+    executeTrackOperation,
+    replaceStoredTracks,
     trackAdded,
     trackRemoved
-} from '../tracks/actions.any';
+} from '../tracks/actions';
 import { getLocalTracks } from '../tracks/functions';
+import { TrackOperationType } from '../tracks/types';
 import { getBackendSafeRoomName } from '../util/uri';
 
 import {
@@ -41,6 +42,7 @@ import {
     CONFERENCE_UNIQUE_ID_SET,
     CONFERENCE_WILL_JOIN,
     CONFERENCE_WILL_LEAVE,
+    DATA_CHANNEL_CLOSED,
     DATA_CHANNEL_OPENED,
     E2E_RTT_CHANGED,
     KICKED_OUT,
@@ -110,6 +112,7 @@ function _addConferenceListeners(conference: IJitsiConference, dispatch: IStore[
         JitsiConferenceEvents.CONFERENCE_LEFT,
         (...args: any[]) => {
             dispatch(conferenceTimestampChanged(0));
+
             // @ts-ignore
             dispatch(conferenceLeft(conference, ...args));
         });
@@ -136,34 +139,43 @@ function _addConferenceListeners(conference: IJitsiConference, dispatch: IStore[
     conference.on(
         JitsiConferenceEvents.STARTED_MUTED,
         () => {
-            const audioMuted = Boolean(conference.isStartAudioMuted());
-            const videoMuted = Boolean(conference.isStartVideoMuted());
-            const localTracks = getLocalTracks(state['features/base/tracks']);
+            dispatch(executeTrackOperation(TrackOperationType.AudioVideo, () => {
+                const promises = [];
+                const audioMuted = Boolean(conference.isStartAudioMuted());
+                const videoMuted = Boolean(conference.isStartVideoMuted());
+                const localTracks = getLocalTracks(state['features/base/tracks']);
 
-            sendAnalytics(createStartMutedConfigurationEvent('remote', audioMuted, videoMuted));
-            logger.log(`Start muted: ${audioMuted ? 'audio, ' : ''}${videoMuted ? 'video' : ''}`);
+                sendAnalytics(createStartMutedConfigurationEvent('remote', audioMuted, videoMuted));
+                logger.log(`Start muted: ${audioMuted ? 'audio, ' : ''}${videoMuted ? 'video' : ''}`);
 
-            // XXX Jicofo tells lib-jitsi-meet to start with audio and/or video
-            // muted i.e. Jicofo expresses an intent. Lib-jitsi-meet has turned
-            // Jicofo's intent into reality by actually muting the respective
-            // tracks. The reality is expressed in base/tracks already so what
-            // is left is to express Jicofo's intent in base/media.
-            // TODO Maybe the app needs to learn about Jicofo's intent and
-            // transfer that intent to lib-jitsi-meet instead of lib-jitsi-meet
-            // acting on Jicofo's intent without the app's knowledge.
-            dispatch(setAudioMuted(audioMuted));
-            dispatch(setVideoMuted(videoMuted));
+                // XXX Jicofo tells lib-jitsi-meet to start with audio and/or video
+                // muted i.e. Jicofo expresses an intent. Lib-jitsi-meet has turned
+                // Jicofo's intent into reality by actually muting the respective
+                // tracks. The reality is expressed in base/tracks already so what
+                // is left is to express Jicofo's intent in base/media.
+                // TODO Maybe the app needs to learn about Jicofo's intent and
+                // transfer that intent to lib-jitsi-meet instead of lib-jitsi-meet
+                // acting on Jicofo's intent without the app's knowledge.
+                promises.push(
+                    dispatch(setAudioMuted(audioMuted)).catch(e => logger.error(`Set audio muted failed: ${e}`)));
+                promises.push(
+                    dispatch(setVideoMuted(videoMuted)).catch(e => logger.error(`Set video muted failed: ${e}`)));
 
-            // Remove the tracks from peerconnection as well.
-            for (const track of localTracks) {
-                const trackType = track.jitsiTrack.getType();
+                // Remove the tracks from peerconnection as well.
+                for (const track of localTracks) {
+                    const trackType = track.jitsiTrack.getType();
 
-                // Do not remove the audio track on RN. Starting with iOS 15 it will fail to unmute otherwise.
-                if ((audioMuted && trackType === MEDIA_TYPE.AUDIO && navigator.product !== 'ReactNative')
-                        || (videoMuted && trackType === MEDIA_TYPE.VIDEO)) {
-                    dispatch(replaceLocalTrack(track.jitsiTrack, null, conference));
+                    // Do not remove the audio track on RN. Starting with iOS 15 it will fail to unmute otherwise.
+                    if ((audioMuted && trackType === MEDIA_TYPE.AUDIO && navigator.product !== 'ReactNative')
+                            || (videoMuted && trackType === MEDIA_TYPE.VIDEO)) {
+                        promises.push(
+                            dispatch(replaceStoredTracks(track.jitsiTrack, null))
+                            .catch(e => logger.error(`replaceLocalTrack failed: ${e}`)));
+                    }
                 }
-            }
+
+                return Promise.all(promises);
+            }));
         });
 
     conference.on(
@@ -581,6 +593,26 @@ export function dataChannelOpened() {
     };
 }
 
+/**
+ * Signals the data channel with the bridge was abruptly closed.
+ *
+ * @param {number} code - Close code.
+ * @param {string} reason - Close reason.
+ *
+ * @returns {{
+ *     type: DATA_CHANNEL_CLOSED,
+ *     code: number,
+ *     reason: string
+ * }}
+ */
+export function dataChannelClosed(code: number, reason: string) {
+    return {
+        type: DATA_CHANNEL_CLOSED,
+        code,
+        reason
+    };
+}
+
 /**
  * Action to end a conference for all participants.
  *

react/features/base/conference/functions.ts

@@ -454,18 +454,18 @@ export function sendLocalParticipant(
         name
     } = getLocalParticipant(stateful) ?? {};
 
-    avatarURL && conference.sendCommand(AVATAR_URL_COMMAND, {
+    avatarURL && conference?.sendCommand(AVATAR_URL_COMMAND, {
         value: avatarURL
     });
-    email && conference.sendCommand(EMAIL_COMMAND, {
+    email && conference?.sendCommand(EMAIL_COMMAND, {
         value: email
     });
 
     if (features && features['screen-sharing'] === 'true') {
-        conference.setLocalParticipantProperty('features_screen-sharing', true);
+        conference?.setLocalParticipantProperty('features_screen-sharing', true);
     }
 
-    conference.setDisplayName(name);
+    conference?.setDisplayName(name);
 }
 
 /**

react/features/base/conference/reducer.ts

@@ -1,4 +1,6 @@
+import { FaceLandmarks } from '../../face-landmarks/types';
 import { LOCKED_LOCALLY, LOCKED_REMOTELY } from '../../room-lock/constants';
+import { ISpeakerStats } from '../../speaker-stats/reducer';
 import { CONNECTION_WILL_CONNECT, SET_LOCATION_URL } from '../connection/actionTypes';
 import { JitsiConferenceErrors } from '../lib-jitsi-meet';
 import ReducerRegistry from '../redux/ReducerRegistry';
@@ -53,20 +55,24 @@ export interface IJitsiConference {
     getMeetingUniqueId: Function;
     getParticipantById: Function;
     getParticipants: Function;
+    getSpeakerStats: () => ISpeakerStats;
     grantOwner: Function;
     isAVModerationSupported: Function;
     isCallstatsEnabled: Function;
+    isE2EEEnabled: Function;
     isEndConferenceSupported: Function;
     isLobbySupported: Function;
     isSIPCallingSupported: Function;
     isStartAudioMuted: Function;
     isStartVideoMuted: Function;
     join: Function;
+    joinLobby: Function;
     kickParticipant: Function;
     lock: Function;
     muteParticipant: Function;
     myLobbyUserId: Function;
     myUserId: Function;
+    off: Function;
     on: Function;
     removeTrack: Function;
     replaceTrack: Function;
@@ -74,6 +80,7 @@ export interface IJitsiConference {
     sendCommand: Function;
     sendCommandOnce: Function;
     sendEndpointMessage: Function;
+    sendFaceLandmarks: (faceLandmarks: FaceLandmarks) => void;
     sendFeedback: Function;
     sendLobbyMessage: Function;
     sessionId: string;
@@ -83,6 +90,7 @@ export interface IJitsiConference {
     setReceiverConstraints: Function;
     setSenderVideoConstraint: Function;
     setSubject: Function;
+    startVerification: Function;
 }
 
 export interface IConferenceState {
@@ -100,7 +108,7 @@ export interface IConferenceState {
     leaving?: Object;
     localSubject?: string;
     locked?: string;
-    membersOnly?: Object;
+    membersOnly?: IJitsiConference;
     obfuscatedRoom?: string;
     obfuscatedRoomSource?: string;
     p2p?: Object;
@@ -223,7 +231,8 @@ function _authStatusChanged(state: IConferenceState,
  * @returns {Object} The new state of the feature base/conference after the
  * reduction of the specified action.
  */
-function _conferenceFailed(state: IConferenceState, { conference, error }: { conference: Object; error: Error; }) {
+function _conferenceFailed(state: IConferenceState, { conference, error }: {
+    conference: IJitsiConference; error: Error; }) {
     // The current (similar to getCurrentConference in
     // base/conference/functions.any.js) conference which is joining or joined:
     const conference_ = state.conference || state.joining;

react/features/base/config/configType.ts

@@ -316,6 +316,7 @@ export interface IConfig {
         sdkKey?: string;
         tileTime?: number;
     };
+    googleApiApplicationClientID?: string;
     gravatar?: {
         baseUrl?: string;
         disabled?: boolean;
@@ -366,6 +367,7 @@ export interface IConfig {
     localSubject?: string;
     locationURL?: URL;
     maxFullResolutionParticipants?: number;
+    microsoftApiApplicationClientID?: string;
     moderatedRoomServiceUrl?: string;
     mouseMoveCallbackInterval?: number;
     noticeMessage?: string;

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

@@ -1,6 +1,6 @@
-/* eslint-disable lines-around-comment */
 // @ts-ignore
 import Bourne from '@hapi/bourne';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { jitsiLocalStorage } from '@jitsi/js-utils';
 import _ from 'lodash';

react/features/base/config/middleware.ts

@@ -2,6 +2,7 @@ import { AnyAction } from 'redux';
 
 import { IStore } from '../../app/types';
 import { getFeatureFlag } from '../flags/functions';
+import Platform from '../react/Platform';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
 import { updateSettings } from '../settings/actions';
 
@@ -52,7 +53,7 @@ function _setConfig({ dispatch, getState }: IStore, next: Function, action: AnyA
     const settings = state['features/base/settings'];
     const config: IConfig = {};
 
-    if (typeof settings.disableP2P !== 'undefined') {
+    if (Platform.OS !== 'android' && typeof settings.disableP2P !== 'undefined') {
         config.p2p = { enabled: !settings.disableP2P };
     }
 

react/features/base/config/reducer.ts

@@ -1,6 +1,7 @@
 import _ from 'lodash';
 
 import { CONFERENCE_INFO } from '../../conference/components/constants';
+import Platform from '../react/Platform';
 import ReducerRegistry from '../redux/ReducerRegistry';
 import { equals } from '../redux/functions';
 
@@ -48,6 +49,8 @@ const INITIAL_RN_STATE: IConfig = {
     disableAudioLevels: true,
 
     p2p: {
+        // Temporarily disable P2P on Android while we sort out some (codec?) issues.
+        ...(Platform.OS === 'android' ? { enabled: false } : {}), // eslint-disable-line no-extra-parens
         preferredCodec: 'h264'
     },
 
@@ -74,6 +77,7 @@ export interface IConfigState extends IConfig {
     analysis?: {
         obfuscateRoomName?: boolean;
     };
+    disableRemoteControl?: boolean;
     error?: Error;
 }
 

react/features/base/connection/reducer.ts

@@ -16,6 +16,7 @@ import { ConnectionFailedError } from './actions.any';
 export interface IConnectionState {
     connecting?: any;
     connection?: {
+        addFeature: Function;
         disconnect: Function;
         getJid: () => string;
         getLogs: () => Object;

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

@@ -4,6 +4,7 @@ import WaitForOwnerDialog from '../../authentication/components/web/WaitForOwner
 import ChatPrivacyDialog from '../../chat/components/web/ChatPrivacyDialog';
 import DesktopPicker from '../../desktop-picker/components/DesktopPicker';
 import DisplayNamePrompt from '../../display-name/components/web/DisplayNamePrompt';
+import ParticipantVerificationDialog from '../../e2ee/components/ParticipantVerificationDialog';
 import EmbedMeetingDialog from '../../embed-meeting/components/EmbedMeetingDialog';
 // @ts-ignore
 import FeedbackDialog from '../../feedback/components/FeedbackDialog.web';
@@ -49,7 +50,7 @@ const NEW_DIALOG_LIST = [ KeyboardShortcutsDialog, ChatPrivacyDialog, DisplayNam
     SharedVideoDialog, SpeakerStats, LanguageSelectorDialog, MuteEveryoneDialog, MuteEveryonesVideoDialog,
     GrantModeratorDialog, KickRemoteParticipantDialog, MuteRemoteParticipantsVideoDialog, VideoQualityDialog,
     VirtualBackgroundDialog, LoginDialog, WaitForOwnerDialog, DesktopPicker, RemoteControlAuthorizationDialog,
-    LogoutDialog, SalesforceLinkDialog ];
+    LogoutDialog, SalesforceLinkDialog, ParticipantVerificationDialog ];
 
 // This function is necessary while the transition from @atlaskit dialog to our component is ongoing.
 const isNewDialog = (component: any) => NEW_DIALOG_LIST.some(comp => comp === component);

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

@@ -1,8 +1,8 @@
-/* eslint-disable lines-around-comment */
 import React, { useCallback } from 'react';
 
 // @ts-ignore
 import { Container } from '../../react/base';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { styleTypeToObject } from '../../styles';
 

react/features/base/icons/svg/emotions-angry.svg

@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1897)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M5.46845 5.14411C5.08781 4.88541 4.56951 4.98428 4.31081 5.36492C4.05212 5.74557 4.15098 6.26387 4.53163 6.52257L5.47766 7.16551C5.18224 7.46624 5.00002 7.87855 5.00002 8.33341C5.00002 9.25388 5.74622 10.0001 6.66669 10.0001C7.58716 10.0001 8.33336 9.25388 8.33336 8.33341C8.33336 8.23415 8.32468 8.13691 8.30804 8.04242C8.54426 7.66462 8.44124 7.16449 8.06956 6.91188L5.46845 5.14411ZM6.66305 14.7842C6.30373 14.5781 6.1795 14.1198 6.38556 13.7605C6.75032 13.1244 7.27645 12.5959 7.91081 12.2283C8.54518 11.8607 9.26532 11.6669 9.99852 11.6667C10.7317 11.6664 11.452 11.8596 12.0866 12.2268C12.7213 12.5939 13.2478 13.1221 13.613 13.7578C13.8193 14.117 13.6954 14.5754 13.3362 14.7818C12.9771 14.9881 12.5186 14.8642 12.3123 14.505C12.0786 14.0981 11.7416 13.7601 11.3354 13.5251C10.9293 13.2901 10.4683 13.1665 9.99906 13.1667C9.52981 13.1668 9.06892 13.2908 8.66293 13.5261C8.25693 13.7614 7.92021 14.0996 7.68677 14.5067C7.4807 14.866 7.02237 14.9902 6.66305 14.7842ZM15.7903 5.36492C15.5316 4.98428 15.0134 4.88541 14.6327 5.14411L12.0316 6.91188C11.7043 7.13434 11.5853 7.54876 11.7229 7.90254C11.6862 8.03998 11.6667 8.18441 11.6667 8.33341C11.6667 9.25388 12.4129 10.0001 13.3334 10.0001C14.2538 10.0001 15 9.25388 15 8.33341C15 7.89926 14.834 7.50388 14.562 7.20728L15.5695 6.52257C15.9502 6.26387 16.049 5.74557 15.7903 5.36492Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1897" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#F26325"/>
+<stop offset="1" stop-color="#F24A25"/>
+</radialGradient>
+</defs>
+</svg>

react/features/base/icons/svg/emotions-disgusted.svg

@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_351_6183)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M4.16669 7.50001C4.16669 7.03977 4.53978 6.66667 5.00002 6.66667H7.50002C7.96026 6.66667 8.33335 7.03977 8.33335 7.50001C8.33335 7.96024 7.96026 8.33334 7.50002 8.33334H5.00002C4.53978 8.33334 4.16669 7.96024 4.16669 7.50001ZM6.66669 15C6.66669 13.1591 8.15907 11.6667 10 11.6667C11.841 11.6667 13.3334 13.1591 13.3334 15H6.66669ZM12.5 6.66667C12.0398 6.66667 11.6667 7.03977 11.6667 7.50001C11.6667 7.96024 12.0398 8.33334 12.5 8.33334H15C15.4603 8.33334 15.8334 7.96024 15.8334 7.50001C15.8334 7.03977 15.4603 6.66667 15 6.66667H12.5Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_351_6183" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#98E791"/>
+<stop offset="1" stop-color="#3C9845"/>
+</radialGradient>
+</defs>
+</svg>

react/features/base/icons/svg/emotions-fearful.svg

@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1884)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M8.33333 7.49999C8.33333 8.42047 7.58714 9.16666 6.66667 9.16666C5.74619 9.16666 5 8.42047 5 7.49999C5 6.57952 5.74619 5.83333 6.66667 5.83333C7.58714 5.83333 8.33333 6.57952 8.33333 7.49999ZM15 7.49999C15 8.42047 14.2538 9.16666 13.3333 9.16666C12.4129 9.16666 11.6667 8.42047 11.6667 7.49999C11.6667 6.57952 12.4129 5.83333 13.3333 5.83333C14.2538 5.83333 15 6.57952 15 7.49999ZM10 11.6667C8.15905 11.6667 6.66667 13.159 6.66667 15H13.3333C13.3333 13.159 11.8409 11.6667 10 11.6667Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1884" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#6BEBD4"/>
+<stop offset="1" stop-color="#077EA4"/>
+</radialGradient>
+</defs>
+</svg>

react/features/base/icons/svg/emotions-happy.svg

@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1844)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M8.33333 7.49999C8.33333 8.42047 7.58714 9.16666 6.66667 9.16666C5.74619 9.16666 5 8.42047 5 7.49999C5 6.57952 5.74619 5.83333 6.66667 5.83333C7.58714 5.83333 8.33333 6.57952 8.33333 7.49999ZM15 7.49999C15 8.42047 14.2538 9.16666 13.3333 9.16666C12.4129 9.16666 11.6667 8.42047 11.6667 7.49999C11.6667 6.57952 12.4129 5.83333 13.3333 5.83333C14.2538 5.83333 15 6.57952 15 7.49999ZM7.53238 12.6776C7.37535 12.2943 6.93734 12.1109 6.55404 12.2679C6.17075 12.4249 5.98732 12.8629 6.14435 13.2462C6.45676 14.0088 6.98828 14.6616 7.6717 15.1221C8.35513 15.5826 9.15976 15.8301 9.98384 15.8333C10.8079 15.8365 11.6144 15.5953 12.3014 15.1401C12.9884 14.6849 13.525 14.0362 13.8433 13.2761C14.0033 12.894 13.8233 12.4546 13.4412 12.2946C13.0591 12.1346 12.6197 12.3146 12.4597 12.6967C12.256 13.1832 11.9126 13.5983 11.4729 13.8896C11.0332 14.181 10.5171 14.3354 9.98966 14.3333C9.46224 14.3313 8.94728 14.1729 8.50989 13.8782C8.0725 13.5834 7.73232 13.1656 7.53238 12.6776Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1844" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#F2AD25"/>
+<stop offset="1" stop-color="#F27B25"/>
+</radialGradient>
+</defs>
+</svg>

react/features/base/icons/svg/emotions-neutral.svg

@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1850)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M8.33333 7.49999C8.33333 8.42047 7.58714 9.16666 6.66667 9.16666C5.74619 9.16666 5 8.42047 5 7.49999C5 6.57952 5.74619 5.83333 6.66667 5.83333C7.58714 5.83333 8.33333 6.57952 8.33333 7.49999ZM15 7.49999C15 8.42047 14.2538 9.16666 13.3333 9.16666C12.4129 9.16666 11.6667 8.42047 11.6667 7.49999C11.6667 6.57952 12.4129 5.83333 13.3333 5.83333C14.2538 5.83333 15 6.57952 15 7.49999ZM7.5 13.3333C7.03976 13.3333 6.66667 13.7064 6.66667 14.1667C6.66667 14.6269 7.03976 15 7.5 15H12.5C12.9602 15 13.3333 14.6269 13.3333 14.1667C13.3333 13.7064 12.9602 13.3333 12.5 13.3333H7.5Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1850" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#AAAAAA"/>
+<stop offset="1" stop-color="#5E5E5E"/>
+</radialGradient>
+</defs>
+</svg>

react/features/base/icons/svg/emotions-sad.svg

@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1862)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M8.33333 7.49999C8.33333 8.42047 7.58714 9.16666 6.66667 9.16666C5.74619 9.16666 5 8.42047 5 7.49999C5 6.57952 5.74619 5.83333 6.66667 5.83333C7.58714 5.83333 8.33333 6.57952 8.33333 7.49999ZM15 7.49999C15 8.42047 14.2538 9.16666 13.3333 9.16666C12.4129 9.16666 11.6667 8.42047 11.6667 7.49999C11.6667 6.57952 12.4129 5.83333 13.3333 5.83333C14.2538 5.83333 15 6.57952 15 7.49999ZM6.38554 13.7605C6.17948 14.1198 6.30371 14.5781 6.66303 14.7842C7.02235 14.9902 7.48068 14.866 7.68675 14.5067C7.92019 14.0996 8.25691 13.7614 8.66291 13.5261C9.0689 13.2908 9.52979 13.1668 9.99904 13.1667C10.4683 13.1665 10.9293 13.2901 11.3354 13.5251C11.7416 13.7601 12.0786 14.0981 12.3123 14.505C12.5186 14.8642 12.977 14.9881 13.3362 14.7818C13.6954 14.5754 13.8193 14.117 13.613 13.7578C13.2477 13.1221 12.7212 12.5939 12.0866 12.2268C11.452 11.8596 10.7317 11.6664 9.9985 11.6667C9.2653 11.6669 8.54516 11.8607 7.91079 12.2283C7.27643 12.5959 6.7503 13.1244 6.38554 13.7605Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1862" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#65B3FB"/>
+<stop offset="1" stop-color="#256BF2"/>
+</radialGradient>
+</defs>
+</svg>

react/features/base/icons/svg/emotions-surprised.svg

@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1873)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.33333 7.49999C8.33333 8.42047 7.58714 9.16666 6.66667 9.16666C5.74619 9.16666 5 8.42047 5 7.49999C5 6.57952 5.74619 5.83333 6.66667 5.83333C7.58714 5.83333 8.33333 6.57952 8.33333 7.49999ZM15 7.49999C15 8.42047 14.2538 9.16666 13.3333 9.16666C12.4129 9.16666 11.6667 8.42047 11.6667 7.49999C11.6667 6.57952 12.4129 5.83333 13.3333 5.83333C14.2538 5.83333 15 6.57952 15 7.49999ZM10 15C11.3807 15 12.5 14.403 12.5 13.6667C12.5 12.9303 11.3807 11.6667 10 11.6667C8.61929 11.6667 7.5 12.9303 7.5 13.6667C7.5 14.403 8.61929 15 10 15Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1873" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#CC86E4"/>
+<stop offset="1" stop-color="#933CD8"/>
+</radialGradient>
+</defs>
+</svg>

react/features/base/icons/svg/index.ts

@@ -29,6 +29,13 @@ export { default as IconE2EE } from './e2ee.svg';
 export { default as IconEnlarge } from './enlarge.svg';
 export { default as IconEnterFullscreen } from './enter-fullscreen.svg';
 export { default as IconEnvelope } from './envelope.svg';
+export { default as IconEmotionsAngry } from './emotions-angry.svg';
+export { default as IconEmotionsDisgusted } from './emotions-disgusted.svg';
+export { default as IconEmotionsFearful } from './emotions-fearful.svg';
+export { default as IconEmotionsHappy } from './emotions-happy.svg';
+export { default as IconEmotionsNeutral } from './emotions-neutral.svg';
+export { default as IconEmotionsSad } from './emotions-sad.svg';
+export { default as IconEmotionsSurprised } from './emotions-surprised.svg';
 export { default as IconExclamationSolid } from './exclamation-solid.svg';
 export { default as IconExclamationTriangle } from './exclamation-triangle.svg';
 export { default as IconExitFullscreen } from './exit-fullscreen.svg';

react/features/base/media/actions.ts

@@ -2,6 +2,11 @@ import { IStore } from '../../app/types';
 import { showModeratedNotification } from '../../av-moderation/actions';
 import { shouldShowModeratedNotification } from '../../av-moderation/functions';
 import { isModerationNotificationDisplayed } from '../../notifications/functions';
+import { isForceMuted } from '../../participants-pane/functions';
+import { maybeStopMuteBecauseOfLocalRecording } from '../../recording/functions';
+import { getLocalParticipant } from '../participants/functions';
+import { setMuted } from '../tracks/actions.any';
+import { isUserInteractionRequiredForUnmute } from '../tracks/functions';
 
 import {
     SET_AUDIO_AVAILABLE,
@@ -53,10 +58,32 @@ export function setAudioAvailable(available: boolean) {
  * }}
  */
 export function setAudioMuted(muted: boolean, ensureTrack = false) {
-    return {
-        type: SET_AUDIO_MUTED,
-        ensureTrack,
-        muted
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+        const state = getState();
+        const participant = getLocalParticipant(state);
+
+        if (!muted && isForceMuted(participant, MEDIA_TYPE.AUDIO, state)) {
+            return Promise.resolve();
+        }
+
+        if (!muted
+            && isUserInteractionRequiredForUnmute(state)) {
+            return Promise.resolve();
+        }
+
+        const mutePromise = dispatch(setMuted({
+            muted,
+            ensureTrack,
+            mediaType: MEDIA_TYPE.AUDIO
+        }));
+
+        dispatch({
+            type: SET_AUDIO_MUTED,
+            ensureTrack,
+            muted
+        });
+
+        return mutePromise;
     };
 }
 
@@ -114,7 +141,7 @@ export function setScreenshareMuted(
                 ensureTrack && dispatch(showModeratedNotification(MEDIA_TYPE.SCREENSHARE));
             }
 
-            return;
+            return Promise.resolve();
         }
 
         const oldValue = state['features/base/media'].screenshare.muted;
@@ -122,13 +149,28 @@ export function setScreenshareMuted(
         // eslint-disable-next-line no-bitwise
         const newValue = muted ? oldValue | authority : oldValue & ~authority;
 
-        return dispatch({
+        const participant = getLocalParticipant(state);
+
+        if (!newValue && isForceMuted(participant, MEDIA_TYPE.SCREENSHARE, state)) {
+            return Promise.resolve();
+        }
+
+        const mutePromise = dispatch(setMuted({
+            authority,
+            mediaType,
+            ensureTrack,
+            muted: Boolean(newValue)
+        }));
+
+        dispatch({
             type: SET_SCREENSHARE_MUTED,
             authority,
             mediaType,
             ensureTrack,
             muted: newValue
         });
+
+        return mutePromise;
     };
 }
 
@@ -163,7 +205,7 @@ export function setVideoAvailable(available: boolean) {
  */
 export function setVideoMuted(
         muted: boolean,
-        mediaType: string = MEDIA_TYPE.VIDEO,
+        mediaType: MediaType = MEDIA_TYPE.VIDEO,
         authority: number = VIDEO_MUTISM_AUTHORITY.USER,
         ensureTrack = false) {
     return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
@@ -175,21 +217,43 @@ export function setVideoMuted(
                 ensureTrack && dispatch(showModeratedNotification(MEDIA_TYPE.VIDEO));
             }
 
-            return;
+            return Promise.resolve();
         }
 
         const oldValue = state['features/base/media'].video.muted;
 
         // eslint-disable-next-line no-bitwise
         const newValue = muted ? oldValue | authority : oldValue & ~authority;
+        const participant = getLocalParticipant(state);
 
-        return dispatch({
+        if (!newValue && isForceMuted(participant, MEDIA_TYPE.VIDEO, state)) {
+            return Promise.resolve();
+        }
+
+        if (maybeStopMuteBecauseOfLocalRecording(Boolean(newValue), dispatch)) {
+            return Promise.resolve();
+        }
+
+        if (!newValue && isUserInteractionRequiredForUnmute(state)) {
+            return Promise.resolve();
+        }
+
+        const mutePromise = dispatch(setMuted({
+            ensureTrack,
+            authority,
+            muted: Boolean(newValue),
+            mediaType
+        }));
+
+        dispatch({
             type: SET_VIDEO_MUTED,
             authority,
             mediaType,
             ensureTrack,
             muted: newValue
         });
+
+        return mutePromise;
     };
 }
 

react/features/base/media/middleware.js

@@ -12,12 +12,10 @@ import {
     NOTIFICATION_TIMEOUT_TYPE,
     showWarningNotification
 } from '../../notifications';
-import { isForceMuted } from '../../participants-pane/functions';
 import { isScreenMediaShared } from '../../screen-share/functions';
 import { SET_AUDIO_ONLY, setAudioOnly } from '../audio-only';
 import { SET_ROOM, isRoomValid } from '../conference';
 import { getMultipleVideoSendingSupportFeatureFlag } from '../config';
-import { getLocalParticipant } from '../participants';
 import { MiddlewareRegistry } from '../redux';
 import { getPropertyValue } from '../settings';
 import {
@@ -27,12 +25,11 @@ import {
     isLocalVideoTrackDesktop,
     setTrackMuted
 } from '../tracks';
+import { executeTrackOperation } from '../tracks/actions';
+import { TrackOperationType } from '../tracks/types';
 
 import {
-    SET_AUDIO_MUTED,
     SET_AUDIO_UNMUTE_PERMISSIONS,
-    SET_SCREENSHARE_MUTED,
-    SET_VIDEO_MUTED,
     SET_VIDEO_UNMUTE_PERMISSIONS
 } from './actionTypes';
 import {
@@ -54,6 +51,9 @@ import {
     _VIDEO_INITIAL_MEDIA_STATE
 } from './reducer';
 
+
+import './subscriber';
+
 /**
  * Implements the entry point of the middleware of the feature base/media.
  *
@@ -83,16 +83,6 @@ MiddlewareRegistry.register(store => next => action => {
         return result;
     }
 
-    case SET_AUDIO_MUTED: {
-        const state = store.getState();
-        const participant = getLocalParticipant(state);
-
-        if (!action.muted && isForceMuted(participant, MEDIA_TYPE.AUDIO, state)) {
-            return;
-        }
-        break;
-    }
-
     case SET_AUDIO_UNMUTE_PERMISSIONS: {
         const { blocked, skipNotification } = action;
         const state = store.getState();
@@ -108,25 +98,6 @@ MiddlewareRegistry.register(store => next => action => {
         break;
     }
 
-    case SET_SCREENSHARE_MUTED: {
-        const state = store.getState();
-        const participant = getLocalParticipant(state);
-
-        if (!action.muted && isForceMuted(participant, MEDIA_TYPE.SCREENSHARE, state)) {
-            return;
-        }
-        break;
-    }
-    case SET_VIDEO_MUTED: {
-        const state = store.getState();
-        const participant = getLocalParticipant(state);
-
-        if (!action.muted && isForceMuted(participant, MEDIA_TYPE.VIDEO, state)) {
-            return;
-        }
-        break;
-    }
-
     case SET_VIDEO_UNMUTE_PERMISSIONS: {
         const { blocked, skipNotification } = action;
         const state = store.getState();
@@ -191,9 +162,12 @@ function _setAudioOnly({ dispatch, getState }, next, action) {
     sendAnalytics(createTrackMutedEvent('video', 'audio-only mode', audioOnly));
 
     // Make sure we mute both the desktop and video tracks.
-    dispatch(setVideoMuted(audioOnly, MEDIA_TYPE.VIDEO, VIDEO_MUTISM_AUTHORITY.AUDIO_ONLY));
+    dispatch(executeTrackOperation(TrackOperationType.Video,
+        () => dispatch(setVideoMuted(audioOnly, MEDIA_TYPE.VIDEO, VIDEO_MUTISM_AUTHORITY.AUDIO_ONLY))));
     if (getMultipleVideoSendingSupportFeatureFlag(state)) {
-        dispatch(setScreenshareMuted(audioOnly, MEDIA_TYPE.SCREENSHARE, SCREENSHARE_MUTISM_AUTHORITY.AUDIO_ONLY));
+        dispatch(executeTrackOperation(TrackOperationType.Video,
+            () => dispatch(setScreenshareMuted(
+                audioOnly, MEDIA_TYPE.SCREENSHARE, SCREENSHARE_MUTISM_AUTHORITY.AUDIO_ONLY))));
     }
 
     return next(action);
@@ -234,9 +208,9 @@ function _setRoom({ dispatch, getState }, next, action) {
     // Unconditionally express the desires/expectations/intents of the app and
     // the user i.e. the state of base/media. Eventually, practice/reality i.e.
     // the state of base/tracks will or will not agree with the desires.
-    dispatch(setAudioMuted(audioMuted));
+    dispatch(executeTrackOperation(TrackOperationType.Audio, () => dispatch(setAudioMuted(audioMuted))));
     dispatch(setCameraFacingMode(CAMERA_FACING_MODE.USER));
-    dispatch(setVideoMuted(videoMuted));
+    dispatch(executeTrackOperation(TrackOperationType.Video, () => dispatch(setVideoMuted(videoMuted))));
 
     // startAudioOnly
     //
@@ -296,21 +270,29 @@ function _setRoom({ dispatch, getState }, next, action) {
  * @private
  * @returns {void}
  */
-function _syncTrackMutedState({ getState }, track) {
-    const state = getState()['features/base/media'];
+function _syncTrackMutedState({ dispatch, getState }, track) {
     const mediaType = track.mediaType;
-    const muted = Boolean(state[mediaType].muted);
+    const trackOpType = mediaType === MEDIA_TYPE.AUDIO ? TrackOperationType.Audio : TrackOperationType.Video;
 
-    // XXX If muted state of track when it was added is different from our media
-    // muted state, we need to mute track and explicitly modify 'muted' property
-    // on track. This is because though TRACK_ADDED action was dispatched it's
-    // not yet in redux state and JitsiTrackEvents.TRACK_MUTE_CHANGED may be
-    // fired before track gets to state.
-    if (track.muted !== muted) {
-        sendAnalytics(createSyncTrackStateEvent(mediaType, muted));
-        logger.log(`Sync ${mediaType} track muted state to ${muted ? 'muted' : 'unmuted'}`);
+    dispatch(executeTrackOperation(trackOpType, () => {
+        const state = getState()['features/base/media'];
 
-        track.muted = muted;
-        setTrackMuted(track.jitsiTrack, muted, state);
-    }
+        const muted = Boolean(state[mediaType].muted);
+
+        // XXX If muted state of track when it was added is different from our media
+        // muted state, we need to mute track and explicitly modify 'muted' property
+        // on track. This is because though TRACK_ADDED action was dispatched it's
+        // not yet in redux state and JitsiTrackEvents.TRACK_MUTE_CHANGED may be
+        // fired before track gets to state.
+        if (track.muted !== muted) {
+            sendAnalytics(createSyncTrackStateEvent(track.mediaType, muted));
+            logger.log(`Sync ${track.mediaType} track muted state to ${muted ? 'muted' : 'unmuted'}`);
+
+            track.muted = muted;
+
+            return setTrackMuted(track.jitsiTrack, muted, state);
+        }
+
+        return Promise.resolve();
+    }));
 }

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

@@ -1 +0,0 @@
-import './middleware.any.js';

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

@@ -1,45 +0,0 @@
-import './middleware.any.js';
-
-import { IStore } from '../../app/types';
-import { showNotification } from '../../notifications/actions';
-import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
-import LocalRecordingManager from '../../recording/components/Recording/LocalRecordingManager.web';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
-import StopRecordingDialog from '../../recording/components/Recording/web/StopRecordingDialog';
-import { openDialog } from '../dialog/actions';
-import MiddlewareRegistry from '../redux/MiddlewareRegistry';
-
-import { SET_VIDEO_MUTED } from './actionTypes';
-
-import './subscriber';
-
-/**
- * Implements the entry point of the middleware of the feature base/media.
- *
- * @param {IStore} store - The redux store.
- * @returns {Function}
- */
-MiddlewareRegistry.register((store: IStore) => (next: Function) => (action: any) => {
-    const { dispatch } = store;
-
-    switch (action.type) {
-    case SET_VIDEO_MUTED: {
-        if (LocalRecordingManager.isRecordingLocally() && LocalRecordingManager.selfRecording.on) {
-            if (action.muted && LocalRecordingManager.selfRecording.withVideo) {
-                dispatch(openDialog(StopRecordingDialog, { localRecordingVideoStop: true }));
-
-                return;
-            } else if (!action.muted && !LocalRecordingManager.selfRecording.withVideo) {
-                dispatch(showNotification({
-                    titleKey: 'recording.localRecordingNoVideo',
-                    descriptionKey: 'recording.localRecordingVideoWarning',
-                    uid: 'recording.localRecordingNoVideo'
-                }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
-            }
-        }
-    }
-    }
-
-    return next(action);
-});

react/features/base/modal/components/JitsiKeyboardAvoidingView.js

@@ -53,9 +53,9 @@ const JitsiKeyboardAvoidingView = (
             addBottomPadding = true,
             children,
             contentContainerStyle,
+            disableForcedKeyboardDismiss,
             hasTabNavigator,
             hasBottomTextInput,
-            disableForcedKeyboardDismiss,
             style
         }: Props) => {
     const headerHeight = useHeaderHeight();

react/features/base/modal/components/JitsiScreen.js

@@ -60,10 +60,10 @@ const JitsiScreen = ({
     addBottomPadding,
     contentContainerStyle,
     children,
+    disableForcedKeyboardDismiss = false,
     footerComponent,
     hasTabNavigator = false,
     hasBottomTextInput = false,
-    disableForcedKeyboardDismiss = false,
     safeAreaInsets = [ 'left', 'right' ],
     style
 }: Props) => {

react/features/base/participants/actions.ts

@@ -477,18 +477,19 @@ export function participantMutedUs(participant: any, track: any) {
 /**
  * Action to create a virtual screenshare participant.
  *
- * @param {(string)} sourceName - JitsiTrack instance.
- * @param {(boolean)} local - JitsiTrack instance.
+ * @param {(string)} sourceName - The source name of the JitsiTrack instance.
+ * @param {(boolean)} local - Whether it's a local or remote participant.
+ * @param {JitsiConference} conference - The conference instance for which the participant is to be created.
  * @returns {Function}
  */
-export function createVirtualScreenshareParticipant(sourceName: string, local: boolean) {
+export function createVirtualScreenshareParticipant(sourceName: string, local: boolean, conference: any) {
     return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
         const state = getState();
         const ownerId = getVirtualScreenshareParticipantOwnerId(sourceName);
         const ownerName = getParticipantDisplayName(state, ownerId);
 
         dispatch(participantJoined({
-            conference: state['features/base/conference'].conference,
+            conference,
             fakeParticipant: local ? FakeParticipant.LocalScreenShare : FakeParticipant.RemoteScreenShare,
             id: sourceName,
             name: ownerName

react/features/base/participants/functions.ts

@@ -1,9 +1,7 @@
-/* eslint-disable lines-around-comment */
 // @ts-ignore
 import { getGravatarURL } from '@jitsi/js-utils/avatar';
 
 import { IReduxState, IStore } from '../../app/types';
-// @ts-ignore
 import { isStageFilmstripAvailable } from '../../filmstrip/functions';
 import { IStateful } from '../app/types';
 import { GRAVATAR_BASE_URL } from '../avatar/constants';
@@ -20,6 +18,7 @@ import {
     PARTICIPANT_ROLE,
     WHITEBOARD_PARTICIPANT_ICON
 } from './constants';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { preloadImage } from './preloadImage';
 import { FakeParticipant, IParticipant } from './types';

react/features/base/participants/subscriber.ts

@@ -46,7 +46,7 @@ function _updateScreenshareParticipants({ getState, dispatch }: IStore) {
 
     if (getMultipleVideoSendingSupportFeatureFlag(state)) {
         if (!localScreenShare && newLocalSceenshareSourceName) {
-            dispatch(createVirtualScreenshareParticipant(newLocalSceenshareSourceName, true));
+            dispatch(createVirtualScreenshareParticipant(newLocalSceenshareSourceName, true, conference));
         }
 
         if (localScreenShare && !newLocalSceenshareSourceName) {
@@ -68,7 +68,7 @@ function _updateScreenshareParticipants({ getState, dispatch }: IStore) {
     }
 
     if (addedScreenshareSourceNames.length) {
-        addedScreenshareSourceNames.forEach(id => dispatch(createVirtualScreenshareParticipant(id, false)));
-
+        addedScreenshareSourceNames.forEach(id => dispatch(
+            createVirtualScreenshareParticipant(id, false, conference)));
     }
 }

react/features/base/participants/types.ts

@@ -13,6 +13,8 @@ export interface IParticipant {
     dominantSpeaker?: boolean;
     e2eeEnabled?: boolean;
     e2eeSupported?: boolean;
+    e2eeVerificationAvailable?: boolean;
+    e2eeVerified?: boolean;
     email?: string;
     fakeParticipant?: FakeParticipant;
     features?: {

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

@@ -19,7 +19,12 @@ type Props = {
     /**
      * The extra styles to be applied to links.
      */
-    linkStyle: StyleType
+    linkStyle: StyleType,
+
+    /**
+     * The extra styles to be applied to text.
+     */
+    style?: StyleType
 };
 
 /**
@@ -46,7 +51,9 @@ export default class Linkify extends Component<Props> {
         return (
             <ReactLinkify
                 componentDecorator = { this._componentDecorator }>
-                <Text selectable = { true }>
+                <Text
+                    selectable = { true }
+                    style = { this.props.style }>
                     { this.props.children }
                 </Text>
             </ReactLinkify>

react/features/base/settings/components/native/SettingsButton.tsx

@@ -10,8 +10,8 @@ import { navigate }
     from '../../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 // @ts-ignore
 import { screen } from '../../../../mobile/navigation/routes';
-// @ts-ignore
-import { SETTINGS_ENABLED, getFeatureFlag } from '../../../flags';
+import { SETTINGS_ENABLED } from '../../../flags/constants';
+import { getFeatureFlag } from '../../../flags/functions';
 import { connect } from '../../../redux/functions';
 
 /**

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

@@ -1,4 +1,3 @@
-/* eslint-disable lines-around-comment */
 import _ from 'lodash';
 import { AnyAction } from 'redux';
 

react/features/base/tracks/actionTypes.ts

@@ -9,6 +9,17 @@
  */
 export const SET_NO_SRC_DATA_NOTIFICATION_UID = 'SET_NO_SRC_DATA_NOTIFICATION_UID';
 
+/**
+ * Sets the track operation promise.
+ *
+ * {
+ *      type: SET_TRACK_OPERATIONS_PROMISE,
+ *      audioTrackOperationsPromise: Promise<void>,
+ *      videoTrackOperationsPromise: Promise<void>
+ * }
+ */
+export const SET_TRACK_OPERATIONS_PROMISE = 'SET_TRACK_OPERATIONS_PROMISE';
+
 /**
  * The type of redux action dispatched when a track has been (locally or
  * remotely) added to the conference.

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

@@ -3,22 +3,22 @@ import { sendAnalytics } from '../../analytics/functions';
 import { IStore } from '../../app/types';
 import { showErrorNotification, showNotification } from '../../notifications/actions';
 import { NOTIFICATION_TIMEOUT, NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
+import { isPrejoinPageVisible } from '../../prejoin/functions';
 import { getCurrentConference } from '../conference/functions';
 import { IJitsiConference } from '../conference/reducer';
 import { getMultipleVideoSendingSupportFeatureFlag } from '../config/functions.any';
 import { JitsiTrackErrors, JitsiTrackEvents } from '../lib-jitsi-meet';
-import { createLocalTrack } from '../lib-jitsi-meet/functions.any';
 import { setAudioMuted, setScreenshareMuted, setVideoMuted } from '../media/actions';
 import {
     CAMERA_FACING_MODE,
     MEDIA_TYPE,
     MediaType,
+    SCREENSHARE_MUTISM_AUTHORITY,
     VIDEO_MUTISM_AUTHORITY,
     VIDEO_TYPE,
     VideoType
 } from '../media/constants';
 import { getLocalParticipant } from '../participants/functions';
-import { updateSettings } from '../settings/actions';
 
 import {
     SET_NO_SRC_DATA_NOTIFICATION_UID,
@@ -38,7 +38,8 @@ import {
     getLocalTrack,
     getLocalTracks,
     getLocalVideoTrack,
-    getTrackByJitsiTrack
+    getTrackByJitsiTrack,
+    setTrackMuted
 } from './functions';
 import logger from './logger';
 import { ITrackOptions } from './types';
@@ -57,7 +58,7 @@ export function addLocalTrack(newTrack: any) {
             await conference.addTrack(newTrack);
         }
 
-        const setMuted = newTrack.isVideoTrack()
+        const setMutedA = newTrack.isVideoTrack()
             ? getMultipleVideoSendingSupportFeatureFlag(getState())
             && newTrack.getVideoType() === VIDEO_TYPE.DESKTOP
                 ? setScreenshareMuted
@@ -66,7 +67,7 @@ export function addLocalTrack(newTrack: any) {
         const isMuted = newTrack.isMuted();
 
         logger.log(`Adding ${newTrack.getType()} track - ${isMuted ? 'muted' : 'unmuted'}`);
-        await dispatch(setMuted(isMuted));
+        await dispatch(setMutedA(isMuted));
 
         return dispatch(_addTracks([ newTrack ]));
     };
@@ -139,6 +140,7 @@ export function createLocalTracksA(options: ITrackOptions = {}) {
             dispatch,
             getState
         };
+        const promises: Promise<any>[] = [];
 
         // The following executes on React Native only at the time of this
         // writing. The effort to port Web's createInitialLocalTracksAndConnect
@@ -216,7 +218,14 @@ export function createLocalTracksA(options: ITrackOptions = {}) {
                     mediaType: device
                 }
             });
+
+            promises.push(gumProcess.catch(() => {
+                // ignore the error in the result promises so that the Promise.all resolves after all promises are
+                // settled.
+            }));
         }
+
+        return Promise.all(promises);
     };
 }
 
@@ -329,7 +338,7 @@ export function replaceLocalTrack(oldTrack: any, newTrack: any, conference?: IJi
  * @param {JitsiLocalTrack|null} newTrack - The track to use instead.
  * @returns {Function}
  */
-function replaceStoredTracks(oldTrack: any, newTrack: any) {
+export function replaceStoredTracks(oldTrack: any, newTrack: any) {
     return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
         // We call dispose after doing the replace because dispose will
         // try and do a new o/a after the track removes itself. Doing it
@@ -345,7 +354,7 @@ function replaceStoredTracks(oldTrack: any, newTrack: any) {
             // should be falsey. As such, emit a mute event here to set up the app to reflect the track's mute
             // state. If this is not done, the current mute state of the app will be reflected on the track,
             // not vice-versa.
-            const setMuted = newTrack.isVideoTrack()
+            const setMutedA = newTrack.isVideoTrack()
                 ? getMultipleVideoSendingSupportFeatureFlag(getState())
                     && newTrack.getVideoType() === VIDEO_TYPE.DESKTOP
                     ? setScreenshareMuted
@@ -356,7 +365,7 @@ function replaceStoredTracks(oldTrack: any, newTrack: any) {
             sendAnalytics(createTrackMutedEvent(newTrack.getType(), 'track.replaced', isMuted));
             logger.log(`Replace ${newTrack.getType()} track - ${isMuted ? 'muted' : 'unmuted'}`);
 
-            await dispatch(setMuted(isMuted));
+            await dispatch(setMutedA(isMuted));
             await dispatch(_addTracks([ newTrack ]));
         }
     };
@@ -817,37 +826,48 @@ export function updateLastTrackVideoMediaEvent(track: any, name: string): {
     };
 }
 
+
 /**
- * Toggles the facingMode constraint on the video stream.
+ * Mutes or unmutes a local track with a specific media type.
  *
- * @returns {Function}
+ * @param {Object} options - Parameters of the function.
+ * @private
+ * @returns {Promise}
  */
-export function toggleCamera() {
-    return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+export function setMuted({ ensureTrack, authority, mediaType, muted }: {
+    authority?: number; ensureTrack: boolean; mediaType: MediaType; muted: boolean; }) {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']): Promise<any> => {
         const state = getState();
-        const tracks = state['features/base/tracks'];
-        const localVideoTrack = getLocalVideoTrack(tracks)?.jitsiTrack;
-        const currentFacingMode = localVideoTrack.getCameraFacingMode();
+        const localTrack = getLocalTrack(state['features/base/tracks'], mediaType, true);
 
-        /**
-         * FIXME: Ideally, we should be dispatching {@code replaceLocalTrack} here,
-         * but it seems to not trigger the re-rendering of the local video on Chrome;
-         * could be due to a plan B vs unified plan issue. Therefore, we use the legacy
-         * method defined in conference.js that manually takes care of updating the local
-         * video as well.
-         */
-        await APP.conference.useVideoStream(null);
+        if (mediaType === MEDIA_TYPE.SCREENSHARE
+            && getMultipleVideoSendingSupportFeatureFlag(state)
+            && !muted) {
+            return Promise.resolve();
+        }
 
-        const targetFacingMode = currentFacingMode === CAMERA_FACING_MODE.USER
-            ? CAMERA_FACING_MODE.ENVIRONMENT
-            : CAMERA_FACING_MODE.USER;
+        if (localTrack) {
+            // The `jitsiTrack` property will have a value only for a localTrack for which `getUserMedia` has
+            // already completed. If there's no `jitsiTrack`, then the `muted` state will be applied once the
+            // `jitsiTrack` is created.
+            const { jitsiTrack } = localTrack;
+            const isAudioOnly = (mediaType === MEDIA_TYPE.VIDEO && authority === VIDEO_MUTISM_AUTHORITY.AUDIO_ONLY)
+                || (mediaType === MEDIA_TYPE.SCREENSHARE && authority === SCREENSHARE_MUTISM_AUTHORITY.AUDIO_ONLY);
 
-        // Update the flipX value so the environment facing camera is not flipped, before the new track is created.
-        dispatch(updateSettings({ localFlipX: targetFacingMode === CAMERA_FACING_MODE.USER }));
+            // Screenshare cannot be unmuted using the video mute button unless it is muted by audioOnly in
+            // the legacy screensharing mode.
+            if (jitsiTrack && (
+                jitsiTrack.videoType !== 'desktop' || isAudioOnly || getMultipleVideoSendingSupportFeatureFlag(state))
+            ) {
+                return setTrackMuted(jitsiTrack, muted, state).catch(
+                    () => dispatch(trackMuteUnmuteFailed(localTrack, muted)));
+            }
+        } else if (!muted && ensureTrack && (typeof APP === 'undefined' || isPrejoinPageVisible(state))) {
+            // FIXME: This only runs on mobile now because web has its own way of
+            // creating local tracks. Adjust the check once they are unified.
+            return dispatch(createLocalTracksA({ devices: [ mediaType ] }));
+        }
 
-        const newVideoTrack = await createLocalTrack('video', null, null, { facingMode: targetFacingMode });
-
-        // FIXME: See above.
-        await APP.conference.useVideoStream(newVideoTrack);
+        return Promise.resolve();
     };
 }

react/features/base/tracks/actions.native.ts

@@ -1,13 +1,13 @@
-/* eslint-disable lines-around-comment */
-
 import { IReduxState, IStore } from '../../app/types';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { setPictureInPictureEnabled } from '../../mobile/picture-in-picture/functions';
 import { setAudioOnly } from '../audio-only/actions';
 import JitsiMeetJS from '../lib-jitsi-meet';
 
 import { destroyLocalDesktopTrackIfExists, replaceLocalTrack } from './actions.any';
-import { getLocalVideoTrack, isLocalVideoTrackDesktop } from './functions';
+import { getLocalVideoTrack, isLocalVideoTrackDesktop } from './functions.native';
+import { TrackOperationType } from './types';
 /* eslint-enable lines-around-comment */
 
 export * from './actions.any';
@@ -72,3 +72,22 @@ function _startScreenSharing(dispatch: Function, state: IReduxState) {
         setPictureInPictureEnabled(true);
     });
 }
+
+
+/**
+ * Executes a track operation.
+ *
+ * NOTE: This is dummy implementation for mobile. Currently we are not sure if we need to chain the track operations.
+ * For now we are just executing the passed operation without chaining it.
+ *
+ * @param {TrackOperationType} type - The type of the operation ('audio', 'video' or 'audio-video').
+ * @param {Function} operation - The operation.
+ * @returns {{
+ *      type: SET_TRACK_OPERATIONS_PROMISE,
+ *      audioTrackOperationsPromise: Promise<void>,
+ *      videoTrackOperationsPromise: Promise<void>
+ * }}
+ */
+export function executeTrackOperation(type: TrackOperationType, operation: () => Promise<any>) {
+    return () => operation();
+}

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

@@ -8,7 +8,6 @@ import { showNotification } from '../../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
 // @ts-ignore
 import { stopReceiver } from '../../remote-control/actions';
-// @ts-ignore
 import { setScreenAudioShareState, setScreenshareAudioTrack } from '../../screen-share/actions';
 import { isAudioOnlySharing, isScreenVideoShared } from '../../screen-share/functions';
 // @ts-ignore
@@ -18,10 +17,13 @@ import { AudioMixerEffect } from '../../stream-effects/audio-mixer/AudioMixerEff
 import { setAudioOnly } from '../audio-only/actions';
 import { getCurrentConference } from '../conference/functions';
 import { JitsiTrackErrors, JitsiTrackEvents } from '../lib-jitsi-meet';
+import { createLocalTrack } from '../lib-jitsi-meet/functions.any';
 import { setScreenshareMuted } from '../media/actions';
-import { MEDIA_TYPE, VIDEO_TYPE } from '../media/constants';
+import { CAMERA_FACING_MODE, MEDIA_TYPE, VIDEO_TYPE } from '../media/constants';
+import { updateSettings } from '../settings/actions';
 /* eslint-enable lines-around-comment */
 
+import { SET_TRACK_OPERATIONS_PROMISE } from './actionTypes';
 import {
     addLocalTrack,
     replaceLocalTrack
@@ -29,9 +31,10 @@ import {
 import {
     createLocalTracksF,
     getLocalDesktopTrack,
-    getLocalJitsiAudioTrack
+    getLocalJitsiAudioTrack,
+    getLocalVideoTrack
 } from './functions';
-import { IShareOptions, IToggleScreenSharingOptions } from './types';
+import { IShareOptions, IToggleScreenSharingOptions, TrackOperationType } from './types';
 
 export * from './actions.any';
 
@@ -149,8 +152,6 @@ async function _toggleScreenSharing(
     const audioOnlySharing = isAudioOnlySharing(state);
     const screenSharing = isScreenVideoShared(state);
     const conference = getCurrentConference(state);
-    const localAudio = getLocalJitsiAudioTrack(state);
-    const localScreenshare = getLocalDesktopTrack(state['features/base/tracks']);
 
     // Toggle screenshare or audio-only share if the new state is not passed. Happens in the following two cases.
     // 1. ShareAudioDialog passes undefined when the user hits continue in the share audio demo modal.
@@ -200,11 +201,16 @@ async function _toggleScreenSharing(
                 throw new Error(AUDIO_ONLY_SCREEN_SHARE_NO_TRACK);
             }
         } else if (desktopVideoTrack) {
-            if (localScreenshare) {
-                await dispatch(replaceLocalTrack(localScreenshare.jitsiTrack, desktopVideoTrack, conference));
-            } else {
-                await dispatch(addLocalTrack(desktopVideoTrack));
-            }
+            await dispatch(executeTrackOperation(TrackOperationType.Video, async () => {
+                const localScreenshare = getLocalDesktopTrack(getState()['features/base/tracks']);
+
+                if (localScreenshare) {
+                    await dispatch(replaceLocalTrack(localScreenshare.jitsiTrack, desktopVideoTrack, conference));
+                } else {
+                    await dispatch(addLocalTrack(desktopVideoTrack));
+                }
+            }));
+
             if (isScreenshotCaptureEnabled(state, false, true)) {
                 dispatch(toggleScreenshotCaptureSummary(true));
             }
@@ -217,15 +223,23 @@ async function _toggleScreenSharing(
             // Noise suppression doesn't work with desktop audio because we can't chain track effects yet, disable it
             // first. We need to to wait for the effect to clear first or it might interfere with the audio mixer.
             await dispatch(setNoiseSuppressionEnabled(false));
-            _maybeApplyAudioMixerEffect(desktopAudioTrack, state);
-            dispatch(setScreenshareAudioTrack(desktopAudioTrack));
 
-            // Handle the case where screen share was stopped from the browsers 'screen share in progress' window.
-            if (audioOnly) {
-                desktopAudioTrack?.on(
-                    JitsiTrackEvents.LOCAL_TRACK_STOPPED,
-                    () => dispatch(toggleScreensharing(undefined, true)));
-            }
+            dispatch(executeTrackOperation(TrackOperationType.Audio,
+                () => {
+                    const result = _maybeApplyAudioMixerEffect(desktopAudioTrack, state);
+
+                    dispatch(setScreenshareAudioTrack(desktopAudioTrack));
+
+                    // Handle the case where screen share was stopped from the browsers 'screen share in progress'
+                    // window.
+                    if (audioOnly) {
+                        desktopAudioTrack?.on(
+                            JitsiTrackEvents.LOCAL_TRACK_STOPPED,
+                            () => dispatch(toggleScreensharing(undefined, true)));
+                    }
+
+                    return result;
+                }));
         }
 
         // Disable audio-only or best performance mode if the user starts screensharing. This doesn't apply to
@@ -242,16 +256,25 @@ async function _toggleScreenSharing(
 
         dispatch(toggleScreenshotCaptureSummary(false));
 
-        // Mute the desktop track instead of removing it from the conference since we don't want the client to signal
-        // a source-remove to the remote peer for the screenshare track. Later when screenshare is enabled again, the
-        // same sender will be re-used without the need for signaling a new ssrc through source-add.
-        dispatch(setScreenshareMuted(true));
+        await dispatch(executeTrackOperation(TrackOperationType.Video, () => {
+            // Mute the desktop track instead of removing it from the conference since we don't want the client to
+            // signal a source-remove to the remote peer for the screenshare track. Later when screenshare is enabled
+            // again, the same sender will be re-used without the need for signaling a new ssrc through source-add.
+            dispatch(setScreenshareMuted(true));
+
+            return Promise.resolve();
+        }));
+
         if (desktopAudioTrack) {
-            if (localAudio) {
-                localAudio.setEffect(undefined);
-            } else {
-                await conference.replaceTrack(desktopAudioTrack, null);
-            }
+            await dispatch(executeTrackOperation(TrackOperationType.Audio, async () => {
+                const localAudio = getLocalJitsiAudioTrack(state);
+
+                if (localAudio) {
+                    await localAudio.setEffect(undefined);
+                } else {
+                    await conference.replaceTrack(desktopAudioTrack, null);
+                }
+            }));
             desktopAudioTrack.dispose();
             dispatch(setScreenshareAudioTrack(null));
         }
@@ -264,3 +287,101 @@ async function _toggleScreenSharing(
         APP.API.notifyScreenSharingStatusChanged(enable, screensharingDetails);
     }
 }
+
+
+/**
+ * Executes a track operation.
+ *
+ * @param {TrackOperationType} type - The type of the operation ('audio', 'video' or 'audio-video').
+ * @param {Function} operation - The operation.
+ * @returns {{
+ *      type: SET_TRACK_OPERATIONS_PROMISE,
+ *      audioTrackOperationsPromise: Promise<void>,
+ *      videoTrackOperationsPromise: Promise<void>
+ * }}
+ */
+export function executeTrackOperation(type: TrackOperationType, operation: () => Promise<any>) {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+        const {
+            audioTrackOperationsPromise,
+            videoTrackOperationsPromise
+        } = getState()['features/base/track-operations'];
+
+        switch (type) {
+        case TrackOperationType.Audio: {
+            const promise = audioTrackOperationsPromise.then(operation, operation);
+
+            dispatch({
+                type: SET_TRACK_OPERATIONS_PROMISE,
+                audioTrackOperationsPromise: promise
+            });
+
+            return promise;
+        }
+        case TrackOperationType.Video: {
+            const promise = videoTrackOperationsPromise.then(operation, operation);
+
+            dispatch({
+                type: SET_TRACK_OPERATIONS_PROMISE,
+                videoTrackOperationsPromise: promise
+            });
+
+            return promise;
+        }
+        case TrackOperationType.AudioVideo: {
+            const promise = Promise.allSettled([
+                audioTrackOperationsPromise,
+                videoTrackOperationsPromise
+            ]).then(operation);
+
+            dispatch({
+                type: SET_TRACK_OPERATIONS_PROMISE,
+                audioTrackOperationsPromise: promise,
+                videoTrackOperationsPromise: promise
+            });
+
+            return promise;
+        }
+        default: {
+            const unexpectedType: never = type;
+
+            return Promise.reject(new Error(`Unexpected track operation type: ${unexpectedType}`));
+        }
+        }
+    };
+}
+
+/**
+ * Toggles the facingMode constraint on the video stream.
+ *
+ * @returns {Function}
+ */
+export function toggleCamera() {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) =>
+        dispatch(executeTrackOperation(TrackOperationType.Video, () =>
+
+            /**
+             * FIXME: Ideally, we should be dispatching {@code replaceLocalTrack} here,
+             * but it seems to not trigger the re-rendering of the local video on Chrome;
+             * could be due to a plan B vs unified plan issue. Therefore, we use the legacy
+             * method defined in conference.js that manually takes care of updating the local
+             * video as well.
+             */
+            APP.conference.useVideoStream(null).then(() => {
+                const state = getState();
+                const tracks = state['features/base/tracks'];
+                const localVideoTrack = getLocalVideoTrack(tracks)?.jitsiTrack;
+                const currentFacingMode = localVideoTrack.getCameraFacingMode();
+
+                const targetFacingMode = currentFacingMode === CAMERA_FACING_MODE.USER
+                    ? CAMERA_FACING_MODE.ENVIRONMENT
+                    : CAMERA_FACING_MODE.USER;
+
+                // Update the flipX value so the environment facing camera is not flipped, before the new track is
+                // created.
+                dispatch(updateSettings({ localFlipX: targetFacingMode === CAMERA_FACING_MODE.USER }));
+
+                return createLocalTrack('video', null, null, { facingMode: targetFacingMode });
+            })
+            .then((newVideoTrack: any) => APP.conference.useVideoStream(newVideoTrack))));
+}

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

@@ -214,7 +214,7 @@ export function getVideoTrackByParticipant(
 export function getTrackByMediaTypeAndParticipant(
         tracks: ITrack[],
         mediaType: MediaType,
-        participantId: string) {
+        participantId?: string) {
     return tracks.find(
         t => Boolean(t.jitsiTrack) && t.participantId === participantId && t.mediaType === mediaType
     );

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

@@ -9,10 +9,12 @@ import {
     getUserSelectedMicDeviceId
 } from '../settings/functions.web';
 
+import { executeTrackOperation } from './actions.web';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import loadEffects from './loadEffects';
 import logger from './logger';
-import { ITrackOptions } from './types';
+import { ITrackOptions, TrackOperationType } from './types';
 
 export * from './functions.any';
 
@@ -107,14 +109,15 @@ export function createPrejoinTracks() {
     const initialDevices = [ 'audio' ];
     const requestedAudio = true;
     let requestedVideo = false;
-    const { startAudioOnly, startWithAudioMuted, startWithVideoMuted } = APP.store.getState()['features/base/settings'];
+    const { dispatch, getState } = APP.store;
+    const { startAudioOnly, startWithAudioMuted, startWithVideoMuted } = getState()['features/base/settings'];
 
     // Always get a handle on the audio input device so that we have statistics even if the user joins the
     // conference muted. Previous implementation would only acquire the handle when the user first unmuted,
     // which would results in statistics ( such as "No audio input" or "Are you trying to speak?") being available
     // only after that point.
     if (startWithAudioMuted) {
-        APP.store.dispatch(setAudioMuted(true));
+        dispatch(executeTrackOperation(TrackOperationType.Audio, () => dispatch(setAudioMuted(true))));
     }
 
     if (!startWithVideoMuted && !startAudioOnly) {
@@ -128,10 +131,11 @@ export function createPrejoinTracks() {
         // Resolve with no tracks
         tryCreateLocalTracks = Promise.resolve([]);
     } else {
-        tryCreateLocalTracks = createLocalTracksF({
-            devices: initialDevices,
-            firePermissionPromptIsShownEvent: true
-        }, APP.store)
+        tryCreateLocalTracks = dispatch(executeTrackOperation(TrackOperationType.AudioVideo, () =>
+            createLocalTracksF({
+                devices: initialDevices,
+                firePermissionPromptIsShownEvent: true
+            }, APP.store)
                 .catch((err: Error) => {
                     if (requestedAudio && requestedVideo) {
 
@@ -177,7 +181,7 @@ export function createPrejoinTracks() {
                     errors.videoOnlyError = err;
 
                     return [];
-                });
+                })));
     }
 
     return {

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

@@ -1,42 +1,17 @@
-import { batch } from 'react-redux';
-
-import { IStore } from '../../app/types';
-import { _RESET_BREAKOUT_ROOMS } from '../../breakout-rooms/actionTypes';
-import { isPrejoinPageVisible } from '../../prejoin/functions';
-import { getCurrentConference } from '../conference/functions';
-import { getMultipleVideoSendingSupportFeatureFlag } from '../config/functions.any';
 import {
-    SET_AUDIO_MUTED,
     SET_CAMERA_FACING_MODE,
-    SET_SCREENSHARE_MUTED,
-    SET_VIDEO_MUTED,
     TOGGLE_CAMERA_FACING_MODE
 } from '../media/actionTypes';
 import { toggleCameraFacingMode } from '../media/actions';
 import {
     CAMERA_FACING_MODE,
     MEDIA_TYPE,
-    MediaType,
-    SCREENSHARE_MUTISM_AUTHORITY,
-    VIDEO_MUTISM_AUTHORITY
+    MediaType
 } from '../media/constants';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
-import StateListenerRegistry from '../redux/StateListenerRegistry';
 
-import {
-    TRACK_UPDATED
-} from './actionTypes';
-import {
-    createLocalTracksA,
-    destroyLocalTracks,
-    trackMuteUnmuteFailed,
-    trackRemoved
-} from './actions';
-import {
-    getLocalTrack,
-    isUserInteractionRequiredForUnmute,
-    setTrackMuted
-} from './functions';
+import { TRACK_UPDATED } from './actionTypes';
+import { getLocalTrack } from './functions';
 import './subscriber';
 
 /**
@@ -49,15 +24,6 @@ import './subscriber';
  */
 MiddlewareRegistry.register(store => next => action => {
     switch (action.type) {
-    case SET_AUDIO_MUTED:
-        if (!action.muted
-                && isUserInteractionRequiredForUnmute(store.getState())) {
-            return;
-        }
-
-        _setMuted(store, action, MEDIA_TYPE.AUDIO);
-        break;
-
     case SET_CAMERA_FACING_MODE: {
         // XXX The camera facing mode of a MediaStreamTrack can be specified
         // only at initialization time and then it can only be toggled. So in
@@ -78,19 +44,6 @@ MiddlewareRegistry.register(store => next => action => {
         break;
     }
 
-    case SET_SCREENSHARE_MUTED:
-        _setMuted(store, action, action.mediaType);
-        break;
-
-    case SET_VIDEO_MUTED:
-        if (!action.muted
-                && isUserInteractionRequiredForUnmute(store.getState())) {
-            return;
-        }
-
-        _setMuted(store, action, action.mediaType);
-        break;
-
     case TOGGLE_CAMERA_FACING_MODE: {
         const localTrack = _getLocalTrack(store, MEDIA_TYPE.VIDEO);
         let jitsiTrack;
@@ -121,31 +74,6 @@ MiddlewareRegistry.register(store => next => action => {
     return next(action);
 });
 
-/**
- * Set up state change listener to perform maintenance tasks when the conference
- * is left or failed, remove all tracks from the store.
- */
-StateListenerRegistry.register(
-    state => getCurrentConference(state),
-    (conference, { dispatch, getState }, prevConference) => {
-        const { authRequired, error } = getState()['features/base/conference'];
-
-        // conference keep flipping while we are authenticating, skip clearing while we are in that process
-        if (prevConference && !conference && !authRequired && !error) {
-
-            // Clear all tracks.
-            const remoteTracks = getState()['features/base/tracks'].filter(t => !t.local);
-
-            batch(() => {
-                dispatch(destroyLocalTracks());
-                for (const track of remoteTracks) {
-                    dispatch(trackRemoved(track.jitsiTrack));
-                }
-                dispatch({ type: _RESET_BREAKOUT_ROOMS });
-            });
-        }
-    });
-
 /**
  * Gets the local track associated with a specific {@code MEDIA_TYPE} in a
  * specific redux store.
@@ -173,48 +101,3 @@ function _getLocalTrack(
             mediaType,
             includePending));
 }
-
-/**
- * Mutes or unmutes a local track with a specific media type.
- *
- * @param {Store} store - The redux store in which the specified action is
- * dispatched.
- * @param {Action} action - The redux action dispatched in the specified store.
- * @param {MEDIA_TYPE} mediaType - The {@link MEDIA_TYPE} of the local track
- * which is being muted or unmuted.
- * @private
- * @returns {void}
- */
-async function _setMuted(store: IStore, { ensureTrack, authority, muted }: {
-    authority: number; ensureTrack: boolean; muted: boolean; }, mediaType: MediaType) {
-    const { dispatch, getState } = store;
-    const localTrack = _getLocalTrack(store, mediaType, /* includePending */ true);
-    const state = getState();
-
-    if (mediaType === MEDIA_TYPE.SCREENSHARE
-        && getMultipleVideoSendingSupportFeatureFlag(state)
-        && !muted) {
-        return;
-    }
-
-    if (localTrack) {
-        // The `jitsiTrack` property will have a value only for a localTrack for which `getUserMedia` has already
-        // completed. If there's no `jitsiTrack`, then the `muted` state will be applied once the `jitsiTrack` is
-        // created.
-        const { jitsiTrack } = localTrack;
-        const isAudioOnly = (mediaType === MEDIA_TYPE.VIDEO && authority === VIDEO_MUTISM_AUTHORITY.AUDIO_ONLY)
-            || (mediaType === MEDIA_TYPE.SCREENSHARE && authority === SCREENSHARE_MUTISM_AUTHORITY.AUDIO_ONLY);
-
-        // Screenshare cannot be unmuted using the video mute button unless it is muted by audioOnly in the legacy
-        // screensharing mode.
-        if (jitsiTrack && (
-            jitsiTrack.videoType !== 'desktop' || isAudioOnly || getMultipleVideoSendingSupportFeatureFlag(state))
-        ) {
-            setTrackMuted(jitsiTrack, muted, state).catch(() => dispatch(trackMuteUnmuteFailed(localTrack, muted)));
-        }
-    } else if (!muted && ensureTrack && (typeof APP === 'undefined' || isPrejoinPageVisible(state))) {
-        // FIXME: This only runs on mobile now because web has its own way of
-        // creating local tracks. Adjust the check once they are unified.
-        dispatch(createLocalTracksA({ devices: [ mediaType ] }));
-    }
-}

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

@@ -18,6 +18,7 @@ import {
     TRACK_UPDATED
 } from './actionTypes';
 import {
+    executeTrackOperation,
     showNoDataFromSourceVideoError,
     toggleScreensharing,
     trackNoDataFromSourceNotificationInfoChanged
@@ -25,7 +26,7 @@ import {
 import {
     getTrackByJitsiTrack
 } from './functions.web';
-import { ITrack } from './types';
+import { ITrack, TrackOperationType } from './types';
 
 import './middleware.any';
 
@@ -67,9 +68,10 @@ MiddlewareRegistry.register(store => next => action => {
         const { jitsiTrack } = action.track;
         const muted = action.wasMuted;
         const isVideoTrack = jitsiTrack.getType() !== MEDIA_TYPE.AUDIO;
+        const { dispatch } = store;
 
         if (isVideoTrack && jitsiTrack.getVideoType() === VIDEO_TYPE.DESKTOP) {
-            store.dispatch(setScreenshareMuted(!muted));
+            dispatch(executeTrackOperation(TrackOperationType.Video, () => dispatch(setScreenshareMuted(!muted))));
         } else if (isVideoTrack) {
             APP.conference.setVideoMuteStatus();
         } else {

react/features/base/tracks/reducer.ts

@@ -4,6 +4,7 @@ import { set } from '../redux/functions';
 
 import {
     SET_NO_SRC_DATA_NOTIFICATION_UID,
+    SET_TRACK_OPERATIONS_PROMISE,
     TRACK_ADDED,
     TRACK_CREATE_CANCELED,
     TRACK_CREATE_ERROR,
@@ -152,3 +153,31 @@ ReducerRegistry.register<INoSrcDataState>('features/base/no-src-data', (state =
     }
 });
 
+export interface ITrackOperations {
+    audioTrackOperationsPromise: Promise<void>;
+    videoTrackOperationsPromise: Promise<void>;
+}
+
+const DEFAULT_TRACK_OPERATIONS_STATE = {
+    audioTrackOperationsPromise: Promise.resolve(),
+    videoTrackOperationsPromise: Promise.resolve()
+};
+
+/**
+ * Listen for actions that mutate the no-src-data state, like the current notification id.
+ */
+ReducerRegistry.register<ITrackOperations>(
+    'features/base/track-operations',
+    (state = DEFAULT_TRACK_OPERATIONS_STATE, action): ITrackOperations => {
+        switch (action.type) {
+        case SET_TRACK_OPERATIONS_PROMISE:
+            return {
+                ...state,
+                audioTrackOperationsPromise: action.audioTrackOperationsPromise || state.audioTrackOperationsPromise,
+                videoTrackOperationsPromise: action.videoTrackOperationsPromise || state.videoTrackOperationsPromise
+            };
+        default:
+            return state;
+        }
+    });
+

react/features/base/tracks/subscriber.ts

@@ -1,9 +1,13 @@
 import _ from 'lodash';
+import { batch } from 'react-redux';
 
+import { _RESET_BREAKOUT_ROOMS } from '../../breakout-rooms/actionTypes';
+import { getCurrentConference } from '../conference/functions';
 import { MEDIA_TYPE } from '../media/constants';
 import { getScreenshareParticipantIds } from '../participants/functions';
 import StateListenerRegistry from '../redux/StateListenerRegistry';
 
+import { destroyLocalTracks, trackRemoved } from './actions.any';
 import { isLocalTrackMuted } from './functions';
 
 /**
@@ -38,3 +42,28 @@ StateListenerRegistry.register(
         }
     }
 );
+
+/**
+ * Set up state change listener to perform maintenance tasks when the conference
+ * is left or failed, remove all tracks from the store.
+ */
+StateListenerRegistry.register(
+    state => getCurrentConference(state),
+    (conference, { dispatch, getState }, prevConference) => {
+        const { authRequired, error } = getState()['features/base/conference'];
+
+        // conference keep flipping while we are authenticating, skip clearing while we are in that process
+        if (prevConference && !conference && !authRequired && !error) {
+
+            // Clear all tracks.
+            const remoteTracks = getState()['features/base/tracks'].filter(t => !t.local);
+
+            batch(() => {
+                dispatch(destroyLocalTracks());
+                for (const track of remoteTracks) {
+                    dispatch(trackRemoved(track.jitsiTrack));
+                }
+                dispatch({ type: _RESET_BREAKOUT_ROOMS });
+            });
+        }
+    });

react/features/base/tracks/types.ts

@@ -72,3 +72,9 @@ export interface IShareOptions {
     desktopSharingSources?: string[];
     desktopStream?: any;
 }
+
+export enum TrackOperationType {
+    Audio = 'audio',
+    AudioVideo = 'audio-video',
+    Video = 'video'
+}

react/features/base/ui/components/native/Button.tsx

@@ -1,4 +1,3 @@
-// @ts-ignore
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import {
@@ -66,12 +65,15 @@ const Button: React.FC<IProps> = ({
     }
 
     if (type === TERTIARY) {
+        buttonLabelStyles
+            = disabled ? styles.buttonLabelTertiaryDisabled : styles.buttonLabelTertiary;
+
         return (
             <TouchableRipple
                 accessibilityLabel = { accessibilityLabel }
                 disabled = { disabled }
                 onPress = { onPress }
-                rippleColor = 'transparent'
+                rippleColor = { BaseTheme.palette.action03Active }
                 style = { [
                     buttonStyles,
                     style

react/features/base/ui/components/native/IconButton.tsx

@@ -1,8 +1,8 @@
-/* eslint-disable lines-around-comment */
 import React from 'react';
 import { TouchableRipple } from 'react-native-paper';
 
 import Icon from '../../../icons/components/Icon';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import styles from '../../../react/components/native/styles';
 import { IIconButtonProps } from '../../../react/types';

react/features/base/ui/components/native/buttonStyles.ts

@@ -23,15 +23,15 @@ export default {
         ...buttonLabel
     },
 
-    buttonContent: {
-        height: BUTTON_HEIGHT
-    },
-
     buttonLabelDisabled: {
         ...buttonLabel,
         color: BaseTheme.palette.text03
     },
 
+    buttonContent: {
+        height: BUTTON_HEIGHT
+    },
+
     buttonDisabled: {
         ...button,
         backgroundColor: BaseTheme.palette.actionDisabled
@@ -54,6 +54,13 @@ export default {
 
     buttonLabelTertiary: {
         ...buttonLabel,
-        color: BaseTheme.palette.text01
+        color: BaseTheme.palette.text01,
+        textAlign: 'center'
+    },
+
+    buttonLabelTertiaryDisabled: {
+        ...buttonLabel,
+        color: BaseTheme.palette.text03,
+        textAlign: 'center'
     }
 };

react/features/base/ui/components/web/ClickableIcon.tsx

@@ -6,6 +6,7 @@ import Icon from '../../../icons/components/Icon';
 
 interface IProps {
     accessibilityLabel: string;
+    className?: string;
     icon: Function;
     id?: string;
     onClick: () => void;
@@ -40,14 +41,14 @@ const useStyles = makeStyles()(theme => {
     };
 });
 
-const ClickableIcon = ({ accessibilityLabel, icon, id, onClick }: IProps) => {
+const ClickableIcon = ({ accessibilityLabel, className, icon, id, onClick }: IProps) => {
     const { classes: styles, cx } = useStyles();
     const isMobile = isMobileBrowser();
 
     return (
         <button
             aria-label = { accessibilityLabel }
-            className = { cx(styles.button, isMobile && 'is-mobile') }
+            className = { cx(styles.button, isMobile && 'is-mobile', className) }
             id = { id }
             onClick = { onClick }>
             <Icon

react/features/base/ui/components/web/Dialog.tsx

@@ -27,6 +27,7 @@ const useStyles = makeStyles()(theme => {
             display: 'flex',
             justifyContent: 'center',
             alignItems: 'flex-start',
+            zIndex: 301,
             animation: `${keyframes`
                 0% {
                     opacity: 0.4;
@@ -67,7 +68,7 @@ const useStyles = makeStyles()(theme => {
             flexDirection: 'column',
             height: 'auto',
             minHeight: '200px',
-            maxHeight: '560px',
+            maxHeight: '760px',
             marginTop: '64px',
             animation: `${keyframes`
                 0% {
@@ -137,6 +138,12 @@ const useStyles = makeStyles()(theme => {
             justifyContent: 'space-between'
         },
 
+        closeIcon: {
+            '&:focus': {
+                boxShadow: 'none'
+            }
+        },
+
         title: {
             color: theme.palette.text01,
             ...withPixelLineHeight(theme.typography.heading5),
@@ -278,6 +285,7 @@ const Dialog = ({
                         {!hideCloseButton && (
                             <ClickableIcon
                                 accessibilityLabel = { t('dialog.close') }
+                                className = { classes.closeIcon }
                                 icon = { IconCloseLarge }
                                 id = 'modal-header-close-button'
                                 onClick = { onClose } />