fix: Fixes destroying main room when breakout rooms are enabled.

By the time the timer is fired the room maybe recreated (destroyed and created again) and we do not want to destroy it again. The timer was keeping a reference to the old room and is destroying it without notifying the future occupants(jicofo).
Drop save, as we do not need it before destroying, check lobby.

.flowconfig

@@ -0,0 +1,118 @@
+[ignore]
+; We fork some components by platform
+.*/*[.]android.js
+
+; Ignore unexpected extra "@providesModule"
+.*/node_modules/.*/node_modules/fbjs/.*
+node_modules/react-native/Libraries/react-native/React.js
+
+; Ignore duplicate module providers
+; For RN Apps installed via npm, "Libraries" folder is inside
+; "node_modules/react-native" but in the source repo it is in the root
+node_modules/react-native/Libraries/react-native/React.js
+
+; Flow doesn't support platforms
+.*/Libraries/Utilities/LoadingView.js
+
+; Ignore polyfills
+node_modules/react-native/Libraries/polyfills/.*
+
+; These should not be required directly
+; require from fbjs/lib instead: require('fbjs/lib/warning')
+node_modules/warning/.*
+
+; Flow doesn't support platforms
+.*/Libraries/Utilities/HMRLoadingView.js
+
+[untyped]
+.*/node_modules/@react-native-community/cli/.*/.*
+
+; Ignore packages in node_modules which we (i.e. the jitsi-meet project) have
+; seen to cause errors and we have chosen not to fix.
+.*/node_modules/@atlaskit/.*/*.js.flow
+.*/node_modules/react-native-keep-awake/.*
+.*/node_modules/react-native-permissions/.*
+.*/node_modules/styled-components/.*
+
+.*/\.git/.*
+
+[include]
+
+[libs]
+node_modules/react-native/Libraries/react-native/react-native-interface.js
+node_modules/react-native/flow/
+
+[options]
+emoji=true
+
+esproposal.optional_chaining=enable
+esproposal.nullish_coalescing=enable
+
+; We (i.e. the jitsi-meet project) are using the haste module system on Web as
+; well, not only on React Native. Unfortunately, Flow does not support .web.js
+; by default. Override Flow's defaults to include .web.js as well. Technically,
+; we have .native.js as well so the choice of .web.js may lead to errors.
+; Practically though, it is a potential future problem that we do not have at
+; the time of this writing.
+module.file_ext=.web.js
+; Flow's defaults:
+module.file_ext=.js
+module.file_ext=.json
+module.file_ext=.ios.js
+
+module.system=haste
+module.system.haste.use_name_reducers=true
+# get basename
+module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
+# strip .js or .js.flow suffix
+module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
+# strip .ios suffix
+module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
+module.system.haste.paths.blacklist=.*/__tests__/.*
+module.system.haste.paths.blacklist=.*/__mocks__/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/RNTester/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/IntegrationTests/.*
+module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation.js
+module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
+
+munge_underscores=true
+
+module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
+
+suppress_type=$FlowIssue
+suppress_type=$FlowFixMe
+suppress_type=$FlowFixMeProps
+suppress_type=$FlowFixMeState
+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
+
+suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
+
+[lints]
+sketchy-null-number=warn
+sketchy-null-mixed=warn
+sketchy-number=warn
+untyped-type-import=warn
+nonstrict-import=warn
+deprecated-type=warn
+unsafe-getters-setters=warn
+inexact-spread=warn
+unnecessary-invariant=warn
+signature-verification-failure=warn
+deprecated-utility=error
+
+[strict]
+deprecated-type
+nonstrict-import
+sketchy-null
+unclear-type
+unsafe-getters-setters
+untyped-import
+untyped-type-import
+
+[version]
+^0.104.0

.github/workflows/ci.yml

@@ -14,12 +14,9 @@ jobs:
     - run: npm install
     - name: Check git status
       run: git status
-    - name: Normalize lang files to ensure sorted
-      run: npm run lang-sort
     - name: Check git diff
       run: git diff
     - name: Check if the git repository is clean
       run: exit $( git status --porcelain --untracked-files=no | head -255 | wc -l )
     - run: npm run lint
-    - run: for file in lang/*.json; do npx --yes jsonlint -q $file || exit 1; done
     - run: make

Makefile

@@ -1,12 +1,12 @@
 BUILD_DIR = build
 CLEANCSS = ./node_modules/.bin/cleancss
 DEPLOY_DIR = libs
-LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet
-LIBFLAC_DIR = node_modules/libflacjs/dist/min
+LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet/
+LIBFLAC_DIR = node_modules/libflacjs/dist/min/
 OLM_DIR = node_modules/@matrix-org/olm
-RNNOISE_WASM_DIR = node_modules/rnnoise-wasm/dist
+RNNOISE_WASM_DIR = node_modules/rnnoise-wasm/dist/
 TFLITE_WASM = react/features/stream-effects/virtual-background/vendor/tflite
-MEET_MODELS_DIR  = react/features/stream-effects/virtual-background/vendor/models
+MEET_MODELS_DIR  = react/features/stream-effects/virtual-background/vendor/models/
 FACIAL_MODELS_DIR = react/features/facial-recognition/resources
 NODE_SASS = ./node_modules/.bin/sass
 NPM = npm
@@ -62,9 +62,9 @@ deploy-appbundle:
 
 deploy-lib-jitsi-meet:
 	cp \
-		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.min.js \
-		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.min.map \
-		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.e2ee-worker.js \
+		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.min.js \
+		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.min.map \
+		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.e2ee-worker.js \
 		$(LIBJITSIMEET_DIR)/connection_optimization/external_connect.js \
 		$(LIBJITSIMEET_DIR)/modules/browser/capabilities.json \
 		$(DEPLOY_DIR)
@@ -102,7 +102,7 @@ deploy-facial-expressions:
 
 deploy-css:
 	$(NODE_SASS) $(STYLES_MAIN) $(STYLES_BUNDLE) && \
-	$(CLEANCSS) --skip-rebase $(STYLES_BUNDLE) > $(STYLES_DESTINATION) && \
+	$(CLEANCSS) --skip-rebase $(STYLES_BUNDLE) > $(STYLES_DESTINATION) ; \
 	rm $(STYLES_BUNDLE)
 
 deploy-local:

android/app/build.gradle

@@ -76,13 +76,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    // https://github.com/facebook/react-native/issues/31572
-    // We can update past 1.4.0 on RN 0.68
-    implementation ('androidx.appcompat:appcompat:1.3.1') {
-        version {
-            strictly '1.3.1'
-        }
-    }
+    implementation 'androidx.appcompat:appcompat:1.2.0'
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
 

android/app/src/main/res/values/styles.xml

@@ -3,6 +3,5 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
-        <item name="android:windowDisablePreview">true</item>
-   </style>
+    </style>
 </resources>

android/build.gradle

@@ -7,12 +7,12 @@ import org.gradle.util.VersionNumber
 buildscript {
     repositories {
         google()
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
     }
 }
 
@@ -22,7 +22,6 @@ ext {
     minSdkVersion    = 23
     targetSdkVersion = 31
     supportLibVersion = "28.0.0"
-    ndkVersion = "21.4.7075529"
 
     // 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
@@ -43,19 +42,12 @@ ext {
 
 allprojects {
     repositories {
+        google()
+        jcenter()
         // 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 {
-            // 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' }
     }
 
     // Make sure we use the react-native version in node_modules and not the one

android/gradle.properties

@@ -26,5 +26,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false
 
-appVersion=22.0.0
-sdkVersion=5.0.0
+appVersion=21.6.0
+sdkVersion=4.1.0

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Wed Sep 23 11:48:00 EEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip

android/gradlew

@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -82,7 +66,6 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -126,11 +109,10 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -156,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        i=$((i+1))
     done
     case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -177,9 +159,14 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -1,89 +1,84 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

android/sdk/build.gradle

@@ -3,7 +3,6 @@ apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    ndkVersion rootProject.ext.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -35,14 +34,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    // https://github.com/facebook/react-native/issues/31572
-    // We can update past 1.4.0 on RN 0.68
-    implementation ('androidx.appcompat:appcompat:1.3.1') {
-        version {
-            strictly '1.3.1'
-        }
-    }
-    implementation 'androidx.fragment:fragment:1.4.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.fragment:fragment:1.2.5'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
@@ -83,7 +76,6 @@ dependencies {
     implementation project(':react-native-immersive')
     implementation project(':react-native-keep-awake')
     implementation project(':react-native-masked-view_masked-view')
-    implementation project(':react-native-pager-view')
     implementation project(':react-native-performance')
     implementation project(':react-native-reanimated')
     implementation project(':react-native-safe-area-context')

android/sdk/src/debug/AndroidManifest.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
-    <application android:usesCleartextTraffic="true">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-    </application>
-</manifest>

android/sdk/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <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" />
@@ -35,6 +36,7 @@
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true"
             android:windowSoftInputMode="adjustResize"/>
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
 
         <service
             android:name=".ConnectionService"

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

@@ -16,7 +16,6 @@
 
 package org.jitsi.meet.sdk;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.media.AudioManager;
@@ -55,7 +54,6 @@ import java.util.concurrent.Executors;
  * Before a call has started and after it has ended the
  * {@code AudioModeModule.DEFAULT} mode should be used.
  */
-@SuppressLint("AnnotateVersionCheck")
 @ReactModule(name = AudioModeModule.NAME)
 class AudioModeModule extends ReactContextBaseJavaModule {
     public static final String NAME = "AudioMode";
@@ -81,6 +79,7 @@ class AudioModeModule extends ReactContextBaseJavaModule {
     /**
      * Whether or not the ConnectionService is used for selecting audio devices.
      */
+
     private static final boolean supportsConnectionService = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
     private static boolean useConnectionService_ = supportsConnectionService;
 
@@ -149,16 +148,6 @@ class AudioModeModule extends ReactContextBaseJavaModule {
         audioManager = (AudioManager)reactContext.getSystemService(Context.AUDIO_SERVICE);
     }
 
-    @ReactMethod
-    public void addListener(String eventName) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
-    @ReactMethod
-    public void removeListeners(Integer count) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
     /**
      * Gets a mapping with the constants this module is exporting.
      *

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

@@ -31,7 +31,8 @@ import java.util.Map;
  * Module implementing an API for sending events from JavaScript to native code.
  */
 @ReactModule(name = ExternalAPIModule.NAME)
-class ExternalAPIModule extends ReactContextBaseJavaModule {
+class ExternalAPIModule
+    extends ReactContextBaseJavaModule {
 
     public static final String NAME = "ExternalAPI";
 
@@ -56,16 +57,6 @@ class ExternalAPIModule extends ReactContextBaseJavaModule {
         ParticipantsService.init(reactContext);
     }
 
-    @ReactMethod
-    public void addListener(String eventName) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
-    @ReactMethod
-    public void removeListeners(Integer count) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
     /**
      * Gets the name of this module to be used in the React Native bridge.
      *

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

@@ -59,16 +59,6 @@ class RNConnectionService extends ReactContextBaseJavaModule {
         super(reactContext);
     }
 
-    @ReactMethod
-    public void addListener(String eventName) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
-    @ReactMethod
-    public void removeListeners(Integer count) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
     /**
      * Starts a new outgoing call.
      *

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

@@ -26,6 +26,7 @@ import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.LifecycleState;
+import com.facebook.react.devsupport.DevInternalSettings;
 import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.ViewManager;
@@ -176,12 +177,11 @@ class ReactInstanceManagerHolder {
             = new ArrayList<>(Arrays.asList(
                 new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
                 new com.ocetnik.timer.BackgroundTimerPackage(),
-                new com.calendarevents.RNCalendarEventsPackage(),
+                new com.calendarevents.CalendarEventsPackage(),
                 new com.corbt.keepawake.KCKeepAwakePackage(),
                 new com.facebook.react.shell.MainReactPackage(),
                 new com.reactnativecommunity.clipboard.ClipboardPackage(),
                 new com.reactnativecommunity.netinfo.NetInfoPackage(),
-                new com.reactnativepagerview.PagerViewPackage(),
                 new com.oblador.performance.PerformancePackage(),
                 new com.reactnativecommunity.slider.ReactSliderPackage(),
                 new com.brentvatne.react.ReactVideoPackage(),
@@ -219,7 +219,7 @@ class ReactInstanceManagerHolder {
 
         // RNGoogleSigninPackage
         try {
-            Class<?> googlePackageClass = Class.forName("com.reactnativegooglesignin.RNGoogleSigninPackage");
+            Class<?> googlePackageClass = Class.forName("co.apptailor.googlesignin.RNGoogleSigninPackage");
             Constructor constructor = googlePackageClass.getConstructor();
             packages.add((ReactPackage)constructor.newInstance());
         } catch (Exception e) {
@@ -242,6 +242,13 @@ class ReactInstanceManagerHolder {
                 .setInitialLifecycleState(LifecycleState.RESUMED)
                 .build();
 
+        // Disable delta updates on Android, they have caused trouble.
+        DevInternalSettings devSettings
+            = (DevInternalSettings)reactInstanceManager.getDevSupportManager().getDevSettings();
+        if (devSettings != null) {
+            devSettings.setBundleDeltasEnabled(false);
+        }
+
         // Register our uncaught exception handler.
         JitsiMeetUncaughtExceptionHandler.register();
     }

android/settings.gradle

@@ -22,15 +22,13 @@ project(':react-native-gesture-handler').projectDir = new File(rootProject.proje
 include ':react-native-get-random-values'
 project(':react-native-get-random-values').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-get-random-values/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')
+project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/google-signin/android')
 include ':react-native-immersive'
 project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
 include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
 include ':react-native-masked-view_masked-view'
 project(':react-native-masked-view_masked-view').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-masked-view/masked-view/android')
-include ':react-native-pager-view'
-project(':react-native-pager-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-pager-view/android')
 include ':react-native-performance'
 project(':react-native-performance').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-performance/android')
 include ':react-native-reanimated'

conference.js

@@ -71,7 +71,8 @@ import {
     JitsiMediaDevicesEvents,
     JitsiParticipantConnectionStatus,
     JitsiTrackErrors,
-    JitsiTrackEvents
+    JitsiTrackEvents,
+    JitsiRecordingConstants
 } from './react/features/base/lib-jitsi-meet';
 import {
     getStartWithAudioMuted,
@@ -89,7 +90,6 @@ import {
     dominantSpeakerChanged,
     getLocalParticipant,
     getNormalizedDisplayName,
-    localParticipantAudioLevelChanged,
     localParticipantConnectionStatusChanged,
     localParticipantRoleChanged,
     participantConnectionStatusChanged,
@@ -135,15 +135,16 @@ import { mediaPermissionPromptVisibilityChanged, toggleSlowGUMOverlay } from './
 import { suspendDetected } from './react/features/power-monitor';
 import {
     initPrejoin,
+    isPrejoinPageEnabled,
     isPrejoinPageVisible,
     makePrecallTest,
     setJoiningInProgress,
     setPrejoinPageVisibility
 } from './react/features/prejoin';
+import { getActiveSession } from './react/features/recording/functions';
 import { disableReceiver, stopReceiver } from './react/features/remote-control';
 import { setScreenAudioShareState, isScreenAudioShared } from './react/features/screen-share/';
 import { toggleScreenshotCaptureSummary } from './react/features/screenshot-capture';
-import { isScreenshotCaptureEnabled } from './react/features/screenshot-capture/functions';
 import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/AudioMixerEffect';
 import { createPresenterEffect } from './react/features/stream-effects/presenter';
 import { createRnnoiseProcessor } from './react/features/stream-effects/rnnoise';
@@ -373,6 +374,7 @@ class ConferenceConnector {
             break;
 
         case JitsiConferenceErrors.CONFERENCE_MAX_USERS:
+            connection.disconnect();
             APP.UI.notifyMaxUsersLimitReached();
             break;
 
@@ -484,7 +486,7 @@ export default {
 
         // Always get a handle on the audio input device so that we have statistics (such as "No audio input" or
         // "Are you trying to speak?" ) even if the user joins the conference muted.
-        const initialDevices = config.disableInitialGUM ? [] : [ MEDIA_TYPE.AUDIO ];
+        const initialDevices = config.disableInitialGUM ? [] : [ 'audio' ];
         const requestedAudio = !config.disableInitialGUM;
         let requestedVideo = false;
 
@@ -492,7 +494,7 @@ export default {
                 && !options.startWithVideoMuted
                 && !options.startAudioOnly
                 && !options.startScreenSharing) {
-            initialDevices.push(MEDIA_TYPE.VIDEO);
+            initialDevices.push('video');
             requestedVideo = true;
         }
 
@@ -516,35 +518,21 @@ export default {
         // spend much time displaying the overlay screen. If GUM is not resolved within 15 seconds it will
         // probably never resolve.
         const timeout = browser.isElectron() ? 15000 : 60000;
-        const audioOptions = {
-            devices: [ MEDIA_TYPE.AUDIO ],
-            timeout,
-            firePermissionPromptIsShownEvent: true,
-            fireSlowPromiseEvent: true
-        };
 
         // FIXME is there any simpler way to rewrite this spaghetti below ?
         if (options.startScreenSharing) {
-            // 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
-            // Please note that Spot uses the same config option to use an external video input device label as
-            // screenshare and calls getUserMedia instead of getDisplayMedia for capturing the media. Therefore it
-            // needs to be supported here if _desktopSharingSourceDevice is provided.
-            const errMessage = new Error('startScreenSharing config option is no longer supported for web browsers');
-            const desktopPromise = config._desktopSharingSourceDevice
-                ? this._createDesktopTrack()
-                : Promise.reject(errMessage);
-
-            tryCreateLocalTracks = desktopPromise
+            tryCreateLocalTracks = this._createDesktopTrack()
                 .then(([ desktopStream ]) => {
                     if (!requestedAudio) {
                         return [ desktopStream ];
                     }
 
-                    return createLocalTracksF(audioOptions)
+                    return createLocalTracksF({
+                        devices: [ 'audio' ],
+                        timeout,
+                        firePermissionPromptIsShownEvent: true,
+                        fireSlowPromiseEvent: true
+                    })
                         .then(([ audioStream ]) =>
                             [ desktopStream, audioStream ])
                         .catch(error => {
@@ -557,7 +545,14 @@ export default {
                     logger.error('Failed to obtain desktop stream', error);
                     errors.screenSharingError = error;
 
-                    return requestedAudio ? createLocalTracksF(audioOptions) : [];
+                    return requestedAudio
+                        ? createLocalTracksF({
+                            devices: [ 'audio' ],
+                            timeout,
+                            firePermissionPromptIsShownEvent: true,
+                            fireSlowPromiseEvent: true
+                        })
+                        : [];
                 })
                 .catch(error => {
                     errors.audioOnlyError = error;
@@ -592,7 +587,13 @@ export default {
                             return [];
                         }
 
-                        return createLocalTracksF(audioOptions);
+                        return (
+                            createLocalTracksF({
+                                devices: [ 'audio' ],
+                                timeout,
+                                firePermissionPromptIsShownEvent: true,
+                                fireSlowPromiseEvent: true
+                            }));
                     } else if (requestedAudio && !requestedVideo) {
                         errors.audioOnlyError = err;
 
@@ -614,7 +615,7 @@ export default {
                     // Try video only...
                     return requestedVideo
                         ? createLocalTracksF({
-                            devices: [ MEDIA_TYPE.VIDEO ],
+                            devices: [ 'video' ],
                             firePermissionPromptIsShownEvent: true,
                             fireSlowPromiseEvent: true
                         })
@@ -796,21 +797,7 @@ export default {
             logger.warn('initial device list initialization failed', error);
         }
 
-        const handleStartAudioMuted = (options, tracks) => {
-            if (options.startWithAudioMuted) {
-                // Always add the track on Safari because of a known issue where audio playout doesn't happen
-                // if the user joins audio and video muted, i.e., if there is no local media capture.
-                if (browser.isWebKitBased()) {
-                    this.muteAudio(true, true);
-                } else {
-                    return tracks.filter(track => track.getType() !== MEDIA_TYPE.AUDIO);
-                }
-            }
-
-            return tracks;
-        };
-
-        if (isPrejoinPageVisible(APP.store.getState())) {
+        if (isPrejoinPageEnabled(APP.store.getState())) {
             _connectionPromise = connect(roomName).then(c => {
                 // we want to initialize it early, in case of errors to be able
                 // to gather logs
@@ -841,28 +828,25 @@ export default {
 
             this._displayErrorsForCreateInitialLocalTracks(errors);
 
-            let localTracks = handleStartAudioMuted(initialOptions, tracks);
-
-            // in case where gum is slow and resolves after the startAudio/VideoMuted coming from jicofo, we can be
-            // join unmuted even though jicofo had instruct us to mute, so let's respect that before passing the tracks
-            if (!browser.isWebKitBased()) {
-                if (room?.isStartAudioMuted()) {
-                    localTracks = localTracks.filter(track => track.getType() !== MEDIA_TYPE.AUDIO);
-                }
-            }
-
-            if (room?.isStartVideoMuted()) {
-                localTracks = localTracks.filter(track => track.getType() !== MEDIA_TYPE.VIDEO);
-            }
-
-            return this._setLocalAudioVideoStreams(localTracks);
+            return this._setLocalAudioVideoStreams(tracks);
         }
 
         const [ tracks, con ] = await this.createInitialLocalTracksAndConnect(roomName, initialOptions);
+        let localTracks = tracks;
 
         this._initDeviceList(true);
 
-        return this.startConference(con, handleStartAudioMuted(initialOptions, tracks));
+        if (initialOptions.startWithAudioMuted) {
+            // Always add the track on Safari because of a known issue where audio playout doesn't happen
+            // if the user joins audio and video muted, i.e., if there is no local media capture.
+            if (browser.isWebKitBased()) {
+                this.muteAudio(true, true);
+            } else {
+                localTracks = localTracks.filter(track => track.getType() !== MEDIA_TYPE.AUDIO);
+            }
+        }
+
+        return this.startConference(con, localTracks);
     },
 
     /**
@@ -1140,11 +1124,8 @@ export default {
         return room.getParticipants();
     },
 
-    /**
-     * Used by Jibri to detect when it's alone and the meeting should be terminated.
-     */
     get membersCount() {
-        return room.getParticipants().filter(p => !p.isHidden()).length + 1;
+        return room.getParticipants().length + 1;
     },
 
     /**
@@ -1573,7 +1554,9 @@ export default {
 
         this._stopProxyConnection();
 
-        APP.store.dispatch(toggleScreenshotCaptureSummary(false));
+        if (config.enableScreenshotCapture) {
+            APP.store.dispatch(toggleScreenshotCaptureSummary(false));
+        }
         const tracks = APP.store.getState()['features/base/tracks'];
         const duration = getLocalVideoTrack(tracks)?.jitsiTrack.getDuration() ?? 0;
 
@@ -1952,8 +1935,10 @@ export default {
             })
             .then(() => {
                 this.videoSwitchInProgress = false;
-                if (isScreenshotCaptureEnabled(APP.store.getState(), false, true)) {
-                    APP.store.dispatch(toggleScreenshotCaptureSummary(true));
+                if (config.enableScreenshotCapture) {
+                    if (getActiveSession(APP.store.getState(), JitsiRecordingConstants.mode.FILE)) {
+                        APP.store.dispatch(toggleScreenshotCaptureSummary(true));
+                    }
                 }
                 sendAnalytics(createScreenSharingEvent('started'));
                 logger.log('Screen sharing started');
@@ -2127,10 +2112,6 @@ export default {
             const localAudio = getLocalJitsiAudioTrack(APP.store.getState());
             let newLvl = lvl;
 
-            if (this.isLocalId(id)) {
-                APP.store.dispatch(localParticipantAudioLevelChanged(lvl));
-            }
-
             if (this.isLocalId(id) && localAudio?.isMuted()) {
                 newLvl = 0;
             }

config.js

@@ -74,12 +74,6 @@ var config = {
         // callStatsThreshold: 5 // enable callstats for 5% of the users.
     },
 
-    // Feature Flags.
-    flags: {
-        // Enables source names in the signaling.
-        // sourceNameSignaling: false,
-    },
-
     // Disables moderator indicators.
     // disableModeratorIndicator: false,
 
@@ -95,20 +89,6 @@ var config = {
     // Disables self-view tile. (hides it from tile view and from filmstrip)
     // disableSelfView: false,
 
-    // Disables self-view settings in UI
-    // disableSelfViewSettings: false,
-
-    // screenshotCapture : {
-    //      Enables the screensharing capture feature.
-    //      enabled: false,
-    //
-    //      The mode for the screenshot capture feature.
-    //      Can be either 'recording' - screensharing screenshots are taken
-    //      only when the recording is also on,
-    //      or 'always' - screensharing screenshots are always taken.
-    //      mode: 'recording'
-    // }
-
     // Disables ICE/UDP by filtering out local and remote UDP candidates in
     // signalling.
     // webrtcIceUdpDisable: false,
@@ -247,11 +227,7 @@ var config = {
     //     max: 5
     // },
 
-    // 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
+    // Try to start calls with screen-sharing instead of camera video.
     // startScreenSharing: false,
 
     // Recording
@@ -505,12 +481,6 @@ var config = {
     // Default remote name to be displayed
     // defaultRemoteDisplayName: 'Fellow Jitster',
 
-    // Hides the display name from the participant thumbnail
-    // hideDisplayName: false,
-
-    // Hides the dominant speaker name badge that hovers above the toolbox
-    // hideDominantSpeakerBadge: false,
-
     // Default language for the user interface.
     // defaultLanguage: 'en',
 
@@ -564,9 +534,6 @@ var config = {
     // Document should be focused for this option to work
     // enableAutomaticUrlCopy: false,
 
-    // Array with avatar URL prefixes that need to use CORS.
-    // corsAvatarURLs: [ 'https://www.gravatar.com/avatar/' ],
-
     // Base URL for a Gravatar-compatible service. Defaults to libravatar.
     // gravatarBaseURL: 'https://seccdn.libravatar.org/avatar/',
 
@@ -633,61 +600,41 @@ var config = {
     //     alwaysVisible: false
     // },
 
-    // Toolbar buttons which have their click/tap event exposed through the API on
-    // `toolbarButtonClicked`. 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.
+    // Toolbar buttons which have their click event exposed through the API on
+    // `toolbarButtonClicked` event instead of executing the normal click routine.
     // buttonsWithNotifyClick: [
-    //     'camera',
-    //     {
-    //         key: 'chat',
-    //         preventExecution: false
-    //     },
-    //     {
-    //         key: 'closedcaptions',
-    //         preventExecution: true
-    //     },
-    //     'desktop',
-    //     'download',
-    //     'embedmeeting',
-    //     'etherpad',
-    //     'feedback',
-    //     'filmstrip',
-    //     'fullscreen',
-    //     'hangup',
-    //     'help',
-    //     {
-    //         key: 'invite',
-    //         preventExecution: false
-    //     },
-    //     'livestreaming',
-    //     'microphone',
-    //     'mute-everyone',
-    //     'mute-video-everyone',
-    //     'participants-pane',
-    //     'profile',
-    //     {
-    //         key: 'raisehand',
-    //         preventExecution: true
-    //     },
-    //     'recording',
-    //     'security',
-    //     'select-background',
-    //     'settings',
-    //     'shareaudio',
-    //     'sharedvideo',
-    //     'shortcuts',
-    //     'stats',
-    //     'tileview',
-    //     'toggle-camera',
-    //     'videoquality',
-    //     // The add passcode button from the security dialog.
-    //     {
-    //         key: 'add-passcode',
-    //         preventExecution: false
-    //     }
-    //     '__end'
+    //    'camera',
+    //    'chat',
+    //    'closedcaptions',
+    //    'desktop',
+    //    'download',
+    //    'embedmeeting',
+    //    'etherpad',
+    //    'feedback',
+    //    'filmstrip',
+    //    'fullscreen',
+    //    'hangup',
+    //    'help',
+    //    'invite',
+    //    'livestreaming',
+    //    'microphone',
+    //    'mute-everyone',
+    //    'mute-video-everyone',
+    //    'participants-pane',
+    //    'profile',
+    //    'raisehand',
+    //    'recording',
+    //    'security',
+    //    'select-background',
+    //    'settings',
+    //    'shareaudio',
+    //    'sharedvideo',
+    //    'shortcuts',
+    //    'stats',
+    //    'tileview',
+    //    'toggle-camera',
+    //    'videoquality',
+    //    '__end'
     // ],
 
     // List of pre meeting screens buttons to hide. The values must be one or more of the 5 allowed buttons:
@@ -742,9 +689,6 @@ var config = {
     // Enables detecting faces of participants and get their expression and send it to other participants
     // enableFacialRecognition: true,
 
-    // Enables displaying facial expressions in speaker stats
-    // enableDisplayFacialExpressions: true,
-
     // 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,
@@ -1066,15 +1010,14 @@ var config = {
     // If true, tile view will not be enabled automatically when the participants count threshold is reached.
     // disableTileView: true,
 
-    // If true, the tiles will be displayed contained within the available space rather than enlarged to cover it,
-    // with a 16:9 aspect ratio (old behaviour).
+    // If true, the tiles will be displayed contained within the available space rather than enlarged to cover it.
     // disableTileEnlargement: true,
 
     // Controls the visibility and behavior of the top header conference info labels.
     // If a label's id is not in any of the 2 arrays, it will not be visible at all on the header.
     // conferenceInfo: {
     //     // those labels will not be hidden in tandem with the toolbox.
-    //     alwaysVisible: ['recording', 'local-recording', 'raised-hands-count'],
+    //     alwaysVisible: ['recording', 'local-recording'],
     //     // those labels will be auto-hidden in tandem with the toolbox buttons.
     //     autoHide: [
     //         'subject',
@@ -1088,10 +1031,10 @@ var config = {
     // },
 
     // Hides the conference subject
-    // hideConferenceSubject: false,
+    // hideConferenceSubject: true,
 
     // Hides the conference timer.
-    // hideConferenceTimer: false,
+    // hideConferenceTimer: true,
 
     // Hides the recording label
     // hideRecordingLabel: false,
@@ -1102,9 +1045,6 @@ var config = {
     // Sets the conference subject
     // subject: 'Conference Subject',
 
-    // Sets the conference local subject
-    // localSubject: 'Conference Local Subject',
-
     // This property is related to the use case when jitsi-meet is used via the IFrame API. When the property is true
     // jitsi-meet will use the local storage of the host page instead of its own. This option is useful if the browser
     // is not persisting the local storage inside the iframe.
@@ -1209,14 +1149,10 @@ var config = {
     //     '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
     //     'localRecording.localRecording', // shown when a local recording is started
-    //     '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.connectedTwoMembers', // show when two participants joined simultaneously
     //     '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.invitedOneMember', // shown when 1 participant has been invited
     //     'notify.invitedThreePlusMembers', // shown when 3+ participants have been invited
@@ -1231,7 +1167,6 @@ var config = {
     //     '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.participantWantsToJoin', // shown when lobby is enabled and participant requests 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,

css/_atlaskit_overrides.scss

@@ -24,6 +24,14 @@
     bottom: calc(#{$newToolbarSizeWithPadding}) !important;
 }
 
+/**
+ * Override @atlaskit/theme styling for the top toolbar so it displays over
+ * the video thumbnail while obscuring as little as possible.
+ */
+.videocontainer__toptoolbar > div > div {
+    background: none;
+}
+
 
 /**
  * Keep overflow menu within screen vertical bounds and make it scrollable.

css/_audio-preview.scss

@@ -121,18 +121,9 @@
             }
         }
 
-        &--nometer {
-            .audio-preview-entry-text {
-                max-width: 238px;
-            }
+        .audio-preview-entry-text {
+            max-width: 178px;
         }
-
-        &--withmeter {
-            .audio-preview-entry-text {
-                max-width: 178px;
-            }
-        }
-
     }
 
     &-icon {

css/_base.scss

@@ -6,10 +6,6 @@
 * {
     -webkit-user-select: none;
     user-select: none;
-
-    // Firefox only
-    scrollbar-width: thin;
-    scrollbar-color: rgba(0, 0, 0, .5) transparent;
 }
 
 input,

css/_drawer.scss

@@ -24,9 +24,10 @@
 }
 
 .drawer-menu {
+    max-height: calc(80vh - 64px);
     background: #242528;
     border-radius: 16px 16px 0 0;
-    overflow-y: auto;
+    overflow-y: scroll;
     margin-bottom: env(safe-area-inset-bottom, 0);
     width: 100%;
 
@@ -42,6 +43,15 @@
         }
     }
 
+    .popupmenu {
+        margin: auto;
+        width: 100%;
+    }
+
+    .popupmenu__item {
+        height: 48px;
+    }
+
     &#{&} .overflow-menu {
         margin: auto;
         font-size: 1.2em;

css/_popover.scss

@@ -43,5 +43,10 @@
 
 .popover {
     margin: -16px -24px;
+    padding: 16px 24px;
     z-index: $popoverZ;
 }
+
+.padded-content {
+    padding: 4px 8px;
+}

css/_popup_menu.scss

@@ -2,18 +2,122 @@
 * Initialize
 **/
 
-.popupmenu__contents {
-    .popupmenu__volume-slider {
-            &::-webkit-slider-runnable-track {
-                background-color: $popupSliderColor;
-            }
+.popupmenu {
+    background-color: $menuBG;
+    border-radius: 3px;
+    list-style-type: none;
+    min-width: 150px;
+    text-align: left;
+    padding: 0px;
+    white-space: nowrap;
 
-            &::-moz-range-track {
-                background-color: $popupSliderColor;
-            }
+    &__item {
+        list-style-type: none;
+        height: 35px;
+    }
 
-            &::-ms-fill-lower {
-                background-color: $popupSliderColor;
+    // Link Appearance
+    &__link,
+    &__contents {
+        display: block;
+        box-sizing: border-box;
+        text-decoration: none;
+        height: 100%;
+        font-size: 9pt;
+        width: 100%;
+        cursor: pointer;
+        padding: 0 5px;
+        color: $popupMenuColor;
+
+        &:hover {
+            background-color: $popupMenuHoverBackground;
+            color: $popupMenuHoverColor;
+        }
+
+        &.disabled {
+            pointer-events: none;
+        }
+    }
+
+    &__list {
+        margin: 0;
+        padding: 0;
+    }
+
+    &__text {
+        display: inline-block;
+        margin-left: 8px;
+        vertical-align: middle;
+    }
+
+    &__link {
+        i {
+            cursor: pointer;
+        }
+    }
+
+    &__contents {
+        display: flex;
+
+        /**
+         * Positioning styles on the slider and its container are used to make
+         * the container fit the popup width, by removing the slider from the
+         * page flow, and then making the slider fit the container.
+         */
+        .popupmenu__slider_container {
+            position: relative;
+            width: 100%;
+
+            .popupmenu__slider {
+                position: absolute;
+                top: 50%;
+                transform: translate(0, -50%);
+                width: 100%;
+
+                &::-webkit-slider-runnable-track {
+                    background-color: $popupSliderColor;
+                }
+
+                &::-moz-range-track {
+                    background-color: $popupSliderColor;
+                }
+
+                &::-ms-fill-lower {
+                    background-color: $popupSliderColor;
+                }
             }
         }
+    }
+
+    &__icon {
+        vertical-align: middle;
+        position: relative;
+        display: inline-block;
+        min-width: 20px;
+        height: 100%;
+        padding-right: 10px;
+
+        > * {
+            @include absoluteAligning();
+        }
+    }
+
+    .icon-kick,
+    .icon-play,
+    .icon-stop {
+        font-size: 8pt;
+    }
+}
+
+/**
+ * Override reset css styling modifying all lists and set negative margin to
+ * reduce the visibility of padding on AtlasKit
+ * InlineDialogs.
+ */
+ul.popupmenu {
+    margin: -16px -24px;
+}
+
+span.localvideomenu:hover ul.popupmenu, span.remotevideomenu:hover ul.popupmenu, ul.popupmenu:hover {
+    display:block !important;
 }

css/_reactions-menu.scss

@@ -8,6 +8,12 @@
 	padding: 16px;
 
 	&.overflow {
+		width: auto;
+		padding-bottom: max(env(safe-area-inset-bottom, 0), 16px);
+		background-color: #141414;
+		box-shadow: none;
+		border-radius: 0;
+		position: relative;
 
 		.toolbox-icon {
 			width: 48px;

css/_subject.scss

@@ -1,25 +1,11 @@
 .subject {
     color: #fff;
-    transition: opacity .6s ease-in-out;
+    margin-top: -120px;
+    transition: margin-top .3s ease-in;
     z-index: $zindex3;
-    margin-top: 20px;
-    opacity: 0;
 
     &.visible {
-        opacity: 1;
-    }
-
-    &#autoHide.with-always-on {
-        overflow: hidden;
-        animation: hideSubject forwards .6s ease-out;
-
-        & > .subject-info-container {
-            justify-content: flex-start;
-        }
-
-        &.visible {
-            animation: showSubject forwards .6s ease-out;
-        }
+        margin-top: 20px;
     }
 }
 
@@ -50,7 +36,10 @@
     line-height: 28px;
     padding: 0 16px;
     height: 28px;
-    max-width: 324px;
+
+    @media (max-width: 700px) {
+        max-width: 100px;
+    }
 
     @media (max-width: 300px) {
         display: none;
@@ -85,29 +74,8 @@
     position: absolute;
     top: 0;
     height: 48px;
-    max-width: calc(100% - 24px);
 }
 
 .shift-right .details-container {
     margin-left: calc(#{$sidebarWidth} / 2);
 }
-
-@keyframes hideSubject {
-    0% {
-        max-width: 100%;
-    }
-
-    100% {
-        max-width: 0;
-    }
-}
-
-@keyframes showSubject {
-    0% {
-        max-width: 0%;
-    }
-
-    100% {
-        max-width: 100%;
-    }
-}

css/_toolbars.scss

@@ -30,7 +30,7 @@
     transition: bottom .3s ease-in;
     width: 100%;
     pointer-events: none;
-    z-index: $toolbarZ + 2;
+
 
     &.visible {
         bottom: 0;

css/_variables.scss

@@ -13,6 +13,9 @@ $hangupFontSize: 2em;
  */
 
 // Video layout.
+$thumbnailToolbarHeight: 22px;
+$thumbnailIndicatorBorder: 2px;
+$thumbnailIndicatorSize: $thumbnailToolbarHeight;
 $thumbnailVideoMargin: 2px;
 $thumbnailsBorder: 2px;
 $thumbnailVideoBorder: 2px;
@@ -53,12 +56,19 @@ $overflowMenuItemBackground: #36383C;
 /**
  * Video layout
  */
+$videoThumbnailHovered: rgba(22, 94, 204, .4);
+$videoThumbnailSelected: #165ECC;
 $participantNameColor: #fff;
+$thumbnailPictogramColor: #fff;
+$dominantSpeakerBg: #165ecc;
+$raiseHandBg: #F8AE1A;
 $audioLevelBg: #44A5FF;
+$connectionIndicatorBg: #165ecc;
 $audioLevelShadow: rgba(9, 36, 77, 0.9);
 $videoStateIndicatorColor: $defaultColor;
 $videoStateIndicatorBackground: $toolbarBackground;
 $videoStateIndicatorSize: 40px;
+$remoteVideoMenuIconMargin: initial;
 
 /**
  * Feedback Modal
@@ -92,6 +102,7 @@ $sidebarWidth: 315px;
  * Misc.
  */
 $borderRadius: 4px;
+$popoverMenuPadding: 13px;
 $happySoftwareBackground: transparent;
 $desktopAppDragBarHeight: 25px;
 $scrollHeight: 7px;
@@ -107,6 +118,7 @@ $toolbarBackgroundZ: 4;
 $labelsZ: 5;
 $subtitlesZ: 7;
 $popoverZ: 8;
+$zindex10: 10;
 $reloadZ: 20;
 $poweredByZ: 100;
 $ringingZ: 300;

css/_videolayout_default.scss

@@ -43,7 +43,165 @@
 .videocontainer {
     position: relative;
     text-align: center;
-    overflow: 'hidden';
+
+    &__background {
+        @include topLeft();
+        background-color: black;
+        border-radius: $borderRadius;
+        width: 100%;
+        height: 100%;
+    }
+
+    /**
+     * The toolbar of the video thumbnail.
+     */
+    &__toolbar,
+    &__toptoolbar {
+        position: absolute;
+        left: 0;
+        pointer-events: none;
+        z-index: $zindex10;
+        width: 100%;
+        box-sizing: border-box; // Includes the padding in the 100% width.
+
+        /**
+         * FIXME (lenny): Disabling pointer-events is a pretty big sin that
+         * sidesteps the problems. There are z-index wars occurring within
+         * videocontainer and AtlasKit Tooltips rely on their parent z-indexe
+         * being higher than whatever they need to appear over. So set a higher
+         * z-index for the tooltip containers but make any empty space not block
+         * mouse overs for various mouseover triggers.
+         */
+        pointer-events: none;
+
+        * {
+            pointer-events: auto;
+        }
+
+        .indicator-container {
+            display: inline-block;
+            float: left;
+            pointer-events: all;
+        }
+    }
+
+    &__toolbar {
+        bottom: 0;
+        padding: 0 5px 0 5px;
+    }
+
+    &__toptoolbar {
+        $toolbarIconMargin: 5px;
+        top: 0;
+        padding-bottom: 0;
+        /**
+         * Override text-align center as icons need to be left justified.
+         */
+        text-align: left;
+
+        /**
+         * Intentionally use margin on the icon itself as AtlasKit InlineDialog
+         * positioning depends on the trigger (indicator icon).
+         */
+        .indicator {
+            margin-left: 5px;
+            margin-top: $toolbarIconMargin;
+        }
+
+        .indicator-container:nth-child(1) .indicator {
+            margin-left: $toolbarIconMargin;
+        }
+
+        .indicator-container {
+            display: inline-block;
+            vertical-align: top;
+
+            .popover-trigger {
+                display: inline-block;
+            }
+        }
+
+        .connection-indicator,
+        .indicator {
+            position: relative;
+            font-size: 8px;
+            text-align: center;
+            line-height: $thumbnailIndicatorSize;
+            padding: 0;
+            @include circle($thumbnailIndicatorSize);
+            box-sizing: border-box;
+            z-index: $zindex3;
+            background: $dominantSpeakerBg;
+            color: $thumbnailPictogramColor;
+            border: $thumbnailIndicatorBorder solid $thumbnailPictogramColor;
+
+            .indicatoricon {
+                @include absoluteAligning();
+            }
+
+            .connection {
+                position: relative;
+                display: inline-block;
+                margin: 0 auto;
+                left: 0;
+                @include transform(translate(0, -50%));
+
+                &_empty,
+                &_lost
+                {
+                    color: #8B8B8B;/*#FFFFFF*/
+                    overflow: hidden;
+                }
+
+                &_full
+                {
+                    @include topLeft();
+                    color: #FFFFFF;/*#15A1ED*/
+                    overflow: hidden;
+                }
+
+                &_ninja
+                {
+                    font-size: 1.5em;
+                }
+            }
+
+            .icon-gsm-bars {
+                cursor: pointer;
+                font-size: 1em;
+            }
+        }
+
+        .hide-connection-indicator {
+            display: none;
+        }
+    }
+
+    &__hoverOverlay {
+        background: rgba(0,0,0,.6);
+        border-radius: $borderRadius;
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        width: 100%;
+        height: 100%;
+        visibility: hidden;
+        z-index: $zindex2;
+    }
+
+    &__participant-name {
+        color: #fff;
+        background-color: rgba(0,0,0,.4);
+        padding: 3px 7px;
+        border-radius: 3px;
+        max-width: calc(100% - 32px);
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        height: 16px;
+        display: inline-block;
+        text-align: right;
+    }
 
     @media (min-width: 581px) {
         &.shift-right {
@@ -130,6 +288,16 @@
     z-index: $zindex0;
 }
 
+/**
+ * Positions video thumbnail display name and editor.
+ */
+#alwaysOnTop .displayname,
+.videocontainer .displayname,
+.videocontainer .editdisplayname {
+    font-weight: 100;
+    color: $participantNameColor;
+}
+
 #alwaysOnTop .displayname {
     font-size: 15px;
     position: inherit;
@@ -139,6 +307,146 @@
     margin-top: 10px;
 }
 
+/**
+ * Positions video thumbnail display name editor.
+ */
+.videocontainer .editdisplayname {
+    outline: none;
+    border: none;
+    background: none;
+    box-shadow: none;
+    padding: 0;
+}
+
+#localVideoContainer .displayname:hover {
+    cursor: text;
+}
+
+.videocontainer .displayname {
+    pointer-events: none;
+    padding: 0 3px 0 3px;
+}
+
+.videocontainer .editdisplayname {
+    height: auto;
+}
+
+#localDisplayName {
+    pointer-events: auto !important;
+}
+
+.videocontainer>a.displayname {
+    display: inline-block;
+    position: absolute;
+    color: #FFFFFF;
+    bottom: 0;
+    right: 0;
+    padding: 3px 5px;
+    font-size: 9pt;
+    cursor: pointer;
+    z-index: $zindex2;
+}
+
+/**
+ * Video thumbnail toolbar icon.
+ */
+.videocontainer .toolbar-icon {
+    font-size: 8pt;
+    text-align: center;
+    text-shadow: 0px 1px 0px rgba(255,255,255,.3), 0px -1px 0px rgba(0,0,0,.7);
+    color: #FFFFFF;
+    width: 12px;
+    line-height: $thumbnailToolbarHeight;
+    height: $thumbnailToolbarHeight;
+    padding: 0;
+    border: 0;
+    margin: 0px 5px 0px 0px;
+}
+
+/**
+ * Toolbar icon internal i elements (font icons).
+ */
+.toolbar-icon>div {
+    height: $thumbnailToolbarHeight;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+/**
+ * Toolbar icons positioned on the right.
+ */
+.moderator-icon {
+    display: inline-block;
+
+    &.right {
+        float: right;
+        margin: 0px 0px 0px 5px;
+    }
+
+    .toolbar-icon {
+        margin: 0;
+    }
+}
+
+.raisehandindicator {
+  background: $raiseHandBg !important;
+}
+
+.connection-indicator {
+    background: $connectionIndicatorBg;
+
+    &.status-high {
+        background: green;
+    }
+
+    &.status-med {
+        background: #FFD740;
+    }
+
+    &.status-lost {
+        background: gray;
+    }
+
+    &.status-low {
+        background: #BF2117;
+    }
+
+    &.status-other {
+        background: $connectionIndicatorBg;
+    }
+
+    &.status-disabled {
+        background: transparent;
+        border: none
+    }
+}
+
+.local-video-menu-trigger,
+.remote-video-menu-trigger,
+.localvideomenu,
+.remotevideomenu
+{
+    display: inline-block;
+    position: absolute;
+    top: 0px;
+    right: 0;
+    z-index: $zindex2;
+    width: 18px;
+    height: 18px;
+    color: #FFF;
+    font-size: 10pt;
+    margin-right: $remoteVideoMenuIconMargin;
+
+    >i{
+        cursor: hand;
+    }
+}
+.local-video-menu-trigger,
+.remote-video-menu-trigger {
+    margin-top: 7px;
+}
+
 /**
  * Audio indicator on video thumbnails.
  */
@@ -315,11 +623,74 @@
     display: none;
 }
 
+.display-avatar-with-name {
+    .avatar-container {
+        visibility: visible;
+    }
+
+    .displayNameContainer {
+        visibility: visible;
+    }
+
+    .videocontainer__hoverOverlay {
+        visibility: visible;
+    }
+
+    video {
+        visibility: hidden;
+    }
+}
+
+.display-name-on-black {
+    .avatar-container {
+        visibility: hidden;
+    }
+
+    .displayNameContainer {
+        visibility: visible;
+    }
+
+    .videocontainer__hoverOverlay {
+        visibility: hidden;
+    }
+
+    video {
+        opacity: 0.2;
+        visibility: visible;
+    }
+}
+
 .display-video {
     .avatar-container {
         visibility: hidden;
     }
 
+    .displayNameContainer {
+        visibility: hidden;
+    }
+
+    .videocontainer__hoverOverlay {
+        visibility: hidden;
+    }
+
+    video {
+        visibility: visible;
+    }
+}
+
+.display-name-on-video {
+    .avatar-container {
+        visibility: hidden;
+    }
+
+    .displayNameContainer {
+        visibility: visible;
+    }
+
+    .videocontainer__hoverOverlay {
+        visibility: visible;
+    }
+
     video {
         visibility: visible;
     }
@@ -330,6 +701,14 @@
         visibility: visible;
     }
 
+    .displayNameContainer {
+        visibility: hidden;
+    }
+
+    .videocontainer__hoverOverlay {
+        visibility: hidden;
+    }
+
     video {
         visibility: hidden;
     }

css/filmstrip/_filmstrip_toolbar.scss

@@ -0,0 +1,30 @@
+.filmstrip__toolbar {
+    @include flex();
+    flex-direction: column-reverse;
+    flex-wrap: nowrap;
+    position: relative;
+    width: $filmstripToggleButtonWidth;
+
+    button {
+        font-size: 14px;
+        line-height: 1.2;
+        text-align: center;
+        background: transparent;
+        opacity: 0.7;
+        height: auto;
+        width: 100%;
+        padding: 0;
+        margin: 0;
+        border: none;
+
+        -webkit-appearance: none;
+
+        &:hover {
+            opacity: 1;
+        }
+
+        i {
+            cursor: pointer;
+        }
+    }
+}

css/filmstrip/_horizontal_filmstrip.scss

@@ -6,8 +6,11 @@
 }
 
 .horizontal-filmstrip .filmstrip {
+    bottom: 0;
+    right: 0;
     padding: 10px 5px;
     @extend %align-right;
+    transition: bottom .3s;
     z-index: $filmstripVideosZ;
     box-sizing: border-box;
     width: 100%;
@@ -55,7 +58,7 @@
         }
 
         &.hidden {
-            bottom: calc(-196px - #{$newToolbarSizeWithPadding} + 50px);
+            bottom: calc(-196px - #{$newToolbarSizeWithPadding});
         }
     }
 

css/filmstrip/_small_video.scss

@@ -6,10 +6,37 @@
     border-radius: $borderRadius;
     margin: 0 $thumbnailVideoMargin;
 
-    &:hover {
+    &.videoContainerFocused, &:hover {
         cursor: hand;
     }
 
+    /**
+     * Focused video thumbnail.
+     */
+    &.videoContainerFocused {
+        border: $thumbnailVideoBorder solid $videoThumbnailSelected;
+        box-shadow: inset 0 0 3px $videoThumbnailSelected,
+        0 0 3px $videoThumbnailSelected;
+    }
+
+    .remotevideomenu > .icon-menu, .localvideomenu > .icon-menu {
+        display: none;
+    }
+
+    /**
+     * Hovered video thumbnail.
+     */
+    &:hover:not(.videoContainerFocused):not(.active-speaker) {
+        cursor: hand;
+        border: $thumbnailVideoBorder solid $videoThumbnailHovered;
+        box-shadow: inset 0 0 3px $videoThumbnailHovered,
+        0 0 3px $videoThumbnailHovered;
+
+        .remotevideomenu > .icon-menu, .localvideomenu > .icon-menu {
+            display: inline-block;
+        }
+    }
+
     & > video {
         cursor: hand;
         border-radius: $borderRadius;

css/filmstrip/_tile_view.scss

@@ -2,6 +2,13 @@
  * CSS styles that are specific to the filmstrip that shows the thumbnail tiles.
  */
 .tile-view {
+    /**
+     * Add a border around the active speaker to make the thumbnail easier to
+     * see.
+     */
+    .active-speaker {
+        box-shadow: 0px 0px 1px 1.5px black, 0px 0px 1.3px 4px $videoThumbnailSelected;
+    }
 
     .remote-videos {
         align-items: center;
@@ -99,6 +106,19 @@
                 display: block;
                 margin: 2px;
             }
+
+            video {
+                object-fit: contain;
+            }
+
+            /**
+            * Max-width corresponding to the ASPECT_RATIO_BREAKPOINT from features/filmstrip/constants.
+            */
+            @media only screen and (max-width: 500px) {
+                video {
+                    object-fit: cover;
+                }
+            }
         }
     }
 }
@@ -114,3 +134,7 @@
         }
     }
 }
+
+.indicator-icon-container {
+    display: inline-block;
+}

css/filmstrip/_tile_view_overrides.scss

@@ -17,7 +17,8 @@
     #dominantSpeaker,
     #filmstripLocalVideoThumbnail,
     #largeVideoElementsContainer,
-    #sharedVideo {
+    #sharedVideo,
+    .filmstrip__toolbar {
         display: none;
     }
 
@@ -34,4 +35,16 @@
     #remotePresenceMessage {
         display: none !important;
     }
+
+    /**
+     * Thumbnail popover menus can overlap other thumbnails. Setting an auto
+     * z-index will allow AtlasKit InlineDialog's large z-index to be
+     * respected and thereby display over elements in other thumbnails,
+     * specifically the various status icons.
+     */
+    .remotevideomenu,
+    .localvideomenu,
+    .videocontainer__toptoolbar {
+        z-index: auto;
+    }
 }

css/filmstrip/_vertical_filmstrip.scss

@@ -37,6 +37,7 @@
      */
     position: fixed;
     top: 0;
+    transition: height .3s ease-in;
     right: 0;
     z-index: $filmstripVideosZ;
 
@@ -51,6 +52,11 @@
         right: 0;
         width: auto;
 
+        &.hidden {
+            bottom: auto;
+            right: -196px;
+        }
+
         /**
          * An id selector is used to match id specificity with existing
          * filmstrip styles.
@@ -58,6 +64,7 @@
         &#remoteVideos {
             border: $thumbnailsBorder solid transparent;
             padding-left: 0;
+            transition: right 2s;
             width: 100%;
         }
     }

css/filmstrip/_vertical_filmstrip_overrides.scss

@@ -1,3 +1,11 @@
+/**
+ * Rotate the hide filmstrip icon so it points towards the right edge
+ * of the screen.
+ */
+.vertical-filmstrip .filmstrip__toolbar {
+    transform: rotate(-90deg);
+}
+
 /**
  * Overrides for video containers that should not be centered aligned to avoid=
  * clashing with the filmstrip.
@@ -11,6 +19,72 @@
  * Overrides for small videos in vertical filmstrip mode.
  */
 .vertical-filmstrip .filmstrip__videos .videocontainer {
+    /**
+     * Move status icons to the bottom right of the thumbnail.
+     */
+    .videocontainer__toolbar {
+        /**
+         * FIXME: disable pointer to allow any elements moved below to still
+         * be clickable. The real fix would to make sure those moved elements
+         * are actually part of the toolbar instead of positioning being faked.
+         */
+        pointer-events: none;
+        text-align: right;
+
+        > div {
+            pointer-events: none;
+        }
+
+        .right {
+            float: none;
+            margin: auto;
+        }
+
+        .toolbar-icon {
+            pointer-events: all;
+        }
+    }
+
+    /**
+     * Apply hardware acceleration to prevent flickering on scroll. The
+     * selectors are specific to icon wrappers to prevent fixed position dialogs
+     * and tooltips from getting a new location context due to translate3d.
+     */
+    .connection-indicator,
+    .local-video-menu-trigger,
+    .remote-video-menu-trigger,
+    .indicator-icon-container {
+        transform: translate3d(0, 0, 0);
+    }
+
+    .indicator-icon-container {
+        display: inline-block;
+    }
+
+    .indicator-container {
+        float: none;
+    }
+
+    /**
+     * Move the remote video menu trigger to the bottom left of the video
+     * thumbnail.
+     */
+    .localvideomenu,
+    .remotevideomenu,
+    .local-video-menu-trigger,
+    .remote-video-menu-trigger {
+        bottom: 0;
+        left: 0;
+        top: auto;
+        right: auto;
+    }
+
+    .local-video-menu-trigger,
+    .remote-video-menu-trigger {
+        margin-bottom: 3px;
+        margin-left: $remoteVideoMenuIconMargin;
+    }
+
     .self-view-mobile-portrait video {
         object-fit: contain;
     }

css/main.scss

@@ -69,6 +69,7 @@ $flagsImagePath: "../images/";
 @import '404';
 @import 'policy';
 @import 'popover';
+@import 'filmstrip/filmstrip_toolbar';
 @import 'filmstrip/horizontal_filmstrip';
 @import 'filmstrip/small_video';
 @import 'filmstrip/tile_view';

css/modals/_dialog.scss

@@ -140,12 +140,3 @@
         margin: 16px auto 0 auto;
     }
 }
-
-/**
- * Styling shared video dialog errors.
- */
-.shared-video-dialog-error {
-    color: #E04757;
-    margin-top: 2px;
-    display: block;
-}

css/modals/speaker_stats/_speaker_stats.scss

@@ -1,30 +1,80 @@
 .speaker-stats {
     list-style: none;
-    .row{
-        display: flex;
-        align-items: center;
-        .avatar {
-            width: 32px;
-            margin-right: 16px;
+    padding: 0;
+    width: 100%;
+    font-weight: 500;
+
+    .speaker-stats-item__status-dot {
+        position: relative;
+        display: block;
+        width: 9px;
+        height: 9px;
+        border-radius: 50%;
+        margin: 0 auto;
+
+        &.status-active {
+            background: green;
         }
-        .name-time {
-            width: calc(100% - 48px);
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            
-        }
-        .name-time_expressions-on {
-            width: calc(47% - 48px);
-        }
-        .expressions {
-            width: calc(53% - 29px);
-            display: flex;
-            justify-content: space-between;
-            .expression {
-                width: 30px;
-                text-align: center;
-            }
+
+        &.status-inactive {
+            background: gray;
         }
     }
+
+    .status-user-left {
+        color: $placeHolderColor;
+    }
+
+    .speaker-stats-item__status,
+    .speaker-stats-item__name,
+    .speaker-stats-item__time,
+    .speaker-stats-item__name_expressions_on,
+    .speaker-stats-item__time_expressions_on,
+    .speaker-stats-item__expression {
+        display: inline-block;
+        margin: 5px 0;
+        vertical-align: middle;
+    }
+    .speaker-stats-item__status {
+        width: 5%;
+    }
+    .speaker-stats-item__name {
+        width: 40%;
+    }
+    .speaker-stats-item__time {
+        width: 55%;
+    }
+    .speaker-stats-item__name_expressions_on {
+        width: 20%;
+    }
+    .speaker-stats-item__time_expressions_on {
+        width: 25%;
+    }
+
+    .speaker-stats-item__expression {
+        width: 7%;
+        text-align: center;
+    }
+
+    @media(max-width: 750px) {
+        .speaker-stats-item__name_expressions_on {
+            width: 25%;
+        }
+        .speaker-stats-item__time_expressions_on {
+            width: 30%;
+        }
+        .speaker-stats-item__expression {
+            width: 10%;
+        }
+    }
+
+    .speaker-stats-item__name,
+    .speaker-stats-item__time,
+    .speaker-stats-item__name_expressions_on,
+    .speaker-stats-item__time_expressions_on,
+    .speaker-stats-item__expression {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
 }

css/modals/virtual-background/_virtual-background.scss

@@ -201,7 +201,3 @@
     top: 40%;
     left: 45%;
 }
-
-.dialog-margin-top{
-    margin-top: 44px;
-}

css/premeeting/_lobby.scss

@@ -40,3 +40,106 @@
         }
     }
 }
+
+#notification-participant-list {
+    background-color: $newToolbarBackgroundColor;
+    border: 1px solid rgba(255, 255, 255, .4);
+    border-radius: 8px;
+    left: 0;
+    margin: 20px;
+    max-height: 600px;
+    overflow: hidden;
+    overflow-y: auto;
+    position: fixed;
+    top: 30px;
+    z-index: $toolbarZ + 1;
+
+    &:empty {
+        border: none;
+    }
+
+    &.toolbox-visible {
+        // Same as toolbox subject position
+        top: 120px;
+    }
+
+    .title {
+        background-color: rgba(0, 0, 0, .2);
+        font-size: 1.2em;
+        padding: 15px
+    }
+
+    button {
+        align-self: stretch;
+        margin-bottom: 8px 0;
+        padding: 12px;
+        transition: .2s transform ease;
+
+        &:disabled {
+            opacity: .5;
+        }
+
+        &:hover {
+            transform: scale(1.05);
+
+            &:disabled {
+                transform: none;
+            }
+        }
+
+        &.borderLess {
+            background-color: transparent;
+            border-width: 0;
+        }
+
+        &.primary {
+            background-color: rgb(3, 118, 218);
+            border-width: 0;
+        }
+    }
+}
+
+.knocking-participants-container {
+    list-style-type: none;
+    padding: 0 15px 15px 15px;
+}
+
+.knocking-participant {
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    margin: 8px 0;
+
+    .details {
+        display: flex;
+        flex: 1;
+        flex-direction: column;
+        justify-content: space-evenly;
+        margin: 0 30px 0 10px;
+    }
+
+    button {
+        align-self: unset;
+        margin: 0 5px;
+    }
+}
+
+@media (max-width: 300px) {
+    #knocking-participant-list {
+        margin: 0;
+        text-align: center;
+        width: 100%;
+
+        .avatar {
+            display: none;
+        }
+    }
+
+    .knocking-participant {
+        flex-direction: column;
+
+        .details {
+            margin: 0;
+        }
+    }
+}

css/themes/_light.scss

@@ -75,7 +75,11 @@ $errorColor: #c61600;
 $feedbackCancelFontColor: #333;
 
 // Popover colors
+$popoverBg: initial;
 $popoverFontColor: #ffffff !important;
+$popupMenuColor: #ffffff !important;
+$popupMenuHoverColor: #ffffff !important;
+$popupMenuHoverBackground: rgba(255, 255, 255, 0.1);
 $popupSliderColor: #0376da;
 
 // Toolbar

debian/jitsi-meet-prosody.postinst

@@ -204,8 +204,6 @@ case "$1" in
             fi
         fi
 
-        CERT_ADDED_TO_TRUST="false"
-
         if [ ! -f /var/lib/prosody/$JICOFO_AUTH_DOMAIN.crt ]; then
             # prosodyctl takes care for the permissions
             # echo for using all default values
@@ -222,8 +220,6 @@ case "$1" in
             # store not get re-generated with latest changes
             update-ca-certificates -f
 
-            CERT_ADDED_TO_TRUST="true"
-
             # don't fail on systems with custom config ($PROSODY_HOST_CONFIG is missing)
             if [ -f $PROSODY_HOST_CONFIG ]; then
                 # now let's add the ssl cert for the auth. domain (we use # as a sed delimiter cause filepaths are confused with default / delimiter)
@@ -236,11 +232,6 @@ case "$1" in
 
         if [ "$PROSODY_CONFIG_PRESENT" = "false" ]; then
             invoke-rc.d prosody restart || true
-
-            # In case we had updated the certificates and restarted prosody, let's restart and the bridge if possible
-            if [ -d /run/systemd/system ] && [ "$CERT_ADDED_TO_TRUST" = "true" ]; then
-                systemctl restart jitsi-videobridge2.service >/dev/null || true
-            fi
         fi
     ;;
 

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

@@ -124,5 +124,4 @@ Component "lobby.jitmeet.example.com" "muc"
     muc_room_default_public_jids = true
     modules_enabled = {
         "muc_rate_limit";
-        "polls";
     }

doc/debian/jitsi-meet-turn/turnserver.conf

@@ -32,12 +32,4 @@ denied-peer-ip=198.18.0.0-198.19.255.255
 denied-peer-ip=198.51.100.0-198.51.100.255
 denied-peer-ip=203.0.113.0-203.0.113.255
 denied-peer-ip=240.0.0.0-255.255.255.255
-denied-peer-ip=::1
-denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff
-denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255
-denied-peer-ip=100::-100::ffff:ffff:ffff:ffff
-denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff
-denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff
-denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
-denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff
 syslog

flow-typed/npm/flow-bin_v0.x.x.js

@@ -0,0 +1,6 @@
+// flow-typed signature: 4e6a5da3290fe9ea49e6bcdced64f358
+// flow-typed version: c6154227d1/flow-bin_v0.x.x/flow_>=v0.25.x <=v0.103.x
+
+declare module "flow-bin" {
+  declare module.exports: string;
+}

flow-typed/npm/react-redux_v7.x.x.js

@@ -0,0 +1,300 @@
+// flow-typed signature: 8da1e134b3de1d6f6bf9ba1cc7e2dc7e
+// flow-typed version: 387a235736/react-redux_v7.x.x/flow_>=v0.104.x
+
+/**
+The order of type arguments for connect() is as follows:
+
+connect<Props, OwnProps, StateProps, DispatchProps, State, Dispatch>(…)
+
+In Flow v0.89 only the first two are mandatory to specify. Other 4 can be repaced with the new awesome type placeholder:
+
+connect<Props, OwnProps, _, _, _, _>(…)
+
+But beware, in case of weird type errors somewhere in random places
+just type everything and get to a green field and only then try to
+remove the definitions you see bogus.
+
+Decrypting the abbreviations:
+  WC = Component being wrapped
+  S = State
+  D = Dispatch
+  OP = OwnProps
+  SP = StateProps
+  DP = DispatchProps
+  MP = Merge props
+  RSP = Returned state props
+  RDP = Returned dispatch props
+  RMP = Returned merge props
+  CP = Props for returned component
+  Com = React Component
+  SS = Selected state
+  ST = Static properties of Com
+  EFO = Extra factory options (used only in connectAdvanced)
+*/
+
+declare module "react-redux" {
+  // ------------------------------------------------------------
+  // Typings for connect()
+  // ------------------------------------------------------------
+
+  declare export type Options<S, OP, SP, MP> = {|
+    pure?: boolean,
+    forwardRef?: boolean,
+    areStatesEqual?: (next: S, prev: S) => boolean,
+    areOwnPropsEqual?: (next: OP, prev: OP) => boolean,
+    areStatePropsEqual?: (next: SP, prev: SP) => boolean,
+    areMergedPropsEqual?: (next: MP, prev: MP) => boolean,
+    storeKey?: string,
+  |};
+
+  declare type MapStateToProps<-S, -OP, +SP> =
+    | ((state: S, ownProps: OP) => SP)
+    // If you want to use the factory function but get a strange error
+    // like "function is not an object" then just type the factory function
+    // like this:
+    // const factory: (State, OwnProps) => (State, OwnProps) => StateProps
+    // and provide the StateProps type to the SP type parameter.
+    | ((state: S, ownProps: OP) => (state: S, ownProps: OP) => SP);
+
+  declare type Bind<D> = <A, R>((...A) => R) => (...A) => $Call<D, R>;
+
+  declare type MapDispatchToPropsFn<D, -OP, +DP> =
+    | ((dispatch: D, ownProps: OP) => DP)
+    // If you want to use the factory function but get a strange error
+    // like "function is not an object" then just type the factory function
+    // like this:
+    // const factory: (Dispatch, OwnProps) => (Dispatch, OwnProps) => DispatchProps
+    // and provide the DispatchProps type to the DP type parameter.
+    | ((dispatch: D, ownProps: OP) => (dispatch: D, ownProps: OP) => DP);
+
+  declare class ConnectedComponent<OP, +WC> extends React$Component<OP> {
+    static +WrappedComponent: WC;
+    getWrappedInstance(): React$ElementRef<WC>;
+  }
+  // The connection of the Wrapped Component and the Connected Component
+  // happens here in `MP: P`. It means that type wise MP belongs to P,
+  // so to say MP >= P.
+  declare type Connector<P, OP, MP: P> = <WC: React$ComponentType<P>>(
+    WC,
+  ) => Class<ConnectedComponent<OP, WC>> & WC;
+
+  // No `mergeProps` argument
+
+  // Got error like inexact OwnProps is incompatible with exact object type?
+  // Just make the OP parameter for `connect()` an exact object.
+  declare type MergeOP<OP, D> = {| ...$Exact<OP>, dispatch: D |};
+  declare type MergeOPSP<OP, SP, D> = {| ...$Exact<OP>, ...SP, dispatch: D |};
+  declare type MergeOPDP<OP, DP> = {| ...$Exact<OP>, ...DP |};
+  declare type MergeOPSPDP<OP, SP, DP> = {| ...$Exact<OP>, ...SP, ...DP |};
+
+  declare export function connect<-P, -OP, -SP, -DP, -S, -D>(
+    mapStateToProps?: null | void,
+    mapDispatchToProps?: null | void,
+    mergeProps?: null | void,
+    options?: ?Options<S, OP, {||}, MergeOP<OP, D>>,
+  ): Connector<P, OP, MergeOP<OP, D>>;
+
+  declare export function connect<-P, -OP, -SP, -DP, -S, -D>(
+    // If you get error here try adding return type to your mapStateToProps function
+    mapStateToProps: MapStateToProps<S, OP, SP>,
+    mapDispatchToProps?: null | void,
+    mergeProps?: null | void,
+    options?: ?Options<S, OP, SP, MergeOPSP<OP, SP, D>>,
+  ): Connector<P, OP, MergeOPSP<OP, SP, D>>;
+
+  // In this case DP is an object of functions which has been bound to dispatch
+  // by the given mapDispatchToProps function.
+  declare export function connect<-P, -OP, -SP, -DP, S, D>(
+    mapStateToProps: null | void,
+    mapDispatchToProps: MapDispatchToPropsFn<D, OP, DP>,
+    mergeProps?: null | void,
+    options?: ?Options<S, OP, {||}, MergeOPDP<OP, DP>>,
+  ): Connector<P, OP, MergeOPDP<OP, DP>>;
+
+  // In this case DP is an object of action creators not yet bound to dispatch,
+  // this difference is not important in the vanila redux,
+  // but in case of usage with redux-thunk, the return type may differ.
+  declare export function connect<-P, -OP, -SP, -DP, S, D>(
+    mapStateToProps: null | void,
+    mapDispatchToProps: DP,
+    mergeProps?: null | void,
+    options?: ?Options<S, OP, {||}, MergeOPDP<OP, DP>>,
+  ): Connector<P, OP, MergeOPDP<OP, $ObjMap<DP, Bind<D>>>>;
+
+  declare export function connect<-P, -OP, -SP, -DP, S, D>(
+    // If you get error here try adding return type to your mapStateToProps function
+    mapStateToProps: MapStateToProps<S, OP, SP>,
+    mapDispatchToProps: MapDispatchToPropsFn<D, OP, DP>,
+    mergeProps?: null | void,
+    options?: ?Options<S, OP, SP, {| ...OP, ...SP, ...DP |}>,
+  ): Connector<P, OP, {| ...OP, ...SP, ...DP |}>;
+
+  declare export function connect<-P, -OP, -SP, -DP, S, D>(
+    // If you get error here try adding return type to your mapStateToProps function
+    mapStateToProps: MapStateToProps<S, OP, SP>,
+    mapDispatchToProps: DP,
+    mergeProps?: null | void,
+    options?: ?Options<S, OP, SP, MergeOPSPDP<OP, SP, DP>>,
+  ): Connector<P, OP, MergeOPSPDP<OP, SP, $ObjMap<DP, Bind<D>>>>;
+
+  // With `mergeProps` argument
+
+  declare type MergeProps<+P, -OP, -SP, -DP> = (
+    stateProps: SP,
+    dispatchProps: DP,
+    ownProps: OP,
+  ) => P;
+
+  declare export function connect<-P, -OP, -SP: {||}, -DP: {||}, S, D>(
+    mapStateToProps: null | void,
+    mapDispatchToProps: null | void,
+    // If you get error here try adding return type to you mapStateToProps function
+    mergeProps: MergeProps<P, OP, {||}, {| dispatch: D |}>,
+    options?: ?Options<S, OP, {||}, P>,
+  ): Connector<P, OP, P>;
+
+  declare export function connect<-P, -OP, -SP, -DP: {||}, S, D>(
+    mapStateToProps: MapStateToProps<S, OP, SP>,
+    mapDispatchToProps: null | void,
+    // If you get error here try adding return type to you mapStateToProps function
+    mergeProps: MergeProps<P, OP, SP, {| dispatch: D |}>,
+    options?: ?Options<S, OP, SP, P>,
+  ): Connector<P, OP, P>;
+
+  // In this case DP is an object of functions which has been bound to dispatch
+  // by the given mapDispatchToProps function.
+  declare export function connect<-P, -OP, -SP: {||}, -DP, S, D>(
+    mapStateToProps: null | void,
+    mapDispatchToProps: MapDispatchToPropsFn<D, OP, DP>,
+    mergeProps: MergeProps<P, OP, {||}, DP>,
+    options?: ?Options<S, OP, {||}, P>,
+  ): Connector<P, OP, P>;
+
+  // In this case DP is an object of action creators not yet bound to dispatch,
+  // this difference is not important in the vanila redux,
+  // but in case of usage with redux-thunk, the return type may differ.
+  declare export function connect<-P, -OP, -SP: {||}, -DP, S, D>(
+    mapStateToProps: null | void,
+    mapDispatchToProps: DP,
+    mergeProps: MergeProps<P, OP, {||}, $ObjMap<DP, Bind<D>>>,
+    options?: ?Options<S, OP, {||}, P>,
+  ): Connector<P, OP, P>;
+
+  // In this case DP is an object of functions which has been bound to dispatch
+  // by the given mapDispatchToProps function.
+  declare export function connect<-P, -OP, -SP, -DP, S, D>(
+    mapStateToProps: MapStateToProps<S, OP, SP>,
+    mapDispatchToProps: MapDispatchToPropsFn<D, OP, DP>,
+    mergeProps: MergeProps<P, OP, SP, DP>,
+    options?: ?Options<S, OP, SP, P>,
+  ): Connector<P, OP, P>;
+
+  // In this case DP is an object of action creators not yet bound to dispatch,
+  // this difference is not important in the vanila redux,
+  // but in case of usage with redux-thunk, the return type may differ.
+  declare export function connect<-P, -OP, -SP, -DP, S, D>(
+    mapStateToProps: MapStateToProps<S, OP, SP>,
+    mapDispatchToProps: DP,
+    mergeProps: MergeProps<P, OP, SP, $ObjMap<DP, Bind<D>>>,
+    options?: ?Options<S, OP, SP, P>,
+  ): Connector<P, OP, P>;
+
+  // ------------------------------------------------------------
+  // Typings for Hooks
+  // ------------------------------------------------------------
+
+  declare export function useDispatch<D>(): D;
+
+  declare export function useSelector<S, SS>(
+    selector: (state: S) => SS,
+    equalityFn?: (a: SS, b: SS) => boolean,
+  ): SS;
+
+  declare export function useStore<Store>(): Store;
+
+  // ------------------------------------------------------------
+  // Typings for Provider
+  // ------------------------------------------------------------
+
+  declare export class Provider<Store> extends React$Component<{
+    store: Store,
+    children?: React$Node,
+    ...
+  }> {}
+
+  declare export function createProvider(
+    storeKey?: string,
+    subKey?: string,
+  ): Class<Provider<*>>;
+
+  // ------------------------------------------------------------
+  // Typings for connectAdvanced()
+  // ------------------------------------------------------------
+
+  declare type ConnectAdvancedOptions = {
+    getDisplayName?: (name: string) => string,
+    methodName?: string,
+    renderCountProp?: string,
+    shouldHandleStateChanges?: boolean,
+    storeKey?: string,
+    forwardRef?: boolean,
+    ...
+  };
+
+  declare type SelectorFactoryOptions<Com> = {
+    getDisplayName: (name: string) => string,
+    methodName: string,
+    renderCountProp: ?string,
+    shouldHandleStateChanges: boolean,
+    storeKey: string,
+    forwardRef: boolean,
+    displayName: string,
+    wrappedComponentName: string,
+    WrappedComponent: Com,
+    ...
+  };
+
+  declare type MapStateToPropsEx<S: Object, SP: Object, RSP: Object> = (
+    state: S,
+    props: SP,
+  ) => RSP;
+
+  declare type SelectorFactory<
+    Com: React$ComponentType<*>,
+    Dispatch,
+    S: Object,
+    OP: Object,
+    EFO: Object,
+    CP: Object,
+  > = (
+    dispatch: Dispatch,
+    factoryOptions: SelectorFactoryOptions<Com> & EFO,
+  ) => MapStateToPropsEx<S, OP, CP>;
+
+  declare export function connectAdvanced<
+    Com: React$ComponentType<*>,
+    D,
+    S: Object,
+    OP: Object,
+    CP: Object,
+    EFO: Object,
+    ST: { [_: $Keys<Com>]: any, ... },
+  >(
+    selectorFactory: SelectorFactory<Com, D, S, OP, EFO, CP>,
+    connectAdvancedOptions: ?(ConnectAdvancedOptions & EFO),
+  ): (component: Com) => React$ComponentType<OP> & $Shape<ST>;
+
+  declare export function batch(() => void): void
+
+  declare export default {
+    Provider: typeof Provider,
+    createProvider: typeof createProvider,
+    connect: typeof connect,
+    connectAdvanced: typeof connectAdvanced,
+    useDispatch: typeof useDispatch,
+    useSelector: typeof useSelector,
+    useStore: typeof useStore,
+    batch: typeof batch,
+    ...
+  };
+}

flow-typed/npm/redux_v4.x.x.js

@@ -0,0 +1,100 @@
+// flow-typed signature: 99b2d8ebd0ab4be20976dc62a3bbf54c
+// flow-typed version: c6154227d1/redux_v4.x.x/flow_>=v0.89.x <=v0.103.x
+
+declare module 'redux' {
+  /*
+
+    S = State
+    A = Action
+    D = Dispatch
+
+  */
+
+  declare export type Action<T> = {
+    type: T
+  }
+
+  declare export type DispatchAPI<A> = (action: A) => A;
+
+  declare export type Dispatch<A: { type: * }> = DispatchAPI<A>;
+
+  declare export type MiddlewareAPI<S, A, D = Dispatch<A>> = {
+    dispatch: D,
+    getState(): S,
+  };
+
+  declare export type Store<S, A, D = Dispatch<A>> = {
+    // rewrite MiddlewareAPI members in order to get nicer error messages (intersections produce long messages)
+    dispatch: D,
+    getState(): S,
+    subscribe(listener: () => void): () => void,
+    replaceReducer(nextReducer: Reducer<S, A>): void,
+  };
+
+  declare export type Reducer<S, A> = (state: S | void, action: A) => S;
+
+  declare export type CombinedReducer<S, A> = (
+    state: ($Shape<S> & {}) | void,
+    action: A
+  ) => S;
+
+  declare export type Middleware<S, A, D = Dispatch<A>> = (
+    api: MiddlewareAPI<S, A, D>
+  ) => (next: D) => D;
+
+  declare export type StoreCreator<S, A, D = Dispatch<A>> = {
+    (reducer: Reducer<S, A>, enhancer?: StoreEnhancer<S, A, D>): Store<S, A, D>,
+    (
+      reducer: Reducer<S, A>,
+      preloadedState: S,
+      enhancer?: StoreEnhancer<S, A, D>
+    ): Store<S, A, D>,
+  };
+
+  declare export type StoreEnhancer<S, A, D = Dispatch<A>> = (
+    next: StoreCreator<S, A, D>
+  ) => StoreCreator<S, A, D>;
+
+  declare export function createStore<S, A, D>(
+    reducer: Reducer<S, A>,
+    enhancer?: StoreEnhancer<S, A, D>
+  ): Store<S, A, D>;
+  declare export function createStore<S, A, D>(
+    reducer: Reducer<S, A>,
+    preloadedState?: S,
+    enhancer?: StoreEnhancer<S, A, D>
+  ): Store<S, A, D>;
+
+  declare export function applyMiddleware<S, A, D>(
+    ...middlewares: Array<Middleware<S, A, D>>
+  ): StoreEnhancer<S, A, D>;
+
+  declare export type ActionCreator<A, B> = (...args: Array<B>) => A;
+  declare export type ActionCreators<K, A> = {
+    [key: K]: ActionCreator<A, any>,
+  };
+
+  declare export function bindActionCreators<
+    A,
+    C: ActionCreator<A, any>,
+    D: DispatchAPI<A>
+  >(
+    actionCreator: C,
+    dispatch: D
+  ): C;
+  declare export function bindActionCreators<
+    A,
+    K,
+    C: ActionCreators<K, A>,
+    D: DispatchAPI<A>
+  >(
+    actionCreators: C,
+    dispatch: D
+  ): C;
+
+  declare export function combineReducers<O: {}, A>(
+    reducers: O
+  ): CombinedReducer<$ObjMap<O, <S>(r: Reducer<S, any>) => S>, A>;
+
+  declare export var compose: $Compose;
+}

flow-typed/npm/uuid_v8.x.x.js

@@ -0,0 +1,71 @@
+declare module 'uuid' {
+  // v1 (Timestamp)
+  declare type V1Options = {|
+    node?: $ReadOnlyArray<number>,
+    clockseq?: number,
+    msecs?: number,
+    nsecs?: number,
+    random?: $ReadOnlyArray<number>,
+    rng?: () => $ReadOnlyArray<number>,
+  |};
+
+  declare export function v1(options?: V1Options): string;
+
+  declare export function v1(
+    options: V1Options | null,
+    buffer: Array<number>,
+    offset?: number
+  ): Array<number>;
+
+  // v3 (Namespace)
+  declare function v3Impl(
+    name: string | $ReadOnlyArray<number>,
+    namespace: string | $ReadOnlyArray<number>
+  ): string;
+
+  declare function v3Impl(
+    name: string | $ReadOnlyArray<number>,
+    namespace: string | $ReadOnlyArray<number>,
+    buffer: Array<number>,
+    offset?: number
+  ): Array<number>;
+
+  declare export var v3: {|
+    [[call]]: typeof v3Impl,
+    DNS: string,
+    URL: string,
+  |};
+
+  // v4 (Random)
+  declare type V4Options = {|
+    random?: $ReadOnlyArray<number>,
+    rng?: () => $ReadOnlyArray<number>,
+  |};
+
+  declare export function v4(options?: V4Options): string;
+
+  declare export function v4(
+    options: V4Options | null,
+    buffer: Array<number>,
+    offset?: number
+  ): Array<number>;
+
+  // v5 (Namespace)
+  declare function v5Impl(
+    name: string | $ReadOnlyArray<number>,
+    namespace: string | $ReadOnlyArray<number>
+  ): string;
+
+  declare function v5Impl(
+    name: string | $ReadOnlyArray<number>,
+    namespace: string | $ReadOnlyArray<number>,
+    buffer: Array<number>,
+    offset?: number
+  ): Array<number>;
+
+  declare export var v5: {|
+    [[call]]: typeof v5Impl,
+    DNS: string,
+    URL: string,
+  |};
+}

interface_config.js

@@ -26,7 +26,7 @@ var interfaceConfig = {
 
     CLOSE_PAGE_GUEST_HINT: false, // A html text to be shown to guests on the close page, false disables it
 
-    DEFAULT_BACKGROUND: '#040404',
+    DEFAULT_BACKGROUND: '#474747',
     DEFAULT_LOGO_URL: 'images/watermark.svg',
     DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/watermark.svg',
 
@@ -91,7 +91,7 @@ var interfaceConfig = {
 
     LANG_DETECTION: true, // Allow i18n to detect the system language
     LIVE_STREAMING_HELP_LINK: 'https://jitsi.org/live', // Documentation reference for the live streaming feature.
-    LOCAL_THUMBNAIL_RATIO: 1, // 1:1
+    LOCAL_THUMBNAIL_RATIO: 16 / 9, // 16:9
 
     /**
      * Maximum coefficient of the ratio of the large video to the visible area

ios/Podfile

@@ -1,9 +1,6 @@
-require_relative '../node_modules/react-native/scripts/react_native_pods'
-require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
-
 platform :ios, '12.0'
 workspace 'jitsi-meet'
-
+require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 install! 'cocoapods', :deterministic_uuids => false
 
 target 'JitsiMeet' do
@@ -20,33 +17,84 @@ target 'JitsiMeetSDK' do
   # React Native and its dependencies
   #
 
-  config = use_native_modules!
-  use_react_native!(
-    :path => config["reactNativePath"],
-    :hermes_enabled => false
-  )
+  pod 'FBLazyVector', :path => '../node_modules/react-native/Libraries/FBLazyVector/'
+  pod 'FBReactNativeSpec', :path => '../node_modules/react-native/Libraries/FBReactNativeSpec/'
+  pod 'RCTRequired', :path => '../node_modules/react-native/Libraries/RCTRequired/'
+  pod 'RCTTypeSafety', :path => '../node_modules/react-native/Libraries/TypeSafety/'
+  pod 'React', :path => '../node_modules/react-native/'
+  pod 'ReactCommon', :path => '../node_modules/react-native/ReactCommon', :subspecs => [
+    'turbomodule'
+  ]
+  pod 'React-Core', :path => '../node_modules/react-native/', :subspecs => [
+    'CoreModulesHeaders',
+    'DevSupport',
+    'RCTWebSocket'
+  ], :modular_headers => true
+  pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
+  pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
+  pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
+  pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
+  pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
+  pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
+  pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
+  pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
+  pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
+  pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
+
+  pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
+  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
+  pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
+  pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
+  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
+
+  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
+  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
+  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
+
+  # React Native plugins
+  #
+
+  pod 'amplitude-react-native', :path => '../node_modules/@amplitude/react-native'
+  pod 'react-native-background-timer', :path => '../node_modules/react-native-background-timer'
+  pod 'react-native-calendar-events', :path => '../node_modules/react-native-calendar-events'
+  pod 'react-native-get-random-values', :path => '../node_modules/react-native-get-random-values'
+  pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake'
+  pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
+  pod 'react-native-performance', :path => '../node_modules/react-native-performance/ios'
+  pod 'react-native-safe-area-context', :path => '../node_modules/react-native-safe-area-context'
+  pod 'react-native-slider', :path => '../node_modules/@react-native-community/slider'
+  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
+  pod 'react-native-video', :path => '../node_modules/react-native-video/react-native-video.podspec'
+  pod 'react-native-webview', :path => '../node_modules/react-native-webview'
+  pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
+  pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-async-storage/async-storage'
+  pod 'RNCClipboard', :path => '../node_modules/@react-native-community/clipboard'
+  pod 'RNCMaskedView', :path => '../node_modules/@react-native-masked-view/masked-view'
+  pod 'RNDefaultPreference', :path => '../node_modules/react-native-default-preference'
+  pod 'RNDeviceInfo', :path => '../node_modules/react-native-device-info'
+  pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
+  pod 'RNGoogleSignin', :path => '../node_modules/@react-native-community/google-signin'
+  pod 'RNReanimated', :path => '../node_modules/react-native-reanimated'
+  pod 'RNScreens', :path => '../node_modules/react-native-screens'
+  pod 'RNSound', :path => '../node_modules/react-native-sound'
+  pod 'RNSVG', :path => '../node_modules/react-native-svg'
+  pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
 
   # Native pod dependencies
   #
 
   pod 'CocoaLumberjack', '~>3.5.3'
   pod 'ObjectiveDropboxOfficial', '~>6.1.0'
+
+  use_native_modules!
 end
 
 post_install do |installer|
-  react_native_post_install(installer)
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['ENABLE_BITCODE'] = 'YES'
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
     end
-    # https://github.com/facebook/react-native/issues/32351#issuecomment-939157955
-    case target.name
-    when 'RCT-Folly'
-      target.build_configurations.each do |config|
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
-      end
-    end
   end
 end

ios/Podfile.lock

@@ -1,26 +1,26 @@
 PODS:
-  - Amplitude (8.7.1)
-  - amplitude-react-native (2.7.0):
-    - Amplitude (= 8.7.1)
+  - Amplitude (8.2.0)
+  - amplitude-react-native (2.3.3):
+    - Amplitude (= 8.2.0)
     - React-Core
   - AppAuth (1.4.0):
     - AppAuth/Core (= 1.4.0)
     - AppAuth/ExternalUserAgent (= 1.4.0)
   - AppAuth/Core (1.4.0)
   - AppAuth/ExternalUserAgent (1.4.0)
-  - boost (1.76.0)
+  - boost-for-react-native (1.63.0)
   - CocoaLumberjack (3.5.3):
     - CocoaLumberjack/Core (= 3.5.3)
   - CocoaLumberjack/Core (3.5.3)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.66.4)
-  - FBReactNativeSpec (0.66.4):
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.66.4)
-    - RCTTypeSafety (= 0.66.4)
-    - React-Core (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - ReactCommon/turbomodule/core (= 0.66.4)
+  - FBLazyVector (0.61.5-jitsi.2)
+  - FBReactNativeSpec (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - RCTRequired (= 0.61.5-jitsi.2)
+    - RCTTypeSafety (= 0.61.5-jitsi.2)
+    - React-Core (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
   - Firebase/Analytics (6.33.0):
     - Firebase/Core
   - Firebase/Core (6.33.0):
@@ -65,7 +65,15 @@ PODS:
     - GoogleUtilities/Environment (~> 6.7)
     - GoogleUtilities/UserDefaults (~> 6.7)
     - PromisesObjC (~> 1.2)
-  - fmt (6.2.1)
+  - Folly (2018.10.22.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - Folly/Default (= 2018.10.22.00)
+    - glog
+  - Folly/Default (2018.10.22.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - glog
   - glog (0.3.5)
   - GoogleAppMeasurement (6.8.3):
     - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
@@ -75,8 +83,8 @@ PODS:
     - nanopb (~> 1.30906.0)
   - GoogleDataTransport (7.5.1):
     - nanopb (~> 1.30906.0)
-  - GoogleSignIn (6.0.2):
-    - AppAuth (~> 1.4)
+  - GoogleSignIn (5.0.2):
+    - AppAuth (~> 1.2)
     - GTMAppAuth (~> 1.0)
     - GTMSessionFetcher/Core (~> 1.1)
   - GoogleUtilities/AppDelegateSwizzler (6.7.2):
@@ -109,347 +117,296 @@ PODS:
   - nanopb/encode (1.30906.0)
   - ObjectiveDropboxOfficial (6.1.0)
   - PromisesObjC (1.2.12)
-  - RCT-Folly (2021.06.28.00-v2):
-    - boost
+  - RCTRequired (0.61.5-jitsi.2)
+  - RCTTypeSafety (0.61.5-jitsi.2):
+    - FBLazyVector (= 0.61.5-jitsi.2)
+    - Folly (= 2018.10.22.00)
+    - RCTRequired (= 0.61.5-jitsi.2)
+    - React-Core (= 0.61.5-jitsi.2)
+  - React (0.61.5-jitsi.2):
+    - React-Core (= 0.61.5-jitsi.2)
+    - React-Core/DevSupport (= 0.61.5-jitsi.2)
+    - React-Core/RCTWebSocket (= 0.61.5-jitsi.2)
+    - React-RCTActionSheet (= 0.61.5-jitsi.2)
+    - React-RCTAnimation (= 0.61.5-jitsi.2)
+    - React-RCTBlob (= 0.61.5-jitsi.2)
+    - React-RCTImage (= 0.61.5-jitsi.2)
+    - React-RCTLinking (= 0.61.5-jitsi.2)
+    - React-RCTNetwork (= 0.61.5-jitsi.2)
+    - React-RCTSettings (= 0.61.5-jitsi.2)
+    - React-RCTText (= 0.61.5-jitsi.2)
+    - React-RCTVibration (= 0.61.5-jitsi.2)
+  - React-Core (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default (= 0.61.5-jitsi.2)
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/CoreModulesHeaders (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/Default (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/DevSupport (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default (= 0.61.5-jitsi.2)
+    - React-Core/RCTWebSocket (= 0.61.5-jitsi.2)
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - React-jsinspector (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/RCTActionSheetHeaders (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/RCTAnimationHeaders (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/RCTBlobHeaders (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/RCTImageHeaders (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/RCTLinkingHeaders (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/RCTNetworkHeaders (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/RCTSettingsHeaders (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/RCTTextHeaders (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/RCTVibrationHeaders (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-Core/RCTWebSocket (0.61.5-jitsi.2):
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core/Default (= 0.61.5-jitsi.2)
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-jsiexecutor (= 0.61.5-jitsi.2)
+    - Yoga
+  - React-CoreModules (0.61.5-jitsi.2):
+    - FBReactNativeSpec (= 0.61.5-jitsi.2)
+    - Folly (= 2018.10.22.00)
+    - RCTTypeSafety (= 0.61.5-jitsi.2)
+    - React-Core/CoreModulesHeaders (= 0.61.5-jitsi.2)
+    - React-RCTImage (= 0.61.5-jitsi.2)
+    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
+  - React-cxxreact (0.61.5-jitsi.2):
+    - boost-for-react-native (= 1.63.0)
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - Folly (= 2018.10.22.00)
     - glog
-    - RCT-Folly/Default (= 2021.06.28.00-v2)
-  - RCT-Folly/Default (2021.06.28.00-v2):
-    - boost
+    - React-jsinspector (= 0.61.5-jitsi.2)
+  - React-jsi (0.61.5-jitsi.2):
+    - boost-for-react-native (= 1.63.0)
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - Folly (= 2018.10.22.00)
     - glog
-  - RCTRequired (0.66.4)
-  - RCTTypeSafety (0.66.4):
-    - FBLazyVector (= 0.66.4)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.66.4)
-    - React-Core (= 0.66.4)
-  - React (0.66.4):
-    - React-Core (= 0.66.4)
-    - React-Core/DevSupport (= 0.66.4)
-    - React-Core/RCTWebSocket (= 0.66.4)
-    - React-RCTActionSheet (= 0.66.4)
-    - React-RCTAnimation (= 0.66.4)
-    - React-RCTBlob (= 0.66.4)
-    - React-RCTImage (= 0.66.4)
-    - React-RCTLinking (= 0.66.4)
-    - React-RCTNetwork (= 0.66.4)
-    - React-RCTSettings (= 0.66.4)
-    - React-RCTText (= 0.66.4)
-    - React-RCTVibration (= 0.66.4)
-  - React-callinvoker (0.66.4)
-  - React-Core (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.66.4)
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/CoreModulesHeaders (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/Default (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/DevSupport (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.66.4)
-    - React-Core/RCTWebSocket (= 0.66.4)
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-jsinspector (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/RCTAnimationHeaders (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/RCTBlobHeaders (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/RCTImageHeaders (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/RCTLinkingHeaders (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/RCTNetworkHeaders (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/RCTSettingsHeaders (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/RCTTextHeaders (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/RCTVibrationHeaders (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-Core/RCTWebSocket (0.66.4):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.66.4)
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsiexecutor (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - Yoga
-  - React-CoreModules (0.66.4):
-    - FBReactNativeSpec (= 0.66.4)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.66.4)
-    - React-Core/CoreModulesHeaders (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-RCTImage (= 0.66.4)
-    - ReactCommon/turbomodule/core (= 0.66.4)
-  - React-cxxreact (0.66.4):
-    - boost (= 1.76.0)
+    - React-jsi/Default (= 0.61.5-jitsi.2)
+  - React-jsi/Default (0.61.5-jitsi.2):
+    - boost-for-react-native (= 1.63.0)
     - DoubleConversion
+    - Folly (= 2018.10.22.00)
     - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-jsinspector (= 0.66.4)
-    - React-logger (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-    - React-runtimeexecutor (= 0.66.4)
-  - React-jsi (0.66.4):
-    - boost (= 1.76.0)
+  - React-jsiexecutor (0.61.5-jitsi.2):
     - DoubleConversion
+    - Folly (= 2018.10.22.00)
     - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi/Default (= 0.66.4)
-  - React-jsi/Default (0.66.4):
-    - boost (= 1.76.0)
-    - DoubleConversion
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-  - React-jsiexecutor (0.66.4):
-    - DoubleConversion
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-  - React-jsinspector (0.66.4)
-  - React-logger (0.66.4):
-    - glog
-  - react-native-background-timer (2.4.1):
-    - React-Core
-  - react-native-get-random-values (1.7.2):
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+  - React-jsinspector (0.61.5-jitsi.2)
+  - react-native-background-timer (2.4.0):
+    - React
+  - react-native-calendar-events (2.0.0):
+    - React
+  - react-native-get-random-values (1.7.0):
     - React-Core
   - react-native-keep-awake (4.0.0):
     - React
-  - react-native-netinfo (7.1.7):
-    - React-Core
-  - react-native-pager-view (5.4.9):
-    - React-Core
-  - react-native-performance (2.1.0):
+  - react-native-netinfo (4.1.5):
+    - React
+  - react-native-performance (2.0.0):
     - React-Core
   - react-native-safe-area-context (3.3.2):
     - React-Core
-  - react-native-slider (4.1.12):
+  - react-native-slider (3.0.3):
+    - React
+  - react-native-splash-screen (3.2.0):
+    - React
+  - react-native-video (5.1.1):
     - React-Core
-  - react-native-splash-screen (3.3.0):
-    - React-Core
-  - react-native-video (5.2.0):
-    - React-Core
-    - react-native-video/Video (= 5.2.0)
-  - react-native-video/Video (5.2.0):
+    - react-native-video/Video (= 5.1.1)
+  - react-native-video/Video (5.1.1):
     - React-Core
   - react-native-webrtc (1.94.1):
     - React-Core
-  - react-native-webview (11.15.1):
+  - react-native-webview (11.0.2):
     - React-Core
-  - React-perflogger (0.66.4)
-  - React-RCTActionSheet (0.66.4):
-    - React-Core/RCTActionSheetHeaders (= 0.66.4)
-  - React-RCTAnimation (0.66.4):
-    - FBReactNativeSpec (= 0.66.4)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.66.4)
-    - React-Core/RCTAnimationHeaders (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - ReactCommon/turbomodule/core (= 0.66.4)
-  - React-RCTBlob (0.66.4):
-    - FBReactNativeSpec (= 0.66.4)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/RCTBlobHeaders (= 0.66.4)
-    - React-Core/RCTWebSocket (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-RCTNetwork (= 0.66.4)
-    - ReactCommon/turbomodule/core (= 0.66.4)
-  - React-RCTImage (0.66.4):
-    - FBReactNativeSpec (= 0.66.4)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.66.4)
-    - React-Core/RCTImageHeaders (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-RCTNetwork (= 0.66.4)
-    - ReactCommon/turbomodule/core (= 0.66.4)
-  - React-RCTLinking (0.66.4):
-    - FBReactNativeSpec (= 0.66.4)
-    - React-Core/RCTLinkingHeaders (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - ReactCommon/turbomodule/core (= 0.66.4)
-  - React-RCTNetwork (0.66.4):
-    - FBReactNativeSpec (= 0.66.4)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.66.4)
-    - React-Core/RCTNetworkHeaders (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - ReactCommon/turbomodule/core (= 0.66.4)
-  - React-RCTSettings (0.66.4):
-    - FBReactNativeSpec (= 0.66.4)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.66.4)
-    - React-Core/RCTSettingsHeaders (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - ReactCommon/turbomodule/core (= 0.66.4)
-  - React-RCTText (0.66.4):
-    - React-Core/RCTTextHeaders (= 0.66.4)
-  - React-RCTVibration (0.66.4):
-    - FBReactNativeSpec (= 0.66.4)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/RCTVibrationHeaders (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - ReactCommon/turbomodule/core (= 0.66.4)
-  - React-runtimeexecutor (0.66.4):
-    - React-jsi (= 0.66.4)
-  - ReactCommon/turbomodule/core (0.66.4):
+  - React-RCTActionSheet (0.61.5-jitsi.2):
+    - React-Core/RCTActionSheetHeaders (= 0.61.5-jitsi.2)
+  - React-RCTAnimation (0.61.5-jitsi.2):
+    - React-Core/RCTAnimationHeaders (= 0.61.5-jitsi.2)
+  - React-RCTBlob (0.61.5-jitsi.2):
+    - React-Core/RCTBlobHeaders (= 0.61.5-jitsi.2)
+    - React-Core/RCTWebSocket (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - React-RCTNetwork (= 0.61.5-jitsi.2)
+  - React-RCTImage (0.61.5-jitsi.2):
+    - React-Core/RCTImageHeaders (= 0.61.5-jitsi.2)
+    - React-RCTNetwork (= 0.61.5-jitsi.2)
+  - React-RCTLinking (0.61.5-jitsi.2):
+    - React-Core/RCTLinkingHeaders (= 0.61.5-jitsi.2)
+  - React-RCTNetwork (0.61.5-jitsi.2):
+    - React-Core/RCTNetworkHeaders (= 0.61.5-jitsi.2)
+  - React-RCTSettings (0.61.5-jitsi.2):
+    - React-Core/RCTSettingsHeaders (= 0.61.5-jitsi.2)
+  - React-RCTText (0.61.5-jitsi.2):
+    - React-Core/RCTTextHeaders (= 0.61.5-jitsi.2)
+  - React-RCTVibration (0.61.5-jitsi.2):
+    - React-Core/RCTVibrationHeaders (= 0.61.5-jitsi.2)
+  - ReactCommon/jscallinvoker (0.61.5-jitsi.2):
     - DoubleConversion
+    - Folly (= 2018.10.22.00)
     - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.66.4)
-    - React-Core (= 0.66.4)
-    - React-cxxreact (= 0.66.4)
-    - React-jsi (= 0.66.4)
-    - React-logger (= 0.66.4)
-    - React-perflogger (= 0.66.4)
-  - RNCalendarEvents (2.2.0):
-    - React
-  - RNCAsyncStorage (1.15.14):
+    - React-cxxreact (= 0.61.5-jitsi.2)
+  - ReactCommon/turbomodule (0.61.5-jitsi.2):
+    - DoubleConversion
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core (= 0.61.5-jitsi.2)
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
+    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
+    - ReactCommon/turbomodule/samples (= 0.61.5-jitsi.2)
+  - ReactCommon/turbomodule/core (0.61.5-jitsi.2):
+    - DoubleConversion
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core (= 0.61.5-jitsi.2)
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
+  - ReactCommon/turbomodule/samples (0.61.5-jitsi.2):
+    - DoubleConversion
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-Core (= 0.61.5-jitsi.2)
+    - React-cxxreact (= 0.61.5-jitsi.2)
+    - React-jsi (= 0.61.5-jitsi.2)
+    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
+    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
+  - RNCAsyncStorage (1.15.5):
     - React-Core
   - RNCClipboard (1.5.1):
     - React-Core
   - RNCMaskedView (0.2.6):
     - React-Core
-  - RNDefaultPreference (1.4.3):
+  - RNDefaultPreference (1.4.2):
+    - React
+  - RNDeviceInfo (8.0.0):
     - React-Core
-  - RNDeviceInfo (8.4.8):
-    - React-Core
-  - RNGestureHandler (2.1.0):
-    - React-Core
-  - RNGoogleSignin (7.0.4):
-    - GoogleSignIn (~> 6.0.0)
+  - RNGestureHandler (1.10.3):
     - React-Core
+  - RNGoogleSignin (3.0.1):
+    - GoogleSignIn (~> 5.0.0)
+    - React
   - RNReanimated (1.13.3):
     - React-Core
-  - RNScreens (3.10.1):
-    - React-Core
-    - React-RCTImage
-  - RNSound (0.11.1):
-    - React-Core
-    - RNSound/Core (= 0.11.1)
-  - RNSound/Core (0.11.1):
+  - RNScreens (2.18.1):
     - React-Core
+  - RNSound (0.11.0):
+    - React
+    - RNSound/Core (= 0.11.0)
+  - RNSound/Core (0.11.0):
+    - React
   - RNSVG (12.1.0):
     - React
-  - RNWatch (1.0.4):
+  - RNWatch (0.4.3):
     - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
   - "amplitude-react-native (from `../node_modules/@amplitude/react-native`)"
-  - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
   - CocoaLumberjack (~> 3.5.3)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
-  - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
+  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector/`)
+  - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec/`)
   - Firebase/Analytics (~> 6.33.0)
   - Firebase/Crashlytics (~> 6.33.0)
   - Firebase/DynamicLinks (~> 6.33.0)
+  - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - ObjectiveDropboxOfficial (~> 6.1.0)
-  - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
-  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
-  - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
+  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired/`)
+  - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety/`)
   - React (from `../node_modules/react-native/`)
-  - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
-  - React-Core (from `../node_modules/react-native/`)
+  - React-Core/CoreModulesHeaders (from `../node_modules/react-native/`)
   - React-Core/DevSupport (from `../node_modules/react-native/`)
   - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
   - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
@@ -457,20 +414,18 @@ DEPENDENCIES:
   - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
-  - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
   - react-native-background-timer (from `../node_modules/react-native-background-timer`)
+  - react-native-calendar-events (from `../node_modules/react-native-calendar-events`)
   - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
   - react-native-keep-awake (from `../node_modules/react-native-keep-awake`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
-  - react-native-pager-view (from `../node_modules/react-native-pager-view`)
   - react-native-performance (from `../node_modules/react-native-performance/ios`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
   - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
-  - react-native-video (from `../node_modules/react-native-video`)
+  - react-native-video (from `../node_modules/react-native-video/react-native-video.podspec`)
   - react-native-webrtc (from `../node_modules/react-native-webrtc`)
   - react-native-webview (from `../node_modules/react-native-webview`)
-  - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
   - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
@@ -480,16 +435,14 @@ DEPENDENCIES:
   - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
   - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
-  - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
-  - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
-  - RNCalendarEvents (from `../node_modules/react-native-calendar-events`)
+  - ReactCommon/turbomodule (from `../node_modules/react-native/ReactCommon`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
   - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
   - RNDefaultPreference (from `../node_modules/react-native-default-preference`)
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
-  - "RNGoogleSignin (from `../node_modules/@react-native-google-signin/google-signin`)"
+  - "RNGoogleSignin (from `../node_modules/@react-native-community/google-signin`)"
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
   - RNSound (from `../node_modules/react-native-sound`)
@@ -501,6 +454,7 @@ SPEC REPOS:
   trunk:
     - Amplitude
     - AppAuth
+    - boost-for-react-native
     - CocoaLumberjack
     - Firebase
     - FirebaseAnalytics
@@ -509,7 +463,6 @@ SPEC REPOS:
     - FirebaseCrashlytics
     - FirebaseDynamicLinks
     - FirebaseInstallations
-    - fmt
     - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleSignIn
@@ -523,26 +476,22 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   amplitude-react-native:
     :path: "../node_modules/@amplitude/react-native"
-  boost:
-    :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   FBLazyVector:
-    :path: "../node_modules/react-native/Libraries/FBLazyVector"
+    :path: "../node_modules/react-native/Libraries/FBLazyVector/"
   FBReactNativeSpec:
-    :path: "../node_modules/react-native/React/FBReactNativeSpec"
+    :path: "../node_modules/react-native/Libraries/FBReactNativeSpec/"
+  Folly:
+    :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
   glog:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
-  RCT-Folly:
-    :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
-    :path: "../node_modules/react-native/Libraries/RCTRequired"
+    :path: "../node_modules/react-native/Libraries/RCTRequired/"
   RCTTypeSafety:
-    :path: "../node_modules/react-native/Libraries/TypeSafety"
+    :path: "../node_modules/react-native/Libraries/TypeSafety/"
   React:
     :path: "../node_modules/react-native/"
-  React-callinvoker:
-    :path: "../node_modules/react-native/ReactCommon/callinvoker"
   React-Core:
     :path: "../node_modules/react-native/"
   React-CoreModules:
@@ -555,18 +504,16 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
   React-jsinspector:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
-  React-logger:
-    :path: "../node_modules/react-native/ReactCommon/logger"
   react-native-background-timer:
     :path: "../node_modules/react-native-background-timer"
+  react-native-calendar-events:
+    :path: "../node_modules/react-native-calendar-events"
   react-native-get-random-values:
     :path: "../node_modules/react-native-get-random-values"
   react-native-keep-awake:
     :path: "../node_modules/react-native-keep-awake"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
-  react-native-pager-view:
-    :path: "../node_modules/react-native-pager-view"
   react-native-performance:
     :path: "../node_modules/react-native-performance/ios"
   react-native-safe-area-context:
@@ -576,13 +523,11 @@ EXTERNAL SOURCES:
   react-native-splash-screen:
     :path: "../node_modules/react-native-splash-screen"
   react-native-video:
-    :path: "../node_modules/react-native-video"
+    :path: "../node_modules/react-native-video/react-native-video.podspec"
   react-native-webrtc:
     :path: "../node_modules/react-native-webrtc"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
-  React-perflogger:
-    :path: "../node_modules/react-native/ReactCommon/reactperflogger"
   React-RCTActionSheet:
     :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
   React-RCTAnimation:
@@ -601,12 +546,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/Libraries/Text"
   React-RCTVibration:
     :path: "../node_modules/react-native/Libraries/Vibration"
-  React-runtimeexecutor:
-    :path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
-  RNCalendarEvents:
-    :path: "../node_modules/react-native-calendar-events"
   RNCAsyncStorage:
     :path: "../node_modules/@react-native-async-storage/async-storage"
   RNCClipboard:
@@ -620,7 +561,7 @@ EXTERNAL SOURCES:
   RNGestureHandler:
     :path: "../node_modules/react-native-gesture-handler"
   RNGoogleSignin:
-    :path: "../node_modules/@react-native-google-signin/google-signin"
+    :path: "../node_modules/@react-native-community/google-signin"
   RNReanimated:
     :path: "../node_modules/react-native-reanimated"
   RNScreens:
@@ -635,14 +576,14 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  Amplitude: 834c7332dfb9640a751e21c13efb22a07c0c12d4
-  amplitude-react-native: 0ed8cab759aafaa94961b82122bf56297da607ad
+  Amplitude: 263118b9e691e73a1c864b05bb08a3aff3636d16
+  amplitude-react-native: 9369759dc6d01590aeb6261f714d53beaebc7e6f
   AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
-  boost: a7c83b31436843459a1961bfd74b96033dc77234
+  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
-  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
-  FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1
-  FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58
+  DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
+  FBLazyVector: ca7f56c8ff6cd8590f7a673d7903b06019805581
+  FBReactNativeSpec: 8136c3cf27de2bb310a69cffbb423c5643f5c1c4
   Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
   FirebaseAnalytics: 5dd088bd2e67bb9d13dbf792d1164ceaf3052193
   FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
@@ -650,68 +591,62 @@ SPEC CHECKSUMS:
   FirebaseCrashlytics: 1a747c9cc084a24dc6d9511c991db1cd078154eb
   FirebaseDynamicLinks: 6eac37d86910382eafb6315d952cc44c9e176094
   FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
-  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 5337263514dd6f09803962437687240c5dc39aa4
+  Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
+  glog: 1f3da668190260b06b429bb211bfbee5cd790c28
   GoogleAppMeasurement: 966e88df9d19c15715137bb2ddaf52373f111436
   GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
-  GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
+  GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213
   GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
   GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
   GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91
   nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
   ObjectiveDropboxOfficial: b4765572e334d6fc6214b43a7595510324bbbbaa
   PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
-  RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9
-  RCTRequired: 4bf86c70714490bca4bf2696148638284622644b
-  RCTTypeSafety: c475a7059eb77935fa53d2c17db299893f057d5d
-  React: f64af14e3f2c50f6f2c91a5fd250e4ff1b3c3459
-  React-callinvoker: b74e4ae80287780dcdf0cab262bcb581eeef56e7
-  React-Core: 3eb7432bad96ff1d25aebc1defbae013fee2fd0e
-  React-CoreModules: ad9e1fd5650e16666c57a08328df86fd7e480cb9
-  React-cxxreact: 02633ff398cf7e91a2c1e12590d323c4a4b8668a
-  React-jsi: 805c41a927d6499fb811772acb971467d9204633
-  React-jsiexecutor: 94ce921e1d8ce7023366873ec371f3441383b396
-  React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85
-  React-logger: 933f80c97c633ee8965d609876848148e3fef438
-  react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
-  react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
+  RCTRequired: a686731276578c125dff205f08b6ec9cee6ede32
+  RCTTypeSafety: 88e5500e801c00d16a3d1895e3470d13beed6584
+  React: 8b2bcf6a93846e47a7a365a54ec6edeb78b37701
+  React-Core: 3fbdbc87c18c4742b735ff9a0c02fa38c87e0fba
+  React-CoreModules: f6f8a8212aec52a21251c0af58bdb037b57c70b3
+  React-cxxreact: c6ad34143db06a5c3cb0e8e169c775475287ac9c
+  React-jsi: ddb471a56185e4007835a1bba0882ecb5ce3dc0e
+  React-jsiexecutor: 67106691c60030ec888d7cbbc4f48a3168e27a02
+  React-jsinspector: 92ceee6c66dc19886289b52436ade7e020b89602
+  react-native-background-timer: 029c606b3fd6dd476b153e177c518b6ade4c169f
+  react-native-calendar-events: 82dc6c915653a1a8a266e43fdbbfdb3b1022ca99
+  react-native-get-random-values: 237bffb1c7e05fb142092681531810a29ba53015
   react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
-  react-native-netinfo: 27f287f2d191693f3b9d01a4273137fcf91c3b5d
-  react-native-pager-view: 3ee7d4c7697fb3ef788346e834a60cca97ed8540
-  react-native-performance: f4b6604a9d5a8a7407e34a82fab6c641d9a3ec12
+  react-native-netinfo: 0e563248a4b9a99c33ec29bd03c2d50767db22a6
+  react-native-performance: 6bd6cfac80594775fb782405fceaaf206becf53b
   react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
-  react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
-  react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
-  react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28
+  react-native-slider: e99fc201cefe81270fc9d81714a7a0f5e566b168
+  react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
+  react-native-video: 0bb76b6d6b77da3009611586c7dbf817b947f30e
   react-native-webrtc: 2f20515f3ebb9dbf1f2aad638cc7573396cf948f
-  react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
-  React-perflogger: 93075d8931c32cd1fce8a98c15d2d5ccc4d891bd
-  React-RCTActionSheet: 7d3041e6761b4f3044a37079ddcb156575fb6d89
-  React-RCTAnimation: 743e88b55ac62511ae5c2e22803d4f503f2a3a13
-  React-RCTBlob: bee3a2f98fa7fc25c957c8643494244f74bea0a0
-  React-RCTImage: 19fc9e29b06cc38611c553494f8d3040bf78c24e
-  React-RCTLinking: dc799503979c8c711126d66328e7ce8f25c2848f
-  React-RCTNetwork: 417e4e34cf3c19eaa5fd4e9eb20180d662a799ce
-  React-RCTSettings: 4df89417265af26501a7e0e9192a34d3d9848dff
-  React-RCTText: f8a21c3499ab322326290fa9b701ae29aa093aa5
-  React-RCTVibration: e3ffca672dd3772536cb844274094b0e2c31b187
-  React-runtimeexecutor: dec32ee6f2e2a26e13e58152271535fadff5455a
-  ReactCommon: 57b69f6383eafcbd7da625bfa6003810332313c4
-  RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3
-  RNCAsyncStorage: ea6b5c280997b2b32a587793163b1f10e580c4f7
+  react-native-webview: dfd7202ff115c44d3ea401c2f36122fb3ac79f07
+  React-RCTActionSheet: bcbc311dc3b47bc8efb2737ff0940239a45789a9
+  React-RCTAnimation: 65f61080ce632f6dea23d52e354ffac9948396c6
+  React-RCTBlob: 70d88f7b68b5c44953cdb286ac2e36a7a509a97e
+  React-RCTImage: e0d25b620e42de91ed791ef129e2d3a0df1eb5ab
+  React-RCTLinking: bc2287cfd9e56403ecea5dafdbdac8c57fa1ac36
+  React-RCTNetwork: cd8ae8fc787c02ed5152fe9cbf7521ee70c1bce7
+  React-RCTSettings: f6667271ccd8876a934134b73002b5a2714e1525
+  React-RCTText: 4f1b99f228278d2a5e9008eced8dc9c974c4a270
+  React-RCTVibration: c1041024893fdfdb8371e7c720c437751b711676
+  ReactCommon: 18014e1d98dbeb9141e935cfe35fc93bd511ffb6
+  RNCAsyncStorage: 56a3355a10b5d660c48c6e37325ac85ebfd09885
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
   RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
-  RNDefaultPreference: 326860d42a681bfd7338c8f6d061cf58745bd860
-  RNDeviceInfo: 0400a6d0c94186d1120c3cbd97b23abc022187a9
-  RNGestureHandler: e5c7cab5f214503dcefd6b2b0cefb050e1f51c4a
-  RNGoogleSignin: c4381751eefd73c552b923ba347a9bfc6f18771c
+  RNDefaultPreference: 1f8133ec0bc0f9453cdada578564ba1ef551fb44
+  RNDeviceInfo: 87d2d175c760f6bcf58acd036f887e8b2392802c
+  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
+  RNGoogleSignin: 39336070b35fc4cea6a98cf111e00480317be0ae
   RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926
-  RNScreens: 522705f2e5c9d27efb17f24aceb2bf8335bc7b8e
-  RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
+  RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
+  RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e
-  RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80
-  Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280
+  RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
+  Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
 
-PODFILE CHECKSUM: 93620e428bb16cc7fb8fd7314c0402e26929b5bf
+PODFILE CHECKSUM: 0cfc1f35e2872ceb0a86252e14e226bd489a2602
 
 COCOAPODS: 1.11.2

ios/app/app.xcodeproj/project.pbxproj

@@ -977,7 +977,6 @@
 				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1038,7 +1037,6 @@
 				ENABLE_BITCODE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

ios/app/broadcast-extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>22.0.0</string>
+	<string>21.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

ios/app/src/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>22.0.0</string>
+	<string>21.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/app/watchos/app/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>22.0.0</string>
+	<string>21.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>

ios/app/watchos/extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>22.0.0</string>
+	<string>21.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -407,15 +407,13 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh",
-				"${PODS_ROOT}/Amplitude/Sources/Resources/ComodoRsaDomainValidationCA.der",
-				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_ROOT}/Amplitude/Sources/Amplitude/Resources/ComodoRsaDomainValidationCA.der",
+				"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaDomainValidationCA.der",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -518,7 +516,6 @@
 				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -581,7 +578,6 @@
 				ENABLE_BITCODE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

ios/sdk/src/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0.0</string>
+	<string>4.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

lang/languages-af.json

@@ -1,11 +1,11 @@
 {
+    "en": "Engels",
     "af": "",
     "az": "Azerbeidjans",
     "bg": "Bulgaars",
     "cs": "Tsjeggies",
     "de": "Duits",
     "el": "Grieks",
-    "en": "Engels",
     "eo": "Esperanto",
     "es": "Spaans",
     "fr": "Frans",
@@ -24,4 +24,4 @@
     "tr": "Turks",
     "vi": "Viëtnamees",
     "zhCN": "Sjinees (Sjina)"
-}
+}

lang/languages-ar.json

@@ -1,47 +1,47 @@
 {
-    "af": "الأفريكانية",
     "ar": "العربية",
+    "en": "الإنجليزية",
+    "af": "الأفريكانية",
     "bg": "البلغارية",
     "ca": "الكاتالانية",
     "cs": "التشيكية",
     "da": "الدنماركية",
     "de": "الألمانية",
     "el": "اليونانية",
-    "en": "الإنجليزية",
     "enGB": "الإنجليزية (المملكة المتحدة)",
     "eo": "الإسبرانتو",
     "es": "الإسبانية",
     "esUS": "الإسبانية (أمريكا اللاتينية)",
     "et": "الإستونية",
-    "eu": "الباسكية",
     "fi": "الفنلندية",
     "fr": "الفرنسية",
     "frCA": "الفرنسية (الكندية)",
-    "he": "العبرية",
     "hr": "الكرواتية",
     "hu": "الهنغارية",
     "hy": "الأرمنية",
-    "id": "الإندونيسية",
     "it": "الإيطالية",
     "ja": "اليابانية",
-    "kab": "قَبَلي",
     "ko": "الكورية",
-    "lt": "الليتوانية",
-    "mr": "الماراثى",
     "nl": "الهولندية",
     "oc": "القسطانية",
     "pl": "البولندية",
     "ptBR": "البرتغالية (البرازيل)",
-    "ro": "الرومانية",
     "ru": "الروسية",
-    "sc": "السردينية",
-    "sk": "السلوفاكية",
-    "sl": "السلوفينية",
     "sv": "السويدية",
-    "th": "التايلندية",
     "tr": "التركية",
-    "uk": "الأوكرانية",
     "vi": "الفيتنامية",
     "zhCN": "الصينية (الصين)",
-    "zhTW": "الصينية (تايوان)"
+    "zhTW": "الصينية (تايوان)",
+    "th": "التايلندية",
+    "sc": "السردينية",
+    "eu": "الباسكية",
+    "uk": "الأوكرانية",
+    "sk": "السلوفاكية",
+    "lt": "الليتوانية",
+    "id": "الإندونيسية",
+    "he": "العبرية",
+    "mr":"الماراثى",
+    "kab": "قَبَلي",
+    "ro": "الرومانية",
+    "sl": "السلوفينية",
 }

lang/languages-be.json

@@ -1,4 +1,5 @@
 {
+    "en": "Англійская",
     "af": "Афрыкаанс",
     "bg": "Балгарская",
     "ca": "Каталанская",
@@ -6,7 +7,6 @@
     "da": "Дацкая",
     "de": "Нямецкая",
     "el": "Грэцкая",
-    "en": "Англійская",
     "enGB": "Англійская (Вялікабрытанія)",
     "eo": "Эсперанта",
     "es": "Іспанская",

lang/languages-bg.json

@@ -1,11 +1,11 @@
 {
+    "en": "Английски",
     "af": "Африканс",
     "bg": "Български",
     "ca": "Каталонски",
     "cs": "Чешки",
     "de": "Немски",
     "el": "Гръцки",
-    "en": "Английски",
     "enGB": "Английски (Великобритания)",
     "eo": "Есперанто",
     "es": "Испански",
@@ -29,4 +29,4 @@
     "vi": "Виетнамски",
     "zhCN": "Китайски (Китай)",
     "zhTW": "Тайвански"
-}
+}

lang/languages-ca.json

@@ -1,4 +1,5 @@
 {
+    "en": "Anglès",
     "af": "Afrikaans",
     "ar": "Àrab",
     "bg": "Búlgar",
@@ -7,46 +8,36 @@
     "da": "Danès",
     "de": "Alemany",
     "el": "Grec",
-    "en": "Anglès",
     "enGB": "Anglès (Regne Unit)",
     "eo": "Esperanto",
     "es": "Espanyol",
-    "esUS": "Espanyol (Amèrica llatina)",
+    "esUS": "Espanyol (Amèrica Llatina)",
     "et": "Estonià",
-    "eu": "Basc",
-    "fa": "Persa",
+    "eu": "Èuscar",
     "fi": "Finès",
     "fr": "Francès",
     "frCA": "Francès (Canadà)",
     "he": "Hebreu",
-    "hi": "Hindi",
+    "mr": "Marathi",
     "hr": "Croat",
     "hu": "Hongarès",
     "hy": "Armeni",
     "id": "Indonesi",
     "it": "Italià",
     "ja": "Japonès",
-    "kab": "Cabilenc",
     "ko": "Coreà",
     "lt": "Lituà",
-    "lv": "Letó",
-    "ml": "Malaiàlam",
-    "mr": "Marathi",
     "nl": "Neerlandès",
     "oc": "Occità",
     "pl": "Polonès",
-    "pt": "Portuguès",
     "ptBR": "Portuguès (Brasil)",
-    "ro": "Romanès",
     "ru": "Rus",
+    "ro": "Romanès",
     "sc": "Sard",
     "sk": "Eslovac",
     "sl": "Eslovè",
-    "sq": "Albanès",
-    "sr": "Serbi",
     "sv": "Suec",
-    "te": "Telugu",
-    "th": "tailandès",
+    "th": "Tai",
     "tr": "Turc",
     "uk": "Ucraïnès",
     "vi": "Vietnamita",

lang/languages-cs.json

@@ -1,4 +1,5 @@
 {
+    "en": "Angličtina",
     "af": "Afrikánština",
     "ar": "Arabština",
     "az": "Ázerbájdžánština",
@@ -8,7 +9,6 @@
     "da": "Dánština",
     "de": "Němčina",
     "el": "Řečtina",
-    "en": "Angličtina",
     "enGB": "Angličtina (Spojené království)",
     "eo": "Esperanto",
     "es": "Španělština",
@@ -19,6 +19,7 @@
     "fr": "Francouština",
     "frCA": "Francouzština (Kanada)",
     "he": "Hebrejština",
+    "mr":"Maráthština",
     "hr": "Chorvatština",
     "hu": "Maďarština",
     "hy": "Arménština",
@@ -28,14 +29,13 @@
     "kab": "Kabylština",
     "ko": "Korejština",
     "lt": "Litevština",
-    "mr": "Maráthština",
-    "nb": "Norština Bokmal",
     "nl": "Nizozemština",
+    "nb": "Norština Bokmal",
     "oc": "Okcitánština",
     "pl": "Polština",
     "ptBR": "Portugalština (Brazílie)",
-    "ro": "Rumunština",
     "ru": "Ruština",
+    "ro": "Rumunština",
     "sc": "Sardinština",
     "sk": "Slovenština",
     "sl": "Slovinština",

lang/languages-da.json

@@ -1,4 +1,5 @@
 {
+    "en": "Engelsk",
     "af": "Sydafrikansk",
     "bg": "Bulgarsk",
     "ca": "Katalansk",
@@ -6,7 +7,6 @@
     "da": "Dansk",
     "de": "Tysk",
     "el": "Græsk",
-    "en": "Engelsk",
     "enGB": "Engelsk (Storbritannien)",
     "eo": "Esperanto",
     "es": "Spansk",

lang/languages-de.json

@@ -1,29 +1,19 @@
 {
+    "en": "Englisch",
     "af": "Afrikaans",
     "az": "Aserbaidschanisch",
     "bg": "Bulgarisch",
-    "ca": "Katalanisch",
     "cs": "Tschechisch",
-    "da": "Dänisch",
     "de": "Deutsch",
     "el": "Griechisch",
-    "en": "Englisch",
-    "enGB": "Englisch (Vereinigtes Königreich)",
     "eo": "Esperanto",
     "es": "Spanisch",
-    "esUS": "Spanisch (Lateinamerika)",
-    "et": "Estnisch",
-    "fi": "Finnisch",
     "fr": "Französisch",
-    "frCA": "Französisch (Kanada)",
-    "hr": "Kroatisch",
-    "hu": "Ungarisch",
     "hy": "Armenisch",
     "it": "Italienisch",
     "ja": "Japanisch",
     "ko": "Koreanisch",
     "nb": "Norwegisch (Bokmal)",
-    "nl": "Niederländisch",
     "oc": "Okzitanisch",
     "pl": "Polnisch",
     "ptBR": "Portugiesisch (Brasilien)",
@@ -35,5 +25,15 @@
     "tr": "Türkisch",
     "vi": "Vietnamesisch",
     "zhCN": "Chinesisch (China)",
-    "zhTW": "Chinesisch (Taiwan)"
+    "zhTW": "Chinesisch (Taiwan)",
+    "nl": "Niederländisch",
+    "hu": "Ungarisch",
+    "hr": "Kroatisch",
+    "frCA": "Französisch (Kanada)",
+    "fi": "Finnisch",
+    "et": "Estnisch",
+    "esUS": "Spanisch (Lateinamerika)",
+    "enGB": "Englisch (Vereinigtes Königreich)",
+    "da": "Dänisch",
+    "ca": "Katalanisch"
 }

lang/languages-el.json

@@ -1,4 +1,5 @@
 {
+    "en": "Αγγλικά",
     "af": "Αφρικανικά",
     "bg": "Βουλγάρικα",
     "ca": "Καταλανικά",
@@ -6,7 +7,6 @@
     "da": "Δανέζικα",
     "de": "Γερμανικά",
     "el": "Ελληνικά",
-    "en": "Αγγλικά",
     "enGB": "Αγγλικά (Ηνωμένου Βασιλείου)",
     "eo": "Εσπεράντο",
     "es": "Ισπανικά",
@@ -39,4 +39,4 @@
     "vi": "Βιετναμέζικα",
     "zhCN": "Κινέζικα (Κίνας)",
     "zhTW": "Κινέζικα (Ταϊβάν)"
-}
+}

lang/languages-enGB.json

@@ -1,29 +1,19 @@
 {
+    "en": "English",
     "af": "Afrikaans",
     "az": "",
     "bg": "Bulgarian",
-    "ca": "Catalan",
     "cs": "Czech",
-    "da": "Danish",
     "de": "German",
     "el": "Greek",
-    "en": "English",
-    "enGB": "English (United Kingdom)",
     "eo": "Esperanto",
     "es": "Spanish",
-    "esUS": "Spanish (Latin America)",
-    "et": "Estonian",
-    "fi": "Finnish",
     "fr": "French",
-    "frCA": "French (Canadian)",
-    "hr": "Croatian",
-    "hu": "Hungarian",
     "hy": "Armenian",
     "it": "Italian",
     "ja": "Japanese",
     "ko": "Korean",
     "nb": "",
-    "nl": "Dutch",
     "oc": "Occitan",
     "pl": "Polish",
     "ptBR": "Portuguese (Brazil)",
@@ -35,5 +25,15 @@
     "tr": "Turkish",
     "vi": "Vietnamese",
     "zhCN": "Chinese (China)",
-    "zhTW": "Chinese (Taiwan)"
+    "zhTW": "Chinese (Taiwan)",
+    "nl": "Dutch",
+    "hu": "Hungarian",
+    "hr": "Croatian",
+    "frCA": "French (Canadian)",
+    "fi": "Finnish",
+    "et": "Estonian",
+    "esUS": "Spanish (Latin America)",
+    "enGB": "English (United Kingdom)",
+    "da": "Danish",
+    "ca": "Catalan"
 }

lang/languages-eo.json

@@ -1,11 +1,11 @@
 {
+    "en": "Angla",
     "af": "Afrikansa",
     "az": "Azera",
     "bg": "Bulgara",
     "cs": "Ĉeĥa",
     "de": "Germana",
     "el": "Greka",
-    "en": "Angla",
     "eo": "Esperanto",
     "es": "Hispana",
     "fr": "Franca",

lang/languages-es.json

@@ -1,17 +1,15 @@
 {
+    "en": "Inglés",
     "af": "Afrikáans",
     "bg": "Búlgaro",
     "ca": "Catalán",
     "cs": "Checo",
-    "da": "Danés",
     "de": "Alemán",
     "el": "Griego",
-    "en": "Inglés",
     "enGB": "Inglés (Reino Unido)",
     "eo": "Esperanto",
     "es": "Español",
     "esUS": "Español (América Latina)",
-    "et": "Estonio",
     "fi": "Finlandés",
     "fr": "Francés",
     "frCA": "Francés (Canadiense)",
@@ -32,5 +30,7 @@
     "tr": "Turco",
     "vi": "Vietnamita",
     "zhCN": "Chino (China)",
-    "zhTW": "Chino (Taiwán)"
+    "zhTW": "Chino (Taiwán)",
+    "et": "Estonio",
+    "da": "Danés"
 }

lang/languages-esUS.json

@@ -1,11 +1,11 @@
 {
+    "en": "Inglés",
     "af": "Africano",
     "bg": "Búlgaro",
     "ca": "Catalán",
     "cs": "Checo",
     "de": "Alemán",
     "el": "Griego",
-    "en": "Inglés",
     "enGB": "Inglés",
     "eo": "Esperanto",
     "es": "Español",

lang/languages-et.json

@@ -1,33 +1,33 @@
 {
-    "af": "Afrikaani keel",
-    "bg": "Bulgaaria keel",
-    "ca": "Katalaani keel",
-    "cs": "Tšehhi keel",
-    "de": "Saksa keel",
-    "el": "Kreeka keel",
-    "en": "Inglise keel",
-    "enGB": "Inglise keel (Ühendkuningriik)",
-    "eo": "Esperanto keel",
-    "es": "Hispaania keel",
-    "esUS": "Hispaania keel (Ladina-Ameerika)",
-    "et": "Eesti keel",
-    "fi": "Soome keel",
-    "fr": "Prantsuse keel",
-    "frCA": "Prantsuse keel (Kanada)",
-    "hr": "Horvaadi keel",
-    "hu": "Ungari keel",
-    "hy": "Armeenia keel",
-    "it": "Itaalia keel",
-    "ja": "Jaapani keel",
-    "ko": "Korea keel",
-    "nl": "Hollandi keel",
-    "oc": "Oksitaani keel",
-    "pl": "Poola keel",
-    "ptBR": "Portigali keel (Brasiilia)",
-    "ru": "Vene keel",
-    "sv": "Roosi keel",
-    "tr": "Türgi keel",
-    "vi": "Vietnami keel",
-    "zhCN": "Hiina keel (Hiina)",
-    "zhTW": "Hiina keel (Tai)"
+  "en": "Inglise keel",
+  "af": "Afrikaani keel",
+  "bg": "Bulgaaria keel",
+  "ca": "Katalaani keel",
+  "cs": "Tšehhi keel",
+  "de": "Saksa keel",
+  "el": "Kreeka keel",
+  "enGB": "Inglise keel (Ühendkuningriik)",
+  "eo": "Esperanto keel",
+  "es": "Hispaania keel",
+  "esUS": "Hispaania keel (Ladina-Ameerika)",
+  "et": "Eesti keel",
+  "fi": "Soome keel",
+  "fr": "Prantsuse keel",
+  "frCA": "Prantsuse keel (Kanada)",
+  "hr": "Horvaadi keel",
+  "hu": "Ungari keel",
+  "hy": "Armeenia keel",
+  "it": "Itaalia keel",
+  "ja": "Jaapani keel",
+  "ko": "Korea keel",
+  "nl": "Hollandi keel",
+  "oc": "Oksitaani keel",
+  "pl": "Poola keel",
+  "ptBR": "Portigali keel (Brasiilia)",
+  "ru": "Vene keel",
+  "sv": "Roosi keel",
+  "tr": "Türgi keel",
+  "vi": "Vietnami keel",
+  "zhCN": "Hiina keel (Hiina)",
+  "zhTW": "Hiina keel (Tai)"
 }

lang/languages-eu.json

@@ -1,4 +1,5 @@
 {
+    "en": "Ingelesa",
     "af": "Afrikaans",
     "bg": "Bulgariera",
     "ca": "Katalana",
@@ -6,7 +7,6 @@
     "da": "Daniera",
     "de": "Alemana",
     "el": "Greziera",
-    "en": "Ingelesa",
     "enGB": "Ingelesa (Erresuma Batua)",
     "eo": "Esperantoa",
     "es": "Gaztelania",

lang/languages-fa.json

@@ -1,4 +1,5 @@
 {
+    "en": "انگلیسی",
     "af": "آفریقایی",
     "ar": "عربی",
     "bg": "بلغاری",
@@ -7,18 +8,17 @@
     "da": "دانمارکی",
     "de": "آلمانی",
     "el": "یونانی",
-    "en": "انگلیسی",
     "enGB": "انگلیسی (انگلستان)",
     "eo": "اسپرانتو",
     "es": "اسپانیایی",
     "esUS": "اسپانیایی (آمریکا لاتین)",
     "et": "استونیایی",
     "eu": "باسکایی",
-    "fa": "فارسی",
     "fi": "فنلاندی",
     "fr": "فرانسوی",
     "frCA": "فرانسوی (کانادا)",
     "he": "عبری",
+    "mr":"مراتی",
     "hr": "کرواتی",
     "hu": "بلغاری",
     "hy": "ارمنی",
@@ -28,15 +28,15 @@
     "kab": "کابیلی",
     "ko": "کره ای",
     "lt": "لیتوانیایی",
-    "lv": "لتونیایی",
     "ml": "مالایایی",
-    "mr": "مراتی",
+    "lv": "لتونیایی",
     "nl": "هلندی",
     "oc": "اکسیتان(قدیمی)",
+    "fa": "فارسی",
     "pl": "لهستانی",
     "ptBR": "پرتغالی (برزیل)",
-    "ro": "رومانیایی",
     "ru": "روسی",
+    "ro": "رومانیایی",
     "sc": "ساردینی",
     "sk": "اسلواکیایی",
     "sl": "اسلوونیایی",

lang/languages-fi.json

@@ -1,29 +1,19 @@
 {
+    "en": "englanti",
     "af": "afrikaans",
     "az": "",
     "bg": "bulgaria",
-    "ca": "katalaani",
     "cs": "tšekki",
-    "da": "tanska",
     "de": "saksa",
     "el": "kreikka",
-    "en": "englanti",
-    "enGB": "englanti (Yhdistynyt kuningaskunta)",
     "eo": "esperanto",
     "es": "espanja",
-    "esUS": "espanja (Latinalainen Amerikka)",
-    "et": "viro",
-    "fi": "suomi",
     "fr": "ranska",
-    "frCA": "ranska (Kanada)",
-    "hr": "kroaatti",
-    "hu": "unkari",
     "hy": "armenia",
     "it": "italia",
     "ja": "japani",
     "ko": "korea",
     "nb": "",
-    "nl": "hollanti",
     "oc": "oksitaani",
     "pl": "puola",
     "ptBR": "portugali (Brasilia)",
@@ -34,5 +24,15 @@
     "tr": "turkki",
     "vi": "vietnam",
     "zhCN": "kiina (Kiina)",
-    "zhTW": "kiina (Taiwan)"
+    "zhTW": "kiina (Taiwan)",
+    "nl": "hollanti",
+    "hu": "unkari",
+    "hr": "kroaatti",
+    "frCA": "ranska (Kanada)",
+    "fi": "suomi",
+    "et": "viro",
+    "esUS": "espanja (Latinalainen Amerikka)",
+    "enGB": "englanti (Yhdistynyt kuningaskunta)",
+    "da": "tanska",
+    "ca": "katalaani"
 }

lang/languages-fr.json

@@ -1,17 +1,15 @@
 {
+    "en": "Anglais",
     "af": "Afrikaans",
     "bg": "Bulgare",
     "ca": "Catalan",
     "cs": "Tchèque",
-    "da": "Danois",
     "de": "Allemand",
     "el": "Grec",
-    "en": "Anglais",
     "enGB": "Anglais (Royaume-Uni)",
     "eo": "Espéranto",
     "es": "Espagnol",
     "esUS": "Espagnol (Amérique latine)",
-    "et": "Estonien",
     "fi": "Finnois",
     "fr": "Français",
     "frCA": "Français (Canada)",
@@ -31,5 +29,7 @@
     "tr": "Turc",
     "vi": "Vietnamien",
     "zhCN": "Chinois (Chine)",
-    "zhTW": "Chinois (Taiwan)"
+    "zhTW": "Chinois (Taiwan)",
+    "et": "Estonien",
+    "da": "Danois"
 }

lang/languages-frCA.json

@@ -1,17 +1,15 @@
 {
+    "en": "Anglais",
     "af": "Africain",
     "bg": "Bulgare",
     "ca": "Catalan",
     "cs": "Tchèque",
-    "da": "Danois",
     "de": "Allemand",
     "el": "Grec",
-    "en": "Anglais",
     "enGB": "Anglais (Royaume-Uni)",
     "eo": "Espéranto",
     "es": "Espagnol",
     "esUS": "Espagnol (Amérique latine)",
-    "et": "Estonien",
     "fi": "Finnois",
     "fr": "Français",
     "frCA": "Français (Canadien)",
@@ -31,5 +29,7 @@
     "tr": "Turc",
     "vi": "Vietnamien",
     "zhCN": "Chinois (Chine)",
-    "zhTW": "Chinois (Taiwan)"
+    "zhTW": "Chinois (Taiwan)",
+    "et": "Estonien",
+    "da": "Danois"
 }

lang/languages-fy.json

@@ -1,4 +1,5 @@
 {
+    "en": "",
     "af": "",
     "bg": "",
     "ca": "",
@@ -6,7 +7,6 @@
     "da": "",
     "de": "",
     "el": "",
-    "en": "",
     "enGB": "",
     "eo": "",
     "es": "",

lang/languages-gl.json

@@ -1,4 +1,5 @@
 {
+    "en": "Inglés",
     "af": "Afrikans",
     "ar": "Árabe",
     "bg": "Búlgaro",
@@ -7,7 +8,6 @@
     "da": "Dinamarqués",
     "de": "Alemán",
     "el": "Grego",
-    "en": "Inglés",
     "enGB": "Inglés (Reino Unido)",
     "eo": "Esperanto",
     "es": "Español",
@@ -18,6 +18,7 @@
     "fr": "Francés",
     "frCA": "Francés (Canadá)",
     "he": "Hebreo",
+    "mr":"Marathi",
     "hr": "Croata",
     "hu": "Húngaro",
     "hy": "Armenio",
@@ -27,15 +28,14 @@
     "kab": "Cabila",
     "ko": "Coreano",
     "lt": "Lituano",
-    "lv": "Letón",
     "ml": "Malayalam",
-    "mr": "Marathi",
+    "lv": "Letón",
     "nl": "Holandés",
     "oc": "Occitano",
     "pl": "Polaco",
     "ptBR": "Portugués (Brasil)",
-    "ro": "Romanés",
     "ru": "Ruso",
+    "ro": "Romanés",
     "sc": "Sardo",
     "sk": "Eslovaco",
     "sl": "Esloveno",

lang/languages-he.json

@@ -1,4 +1,5 @@
 {
+    "en": "אנגלית",
     "af": "אפריקאית",
     "bg": "בולגרית",
     "ca": "קטלנית",
@@ -6,7 +7,6 @@
     "da": "דנית",
     "de": "גרמנית",
     "el": "יוונית",
-    "en": "אנגלית",
     "enGB": "אנגלית (בריטניה)",
     "eo": "אספרנטו",
     "es": "ספרדית",

lang/languages-hi.json

@@ -1,4 +1,9 @@
 {
+    "en": "अंग्रेज़ी",
+	"hi": "हिन्दी",
+	"mr":"मराठी",
+	"ml": "मलयालम",
+	"enGB": "अंग्रेज़ी (UK)",
     "af": "Afrikaans",
     "ar": "Arabic",
     "bg": "Bulgarian",
@@ -7,19 +12,15 @@
     "da": "Danish",
     "de": "German",
     "el": "Greek",
-    "en": "अंग्रेज़ी",
-    "enGB": "अंग्रेज़ी (UK)",
     "eo": "Esperanto",
     "es": "Spanish",
     "esUS": "Spanish (Latin America)",
     "et": "Estonian",
     "eu": "Basque",
-    "fa": "Persian",
     "fi": "Finnish",
     "fr": "French",
     "frCA": "French (Canadian)",
-    "he": "Hebrew",
-    "hi": "हिन्दी",
+    "he": "Hebrew", 
     "hr": "Croatian",
     "hu": "Hungarian",
     "hy": "Armenian",
@@ -30,15 +31,14 @@
     "ko": "Korean",
     "lt": "Lithuanian",
     "lv": "Latvian",
-    "ml": "मलयालम",
-    "mr": "मराठी",
     "nl": "Dutch",
     "oc": "Occitan",
+    "fa": "Persian",
     "pl": "Polish",
     "pt": "Portuguese",
     "ptBR": "Portuguese (Brazil)",
-    "ro": "Romanian",
     "ru": "Russian",
+    "ro": "Romanian",
     "sc": "Sardinian",
     "sk": "Slovak",
     "sl": "Slovenian",

lang/languages-hr.json

@@ -1,11 +1,11 @@
 {
+    "en": "Engleski",
     "af": "Afrikanski",
     "az": "Ažerbejdžanski",
     "bg": "Bugarski",
     "cs": "Češki",
     "de": "Njemački",
     "el": "Grčki",
-    "en": "Engleski",
     "eo": "Esperanto",
     "es": "Španjolski",
     "fr": "Francuski",
@@ -25,4 +25,4 @@
     "tr": "Turski",
     "vi": "Vijetnamski",
     "zhCN": "Kineski (Kina)"
-}
+}

lang/languages-hu.json

@@ -1,17 +1,15 @@
 {
+    "en": "Angol",
     "af": "Afrikaans",
     "bg": "Bolgár",
     "ca": "Katalán",
     "cs": "Cseh",
-    "da": "Dán",
     "de": "Német",
     "el": "Görög",
-    "en": "Angol",
     "enGB": "Angol (Egyesült Királyság)",
     "eo": "Eszperantó",
     "es": "Spanyol",
     "esUS": "Spanyol (Latin-Amerika)",
-    "et": "Észt",
     "fi": "Finn",
     "fr": "Francia",
     "frCA": "Francia (kanadai)",
@@ -31,5 +29,7 @@
     "tr": "Török",
     "vi": "Vietnámi",
     "zhCN": "Kínai (Kína)",
-    "zhTW": "Kínai (Tajvan)"
+    "zhTW": "Kínai (Tajvan)",
+    "et": "Észt",
+    "da": "Dán"
 }

lang/languages-hy.json

@@ -1,11 +1,11 @@
 {
+    "en": "Անգլերեն",
     "af": "",
     "az": "",
     "bg": "Բուլղարերեն",
     "cs": "",
     "de": "Գերմաներեն ",
     "el": "",
-    "en": "Անգլերեն",
     "eo": "Էսպերանտո",
     "es": "Իսպաներեն",
     "fr": "Ֆրանսերեն",
@@ -24,4 +24,4 @@
     "tr": "Թուրքերեն",
     "vi": "",
     "zhCN": "Չիներեն"
-}
+}

lang/languages-id.json

@@ -1,4 +1,5 @@
 {
+    "en": "Bahasa Inggris - US",
     "af": "Bahasa Afrika",
     "bg": "Bahasa Bulgaria",
     "ca": "Bahasa Katalan",
@@ -6,7 +7,6 @@
     "da": "Bahasa Denmark",
     "de": "Bahasa Jerman",
     "el": "Bahasa Yunani",
-    "en": "Bahasa Inggris - US",
     "enGB": "Bahasa Inggris - UK",
     "eo": "Esperanto",
     "es": "Bahasa Spanyol",

lang/languages-is.json

@@ -1,4 +1,5 @@
 {
+    "en": "Enska",
     "af": "Afríkanska",
     "bg": "Búlgarska",
     "ca": "Katalónska",
@@ -6,7 +7,6 @@
     "da": "Danska",
     "de": "Þýska",
     "el": "Gríska",
-    "en": "Enska",
     "enGB": "Enska (Bretland)",
     "eo": "Esperantó",
     "es": "Spænska",

lang/languages-it.json

@@ -1,4 +1,5 @@
 {
+    "en": "Inglese",
     "af": "Afrikaans",
     "az": "Azero",
     "bg": "Bulgaro",
@@ -7,7 +8,6 @@
     "da": "Danese",
     "de": "Tedesco",
     "el": "Greco",
-    "en": "Inglese",
     "enGB": "Inglese (Regno Unito)",
     "eo": "Esperanto",
     "es": "Spagnolo",
@@ -18,6 +18,7 @@
     "fr": "Francese",
     "frCA": "Francese (Canada)",
     "he": "Ebraico",
+    "mr": "Marathi",
     "hr": "Croato",
     "hu": "Ungaro",
     "hy": "Armeno",
@@ -27,20 +28,19 @@
     "kab": "Kabyle",
     "ko": "Coreano",
     "lt": "Lituano",
-    "lv": "Lettone",
     "ml": "Malese",
-    "mr": "Marathi",
+    "lv": "Lettone",
     "nl": "Olandese",
     "oc": "Occitano",
     "pl": "Polacco",
     "ptBR": "Portoghese (Brasile)",
-    "ro": "Rumeno",
-    "ru": "Russo",
+    "ru": "Russo",    
+    "ro": "Rumeno",    
     "sc": "Sardo",
     "sk": "Slovacco",
-    "sl": "Sloveno",
+    "sl": "Sloveno",    
     "sr": "Serbo",
-    "sv": "Svedese",
+    "sv": "Svedese",    
     "th": "Tailandese",
     "tr": "Turco",
     "uk": "Ucraino",

lang/languages-ja.json

@@ -1,4 +1,5 @@
 {
+    "en": "英語",
     "af": "アフリカーンス語",
     "ar": "アラビア語",
     "bg": "ブルガリア語",
@@ -7,19 +8,17 @@
     "da": "デンマーク語",
     "de": "ドイツ語",
     "el": "ギリシア語",
-    "en": "英語",
     "enGB": "英語 (英国)",
     "eo": "エスペラント語",
     "es": "スペイン語",
     "esUS": "スペイン語 (ラテンアメリカ)",
     "et": "エストニア語",
     "eu": "バスク語",
-    "fa": "ペルシア語",
     "fi": "フィンランド語",
     "fr": "フランス語",
     "frCA": "フランス語 (カナダ)",
     "he": "ヘブライ語",
-    "hi": "ヒンディー語",
+    "mr": "マラーティー語",
     "hr": "クロアチア語",
     "hu": "ハンガリー語",
     "hy": "アルメニア語",
@@ -29,23 +28,17 @@
     "kab": "カビル語",
     "ko": "韓国語",
     "lt": "リトアニア語",
-    "lv": "ラトビア語",
-    "ml": "マラヤーラム語",
-    "mr": "マラーティー語",
     "nl": "オランダ語",
     "oc": "オック語",
     "pl": "ポーランド語",
-    "pt": "ポルトガル語",
     "ptBR": "ポルトガル語 (ブラジル)",
-    "ro": "ルーマニア語",
     "ru": "ロシア語",
+    "ro": "ルーマニア語",
     "sc": "サルデーニャ語",
     "sk": "スロバキア語",
     "sl": "スロベニア語",
-    "sq": "アルバニア語",
     "sr": "セルビア語",
     "sv": "スウェーデン語",
-    "te": "テルグ語",
     "th": "タイ語",
     "tr": "トルコ語",
     "uk": "ウクライナ語",

lang/languages-ka.json

@@ -1,17 +1,15 @@
 {
+    "en": "ინგლისური",
     "af": "აფრიკული",
     "bg": "ბულგარული",
     "ca": "კატალონიური",
     "cs": "ჩეხური",
-    "da": "დანიური",
     "de": "გერმანული",
     "el": "ბერძნული",
-    "en": "ინგლისური",
     "enGB": "ინგლისური (დიდი ბრიტანეთი)",
     "eo": "ესტონური",
     "es": "ესპანური",
     "esUS": "ესპანური (ლათინური ამერიკა)",
-    "et": "ესტონური",
     "fi": "ფინური",
     "fr": "ფრანგული",
     "frCA": "ფრანგული (კანადური)",
@@ -32,5 +30,7 @@
     "tr": "თურქული",
     "vi": "ვიეტნამური",
     "zhCN": "ჩინური (ჩინეთი)",
-    "zhTW": "ჩინური (ტაივანი)"
+    "zhTW": "ჩინური (ტაივანი)",
+    "et": "ესტონური",
+    "da": "დანიური"
 }

lang/languages-kab.json

@@ -1,57 +1,57 @@
 {
+    "en": "Taglizit",
     "af": "Tafrikant",
-    "ar": "Taɛrabt",
     "az": "Tazirit",
     "bg": "Tabulgarit",
-    "ca": "Takaṭalant",
     "cs": "Taččikit",
-    "da": "Tadanit",
     "de": "Talmanit",
     "el": "Tagrigit",
-    "en": "Taglizit",
-    "enGB": "Tagnizit (Tagldit i ddukklen)",
     "eo": "Taspiṛantit",
     "es": "Taspanit",
-    "esUS": "Taspanit (Temrikt Talatinit)",
-    "et": "Tastunit",
-    "eu": "Tabaskit",
-    "fa": "Tafarisit",
-    "fi": "Tafinit",
     "fr": "Tafransist",
-    "frCA": "Tafṛansist (Kanada)",
-    "he": "Taɛbrit",
-    "hi": "Tahindit",
-    "hr": "Takrwasit",
-    "hu": "Tahungrit",
     "hy": "Tarminit",
-    "id": "Tandunizit",
     "it": "Taṭalyant",
     "ja": "Tajapunit",
-    "kab": "Taqbaylit",
     "ko": "Takurit",
-    "lt": "Taliṭwanit",
-    "lv": "Talatviant",
-    "ml": "Tamalayalamt",
-    "mr": "Tamratit",
+    "kab": "Taqbaylit",
     "nb": "Tanurvijit Bukmal",
-    "nl": "Tahulandit",
     "oc": "Tuksitant",
     "pl": "Tapulunit",
-    "pt": "Taportugit",
     "ptBR": "Tapurtugit (Brazil)",
-    "ro": "Tarumanit",
     "ru": "Tarusit",
-    "sc": "Tasardit",
     "sk": "Tasluvakit",
     "sl": "Tasluvinit",
-    "sq": "Talbanit",
-    "sr": "Taserbit",
     "sv": "Taswidit",
-    "te": "Tatelugut",
-    "th": "Tayland",
     "tr": "Taṭurkit",
-    "uk": "Tukranit",
     "vi": "Tavyitnamit",
     "zhCN": "Tavyitnamit",
-    "zhTW": "Tacinwat (Taiwan)"
+    "ro": "Tarumanit",
+    "ar": "Taɛrabt",
+    "zhTW": "Tacinwat (Taiwan)",
+    "uk": "Tukranit",
+    "th": "Tayland",
+    "sc": "Tasardit",
+    "nl": "Tahulandit",
+    "lt": "Taliṭwanit",
+    "id": "Tandunizit",
+    "hu": "Tahungrit",
+    "hr": "Takrwasit",
+    "he": "Taɛbrit",
+    "frCA": "Tafṛansist (Kanada)",
+    "fi": "Tafinit",
+    "eu": "Tabaskit",
+    "et": "Tastunit",
+    "esUS": "Taspanit (Temrikt Talatinit)",
+    "enGB": "Tagnizit (Tagldit i ddukklen)",
+    "da": "Tadanit",
+    "ca": "Takaṭalant",
+    "mr": "Tamratit",
+    "ml": "Tamalayalamt",
+    "lv": "Talatviant",
+    "fa": "Tafarisit",
+    "pt": "Taportugit",
+    "sr": "Taserbit",
+    "sq": "Talbanit",
+    "hi": "Tahindit",
+    "te": "Tatelugut"
 }

lang/languages-km.json

@@ -1,11 +1,11 @@
 {
+    "en": "អង់គ្លេស",
     "af": "អាហ្វ្រិច",
     "az": "Azerbaijani",
     "bg": "ប៊ុលហ្គារី",
     "cs": "ឆេក",
     "de": "អាល្លឺម៉ង់",
     "el": "ក្រិក",
-    "en": "អង់គ្លេស",
     "eo": "Esperanto",
     "es": "អេស្ប៉ាញ",
     "fr": "បារាំង",
@@ -24,4 +24,4 @@
     "tr": "ទួរគី",
     "vi": "វៀតណាម",
     "zhCN": "ចិន (ចិន)"
-}
+}

lang/languages-ko.json

@@ -1,25 +1,25 @@
 {
+    "en": "영어",
     "af": "아프리칸스어",
     "ar": "아랍어",
     "az": "아제르바이잔어",
     "bg": "불가리어",
     "ca": "카탈루냐어",
-    "cs": "체코어",
+    "cs": "체코어",    
     "da": "덴마크어",
     "de": "독일어",
     "el": "그리스어",
-    "en": "영어",
     "enGB": "영어(영국)",
     "eo": "에스페란토어",
     "es": "스페인어",
     "esUS": "스페인어(라틴 아메리카)",
     "et": "에스토니아어",
     "eu": "바스크어",
-    "fa": "페르시아어",
     "fi": "핀란드어",
     "fr": "프랑스어",
     "frCA": "프랑스어(캐나다)",
     "he": "히브리어",
+    "mr":"마라티어",
     "hr": "크로아티아어",
     "hu": "헝가리어",
     "hy": "아르메니아어",
@@ -29,15 +29,15 @@
     "kab": "커바일어",
     "ko": "한국어",
     "lt": "리투아니아어",
-    "lv": "라트비아어",
     "ml": "말라얄람어",
-    "mr": "마라티어",
+    "lv": "라트비아어",
     "nl": "네덜란드어",
     "oc": "오크어",
+    "fa": "페르시아어",
     "pl": "폴란드어",
     "ptBR": "포르투갈어(브라질)",
-    "ro": "루마니아어",
     "ru": "러시아어",
+    "ro": "루마니아어",
     "sc": "사르데냐어",
     "sk": "슬로바키아어",
     "sl": "슬로베니아어",

lang/languages-lt.json

@@ -1,4 +1,5 @@
 {
+    "en": "Anglų",
     "af": "Afrikanų",
     "bg": "Bulgarų",
     "ca": "Katalanų",
@@ -6,7 +7,6 @@
     "da": "Danų",
     "de": "Vokiečių",
     "el": "Graikų",
-    "en": "Anglų",
     "enGB": "Anglų (Britų)",
     "eo": "Esperanto",
     "es": "Ispanų",
@@ -20,8 +20,8 @@
     "hy": "Armėnų",
     "it": "Italų",
     "ja": "Japonų",
-    "ko": "Korėjiečių",
     "lt": "Lietuvių",
+    "ko": "Korėjiečių",
     "nl": "Olandų",
     "oc": "Oksitanų",
     "pl": "Lenkų",

lang/languages-lv.json

@@ -1,11 +1,11 @@
 {
+    "en": "angļu",
     "af": "āfrikāņu",
     "bg": "bulgāru",
     "ca": "kataloniešu",
     "cs": "čehu",
     "de": "vācu",
     "el": "grieķu",
-    "en": "angļu",
     "enGB": "angļu (Lielbritānija)",
     "eo": "esperanto",
     "es": "spāņu",

lang/languages-mn.json

@@ -1,4 +1,5 @@
 {
+    "en": "English",
     "af": "Afrikaans",
     "bg": "Bulgarian",
     "ca": "Catalan",
@@ -6,7 +7,6 @@
     "da": "Danish",
     "de": "German",
     "el": "Greek",
-    "en": "English",
     "enGB": "English (United Kingdom)",
     "eo": "Esperanto",
     "es": "Spanish",
@@ -21,7 +21,6 @@
     "it": "Italian",
     "ja": "Japanese",
     "ko": "Korean",
-    "mn": "Монгол",
     "nl": "Dutch",
     "oc": "Occitan",
     "pl": "Polish",
@@ -31,5 +30,6 @@
     "tr": "Turkish",
     "vi": "Vietnamese",
     "zhCN": "Chinese (China)",
-    "zhTW": "Chinese (Taiwan)"
+    "zhTW": "Chinese (Taiwan)",
+    "mn": "Монгол"
 }