chore(rn,versions) bump app and sdk versions

Fix a crash in Metal rendering: 0c9cc42025

.eslintignore

@@ -1,8 +1,6 @@
 # The build artifacts of the jitsi-meet project.
 build/*
 
-doc/*
-
 # Third-party source code which we (1) do not want to modify or (2) try to
 # modify as little as possible.
 libs/*

.github/stale.yml

@@ -0,0 +1,16 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 90
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - confirmed
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
+

.github/workflows/ci-lua.yml

@@ -17,8 +17,7 @@ jobs:
 
     - name: Check lua codes
       run: |
-        set -o pipefail && luacheck . \
-        --exclude-files=resources/prosody-plugins/mod_firewall/mod_firewall.lua | awk -F: '
+        set -o pipefail && luacheck . | awk -F: '
           {
             print $0
             printf "::warning file=%s,line=%s,col=%s::%s\n", $1, $2, $3, $4

.github/workflows/ci.yml

@@ -12,24 +12,14 @@ jobs:
       with:
         node-version: 16
         cache: 'npm'
-    - name: Get changed files
-      id: changed-files
-      uses: tj-actions/changed-files@v41
-    - name: Get changed lang files
-      id: lang-files
-      run: echo "all=$(echo "${{ steps.changed-files.outputs.all_changed_files }}" | grep -oE 'lang\/\S+' | tr '\n' ' ')" >> "$GITHUB_OUTPUT"
     - run: npm install
     - name: Check git status
       run: git status
     - name: Normalize lang files to ensure sorted
-      if: steps.lang-files.outputs.all
       run: npm run lang-sort
-    - name: Check lang files are formatted correctly
-      if: steps.lang-files.outputs.all
-      run: npm run lint:lang
     - name: Check if the git repository is clean
       run: $(exit $(git status --porcelain --untracked-files=no | head -255 | wc -l)) || (echo "Dirty git tree"; git diff; exit 1)
-    - run: npm run lint:ci && npm run tsc:ci
+    - run: npm run lint:ci
   linux-build:
     name: Build Frontend (Linux)
     runs-on: ubuntu-latest
@@ -73,29 +63,4 @@ jobs:
         node-version: 16
         cache: 'npm'
     - run: npm install
-    - name: setup-cocoapods
-      uses: maxim-lobanov/setup-cocoapods@v1
-      with:
-        podfile-path: ios/Podfile.lock
-    - name: Install Pods
-      run: |
-        pod --version
-        cd ios
-        pod install --repo-update
-    - name: Check if the git repository is clean
-      run: $(exit $(git status --porcelain --untracked-files=no | head -255 | wc -l)) || (echo "Dirty git tree"; git diff; exit 1)
     - run: npx react-native bundle --entry-file react/index.native.js --platform ios --bundle-output /tmp/ios.bundle --reset-cache
-  debian-build:
-    name: Test Debian packages build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 16
-        cache: 'npm'
-    - run: npm install
-    - run: make
-    - run: sudo apt-get install -y debhelper
-    - run: dpkg-buildpackage -A -rfakeroot -us -uc -d
-    - run: make source-package

.github/workflows/stale.yml

@@ -1,21 +0,0 @@
-name: 'Close stale issues and PRs'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v8
-        with:
-          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
-          stale-pr-message: 'This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
-          stale-issue-label: 'stale'
-          stale-pr-label: 'stale'
-          exempt-issue-labels: 'confirmed,help-needed'
-          exempt-pr-labels: 'confirmed'
-          days-before-issue-stale: 60
-          days-before-pr-stale: 90
-          days-before-issue-close: 10
-          days-before-pr-close: 10

.gitignore

@@ -61,9 +61,8 @@ buck-out/
 
 # fastlane
 #
-**/fastlane/report.xml
-**/fastlane/Preview.html
-**/fastlane/test_output
+*/fastlane/report.xml
+*/fastlane/Preview.html
 
 # Build artifacts
 *.jsbundle
@@ -94,17 +93,3 @@ twa/*.aab
 twa/assetlinks.json
 
 tsconfig.json
-
-# React Native SDK
-#
-react-native-sdk/*.tgz
-react-native-sdk/android/src
-!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetReactNativePackage.java
-react-native-sdk/images
-react-native-sdk/ios
-react-native-sdk/lang
-react-native-sdk/modules
-react-native-sdk/node_modules
-react-native-sdk/react
-react-native-sdk/service
-react-native-sdk/sounds

Makefile

@@ -55,8 +55,6 @@ deploy-appbundle:
 		$(BUILD_DIR)/face-landmarks-worker.min.js.map \
 		$(BUILD_DIR)/noise-suppressor-worklet.min.js \
 		$(BUILD_DIR)/noise-suppressor-worklet.min.js.map \
-		$(BUILD_DIR)/screenshot-capture-worker.min.js \
-		$(BUILD_DIR)/screenshot-capture-worker.min.js.map \
 		$(DEPLOY_DIR)
 	cp \
 		$(BUILD_DIR)/close3.min.js \
@@ -125,7 +123,7 @@ dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-mode
 
 source-package:
 	mkdir -p source_package/jitsi-meet/css && \
-	cp -r *.js *.html resources/*.txt fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
+	cp -r *.js *.html resources/*.txt favicon.ico fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
 	cp css/all.css source_package/jitsi-meet/css && \
 	(cd source_package ; tar cjf ../jitsi-meet.tar.bz2 jitsi-meet) && \
 	rm -rf source_package

README.md

@@ -27,7 +27,7 @@ And many more!
 
 ## Using Jitsi Meet
 
-Using Jitsi Meet is straightforward, as it's browser based. Head over to [meet.jit.si](https://meet.jit.si) and give it a try. It's scalable and free to use. All you need is a Google, Facebook or GitHub account in order to start a meeting. All browsers are supported!
+Using Jitsi Meet is straightforward, as it's browser based. Head over to [meet.jit.si](https://meet.jit.si) and give it a try. It's anonymous, scalable and free to use. All browsers are supported! 
 
 Using mobile? No problem, you can either use your mobile web browser or our fully-featured
 mobile apps:

android/app/build.gradle

@@ -15,12 +15,10 @@ def vcode = (int) (((new Date().getTime() / 1000) - 1546297200) / 10)
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
-    packagingOptions {
-        jniLibs {
-            excludes += ['lib/*/libhermes*.so']
-        }
-    }
 
+    packagingOptions {
+        exclude 'lib/*/libhermes*.so'
+    }
 
     defaultConfig {
         applicationId 'org.jitsi.meet'
@@ -74,24 +72,23 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    namespace 'org.jitsi.meet'
 }
 
 dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.5.1'
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
 
     if (!rootProject.ext.libreBuild) {
-        // Sync with react-native-google-signin
-        implementation 'com.google.android.gms:play-services-auth:20.5.0'
+        implementation 'com.google.android.gms:play-services-auth:16.0.1'
 
         // Firebase
         //  - Crashlytics
         //  - Dynamic Links
-        implementation 'com.google.firebase:firebase-analytics:21.3.0'
-        implementation 'com.google.firebase:firebase-crashlytics:18.4.3'
-        implementation 'com.google.firebase:firebase-dynamic-links:21.1.0'
+        implementation 'com.google.firebase:firebase-analytics:17.5.0'
+        implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+        implementation 'com.google.firebase:firebase-dynamic-links:19.1.0'
     }
 
     implementation project(':sdk')

android/app/proguard-rules.pro

@@ -1,8 +1,3 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
 # in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
@@ -14,25 +9,20 @@
 
 # Add any project specific keep options here:
 
-# Disabling obfuscation is useful if you collect stack traces from production crashes
-# (unless you are using a system that supports de-obfuscate the stack traces).
-# -dontobfuscate
-
 # React Native
 
 # Keep our interfaces so they can be used by other ProGuard rules.
 # See http://sourceforge.net/p/proguard/bugs/466/
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
+-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
 
 # Do not strip any method/class that is annotated with @DoNotStrip
 -keep @com.facebook.proguard.annotations.DoNotStrip class *
+-keep @com.facebook.common.internal.DoNotStrip class *
 -keepclassmembers class * {
     @com.facebook.proguard.annotations.DoNotStrip *;
-}
-
--keep @com.facebook.proguard.annotations.DoNotStripAny class * {
-    *;
+    @com.facebook.common.internal.DoNotStrip *;
 }
 
 -keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
@@ -40,32 +30,32 @@
   *** get*();
 }
 
--keep class * implements com.facebook.react.bridge.JavaScriptModule { *; }
--keep class * implements com.facebook.react.bridge.NativeModule { *; }
+-keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
+-keep class * extends com.facebook.react.bridge.NativeModule { *; }
 -keepclassmembers,includedescriptorclasses class * { native <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.UIProp <fields>; }
 -keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
 -keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
 
 -dontwarn com.facebook.react.**
 -keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
--keep,includedescriptorclasses class com.facebook.react.turbomodule.core.** { *; }
 
-# hermes
--keep class com.facebook.jni.** { *; }
+# okhttp
+
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
 
 # okio
+
 -keep class sun.misc.Unsafe { *; }
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-keep class okio.** { *; }
 -dontwarn okio.**
 
-# yoga
--keep,allowobfuscation @interface com.facebook.yoga.annotations.DoNotStrip
--keep @com.facebook.yoga.annotations.DoNotStrip class *
--keepclassmembers class * {
-    @com.facebook.yoga.annotations.DoNotStrip *;
-}
-
 # WebRTC
 
 -keep class org.webrtc.** { *; }

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.jitsi.meet"
     android:installLocation="auto">
   <application
       android:allowBackup="true"
@@ -15,8 +16,7 @@
         android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
         android:exported="true"
         android:label="@string/app_name"
-        android:launchMode="singleInstance"
-        android:taskAffinity=""
+        android:launchMode="singleTask"
         android:name=".MainActivity"
         android:resizeableActivity="true"
         android:supportsPictureInPicture="true"

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

@@ -152,6 +152,7 @@ public class MainActivity extends JitsiMeetActivity {
             = new JitsiMeetConferenceOptions.Builder()
             .setServerURL(buildURL(defaultURL))
             .setFeatureFlag("welcomepage.enabled", true)
+            .setFeatureFlag("call-integration.enabled", false)
             .setFeatureFlag("resolution", 360)
             .setFeatureFlag("server-url-change.enabled", !configurationByRestrictions)
             .build();

android/app/src/main/res/xml/app_restrictions.xml

@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<restrictions xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Server URL configuration -->
-    <restriction
-        android:description="@string/restriction_server_url_description"
-        android:key="SERVER_URL"
-        android:restrictionType="string"
-        android:title="@string/restriction_server_url_title"/>
-</restrictions>
+<?xml version="1.0" encoding="utf-8"?>
+<restrictions xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Server URL configuration -->
+    <restriction
+        android:defaultValue="https://meet.jit.si"
+        android:description="@string/restriction_server_url_description"
+        android:key="SERVER_URL"
+        android:restrictionType="string"
+        android:title="@string/restriction_server_url_title"/>
+</restrictions>

android/build.gradle

@@ -10,24 +10,28 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath 'com.google.gms:google-services:4.4.0'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
+        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
     }
 }
 
 ext {
-    kotlinVersion = "1.7.0"
-    buildToolsVersion = "33.0.2"
-    compileSdkVersion = 34
+    buildToolsVersion = "31.0.0"
+    compileSdkVersion = 32
     minSdkVersion    = 24
-    targetSdkVersion = 34
+    targetSdkVersion = 32
     supportLibVersion = "28.0.0"
 
-    // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-    ndkVersion = "23.1.7779620"
+    if (System.properties['os.arch'] == "aarch64") {
+        // For M1 Users we need to use the NDK 24 which added support for aarch64
+        ndkVersion = "24.0.8215888"
+    } else {
+        // Otherwise we default to the side-by-side NDK version from AGP.
+        ndkVersion = "21.4.7075529"
+    }
 
-    // The Maven artifact groupId of the third-party react-native modules which
+    // The Maven artifact groupdId of the third-party react-native modules which
     // Jitsi Meet SDK for Android depends on and which are not available in
     // third-party Maven repositories so we have to deploy to a Maven repository
     // of ours.
@@ -42,16 +46,21 @@ ext {
     libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
 
     googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
-
-    //React Native Version
-    rnVersion = "0.72.9"
 }
 
 allprojects {
     repositories {
+        // React Native (JS, Obj-C sources, Android binaries) is installed from npm.
+        maven { url "$rootDir/../node_modules/react-native/android" }
         // Android JSC is installed from npm.
         maven { url("$rootDir/../node_modules/jsc-android/dist") }
-        mavenCentral()
+        mavenCentral {
+            // We don't want to fetch react-native from Maven Central as there are
+            // older versions over there.
+            content {
+                excludeGroup "com.facebook.react"
+            }
+        }
         google()
         maven { url 'https://www.jitpack.io' }
     }
@@ -61,13 +70,11 @@ allprojects {
     configurations.all {
         resolutionStrategy {
             eachDependency { DependencyResolveDetails details ->
-                if (details.requested.group == 'com.facebook.react') {
-                    if (details.requested.name == 'react-native') {
-                        details.useTarget "com.facebook.react:react-android:$rnVersion"
-                    }
-                    if (details.requested.name == 'react-android') {
-                        details.useVersion rootProject.ext.rnVersion
-                    }
+                if (details.requested.group == 'com.facebook.react'
+                        && details.requested.name == 'react-native') {
+                    def file = new File("$rootDir/../node_modules/react-native/package.json")
+                    def version = new JsonSlurper().parseText(file.text).version
+                    details.useVersion version
                 }
             }
         }

android/gradle.properties

@@ -26,5 +26,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false
 
-appVersion=24.0.1
-sdkVersion=9.0.1
+appVersion=23.1.2
+sdkVersion=8.1.2

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/scripts/release-sdk.sh

@@ -9,6 +9,7 @@ THE_MVN_REPO=${MVN_REPO:-${1:-$DEFAULT_MVN_REPO}}
 MVN_HTTP=0
 DEFAULT_SDK_VERSION=$(grep sdkVersion ${THIS_DIR}/../gradle.properties | cut -d"=" -f2)
 SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
+RN_VERSION=$(jq -r '.version' ${THIS_DIR}/../../node_modules/react-native/package.json)
 JSC_VERSION="r"$(jq -r '.dependencies."jsc-android"' ${THIS_DIR}/../../node_modules/react-native/package.json | cut -d . -f 1 | cut -c 2-)
 DO_GIT_TAG=${GIT_TAG:-0}
 
@@ -24,7 +25,19 @@ export MVN_REPO=$THE_MVN_REPO
 echo "Releasing Jitsi Meet SDK ${SDK_VERSION}"
 echo "Using ${MVN_REPO} as the Maven repo"
 
- if [[ $MVN_HTTP == 1 ]]; then
+if [[ $MVN_HTTP == 1 ]]; then
+    # Push React Native
+    echo "Pushing React Native ${RN_VERSION} to the Maven repo"
+    pushd ${THIS_DIR}/../../node_modules/react-native/android/com/facebook/react/react-native/${RN_VERSION}
+    mvn \
+        deploy:deploy-file \
+        -Durl=${MVN_REPO} \
+        -DrepositoryId=${MVN_REPO_ID} \
+        -Dfile=react-native-${RN_VERSION}.aar \
+        -Dpackaging=aar \
+        -DgeneratePom=false \
+        -DpomFile=react-native-${RN_VERSION}.pom || true
+    popd
     # Push JSC
     echo "Pushing JSC ${JSC_VERSION} to the Maven repo"
     pushd ${THIS_DIR}/../../node_modules/jsc-android/dist/org/webkit/android-jsc/${JSC_VERSION}
@@ -38,6 +51,20 @@ echo "Using ${MVN_REPO} as the Maven repo"
         -DpomFile=android-jsc-${JSC_VERSION}.pom || true
     popd
 else
+    # Push React Native, if necessary
+    if [[ ! -d ${MVN_REPO}/com/facebook/react/react-native/${RN_VERSION} ]]; then
+        echo "Pushing React Native ${RN_VERSION} to the Maven repo"
+        pushd ${THIS_DIR}/../../node_modules/react-native/android/com/facebook/react/react-native/${RN_VERSION}
+        mvn \
+            deploy:deploy-file \
+            -Durl=${MVN_REPO} \
+            -Dfile=react-native-${RN_VERSION}.aar \
+            -Dpackaging=aar \
+            -DgeneratePom=false \
+            -DpomFile=react-native-${RN_VERSION}.pom
+        popd
+    fi
+
     # Push JSC, if necessary
     if [[ ! -d ${MVN_REPO}/org/webkit/android-jsc/${JSC_VERSION} ]]; then
         echo "Pushing JSC ${JSC_VERSION} to the Maven repo"
@@ -62,8 +89,8 @@ fi
 # Now build and publish the Jitsi Meet SDK and its dependencies
 echo "Building and publishing the Jitsi Meet SDK"
 pushd ${THIS_DIR}/../
-./gradlew clean
-./gradlew assembleRelease
+./gradlew clean 
+./gradlew assembleRelease 
 ./gradlew publish
 popd
 

android/sdk/build.gradle

@@ -30,7 +30,6 @@ android {
             }
         }
     }
-    namespace 'org.jitsi.meet.sdk'
 }
 
 dependencies {
@@ -40,8 +39,8 @@ dependencies {
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
-    api "com.facebook.react:react-android:$rootProject.ext.rnVersion"
-
+    //noinspection GradleDynamicVersion
+    api 'com.facebook.react:react-native:+'
     //noinspection GradleDynamicVersion
     implementation 'org.webkit:android-jsc:+'
 
@@ -50,7 +49,7 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'com.squareup.duktape:duktape-android:1.3.0'
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'androidx.startup:startup-runtime:1.1.0'
+    implementation "androidx.startup:startup-runtime:1.1.0"
 
     // Only add these packages if we are NOT doing a LIBRE_BUILD
     if (!rootProject.ext.libreBuild) {
@@ -75,7 +74,7 @@ dependencies {
     }
     implementation project(':react-native-gesture-handler')
     implementation project(':react-native-get-random-values')
-    implementation project(':react-native-immersive-mode')
+    implementation project(':react-native-immersive')
     implementation project(':react-native-keep-awake')
     implementation project(':react-native-orientation-locker')
     implementation project(':react-native-pager-view')

android/sdk/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.jitsi.meet.sdk">
     <!-- XXX ACCESS_NETWORK_STATE is required by WebRTC. -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
@@ -12,7 +13,6 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
     <uses-feature
         android:glEsVersion="0x00020000"
@@ -48,7 +48,7 @@
 
         <service
             android:name="org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService"
-            android:foregroundServiceType="mediaPlayback" />
+            android:foregroundServiceType="mediaProjection" />
 
         <provider
             android:name="com.reactnativecommunity.webview.RNCWebViewFileProvider"
@@ -66,4 +66,4 @@
 
     </application>
 
-</manifest>
+</manifest>

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

@@ -25,7 +25,6 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.module.annotations.ReactModule;
 
-import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -33,10 +32,7 @@ import java.util.Map;
 class AppInfoModule
     extends ReactContextBaseJavaModule {
 
-    private static final String BUILD_CONFIG = "org.jitsi.meet.sdk.BuildConfig";
     public static final String NAME = "AppInfo";
-    public static final boolean GOOGLE_SERVICES_ENABLED = getGoogleServicesEnabled();
-    public static final boolean LIBRE_BUILD = getLibreBuild();
 
     public AppInfoModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -79,8 +75,8 @@ class AppInfoModule
         constants.put(
             "version",
             packageInfo == null ? "" : packageInfo.versionName);
-        constants.put("LIBRE_BUILD", LIBRE_BUILD);
-        constants.put("GOOGLE_SERVICES_ENABLED", GOOGLE_SERVICES_ENABLED);
+        constants.put("LIBRE_BUILD", BuildConfig.LIBRE_BUILD);
+        constants.put("GOOGLE_SERVICES_ENABLED", BuildConfig.GOOGLE_SERVICES_ENABLED);
 
         return constants;
     }
@@ -89,47 +85,4 @@ class AppInfoModule
     public String getName() {
         return NAME;
     }
-
-    /**
-     * Checks if libre google services object is null based on build configuration.
-     */
-    private static boolean getGoogleServicesEnabled() {
-        Object googleServicesEnabled = getBuildConfigValue("GOOGLE_SERVICES_ENABLED");
-
-        if (googleServicesEnabled !=null) {
-            return (Boolean) googleServicesEnabled;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if libre build field is null based on build configuration.
-     */
-    private static boolean getLibreBuild() {
-        Object libreBuild = getBuildConfigValue("LIBRE_BUILD");
-
-        if (libreBuild !=null) {
-            return (Boolean) libreBuild;
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets build config value of a certain field.
-     *
-     * @param fieldName Field from build config.
-     */
-    private static Object getBuildConfigValue(String fieldName) {
-        try {
-            Class<?> c = Class.forName(BUILD_CONFIG);
-            Field f  = c.getDeclaredField(fieldName);
-            f.setAccessible(true);
-            return f.get(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
 }

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

@@ -87,7 +87,6 @@ class AudioDeviceHandlerGeneric implements
                         devices.add(AudioModeModule.DEVICE_EARPIECE);
                         break;
                     case AudioDeviceInfo.TYPE_BUILTIN_SPEAKER:
-                    case AudioDeviceInfo.TYPE_HDMI:
                         devices.add(AudioModeModule.DEVICE_SPEAKER);
                         break;
                     case AudioDeviceInfo.TYPE_WIRED_HEADPHONES:

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

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

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

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

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

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

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

@@ -13,7 +13,6 @@ import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
-
 import androidx.annotation.RequiresApi;
 
 import com.facebook.react.bridge.Promise;
@@ -358,7 +357,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
             JitsiMeetLogger.i(TAG + " onDisconnect " + getCallUUID());
             WritableNativeMap data = new WritableNativeMap();
             data.putString("callUUID", getCallUUID());
-            RNConnectionService.getInstance().emitEvent(
+            ReactInstanceManagerHolder.emitEvent(
                     "org.jitsi.meet:features/connection_service#disconnect",
                     data);
             // The JavaScript side will not go back to the native with
@@ -378,7 +377,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
             JitsiMeetLogger.i(TAG + " onAbort " + getCallUUID());
             WritableNativeMap data = new WritableNativeMap();
             data.putString("callUUID", getCallUUID());
-            RNConnectionService.getInstance().emitEvent(
+            ReactInstanceManagerHolder.emitEvent(
                     "org.jitsi.meet:features/connection_service#abort",
                     data);
             // The JavaScript side will not go back to the native with
@@ -407,7 +406,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
         @Override
         public void onCallAudioStateChanged(CallAudioState state) {
             JitsiMeetLogger.d(TAG + " onCallAudioStateChanged: " + state);
-            RNConnectionService module = RNConnectionService.getInstance();
+            RNConnectionService module = ReactInstanceManagerHolder.getNativeModule(RNConnectionService.class);
             if (module != null) {
                 module.onCallAudioStateChange(state);
             }

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

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

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

@@ -16,7 +16,6 @@
 
 package org.jitsi.meet.sdk;
 
-import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.Service;
@@ -24,7 +23,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.ServiceInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -34,7 +32,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
 import java.util.HashMap;
-import java.util.Random;
 
 /**
  * This class implements an Android {@link Service}, a foreground one specifically, and it's
@@ -54,12 +51,8 @@ public class JitsiMeetOngoingConferenceService extends Service
 
     private boolean isAudioMuted;
 
-    static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
-
-
     public static void launch(Context context, HashMap<String, Object> extraData) {
-
-        OngoingNotification.createNotificationChannel((Activity) context);
+        OngoingNotification.createOngoingConferenceNotificationChannel();
 
         Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
 
@@ -96,16 +89,13 @@ public class JitsiMeetOngoingConferenceService extends Service
     public void onCreate() {
         super.onCreate();
 
-        Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, this);
+        Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
         if (notification == null) {
             stopSelf();
             JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
         } else {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);
-            } else {
-                startForeground(NOTIFICATION_ID, notification);
-            }
+            startForeground(OngoingNotification.NOTIFICATION_ID, notification);
+            JitsiMeetLogger.i(TAG + " Service started");
         }
 
         OngoingConferenceTracker.getInstance().addListener(this);
@@ -136,13 +126,13 @@ public class JitsiMeetOngoingConferenceService extends Service
         if (isAudioMuted != null) {
             this.isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));
 
-            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, this);
+            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
             if (notification == null) {
                 stopSelf();
                 JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
             } else {
                 NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-                notificationManager.notify(NOTIFICATION_ID, notification);
+                notificationManager.notify(OngoingNotification.NOTIFICATION_ID, notification);
             }
         }
 
@@ -222,13 +212,13 @@ public class JitsiMeetOngoingConferenceService extends Service
         @Override
         public void onReceive(Context context, Intent intent) {
             isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));
-            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, context);
+            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
             if (notification == null) {
                 stopSelf();
                 JitsiMeetLogger.w(TAG + " Couldn't update service, notification is null");
             } else {
                 NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-                notificationManager.notify(NOTIFICATION_ID, notification);
+                notificationManager.notify(OngoingNotification.NOTIFICATION_ID, notification);
 
                 JitsiMeetLogger.i(TAG + " audio muted changed");
             }

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

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

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

@@ -0,0 +1,10 @@
+package org.jitsi.meet.sdk;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class NotificationChannels {
+    static final String ONGOING_CONFERENCE_CHANNEL_ID = "JitsiOngoingConferenceChannel";
+
+    public static List<String> allIds = new ArrayList<String>() {{ add(ONGOING_CONFERENCE_CHANNEL_ID); }};
+}

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

@@ -16,21 +16,22 @@
 
 package org.jitsi.meet.sdk;
 
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+import static org.jitsi.meet.sdk.NotificationChannels.ONGOING_CONFERENCE_CHANNEL_ID;
 
-import android.app.Activity;
+import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
-import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 
 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 
-import android.os.Build;
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
+import java.util.Random;
 
 /**
  * Helper class for creating the ongoing notification which is used with
@@ -40,15 +41,15 @@ import android.os.Build;
 class OngoingNotification {
     private static final String TAG = OngoingNotification.class.getSimpleName();
 
+    static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
     private static long startingTime = 0;
 
-    static final String ONGOING_CONFERENCE_CHANNEL_ID = "JitsiOngoingConferenceChannel";
-
-    static void createNotificationChannel(Activity context) {
+    static void createOngoingConferenceNotificationChannel() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
             return;
         }
 
+        Context context = ReactInstanceManagerHolder.getCurrentActivity();
         if (context == null) {
             JitsiMeetLogger.w(TAG + " Cannot create notification channel: no current context");
             return;
@@ -59,13 +60,12 @@ class OngoingNotification {
 
         NotificationChannel channel
             = notificationManager.getNotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID);
-
         if (channel != null) {
             // The channel was already created, no need to do it again.
             return;
         }
 
-        channel = new NotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID, context.getString(R.string.ongoing_notification_channel_name), NotificationManager.IMPORTANCE_DEFAULT);
+        channel = new NotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID, context.getString(R.string.ongoing_notification_action_unmute), NotificationManager.IMPORTANCE_DEFAULT);
         channel.enableLights(false);
         channel.enableVibration(false);
         channel.setShowBadge(false);
@@ -73,8 +73,8 @@ class OngoingNotification {
         notificationManager.createNotificationChannel(channel);
     }
 
-    static Notification buildOngoingConferenceNotification(Boolean isMuted, Context context) {
-
+    static Notification buildOngoingConferenceNotification(boolean isMuted) {
+        Context context = ReactInstanceManagerHolder.getCurrentActivity();
         if (context == null) {
             JitsiMeetLogger.w(TAG + " Cannot create notification: no current context");
             return null;

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

@@ -10,19 +10,14 @@ import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
-
-import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
-import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
@@ -40,7 +35,6 @@ class RNConnectionService extends ReactContextBaseJavaModule {
 
     private static final String TAG = ConnectionService.TAG;
 
-    private static RNConnectionService sRNConnectionServiceInstance;
     /**
      * Handler for dealing with call state changes. We are acting as a proxy between ConnectionService
      * and other modules such as {@link AudioModeModule}.
@@ -63,11 +57,6 @@ class RNConnectionService extends ReactContextBaseJavaModule {
 
     RNConnectionService(ReactApplicationContext reactContext) {
         super(reactContext);
-        sRNConnectionServiceInstance = this;
-    }
-
-    static RNConnectionService getInstance() {
-        return sRNConnectionServiceInstance;
     }
 
     @ReactMethod
@@ -237,22 +226,4 @@ class RNConnectionService extends ReactContextBaseJavaModule {
     interface CallAudioStateListener {
         void onCallAudioStateChange(android.telecom.CallAudioState callAudioState);
     }
-
-    /**
-     * Helper function to send an event to JavaScript.
-     *
-     * @param eventName {@code String} containing the event name.
-     * @param data {@code Object} optional ancillary data for the event.
-     */
-    void emitEvent(
-        String eventName,
-        @Nullable Object data) {
-        ReactContext reactContext = getReactApplicationContext();
-
-        if (reactContext != null) {
-            reactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit(eventName, data);
-        }
-    }
 }

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

@@ -37,7 +37,6 @@ import com.oney.WebRTCModule.webrtcutils.H264AndSoftwareVideoEncoderFactory;
 
 import org.devio.rn.splashscreen.SplashScreenModule;
 import org.webrtc.EglBase;
-import org.webrtc.Logging;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -106,7 +105,7 @@ class ReactInstanceManagerHolder {
             new com.oney.WebRTCModule.WebRTCModulePackage(),
             new com.swmansion.gesturehandler.RNGestureHandlerPackage(),
             new org.linusu.RNGetRandomValuesPackage(),
-            new com.rnimmersivemode.RNImmersiveModePackage(),
+            new com.rnimmersive.RNImmersivePackage(),
             new com.swmansion.rnscreens.RNScreensPackage(),
             new com.zmxv.RNSound.RNSoundPackage(),
             new com.th3rdwave.safeareacontext.SafeAreaContextPackage(),
@@ -241,8 +240,6 @@ class ReactInstanceManagerHolder {
 
         options.videoDecoderFactory = new H264AndSoftwareVideoDecoderFactory(eglContext);
         options.videoEncoderFactory = new H264AndSoftwareVideoEncoderFactory(eglContext);
-        options.enableMediaProjectionService = true;
-//      options.loggingSeverity = Logging.Severity.LS_INFO;
 
         Log.d(TAG, "initializing RN with Activity");
 

android/sdk/src/main/res/values-ru/strings.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="ongoing_notification_title">Текущая встреча</string>
-    <string name="ongoing_notification_text">Нажмите, чтобы вернуться к встрече.</string>
-    <string name="ongoing_notification_action_hang_up">Отключиться</string>
-    <string name="ongoing_notification_action_mute">Отключить звук</string>
-    <string name="ongoing_notification_action_unmute">Включить звук</string>
-    <string name="ongoing_notification_channel_name">Ongoing Conference Notifications</string>
-</resources>

android/sdk/src/main/res/values/strings.xml

@@ -1,8 +1,6 @@
 <resources>
     <string name="app_name">Jitsi Meet SDK</string>
     <string name="dropbox_app_key"></string>
-    <string name="media_projection_notification_title">Media projection</string>
-    <string name="media_projection_notification_text">You are currently sharing your screen.</string>
     <string name="ongoing_notification_title">Ongoing meeting</string>
     <string name="ongoing_notification_text">You are currently in a meeting. Tap to return to it.</string>
     <string name="ongoing_notification_action_hang_up">Hang up</string>

android/settings.gradle

@@ -1,9 +1,10 @@
 rootProject.name = 'jitsi-meet'
 
 include ':app', ':sdk'
+includeBuild('../node_modules/react-native-gradle-plugin')
 
 include ':react-native-amplitude'
-project(':react-native-amplitude').projectDir = new File(rootProject.projectDir, '../node_modules/@amplitude/react-native/android')
+project(':react-native-amplitude').projectDir = new File(rootProject.projectDir, '../node_modules/@amplitude/react-native//android')
 include ':react-native-async-storage'
 project(':react-native-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-async-storage/async-storage/android')
 include ':react-native-background-timer'
@@ -26,8 +27,8 @@ include ':react-native-giphy'
 project(':react-native-giphy').projectDir = new File(rootProject.projectDir, '../node_modules/@giphy/react-native-sdk/android')
 include ':react-native-google-signin'
 project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-google-signin/google-signin/android')
-include ':react-native-immersive-mode'
-project(':react-native-immersive-mode').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive-mode/android')
+include ':react-native-immersive'
+project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
 include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
 include ':react-native-orientation-locker'

app.js

@@ -31,6 +31,12 @@ if (window.Olm) {
 window.APP = {
     API,
     conference,
+
+    // Used for automated performance tests.
+    connectionTimes: {
+        'index.loaded': window.indexLoadedTime
+    },
+
     translation,
     UI
 };

config.js

@@ -51,9 +51,6 @@ var config = {
     // Websocket URL (XMPP)
     // websocket: 'wss://jitsi-meet.example.com/' + subdir + 'xmpp-websocket',
 
-    // Whether BOSH should be preferred over WebSocket if both are configured.
-    // preferBosh: false,
-
     // The real JID of focus participant - can be overridden here
     // Do not change username - FIXME: Make focus username configurable
     // https://github.com/jitsi/jitsi-meet/issues/7376
@@ -77,16 +74,10 @@ var config = {
     //
 
     testing: {
-        // Allows the setting of a custom bandwidth value from the UI.
-        // assumeBandwidth: true,
-
         // Disables the End to End Encryption feature. Useful for debugging
         // issues related to insertable streams.
         // disableE2EE: false,
 
-        // Enables supports for AV1 codec.
-        // enableAv1Support: false,
-
         // Enables XMPP WebSocket (as opposed to BOSH) for the given amount of users.
         // mobileXmppWsThreshold: 10, // enable XMPP WebSockets on mobile for 10% of the users
 
@@ -101,11 +92,10 @@ var config = {
         // This is useful when the client runs on a host with limited resources.
         // noAutoPlayVideo: false,
 
-        // Experiment: Whether to skip interim transcriptions.
-        // skipInterimTranscriptions: false,
-
-        // Dump transcripts to a <transcript> element for debugging.
-        // dumpTranscript: false,
+        // Enable callstats only for a percentage of users.
+        // This takes a value between 0 and 100 which determines the probability for
+        // the callstats to be enabled.
+        // callStatsThreshold: 5, // enable callstats for 5% of the users.
     },
 
     // Disables moderator indicators.
@@ -222,9 +212,6 @@ var config = {
 
     // Video
 
-    // Sets the default camera facing mode.
-    // cameraFacingMode: 'user',
-
     // Sets the preferred resolution (height) for local video. Defaults to 720.
     // resolution: 720,
 
@@ -298,19 +285,12 @@ var config = {
     //     max: 5,
     // },
 
-    // Optional screenshare settings that give more control over screen capture in the browser.
-    // screenShareSettings: {
-    //      // Show users the current tab is the preferred capture source, default: false.
-    //      desktopPreferCurrentTab: false,
-    //      // Allow users to select system audio, default: include.
-    //      desktopSystemAudio: 'include',
-    //      // Allow users to seamlessly switch which tab they are sharing without having to select the tab again.
-    //      desktopSurfaceSwitching: 'include',
-    //      // Allow a user to be shown a preference for what screen is to be captured, default: unset.
-    //      desktopDisplaySurface: undefined,
-    //      // Allow users to select the current tab as a capture source, default: exclude.
-    //      desktopSelfBrowserSurface: 'exclude'
-    // },
+    // This option has been deprecated since it is no longer supported as per the w3c spec.
+    // https://w3c.github.io/mediacapture-screen-share/#dom-mediadevices-getdisplaymedia. If the user has not
+    // interacted with the webpage before the getDisplayMedia call, the promise will be rejected by the browser. This
+    // has already been implemented in Firefox and Safari and will be implemented in Chrome soon.
+    // https://bugs.chromium.org/p/chromium/issues/detail?id=1198918
+    // startScreenSharing: false,
 
     // Recording
 
@@ -327,18 +307,6 @@ var config = {
     //          'https://jitsi-meet.example.com/subfolder/static/oauth.html',
     // },
 
-    // configuration for all things recording related. Existing settings will be migrated here in the future.
-    // recordings: {
-    //    // IF true (default) recording audio and video is selected by default in the recording dialog.
-    //    // recordAudioAndVideo: true,
-    //    // If true, shows a notification at the start of the meeting with a call to action button
-    //    // to start recording (for users who can do so).
-    //    // suggestRecording: true,
-    //    // If true, shows a warning label in the prejoin screen to point out the possibility that
-    //    // the call you're joining might be recorded.
-    //    // showPrejoinWarning: true,
-    // },
-
     // recordingService: {
     //     // When integrations like dropbox are enabled only that will be shown,
     //     // by enabling fileRecordingsServiceEnabled, we show both the integrations
@@ -399,7 +367,7 @@ var config = {
     // DEPRECATED. Use transcription.preferredLanguage instead.
     // preferredTranscribeLanguage: 'en-US',
 
-    // DEPRECATED. Use transcription.autoTranscribeOnRecord instead.
+    // DEPRECATED. Use transcription.autoCaptionOnRecord instead.
     // autoCaptionOnRecord: false,
 
     // Transcription options.
@@ -428,8 +396,11 @@ var config = {
     //     // ./src/react/features/transcribing/transcriber-langs.json.
     //     preferredLanguage: 'en-US',
 
-    //     // Enables automatic turning on transcribing when recording is started
-    //     autoTranscribeOnRecord: false,
+    //     // Disable start transcription for all participants.
+    //     disableStartForAll: false,
+
+    //     // Enables automatic turning on captions when recording is started
+    //     autoCaptionOnRecord: false,
     // },
 
     // Misc
@@ -453,53 +424,26 @@ var config = {
 
     // Specify the settings for video quality optimizations on the client.
     // videoQuality: {
+    //    // Provides a way to prevent a video codec from being negotiated on the JVB connection. The codec specified
+    //    // here will be removed from the list of codecs present in the SDP answer generated by the client. If the
+    //    // same codec is specified for both the disabled and preferred option, the disable settings will prevail.
+    //    // Note that 'VP8' cannot be disabled since it's a mandatory codec, the setting will be ignored in this case.
+    //    disabledCodec: 'H264',
     //
-    //    // Provides a way to set the codec preference on desktop based endpoints.
-    //    codecPreferenceOrder: [ 'VP9', 'VP8', 'H264' ],
+    //    // Provides a way to set a preferred video codec for the JVB connection. If 'H264' is specified here,
+    //    // simulcast will be automatically disabled since JVB doesn't support H264 simulcast yet. This will only
+    //    // rearrange the the preference order of the codecs in the SDP answer generated by the browser only if the
+    //    // preferred codec specified here is present. Please ensure that the JVB offers the specified codec for this
+    //    // to take effect.
+    //    preferredCodec: 'VP8',
     //
-    //    // Codec specific settings for scalability modes and max bitrates.
-    //    av1: {
-    //      maxBitratesVideo: {
-    //          low: 100000,
-    //          standard: 300000,
-    //          high: 1000000,
-    //          ssHigh: 2500000
-    //      },
-    //      scalabilityModeEnabled: true,
-    //      useSimulcast: false,
-    //      useKSVC: true
-    //    },
-    //    h264: {
-    //      maxBitratesVideo: {
-    //          low: 200000,
-    //          standard: 500000,
-    //          high: 1500000,
-    //          ssHigh: 2500000
-    //      },
-    //      scalabilityModeEnabled: true
-    //    },
-    //    vp8: {
-    //      maxBitratesVideo: {
-    //          low: 200000,
-    //          standard: 500000,
-    //          high: 1500000,
-    //          ssHigh: 2500000
-    //      },
-    //      scalabilityModeEnabled: false
-    //    },
-    //    vp9: {
-    //      maxBitratesVideo: {
-    //          low: 100000,
-    //          standard: 300000,
-    //          high: 1200000,
-    //          ssHigh: 2500000
-    //      },
-    //      scalabilityModeEnabled: true,
-    //      useSimulcast: false,
-    //      useKSVC: true
-    //    }
+    //    // Provides a way to enforce the preferred codec for the conference even when the conference has endpoints
+    //    // that do not support the preferred codec. For example, older versions of Safari do not support VP9 yet.
+    //    // This will result in Safari not being able to decode video from endpoints sending VP9 video.
+    //    // When set to false, the conference falls back to VP8 whenever there is an endpoint that doesn't support the
+    //    // preferred codec and goes back to the preferred codec when that endpoint leaves.
+    //    enforcePreferredCodec: false,
     //
-    //    DEPRECATED! Use `codec specific settings` instead.
     //    // Provides a way to configure the maximum bitrates that will be enforced on the simulcast streams for
     //    // video tracks. The keys in the object represent the type of the stream (LD, SD or HD) and the values
     //    // are the max.bitrates to be set on that particular type of stream. The actual send may vary based on
@@ -538,24 +482,6 @@ var config = {
     //        720: 'high',
     //    },
     //
-    //    // Provides a way to set the codec preference on mobile devices, both on RN and mobile browser based endpoint
-    //    mobileCodecPreferenceOrder: [ 'VP8', 'VP9', 'H264' ],
-    //
-    //    // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
-    //    // Provides a way to prevent a video codec from being negotiated on the JVB connection. The codec specified
-    //    // here will be removed from the list of codecs present in the SDP answer generated by the client. If the
-    //    // same codec is specified for both the disabled and preferred option, the disable settings will prevail.
-    //    // Note that 'VP8' cannot be disabled since it's a mandatory codec, the setting will be ignored in this case.
-    //    disabledCodec: 'H264',
-    //
-    //    // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
-    //    // Provides a way to set a preferred video codec for the JVB connection. If 'H264' is specified here,
-    //    // simulcast will be automatically disabled since JVB doesn't support H264 simulcast yet. This will only
-    //    // rearrange the the preference order of the codecs in the SDP answer generated by the browser only if the
-    //    // preferred codec specified here is present. Please ensure that the JVB offers the specified codec for this
-    //    // to take effect.
-    //    preferredCodec: 'VP8',
-    //
     // },
 
     // Notification timeouts
@@ -652,12 +578,12 @@ var config = {
     //     // Whether to disable welcome page. In case it's disabled a random room
     //     // will be joined when no room is specified.
     //     disabled: false,
-    //     // If set, landing page will redirect to this URL.
+    //     // If set,landing page will redirect to this URL.
     //     customUrl: ''
     // },
 
     // Configs for the lobby screen.
-    // lobby: {
+    // lobby {
     //     // If Lobby is enabled, it starts knocking automatically. Replaces `autoKnockLobby`.
     //     autoKnock: false,
     //     // Enables the lobby chat. Replaces `enableLobbyChat`.
@@ -701,7 +627,6 @@ var config = {
     // hideDominantSpeakerBadge: false,
 
     // Default language for the user interface. Cannot be overwritten.
-    // DEPRECATED! Use the `lang` iframe option directly instead.
     // defaultLanguage: 'en',
 
     // Disables profile and the edit of all fields from the profile settings (display name and email)
@@ -725,7 +650,7 @@ var config = {
     // Configs for prejoin page.
     // prejoinConfig: {
     //     // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
-    //     // This replaces `prejoinPageEnabled`. Defaults to true.
+    //     // This replaces `prejoinPageEnabled`.
     //     enabled: true,
     //     // Hides the participant name editing field in the prejoin screen.
     //     // If requireDisplayName is also set as true, a name should still be provided through
@@ -896,42 +821,6 @@ var config = {
     //     'whiteboard',
     // ],
 
-    // Participant context menu buttons which have their click/tap event exposed through the API on
-    // `participantMenuButtonClick`. Passing a string for the button key will
-    // prevent execution of the click/tap routine; passing an object with `key` and
-    // `preventExecution` flag on false will not prevent execution of the click/tap
-    // routine. Below array with mixed mode for passing the buttons.
-    // participantMenuButtonsWithNotifyClick: [
-    //     'allow-video',
-    //     {
-    //         key: 'ask-unmute',
-    //         preventExecution: false
-    //     },
-    //     'conn-status',
-    //     'flip-local-video',
-    //     'grant-moderator',
-    //     {
-    //         key: 'kick',
-    //         preventExecution: true
-    //     },
-    //     {
-    //         key: 'hide-self-view',
-    //         preventExecution: false
-    //     },
-    //     'mute',
-    //     'mute-others',
-    //     'mute-others-video',
-    //     'mute-video',
-    //     'pinToStage',
-    //     'privateMessage',
-    //     {
-    //         key: 'remote-control',
-    //         preventExecution: false
-    //     },
-    //     'send-participant-to-room',
-    //     'verify',
-    // ],
-
     // List of pre meeting screens buttons to hide. The values must be one or more of the 5 allowed buttons:
     // 'microphone', 'camera', 'select-background', 'invite', 'settings'
     // hiddenPremeetingButtons: [],
@@ -941,7 +830,7 @@ var config = {
     // customParticipantMenuButtons: [],
 
     // An array with custom option buttons for the toolbar
-    // type:  Array<{ icon: string; id: string; text: string; backgroundColor?: string; }>
+    // type:  Array<{ icon: string; id: string; text: string; }>
     // customToolbarButtons: [],
 
     // Stats
@@ -956,10 +845,38 @@ var config = {
     // The interval at which PeerConnection.getStats() is called. Defaults to 10000
     // pcStatsInterval: 10000,
 
-    // Enables sending participants' display names to stats
+    // To enable sending statistics to callstats.io you must provide the
+    // Application ID and Secret.
+    // callStatsID: '',
+    // callStatsSecret: '',
+    // callStatsApplicationLogsDisabled: false,
+
+    // The callstats initialize config params as described in the API:
+    // https://docs.callstats.io/docs/javascript#callstatsinitialize-with-app-secret
+    // callStatsConfigParams: {
+    //     disableBeforeUnloadHandler: true, // disables callstats.js's window.onbeforeunload parameter.
+    //     applicationVersion: "app_version", // Application version specified by the developer.
+    //     disablePrecalltest: true, // disables the pre-call test, it is enabled by default.
+    //     siteID: "siteID", // The name/ID of the site/campus from where the call/pre-call test is made.
+    //     additionalIDs: { // additionalIDs object, contains application related IDs.
+    //         customerID: "Customer Identifier. Example, walmart.",
+    //         tenantID: "Tenant Identifier. Example, monster.",
+    //         productName: "Product Name. Example, Jitsi.",
+    //         meetingsName: "Meeting Name. Example, Jitsi loves callstats.",
+    //         serverName: "Server/MiddleBox Name. Example, jvb-prod-us-east-mlkncws12.",
+    //         pbxID: "PBX Identifier. Example, walmart.",
+    //         pbxExtensionID: "PBX Extension Identifier. Example, 5625.",
+    //         fqExtensionID: "Fully qualified Extension Identifier. Example, +71 (US) +5625.",
+    //         sessionID: "Session Identifier. Example, session-12-34",
+    //     },
+    //     collectLegacyStats: true, //enables the collection of legacy stats in chrome browser
+    //     collectIP: true, //enables the collection localIP address
+    // },
+
+    // Enables sending participants' display names to callstats
     // enableDisplayNameInStats: false,
 
-    // Enables sending participants' emails (if available) to stats and other analytics
+    // Enables sending participants' emails (if available) to callstats and other analytics
     // enableEmailInStats: false,
 
     // faceLandmarks: {
@@ -982,7 +899,7 @@ var config = {
     //     captureInterval: 1000,
     // },
 
-    // Controls the percentage of automatic feedback shown to participants.
+    // Controls the percentage of automatic feedback shown to participants when callstats is enabled.
     // The default value is 100%. If set to 0, no automatic feedback will be requested
     // feedbackPercentage: 100,
 
@@ -990,7 +907,7 @@ var config = {
     //
 
     // If third party requests are disabled, no other server will be contacted.
-    // This means avatars will be locally generated and external stats integration
+    // This means avatars will be locally generated and callstats integration
     // will not function.
     // disableThirdPartyRequests: false,
 
@@ -1015,12 +932,12 @@ var config = {
         // If not set, the effective value is 'all'.
         // iceTransportPolicy: 'all',
 
-        // Provides a way to set the codec preference on mobile devices, both on RN and mobile browser based
-        // endpoints.
-        // mobileCodecPreferenceOrder: [ 'H264', 'VP8', 'VP9' ],
-        //
-        // Provides a way to set the codec preference on desktop based endpoints.
-        // codecPreferenceOrder: [ 'VP9', 'VP8', 'H264 ],
+        // Provides a way to set the video codec preference on the p2p connection. Acceptable
+        // codec values are 'VP8', 'VP9' and 'H264'.
+        // preferredCodec: 'H264',
+
+        // Provides a way to prevent a video codec from being negotiated on the p2p connection.
+        // disabledCodec: '',
 
         // How long we're going to wait, before going back to P2P after the 3rd
         // participant has left the conference (to filter out page reload).
@@ -1032,15 +949,6 @@ var config = {
             // { urls: 'stun:jitsi-meet.example.com:3478' },
             { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' },
         ],
-
-        // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
-        // Provides a way to set the video codec preference on the p2p connection. Acceptable
-        // codec values are 'VP8', 'VP9' and 'H264'.
-        // preferredCodec: 'H264',
-
-        // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
-        // Provides a way to prevent a video codec from being negotiated on the p2p connection.
-        // disabledCodec: '',
     },
 
     analytics: {
@@ -1057,10 +965,6 @@ var config = {
         // The Amplitude APP Key:
         // amplitudeAPPKey: '<APP_KEY>',
 
-        // Enables Amplitude UTM tracking:
-        // Default value is false.
-        // amplitudeIncludeUTM: false,
-
         // Obfuscates room name sent to analytics (amplitude, rtcstats)
         // Default value is false.
         // obfuscateRoomName: false,
@@ -1090,11 +994,6 @@ var config = {
         //      "libs/analytics-ga.min.js", // google-analytics
         //      "https://example.com/my-custom-analytics.js",
         // ],
-
-        // By enabling watchRTCEnabled option you would want to use watchRTC feature
-        // This would also require to configure watchRTCConfigParams.
-        // Please remember to keep rtcstatsEnabled disabled for watchRTC to work.
-        // watchRTCEnabled: false,
     },
 
     // Logs that should go be passed through the 'log' event if a handler is defined for it
@@ -1166,12 +1065,7 @@ var config = {
     // },
 
     // e2ee: {
-    //   labels: {
-    //     description: '',
-    //     label: '',
-    //     tooltip: '',
-    //     warning: '',
-    //   },
+    //   labels,
     //   externallyManagedKey: false,
     // },
 
@@ -1209,17 +1103,9 @@ var config = {
     // https://firebase.google.com/docs/dynamic-links/create-manually
     // deeplinking: {
     //
-    //     // The desktop deeplinking config, disabled by default.
+    //     // The desktop deeplinking config.
     //     desktop: {
-    //         appName: 'Jitsi Meet',
-    //         appScheme: 'jitsi-meet,
-    //         download: {
-    //             linux:
-    //               'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet-x86_64.AppImage',
-    //             macos: 'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet.dmg',
-    //             windows: 'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet.exe'
-    //         },
-    //         enabled: false
+    //         appName: 'Jitsi Meet'
     //     },
     //     // If true, any checks to handoff to another application will be prevented
     //     // and instead the app will continue to display in the current browser.
@@ -1302,8 +1188,6 @@ var config = {
     // remoteVideoMenu: {
     //     // Whether the remote video context menu to be rendered or not.
     //     disabled: true,
-    //     // If set to true the 'Switch to visitor' button will be disabled.
-    //     disableDemote: true,
     //     // If set to true the 'Kick out' button will be disabled.
     //     disableKick: true,
     //     // If set to true the 'Grant moderator' button will be disabled.
@@ -1324,6 +1208,9 @@ var config = {
     // If set to true all muting operations of remote participants will be disabled.
     // disableRemoteMute: true,
 
+    // Enables support for lip-sync for this client (if the browser supports it).
+    // enableLipSync: false,
+
     /**
      External API url used to receive branding specific information.
      If there is no url set or there are missing fields, the defaults are applied.
@@ -1347,16 +1234,6 @@ var config = {
         // A list of images that can be used as video backgrounds.
         // When this field is present, the default images will be replaced with those provided.
         virtualBackgrounds: ['https://example.com/img.jpg'],
-        // Object containing customized icons that should replace the default ones.
-        // The keys need to be the exact same icon names used in here:
-        // https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/icons/svg/index.ts
-        // To avoid having the icons trimmed or displayed in an unexpected way, please provide svg
-        // files containing svg xml icons in the size that the default icons come in.
-        customIcons: {
-            IconArrowUp: 'https://example.com/arrow-up.svg',
-            IconDownload: 'https://example.com/download.svg',
-            IconRemoteControlStart: 'https://example.com/remote-start.svg',
-        },
         // Object containing a theme's properties. It also supports partial overwrites of the main theme.
         // For a list of all possible theme tokens and their current defaults, please check:
         // https://github.com/jitsi/jitsi-meet/tree/master/resources/custom-theme/custom-theme.json
@@ -1392,8 +1269,6 @@ var config = {
 
     // Options related to the participants pane.
     // participantsPane: {
-    //     // Enables feature
-    //     enabled: true,
     //     // Hides the moderator settings tab.
     //     hideModeratorSettingsTab: false,
     //     // Hides the more actions button.
@@ -1412,13 +1287,13 @@ var config = {
     //     hideJoinRoomButton: false,
     // },
 
-    // When true, virtual background feature will be disabled.
-    // disableVirtualBackground: false,
-
     // When true the user cannot add more images to be used as virtual background.
     // Only the default ones from will be available.
     // disableAddingBackgroundImages: false,
 
+    // Disables using screensharing as virtual background.
+    // disableScreensharingVirtualBackground: false,
+
     // Sets the background transparency level. '0' is fully transparent, '1' is opaque.
     // backgroundAlpha: 1,
 
@@ -1445,6 +1320,7 @@ var config = {
     //         'conference-timer',
     //         'participants-count',
     //         'e2ee',
+    //         'transcribing',
     //         'video-quality',
     //         'insecure-room',
     //         'highlight-moment',
@@ -1488,31 +1364,6 @@ var config = {
     // dialInConfCodeUrl is the conference mapper converting a meeting id to a PIN used for dial-in
     // or the other way around (more info in resources/cloud-api.swagger)
 
-    // You can use external service for authentication that will redirect back passing a jwt token
-    // You can use tokenAuthUrl config to point to a URL of such service.
-    // The URL for the service supports few params which will be filled in by the code.
-    // tokenAuthUrl:
-    //      'https://myservice.com/auth/{room}?code_challenge_method=S256&code_challenge={code_challenge}&state={state}'
-    // Supported parameters in tokenAuthUrl:
-    //      {room} - will be replaced with the room name
-    //      {code_challenge} - (A web only). A oauth 2.0 code challenge that will be sent to the service. See:
-    //          https://datatracker.ietf.org/doc/html/rfc7636. The code verifier will be saved in the sessionStorage
-    //          under key: 'code_verifier'.
-    //      {state} - A json with the current state before redirecting. Keys that are included in the state:
-    //          - room (The current room name as shown in the address bar)
-    //          - roomSafe (the backend safe room name to use (lowercase), that is passed to the backend)
-    //          - tenant (The tenant if any)
-    //          - config.xxx (all config overrides)
-    //          - interfaceConfig.xxx (all interfaceConfig overrides)
-    //          - ios=true (in case ios mobile app is used)
-    //          - android=true (in case android mobile app is used)
-    //          - electron=true (when web is loaded in electron app)
-    // If there is a logout service you can specify its URL with:
-    // tokenLogoutUrl: 'https://myservice.com/logout'
-    // You can enable tokenAuthUrlAutoRedirect which will detect that you have logged in successfully before
-    // and will automatically redirect to the token service to get the token for the meeting.
-    // tokenAuthUrlAutoRedirect: false
-
     // List of undocumented settings used in jitsi-meet
     /**
      _immediateReloadThreshold
@@ -1524,6 +1375,7 @@ var config = {
      dialOutRegionUrl
      disableRemoteControl
      displayJids
+     e2eeLabels
      firefox_fake_device
      googleApiApplicationClientID
      iAmRecorder
@@ -1532,6 +1384,7 @@ var config = {
      peopleSearchQueryTypes
      peopleSearchUrl
      requireDisplayName
+     tokenAuthUrl
      */
 
     /**
@@ -1546,6 +1399,8 @@ var config = {
      _peerConnStatusOutOfLastNTimeout
      _peerConnStatusRtcMuteTimeout
      avgRtpStatsN
+     callStatsConfIDNamespace
+     callStatsCustomScriptUrl
      desktopSharingSources
      disableAEC
      disableAGC
@@ -1554,6 +1409,7 @@ var config = {
      disableLocalStats
      disableNS
      enableTalkWhileMuted
+     forceJVB121Ratio
      forceTurnRelay
      hiddenDomain
      hiddenFromRecorderFeatureEnabled
@@ -1577,7 +1433,6 @@ var config = {
     */
     // notifications: [
     //     'connection.CONNFAIL', // shown when the connection fails,
-    //     'dialog.cameraConstraintFailedError', // shown when the camera failed
     //     'dialog.cameraNotSendingData', // shown when there's no feed from user's camera
     //     'dialog.kickTitle', // shown when user has been kicked
     //     'dialog.liveStreaming', // livestreaming notifications (pending, on, off, limits)
@@ -1588,12 +1443,10 @@ var config = {
     //     'dialog.recording', // recording notifications (pending, on, off, limits)
     //     'dialog.remoteControlTitle', // remote control notifications (allowed, denied, start, stop, error)
     //     'dialog.reservationError',
-    //     'dialog.screenSharingFailedTitle', // shown when the screen sharing failed
     //     'dialog.serviceUnavailable', // shown when server is not reachable
     //     'dialog.sessTerminated', // shown when there is a failed conference session
     //     'dialog.sessionRestarted', // show when a client reload is initiated because of bridge migration
     //     'dialog.tokenAuthFailed', // show when an invalid jwt is used
-    //     'dialog.tokenAuthFailedWithReasons', // show when an invalid jwt is used with the reason behind the error
     //     'dialog.transcribing', // transcribing notifications (pending, off)
     //     'dialOut.statusMessage', // shown when dial out status is updated.
     //     'liveStreaming.busy', // shown when livestreaming service is busy
@@ -1601,45 +1454,37 @@ var config = {
     //     'liveStreaming.unavailableTitle', // shown when livestreaming service is not reachable
     //     'lobby.joinRejectedMessage', // shown when while in a lobby, user's request to join is rejected
     //     'lobby.notificationTitle', // shown when lobby is toggled and when join requests are allowed / denied
-    //     'notify.audioUnmuteBlockedTitle', // shown when mic unmute blocked
     //     'notify.chatMessages', // shown when receiving chat messages while the chat window is closed
+    //     'notify.disconnected', // shown when a participant has left
     //     'notify.connectedOneMember', // show when a participant joined
-    //     'notify.connectedThreePlusMembers', // show when more than 2 participants joined simultaneously
     //     'notify.connectedTwoMembers', // show when two participants joined simultaneously
-    //     'notify.dataChannelClosed', // shown when the bridge channel has been disconnected
+    //     'notify.connectedThreePlusMembers', // show when more than 2 participants joined simultaneously
+    //     'notify.leftOneMember', // show when a participant left
+    //     'notify.leftTwoMembers', // show when two participants left simultaneously
+    //     'notify.leftThreePlusMembers', // show when more than 2 participants left simultaneously
+    //     'notify.grantedTo', // shown when moderator rights were granted to a participant
     //     'notify.hostAskedUnmute', // shown to participant when host asks them to unmute
     //     'notify.invitedOneMember', // shown when 1 participant has been invited
     //     'notify.invitedThreePlusMembers', // shown when 3+ participants have been invited
     //     'notify.invitedTwoMembers', // shown when 2 participants have been invited
     //     'notify.kickParticipant', // shown when a participant is kicked
-    //     'notify.leftOneMember', // show when a participant left
-    //     'notify.leftThreePlusMembers', // show when more than 2 participants left simultaneously
-    //     'notify.leftTwoMembers', // show when two participants left simultaneously
     //     'notify.linkToSalesforce', // shown when joining a meeting with salesforce integration
-    //     'notify.localRecordingStarted', // shown when the local recording has been started
-    //     'notify.localRecordingStopped', // shown when the local recording has been stopped
-    //     'notify.moderationInEffectCSTitle', // shown when user attempts to share content during AV moderation
+    //     'notify.moderationStartedTitle', // shown when AV moderation is activated
+    //     'notify.moderationStoppedTitle', // shown when AV moderation is deactivated
     //     'notify.moderationInEffectTitle', // shown when user attempts to unmute audio during AV moderation
     //     'notify.moderationInEffectVideoTitle', // shown when user attempts to enable video during AV moderation
-    //     'notify.moderator', // shown when user gets moderator privilege
+    //     'notify.moderationInEffectCSTitle', // shown when user attempts to share content during AV moderation
     //     'notify.mutedRemotelyTitle', // shown when user is muted by a remote party
     //     'notify.mutedTitle', // shown when user has been muted upon joining,
     //     'notify.newDeviceAudioTitle', // prompts the user to use a newly detected audio device
     //     'notify.newDeviceCameraTitle', // prompts the user to use a newly detected camera
-    //     'notify.noiseSuppressionFailedTitle', // shown when failed to start noise suppression
     //     'notify.participantWantsToJoin', // shown when lobby is enabled and participant requests to join meeting
-    //     'notify.participantsWantToJoin', // shown when lobby is enabled and participants request to join meeting
     //     'notify.passwordRemovedRemotely', // shown when a password has been removed remotely
     //     'notify.passwordSetRemotely', // shown when a password has been set remotely
     //     'notify.raisedHand', // shown when a partcipant used raise hand,
-    //     'notify.screenShareNoAudio', // shown when the audio could not be shared for the selected screen
-    //     'notify.screenSharingAudioOnlyTitle', // shown when the best performance has been affected by screen sharing
-    //     'notify.selfViewTitle', // show "You can always un-hide the self-view from settings"
     //     'notify.startSilentTitle', // shown when user joined with no audio
-    //     'notify.suboptimalExperienceTitle', // show the browser warning
     //     'notify.unmute', // shown to moderator when user raises hand during AV moderation
     //     'notify.videoMutedRemotelyTitle', // shown when user's video is muted by a remote party,
-    //     'notify.videoUnmuteBlockedTitle', // shown when camera unmute and desktop sharing are blocked
     //     'prejoin.errorDialOut',
     //     'prejoin.errorDialOutDisconnected',
     //     'prejoin.errorDialOutFailed',
@@ -1662,8 +1507,6 @@ var config = {
     // disableFilmstripAutohiding: false,
 
     // filmstrip: {
-    //     // Disable the vertical/horizonal filmstrip.
-    //     disabled: false,
     //     // Disables user resizable filmstrip. Also, allows configuration of the filmstrip
     //     // (width, tiles aspect ratios) through the interfaceConfig options.
     //     disableResizable: false,
@@ -1686,8 +1529,6 @@ var config = {
 
     // Tile view related config options.
     // tileView: {
-    //     // Whether tileview should be disabled.
-    //     disabled: false,
     //     // The optimal number of tiles that are going to be shown in tile view. Depending on the screen size it may
     //     // not be possible to show the exact number of participants specified here.
     //     numberOfVisibleTiles: 25,
@@ -1719,12 +1560,13 @@ var config = {
     // logging: {
     //      // Default log level for the app and lib-jitsi-meet.
     //      defaultLogLevel: 'trace',
-    //      // Option to disable LogCollector.
+    //      // Option to disable LogCollector (which stores the logs on CallStats).
     //      //disableLogCollector: true,
     //      // Individual loggers are customizable.
     //      loggers: {
     //      // The following are too verbose in their logging with the default level.
     //      'modules/RTC/TraceablePeerConnection.js': 'info',
+    //      'modules/statistics/CallStats.js': 'info',
     //      'modules/xmpp/strophe.util.js': 'log',
     // },
 
@@ -1738,45 +1580,6 @@ var config = {
     //     // The server used to support whiteboard collaboration.
     //     // https://github.com/jitsi/excalidraw-backend
     //     collabServerBaseUrl: 'https://excalidraw-backend.example.com',
-    //     // The user access limit to the whiteboard, introduced as a means
-    //     // to control the performance.
-    //     userLimit: 25,
-    //     // The url for more info about the whiteboard and its usage limitations.
-    //     limitUrl: 'https://example.com/blog/whiteboard-limits,
-    // },
-
-    // The watchRTC initialize config params as described :
-    // https://testrtc.com/docs/installing-the-watchrtc-javascript-sdk/#h-set-up-the-sdk
-    // https://www.npmjs.com/package/@testrtc/watchrtc-sdk
-    // watchRTCConfigParams: {
-    //         /** Watchrtc api key */
-    //         rtcApiKey: string;
-    //         /** Identifier for the session */
-    //         rtcRoomId?: string;
-    //         /** Identifier for the current peer */
-    //         rtcPeerId?: string;
-    //         /**
-    //          * ["tag1", "tag2", "tag3"]
-    //          * @deprecated use 'keys' instead
-    //          */
-    //         rtcTags?: string[];
-    //         /** { "key1": "value1", "key2": "value2"} */
-    //         keys?: any;
-    //         /** Enables additional logging */
-    //         debug?: boolean;
-    //         rtcToken?: string;
-    //         /**
-    //          * @deprecated No longer needed. Use "proxyUrl" instead.
-    //          */
-    //         wsUrl?: string;
-    //         proxyUrl?: string;
-    //         console?: {
-    //             level: string;
-    //             override: boolean;
-    //         };
-    //         allowBrowserLogCollection?: boolean;
-    //         collectionInterval?: number;
-    //         logGetStats?: boolean;
     // },
 };
 

connection.js

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

css/_base.scss

@@ -31,8 +31,8 @@ body {
     font-size: 12px;
     font-weight: 400;
     overflow: hidden;
-    color: #F1F1F1;
-    background: #040404; // should match DEFAULT_BACKGROUND from interface_config
+    color: $defaultColor;
+    background: $defaultBackground;
 }
 
 /**
@@ -66,6 +66,10 @@ body, input, textarea, keygen, select, button {
     font-family: $baseFontFamily !important;
 }
 
+#nowebrtc {
+    display:none;
+}
+
 button, input, select, textarea {
     margin: 0;
     vertical-align: baseline;
@@ -90,7 +94,7 @@ input[type='text'], input[type='password'], textarea {
 
 button {
     color: #FFF;
-    background-color: #44A5FF;
+    background-color: $buttonBackground;
     border-radius: $borderRadius;
 
     &.no-icon {
@@ -115,18 +119,17 @@ form {
 }
 
 .leftwatermark {
-    max-width: 140px;
-    max-height:70px;
     left: 32px;
     top: 32px;
     background-position: center left;
     background-repeat: no-repeat;
     background-size: contain;
+}
 
-    &.no-margin {
-        left:0;
-        top:0;
-    }
+.leftwatermarknomargin {
+    background-position: center left;
+    background-repeat: no-repeat;
+    background-size: contain;
 }
 
 .rightwatermark {
@@ -142,7 +145,22 @@ form {
     font-size: 11pt;
     color: rgba(255,255,255,.50);
     text-decoration: none;
-    z-index: 100;
+    z-index: $poweredByZ;
+}
+
+.connected {
+    color: #21B9FC;
+    font-size: 12px;
+}
+
+.lastN, .disconnected {
+    color: #a3a3a3;
+    font-size: 12px;
+}
+
+#inviteLinkRef {
+    -webkit-user-select: text;
+    user-select: text;
 }
 
 /**
@@ -167,7 +185,7 @@ form {
 }
 
 ::-webkit-scrollbar-thumb {
-    background: #3D3D3D;
+    background: rgba(0, 0, 0, .5);
     border-radius: 4px;
 }
 
@@ -175,16 +193,3 @@ form {
 .jitsi-icon svg path {
     fill: inherit !important;
 }
-
-.sr-only {
-    border: 0 !important;
-    clip: rect(1px, 1px, 1px, 1px) !important;
-    clip-path: inset(50%) !important;
-    height: 1px !important;
-    margin: -1px !important;
-    overflow: hidden !important;
-    padding: 0 !important;
-    position: absolute !important;
-    width: 1px !important;
-    white-space: nowrap !important;
-}

css/_chat.scss

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

css/_drawer.scss

@@ -0,0 +1,89 @@
+.drawer-portal {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: $drawerZ;
+    border-radius: 16px 16px 0 0;
+
+    &.notification-portal {
+        z-index: $dropdownZ;
+    }
+}
+
+.drawer-portal::after {
+    content: '';
+    background-color: $participantsPaneBgColor;
+    margin-bottom: env(safe-area-inset-bottom, 0);
+}
+
+.drawer-menu-container {
+    height: 100vh;
+    display: flex;
+    align-items: flex-end;
+}
+
+.drawer-menu {
+    overflow-y: auto;
+    margin-bottom: env(safe-area-inset-bottom, 0);
+    width: 100%;
+
+    .drawer-toggle {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 44px;
+        cursor: pointer;
+
+        svg {
+            fill: none;
+        }
+    }
+
+    &#{&} .overflow-menu {
+        margin: auto;
+        font-size: 1.2em;
+        list-style-type: none;
+        padding: 0;
+        height: calc(80vh - 144px - 64px);
+        overflow-y: auto;
+
+        .overflow-menu-item {
+            box-sizing: border-box;
+            height: 48px;
+            padding: 12px 16px;
+
+            align-items: center;
+            color: $overflowMenuItemColor;
+            cursor: pointer;
+            display: flex;
+            font-size: 16px;
+
+            div {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+            }
+
+            &.unclickable {
+                cursor: default;
+            }
+            @media (hover: hover) and (pointer: fine) {
+                &.unclickable:hover {
+                    background: inherit;
+                }
+            }
+            &.disabled {
+                cursor: initial;
+                color: #3b475c;
+            }
+        }
+
+        .profile-text {
+            max-width: 100%;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+    }
+}

css/_e2ee.scss

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

css/_inlay.scss

@@ -3,20 +3,20 @@
     @include border-radius(4px);
     padding: 40px 38px 44px;
     color: #fff;
-    background: lighten(#474747, 20%);
+    background: $inlayColorBg;
     text-align: center;
 
     &__title {
         margin: 17px 0;
         padding-bottom: 17px;
-        color: #ffffff;
+        color: $popoverFontColor;
         font-size: 21px;
         letter-spacing: 0.3px;
-        border-bottom: 1px solid lighten(#FFFFFF, 10%);
+        border-bottom: 1px solid $inlayBorderColor;
     }
 
     &__text {
-        color: #ffffff;
+        color: $popoverFontColor;
         display: block;
         margin-top: 22px;
         font-size: 16px;

css/_login_menu.scss

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

css/_mini_toolbox.scss

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

css/_modaldialog.scss

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

css/_navigate_section_list.scss

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

css/_notice.scss

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

css/_participants-pane.scss

@@ -1,3 +1,42 @@
+.participants_pane {
+    background-color: $participantsPaneBgColor;
+    flex-shrink: 0;
+    overflow: hidden;
+    position: relative;
+    transition: width .16s ease-in-out;
+    width: 315px;
+    z-index: $zindex0;
+}
+
+.participants_pane-content {
+    display: flex;
+    flex-direction: column;
+    font-weight: 600;
+    height: 100%;
+    width: 315px;
+
+    & > *:first-child,
+    & > *:last-child {
+        flex-shrink: 0;
+    }
+}
+
+@media (max-width: 580px) {
+    .participants_pane {
+        height: 100vh;
+        height: -webkit-fill-available;
+        left: 0;
+        position: fixed;
+        right: 0;
+        top: 0;
+        width: auto;
+    }
+
+    .participants_pane-content {
+        width: 100%;
+    }
+}
+
 .jitsi-icon {
     &-dominant-speaker {
         background-color: #1EC26A;

css/_polls.scss

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

css/_popover.scss

@@ -1,5 +1,5 @@
 .popover {
-    z-index: 8;
+    z-index: $popoverZ;
 
     .popover-content {
         position: relative;

css/_reactions-menu.scss

@@ -2,7 +2,7 @@
 
 .reactions-menu {
 	width: 280px;
-	background: #242528;
+	background: $menuBG;
 	box-shadow: 0px 3px 16px rgba(0, 0, 0, 0.6), 0px 0px 4px 1px rgba(0, 0, 0, 0.25);
 	border-radius: 6px;
 	padding: 16px;
@@ -104,7 +104,7 @@
 	}
 }
 
-.reactions-animations-overflow-container {
+.reactions-animations-container {
 	position: absolute;
 	width: 20%;
 	bottom: 0;
@@ -117,13 +117,6 @@
 	position: relative;
 }
 
-.reactions-animations-container {
-	left: 50%;
-	bottom: 0px;
-	display: inline-block;
-	position: absolute;
-}
-
 $reactionCount: 20;
 
 @function random($min, $max) {
@@ -161,17 +154,17 @@ $reactionCount: 20;
 	}
 
 	70% {
-		transform: translate(40px, -70dvh) scale(1.5);
+		transform: translate(40px, -70vh) scale(1.5);
 		opacity: 1;
 	}
 
 	75% {
-		transform: translate(40px, -70dvh) scale(1.5);
+		transform: translate(40px, -70vh) scale(1.5);
 		opacity: 1;
 	}
 
 	100% {
-		transform: translate(140px, -50dvh) scale(1);
+		transform: translate(140px, -50vh) scale(1);
 		opacity: 0;
 	}
 }
@@ -194,17 +187,17 @@ $reactionCount: 20;
 			}
 
 			70% {
-				transform: translate(#{$topX}px, -#{$topY}dvh) scale(1.5);
+				transform: translate(#{$topX}px, -#{$topY}vh) scale(1.5);
 				opacity: 1;
 			}
 
 			75% {
-				transform: translate(#{$topX}px, -#{$topY}dvh) scale(1.5);
+				transform: translate(#{$topX}px, -#{$topY}vh) scale(1.5);
 				opacity: 1;
 			}
 
 			100% {
-				transform: translate(#{$bottomX}px, -#{$bottomY}dvh) scale(1);
+				transform: translate(#{$bottomX}px, -#{$bottomY}vh) scale(1);
 				opacity: 0;
 			}
 		}

css/_recording.scss

@@ -1,3 +1,7 @@
+.recordingSpinner {
+    vertical-align: top;
+}
+
 .recording-dialog {
     flex: 0;
     flex-direction: column;
@@ -15,10 +19,6 @@
             font-size: 14px;
             margin-left: 16px;
             max-width: 70%;
-
-            &-no-space {
-                margin-left: 0;
-            }
         }
 
         &.space-top {
@@ -50,6 +50,10 @@
         }
     }
 
+    .recording-switch-disabled {
+        opacity: 0.5;
+    }
+
     .recording-icon-container {
         display: inline-flex;
         align-items: center;
@@ -152,7 +156,8 @@
      */
     font-size: 14px;
 
-    .broadcast-dropdown {
+    .broadcast-dropdown,
+    .broadcast-dropdown-trigger {
         text-align: left;
     }
 
@@ -181,7 +186,7 @@
     }
 
     .google-error {
-        color: #c61600;
+        color: $errorColor;
     }
 
     .google-panel {

css/_redirect_page.scss

@@ -5,7 +5,7 @@
     font-size: 24px;
 
     .thanks-msg {
-        border-bottom: 1px solid #FFFFFF;
+        border-bottom: 1px solid $selectBg;
         padding-left: 30px;
         padding-right: 30px;
         p {
@@ -14,7 +14,7 @@
             line-height: 24px;
         }
     }
-    .hint-msg {
+    .hint-msg{
         p {
             margin: 26px auto;
             font-weight: 600;
@@ -28,13 +28,7 @@
             width: 120px;
             height: 86px;
             margin: 0 auto;
-            background: transparent;
-        }
-    }
-    .forbidden-msg {
-        p {
-            font-size: 16px;
-            margin-top: 15px;
+            background: $happySoftwareBackground;
         }
     }
 }

css/_subject.scss

@@ -34,6 +34,14 @@
     }
 }
 
+.subject-info {
+    align-items: center;
+    display: flex;
+    margin-bottom: 4px;
+    max-width: 80%;
+    height: 28px;
+}
+
 .details-container {
     width: 100%;
     display: flex;
@@ -41,6 +49,7 @@
     position: absolute;
     top: 0;
     height: 48px;
+    max-width: calc(100% - 24px);
 }
 
 @keyframes hideSubject {

css/_toolbars.scss

@@ -2,10 +2,10 @@
  * Round badge.
  */
 .badge-round {
-    background-color: #165ECC;
+    background-color: $toolbarBadgeBackground;
     border-radius: 50%;
     box-sizing: border-box;
-    color: #FFFFFF;
+    color: $toolbarBadgeColor;
     // Do not inherit the font-family from the toolbar button, because it's an
     // icon style.
     font-family: $baseFontFamily;
@@ -32,14 +32,6 @@
     pointer-events: none;
     z-index: $toolbarZ + 2;
 
-    &.shift-up {
-        bottom: calc(((#{$newToolbarSize} + 30px) * 2) * -1);
-
-        .toolbox-content {
-            margin-bottom: 46px;
-        }
-    }
-
     &.visible {
         bottom: 0;
     }
@@ -58,6 +50,21 @@
     z-index: $toolbarZ;
     pointer-events: none;
 
+    .button-group-center,
+    .button-group-left,
+    .button-group-right {
+        display: flex;
+        width: 33%;
+    }
+
+    .button-group-center {
+        justify-content: center;
+    }
+
+    .button-group-right {
+        justify-content: flex-end;
+    }
+
     .toolbox-button-wth-dialog {
         display: inline-block;
     }
@@ -97,6 +104,16 @@
     padding-bottom: env(safe-area-inset-bottom, 0);
 }
 
+.beta-tag {
+    background: #36383C;
+    border-radius: 3px;
+    color: #fff;
+    font-size: 12px;
+    margin-left: 8px;
+    padding: 0 4px;
+    text-transform: uppercase;
+}
+
 .overflow-menu-hr {
     border-top: 1px solid #4C4D50;
     border-bottom: 0;
@@ -167,7 +184,7 @@ div.hangup-menu-button {
         background: none;
 
         &:hover {
-            background: rgba(255, 255, 255, 0.2);
+            background: $newToolbarButtonHoverColor;
         }
     }
 

css/_transcription-subtitles.scss

@@ -13,7 +13,7 @@
     1px 0px 1px rgba(0,0,0,0.3),
     0px 0px 1px rgba(0,0,0,0.3);
     transform: translateX(-50%);
-    z-index: 7;
+    z-index: $subtitlesZ;
 
     &.lifted {
         // Lift subtitle above toolbar+dominant speaker box.

css/_utils.scss

@@ -3,7 +3,7 @@
 }
 
 .hidden {
-    display: none;
+  display: none;
 }
 
 /**
@@ -25,34 +25,19 @@
 }
 
 /**
- * resets default button styles,
- * mostly intended to be used on interactive elements that
- * differ from their default styles (e.g. <a>) or have custom styles
+ * Shows an inline element.
  */
-.invisible-button {
-    background: none;
-    border: none;
-    color: inherit;
-    cursor: pointer;
-    padding: 0;
+.show-inline {
+    display: inline-block !important;
 }
 
-
 /**
- * style an element the same as an <a>
- * useful on some cases where we visually have a link but it's actually a <button>
+ * Shows a flex element.
  */
-.as-link {
-    @extend .invisible-button;
-
-    display: inline;
-    color: #44A5FF;
-    text-decoration: none;
-    font-weight: bold;
-
-    &:focus,
-    &:hover,
-    &:active {
-        text-decoration: underline;
-    }
+.show-flex {
+    display: -webkit-box !important;
+    display: -moz-box !important;
+    display: -ms-flexbox !important;
+    display: -webkit-flex !important;
+    display: flex !important;
 }

css/_variables.scss

@@ -1,3 +1,5 @@
+@import "themes/light";
+
 /**
  * Style variables
  */
@@ -8,26 +10,83 @@ $baseFontFamily: -apple-system, BlinkMacSystemFont, 'open_sanslight', 'Helvetica
  */
 
 // Video layout.
+$thumbnailVideoMargin: 2px;
 $thumbnailsBorder: 2px;
+$thumbnailVideoBorder: 2px;
+$filmstripToggleButtonWidth: 17px;
+
+
+/**
+ * Color variables.
+ */
+$defaultColor: #F1F1F1;
+$defaultSideBarFontColor: #44A5FF;
+$defaultSemiDarkColor: #ACACAC;
+$defaultDarkColor: #2b3d5c;
+$defaultWarningColor: rgb(215, 121, 118);
+$participantsPaneBgColor: #141414;
 
 /**
  * Toolbar
  */
 $newToolbarBackgroundColor: #131519;
+$newToolbarButtonHoverColor: rgba(255, 255, 255, 0.2);
+$newToolbarButtonToggleColor: rgba(255, 255, 255, 0.15);
+$menuBG:#242528;
+$newToolbarFontSize: 24px;
+$newToolbarHangupFontSize: 32px;
 $newToolbarSize: 48px;
 $newToolbarSizeMobile: 60px;
 $newToolbarSizeWithPadding: calc(#{$newToolbarSize} + 24px);
+$toolbarTitleFontSize: 19px;
+$overflowMenuItemColor: #fff;
+
+
+/**
+ * Video layout
+ */
+$participantNameColor: #fff;
+$audioLevelBg: #44A5FF;
+$audioLevelShadow: rgba(9, 36, 77, 0.9);
+$videoStateIndicatorColor: $defaultColor;
+$videoStateIndicatorBackground: $toolbarBackground;
+$videoStateIndicatorSize: 40px;
+
+/**
+ * Feedback Modal
+ */
+$feedbackContentBg: #fff;
+$feedbackInputBg: #fff;
+$feedbackTextColor: #000;
+$feedbackInputTextColor: #333;
+$feedbackInputPlaceholderColor: #777;
+
+/**
+ * Modals
+ */
+$modalButtonFontSize: 14px;
+$modalMockAKInputBackground: #fafbfc;
+$modalMockAKInputBorder: 1px solid #f4f5f7;
+$modalTextColor: #333;
 
 /**
  * Chat
  */
+$chatActionsSeparatorColor: rgb(173, 105, 112);
 $chatBackgroundColor: #131519;
+$chatInputSeparatorColor: #A4B8D1;
+$chatLobbyActionsSeparatorColor: #6A50D3;
+$chatLocalMessageBackgroundColor: #484A4F;
+$chatPrivateMessageBackgroundColor: rgb(153, 69, 77);
+$chatRemoteMessageBackgroundColor:  #242528;
 $sidebarWidth: 315px;
 
 /**
  * Misc.
  */
 $borderRadius: 4px;
+$happySoftwareBackground: transparent;
+$desktopAppDragBarHeight: 25px;
 $scrollHeight: 7px;
 
 /**
@@ -37,11 +96,38 @@ $zindex0: 0;
 $zindex1: 1;
 $zindex2: 2;
 $zindex3: 3;
+$subtitlesZ: 7;
+$popoverZ: 8;
+$reloadZ: 20;
+$poweredByZ: 100;
+$ringingZ: 300;
+$sideToolbarContainerZ: 300;
 $toolbarZ: 250;
+$drawerZ: 351;
+$dropdownZ: 901;
+$overlayZ: 1016;
 // Place filmstrip videos over toolbar in order
 // to make connection info visible.
 $filmstripVideosZ: $toolbarZ + 1;
 
+
+/**
+ * Font Colors
+ */
+$defaultFontColor: #777;
+$defaultLightFontColor: #F1F1F1;
+$defaultDarkFontColor: #000;
+
+/**
+ * Forms
+ */
+//inputs
+$inputControlEmColor: #f29424;
+//buttons
+$linkFontColor: #489afe;
+$linkHoverFontColor: #287ade;
+$formPadding: 16px;
+
 /**
  * Unsupported browser
  */

css/_videolayout_default.scss

@@ -108,10 +108,6 @@
 #largeVideoContainer {
     height: 100%;
     width: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-    margin: 0 !important;
 }
 
 #largeVideoWrapper {
@@ -189,7 +185,7 @@
         opacity: 0;
         display: inline-block;
         @include circle(5px);
-        background: rgba(9, 36, 77, 0.9);
+        background: $audioLevelShadow;
         margin: 1px 0 1px 0;
         transition: opacity .25s ease-in-out;
         -moz-transition: opacity .25s ease-in-out;
@@ -205,10 +201,27 @@
         border-radius: 50%;
         -webkit-filter: blur(0.5px);
         filter: blur(0.5px);
-        background: #44A5FF;
+        background: $audioLevelBg;
     }
 }
 
+#reloadPresentation {
+    display: none;
+    position: absolute;
+    color: #FFFFFF;
+    top: 0;
+    right:0;
+    padding: 10px 10px;
+    font-size: 11pt;
+    cursor: pointer;
+    background: rgba(0, 0, 0, 0.3);
+    border-radius: 5px;
+    background-clip: padding-box;
+    -webkit-border-radius: 5px;
+    -webkit-background-clip: padding-box;
+    z-index: $reloadZ; /*The reload button should appear on top of the header!*/
+}
+
 #dominantSpeaker {
     visibility: hidden;
     width: 300px;
@@ -219,6 +232,10 @@
     transform: translateY(-50%);
 }
 
+#mixedstream {
+    display:none !important;
+}
+
 #dominantSpeakerAvatarContainer,
 .dynamic-shadow {
     width: 200px;
@@ -266,10 +283,10 @@
     #avatarContainer {
         border-radius: 50%;
         display: inline-block;
-        height: 50dvh;
-        margin-top: 25dvh;
+        height: 50vh;
+        margin-top: 25vh;
         overflow: hidden;
-        width: 50dvh;
+        width: 50vh;
 
         #avatar {
             height: 100%;
@@ -288,6 +305,11 @@
     object-fit: cover;
 }
 
+.videoMessageFilter {
+    -webkit-filter: grayscale(.5) opacity(0.8);
+    filter: grayscale(.5) opacity(0.8);
+}
+
 #remotePresenceMessage,
 #remoteConnectionMessage {
     position: absolute;
@@ -339,7 +361,7 @@
 }
 
 .presence-label {
-    color: #fff;
+    color: $participantNameColor;
     font-size: 12px;
     font-weight: 100;
     left: 0;

css/_welcome_page.scss

@@ -10,7 +10,7 @@ body.welcome-page {
     flex-direction: column;
     font-family: $welcomePageFontFamily;
     justify-content: space-between;
-    min-height: 100dvh;
+    min-height: 100vh;
     position: relative;
 
     .header {
@@ -61,38 +61,9 @@ body.welcome-page {
 
         }
 
-        .not-allow-title-character-div {
-            color: #f03e3e;
-            background-color: #fff;
-            font-size: 12px;
-            font-weight: 600;
-            margin: 10px 0px 5px 0px;
-            text-align: $welcomePageHeaderTextAlign;
-            border-radius: 5px;
-            padding: 5px;
-            .not-allow-title-character-text {
-                float: right;
-                line-height: 1.9;
-            };
-            .jitsi-icon {
-                margin-right: 9px;
-                float: left;
-
-
-                svg {
-                    fill:#f03e3e;
-
-                    & > *:first-child {
-                        fill: none !important;
-                    }
-                }
-            }
-
-        }
-
         .insecure-room-name-warning {
             align-items: center;
-            color: rgb(215, 121, 118);
+            color: $defaultWarningColor;
             font-weight: 600;
             display: flex;
             flex-direction: row;
@@ -104,7 +75,7 @@ body.welcome-page {
                 margin-right: 15px;
 
                 svg {
-                    fill: rgb(215, 121, 118);
+                    fill: $defaultWarningColor;
 
                     & > *:first-child {
                         fill: none !important;
@@ -260,6 +231,11 @@ body.welcome-page {
             width: $welcomePageWatermarkWidth;
             height: $welcomePageWatermarkHeight;
         }
+
+        .watermark.leftwatermarknomargin {
+            width: $welcomePageWatermarkWidth;
+            height: $welcomePageWatermarkHeight;
+        }
     }
 
     &.without-content {

css/components/_input-slider.scss

@@ -19,7 +19,7 @@ input[type=range]:focus {
  * Include the mixin for a range input style.
  */
 @include slider {
-    background: #474747;
+    background: $sliderTrackBackground;
     border: none;
     border-radius: 3px;
     cursor: pointer;
@@ -33,9 +33,9 @@ input[type=range]:focus {
 @include slider-thumb {
     -webkit-appearance: none;
     background: white;
-    border: 1px solid #3572b0;
+    border: 1px solid $sliderThumbBackground;
     border-radius: 50%;
-    box-shadow: 0px 0px 1px #3572b0;
+    box-shadow: 0px 0px 1px $sliderThumbBackground;
     cursor: pointer;
     height: 14px;
     margin-top: -4px;

css/deep-linking/_mobile.scss

@@ -1,6 +1,6 @@
 .deep-linking-mobile {
     background-color: #fff;
-    height: 100dvh;
+    height: 100vh;
     overflow: auto;
     position: relative;
     width: 100vw;

css/deep-linking/_no-mobile-app.scss

@@ -5,7 +5,7 @@
     width: auto;
 
     &__title {
-        border-bottom: 1px solid lighten(#FFFFFF, 10%);
+        border-bottom: 1px solid $inlayBorderColor;
         color: $unsupportedBrowserTitleColor;
         font-weight: 400;
         letter-spacing: 0.5px;

css/filmstrip/_small_video.scss

@@ -2,9 +2,9 @@
     display: inline-block;
     position: relative;
     background-size: contain;
-    border: 2px solid transparent;
+    border: $thumbnailVideoBorder solid transparent;
     border-radius: $borderRadius;
-    margin: 0 2px;
+    margin: 0 $thumbnailVideoMargin;
 
     &:hover {
         cursor: hand;

css/main.scss

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

css/modals/_dialog.scss

@@ -2,8 +2,8 @@
     margin-top: 5px !important;
 
     .input-control {
-        background: #fafbfc;
-        border: 1px solid #f4f5f7;
+        background: $modalMockAKInputBackground;
+        border: $modalMockAKInputBorder;
         color: inherit;
     }
 

css/modals/_whiteboard.scss

@@ -1,7 +0,0 @@
-.whiteboard {
-
-    .excalidraw-wrapper {
-        height: 100vh;
-        width: 100vw;
-    }
-}

css/modals/security/_security.scss

@@ -21,7 +21,7 @@
 
                 &-actions {
                     margin-top: 10px;
-                    button {
+                    a {
                         cursor: pointer;
                         text-decoration: none;
                         font-size: 14px;

css/overlay/_overlay.scss

@@ -6,12 +6,12 @@
         width: 100%;
         height: 100%;
         position: fixed;
-        z-index: 1016;
-        background: #474747;
+        z-index: $overlayZ;
+        background: $defaultBackground;
     }
 
     &__container-light {
-        @include transparentBg(#474747, 0.7);
+        @include transparentBg($defaultBackground, 0.7);
     }
 
     &__content {

css/reload_overlay/_reload_overlay.scss

@@ -19,7 +19,7 @@
     width: 180px;
 
     .progress-indicator-fill {
-        background: #0074E0;
+        background: $reloadProgressBarBg;
         height: 100%;
         transition: width .5s;
     }

css/ringing/_ringing.scss

@@ -5,11 +5,11 @@
     width: 100%;
     height: 100%;
     position: fixed;
-    z-index: 300;
+    z-index: $ringingZ;
     @include transparentBg(#283447, 0.95);
 
     &.solidBG {
-        background: #040404;
+        background: $defaultBackground;
     }
 
     &__content {

css/themes/_light.scss

@@ -0,0 +1,77 @@
+/**
+ * Base
+ */
+$baseLight: #FFFFFF;
+
+/**
+* Controls
+*/
+$sliderTrackBackground: #474747;
+$sliderThumbBackground: #3572b0;
+
+/**
+* Buttons
+*/
+$buttonBackground: #44A5FF;
+$buttonHoverBackground: #2c4062;
+$buttonBorder: transparent;
+$buttonHoverBorder: transparent;
+$buttonColor: #eceef1;
+
+$buttonLightBackground: #f5f5f5;
+$buttonLightHoverBackground: #e9e9e9;
+$buttonLightBorder: #ccc;
+$buttonLightHoverBorder: #999;
+
+$buttonLinkBackground: transparent;
+$buttonLinkColor: #0090e8;
+
+$primaryButtonBackground: #3572b0;
+$primaryButtonHoverBackground: #2a67a5;
+$primaryButtonColor: $baseLight;
+$primaryButtonFontWeight: 400;
+
+$buttonShadowColor: #192d4f;
+
+$overlayButtonBg: #0074E0;
+
+/**
+* Color variables
+**/
+$defaultBackground: #474747;
+$reloadProgressBarBg: #0074E0;
+
+/**
+ * Dialog colors
+ **/
+$dialogErrorText: #344563;
+
+/**
+* Inlay colors
+**/
+$inlayColorBg: lighten($defaultBackground, 20%);
+$inlayBorderColor: lighten($baseLight, 10%);
+
+// Main controls
+$placeHolderColor: #a7a7a7;
+$readOnlyInputColor: #a7a7a7;
+$defaultDarkSelectionColor: #ccc;
+$buttonFontWeight: 400;
+$labelFontWeight: 400;
+$linkFontColor: #3572b0;
+$linkHoverFontColor: darken(#3572b0, 10%);
+$errorColor: #c61600;
+
+
+// Popover colors
+$popoverFontColor: #ffffff !important;
+
+// Toolbar
+$toolbarBackground: rgba(0, 0, 0, 0.5);
+$toolbarBadgeBackground: #165ECC;
+$toolbarBadgeColor: #FFFFFF;
+
+/**
+ * Forms
+ */
+$selectBg: $baseLight;

css/unsupported-browser/_unsupported-desktop-browser.scss

@@ -25,11 +25,11 @@
     }
 
     &__link {
-        color: #489afe;
+        color: $linkFontColor;
         @include transition(color .1s ease-out);
 
         &:hover {
-            color: #287ade;
+            color: $linkHoverFontColor;
             cursor: pointer;
             text-decoration: none;
 

debian/jitsi-meet-tokens.postinst

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

debian/jitsi-meet-web-config.install

@@ -1,6 +1,3 @@
 doc/debian/jitsi-meet/jitsi-meet.example        /usr/share/jitsi-meet-web-config/
 doc/debian/jitsi-meet/jitsi-meet.example-apache /usr/share/jitsi-meet-web-config/
 config.js                                       /usr/share/jitsi-meet-web-config/
-doc/jaas/nginx-jaas.conf                        /usr/share/jitsi-meet-web-config/
-doc/jaas/index-jaas.html                        /usr/share/jitsi-meet-web-config/
-doc/jaas/8x8.vc-config.js                        /usr/share/jitsi-meet-web-config/

debian/jitsi-meet-web.install

@@ -1,5 +1,6 @@
 interface_config.js		/usr/share/jitsi-meet/
 *.html					/usr/share/jitsi-meet/
+*.ico					/usr/share/jitsi-meet/
 libs					/usr/share/jitsi-meet/
 static                  /usr/share/jitsi-meet/
 css/all.css 			/usr/share/jitsi-meet/css/
@@ -11,5 +12,3 @@ resources/robots.txt	/usr/share/jitsi-meet/
 resources/*.sh			/usr/share/jitsi-meet/scripts/
 pwa-worker.js			/usr/share/jitsi-meet/
 manifest.json			/usr/share/jitsi-meet/
-doc/jaas/move-to-jaas.sh        /usr/share/jitsi-meet/scripts/
-doc/jaas/update-asap-daily.sh   /usr/share/jitsi-meet/scripts/

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

@@ -51,10 +51,12 @@ VirtualHost "jitmeet.example.com"
     }
     av_moderation_component = "avmoderation.jitmeet.example.com"
     speakerstats_component = "speakerstats.jitmeet.example.com"
+    conference_duration_component = "conferenceduration.jitmeet.example.com"
     end_conference_component = "endconference.jitmeet.example.com"
     -- we need bosh
     modules_enabled = {
         "bosh";
+        "pubsub";
         "ping"; -- Enable mod_ping
         "speakerstats";
         "external_services";
@@ -129,6 +131,9 @@ Component "focus.jitmeet.example.com" "client_proxy"
 Component "speakerstats.jitmeet.example.com" "speakerstats_component"
     muc_component = "conference.jitmeet.example.com"
 
+Component "conferenceduration.jitmeet.example.com" "conference_duration_component"
+    muc_component = "conference.jitmeet.example.com"
+
 Component "endconference.jitmeet.example.com" "end_conference"
     muc_component = "conference.jitmeet.example.com"
 

doc/debian/jitsi-meet/jitsi-meet.example

@@ -43,8 +43,8 @@ server {
     }
 }
 server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+    listen 443 ssl;
+    listen [::]:443 ssl;
     server_name jitsi-meet.example.com;
 
     # Mozilla Guideline v5.4, nginx 1.17.7, OpenSSL 1.1.1d, intermediate configuration
@@ -58,8 +58,6 @@ server {
 
     add_header Strict-Transport-Security "max-age=63072000" always;
     set $prefix "";
-    set $custom_index "";
-    set $config_js_location /etc/jitsi/meet/jitsi-meet.example.com-config.js;
 
     ssl_certificate /etc/jitsi/meet/jitsi-meet.example.com.crt;
     ssl_certificate_key /etc/jitsi/meet/jitsi-meet.example.com.key;
@@ -79,10 +77,8 @@ server {
     gzip_proxied no-cache no-store private expired auth;
     gzip_min_length 512;
 
-    include /etc/jitsi/meet/jaas/*.conf;
-
     location = /config.js {
-        alias $config_js_location;
+        alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
     }
 
     location = /external_api.js {
@@ -96,11 +92,6 @@ server {
         proxy_set_header Host $http_host;
     }
 
-    location ~ ^/_api/public/(.*)$ {
-        autoindex off;
-        alias /etc/jitsi/meet/public/$1;
-    }
-
     # ensure all static content can always be found first
     location ~ ^/(libs|css|static|images|fonts|lang|sounds|.well-known)/(.*)$
     {
@@ -151,12 +142,11 @@ server {
     #}
 
     location ~ ^/([^/?&:'"]+)$ {
-        set $roomname "$1";
         try_files $uri @root_path;
     }
 
     location @root_path {
-        rewrite ^/(.*)$ /$custom_index break;
+        rewrite ^/(.*)$ / break;
     }
 
     location ~ ^/([^/?&:'"]+)/config.js$
@@ -164,7 +154,7 @@ server {
         set $subdomain "$1.";
         set $subdir "$1/";
 
-        alias $config_js_location;
+        alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
     }
 
     # Matches /(TENANT)/pwa-worker.js or /(TENANT)/manifest.json to rewrite to / and look for file

doc/jaas/8x8.vc-config.js

@@ -1,7 +0,0 @@
-</script>
-<script src="https://8x8.vc/<!--# echo var="subdir" default="" -->config.js" onload="{
-config.p2p.disabledCodec='VP9';
-config.videoQuality.disabledCodec='VP9';
-config.e2ee = { externallyManagedKey: true };
-}"/>
-<script>

doc/jaas/README.md

@@ -1,22 +0,0 @@
-## How to switch your deployment to [JaaS](https://jaas.8x8.vc) in one easy step
-
-Note: By default it will have e2ee(end-to-end) encryption enabled that works only on chromium based browsers (Chrome, Edge, ...). If a participant joins from another browser or mobile the e2ee is turned off. 
-
-In order to use your deployment with JaaS you first need to login to your [JaaS Developer console](https://jaas.8x8.vc/#/apikeys) and generate a key pair.
-Use `Add API key` button and then `Generate API key pair`. Make sure you download the generated private key from:
-
-<img src="generated_key_dialog.png" height="250">
-
-Make sure you transfer this downloaded private key to your server. Copy the key id from:
-
-<img src="api_keys_kid.png" height="200">
-
-Now on your server run the helper script passing the private key file and the key id:
-
-```
-sudo /usr/share/jitsi-meet/scripts/move-to-jaas.sh /my/path/test-key.pk <key_id>
-```
-
-More information about JaaS Api keys at: https://developer.8x8.com/jaas/docs/jaas-console-api-keys
-
-If you want to adjust the enabled services you can do that in /etc/jits/meet/jaas/nginx-jaas.conf. The part after `proxy_set_body` is the jwt token content that will be used for the client tokens. More info about the JaaS tokens: https://developer.8x8.com/jaas/docs/api-keys-jwt

doc/jaas/index-jaas.html

@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src='external_api.js' async></script>
-        <style>html, body, #jaas-container { height: 100%; }</style>
-        <script type="text/javascript">
-            function getRoomName(pathname) {
-                const contextRootEndIndex = pathname.lastIndexOf('/');
-
-                return pathname.substring(contextRootEndIndex + 1);
-            }
-            window.onload = () => {
-                const jaasJwt = <!--#include virtual="/jaas-jwt" -->;
-                const api = new JitsiMeetExternalAPI(
-                    window.location.host, {
-                        roomName: `${jaasJwt.tenant}/${jaasJwt.confId}`,
-                        parentNode: document.querySelector('#jaas-container'),
-                        jwt: jaasJwt.token,
-                        e2eeKey: jaasJwt.e2eeKey
-                    });
-                api.addListener('videoConferenceJoined', () => {
-                    if (jaasJwt.e2eeKey) {
-                        console.info('Toggling e2ee on!')
-                        api.executeCommand('toggleE2EE', true);
-                    }
-                });
-            }
-        </script>
-    </head>
-    <body>
-        <div id="jaas-container" />
-    </body>
-</html>

doc/jaas/move-to-jaas.sh

@@ -1,59 +0,0 @@
-#!/bin/bash
-
-set -e
-
-PRIVATE_KEY=$1
-JAAS_KEY_ID=$2
-
-if [ ! -f "${PRIVATE_KEY}" ] ; then
-  echo "You need to specify a correct path for the private key as a first argument."
-  exit 1;
-fi
-
-if [[ ! "${JAAS_KEY_ID}" =~ ^vpaas-magic-cookie-[0-9a-z]+/[0-9a-z]+$ ]]; then
-    echo "Invalid key id passed as a second argument."
-    exit 2;
-fi
-
-command -v node >/dev/null 2>&1 || { echo >&2 "You must install node first, go to https://nodejs.org. Aborting."; exit 4; }
-
-NODE_VER=$(node -v);
-NODE_MAJOR_VER=$(echo ${NODE_VER:1} |  cut -d. -f1);
-
-if [ "$NODE_MAJOR_VER" -lt "18" ]; then
-    echo "Please install latest LTS version of node (18+)";
-    exit 3;
-fi
-
-# we need this util for debconf-set-selections
-sudo apt install debconf-utils
-
-# Let's pre-set some settings for token-generator
-cat << EOF | sudo debconf-set-selections
-token-generator token-generator/private-key string ${PRIVATE_KEY}
-token-generator token-generator/kid  string ${JAAS_KEY_ID}
-EOF
-
-apt install token-generator
-
-mkdir -p /etc/jitsi/meet/jaas
-
-VPAAS_COOKIE=$(echo -n ${JAAS_KEY_ID}| cut -d/ -f1)
-cp /usr/share/jitsi-meet-web-config/nginx-jaas.conf /etc/jitsi/meet/jaas
-sed -i "s/jaas_magic_cookie/${VPAAS_COOKIE}/g" /etc/jitsi/meet/jaas/nginx-jaas.conf
-
-cp /usr/share/jitsi-meet-web-config/8x8.vc-config.js /etc/jitsi/meet/jaas/
-echo "set \$config_js_location /etc/jitsi/meet/jaas/8x8.vc-config.js;" >> /etc/jitsi/meet/jaas/jaas-vars
-echo "set \$custom_index index-jaas.html;" >> /etc/jitsi/meet/jaas/jaas-vars
-
-ln -s /usr/share/jitsi-meet-web-config/index-jaas.html /usr/share/jitsi-meet/index-jaas.html
-
-# let's create the daily key now
-/usr/share/jitsi-meet/scripts/update-asap-daily.sh
-
-# let's add to cron daily the update of the asap key
-if [ -d /etc/cron.daily ]; then
-  ln -s /usr/share/jitsi-meet/scripts/update-asap-daily.sh /etc/cron.daily/update-jaas-asap.sh
-else
-  echo "No /etc/cron.daily. Please add to your cron jobs to execute as root daily the script: /usr/share/jitsi-meet/scripts/update-asap-daily.sh"
-fi

doc/jaas/nginx-jaas.conf

@@ -1,23 +0,0 @@
-include /etc/jitsi/meet/jaas/jaas-vars;
-location = /jaas-jwt {
-  include /etc/jitsi/token-generator/daily-key;
-  ssi on;
-  proxy_method POST;
-  proxy_set_header content-type "application/json";
-  proxy_set_header Accept-Encoding "";
-  proxy_set_header Authorization "Bearer $jaas_asap_key";
-  proxy_pass_request_body off;
-  proxy_set_body '{"sub":"jaas_magic_cookie","context":{"features":{"livestreaming":false,"outbound-call":false,"sip-outbound-call":false,"transcription":false,"recording":false},"user":{"moderator":true}},"room": "$roomname"}';
-  proxy_pass http://127.0.0.1:8017/generate/client?e2eeKey=true&confId=true;
-}
-
-location @magic_root_path {
-    rewrite ^/(.*)$ /index.html break;
-}
-
-# Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
-location ~ ^/jaas_magic_cookie/(.*)$ {
-    set $subdomain "jaas_magic_cookie.";
-    set $subdir "jaas_magic_cookie/";
-    try_files $1 @magic_root_path;
-}

doc/jaas/update-asap-daily.sh

@@ -1,9 +0,0 @@
-JWT_KID=$(cat /etc/jitsi/token-generator/config | grep  SYSTEM_ASAP_BASE_URL_MAPPINGS | cut -d= -f2- | jq -r .[].kid)
-JWT_DATE=$(echo -n $JWT_KID | cut -d/ -f2-)
-JWT_DATE=${JWT_DATE#jwt-}
-KEY_FILE=/etc/jitsi/token-generator/daily-key
-echo -n "set \$jaas_asap_key " > ${KEY_FILE}
-ASAP_KEY=$(ASAP_SIGNING_KEY_FILE=/etc/jitsi/token-generator/asap-${JWT_DATE}.key ASAP_JWT_KID="${JWT_KID}" ASAP_EXPIRES_IN="1 day" node /usr/share/token-generator/jwt.js| tail -n1)
-echo -n "${ASAP_KEY};" >> ${KEY_FILE}
-
-service nginx reload

globals.d.ts

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

globals.native.d.ts

@@ -17,11 +17,6 @@ interface IWindow {
     innerWidth: number;
     interfaceConfig: any;
     location: ILocation;
-    PressureObserver?: any;
-    PressureRecord?: any;
-    ReactNativeWebView?: any;
-    TextDecoder?: any;
-    TextEncoder?: any;
     self: any;
     top: any;
 
@@ -35,7 +30,6 @@ interface IWindow {
     setImmediate: typeof setImmediate;
     clearImmediate: typeof clearImmediate;
     addEventListener: Function;
-    removeEventListener: Function;
 }
 
 interface INavigator {

inlang.config.js

@@ -1,23 +0,0 @@
-/**
- * @type { import("@inlang/core/config").DefineConfig }
- */
-export async function defineConfig(env) {
-    const { default: i18nextPlugin } = await env.$import(
-        'https://cdn.jsdelivr.net/npm/@inlang/plugin-i18next@2/dist/index.js'
-    );
-
-    const { default: standardLintRules } = await env.$import(
-        'https://cdn.jsdelivr.net/npm/@inlang/plugin-standard-lint-rules@3/dist/index.js'
-    );
-
-    return {
-        referenceLanguage: 'main',
-        plugins: [
-            i18nextPlugin({
-                pathPattern: 'lang/{language}.json',
-                ignore: [ 'languages.json', 'translation-languages.json' ]
-            }),
-            standardLintRules()
-        ]
-    };
-}

interface_config.js

@@ -107,8 +107,8 @@ var interfaceConfig = {
     // Names of browsers which should show a warning stating the current browser
     // has a suboptimal experience. Browsers which are not listed as optimal or
     // unsupported are considered suboptimal. Valid values are:
-    // chrome, chromium, electron, firefox , safari, webkit
-    OPTIMAL_BROWSERS: [ 'chrome', 'chromium', 'firefox', 'electron', 'safari', 'webkit' ],
+    // chrome, chromium, edge, electron, firefox, nwjs, opera, safari
+    OPTIMAL_BROWSERS: [ 'chrome', 'chromium', 'firefox', 'nwjs', 'electron', 'safari' ],
 
     POLICY_LOGO: null,
     PROVIDER_NAME: 'Jitsi',

ios/.xcode.env

@@ -1,2 +0,0 @@
-export NODE_BINARY=$(command -v node)
-export ENTRY_FILE="${PROJECT_DIR}/../../index.ios.js"

ios/Podfile

@@ -1,11 +1,7 @@
-# Resolve react_native_pods.rb with node to allow for hoisting.
-require Pod::Executable.execute_command('node', ['-p',
-  'require.resolve(
-    "react-native/scripts/react_native_pods.rb",
-    {paths: [process.argv[1]]},
-  )', __dir__]).strip
+require_relative '../node_modules/react-native/scripts/react_native_pods'
+require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-platform :ios, '13.4'
+platform :ios, '12.0'
 workspace 'jitsi-meet'
 
 install! 'cocoapods', :deterministic_uuids => false
@@ -25,9 +21,8 @@ target 'JitsiMeetSDK' do
   #
 
   config = use_native_modules!
-  flags = get_default_flags()
   use_react_native!(
-    :path => config[:reactNativePath],
+    :path => config["reactNativePath"],
     :hermes_enabled => false,
     :fabric_enabled => false,
     # An absolute path to your application root.
@@ -47,6 +42,7 @@ target 'JitsiMeetSDK' do
 
   pod 'CocoaLumberjack', '3.7.2'
   pod 'ObjectiveDropboxOfficial', '6.2.3'
+  pod 'JitsiWebRTC', '~> 111.0.0'
 end
 
 target 'JitsiMeetSDKLite' do
@@ -57,28 +53,24 @@ target 'JitsiMeetSDKLite' do
 
     # React Native and its dependencies
     #
-
+  
     config = use_native_modules!
     use_react_native!(
-      :path => config[:reactNativePath],
+      :path => config["reactNativePath"],
       :hermes_enabled => false,
       :fabric_enabled => false,
       # An absolute path to your application root.
       :app_path => "#{Pod::Config.instance.installation_root}/.."
     )
-
+  
     # Native pod dependencies
     #
-
+  
     pod 'CocoaLumberjack', '3.7.2'
 end
 
 post_install do |installer|
-  react_native_post_install(
-    installer,
-    use_native_modules![:reactNativePath],
-    :mac_catalyst_enabled => false
-  )
+  react_native_post_install(installer)
   __apply_Xcode_12_5_M1_post_install_workaround(installer)
   installer.pods_project.targets.each do |target|
     # https://github.com/CocoaPods/CocoaPods/issues/11402
@@ -89,8 +81,7 @@ post_install do |installer|
     end
     target.build_configurations.each do |config|
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.4'
-      config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -no-verify-emitted-module-interface'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
     end
   end
 end

ios/app/app.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -439,7 +439,7 @@
 				};
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "app" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -862,6 +862,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -891,6 +892,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -976,7 +978,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1011,7 +1013,6 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
-					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1024,16 +1025,9 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "$(inherited)";
-				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
-				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1044,7 +1038,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1074,10 +1068,6 @@
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(inherited)",
-					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
-				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1088,15 +1078,8 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				OTHER_CFLAGS = "$(inherited)";
-				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
-				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				TARGETED_DEVICE_FAMILY = "1,2";