chore(rnsdk, version): bump to 1.0.0

refactor(rnsdk): remove redundant audio and video actions (#14066 )
* refactor(rnsdk): remove redundant audio and video actions
2026-01-02 21:02:28 +00:00 · 2023-11-17 13:00:58 +02:00 · 2023-11-17 12:27:56 +02:00 · 2023-11-16 12:57:28 +02:00 · 2023-11-16 12:57:00 +02:00 · 2023-11-15 16:33:39 +02:00
1399 changed files with 36522 additions and 74704 deletions
--- a/.buckconfig
+++ b/.buckconfig
@@ -0,0 +1,6 @@
+
+[android]
+  target = Google Inc.:Google APIs:23
+
+[maven_repositories]
+  central = https://repo1.maven.org/maven2
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
  "image": "mcr.microsoft.com/devcontainers/universal:2",
  "features": {
    "ghcr.io/devcontainers/features/node:1": {
-      "version": "20"
+      "version": "16"
    }
  },
  "hostRequirements": {
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,7 +6,7 @@ charset = utf-8
 end_of_line = lf
 indent_size = 4
 indent_style = space
-max_line_length = 120
+max_line_length = 80
 trim_trailing_whitespace = true

 [*.md]
--- a/.eslintignore
+++ b/.eslintignore
@@ -17,8 +17,3 @@ react/features/face-landmarks/resources/*

 # Not worth it.
 actionTypes.ts
-
-# It's not complete until all files are copied at build time.
-react-native-sdk/
-
-*.d.ts
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,5 +1,6 @@
 module.exports = {
-    extends: [
+    'extends': [
        '@jitsi/eslint-config'
-    ]
+    ],
+    'ignorePatterns': [ '*.d.ts' ]
 };
--- a/.github/ISSUE_TEMPLATE/1-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md
@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+<!--
+
+This issue tracker is only for reporting bugs and tracking issues related to the source code.
+
+Before posting, please make sure to check if the same or similar bugs have already been discussed: https://github.com/jitsi/jitsi-meet/issues
+
+General questions regarding usage, installation, etc. should be posted at https://community.jitsi.org. They will be closed if posted here.
+
+-->
+
+### Description:
+
+<!-- Please describe the bug clearly and concisely. -->
+
+### Steps to reproduce:
+
+1. <!-- Open '...' -->
+2. <!-- Click on '...' -->
+3. <!-- and so on... -->
+
+### Expected behavior:
+
+<!-- Please describe what should happen. -->
+
+### Actual behavior:
+
+<!-- Please describe what actually happens. -->
+<!-- Please attach screenshot if possible. -->
+
+### Server information:
+
+- Jitsi Meet version:
+- Operating System:
+
+### Client information:
+
+- Browser / app version:
+- Operating System:
+
+### Additional information:
+
+<!-- Please provide additional information about the bug, if any. -->
--- a/.github/ISSUE_TEMPLATE/1-bug.yml
+++ b/.github/ISSUE_TEMPLATE/1-bug.yml
@@ -1,53 +0,0 @@
-name: Bug report
-description: File a bug report and help us improve
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This issue tracker is only for reporting bugs and tracking issues related to the source code.
-
-        **Before posting, please make sure to check if the same or similar bugs have already been reported.**
-
-        ⚠️ General questions regarding usage, installation, etc. should be posted in our [community forum](https://community.jitsi.org).
-  - type: textarea
-    attributes:
-      label: What happened?
-      description: Please describe the problem. Be as detailed as possible.
-    validations:
-      required: true
-  - type: checkboxes
-    attributes:
-      label: Platform
-      description: On what platforms can you reproduce the problem?
-      options:
-        - label: Chrome (or Chromium based)
-        - label: Firefox
-        - label: Safari
-        - label: Other desktop browser
-        - label: Android browser
-        - label: iOS browser
-        - label: Electron app
-        - label: Android mobile app
-        - label: iOS mobile app
-        - label: Custom app using a mobile SDK
-  - type: input
-    attributes:
-      label: Browser / app / sdk version
-      description: Please provide the version of the browser / app / sdk where the problem manifests.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. The browser console JS logs (if applicable) is a good start. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-  - type: checkboxes
-    attributes:
-      label: Reproducibility
-      description: Does the problem reproduce on meet.jit.si using Chrome, Firefox or the official mobile apps?
-      options:
-        - label: The problem is reproducible on meet.jit.si
-  - type: textarea
-    attributes:
-      label: More details?
-      description: Please provide more details in case they apply (such as the Jitsi Meet version you are running, if you are hosting your own server).
--- a/.github/ISSUE_TEMPLATE/2-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/2-feature-request.md
@@ -0,0 +1,25 @@
+---
+name: "Feature request"
+about: Suggest an idea for this project
+title: ''
+labels: 'feature-request'
+assignees: ''
+---
+
+<!--
+Thank you for suggesting an idea to make Jitsi Meet better.
+
+Please fill in as much of the template below as you're able.
+
+Note that the ultimate decision for implementing features lies on the Jitsi team, not all feature requests shall be accepted.
+-->
+
+**Is your feature request related to a problem you are facing?**
+Please describe the problem you are trying to solve.
+
+**Describe the solution you'd like**
+Please describe the desired behavior.
+
+**Describe alternatives you've considered**
+Please describe alternative solutions or features you have considered.
+
--- a/.github/ISSUE_TEMPLATE/2-feature.yml
+++ b/.github/ISSUE_TEMPLATE/2-feature.yml
@@ -1,22 +0,0 @@
-name: Feature request
-description: Suggest an idea for Jitsi Meet
-labels: ["feature-request"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for suggesting an idea to make Jitsi Meet better.
-
-        **Note**: the ultimate decision for implementing features lies on the Jitsi team, not all feature requests shall be accepted.
-  - type: textarea
-    attributes:
-      label: What problem are you trying to solve?
-      description: Tell us what problem your feature request would solve.
-  - type: textarea
-    attributes:
-      label: What solution would you like to see?
-      description: Please describe the desired behavior or feature.
-  - type: textarea
-    attributes:
-      label: Is there an alternative?
-      description: Please describe alternative solutions or features you have considered.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Need help with your Jitsi Meet installation?
+  - name: Need help with Jitsi Meet?
    url: https://community.jitsi.org
-    about: Please ask it in our community forum.
+    about: Please ask it in our community.
--- a/.github/workflows/ci-lua.yml
+++ b/.github/workflows/ci-lua.yml
@@ -7,7 +7,7 @@ jobs:
    name: Luacheck
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3

    - name: Install luarocks
      run: sudo apt-get --install-recommends -y install luarocks
@@ -17,8 +17,7 @@ jobs:

    - name: Check lua codes
      run: |
-        set -o pipefail && luacheck . \
-        --exclude-files=resources/prosody-plugins/mod_firewall/mod_firewall.lua | awk -F: '
+        set -o pipefail && luacheck . | awk -F: '
          {
            print $0
            printf "::warning file=%s,line=%s,col=%s::%s\n", $1, $2, $3, $4
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,18 +7,14 @@ jobs:
    name: Lint
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
      with:
-        node-version-file: '.nvmrc'
+        node-version: 16
        cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
    - name: Get changed files
      id: changed-files
-      uses: jitsi/changed-files@main
+      uses: tj-actions/changed-files@v35
    - name: Get changed lang files
      id: lang-files
      run: echo "all=$(echo "${{ steps.changed-files.outputs.all_changed_files }}" | grep -oE 'lang\/\S+' | tr '\n' ' ')" >> "$GITHUB_OUTPUT"
@@ -34,152 +30,47 @@ jobs:
    - name: Check if the git repository is clean
      run: $(exit $(git status --porcelain --untracked-files=no | head -255 | wc -l)) || (echo "Dirty git tree"; git diff; exit 1)
    - run: npm run lint:ci && npm run tsc:ci
-  frontend:
-    name: Build Frontend
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, ubuntu-latest]
+  linux-build:
+    name: Build Frontend (Linux)
+    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
      with:
-        node-version-file: '.nvmrc'
+        node-version: 16
        cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
    - run: npm install
    - run: make
-    - name: Check config.js syntax
-      run: node config.js
-  android-rn-bundle-build:
-    name: Build mobile bundle (Android)
-    runs-on: macos-15
+  macos-ci:
+    name: Build Frontend (macOS)
+    runs-on: macOS-latest
    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
      with:
-        node-version-file: '.nvmrc'
+        node-version: 16
+        cache: 'npm'
+    - run: npm install
+    - run: make
+  android-build:
+    name: Build mobile bundle (Android)
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
        cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
    - run: npm install
    - run: npx react-native bundle --entry-file react/index.native.js --platform android --bundle-output /tmp/android.bundle --reset-cache
-  ios-rn-bundle-build:
+  ios-build:
    name: Build mobile bundle (iOS)
-    runs-on: macos-15
+    runs-on: macOS-latest
    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
      with:
-        node-version-file: '.nvmrc'
+        node-version: 16
        cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
    - run: npm install
-    - name: setup Xcode
-      run: |
-        uname -a
-        xcode-select -p
-        sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
-        xcodebuild -version
-    - name: setup-cocoapods
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.4'
-        bundler-cache: true
-    - run: npx react-native info
-    - name: Install Pods
-      working-directory: ./ios
-      run: bundle exec pod install --repo-update --deployment
    - run: npx react-native bundle --entry-file react/index.native.js --platform ios --bundle-output /tmp/ios.bundle --reset-cache
-  android-sdk-build:
-    name: Build mobile SDK (Android)
-    runs-on: ubuntu-latest
-    container: reactnativecommunity/react-native-android:v13.0
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
-    - run: npm install
-    - run: |
-        cd android
-        ./gradlew :sdk:clean
-        ./gradlew :sdk:assembleRelease
-  ios-sdk-build:
-    name: Build mobile SDK (iOS)
-    runs-on: macos-15
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
-    - run: npm install
-    - name: setup Xcode
-      run: |
-        uname -a
-        xcode-select -p
-        sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
-        xcodebuild -version
-    - name: setup-cocoapods
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.4'
-        bundler-cache: true
-    - run: npx react-native info
-    - name: Install Pods
-      working-directory: ./ios
-      run: bundle exec pod install --repo-update --deployment
-    - run: |
-        xcodebuild clean \
-          -workspace ios/jitsi-meet.xcworkspace \
-          -scheme JitsiMeetSDK
-        xcodebuild archive \
-          -workspace ios/jitsi-meet.xcworkspace \
-          -scheme JitsiMeetSDK  \
-          -configuration Release \
-          -sdk iphoneos \
-          -destination='generic/platform=iOS' \
-          -archivePath ios/sdk/out/ios-device \
-          SKIP_INSTALL=NO \
-          BUILD_LIBRARY_FOR_DISTRIBUTION=YES
-        xcodebuild -create-xcframework \
-          -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
-          -output ios/sdk/out/JitsiMeetSDK.xcframework
-    - run: ls -lR ios/sdk/out
-  debian-build:
-    name: Test Debian packages build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
-    - run: npm install
-    - run: make
-    - run: sudo apt-get install -y debhelper
-    - run: dpkg-buildpackage -A -rfakeroot -us -uc -d
-    - run: make source-package
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,6 @@ DerivedData
 *.dSYM.zip
 *.xcuserstate
 project.xcworkspace
-**/.xcode.env.local

 # Android/IntelliJ
 #
@@ -62,7 +61,6 @@ buck-out/

 # fastlane
 #
-.bundle/
 **/fastlane/report.xml
 **/fastlane/Preview.html
 **/fastlane/test_output
@@ -101,8 +99,8 @@ tsconfig.json
 #
 react-native-sdk/*.tgz
 react-native-sdk/android/src
-!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetReactNativePackage.java
 !react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
+!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetReactNativePackage.java
 !react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JMOngoingConferenceModule.java
 !react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/RNOngoingNotification.java
 react-native-sdk/images
@@ -113,8 +111,3 @@ react-native-sdk/node_modules
 react-native-sdk/react
 react-native-sdk/service
 react-native-sdk/sounds
-
-# tests
-tests/.env
-test-results
-
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22
+16
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,6 @@
+osx_image: xcode11.1
+language: objective-c
+script:
+- "./ios/travis-ci/build-ipa.sh"
+after_script:
+  - sleep 10
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,20 +1,171 @@
-# Follow Our Updated Guide to See How You Can Contribute
+# How to contribute
+We would love to have your help. Before you start working however, please read
+and follow this short guide.

-**Hello there! 👋**
+# Reporting Issues
+Provide as much information as possible. Mention the version of Jitsi Meet,
+Jicofo and JVB you are using, and explain (as detailed as you can) how the
+problem can be reproduced.

-We're thrilled that you're eager to contribute to **Jitsi Meet! ❤️** 
+# Code contributions
+Found a bug and know how to fix it? Great! Please read on.

-Your interest in improving our platform means a lot to us. To ensure your contributions align seamlessly with our goals and processes, we've recently updated our guide. This guide will provide you with clear instructions on how to get involved effectively.
+## Contributor License Agreement
+While the Jitsi projects are released under the
+[Apache License 2.0](https://github.com/jitsi/jitsi-meet/blob/master/LICENSE), the copyright
+holder and principal creator is [8x8](https://www.8x8.com/). To
+ensure that we can continue making these projects available under an Open Source license,
+we need you to sign our Apache-based contributor
+license agreement as either a [corporation](https://jitsi.org/ccla) or an
+[individual](https://jitsi.org/icla). If you cannot accept the terms laid out
+in the agreement, unfortunately, we cannot accept your contribution.

-### 📖 Get Started
+## Creating Pull Requests
+- Make sure your code passes the linter rules beforehand. The linter is executed
+  automatically when committing code.
+- Perform **one** logical change per pull request.
+- Maintain a clean list of commits, squash them if necessary.
+- Rebase your topic branch on top of the master branch before creating the pull
+ request.

-Ready to get started? Head over to our [Jitsi Meet Handbook](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-contributing/) and let's make **Jitsi Meet** even better together!
+## Coding style

-### 💬 Join the Discussion
+### Comments

-Have questions or need help? Join our community discussions on the [Jitsi Forum](https://community.jitsi.org/) where contributors and maintainers can assist you.
+* Comments documenting the source code are required.

-### ❗️Additional Note
-Before sending us your code, double-check that it meets our coding standards. You can do this by running a command: `npm run lint`. If there are any issues, don't worry! You can fix them by running: `npm run lint-fix`. Once your code passes these checks, feel free to submit your pull request.
+  * Comments from which documentation is automatically generated are **not**
+    subject to case-by-case decisions. Such comments are used, for example, on
+    types and their members. Examples of tools which automatically generate
+    documentation from such comments include JSDoc, Javadoc, Doxygen.

-**Happy coding!**
+  * Comments which are not automatically processed are strongly encouraged. They
+    are subject to case-by-case decisions. Such comments are often observed in
+    function bodies.
+
+* Comments should be formatted as proper English sentences. Such formatting pays
+  attention to, for example, capitalization and punctuation.
+
+### Duplication
+
+* Don't copy-paste source code. Reuse it.
+
+### Formatting
+
+* Line length is limited to 120 characters.
+
+* Sort by alphabetical order in order to make the addition of new entities as
+  easy as looking a word up in a dictionary. Otherwise, one risks duplicate
+  entries (with conflicting values in the cases of key-value pairs). For
+  example:
+
+  * Within an `import` of multiple names from a module, sort the names in
+    alphabetical order. (Of course, the default name stays first as required by
+    the `import` syntax.)
+
+    ````javascript
+    import {
+        DOMINANT_SPEAKER_CHANGED,
+        JITSI_CLIENT_CONNECTED,
+        JITSI_CLIENT_CREATED,
+        JITSI_CLIENT_DISCONNECTED,
+        JITSI_CLIENT_ERROR,
+        JITSI_CONFERENCE_JOINED,
+        MODERATOR_CHANGED,
+        PEER_JOINED,
+        PEER_LEFT,
+        RTC_ERROR
+    } from './actionTypes';
+    ````
+
+  * Within a group of imports (e.g. groups of imports delimited by an empty line
+    may be: third-party modules, then project modules, and eventually the
+    private files of a module), sort the module names in alphabetical order.
+
+    ````javascript
+    import React, { Component } from 'react';
+    import { connect } from 'react-redux';
+    ````
+
+### Indentation
+
+* Align `switch` and `case`/`default`. Don't indent the `case`/`default` more
+  than its `switch`.
+
+  ````javascript
+  switch (i) {
+  case 0:
+      ...
+      break;
+  default:
+      ...
+  }
+  ````
+
+### Naming
+
+* An abstraction should have one name within the project and across multiple
+  projects. For example:
+
+  * The instance of lib-jitsi-meet's `JitsiConnection` type should be named
+    `connection` or `jitsiConnection` in jitsi-meet, not `client`.
+
+  * The class `ReducerRegistry` should be defined in ReducerRegistry.js and its
+    imports in other files should use the same name. Don't define the class
+    `Registry` in ReducerRegistry.js and then import it as `Reducers` in other
+    files.
+
+* The names of global constants (including ES6 module-global constants) should
+  be written in uppercase with underscores to separate words. For example,
+  `BACKGROUND_COLOR`.
+
+* The underscore character at the beginning of a name signals that the
+  respective variable, function, property is non-public i.e. private, protected,
+  or internal. In contrast, the lack of an underscore at the beginning of a name
+  signals public API.
+
+### Feature layout
+
+When adding a new feature, this would be the usual layout.
+
+```
+react/features/sample/
+├── actionTypes.ts
+├── actions.js
+├── components
+│   ├── AnotherComponent.js
+│   ├── OneComponent.js
+│   └── index.js
+├── middleware.js
+└── reducer.js
+```
+
+The middleware must be imported in `react/features/app/` specifically
+in `middlewares.any.ts`, `middlewares.native.ts` or `middlewares.web.ts` where appropriate.
+Likewise for the reducer.
+
+An `index.js` file must not be provided for exporting actions, action types and
+component. Features / files requiring those must import them explicitly.
+
+This has not always been the case and the entire codebase hasn't been migrated to
+this model but new features should follow this new layout.
+
+When working on an old feature, adding the necessary changes to migrate to the new
+model is encouraged.
+
+
+### Avoiding bundle bloat
+
+When adding a new feature it's possible that it triggers a build failure due to the increased bundle size. We have safeguards inplace to avoid bundles growing disproportionatelly. While there are legit reasons for increasing the limits, please analyze the bundle first to make sure no unintended dependencies have been included, causing the increase in size.
+
+First, make a production build with bundle-analysis enabled:
+
+```
+npx webpack -p --analyze-bundle
+```
+
+Then open the interactive bundle analyzer tool:
+
+```
+npx webpack-bundle-analyzer build/app-stats.json
+```
--- a/16
+++ b/16
@@ -1,16 +0,0 @@
-source "https://rubygems.org"
-
-ruby ">= 3.4.0"
-
-gem "cocoapods", "~> 1.16"
-
-# (Optional) Fastlane for automation
-gem "fastlane"
-gem "abbrev"
-gem "logger"
-gem "mutex_m"
-gem "csv"
-gem "bigdecimal"
-
-# (Optional) Bundler itself to ensure consistency
-gem "bundler"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,331 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
-    abbrev (0.1.2)
-    activesupport (7.2.2.1)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    algoliasearch (1.27.5)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
-    artifactory (3.0.17)
-    atomos (0.1.3)
-    aws-eventstream (1.3.1)
-    aws-partitions (1.1050.0)
-    aws-sdk-core (3.218.1)
-      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
-      aws-sigv4 (~> 1.9)
-      base64
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.98.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.181.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-    babosa (1.0.4)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    claide (1.1.0)
-    cocoapods (1.16.2)
-      addressable (~> 2.8)
-      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.16.2)
-      cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 2.1, < 3.0)
-      cocoapods-plugins (>= 1.0.0, < 2.0)
-      cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.6.0, < 2.0)
-      cocoapods-try (>= 1.1.0, < 2.0)
-      colored2 (~> 3.1)
-      escape (~> 0.0.4)
-      fourflusher (>= 2.3.0, < 3.0)
-      gh_inspector (~> 1.0)
-      molinillo (~> 0.8.0)
-      nap (~> 1.0)
-      ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.27.0, < 2.0)
-    cocoapods-core (1.16.2)
-      activesupport (>= 5.0, < 8)
-      addressable (~> 2.8)
-      algoliasearch (~> 1.0)
-      concurrent-ruby (~> 1.1)
-      fuzzy_match (~> 2.0.4)
-      nap (~> 1.0)
-      netrc (~> 0.11)
-      public_suffix (~> 4.0)
-      typhoeus (~> 1.0)
-    cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (2.1)
-    cocoapods-plugins (1.0.0)
-      nap
-    cocoapods-search (1.0.1)
-    cocoapods-trunk (1.6.0)
-      nap (>= 0.8, < 2.0)
-      netrc (~> 0.11)
-    cocoapods-try (1.2.0)
-    colored (1.2)
-    colored2 (3.1.2)
-    commander (4.6.0)
-      highline (~> 2.0.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
-    csv (3.3.2)
-    declarative (0.0.20)
-    digest-crc (0.7.0)
-      rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.6.20240107)
-    dotenv (2.8.1)
-    drb (2.2.1)
-    emoji_regex (3.2.3)
-    escape (0.0.4)
-    ethon (0.16.0)
-      ffi (>= 1.15.0)
-    excon (0.112.0)
-    faraday (1.10.4)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
-      faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.0)
-      multipart-post (~> 2.0)
-    faraday-net_http (1.0.2)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.1)
-      faraday (~> 1.0)
-    fastimage (2.4.0)
-    fastlane (2.226.0)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.8, < 3.0.0)
-      artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
-      babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored (~> 1.2)
-      commander (~> 4.6)
-      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 4.0)
-      excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 1.0)
-      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 1.0)
-      fastimage (>= 2.1.0, < 3.0.0)
-      fastlane-sirp (>= 1.0.0)
-      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-apis-androidpublisher_v3 (~> 0.3)
-      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-env (>= 1.6.0, < 2.0.0)
-      google-cloud-storage (~> 1.31)
-      highline (~> 2.0)
-      http-cookie (~> 1.0.5)
-      json (< 3.0.0)
-      jwt (>= 2.1.0, < 3)
-      mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (>= 2.0.0, < 3.0.0)
-      naturally (~> 2.2)
-      optparse (>= 0.1.1, < 1.0.0)
-      plist (>= 3.1.0, < 4.0.0)
-      rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.5)
-      simctl (~> 1.6.3)
-      terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (~> 3)
-      tty-screen (>= 0.6.3, < 1.0.0)
-      tty-spinner (>= 0.8.0, < 1.0.0)
-      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.4.0)
-      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-sirp (1.0.0)
-      sysrandom (~> 1.0)
-    ffi (1.17.1)
-    ffi (1.17.1-aarch64-linux-gnu)
-    ffi (1.17.1-aarch64-linux-musl)
-    ffi (1.17.1-arm-linux-gnu)
-    ffi (1.17.1-arm-linux-musl)
-    ffi (1.17.1-arm64-darwin)
-    ffi (1.17.1-x86-linux-gnu)
-    ffi (1.17.1-x86-linux-musl)
-    ffi (1.17.1-x86_64-darwin)
-    ffi (1.17.1-x86_64-linux-gnu)
-    ffi (1.17.1-x86_64-linux-musl)
-    fourflusher (2.3.1)
-    fuzzy_match (2.0.4)
-    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.54.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.3)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
-      mini_mime (~> 1.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
-      rexml
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.31.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.1)
-      google-cloud-env (>= 1.0, < 3.a)
-      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.4.0)
-    google-cloud-storage (1.47.0)
-      addressable (~> 2.8)
-      digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.31.0)
-      google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
-      mini_mime (~> 1.0)
-    googleauth (1.8.1)
-      faraday (>= 0.17.3, < 3.a)
-      jwt (>= 1.4, < 3.0)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (>= 0.16, < 2.a)
-    highline (2.0.3)
-    http-cookie (1.0.8)
-      domain_name (~> 0.5)
-    httpclient (2.8.3)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    jmespath (1.6.2)
-    json (2.10.1)
-    jwt (2.10.1)
-      base64
-    logger (1.6.6)
-    mini_magick (4.13.2)
-    mini_mime (1.1.5)
-    minitest (5.25.4)
-    molinillo (0.8.0)
-    multi_json (1.15.0)
-    multipart-post (2.4.1)
-    mutex_m (0.3.0)
-    nanaimo (0.4.0)
-    nap (1.1.0)
-    naturally (2.2.1)
-    netrc (0.11.0)
-    nkf (0.2.0)
-    optparse (0.6.0)
-    os (1.1.4)
-    plist (3.7.2)
-    public_suffix (4.0.7)
-    rake (13.2.1)
-    representable (3.2.0)
-      declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.4.1)
-    rouge (3.28.0)
-    ruby-macho (2.5.1)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.4.1)
-    securerandom (0.4.1)
-    security (0.1.5)
-    signet (0.19.0)
-      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simctl (1.6.10)
-      CFPropertyList
-      naturally
-    sysrandom (1.0.5)
-    terminal-notifier (2.0.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    trailblazer-option (0.1.2)
-    tty-cursor (0.7.1)
-    tty-screen (0.8.2)
-    tty-spinner (0.9.3)
-      tty-cursor (~> 0.7)
-    typhoeus (1.4.1)
-      ethon (>= 0.9.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    uber (0.1.0)
-    unicode-display_width (2.6.0)
-    word_wrap (1.0.0)
-    xcodeproj (1.27.0)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.4.0)
-      rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.4.0)
-      rouge (~> 3.28.0)
-    xcpretty-travis-formatter (1.0.1)
-      xcpretty (~> 0.2, >= 0.0.7)
-
-PLATFORMS
-  aarch64-linux-gnu
-  aarch64-linux-musl
-  arm-linux-gnu
-  arm-linux-musl
-  arm64-darwin
-  ruby
-  x86-linux-gnu
-  x86-linux-musl
-  x86_64-darwin
-  x86_64-linux-gnu
-  x86_64-linux-musl
-
-DEPENDENCIES
-  abbrev
-  bigdecimal
-  bundler
-  cocoapods (~> 1.16)
-  csv
-  fastlane
-  logger
-  mutex_m
-
-RUBY VERSION
-   ruby 3.4.2p28
-
-BUNDLED WITH
-   2.6.3
--- a/21
+++ b/21
@@ -17,16 +17,16 @@ STYLES_BUNDLE = css/all.bundle.css
 STYLES_DESTINATION = css/all.css
 STYLES_MAIN = css/main.scss
 ifeq ($(OS),Windows_NT)
-	WEBPACK = .\node_modules\.bin\webpack --progress
-	WEBPACK_DEV_SERVER = .\node_modules\.bin\webpack serve --mode development --progress
+	WEBPACK = .\node_modules\.bin\webpack
+	WEBPACK_DEV_SERVER = .\node_modules\.bin\webpack serve --mode development
 else
-	WEBPACK = ./node_modules/.bin/webpack --progress
-	WEBPACK_DEV_SERVER = ./node_modules/.bin/webpack serve --mode development --progress
+	WEBPACK = ./node_modules/.bin/webpack
+	WEBPACK_DEV_SERVER = ./node_modules/.bin/webpack serve --mode development
 endif

-all: compile deploy
+all: compile deploy clean

-compile: clean
+compile:
 	NODE_OPTIONS=--max-old-space-size=8192 \
 	$(WEBPACK)

@@ -48,12 +48,13 @@ deploy-appbundle:
 		$(BUILD_DIR)/external_api.min.js.map \
 		$(BUILD_DIR)/alwaysontop.min.js \
 		$(BUILD_DIR)/alwaysontop.min.js.map \
+		$(OUTPUT_DIR)/analytics-ga.js \
+		$(BUILD_DIR)/analytics-ga.min.js \
+		$(BUILD_DIR)/analytics-ga.min.js.map \
 		$(BUILD_DIR)/face-landmarks-worker.min.js \
 		$(BUILD_DIR)/face-landmarks-worker.min.js.map \
 		$(BUILD_DIR)/noise-suppressor-worklet.min.js \
 		$(BUILD_DIR)/noise-suppressor-worklet.min.js.map \
-		$(BUILD_DIR)/screenshot-capture-worker.min.js \
-		$(BUILD_DIR)/screenshot-capture-worker.min.js.map \
 		$(DEPLOY_DIR)
 	cp \
 		$(BUILD_DIR)/close3.min.js \
@@ -120,9 +121,9 @@ deploy-local:
 dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-olm deploy-tf-wasm deploy-excalidraw-dev deploy-face-landmarks
 	$(WEBPACK_DEV_SERVER)

-source-package: compile deploy
+source-package:
 	mkdir -p source_package/jitsi-meet/css && \
-	cp -r *.js *.html resources/*.txt fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
+	cp -r *.js *.html resources/*.txt favicon.ico fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
 	cp css/all.css source_package/jitsi-meet/css && \
 	(cd source_package ; tar cjf ../jitsi-meet.tar.bz2 jitsi-meet) && \
 	rm -rf source_package
--- a/README.md
+++ b/README.md
@@ -27,14 +27,14 @@ And many more!

 ## Using Jitsi Meet

-Using Jitsi Meet is straightforward, as it's browser based. Head over to [meet.jit.si](https://meet.jit.si) and give it a try. It's scalable and free to use. All you need is a Google, Facebook or GitHub account in order to start a meeting. All browsers are supported!
+Using Jitsi Meet is straightforward, as it's browser based. Head over to [meet.jit.si](https://meet.jit.si) and give it a try. It's anonymous, scalable and free to use. All browsers are supported! 

 Using mobile? No problem, you can either use your mobile web browser or our fully-featured
 mobile apps:

 | Android | Android (F-Droid) | iOS |
 |:-:|:-:|:-:|
-| [<img src="resources/img/google-play-badge.png" height="50">](https://play.google.com/store/apps/details?id=org.jitsi.meet) | [<img src="resources/img/f-droid-badge.png" height="50">](https://f-droid.org/packages/org.jitsi.meet/) | [<img src="resources/img/appstore-badge.png" height="50">](https://itunes.apple.com/us/app/jitsi-meet/id1165103905) |
+| [<img src="resources/img/google-play-badge.png" height="50">](https://play.google.com/store/apps/details?id=org.jitsi.meet) | [<img src="resources/img/f-droid-badge.png" height="50">](https://f-droid.org/en/packages/org.jitsi.meet/) | [<img src="resources/img/appstore-badge.png" height="50">](https://itunes.apple.com/us/app/jitsi-meet/id1165103905) |

 If you are feeling adventurous and want to get an early scoop of the features as they are being
 developed you can also sign up for our open beta testing here:
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,6 +4,6 @@

 We take security very seriously and develop all Jitsi projects to be secure and safe.

-If you find (or simply suspect) a security issue in any of the Jitsi projects, please report it to us via [HackerOne](https://hackerone.com/8x8-bounty) or send us an email to security@jitsi.org. 
+If you find (or simply suspect) a security issue in any of the Jitsi projects, please report it to us via [HackerOne](https://hackerone.com/8x8) or send us an email to security@jitsi.org. 

 **We encourage responsible disclosure for the sake of our users, so please reach out before posting in a public space.**
--- a/1
+++ b/1
@@ -1 +0,0 @@
-OK
--- a/analytics-ga.js
+++ b/analytics-ga.js
@@ -0,0 +1,163 @@
+/* global ga */
+
+(function(ctx) {
+    /**
+     *
+     */
+    function Analytics(options) {
+        /* eslint-disable */
+
+        if (!options.googleAnalyticsTrackingId) {
+            console.log(
+                'Failed to initialize Google Analytics handler, no tracking ID');
+             return;
+        }
+
+        /**
+         * Google Analytics
+         * TODO: Keep this local, there's no need to add it to window.
+         */
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create', options.googleAnalyticsTrackingId, 'auto');
+        ga('send', 'pageview');
+
+        /* eslint-enable */
+    }
+
+    /**
+     * Extracts the integer to use for a Google Analytics event's value field
+     * from a lib-jitsi-meet analytics event.
+     * @param {Object} event - The lib-jitsi-meet analytics event.
+     * @returns {Object} - The integer to use for the 'value' of a Google
+     * Analytics event.
+     * @private
+     */
+    Analytics.prototype._extractAction = function(event) {
+        // Page events have a single 'name' field.
+        if (event.type === 'page') {
+            return event.name;
+        }
+
+        // All other events have action, actionSubject, and source fields. All
+        // three fields are required, and the often jitsi-meet and
+        // lib-jitsi-meet use the same value when separate values are not
+        // necessary (i.e. event.action == event.actionSubject).
+        // Here we concatenate these three fields, but avoid adding the same
+        // value twice, because it would only make the GA event's action harder
+        // to read.
+        let action = event.action;
+
+        if (event.actionSubject && event.actionSubject !== event.action) {
+            // Intentionally use string concatenation as analytics needs to
+            // work on IE but this file does not go through babel. For some
+            // reason disabling this globally for the file does not have an
+            // effect.
+            // eslint-disable-next-line prefer-template
+            action = event.actionSubject + '.' + action;
+        }
+        if (event.source && event.source !== event.action
+                && event.source !== event.action) {
+            // eslint-disable-next-line prefer-template
+            action = event.source + '.' + action;
+        }
+
+        return action;
+    };
+
+    /**
+     * Extracts the integer to use for a Google Analytics event's value field
+     * from a lib-jitsi-meet analytics event.
+     * @param {Object} event - The lib-jitsi-meet analytics event.
+     * @returns {Object} - The integer to use for the 'value' of a Google
+     * Analytics event, or NaN if the lib-jitsi-meet event doesn't contain a
+     * suitable value.
+     * @private
+     */
+    Analytics.prototype._extractValue = function(event) {
+        let value = event && event.attributes && event.attributes.value;
+
+        // Try to extract an integer from the "value" attribute.
+        value = Math.round(parseFloat(value));
+
+        return value;
+    };
+
+    /**
+     * Extracts the string to use for a Google Analytics event's label field
+     * from a lib-jitsi-meet analytics event.
+     * @param {Object} event - The lib-jitsi-meet analytics event.
+     * @returns {string} - The string to use for the 'label' of a Google
+     * Analytics event.
+     * @private
+     */
+    Analytics.prototype._extractLabel = function(event) {
+        let label = '';
+
+        // The label field is limited to 500B. We will concatenate all
+        // attributes of the event, except the user agent because it may be
+        // lengthy and is probably included from elsewhere.
+        for (const property in event.attributes) {
+            if (property !== 'permanent_user_agent'
+                && property !== 'permanent_callstats_name'
+                && event.attributes.hasOwnProperty(property)) {
+                // eslint-disable-next-line prefer-template
+                label += property + '=' + event.attributes[property] + '&';
+            }
+        }
+
+        if (label.length > 0) {
+            label = label.slice(0, -1);
+        }
+
+        return label;
+    };
+
+    /**
+     * This is the entry point of the API. The function sends an event to
+     * google analytics. The format of the event is described in
+     * AnalyticsAdapter in lib-jitsi-meet.
+     * @param {Object} event - the event in the format specified by
+     * lib-jitsi-meet.
+     */
+    Analytics.prototype.sendEvent = function(event) {
+        if (!event || !ga) {
+            return;
+        }
+
+        const ignoredEvents
+            = [ 'e2e_rtt', 'rtp.stats', 'rtt.by.region', 'available.device',
+                'stream.switch.delay', 'ice.state.changed', 'ice.duration' ];
+
+        // Temporary removing some of the events that are too noisy.
+        if (ignoredEvents.indexOf(event.action) !== -1) {
+            return;
+        }
+
+        const gaEvent = {
+            'eventCategory': 'jitsi-meet',
+            'eventAction': this._extractAction(event),
+            'eventLabel': this._extractLabel(event)
+        };
+        const value = this._extractValue(event);
+
+        if (!isNaN(value)) {
+            gaEvent.eventValue = value;
+        }
+
+        ga('send', 'event', gaEvent);
+    };
+
+    if (typeof ctx.JitsiMeetJS === 'undefined') {
+        ctx.JitsiMeetJS = {};
+    }
+    if (typeof ctx.JitsiMeetJS.app === 'undefined') {
+        ctx.JitsiMeetJS.app = {};
+    }
+    if (typeof ctx.JitsiMeetJS.app.analyticsHandlers === 'undefined') {
+        ctx.JitsiMeetJS.app.analyticsHandlers = [];
+    }
+    ctx.JitsiMeetJS.app.analyticsHandlers.push(Analytics);
+})(window);
+/* eslint-enable prefer-template */
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -16,6 +16,10 @@ android {
    compileSdkVersion rootProject.ext.compileSdkVersion
    buildToolsVersion rootProject.ext.buildToolsVersion

+    packagingOptions {
+        exclude 'lib/*/libhermes*.so'
+    }
+
    defaultConfig {
        applicationId 'org.jitsi.meet'
        versionCode vcode
@@ -42,7 +46,6 @@ android {
        debug {
            buildConfigField "boolean", "GOOGLE_SERVICES_ENABLED", "${googleServicesEnabled}"
            buildConfigField "boolean", "LIBRE_BUILD", "${rootProject.ext.libreBuild}"
-            applicationIdSuffix ".debug"
        }
        release {
            // Uncomment the following line for singing a test release build.
@@ -69,13 +72,13 @@ android {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
-    namespace 'org.jitsi.meet'
 }

 dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation 'androidx.appcompat:appcompat:1.5.1'

-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'

    if (!rootProject.ext.libreBuild) {
        // Sync with react-native-google-signin
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -1,8 +1,3 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
 # in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
@@ -14,25 +9,20 @@

 # Add any project specific keep options here:

-# Disabling obfuscation is useful if you collect stack traces from production crashes
-# (unless you are using a system that supports de-obfuscate the stack traces).
-# -dontobfuscate
-
 # React Native

 # Keep our interfaces so they can be used by other ProGuard rules.
 # See http://sourceforge.net/p/proguard/bugs/466/
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
+-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip

 # Do not strip any method/class that is annotated with @DoNotStrip
 -keep @com.facebook.proguard.annotations.DoNotStrip class *
+-keep @com.facebook.common.internal.DoNotStrip class *
 -keepclassmembers class * {
    @com.facebook.proguard.annotations.DoNotStrip *;
-}
-
-keep @com.facebook.proguard.annotations.DoNotStripAny class * {
-    *;
+    @com.facebook.common.internal.DoNotStrip *;
 }

 -keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
@@ -40,32 +30,32 @@
  *** get*();
 }

-keep class * implements com.facebook.react.bridge.JavaScriptModule { *; }
-keep class * implements com.facebook.react.bridge.NativeModule { *; }
+-keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
+-keep class * extends com.facebook.react.bridge.NativeModule { *; }
 -keepclassmembers,includedescriptorclasses class * { native <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.UIProp <fields>; }
 -keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
 -keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }

 -dontwarn com.facebook.react.**
 -keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
-keep,includedescriptorclasses class com.facebook.react.turbomodule.core.** { *; }

-# hermes
-keep class com.facebook.jni.** { *; }
+# okhttp
+
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**

 # okio
+
 -keep class sun.misc.Unsafe { *; }
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-keep class okio.** { *; }
 -dontwarn okio.**

-# yoga
-keep,allowobfuscation @interface com.facebook.yoga.annotations.DoNotStrip
-keep @com.facebook.yoga.annotations.DoNotStrip class *
-keepclassmembers class * {
-    @com.facebook.yoga.annotations.DoNotStrip *;
-}
-
 # WebRTC

 -keep class org.webrtc.** { *; }
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <manifest
    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.jitsi.meet"
    android:installLocation="auto">
  <application
      android:allowBackup="true"
--- a/android/app/src/main/java/org/jitsi/meet/MainActivity.java
+++ b/android/app/src/main/java/org/jitsi/meet/MainActivity.java
@@ -30,16 +30,15 @@ import android.view.KeyEvent;

 import androidx.annotation.Nullable;

-import com.oney.WebRTCModule.WebRTCModuleOptions;
-
 import org.jitsi.meet.sdk.JitsiMeet;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
 import org.jitsi.meet.sdk.JitsiMeetConferenceOptions;
-import org.webrtc.Logging;

 import java.lang.reflect.Method;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collection;
+import java.util.HashMap;

 /**
 * The one and only Activity that the Jitsi Meet app needs. The
@@ -76,16 +75,13 @@ public class MainActivity extends JitsiMeetActivity {
     */
    private String defaultURL;

+
    // JitsiMeetActivity overrides
    //

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        JitsiMeet.showSplashScreen(this);
-
-        WebRTCModuleOptions options = WebRTCModuleOptions.getInstance();
-        options.loggingSeverity = Logging.Severity.LS_ERROR;
-
        super.onCreate(null);
    }

@@ -151,12 +147,12 @@ public class MainActivity extends JitsiMeetActivity {
    }

    private void setJitsiMeetConferenceDefaultOptions() {
-
        // Set default options
        JitsiMeetConferenceOptions defaultOptions
            = new JitsiMeetConferenceOptions.Builder()
            .setServerURL(buildURL(defaultURL))
            .setFeatureFlag("welcomepage.enabled", true)
+            .setFeatureFlag("resolution", 360)
            .setFeatureFlag("server-url-change.enabled", !configurationByRestrictions)
            .build();
        JitsiMeet.setDefaultConferenceOptions(defaultOptions);
@@ -218,6 +214,11 @@ public class MainActivity extends JitsiMeetActivity {
        super.onPictureInPictureModeChanged(isInPictureInPictureMode);

        Log.d(TAG, "Is in picture-in-picture mode: " + isInPictureInPictureMode);
+
+        if (!isInPictureInPictureMode) {
+            this.startActivity(new Intent(this, getClass())
+                .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
+        }
    }

    // Helper methods
@@ -226,7 +227,7 @@ public class MainActivity extends JitsiMeetActivity {
    private @Nullable URL buildURL(String urlStr) {
        try {
            return new URL(urlStr);
-        } catch (Exception e) {
+        } catch (MalformedURLException e) {
            return null;
        }
    }
--- a/android/app/src/main/res/xml/app_restrictions.xml
+++ b/android/app/src/main/res/xml/app_restrictions.xml
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<restrictions xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Server URL configuration -->
-    <restriction
-        android:description="@string/restriction_server_url_description"
-        android:key="SERVER_URL"
-        android:restrictionType="string"
-        android:title="@string/restriction_server_url_title"/>
-</restrictions>
+<?xml version="1.0" encoding="utf-8"?>
+<restrictions xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Server URL configuration -->
+    <restriction
+        android:defaultValue="https://meet.jit.si"
+        android:description="@string/restriction_server_url_description"
+        android:key="SERVER_URL"
+        android:restrictionType="string"
+        android:title="@string/restriction_server_url_title"/>
+</restrictions>
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -10,20 +10,22 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
        classpath 'com.google.gms:google-services:4.4.0'
        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
    }
 }

 ext {
-    kotlinVersion = "1.9.24"
-    buildToolsVersion = "34.0.0"
-    compileSdkVersion = 34
-    minSdkVersion    = 26
-    targetSdkVersion = 34
+    kotlinVersion = "1.7.0"
+    buildToolsVersion = "33.0.2"
+    compileSdkVersion = 33
+    minSdkVersion    = 24
+    targetSdkVersion = 33
    supportLibVersion = "28.0.0"
-    ndkVersion = "26.1.10909125"
+
+    // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
+    ndkVersion = "23.1.7779620"

    // The Maven artifact groupId of the third-party react-native modules which
    // Jitsi Meet SDK for Android depends on and which are not available in
@@ -40,14 +42,21 @@ ext {
    libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()

    googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
-
-    //React Native and Hermes Version
-    rnVersion = "0.75.5"
 }

 allprojects {
    repositories {
-        mavenCentral()
+        // 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' }
    }
@@ -57,41 +66,20 @@ allprojects {
    configurations.all {
        resolutionStrategy {
            eachDependency { DependencyResolveDetails details ->
-                if (details.requested.group == 'com.facebook.react') {
-                    if (details.requested.name == 'react-native') {
-                        details.useTarget "com.facebook.react:react-android:$rnVersion"
-                    }
-                    if (details.requested.name == 'react-android') {
-                        details.useVersion rootProject.ext.rnVersion
-                    }
+                if (details.requested.group == 'com.facebook.react'
+                        && details.requested.name == 'react-native') {
+                    def file = new File("$rootDir/../node_modules/react-native/package.json")
+                    def version = new JsonSlurper().parseText(file.text).version
+                    details.useVersion version
                }
            }
        }
    }

-    // Due to a dependency conflict between React Native and the Fresco library used by GiphySDK,
-    // GIFs appear as static images instead of animating
-    // https://github.com/Giphy/giphy-react-native-sdk/commit/7fe466ed6fddfaec95f9cbc959d33bd75ad8f900
-
-    configurations.configureEach {
-        resolutionStrategy {
-            forcedModules = [
-                'com.facebook.fresco:fresco:3.2.0',
-                'com.facebook.fresco:animated-gif:3.2.0',
-                'com.facebook.fresco:animated-base:3.2.0',
-                'com.facebook.fresco:animated-drawable:3.2.0',
-                'com.facebook.fresco:animated-webp:3.2.0',
-                'com.facebook.fresco:webpsupport:3.2.0',
-                'com.facebook.fresco:imagepipeline-okhttp3:3.2.0',
-                'com.facebook.fresco:middleware:3.2.0',
-                'com.facebook.fresco:nativeimagetranscoder:3.2.0'
-            ]
-        }
-    }
-
    // Third-party react-native modules which Jitsi Meet SDK for Android depends
    // on and which are not available in third-party Maven repositories need to
    // be deployed in a Maven repository of ours.
+    //

    if (project.name.startsWith('react-native-')) {
        apply plugin: 'maven-publish'
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -11,7 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx1024m -XX:MaxPermSize=256m

-org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -26,5 +26,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false

-appVersion=99.0.0
-sdkVersion=0.0.0
+appVersion=23.6.0
+sdkVersion=8.6.0
--- a/android/scripts/release-sdk.sh
+++ b/android/scripts/release-sdk.sh
@@ -9,6 +9,9 @@ THE_MVN_REPO=${MVN_REPO:-${1:-$DEFAULT_MVN_REPO}}
 MVN_HTTP=0
 DEFAULT_SDK_VERSION=$(grep sdkVersion ${THIS_DIR}/../gradle.properties | cut -d"=" -f2)
 SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
+RN_VERSION=$(jq -r '.version' ${THIS_DIR}/../../node_modules/react-native/package.json)
+JSC_VERSION="r"$(jq -r '.dependencies."jsc-android"' ${THIS_DIR}/../../node_modules/react-native/package.json | cut -d . -f 1 | cut -c 2-)
+DO_GIT_TAG=${GIT_TAG:-0}

 if [[ $THE_MVN_REPO == http* ]]; then
    MVN_HTTP=1
@@ -22,7 +25,68 @@ export MVN_REPO=$THE_MVN_REPO
 echo "Releasing Jitsi Meet SDK ${SDK_VERSION}"
 echo "Using ${MVN_REPO} as the Maven repo"

- if [[ $MVN_HTTP == 0 ]]; then
+if [[ $MVN_HTTP == 1 ]]; then
+    # Push React Native
+    echo "Pushing React Native ${RN_VERSION} to the Maven repo"
+    pushd ${THIS_DIR}/../../node_modules/react-native/android/com/facebook/react/react-native/${RN_VERSION}
+    cat react-native-${RN_VERSION}.pom \
+        | sed "s#<packaging>pom</packaging>#<packaging>aar</packaging>#" \
+        | sed "/<optional>/d" \
+        > react-native-${RN_VERSION}-fixed.pom
+    mvn \
+        deploy:deploy-file \
+        -Durl=${MVN_REPO} \
+        -DrepositoryId=${MVN_REPO_ID} \
+        -Dfile=react-native-${RN_VERSION}-release.aar \
+        -Dpackaging=aar \
+        -DgeneratePom=false \
+        -DpomFile=react-native-${RN_VERSION}-fixed.pom || true
+    popd
+    # Push JSC
+    echo "Pushing JSC ${JSC_VERSION} to the Maven repo"
+    pushd ${THIS_DIR}/../../node_modules/jsc-android/dist/org/webkit/android-jsc/${JSC_VERSION}
+    mvn \
+        deploy:deploy-file \
+        -Durl=${MVN_REPO} \
+        -DrepositoryId=${MVN_REPO_ID} \
+        -Dfile=android-jsc-${JSC_VERSION}.aar \
+        -Dpackaging=aar \
+        -DgeneratePom=false \
+        -DpomFile=android-jsc-${JSC_VERSION}.pom || true
+    popd
+else
+    # Push React Native, if necessary
+    if [[ ! -d ${MVN_REPO}/com/facebook/react/react-native/${RN_VERSION} ]]; then
+        echo "Pushing React Native ${RN_VERSION} to the Maven repo"
+        pushd ${THIS_DIR}/../../node_modules/react-native/android/com/facebook/react/react-native/${RN_VERSION}
+        cat react-native-${RN_VERSION}.pom \
+            | sed "s#<packaging>pom</packaging>#<packaging>aar</packaging>#" \
+            | sed "/<optional>/d" \
+            > react-native-${RN_VERSION}-fixed.pom
+        mvn \
+            deploy:deploy-file \
+            -Durl=${MVN_REPO} \
+            -Dfile=react-native-${RN_VERSION}-release.aar \
+            -Dpackaging=aar \
+            -DgeneratePom=false \
+            -DpomFile=react-native-${RN_VERSION}-fixed.pom
+        popd
+    fi
+
+    # Push JSC, if necessary
+    if [[ ! -d ${MVN_REPO}/org/webkit/android-jsc/${JSC_VERSION} ]]; then
+        echo "Pushing JSC ${JSC_VERSION} to the Maven repo"
+        pushd ${THIS_DIR}/../../node_modules/jsc-android/dist/org/webkit/android-jsc/${JSC_VERSION}
+        mvn \
+            deploy:deploy-file \
+            -Durl=${MVN_REPO} \
+            -Dfile=android-jsc-${JSC_VERSION}.aar \
+            -Dpackaging=aar \
+            -DgeneratePom=false \
+            -DpomFile=android-jsc-${JSC_VERSION}.pom
+        popd
+    fi
+
    # Check if an SDK with that same version has already been released
    if [[ -d ${MVN_REPO}/org/jitsi/react/jitsi-meet-sdk/${SDK_VERSION} ]]; then
        echo "There is already a release with that version in the Maven repo!"
@@ -33,17 +97,20 @@ fi
 # Now build and publish the Jitsi Meet SDK and its dependencies
 echo "Building and publishing the Jitsi Meet SDK"
 pushd ${THIS_DIR}/../
-./gradlew clean
-./gradlew assembleRelease
+./gradlew clean 
+./gradlew assembleRelease 
 ./gradlew publish
 popd

-# The artifacts are now on the Maven repo, commit them
-if [[ $MVN_HTTP == 0 ]]; then
+if [[ $DO_GIT_TAG == 1 ]]; then
+    # The artifacts are now on the Maven repo, commit them
    pushd ${MVN_REPO_PATH}
    git add -A .
    git commit -m "Jitsi Meet SDK + dependencies: ${SDK_VERSION}"
    popd
+
+    # Tag the release
+    git tag android-sdk-${SDK_VERSION}
 fi

 # Done!
--- a/android/scripts/run-packager-helper.command
+++ b/android/scripts/run-packager-helper.command
@@ -2,4 +2,4 @@

 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)

-exec ${THIS_DIR}/../../node_modules/react-native/scripts/packager.sh --reset-cache
+exec ${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.command --reset-cache
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -8,7 +8,6 @@ android {
    defaultConfig {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        buildConfigField "String", "SDK_VERSION", "\"$sdkVersion\""
    }

    buildTypes {
@@ -31,7 +30,6 @@ android {
            }
        }
    }
-    namespace 'org.jitsi.meet.sdk'
 }

 dependencies {
@@ -41,24 +39,23 @@ dependencies {
    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

-    api "com.facebook.react:react-android:$rootProject.ext.rnVersion"
-    api "com.facebook.react:hermes-android:$rootProject.ext.rnVersion"
-
+    //noinspection GradleDynamicVersion
+    api 'com.facebook.react:react-native:+'
    //noinspection GradleDynamicVersion
    implementation 'org.webkit:android-jsc:+'

    implementation 'com.facebook.fresco:animated-gif:2.5.0'
    implementation 'com.dropbox.core:dropbox-core-sdk:4.0.1'
-    implementation 'com.jakewharton.timber:timber:5.0.1'
+    implementation 'com.jakewharton.timber:timber:4.7.1'
    implementation 'com.squareup.duktape:duktape-android:1.3.0'
    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'androidx.startup:startup-runtime:1.1.0'
+    implementation "androidx.startup:startup-runtime:1.1.0"

    // Only add these packages if we are NOT doing a LIBRE_BUILD
    if (!rootProject.ext.libreBuild) {
        implementation project(':react-native-amplitude')
        implementation project(':react-native-giphy')
-        implementation(project(':react-native-google-signin')) {
+        implementation(project(":react-native-google-signin")) {
            exclude group: 'com.google.android.gms'
            exclude group: 'androidx'
        }
@@ -89,11 +86,9 @@ dependencies {
    implementation project(':react-native-splash-screen')
    implementation project(':react-native-svg')
    implementation project(':react-native-video')
+    implementation project(':react-native-webrtc')
    implementation project(':react-native-webview')

-    // Use `api` here so consumers can use WebRTCModuleOptions.
-    api project(':react-native-webrtc')
-
    testImplementation 'junit:junit:4.12'
 }

@@ -142,7 +137,8 @@ android.libraryVariants.all { def variant ->
        // Run the bundler
        commandLine(
                "node",
-                "node_modules/react-native/scripts/bundle.js",
+                "node_modules/react-native/local-cli/cli.js",
+                "bundle",
                "--platform", "android",
                "--dev", "${devEnabled}",
                "--reset-cache",
--- a/android/sdk/src/main/AndroidManifest.xml
+++ b/android/sdk/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.jitsi.meet.sdk">
    <!-- XXX ACCESS_NETWORK_STATE is required by WebRTC. -->
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.BLUETOOTH" />
@@ -12,10 +13,6 @@
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

    <uses-feature
        android:glEsVersion="0x00020000"
@@ -51,7 +48,7 @@

        <service
            android:name="org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService"
-            android:foregroundServiceType="mediaPlayback|microphone" />
+            android:foregroundServiceType="mediaProjection" />

        <provider
            android:name="com.reactnativecommunity.webview.RNCWebViewFileProvider"
@@ -69,4 +66,4 @@

    </application>

-</manifest>
+</manifest>
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/AppInfoModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/AppInfoModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2017-present Atlassian Pty Ltd
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -37,7 +37,6 @@ class AppInfoModule
    public static final String NAME = "AppInfo";
    public static final boolean GOOGLE_SERVICES_ENABLED = getGoogleServicesEnabled();
    public static final boolean LIBRE_BUILD = getLibreBuild();
-    public static final String SDK_VERSION = getSdkVersion();

    public AppInfoModule(ReactApplicationContext reactContext) {
        super(reactContext);
@@ -80,7 +79,6 @@ class AppInfoModule
        constants.put(
            "version",
            packageInfo == null ? "" : packageInfo.versionName);
-        constants.put("sdkVersion", SDK_VERSION);
        constants.put("LIBRE_BUILD", LIBRE_BUILD);
        constants.put("GOOGLE_SERVICES_ENABLED", GOOGLE_SERVICES_ENABLED);

@@ -118,19 +116,6 @@ class AppInfoModule
        return false;
    }

-    /**
-     * Gets the SDK version.
-     */
-    private static String getSdkVersion() {
-        Object sdkVersion = getBuildConfigValue("SDK_VERSION");
-
-        if (sdkVersion !=null) {
-            return (String) sdkVersion;
-        }
-
-        return "";
-    }
-
    /**
     * Gets build config value of a certain field.
     *
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerConnectionService.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerConnectionService.java
@@ -18,6 +18,7 @@ package org.jitsi.meet.sdk;

 import android.content.Context;
 import android.media.AudioManager;
+import android.os.Build;
 import android.telecom.CallAudioState;
 import androidx.annotation.RequiresApi;

@@ -33,6 +34,7 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 * {@link AudioModeModule.AudioDeviceHandlerInterface} module implementing device handling for
 * Android versions >= O when ConnectionService is enabled.
 */
+@RequiresApi(Build.VERSION_CODES.O)
 class AudioDeviceHandlerConnectionService implements
        AudioModeModule.AudioDeviceHandlerInterface,
        RNConnectionService.CallAudioStateListener {
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerGeneric.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerGeneric.java
@@ -20,6 +20,7 @@ import android.media.AudioAttributes;
 import android.media.AudioDeviceInfo;
 import android.media.AudioFocusRequest;
 import android.media.AudioManager;
+import android.os.Build;

 import java.util.HashSet;
 import java.util.Set;
@@ -86,7 +87,6 @@ class AudioDeviceHandlerGeneric implements
                        devices.add(AudioModeModule.DEVICE_EARPIECE);
                        break;
                    case AudioDeviceInfo.TYPE_BUILTIN_SPEAKER:
-                    case AudioDeviceInfo.TYPE_HDMI:
                        devices.add(AudioModeModule.DEVICE_SPEAKER);
                        break;
                    case AudioDeviceInfo.TYPE_WIRED_HEADPHONES:
@@ -226,17 +226,22 @@ class AudioDeviceHandlerGeneric implements
        audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
        audioManager.setMicrophoneMute(false);

-        int gotFocus = audioManager.requestAudioFocus(new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
-            .setAudioAttributes(
-                new AudioAttributes.Builder()
-                    .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
-                    .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-                    .build()
-            )
-            .setAcceptsDelayedFocusGain(true)
-            .setOnAudioFocusChangeListener(this)
-            .build()
-        );
+        int gotFocus;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            gotFocus = audioManager.requestAudioFocus(new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                .setAudioAttributes(
+                    new AudioAttributes.Builder()
+                        .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
+                        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                        .build()
+                )
+                .setAcceptsDelayedFocusGain(true)
+                .setOnAudioFocusChangeListener(this)
+                .build()
+            );
+        } else {
+            gotFocus = audioManager.requestAudioFocus(this, AudioManager.STREAM_VOICE_CALL, AudioManager.AUDIOFOCUS_GAIN);
+        }

        if (gotFocus == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
            JitsiMeetLogger.w(TAG + " Audio focus request failed");
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioModeModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioModeModule.java
@@ -20,6 +20,7 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.media.AudioManager;
+import android.os.Build;

 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
@@ -57,6 +58,7 @@ 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";
@@ -82,10 +84,11 @@ class AudioModeModule extends ReactContextBaseJavaModule {
    /**
     * Whether or not the ConnectionService is used for selecting audio devices.
     */
-    private static boolean useConnectionService_ = true;
+    private static final boolean supportsConnectionService = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+    private static boolean useConnectionService_ = supportsConnectionService;

    static boolean useConnectionService() {
-        return useConnectionService_;
+        return supportsConnectionService && useConnectionService_;
    }

    /**
@@ -136,11 +139,6 @@ class AudioModeModule extends ReactContextBaseJavaModule {
     */
    private String userSelectedDevice;

-    /**
-     * Whether or not audio is disabled.
-     */
-    private boolean audioDisabled;
-
    /**
     * Initializes a new module instance. There shall be a single instance of
     * this module throughout the lifetime of the application.
@@ -241,12 +239,6 @@ class AudioModeModule extends ReactContextBaseJavaModule {
            audioDeviceHandler.stop();
        }

-        audioDeviceHandler = null;
-
-        if (audioDisabled) {
-            return;
-        }
-
        if (useConnectionService()) {
            audioDeviceHandler = new AudioDeviceHandlerConnectionService(audioManager);
        } else {
@@ -289,27 +281,6 @@ class AudioModeModule extends ReactContextBaseJavaModule {
        });
    }

-    @ReactMethod
-    public void setDisabled(final boolean disabled, final Promise promise) {
-        if (audioDisabled == disabled) {
-            promise.resolve(null);
-            return;
-        }
-
-        JitsiMeetLogger.i(TAG + "  audio disabled: " + disabled);
-
-        audioDisabled = disabled;
-        setAudioDeviceHandler();
-
-        if (disabled) {
-            mode = -1;
-            availableDevices.clear();
-            resetSelectedDevice();
-        }
-
-        promise.resolve(null);
-    }
-
    /**
     * Public method to set the current audio mode.
     *
@@ -319,12 +290,7 @@ class AudioModeModule extends ReactContextBaseJavaModule {
     */
    @ReactMethod
    public void setMode(final int mode, final Promise promise) {
-        if (audioDisabled) {
-            promise.resolve(null);
-            return;
-        }
-
-        if (mode < DEFAULT || mode > VIDEO_CALL) {
+        if (mode != DEFAULT && mode != AUDIO_CALL && mode != VIDEO_CALL) {
            promise.reject("setMode", "Invalid audio mode " + mode);
            return;
        }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastAction.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastAction.java
@@ -3,6 +3,12 @@ package org.jitsi.meet.sdk;
 import android.content.Intent;
 import android.os.Bundle;

+import com.facebook.react.bridge.WritableNativeMap;
+
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+
+import java.util.HashMap;
+
 /**
 * Wraps the name and extra data for events that were broadcasted locally.
 */
@@ -10,21 +16,57 @@ public class BroadcastAction {
    private static final String TAG = BroadcastAction.class.getSimpleName();

    private final Type type;
-    private final Bundle data;
+    private final HashMap<String, Object> data;

    public BroadcastAction(Intent intent) {
        this.type = Type.buildTypeFromAction(intent.getAction());
-        this.data = intent.getExtras();
+        this.data = buildDataFromBundle(intent.getExtras());
    }

    public Type getType() {
        return this.type;
    }

-    public Bundle getData() {
+    public HashMap<String, Object> getData() {
        return this.data;
    }

+    public WritableNativeMap getDataAsWritableNativeMap() {
+        WritableNativeMap nativeMap = new WritableNativeMap();
+
+        for (String key : this.data.keySet()) {
+            try {
+                if (this.data.get(key) instanceof Boolean) {
+                    nativeMap.putBoolean(key, (Boolean) this.data.get(key));
+                } else if (this.data.get(key) instanceof Integer) {
+                    nativeMap.putInt(key, (Integer) this.data.get(key));
+                } else if (this.data.get(key) instanceof Double) {
+                    nativeMap.putDouble(key, (Double) this.data.get(key));
+                } else if (this.data.get(key) instanceof String) {
+                    nativeMap.putString(key, (String) this.data.get(key));
+                } else {
+                    throw new Exception("Unsupported extra data type");
+                }
+            } catch (Exception e) {
+                JitsiMeetLogger.w(TAG + " invalid extra data in event", e);
+            }
+        }
+
+        return nativeMap;
+    }
+
+    private static HashMap<String, Object> buildDataFromBundle(Bundle bundle) {
+        HashMap<String, Object> map = new HashMap<>();
+
+        if (bundle != null) {
+            for (String key : bundle.keySet()) {
+                map.put(key, bundle.get(key));
+            }
+        }
+
+        return map;
+    }
+
    enum Type {
        SET_AUDIO_MUTED("org.jitsi.meet.SET_AUDIO_MUTED"),
        HANG_UP("org.jitsi.meet.HANG_UP"),
@@ -36,13 +78,7 @@ public class BroadcastAction {
        SEND_CHAT_MESSAGE("org.jitsi.meet.SEND_CHAT_MESSAGE"),
        SET_VIDEO_MUTED("org.jitsi.meet.SET_VIDEO_MUTED"),
        SET_CLOSED_CAPTIONS_ENABLED("org.jitsi.meet.SET_CLOSED_CAPTIONS_ENABLED"),
-        TOGGLE_CAMERA("org.jitsi.meet.TOGGLE_CAMERA"),
-        SHOW_NOTIFICATION("org.jitsi.meet.SHOW_NOTIFICATION"),
-        HIDE_NOTIFICATION("org.jitsi.meet.HIDE_NOTIFICATION"),
-        START_RECORDING("org.jitsi.meet.START_RECORDING"),
-        STOP_RECORDING("org.jitsi.meet.STOP_RECORDING"),
-        OVERWRITE_CONFIG("org.jitsi.meet.OVERWRITE_CONFIG"),
-        SEND_CAMERA_FACING_MODE_MESSAGE("org.jitsi.meet.SEND_CAMERA_FACING_MODE_MESSAGE");
+        TOGGLE_CAMERA("org.jitsi.meet.TOGGLE_CAMERA");

        private final String action;

--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastEvent.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastEvent.java
@@ -89,11 +89,7 @@ public class BroadcastEvent {
        CHAT_MESSAGE_RECEIVED("org.jitsi.meet.CHAT_MESSAGE_RECEIVED"),
        CHAT_TOGGLED("org.jitsi.meet.CHAT_TOGGLED"),
        VIDEO_MUTED_CHANGED("org.jitsi.meet.VIDEO_MUTED_CHANGED"),
-        READY_TO_CLOSE("org.jitsi.meet.READY_TO_CLOSE"),
-        TRANSCRIPTION_CHUNK_RECEIVED("org.jitsi.meet.TRANSCRIPTION_CHUNK_RECEIVED"),
-        CUSTOM_BUTTON_PRESSED("org.jitsi.meet.CUSTOM_BUTTON_PRESSED"),
-        CONFERENCE_UNIQUE_ID_SET("org.jitsi.meet.CONFERENCE_UNIQUE_ID_SET"),
-        RECORDING_STATUS_CHANGED("org.jitsi.meet.RECORDING_STATUS_CHANGED");
+        READY_TO_CLOSE("org.jitsi.meet.READY_TO_CLOSE");

        private static final String CONFERENCE_BLURRED_NAME = "CONFERENCE_BLURRED";
        private static final String CONFERENCE_FOCUSED_NAME = "CONFERENCE_FOCUSED";
@@ -110,10 +106,6 @@ public class BroadcastEvent {
        private static final String CHAT_TOGGLED_NAME = "CHAT_TOGGLED";
        private static final String VIDEO_MUTED_CHANGED_NAME = "VIDEO_MUTED_CHANGED";
        private static final String READY_TO_CLOSE_NAME = "READY_TO_CLOSE";
-        private static final String TRANSCRIPTION_CHUNK_RECEIVED_NAME = "TRANSCRIPTION_CHUNK_RECEIVED";
-        private static final String CUSTOM_BUTTON_PRESSED_NAME = "CUSTOM_BUTTON_PRESSED";
-        private static final String CONFERENCE_UNIQUE_ID_SET_NAME = "CONFERENCE_UNIQUE_ID_SET";
-        private static final String RECORDING_STATUS_CHANGED_NAME = "RECORDING_STATUS_CHANGED";

        private final String action;

@@ -166,14 +158,6 @@ public class BroadcastEvent {
                    return VIDEO_MUTED_CHANGED;
                case READY_TO_CLOSE_NAME:
                    return READY_TO_CLOSE;
-                case TRANSCRIPTION_CHUNK_RECEIVED_NAME:
-                    return TRANSCRIPTION_CHUNK_RECEIVED;
-                case CUSTOM_BUTTON_PRESSED_NAME:
-                    return CUSTOM_BUTTON_PRESSED;
-                case CONFERENCE_UNIQUE_ID_SET_NAME:
-                    return CONFERENCE_UNIQUE_ID_SET;
-                case RECORDING_STATUS_CHANGED_NAME:
-                    return RECORDING_STATUS_CHANGED;
            }

            return null;
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastIntentHelper.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastIntentHelper.java
@@ -1,13 +1,11 @@
 package org.jitsi.meet.sdk;

 import android.content.Intent;
-import android.os.Bundle;

 public class BroadcastIntentHelper {
    public static Intent buildSetAudioMutedIntent(boolean muted) {
        Intent intent = new Intent(BroadcastAction.Type.SET_AUDIO_MUTED.getAction());
        intent.putExtra("muted", muted);
-
        return intent;
    }

@@ -19,21 +17,18 @@ public class BroadcastIntentHelper {
        Intent intent = new Intent(BroadcastAction.Type.SEND_ENDPOINT_TEXT_MESSAGE.getAction());
        intent.putExtra("to", to);
        intent.putExtra("message", message);
-
        return intent;
    }

    public static Intent buildToggleScreenShareIntent(boolean enabled) {
        Intent intent = new Intent(BroadcastAction.Type.TOGGLE_SCREEN_SHARE.getAction());
        intent.putExtra("enabled", enabled);
-
        return intent;
    }

    public static Intent buildOpenChatIntent(String participantId) {
        Intent intent = new Intent(BroadcastAction.Type.OPEN_CHAT.getAction());
        intent.putExtra("to", participantId);
-
        return intent;
    }

@@ -45,113 +40,28 @@ public class BroadcastIntentHelper {
        Intent intent = new Intent(BroadcastAction.Type.SEND_CHAT_MESSAGE.getAction());
        intent.putExtra("to", participantId);
        intent.putExtra("message", message);
-
        return intent;
    }

    public static Intent buildSetVideoMutedIntent(boolean muted) {
        Intent intent = new Intent(BroadcastAction.Type.SET_VIDEO_MUTED.getAction());
        intent.putExtra("muted", muted);
-
        return intent;
    }

    public static Intent buildSetClosedCaptionsEnabledIntent(boolean enabled) {
        Intent intent = new Intent(BroadcastAction.Type.SET_CLOSED_CAPTIONS_ENABLED.getAction());
        intent.putExtra("enabled", enabled);
-
        return intent;
    }
-
+    
    public static Intent buildRetrieveParticipantsInfo(String requestId) {
        Intent intent = new Intent(BroadcastAction.Type.RETRIEVE_PARTICIPANTS_INFO.getAction());
        intent.putExtra("requestId", requestId);
-
        return intent;
    }

    public static Intent buildToggleCameraIntent() {
        return new Intent(BroadcastAction.Type.TOGGLE_CAMERA.getAction());
    }
-
-    public static Intent buildShowNotificationIntent(
-        String appearance, String description, String timeout, String title, String uid) {
-        Intent intent = new Intent(BroadcastAction.Type.SHOW_NOTIFICATION.getAction());
-        intent.putExtra("appearance", appearance);
-        intent.putExtra("description", description);
-        intent.putExtra("timeout", timeout);
-        intent.putExtra("title", title);
-        intent.putExtra("uid", uid);
-
-        return intent;
-    }
-
-    public static Intent buildHideNotificationIntent(String uid) {
-        Intent intent = new Intent(BroadcastAction.Type.HIDE_NOTIFICATION.getAction());
-        intent.putExtra("uid", uid);
-
-        return intent;
-    }
-
-    public enum RecordingMode {
-        FILE("file"),
-        STREAM("stream");
-
-        private final String mode;
-
-        RecordingMode(String mode) {
-            this.mode = mode;
-        }
-
-        public String getMode() {
-            return mode;
-        }
-    }
-
-    public static Intent buildStartRecordingIntent(
-        RecordingMode mode,
-        String dropboxToken,
-        boolean shouldShare,
-        String rtmpStreamKey,
-        String rtmpBroadcastID,
-        String youtubeStreamKey,
-        String youtubeBroadcastID,
-        Bundle extraMetadata,
-        boolean transcription) {
-        Intent intent = new Intent(BroadcastAction.Type.START_RECORDING.getAction());
-        intent.putExtra("mode", mode.getMode());
-        intent.putExtra("dropboxToken", dropboxToken);
-        intent.putExtra("shouldShare", shouldShare);
-        intent.putExtra("rtmpStreamKey", rtmpStreamKey);
-        intent.putExtra("rtmpBroadcastID", rtmpBroadcastID);
-        intent.putExtra("youtubeStreamKey", youtubeStreamKey);
-        intent.putExtra("youtubeBroadcastID", youtubeBroadcastID);
-        intent.putExtra("extraMetadata", extraMetadata);
-        intent.putExtra("transcription", transcription);
-
-        return intent;
-    }
-
-    public static Intent buildStopRecordingIntent(RecordingMode mode, boolean transcription) {
-        Intent intent = new Intent(BroadcastAction.Type.STOP_RECORDING.getAction());
-        intent.putExtra("mode", mode.getMode());
-        intent.putExtra("transcription", transcription);
-
-        return intent;
-    }
-
-    public static Intent buildOverwriteConfigIntent(Bundle config) {
-        Intent intent = new Intent(BroadcastAction.Type.OVERWRITE_CONFIG.getAction());
-        intent.putExtra("config", config);
-
-        return intent;
-    }
-
-    public static Intent buildSendCameraFacingModeMessageIntent(String to, String facingMode) {
-        Intent intent = new Intent(BroadcastAction.Type.SEND_CAMERA_FACING_MODE_MESSAGE.getAction());
-        intent.putExtra("to", to);
-        intent.putExtra("facingMode", facingMode);
-
-        return intent;
-    }
 }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastReceiver.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastReceiver.java
@@ -3,9 +3,6 @@ package org.jitsi.meet.sdk;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.Bundle;
-
-import com.facebook.react.bridge.Arguments;

 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

@@ -31,14 +28,7 @@ public class BroadcastReceiver extends android.content.BroadcastReceiver {
    public void onReceive(Context context, Intent intent) {
        BroadcastAction action = new BroadcastAction(intent);
        String actionName = action.getType().getAction();
-        Bundle data = action.getData();
-            
-        // For actions without data bundle (like hangup), we create an empty map
-        // instead of attempting to convert a null bundle to avoid crashes.
-        if (data != null) {
-            ReactInstanceManagerHolder.emitEvent(actionName, Arguments.fromBundle(data));
-        } else {
-            ReactInstanceManagerHolder.emitEvent(actionName, Arguments.createMap());
-        }
+
+        ReactInstanceManagerHolder.emitEvent(actionName, action.getDataAsWritableNativeMap());
    }
 }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ConnectionService.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ConnectionService.java
@@ -37,6 +37,7 @@ import java.util.Objects;
 *
 * @author Pawel Domas
 */
+@RequiresApi(api = Build.VERSION_CODES.O)
 public class ConnectionService extends android.telecom.ConnectionService {

    /**
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java
@@ -97,12 +97,6 @@ class ExternalAPIModule extends ReactContextBaseJavaModule {
        constants.put("SET_VIDEO_MUTED", BroadcastAction.Type.SET_VIDEO_MUTED.getAction());
        constants.put("SET_CLOSED_CAPTIONS_ENABLED", BroadcastAction.Type.SET_CLOSED_CAPTIONS_ENABLED.getAction());
        constants.put("TOGGLE_CAMERA", BroadcastAction.Type.TOGGLE_CAMERA.getAction());
-        constants.put("SHOW_NOTIFICATION", BroadcastAction.Type.SHOW_NOTIFICATION.getAction());
-        constants.put("HIDE_NOTIFICATION", BroadcastAction.Type.HIDE_NOTIFICATION.getAction());
-        constants.put("START_RECORDING", BroadcastAction.Type.START_RECORDING.getAction());
-        constants.put("STOP_RECORDING", BroadcastAction.Type.STOP_RECORDING.getAction());
-        constants.put("OVERWRITE_CONFIG", BroadcastAction.Type.OVERWRITE_CONFIG.getAction());
-        constants.put("SEND_CAMERA_FACING_MODE_MESSAGE", BroadcastAction.Type.SEND_CAMERA_FACING_MODE_MESSAGE.getAction());

        return constants;
    }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
@@ -54,8 +54,6 @@ public class JitsiMeetActivity extends AppCompatActivity
    private static final String ACTION_JITSI_MEET_CONFERENCE = "org.jitsi.meet.CONFERENCE";
    private static final String JITSI_MEET_CONFERENCE_OPTIONS = "JitsiMeetConferenceOptions";

-    private boolean isReadyToClose;
-
    private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
        @Override
        public void onReceive(Context context, Intent intent) {
@@ -126,8 +124,6 @@ public class JitsiMeetActivity extends AppCompatActivity

    @Override
    public void onDestroy() {
-        JitsiMeetLogger.i("onDestroy()");
-
        // Here we are trying to handle the following corner case: an application using the SDK
        // is using this Activity for displaying meetings, but there is another "main" Activity
        // with other content. If this Activity is "swiped out" from the recent list we will get
@@ -135,10 +131,7 @@ public class JitsiMeetActivity extends AppCompatActivity
        // current meeting, but when our view is detached from React the JS <-> Native bridge won't
        // be operational so the external API won't be able to notify the native side that the
        // conference terminated. Thus, try our best to clean up.
-        if (!isReadyToClose) {
-            JitsiMeetLogger.i("onDestroy(): leaving...");
-            leave();
-        }
+        leave();

        this.jitsiView = null;

@@ -156,12 +149,8 @@ public class JitsiMeetActivity extends AppCompatActivity

    @Override
    public void finish() {
-        if (!isReadyToClose) {
-            JitsiMeetLogger.i("finish(): leaving...");
-            leave();
-        }
+        leave();

-        JitsiMeetLogger.i("finish(): finishing...");
        super.finish();
    }

@@ -181,8 +170,8 @@ public class JitsiMeetActivity extends AppCompatActivity
    }

    public void join(JitsiMeetConferenceOptions options) {
-        if (this.jitsiView != null) {
-            this.jitsiView.join(options);
+        if (this.jitsiView  != null) {
+            this.jitsiView .join(options);
        } else {
            JitsiMeetLogger.w("Cannot join, view is null");
        }
@@ -263,26 +252,9 @@ public class JitsiMeetActivity extends AppCompatActivity

    protected void onReadyToClose() {
        JitsiMeetLogger.i("SDK is ready to close");
-        isReadyToClose = true;
        finish();
    }

-//    protected void onTranscriptionChunkReceived(HashMap<String, Object> extraData) {
-//        JitsiMeetLogger.i("Transcription chunk received: " + extraData);
-//    }
-
-//    protected void onCustomButtonPressed(HashMap<String, Object> extraData) {
-//         JitsiMeetLogger.i("Custom button pressed: " + extraData);
-//     }
-
-//     protected void onConferenceUniqueIdSet(HashMap<String, Object> extraData) {
-//         JitsiMeetLogger.i("Conference unique id set: " + extraData);
-//     }
-
-//     protected void onRecordingStatusChanged(HashMap<String, Object> extraData) {
-//       JitsiMeetLogger.i("Recording status changed: " + extraData);
-//     }
-
    // Activity lifecycle methods
    //

@@ -314,8 +286,8 @@ public class JitsiMeetActivity extends AppCompatActivity

    @Override
    protected void onUserLeaveHint() {
-        if (this.jitsiView != null) {
-            this.jitsiView.enterPictureInPicture();
+        if (this.jitsiView  != null) {
+            this.jitsiView .enterPictureInPicture();
        }
    }

@@ -366,18 +338,6 @@ public class JitsiMeetActivity extends AppCompatActivity
                case READY_TO_CLOSE:
                    onReadyToClose();
                    break;
-                // case TRANSCRIPTION_CHUNK_RECEIVED:
-                //    onTranscriptionChunkReceived(event.getData());
-                //    break;
-                // case CUSTOM_BUTTON_PRESSED:
-                //    onCustomButtonPressed(event.getData());
-                //    break;
-                // case CONFERENCE_UNIQUE_ID_SET:
-                //     onConferenceUniqueIdSet(event.getData());
-                //     break;
-                // case RECORDING_STATUS_CHANGED:
-                //     onRecordingStatusChanged(event.getData());
-                //     break;
            }
        }
    }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivityDelegate.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivityDelegate.java
@@ -42,7 +42,7 @@ public class JitsiMeetActivityDelegate {
    /**
     * Tells whether or not the permissions request is currently in progress.
     *
-     * @return {@code true} if the permissions are being requested or {@code false} otherwise.
+     * @return {@code true} if the permssions are being requested or {@code false} otherwise.
     */
    static boolean arePermissionsBeingRequested() {
        return permissionListener != null;
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java
@@ -21,7 +21,6 @@ import android.os.Parcel;
 import android.os.Parcelable;

 import java.net.URL;
-import java.util.ArrayList;


 /**
@@ -230,12 +229,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
            return this;
        }

-        public Builder setConfigOverride(String config, ArrayList<Bundle> arrayList) {
-            this.config.putParcelableArrayList(config, arrayList);
-
-            return this;
-        }
-
        /**
         * Builds the immutable {@link JitsiMeetConferenceOptions} object with the configuration
         * that this {@link Builder} instance specified.
@@ -270,6 +263,11 @@ public class JitsiMeetConferenceOptions implements Parcelable {
    Bundle asProps() {
        Bundle props = new Bundle();

+        // Android always has the PiP flag set by default.
+        if (!featureFlags.containsKey("pip.enabled")) {
+            featureFlags.putBoolean("pip.enabled", true);
+        }
+
        props.putBundle("flags", featureFlags);

        Bundle urlProps = new Bundle();
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
@@ -16,10 +16,6 @@

 package org.jitsi.meet.sdk;

-import static android.Manifest.permission.POST_NOTIFICATIONS;
-import static android.Manifest.permission.RECORD_AUDIO;
-
-import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.Service;
@@ -27,22 +23,15 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;

 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

-import com.facebook.react.modules.core.PermissionListener;
-
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;

-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
-import java.util.Random;

 /**
 * This class implements an Android {@link Service}, a foreground one specifically, and it's
@@ -51,39 +40,34 @@ import java.util.Random;
 *
 * See: https://developer.android.com/guide/components/services
 */
-public class JitsiMeetOngoingConferenceService extends Service implements OngoingConferenceTracker.OngoingConferenceListener {
+public class JitsiMeetOngoingConferenceService extends Service
+    implements OngoingConferenceTracker.OngoingConferenceListener {
    private static final String TAG = JitsiMeetOngoingConferenceService.class.getSimpleName();
-    private static final String ACTIVITY_DATA_KEY = "activityDataKey";
    private static final String EXTRA_DATA_KEY = "extraDataKey";
    private static final String EXTRA_DATA_BUNDLE_KEY = "extraDataBundleKey";
    private static final String IS_AUDIO_MUTED_KEY = "isAudioMuted";

-    private static final int PERMISSIONS_REQUEST_CODE = (int) (Math.random() * Short.MAX_VALUE);
-
    private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver();

    private boolean isAudioMuted;
-    private Class tapBackActivity;

-    static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
-
-    private static void doLaunch(Context context, HashMap<String, Object> extraData) {
-        Activity activity = (Activity) context;
-
-        OngoingNotification.createNotificationChannel(activity);
+    public static void launch(Context context, HashMap<String, Object> extraData) {
+        OngoingNotification.createOngoingConferenceNotificationChannel();

        Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);

        Bundle extraDataBundle = new Bundle();
        extraDataBundle.putSerializable(EXTRA_DATA_KEY, extraData);
-
        intent.putExtra(EXTRA_DATA_BUNDLE_KEY, extraDataBundle);
-        intent.putExtra(ACTIVITY_DATA_KEY, activity.getClass().getCanonicalName());

        ComponentName componentName;

        try {
-            componentName = context.startForegroundService(intent);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                componentName = context.startForegroundService(intent);
+            } else {
+                componentName = context.startService(intent);
+            }
        } catch (RuntimeException e) {
            // Avoid crashing due to ForegroundServiceStartNotAllowedException (API level 31).
            // See: https://developer.android.com/guide/components/foreground-services#background-start-restrictions
@@ -96,55 +80,6 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin
        }
    }

-
-    public static void launch(Context context, HashMap<String, Object> extraData) {
-        List<String> permissionsList = new ArrayList<>();
-
-        PermissionListener listener = new PermissionListener() {
-            @Override
-            public boolean onRequestPermissionsResult(int i, String[] strings, int[] results) {
-                int counter = 0;
-
-                if (results.length > 0) {
-                    for (int result : results) {
-                        if (result == PackageManager.PERMISSION_GRANTED) {
-                            counter++;
-                        }
-                    }
-
-                    if (counter == results.length){
-                        doLaunch(context, extraData);
-                        JitsiMeetLogger.w(TAG + " Service launched, permissions were granted");
-                    } else {
-                        JitsiMeetLogger.w(TAG + " Couldn't launch service, permissions were not granted");
-                    }
-                }
-
-                return true;
-            }
-        };
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            permissionsList.add(POST_NOTIFICATIONS);
-            permissionsList.add(RECORD_AUDIO);
-        }
-
-        String[] permissionsArray = new String[ permissionsList.size() ];
-        permissionsArray = permissionsList.toArray( permissionsArray );
-
-        if (permissionsArray.length > 0) {
-            JitsiMeetActivityDelegate.requestPermissions(
-                (Activity) context,
-                permissionsArray,
-                PERMISSIONS_REQUEST_CODE,
-                listener
-            );
-        } else {
-            doLaunch(context, extraData);
-            JitsiMeetLogger.w(TAG + " Service launched");
-        }
-    }
-
    public static void abort(Context context) {
        Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
        context.stopService(intent);
@@ -154,18 +89,13 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin
    public void onCreate() {
        super.onCreate();

-        Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, this, tapBackActivity);
+        Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
        if (notification == null) {
            stopSelf();
            JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
        } else {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK | ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
-            } else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
-                startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);
-            } else {
-                startForeground(NOTIFICATION_ID, notification);
-            }
+            startForeground(OngoingNotification.NOTIFICATION_ID, notification);
+            JitsiMeetLogger.i(TAG + " Service started");
        }

        OngoingConferenceTracker.getInstance().addListener(this);
@@ -190,37 +120,25 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin

    @Override
    public int onStartCommand(Intent intent, int flags, int startId) {
-        final String actionName = intent.getAction();
-        final Action action = Action.fromName(actionName);

-        if (action != Action.HANGUP) {
-            Boolean isAudioMuted = tryParseIsAudioMuted(intent);
+        Boolean isAudioMuted = tryParseIsAudioMuted(intent);

-            if (isAudioMuted != null) {
-                this.isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));
-            }
+        if (isAudioMuted != null) {
+            this.isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));

-            if (tapBackActivity == null) {
-                String targetActivityName = intent.getExtras().getString(ACTIVITY_DATA_KEY);
-                Class<? extends Activity> targetActivity = null;
-                try {
-                    targetActivity = Class.forName(targetActivityName).asSubclass(Activity.class);
-                    tapBackActivity = targetActivity;
-                } catch (ClassNotFoundException e) {
-                    JitsiMeetLogger.w(TAG + " Could not find target Activity: " + targetActivityName);
-                }
-            }
-
-            Notification notification = OngoingNotification.buildOngoingConferenceNotification(this.isAudioMuted, this, tapBackActivity);
+            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
            if (notification == null) {
                stopSelf();
                JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
            } else {
                NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-                notificationManager.notify(NOTIFICATION_ID, notification);
+                notificationManager.notify(OngoingNotification.NOTIFICATION_ID, notification);
            }
        }

+        final String actionName = intent.getAction();
+        final Action action = Action.fromName(actionName);
+
        // When starting the service, there is no action passed in the intent
        if (action != null) {
            switch (action) {
@@ -293,15 +211,14 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin

        @Override
        public void onReceive(Context context, Intent intent) {
-            Class tapBackActivity = JitsiMeetOngoingConferenceService.this.tapBackActivity;
            isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));
-            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, context, tapBackActivity);
+            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
            if (notification == null) {
                stopSelf();
                JitsiMeetLogger.w(TAG + " Couldn't update service, notification is null");
            } else {
                NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-                notificationManager.notify(NOTIFICATION_ID, notification);
+                notificationManager.notify(OngoingNotification.NOTIFICATION_ID, notification);

                JitsiMeetLogger.i(TAG + " audio muted changed");
            }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java
@@ -33,9 +33,10 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 public class JitsiMeetView extends FrameLayout {

    /**
-     * Background color. Should match the background color set in JS.
+     * Background color used by {@code BaseReactView} and the React Native root
+     * view.
     */
-    private static final int BACKGROUND_COLOR = 0xFF040404;
+    private static final int BACKGROUND_COLOR = 0xFF111111;

    /**
     * React Native root view.
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiVideoDecoderFactory.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiVideoDecoderFactory.java
@@ -1,80 +0,0 @@
-package org.jitsi.meet.sdk;
-
-/*
- *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-import androidx.annotation.Nullable;
-
-import com.oney.WebRTCModule.webrtcutils.SoftwareVideoDecoderFactoryProxy;
-
-import org.webrtc.EglBase;
-import org.webrtc.HardwareVideoDecoderFactory;
-import org.webrtc.PlatformSoftwareVideoDecoderFactory;
-import org.webrtc.VideoCodecInfo;
-import org.webrtc.VideoDecoder;
-import org.webrtc.VideoDecoderFactory;
-import org.webrtc.VideoDecoderFallback;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-
-/**
- * Custom decoder factory which uses HW decoders and falls back to SW.
- */
-public class JitsiVideoDecoderFactory implements VideoDecoderFactory {
-    private final VideoDecoderFactory hardwareVideoDecoderFactory;
-    private final VideoDecoderFactory softwareVideoDecoderFactory = new SoftwareVideoDecoderFactoryProxy();
-    private final @Nullable VideoDecoderFactory platformSoftwareVideoDecoderFactory;
-
-    /**
-     * Create decoder factory using default hardware decoder factory.
-     */
-    public JitsiVideoDecoderFactory(@Nullable EglBase.Context eglContext) {
-        this.hardwareVideoDecoderFactory = new HardwareVideoDecoderFactory(eglContext);
-        this.platformSoftwareVideoDecoderFactory = new PlatformSoftwareVideoDecoderFactory(eglContext);
-    }
-
-    /**
-     * Create decoder factory using explicit hardware decoder factory.
-     */
-    JitsiVideoDecoderFactory(VideoDecoderFactory hardwareVideoDecoderFactory) {
-        this.hardwareVideoDecoderFactory = hardwareVideoDecoderFactory;
-        this.platformSoftwareVideoDecoderFactory = null;
-    }
-
-    @Override
-    public @Nullable VideoDecoder createDecoder(VideoCodecInfo codecType) {
-        VideoDecoder softwareDecoder = softwareVideoDecoderFactory.createDecoder(codecType);
-        final VideoDecoder hardwareDecoder = hardwareVideoDecoderFactory.createDecoder(codecType);
-        if (softwareDecoder == null && platformSoftwareVideoDecoderFactory != null) {
-            softwareDecoder = platformSoftwareVideoDecoderFactory.createDecoder(codecType);
-        }
-        if (hardwareDecoder != null && softwareDecoder != null) {
-            // Both hardware and software supported, wrap it in a software fallback
-            return new VideoDecoderFallback(
-                /* fallback= */ softwareDecoder, /* primary= */ hardwareDecoder);
-        }
-        return hardwareDecoder != null ? hardwareDecoder : softwareDecoder;
-    }
-
-    @Override
-    public VideoCodecInfo[] getSupportedCodecs() {
-        LinkedHashSet<VideoCodecInfo> supportedCodecInfos = new LinkedHashSet<>();
-
-        supportedCodecInfos.addAll(Arrays.asList(softwareVideoDecoderFactory.getSupportedCodecs()));
-        supportedCodecInfos.addAll(Arrays.asList(hardwareVideoDecoderFactory.getSupportedCodecs()));
-        if (platformSoftwareVideoDecoderFactory != null) {
-            supportedCodecInfos.addAll(
-                Arrays.asList(platformSoftwareVideoDecoderFactory.getSupportedCodecs()));
-        }
-
-        return supportedCodecInfos.toArray(new VideoCodecInfo[supportedCodecInfos.size()]);
-    }
-}
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiVideoEncoderFactory.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiVideoEncoderFactory.java
@@ -1,16 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import androidx.annotation.Nullable;
-
-import com.oney.WebRTCModule.webrtcutils.H264AndSoftwareVideoEncoderFactory;
-
-import org.webrtc.EglBase;
-
-/**
- * Custom encoder factory which uses HW for H.264 and SW for everything else.
- */
-public class JitsiVideoEncoderFactory extends H264AndSoftwareVideoEncoderFactory {
-    public JitsiVideoEncoderFactory(@Nullable EglBase.Context eglContext) {
-        super(eglContext);
-    }
-}
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/NotificationChannels.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/NotificationChannels.java
@@ -0,0 +1,10 @@
+package org.jitsi.meet.sdk;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class NotificationChannels {
+    static final String ONGOING_CONFERENCE_CHANNEL_ID = "JitsiOngoingConferenceChannel";
+
+    public static List<String> allIds = new ArrayList<String>() {{ add(ONGOING_CONFERENCE_CHANNEL_ID); }};
+}
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java
@@ -16,19 +16,22 @@

 package org.jitsi.meet.sdk;

-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+import static org.jitsi.meet.sdk.NotificationChannels.ONGOING_CONFERENCE_CHANNEL_ID;

-import android.app.Activity;
+import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
-import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;

 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;

+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+
+import java.util.Random;

 /**
 * Helper class for creating the ongoing notification which is used with
@@ -38,11 +41,15 @@ import androidx.core.app.NotificationCompat;
 class OngoingNotification {
    private static final String TAG = OngoingNotification.class.getSimpleName();

+    static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
    private static long startingTime = 0;

-    static final String ONGOING_CONFERENCE_CHANNEL_ID = "JitsiOngoingConferenceChannel";
+    static void createOngoingConferenceNotificationChannel() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return;
+        }

-    static void createNotificationChannel(Activity context) {
+        Context context = ReactInstanceManagerHolder.getCurrentActivity();
        if (context == null) {
            JitsiMeetLogger.w(TAG + " Cannot create notification channel: no current context");
            return;
@@ -53,13 +60,12 @@ class OngoingNotification {

        NotificationChannel channel
            = notificationManager.getNotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID);
-
        if (channel != null) {
            // The channel was already created, no need to do it again.
            return;
        }

-        channel = new NotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID, context.getString(R.string.ongoing_notification_channel_name), NotificationManager.IMPORTANCE_DEFAULT);
+        channel = new NotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID, context.getString(R.string.ongoing_notification_action_unmute), NotificationManager.IMPORTANCE_DEFAULT);
        channel.enableLights(false);
        channel.enableVibration(false);
        channel.setShowBadge(false);
@@ -67,13 +73,14 @@ class OngoingNotification {
        notificationManager.createNotificationChannel(channel);
    }

-    static Notification buildOngoingConferenceNotification(Boolean isMuted, Context context, Class tapBackActivity) {
+    static Notification buildOngoingConferenceNotification(boolean isMuted) {
+        Context context = ReactInstanceManagerHolder.getCurrentActivity();
        if (context == null) {
            JitsiMeetLogger.w(TAG + " Cannot create notification: no current context");
            return null;
        }

-        Intent notificationIntent = new Intent(context, tapBackActivity == null ? context.getClass() : tapBackActivity);
+        Intent notificationIntent = new Intent(context, context.getClass());
        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);

        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, ONGOING_CONFERENCE_CHANNEL_ID);
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/PictureInPictureModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/PictureInPictureModule.java
@@ -20,6 +20,7 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.PictureInPictureParams;
+import android.os.Build;
 import android.util.Rational;

 import com.facebook.react.bridge.Promise;
@@ -52,7 +53,7 @@ class PictureInPictureModule extends ReactContextBaseJavaModule {
        // Android Go devices don't support PiP. There doesn't seem to be a better way to detect it than
        // to use ActivityManager.isLowRamDevice().
        // https://stackoverflow.com/questions/58340558/how-to-detect-android-go
-        isSupported = !am.isLowRamDevice();
+        isSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !am.isLowRamDevice();
    }

    /**
@@ -81,6 +82,7 @@ class PictureInPictureModule extends ReactContextBaseJavaModule {
     * including when the activity is not visible (paused or stopped), if the
     * screen is locked or if the user has an activity pinned.
     */
+    @TargetApi(Build.VERSION_CODES.O)
    public void enterPictureInPicture() {
        if (!isEnabled) {
            return;
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/RNConnectionService.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/RNConnectionService.java
@@ -3,6 +3,7 @@ package org.jitsi.meet.sdk;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccount;
@@ -31,6 +32,7 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 *
 * @author Pawel Domas
 */
+@RequiresApi(api = Build.VERSION_CODES.O)
@ReactModule(name = RNConnectionService.NAME)
 class RNConnectionService extends ReactContextBaseJavaModule {

@@ -51,6 +53,7 @@ class RNConnectionService extends ReactContextBaseJavaModule {
     * @param audioRoute the new audio route to be set. See
     * {@link android.telecom.CallAudioState} constants prefixed with "ROUTE_".
     */
+    @RequiresApi(api = Build.VERSION_CODES.O)
    static void setAudioRoute(int audioRoute) {
        for (ConnectionService.ConnectionImpl c
                : ConnectionService.getConnections()) {
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
@@ -16,25 +16,26 @@

 package org.jitsi.meet.sdk;

-import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.util.Log;

 import androidx.annotation.Nullable;

-import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
 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.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.oney.WebRTCModule.EglUtils;
 import com.oney.WebRTCModule.WebRTCModuleOptions;
+import com.oney.WebRTCModule.webrtcutils.H264AndSoftwareVideoDecoderFactory;
+import com.oney.WebRTCModule.webrtcutils.H264AndSoftwareVideoEncoderFactory;

 import org.devio.rn.splashscreen.SplashScreenModule;
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 import org.webrtc.EglBase;

 import java.lang.reflect.Constructor;
@@ -124,36 +125,41 @@ class ReactInstanceManagerHolder {
        // AmplitudeReactNativePackage
        try {
            Class<?> amplitudePackageClass = Class.forName("com.amplitude.reactnative.AmplitudeReactNativePackage");
-            Constructor<?> constructor = amplitudePackageClass.getConstructor();
+            Constructor constructor = amplitudePackageClass.getConstructor();
            packages.add((ReactPackage)constructor.newInstance());
        } catch (Exception e) {
            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            JitsiMeetLogger.d(TAG, "Not loading AmplitudeReactNativePackage");
+            Log.d(TAG, "Not loading AmplitudeReactNativePackage");
        }

        // GiphyReactNativeSdkPackage
        try {
            Class<?> giphyPackageClass = Class.forName("com.giphyreactnativesdk.GiphyReactNativeSdkPackage");
-            Constructor<?> constructor = giphyPackageClass.getConstructor();
+            Constructor constructor = giphyPackageClass.getConstructor();
            packages.add((ReactPackage)constructor.newInstance());
        } catch (Exception e) {
            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            JitsiMeetLogger.d(TAG, "Not loading GiphyReactNativeSdkPackage");
+            Log.d(TAG, "Not loading GiphyReactNativeSdkPackage");
        }

        // RNGoogleSignInPackage
        try {
            Class<?> googlePackageClass = Class.forName("com.reactnativegooglesignin.RNGoogleSigninPackage");
-            Constructor<?> constructor = googlePackageClass.getConstructor();
+            Constructor constructor = googlePackageClass.getConstructor();
            packages.add((ReactPackage)constructor.newInstance());
        } catch (Exception e) {
            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            JitsiMeetLogger.d(TAG, "Not loading RNGoogleSignInPackage");
+            Log.d(TAG, "Not loading RNGoogleSignInPackage");
        }

        return packages;
    }

+    static JSCExecutorFactory getReactNativeJSFactory() {
+        // Keep on using JSC, the jury is out on Hermes.
+        return new JSCExecutorFactory("", "");
+    }
+
    /**
     * Helper function to send an event to JavaScript.
     *
@@ -167,7 +173,7 @@ class ReactInstanceManagerHolder {
            = ReactInstanceManagerHolder.getReactInstanceManager();

        if (reactInstanceManager != null) {
-            @SuppressLint("VisibleForTests") ReactContext reactContext
+            ReactContext reactContext
                = reactInstanceManager.getCurrentReactContext();

            if (reactContext != null) {
@@ -190,7 +196,7 @@ class ReactInstanceManagerHolder {
     */
    static <T extends NativeModule> T getNativeModule(
            Class<T> nativeModuleClass) {
-        @SuppressLint("VisibleForTests") ReactContext reactContext
+        ReactContext reactContext
            = reactInstanceManager != null
                ? reactInstanceManager.getCurrentReactContext() : null;

@@ -198,6 +204,18 @@ class ReactInstanceManagerHolder {
                ? reactContext.getNativeModule(nativeModuleClass) : null;
    }

+    /**
+     * Gets the current {@link Activity} linked to React Native.
+     *
+     * @return An activity attached to React Native.
+     */
+    static Activity getCurrentActivity() {
+        ReactContext reactContext
+            = reactInstanceManager != null
+            ? reactInstanceManager.getCurrentReactContext() : null;
+        return reactContext != null ? reactContext.getCurrentActivity() : null;
+    }
+
    static ReactInstanceManager getReactInstanceManager() {
        return reactInstanceManager;
    }
@@ -217,18 +235,13 @@ class ReactInstanceManagerHolder {

        // Initialize the WebRTC module options.
        WebRTCModuleOptions options = WebRTCModuleOptions.getInstance();
-        options.enableMediaProjectionService = true;
-        if (options.videoDecoderFactory == null || options.videoEncoderFactory == null) {
-            EglBase.Context eglContext = EglUtils.getRootEglBaseContext();
-            if (options.videoDecoderFactory == null) {
-                options.videoDecoderFactory = new JitsiVideoDecoderFactory(eglContext);
-            }
-            if (options.videoEncoderFactory == null) {
-                options.videoEncoderFactory = new JitsiVideoEncoderFactory(eglContext);
-            }
-        }

-        JitsiMeetLogger.d(TAG, "initializing RN");
+        EglBase.Context eglContext = EglUtils.getRootEglBaseContext();
+
+        options.videoDecoderFactory = new H264AndSoftwareVideoDecoderFactory(eglContext);
+        options.videoEncoderFactory = new H264AndSoftwareVideoEncoderFactory(eglContext);
+
+        Log.d(TAG, "initializing RN with Activity");

        reactInstanceManager
            = ReactInstanceManager.builder()
@@ -236,7 +249,7 @@ class ReactInstanceManagerHolder {
                .setCurrentActivity(activity)
                .setBundleAssetName("index.android.bundle")
                .setJSMainModulePath("index.android")
-                .setJavaScriptExecutorFactory(new HermesExecutorFactory())
+                .setJavaScriptExecutorFactory(getReactNativeJSFactory())
                .addPackages(getReactNativePackages())
                .setUseDeveloperSupport(BuildConfig.DEBUG)
                .setInitialLifecycleState(LifecycleState.RESUMED)
--- a/android/sdk/src/main/res/values-ru/strings.xml
+++ b/android/sdk/src/main/res/values-ru/strings.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="ongoing_notification_title">Текущая встреча</string>
-    <string name="ongoing_notification_text">Нажмите, чтобы вернуться к встрече.</string>
-    <string name="ongoing_notification_action_hang_up">Отключиться</string>
-    <string name="ongoing_notification_action_mute">Отключить звук</string>
-    <string name="ongoing_notification_action_unmute">Включить звук</string>
-    <string name="ongoing_notification_channel_name">Ongoing Conference Notifications</string>
-</resources>
--- a/android/sdk/src/main/res/values/strings.xml
+++ b/android/sdk/src/main/res/values/strings.xml
@@ -1,8 +1,6 @@
 <resources>
    <string name="app_name">Jitsi Meet SDK</string>
    <string name="dropbox_app_key"></string>
-    <string name="media_projection_notification_title">Media projection</string>
-    <string name="media_projection_notification_text">You are currently sharing your screen.</string>
    <string name="ongoing_notification_title">Ongoing meeting</string>
    <string name="ongoing_notification_text">You are currently in a meeting. Tap to return to it.</string>
    <string name="ongoing_notification_action_hang_up">Hang up</string>
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,9 +1,10 @@
 rootProject.name = 'jitsi-meet'

 include ':app', ':sdk'
+includeBuild('../node_modules/react-native-gradle-plugin')

 include ':react-native-amplitude'
-project(':react-native-amplitude').projectDir = new File(rootProject.projectDir, '../node_modules/@amplitude/react-native/android')
+project(':react-native-amplitude').projectDir = new File(rootProject.projectDir, '../node_modules/@amplitude/react-native//android')
 include ':react-native-async-storage'
 project(':react-native-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-async-storage/async-storage/android')
 include ':react-native-background-timer'
@@ -11,7 +12,7 @@ project(':react-native-background-timer').projectDir = new File(rootProject.proj
 include ':react-native-calendar-events'
 project(':react-native-calendar-events').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-calendar-events/android')
 include ':react-native-community_clipboard'
-project(':react-native-community_clipboard').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-clipboard/clipboard/android')
+project(':react-native-community_clipboard').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/clipboard/android')
 include ':react-native-community_netinfo'
 project(':react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')
 include ':react-native-default-preference'
--- a/app.js
+++ b/app.js
@@ -1,4 +1,4 @@
-/* Jitsi Meet app main entrypoint. */
+/* application specific logic */

 // Re-export jQuery
 // FIXME: Remove this requirement from torture tests.
@@ -10,32 +10,6 @@ import '@matrix-org/olm';

 import 'focus-visible';

-/*
-* Safari polyfill for createImageBitmap
-* https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/createImageBitmap
-*
-* Support source image types: Canvas.
-*/
-if (!('createImageBitmap' in window)) {
-    window.createImageBitmap = function(data) {
-        return new Promise((resolve, reject) => {
-            let dataURL;
-
-            if (data instanceof HTMLCanvasElement) {
-                dataURL = data.toDataURL();
-            } else {
-                reject(new Error('createImageBitmap does not handle the provided image source type'));
-            }
-            const img = document.createElement('img');
-
-            img.addEventListener('load', () => {
-                resolve(img);
-            });
-            img.src = dataURL;
-        });
-    };
-}
-
 // We need to setup the jitsi-local-storage as early as possible so that we can start using it.
 // NOTE: If jitsi-local-storage is used before the initial setup is performed this will break the use case when we use
 // the  local storage from the parent page when the localStorage is disabled. Also the setup is relying that
@@ -57,6 +31,12 @@ if (window.Olm) {
 window.APP = {
    API,
    conference,
+
+    // Used for automated performance tests.
+    connectionTimes: {
+        'index.loaded': window.indexLoadedTime
+    },
+
    translation,
    UI
 };
--- a/babel.config.js
+++ b/babel.config.js
@@ -5,12 +5,5 @@ module.exports = {
            plugins: [ 'react-native-paper/babel' ]
        }
    },
-
-    // This happens because react native has conflict with @babel/plugin-transform-private-methods plugin
-    // https://github.com/ethers-io/ethers.js/discussions/4309#discussioncomment-6694524
-    plugins: [ 'optional-require',
-        [ '@babel/plugin-transform-private-methods', {
-            'loose': true
-        } ]
-    ]
+    plugins: [ 'optional-require' ]
 };
--- a/conference.js
+++ b/conference.js
--- a/config.js
+++ b/config.js
@@ -49,9 +49,7 @@ var config = {
    bosh: 'https://jitsi-meet.example.com/' + subdir + 'http-bind',

    // Websocket URL (XMPP)
-    websocket: 'wss://jitsi-meet.example.com/' + subdir + 'xmpp-websocket',
-
-    // websocketKeepAliveUrl: 'https://jitsi-meet.example.com/' + subdir + '_unlock',
+    // websocket: 'wss://jitsi-meet.example.com/' + subdir + 'xmpp-websocket',

    // Whether BOSH should be preferred over WebSocket if both are configured.
    // preferBosh: false,
@@ -61,10 +59,6 @@ var config = {
    // https://github.com/jitsi/jitsi-meet/issues/7376
    // focusUserJid: 'focus@auth.jitsi-meet.example.com',

-    // Option to send conference requests to jicofo over http (requires nginx rule for it)
-    // conferenceRequestUrl:
-    //   'https://<!--# echo var="http_host" default="jitsi-meet.example.com" -->/' + subdir + 'conference-request/v1',
-
    // Options related to the bridge (colibri) data channel
    bridgeChannel: {
        // If the backend advertises multiple colibri websockets, this options allows
@@ -86,14 +80,12 @@ var config = {
        // Allows the setting of a custom bandwidth value from the UI.
        // assumeBandwidth: true,

-        // Enables use of getDisplayMedia in electron
-        // electronUseGetDisplayMedia: false,
+        // Disables the End to End Encryption feature. Useful for debugging
+        // issues related to insertable streams.
+        // disableE2EE: false,

-        // Enables AV1 codec for FF. Note: By default it is disabled.
-        // enableAV1ForFF: false,
-
-        // Enables the use of the codec selection API supported by the browsers .
-        // enableCodecSelectionAPI: false,
+        // Enables XMPP WebSocket (as opposed to BOSH) for the given amount of users.
+        // mobileXmppWsThreshold: 10, // enable XMPP WebSockets on mobile for 10% of the users

        // P2P test mode disables automatic switching to P2P when there are 2
        // participants in the conference.
@@ -106,17 +98,10 @@ var config = {
        // This is useful when the client runs on a host with limited resources.
        // noAutoPlayVideo: false,

-        // Experiment: Whether to skip interim transcriptions.
-        // skipInterimTranscriptions: false,
-
-        // Dump transcripts to a <transcript> element for debugging.
-        // dumpTranscript: false,
-
-        // Log the audio levels.
-        // debugAudioLevels: true,
-
-        // Will replace ice candidates IPs with invalid ones in order to fail ice.
-        // failICE: true,
+        // Enable callstats only for a percentage of users.
+        // This takes a value between 0 and 100 which determines the probability for
+        // the callstats to be enabled.
+        // callStatsThreshold: 5, // enable callstats for 5% of the users.
    },

    // Disables moderator indicators.
@@ -131,9 +116,6 @@ var config = {
    // Disables polls feature.
    // disablePolls: false,

-    // Disables demote button from self-view
-    // disableSelfDemote: false,
-
    // Disables self-view tile. (hides it from tile view and from filmstrip)
    // disableSelfView: false,

@@ -223,76 +205,25 @@ var config = {
    // installation. Specifically, these files are needed:
    //   - https://meet.example.com/libs/krisp/krisp.mjs
    //   - https://meet.example.com/libs/krisp/models/model_8.kw
-    //   - https://meet.example.com/libs/krisp/models/model_nc.kw
-    //   - https://meet.example.com/libs/krisp/models/model_bvc.kw
-    //   - https://meet.example.com/libs/krisp/assets/bvc-allowed.txt
-    //     In case when you have known BVC supported devices and you want to extend allowed devices list
-    //   - https://meet.example.com/libs/krisp/assets/bvc-allowed-ext.txt
-    //     In case when you have known BVC supported devices and you want to extend allowed devices list
-    //   - https://meet.example.com/libs/krisp/models/model_inbound_8.kw
-    //   - https://meet.example.com/libs/krisp/models/model_inbound_16.kw
-    //     In case when you want to use inbound noise suppression models
-    // NOTE: Krisp JS SDK v2.0.0 was tested.
+    //   - https://meet.example.com/libs/krisp/models/model_16.kw
+    //   - https://meet.example.com/libs/krisp/models/model_32.kw
+    // NOTE: Krisp JS SDK v1.0.9 was tested.
    // noiseSuppression: {
    //     krisp: {
    //         enabled: false,
    //         logProcessStats: false,
    //         debugLogs: false,
-    //         useBVC: false,
-    //         bufferOverflowMS: 1000,
-    //         inboundModels: {
-    //             modelInbound8: 'model_inbound_8.kef',
-    //             modelInbound16: 'model_inbound_16.kef',
-    //         },
-    //         preloadInboundModels: {
-    //             modelInbound8: 'model_inbound_8.kef',
-    //             modelInbound16: 'model_inbound_16.kef',
-    //         },
-    //         preloadModels: {
-    //             modelBVC: 'model_bvc.kef',
-    //             model8: 'model_8.kef',
-    //             modelNC: 'model_nc_mq.kef',
-    //         },
-    //         models: {
-    //             modelBVC: 'model_bvc.kef',
-    //             model8: 'model_8.kef',
-    //             modelNV: 'model_nc_mq.kef',
-    //         },
-    //         bvc: {
-    //             allowedDevices: 'bvc-allowed.txt',
-    //             allowedDevicesExt: 'bvc-allowed-ext.txt',
-    //         }
    //     },
    // },

    // Video

-    // Sets the default camera facing mode.
-    // cameraFacingMode: 'user',
-
    // Sets the preferred resolution (height) for local video. Defaults to 720.
    // resolution: 720,

-    // DEPRECATED. Please use raisedHands.disableRemoveRaisedHandOnFocus instead.
    // Specifies whether the raised hand will hide when someone becomes a dominant speaker or not
    // disableRemoveRaisedHandOnFocus: false,

-    // Specifies which raised hand related config should be set.
-    // raisedHands: {
-    //     // Specifies whether the raised hand can be lowered by moderator.
-    //     disableLowerHandByModerator: false,
-
-    //     // Specifies whether there is a notification before hiding the raised hand
-    //     // when someone becomes the dominant speaker.
-    //     disableLowerHandNotification: true,
-
-    //     // Specifies whether there is a notification when you are the next speaker in line.
-    //     disableNextSpeakerNotification: false,
-
-    //     // Specifies whether the raised hand will hide when someone becomes a dominant speaker or not.
-    //     disableRemoveRaisedHandOnFocus: false,
-    // },
-
    // speakerStats: {
    //     // Specifies whether the speaker stats is enable or not.
    //     disabled: false,
@@ -360,22 +291,18 @@ var config = {
    //     max: 5,
    // },

-    // Optional screenshare settings that give more control over screen capture in the browser.
-    // screenShareSettings: {
-    //      // Show users the current tab is the preferred capture source, default: false.
-    //      desktopPreferCurrentTab: false,
-    //      // Allow users to select system audio, default: include.
-    //      desktopSystemAudio: 'include',
-    //      // Allow users to seamlessly switch which tab they are sharing without having to select the tab again.
-    //      desktopSurfaceSwitching: 'include',
-    //      // Allow a user to be shown a preference for what screen is to be captured, default: unset.
-    //      desktopDisplaySurface: undefined,
-    //      // Allow users to select the current tab as a capture source, default: exclude.
-    //      desktopSelfBrowserSurface: 'exclude'
-    // },
+    // This option has been deprecated since it is no longer supported as per the w3c spec.
+    // https://w3c.github.io/mediacapture-screen-share/#dom-mediadevices-getdisplaymedia. If the user has not
+    // interacted with the webpage before the getDisplayMedia call, the promise will be rejected by the browser. This
+    // has already been implemented in Firefox and Safari and will be implemented in Chrome soon.
+    // https://bugs.chromium.org/p/chromium/issues/detail?id=1198918
+    // startScreenSharing: false,

    // Recording

+    // DEPRECATED. Use recordingService.enabled instead.
+    // fileRecordingsEnabled: false,
+
    // Enable the dropbox integration.
    // dropbox: {
    //     appKey: '<APP_KEY>', // Specify your app key here.
@@ -386,23 +313,6 @@ var config = {
    //          'https://jitsi-meet.example.com/subfolder/static/oauth.html',
    // },

-    // configuration for all things recording related. Existing settings will be migrated here in the future.
-    // recordings: {
-    //    // IF true (default) recording audio and video is selected by default in the recording dialog.
-    //    // recordAudioAndVideo: true,
-    //    // If true, shows a notification at the start of the meeting with a call to action button
-    //    // to start recording (for users who can do so).
-    //    // suggestRecording: true,
-    //    // If true, shows a warning label in the prejoin screen to point out the possibility that
-    //    // the call you're joining might be recorded.
-    //    // showPrejoinWarning: true,
-    //    // If true, the notification for recording start will display a link to download the cloud recording.
-    //    // showRecordingLink: true,
-    //    // If true, mutes audio and video when a recording begins and displays a dialog
-    //    // explaining the effect of unmuting.
-    //    // requireConsent: true,
-    // },
-
    // recordingService: {
    //     // When integrations like dropbox are enabled only that will be shown,
    //     // by enabling fileRecordingsServiceEnabled, we show both the integrations
@@ -463,7 +373,7 @@ var config = {
    // DEPRECATED. Use transcription.preferredLanguage instead.
    // preferredTranscribeLanguage: 'en-US',

-    // DEPRECATED. Use transcription.autoTranscribeOnRecord instead.
+    // DEPRECATED. Use transcription.autoCaptionOnRecord instead.
    // autoCaptionOnRecord: false,

    // Transcription options.
@@ -473,7 +383,7 @@ var config = {

    //     // Translation languages.
    //     // Available languages can be found in
-    //     // ./lang/translation-languages.json.
+    //     // ./src/react/features/transcribing/translation-languages.json.
    //     translationLanguages: ['en', 'es', 'fr', 'ro'],

    //     // Important languages to show on the top of the language list.
@@ -492,12 +402,11 @@ var config = {
    //     // ./src/react/features/transcribing/transcriber-langs.json.
    //     preferredLanguage: 'en-US',

-    //     // Enables automatic turning on transcribing when recording is started
-    //     autoTranscribeOnRecord: false,
+    //     // Disable start transcription for all participants.
+    //     disableStartForAll: false,

-    //     // Enables automatic request of subtitles when transcriber is present in the meeting, uses the default
-    //     // language that is set
-    //     autoCaptionOnTranscribe: false,
+    //     // Enables automatic turning on captions when recording is started
+    //     autoCaptionOnRecord: false,
    // },

    // Misc
@@ -523,65 +432,29 @@ var config = {
    // videoQuality: {
    //
    //    // Provides a way to set the codec preference on desktop based endpoints.
-    //    codecPreferenceOrder: [ 'AV1', 'VP9', 'VP8', 'H264' ],
+    //    codecPreferenceOrder: [ 'VP9', 'VP8', 'H264' ],
    //
-    //    // Provides a way to set the codec for screenshare.
-    //    screenshareCodec: 'AV1',
-    //    mobileScreenshareCodec: 'VP8',
-    //
-    //    // Enables the adaptive mode in the client that will make runtime adjustments to selected codecs and received
-    //    // videos for a better user experience. This mode will kick in only when CPU overuse is reported in the
-    //    // WebRTC statistics for the outbound video streams.
-    //    enableAdaptiveMode: false,
-    //
-    //    // Codec specific settings for scalability modes and max bitrates.
-    //    av1: {
-    //      maxBitratesVideo: {
-    //          low: 100000,
-    //          standard: 300000,
-    //          high: 1000000,
-    //          fullHd: 2000000,
-    //          ultraHd: 4000000,
-    //          ssHigh: 2500000
-    //      },
-    //      scalabilityModeEnabled: true,
-    //      useSimulcast: false,
-    //      useKSVC: true
-    //    },
-    //    h264: {
-    //      maxBitratesVideo: {
-    //          low: 200000,
-    //          standard: 500000,
-    //          high: 1500000,
-    //          fullHd: 3000000,
-    //          ultraHd: 6000000,
-    //          ssHigh: 2500000
-    //      },
-    //      scalabilityModeEnabled: true
-    //    },
-    //    vp8: {
-    //      maxBitratesVideo: {
-    //          low: 200000,
-    //          standard: 500000,
-    //          high: 1500000,
-    //          fullHd: 3000000,
-    //          ultraHd: 6000000,
-    //          ssHigh: 2500000
-    //      },
-    //      scalabilityModeEnabled: false
-    //    },
-    //    vp9: {
-    //      maxBitratesVideo: {
-    //          low: 100000,
-    //          standard: 300000,
-    //          high: 1200000,
-    //          fullHd: 2500000,
-    //          ultraHd: 5000000,
-    //          ssHigh: 2500000
-    //      },
-    //      scalabilityModeEnabled: true,
-    //      useSimulcast: false,
-    //      useKSVC: true
+    //    // Provides a way to configure the maximum bitrates that will be enforced on the simulcast streams for
+    //    // video tracks. The keys in the object represent the type of the stream (LD, SD or HD) and the values
+    //    // are the max.bitrates to be set on that particular type of stream. The actual send may vary based on
+    //    // the available bandwidth calculated by the browser, but it will be capped by the values specified here.
+    //    // This is currently not implemented on app based clients on mobile.
+    //    maxBitratesVideo: {
+    //          H264: {
+    //              low: 200000,
+    //              standard: 500000,
+    //              high: 1500000,
+    //          },
+    //          VP8 : {
+    //              low: 200000,
+    //              standard: 500000,
+    //              high: 1500000,
+    //          },
+    //          VP9: {
+    //              low: 100000,
+    //              standard: 300000,
+    //              high: 1200000,
+    //          },
    //    },
    //
    //    // The options can be used to override default thresholds of video thumbnail heights corresponding to
@@ -600,7 +473,23 @@ var config = {
    //    },
    //
    //    // Provides a way to set the codec preference on mobile devices, both on RN and mobile browser based endpoint
-    //    mobileCodecPreferenceOrder: [ 'VP8', 'VP9', 'H264', 'AV1' ],
+    //    mobileCodecPreferenceOrder: [ 'VP8', 'VP9', 'H264' ],
+    //
+    //    // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
+    //    // Provides a way to prevent a video codec from being negotiated on the JVB connection. The codec specified
+    //    // here will be removed from the list of codecs present in the SDP answer generated by the client. If the
+    //    // same codec is specified for both the disabled and preferred option, the disable settings will prevail.
+    //    // Note that 'VP8' cannot be disabled since it's a mandatory codec, the setting will be ignored in this case.
+    //    disabledCodec: 'H264',
+    //
+    //    // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
+    //    // Provides a way to set a preferred video codec for the JVB connection. If 'H264' is specified here,
+    //    // simulcast will be automatically disabled since JVB doesn't support H264 simulcast yet. This will only
+    //    // rearrange the the preference order of the codecs in the SDP answer generated by the browser only if the
+    //    // preferred codec specified here is present. Please ensure that the JVB offers the specified codec for this
+    //    // to take effect.
+    //    preferredCodec: 'VP8',
+    //
    // },

    // Notification timeouts
@@ -608,7 +497,6 @@ var config = {
    //     short: 2500,
    //     medium: 5000,
    //     long: 10000,
-    //     extraLong: 60000,
    // },

    // // Options for the recording limit notification.
@@ -638,6 +526,14 @@ var config = {
    // Disables or enables REMB support in this client (default: enabled).
    // enableRemb: true,

+    // Enables ICE restart logic in LJM and displays the page reload overlay on
+    // ICE failure. Current disabled by default because it's causing issues with
+    // signaling when Octo is enabled. Also when we do an "ICE restart"(which is
+    // not a real ICE restart), the client maintains the TCC sequence number
+    // counter, but the bridge resets it. The bridge sends media packets with
+    // TCC sequence numbers starting from 0.
+    // enableIceRestart: false,
+
    // Enables forced reload of the client when the call is migrated as a result of
    // the bridge going down.
    // enableForcedReload: true,
@@ -690,7 +586,7 @@ var config = {
    //     // Whether to disable welcome page. In case it's disabled a random room
    //     // will be joined when no room is specified.
    //     disabled: false,
-    //     // If set, landing page will redirect to this URL.
+    //     // If set,landing page will redirect to this URL.
    //     customUrl: ''
    // },

@@ -760,16 +656,10 @@ var config = {
    // and microsoftApiApplicationClientID
    // enableCalendarIntegration: false,

-    // Whether to notify when the conference is terminated because it was destroyed.
-    // notifyOnConferenceDestruction: true,
-
-    // The client id for the google APIs used for the calendar integration, youtube livestreaming, etc.
-    // googleApiApplicationClientID: '<client_id>',
-
    // Configs for prejoin page.
    // prejoinConfig: {
    //     // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
-    //     // This replaces `prejoinPageEnabled`. Defaults to true.
+    //     // This replaces `prejoinPageEnabled`.
    //     enabled: true,
    //     // Hides the participant name editing field in the prejoin screen.
    //     // If requireDisplayName is also set as true, a name should still be provided through
@@ -777,11 +667,6 @@ var config = {
    //     hideDisplayName: false,
    //     // List of buttons to hide from the extra join options dropdown.
    //     hideExtraJoinButtons: ['no-audio', 'by-phone'],
-    //     // Configuration for pre-call test
-    //     // By setting preCallTestEnabled, you enable the pre-call test in the prejoin page.
-    //     // ICE server credentials need to be provided over the preCallTestICEUrl
-    //     preCallTestEnabled: false,
-    //     preCallTestICEUrl: ''
    // },

    // When 'true', the user cannot edit the display name.
@@ -800,6 +685,10 @@ var config = {
    // set or the lobby is not enabled.
    // enableInsecureRoomNameWarning: false,

+    // Whether to automatically copy invitation URL after creating a room.
+    // 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/' ],

@@ -881,22 +770,6 @@ var config = {
    //     autoHideWhileChatIsOpen: false,
    // },

-    // Overrides the buttons displayed in the main toolbar. Depending on the screen size the number of displayed
-    // buttons varies from 2 buttons to 8 buttons. Every array in the mainToolbarButtons array will replace the
-    // corresponding default buttons configuration matched by the number of buttons specified in the array. Arrays with
-    // more than 8 buttons or less then 2 buttons will be ignored. When there there isn't an override for a certain
-    // configuration (for example when 3 buttons are displayed) the default jitsi-meet configuration will be used.
-    // The order of the buttons in the array is preserved.
-    // mainToolbarButtons: [
-    //     [ 'microphone', 'camera', 'desktop', 'chat', 'raisehand', 'reactions', 'participants-pane', 'tileview' ],
-    //     [ 'microphone', 'camera', 'desktop', 'chat', 'raisehand', 'participants-pane', 'tileview' ],
-    //     [ 'microphone', 'camera', 'desktop', 'chat', 'raisehand', 'participants-pane' ],
-    //     [ 'microphone', 'camera', 'desktop', 'chat', 'participants-pane' ],
-    //     [ 'microphone', 'camera', 'chat', 'participants-pane' ],
-    //     [ 'microphone', 'camera', 'chat' ],
-    //     [ 'microphone', 'camera' ]
-    // ],
-
    // 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
@@ -1017,10 +890,38 @@ var config = {
    // The interval at which PeerConnection.getStats() is called. Defaults to 10000
    // pcStatsInterval: 10000,

-    // Enables sending participants' display names to stats
+    // To enable sending statistics to callstats.io you must provide the
+    // Application ID and Secret.
+    // callStatsID: '',
+    // callStatsSecret: '',
+    // callStatsApplicationLogsDisabled: false,
+
+    // The callstats initialize config params as described in the API:
+    // https://docs.callstats.io/docs/javascript#callstatsinitialize-with-app-secret
+    // callStatsConfigParams: {
+    //     disableBeforeUnloadHandler: true, // disables callstats.js's window.onbeforeunload parameter.
+    //     applicationVersion: "app_version", // Application version specified by the developer.
+    //     disablePrecalltest: true, // disables the pre-call test, it is enabled by default.
+    //     siteID: "siteID", // The name/ID of the site/campus from where the call/pre-call test is made.
+    //     additionalIDs: { // additionalIDs object, contains application related IDs.
+    //         customerID: "Customer Identifier. Example, walmart.",
+    //         tenantID: "Tenant Identifier. Example, monster.",
+    //         productName: "Product Name. Example, Jitsi.",
+    //         meetingsName: "Meeting Name. Example, Jitsi loves callstats.",
+    //         serverName: "Server/MiddleBox Name. Example, jvb-prod-us-east-mlkncws12.",
+    //         pbxID: "PBX Identifier. Example, walmart.",
+    //         pbxExtensionID: "PBX Extension Identifier. Example, 5625.",
+    //         fqExtensionID: "Fully qualified Extension Identifier. Example, +71 (US) +5625.",
+    //         sessionID: "Session Identifier. Example, session-12-34",
+    //     },
+    //     collectLegacyStats: true, //enables the collection of legacy stats in chrome browser
+    //     collectIP: true, //enables the collection localIP address
+    // },
+
+    // Enables sending participants' display names to callstats
    // enableDisplayNameInStats: false,

-    // Enables sending participants' emails (if available) to stats and other analytics
+    // Enables sending participants' emails (if available) to callstats and other analytics
    // enableEmailInStats: false,

    // faceLandmarks: {
@@ -1043,7 +944,7 @@ var config = {
    //     captureInterval: 1000,
    // },

-    // Controls the percentage of automatic feedback shown to participants.
+    // Controls the percentage of automatic feedback shown to participants when callstats is enabled.
    // The default value is 100%. If set to 0, no automatic feedback will be requested
    // feedbackPercentage: 100,

@@ -1051,7 +952,7 @@ var config = {
    //

    // If third party requests are disabled, no other server will be contacted.
-    // This means avatars will be locally generated and external stats integration
+    // This means avatars will be locally generated and callstats integration
    // will not function.
    // disableThirdPartyRequests: false,

@@ -1078,14 +979,10 @@ var config = {

        // Provides a way to set the codec preference on mobile devices, both on RN and mobile browser based
        // endpoints.
-        // mobileCodecPreferenceOrder: [ 'H264', 'VP8', 'VP9', 'AV1' ],
+        // mobileCodecPreferenceOrder: [ 'H264', 'VP8', 'VP9' ],
        //
        // Provides a way to set the codec preference on desktop based endpoints.
-        // codecPreferenceOrder: [ 'AV1', 'VP9', 'VP8', 'H264 ],
-
-        // Provides a way to set the codec for screenshare.
-        // screenshareCodec: 'AV1',
-        // mobileScreenshareCodec: 'VP8',
+        // codecPreferenceOrder: [ 'VP9', 'VP8', 'H264 ],

        // How long we're going to wait, before going back to P2P after the 3rd
        // participant has left the conference (to filter out page reload).
@@ -1097,12 +994,24 @@ var config = {
            // { urls: 'stun:jitsi-meet.example.com:3478' },
            { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' },
        ],
+
+        // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
+        // Provides a way to set the video codec preference on the p2p connection. Acceptable
+        // codec values are 'VP8', 'VP9' and 'H264'.
+        // preferredCodec: 'H264',
+
+        // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
+        // Provides a way to prevent a video codec from being negotiated on the p2p connection.
+        // disabledCodec: '',
    },

    analytics: {
        // True if the analytics should be disabled
        // disabled: false,

+        // The Google Analytics Tracking ID:
+        // googleAnalyticsTrackingId: 'your-tracking-id-UA-123456-1',
+
        // Matomo configuration:
        // matomoEndpoint: 'https://your-matomo-endpoint/',
        // matomoSiteID: '42',
@@ -1140,6 +1049,7 @@ var config = {

        // Array of script URLs to load as lib-jitsi-meet "analytics handlers".
        // scriptURLs: [
+        //      "libs/analytics-ga.min.js", // google-analytics
        //      "https://example.com/my-custom-analytics.js",
        // ],

@@ -1225,7 +1135,6 @@ var config = {
    //     warning: '',
    //   },
    //   externallyManagedKey: false,
-    //   disabled: false,
    // },

    // Options related to end-to-end (participant to participant) ping.
@@ -1262,17 +1171,9 @@ var config = {
    // https://firebase.google.com/docs/dynamic-links/create-manually
    // deeplinking: {
    //
-    //     // The desktop deeplinking config, disabled by default.
+    //     // The desktop deeplinking config.
    //     desktop: {
-    //         appName: 'Jitsi Meet',
-    //         appScheme: 'jitsi-meet,
-    //         download: {
-    //             linux:
-    //               'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet-x86_64.AppImage',
-    //             macos: 'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet.dmg',
-    //             windows: 'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet.exe'
-    //         },
-    //         enabled: false
+    //         appName: 'Jitsi Meet'
    //     },
    //     // If true, any checks to handoff to another application will be prevented
    //     // and instead the app will continue to display in the current browser.
@@ -1355,8 +1256,6 @@ var config = {
    // remoteVideoMenu: {
    //     // Whether the remote video context menu to be rendered or not.
    //     disabled: true,
-    //     // If set to true the 'Switch to visitor' button will be disabled.
-    //     disableDemote: true,
    //     // If set to true the 'Kick out' button will be disabled.
    //     disableKick: true,
    //     // If set to true the 'Grant moderator' button will be disabled.
@@ -1377,18 +1276,17 @@ var config = {
    // If set to true all muting operations of remote participants will be disabled.
    // disableRemoteMute: true,

+    // Enables support for lip-sync for this client (if the browser supports it).
+    // enableLipSync: false,
+
    /**
     External API url used to receive branding specific information.
     If there is no url set or there are missing fields, the defaults are applied.
     The config file should be in JSON.
     None of the fields are mandatory and the response must have the shape:
    {
-        // Whether participant can only send group chat message if `send-groupchat` feature is enabled in jwt.
-        groupChatRequiresPermission: false,
-        // Whether participant can only create polls if `create-polls` feature is enabled in jwt.
-        pollCreationRequiresPermission: false,
        // The domain url to apply (will replace the domain in the sharing conference link/embed section)
-        inviteDomain: 'example-company.org',
+        inviteDomain: 'example-company.org,
        // The hex value for the colour used as background
        backgroundColor: '#fff',
        // The url for the image used as background
@@ -1447,17 +1345,8 @@ var config = {
    */
    // dynamicBrandingUrl: '',

-    // A list of allowed URL domains for shared video.
-    //
-    // NOTE:
-    // '*' is allowed value and it will allow any URL to be used for shared video. We do not recommend using '*',
-    // use it at your own risk!
-    // sharedVideoAllowedURLDomains: [ ],
-
    // Options related to the participants pane.
    // participantsPane: {
-    //     // Enables feature
-    //     enabled: true,
    //     // Hides the moderator settings tab.
    //     hideModeratorSettingsTab: false,
    //     // Hides the more actions button.
@@ -1483,6 +1372,9 @@ var config = {
    // Only the default ones from will be available.
    // disableAddingBackgroundImages: false,

+    // Disables using screensharing as virtual background.
+    // disableScreensharingVirtualBackground: false,
+
    // Sets the background transparency level. '0' is fully transparent, '1' is opaque.
    // backgroundAlpha: 1,

@@ -1509,6 +1401,7 @@ var config = {
    //         'conference-timer',
    //         'participants-count',
    //         'e2ee',
+    //         'transcribing',
    //         'video-quality',
    //         'insecure-room',
    //         'highlight-moment',
@@ -1576,64 +1469,26 @@ var config = {
    // You can enable tokenAuthUrlAutoRedirect which will detect that you have logged in successfully before
    // and will automatically redirect to the token service to get the token for the meeting.
    // tokenAuthUrlAutoRedirect: false
-    // An option to respect the context.tenant jwt field compared to the current tenant from the url
-    // tokenRespectTenant: false,
-
-    // You can put an array of values to target different entity types in the invite dialog.
-    // Valid values are "phone", "room", "sip", "user", "videosipgw" and "email"
-    // peopleSearchQueryTypes: ["user", "email"],
-    // Directory endpoint which is called for invite dialog autocomplete
-    // peopleSearchUrl: "https://myservice.com/api/people",
-    // Endpoint which is called to send invitation requests
-    // inviteServiceUrl: "https://myservice.com/api/invite",
-
-    // For external entities (e. g. email), the localStorage key holding the token value for directory authentication
-    // peopleSearchTokenLocation: "mytoken",
-
-
-    // Options related to visitors.
-    // visitors: {
-    //     // Starts audio/video when the participant is promoted from visitor.
-    //     enableMediaOnPromote: {
-    //         audio: true,
-    //         video: true
-    //     },
-    // },
-    // The default type of desktop sharing sources that will be used in the electron app.
-    // desktopSharingSources: ['screen', 'window'],
-
-    // Disables the echo cancelation for local audio tracks.
-    // disableAEC: true,
-
-    // Disables the auto gain control for local audio tracks.
-    // disableAGC: true,
-
-    // Disables the audio processing (echo cancelation, auto gain control and noise suppression) for local audio tracks.
-    // disableAP: true,
-
-    // Disables the anoise suppression for local audio tracks.
-    // disableNS: true,
-
-    // Replaces the display name with the JID of the participants.
-    // displayJids: true,
-
-    // Enables disables talk while muted detection.
-    // enableTalkWhileMuted: true,
-
-    // Sets the peer connection ICE transport policy to "relay".
-    // forceTurnRelay: true,

    // List of undocumented settings used in jitsi-meet
    /**
     _immediateReloadThreshold
+     debug
+     debugAudioLevels
     deploymentInfo
     dialOutAuthUrl
     dialOutCodesUrl
     dialOutRegionUrl
     disableRemoteControl
+     displayJids
+     firefox_fake_device
+     googleApiApplicationClientID
     iAmRecorder
     iAmSipGateway
     microsoftApiApplicationClientID
+     peopleSearchQueryTypes
+     peopleSearchUrl
+     requireDisplayName
     */

    /**
@@ -1648,8 +1503,17 @@ var config = {
     _peerConnStatusOutOfLastNTimeout
     _peerConnStatusRtcMuteTimeout
     avgRtpStatsN
+     callStatsConfIDNamespace
+     callStatsCustomScriptUrl
     desktopSharingSources
+     disableAEC
+     disableAGC
+     disableAP
+     disableHPF
     disableLocalStats
+     disableNS
+     enableTalkWhileMuted
+     forceTurnRelay
     hiddenDomain
     hiddenFromRecorderFeatureEnabled
     ignoreStartMuted
@@ -1726,7 +1590,7 @@ var config = {
    //     'notify.participantsWantToJoin', // shown when lobby is enabled and participants request to join meeting
    //     'notify.passwordRemovedRemotely', // shown when a password has been removed remotely
    //     'notify.passwordSetRemotely', // shown when a password has been set remotely
-    //     'notify.raisedHand', // shown when a participant used raise hand,
+    //     'notify.raisedHand', // shown when a partcipant used raise hand,
    //     'notify.screenShareNoAudio', // shown when the audio could not be shared for the selected screen
    //     'notify.screenSharingAudioOnlyTitle', // shown when the best performance has been affected by screen sharing
    //     'notify.selfViewTitle', // show "You can always un-hide the self-view from settings"
@@ -1747,7 +1611,7 @@ var config = {
    //     'toolbar.noAudioSignalTitle', // shown when a broken mic is detected
    //     'toolbar.noisyAudioInputTitle', // shown when noise is detected for the current microphone
    //     'toolbar.talkWhileMutedPopup', // shown when user tries to speak while muted
-    //     'transcribing.failed', // shown when transcribing fails
+    //     'transcribing.failedToStart', // shown when transcribing fails to start
    // ],

    // List of notifications to be disabled. Works in tandem with the above setting.
@@ -1757,7 +1621,7 @@ var config = {
    // disableFilmstripAutohiding: false,

    // filmstrip: {
-    //     // Disable the vertical/horizontal filmstrip.
+    //     // Disable the vertical/horizonal filmstrip.
    //     disabled: false,
    //     // Disables user resizable filmstrip. Also, allows configuration of the filmstrip
    //     // (width, tiles aspect ratios) through the interfaceConfig options.
@@ -1806,20 +1670,22 @@ var config = {
    //     tileTime: 5000,
    //     // Limit results by rating: g, pg, pg-13, r. Default value: g.
    //     rating: 'pg',
+    //     // The proxy server url for giphy requests in the web app.
+    //     proxyUrl: 'https://giphy-proxy.example.com',
    // },

    // Logging
    // logging: {
    //      // Default log level for the app and lib-jitsi-meet.
    //      defaultLogLevel: 'trace',
-    //      // Option to disable LogCollector.
+    //      // Option to disable LogCollector (which stores the logs on CallStats).
    //      //disableLogCollector: true,
    //      // Individual loggers are customizable.
    //      loggers: {
-    //          // The following are too verbose in their logging with the default level.
-    //          'modules/RTC/TraceablePeerConnection.js': 'info',
-    //          'modules/xmpp/strophe.util.js': 'log',
-    //      },
+    //      // The following are too verbose in their logging with the default level.
+    //      'modules/RTC/TraceablePeerConnection.js': 'info',
+    //      'modules/statistics/CallStats.js': 'info',
+    //      'modules/xmpp/strophe.util.js': 'log',
    // },

    // Application logo url
@@ -1836,7 +1702,7 @@ var config = {
    //     // to control the performance.
    //     userLimit: 25,
    //     // The url for more info about the whiteboard and its usage limitations.
-    //     limitUrl: 'https://example.com/blog/whiteboard-limits',
+    //     limitUrl: 'https://example.com/blog/whiteboard-limits,
    // },

    // The watchRTC initialize config params as described :
@@ -1872,14 +1738,14 @@ var config = {
    //         collectionInterval?: number;
    //         logGetStats?: boolean;
    // },
-
-    // Hide login button on auth dialog, you may want to enable this if you are using JWT tokens to authenticate users
-    // hideLoginButton: true,
-
-    // If true remove the tint foreground on focused user camera in filmstrip
-    // disableCameraTintForeground: false,
 };

+// Temporary backwards compatibility with old mobile clients.
+config.flags = config.flags || {};
+config.flags.sourceNameSignaling = true;
+config.flags.sendMultipleVideoStreams = true;
+config.flags.receiveMultipleVideoStreams = true;
+
 // Set the default values for JaaS customers
 if (enableJaaS) {
    config.dialInNumbersUrl = 'https://conference-mapper.jitsi.net/v1/access/dids';
--- a/css/404.scss
+++ b/css/404.scss
@@ -4,12 +4,12 @@
    text-align: center;

    h2 {
-        font-size: 3rem;
+        font-size: 48px;
        color : #f2f2f2;
    }

    &__message {
-        font-size: 1.5rem;
+        font-size: 24px;
        margin-top: 20px;
    }
 }
--- a/css/_base.scss
+++ b/css/_base.scss
@@ -28,7 +28,7 @@ body {
    margin: 0px;
    width: 100%;
    height: 100%;
-    font-size: 0.75rem;
+    font-size: 12px;
    font-weight: 400;
    overflow: hidden;
    color: #F1F1F1;
@@ -111,22 +111,21 @@ form {
    height: $watermarkHeight;
    background-size: contain;
    background-repeat: no-repeat;
-    z-index: $watermarkZ;
+    z-index: $zindex2;
 }

 .leftwatermark {
-    max-width: 140px;
-    max-height:70px;
    left: 32px;
    top: 32px;
    background-position: center left;
    background-repeat: no-repeat;
    background-size: contain;
+}

-    &.no-margin {
-        left:0;
-        top:0;
-    }
+.leftwatermarknomargin {
+    background-position: center left;
+    background-repeat: no-repeat;
+    background-size: contain;
 }

 .rightwatermark {
@@ -139,10 +138,10 @@ form {
    position: absolute;
    left: 25;
    bottom: 7;
-    font-size: 0.875rem;
+    font-size: 11pt;
    color: rgba(255,255,255,.50);
    text-decoration: none;
-    z-index: $watermarkZ;
+    z-index: 100;
 }

 /**
--- a/css/_chat.scss
+++ b/css/_chat.scss
@@ -1,8 +1,5 @@
-@use './variables';
-
 #chat-conversation-container {
    // extract message input height
-    box-sizing: border-box;
    height: calc(100% - 64px);
    overflow: hidden;
    position: relative;
@@ -11,9 +8,9 @@
 #chatconversation {
    box-sizing: border-box;
    flex: 1;
-    font-size: 0.75rem;
-    height: calc(100% - 10px);
-    line-height: 1.25rem;
+    font-size: 10pt;
+    height: 100%;
+    line-height: 20px;
    overflow: auto;
    padding: 16px;
    text-align: left;
@@ -22,13 +19,6 @@
    display: flex;
    flex-direction: column;

-    &.focus-visible {
-        outline: 0;
-        margin: 4px;
-        border-radius: 0 0 variables.$borderRadius variables.$borderRadius;
-        box-shadow: 0px 0px 0px 2px #4687ed; // focus01/primary07
-    }
-
    & > :first-child {
        margin-top: auto;
    }
@@ -72,7 +62,7 @@
 #nickname {
    text-align: center;
    color: #9d9d9d;
-    font-size: 1rem;
+    font-size: 16px;
    margin: auto 0;
    padding: 0 16px;

@@ -86,7 +76,7 @@
    }

    label {
-        line-height: 1.5rem;
+        line-height: 24px;
    }
 }

@@ -98,7 +88,7 @@
    }

    .chatmessage .usermessage {
-        font-size: 1rem;
+        font-size: 16px;
    }
 }

@@ -112,7 +102,7 @@
        }

        .usermessage {
-            color: #ffffff;
+            color: red;
            padding: 0;
        }
    }
@@ -124,7 +114,7 @@
 }

 #smileys {
-    font-size: 1.625rem;
+    font-size: 20pt;
    margin: auto;
    cursor: pointer;
 }
@@ -168,7 +158,7 @@
 }

 #smileysContainer .smiley {
-    font-size: 1.625rem;
+    font-size: 20pt;
 }

 .smileyContainer {
@@ -219,8 +209,8 @@
        box-sizing: border-box;
        color: #fff;
        font-weight: 600;
-        font-size: 1.5rem;
-        line-height: 2rem;
+        font-size: 24px;
+        line-height: 32px;

        .jitsi-icon {
            cursor: pointer;
--- a/css/_chrome-extension-banner.scss
+++ b/css/_chrome-extension-banner.scss
@@ -34,8 +34,8 @@
    }

    &__checkbox-label {
-        font-size: 0.875rem;
-        line-height: 1.125rem;
+        font-size: 14px;
+        line-height: 18px;
        display: flex;
        align-items: center;
        letter-spacing: -0.006em;
@@ -51,8 +51,8 @@
    }

    &__text-container {
-      font-size: 0.875rem;
-      line-height: 1.125rem;
+      font-size: 14px;
+      line-height: 18px;
      display: flex;
      align-items: center;
      letter-spacing: -0.006em;
@@ -84,8 +84,8 @@

    &__button-text {
      font-weight: 600;
-      font-size: 0.875rem;
-      line-height: 2.5rem;
+      font-size: 14px;
+      line-height: 40px;
      text-align: center;
      letter-spacing: -0.006em;
      color: #FFFFFF;
--- a/css/_inlay.scss
+++ b/css/_inlay.scss
@@ -10,7 +10,7 @@
        margin: 17px 0;
        padding-bottom: 17px;
        color: #ffffff;
-        font-size: 1.25rem;
+        font-size: 21px;
        letter-spacing: 0.3px;
        border-bottom: 1px solid lighten(#FFFFFF, 10%);
    }
@@ -19,12 +19,12 @@
        color: #ffffff;
        display: block;
        margin-top: 22px;
-        font-size: 1rem;
+        font-size: 16px;
    }

    &__icon {
        margin: 0 10px;
-        font-size: 3.125rem;
+        font-size: 50px;
    }

 }
--- a/css/_meetings_list.scss
+++ b/css/_meetings_list.scss
@@ -1,14 +1,14 @@
 .meetings-list {
-    font-size: 0.875rem;
+    font-size: 14px;
    color: #253858;
-    line-height: 1.25rem;
+    line-height: 20px;
    text-align: left;
    text-overflow: ellipsis;
    display: flex;
    flex-direction: column;
    position: relative;
-    overflow-y: auto;
-    flex-grow: 1;
+    overflow: auto;
+    width: 100%;

    .meetings-list-empty {
        text-align: center;
@@ -19,11 +19,11 @@
        flex-direction: column;

        .description {
-            color: #2f3237;
-            font-size: 0.875rem;
-            line-height: 1.125rem;
-            margin-bottom: 16px;
-            max-width: 436px;
+           color: #2f3237;
+           font-size: 14px;
+           line-height: 18px;
+           margin-bottom: 16px;
+           max-width: 436px;
        }
    }

@@ -37,8 +37,8 @@
        color: #0163FF;
        cursor: pointer;
        display: flex;
-        font-size: 0.875rem;
-        line-height: 1.125rem;
+        font-size: 14px;
+        line-height: 18px;
        margin: 24px 0 32px 0;
    }

@@ -101,17 +101,17 @@
        }

        .title {
-            font-size: 0.75rem;
+            font-size: 12px;
            font-weight: 600;
-            line-height: 1rem;
+            line-height: 16px;
            margin-bottom: 4px;
        }

        .subtitle {
            color: #5E6D7A;
            font-weight: normal;
-            font-size: 0.75rem;
-            line-height: 1rem;
+            font-size: 12px;
+            line-height: 16px;
        }


@@ -127,8 +127,7 @@
            cursor: pointer;
        }

-        &.with-click-handler:hover,
-        &.with-click-handler:focus {
+        &.with-click-handler:hover {
            background-color: #c7ddff;
        }

@@ -156,30 +155,14 @@
        margin-right: 16px;
        position: absolute;

-        &>svg {
+        &> svg {
            fill: #0074e0;
        }
    }

-    .item:hover,
-    .item:focus,
-    .item:focus-within {
+    .item:hover, .item:focus, .item:focus-within {
        .delete-meeting {
            display: block;
        }
-
-        .delete-meeting:hover {
-            &>svg {
-                fill: #4687ED;
-            }
-        }
    }
-
-    @media (max-width: 1024px) {  /* Targets iPads and smaller devices */
-        .item {
-            .delete-meeting {
-                display: block !important;
-            }
-        }
-    }
-}
+}
--- a/css/_navigate_section_list.scss
+++ b/css/_navigate_section_list.scss
@@ -1,7 +1,7 @@
 %navigate-section-list-text {
    width: 100%;
-    font-size: 0.875rem;
-    line-height: 1.25rem;
+    font-size: 14px;
+    line-height: 20px;
    color: $welcomePageTitleColor;
    text-align: left;
    font-family: 'open_sanslight', Helvetica, sans-serif;
@@ -52,7 +52,7 @@
 .navigate-section-tile-body {
    @extend %navigate-section-list-tile-text;
    font-weight: normal;
-    line-height: 1.5rem;
+    line-height: 24px;
 }
 .navigate-section-list-tile-info {
    flex: 1;
@@ -61,7 +61,7 @@
 .navigate-section-tile-title {
    @extend %navigate-section-list-tile-text;
    font-weight: bold;
-    line-height: 1.5rem;
+    line-height: 24px;
 }
 .navigate-section-section-header {
    @extend %navigate-section-list-text;
--- a/css/_policy.scss
+++ b/css/_policy.scss
@@ -8,8 +8,8 @@

    &__text {
        text-align: center;
-        font-size: 0.875rem;
-        line-height: 1.25rem;
+        font-size: 14px;
+        line-height: 21px;
        font-weight: 300;
    }
 }
--- a/css/_reactions-menu.scss
+++ b/css/_reactions-menu.scss
@@ -1,14 +1,14 @@
@use 'sass:math';

 .reactions-menu {
-	width: 330px;
+	width: 280px;
 	background: #242528;
 	box-shadow: 0px 3px 16px rgba(0, 0, 0, 0.6), 0px 0px 4px 1px rgba(0, 0, 0, 0.25);
 	border-radius: 6px;
 	padding: 16px;

 	&.with-gif {
-		width: 380px;
+		width: 328px;

 		.reactions-row .toolbox-button:last-of-type {
 			top: 3px;
@@ -55,7 +55,7 @@
 		span.emoji {
 			width: 40px;
 			height: 40px;
-			font-size: 1.375rem;
+			font-size: 22px;
 			display: flex;
 			align-items: center;
 			justify-content: center;
@@ -63,7 +63,7 @@

 			@for $i from 1 through 12 {
 				&.increase-#{$i}{
-					font-size: calc(1.25rem + #{$i}px);
+					font-size: calc(20px + #{$i}px);
 				}
 			}
 		}
@@ -96,15 +96,15 @@
 			span.text {
 				font-style: normal;
 				font-weight: 600;
-				font-size: 0.875rem;
-				line-height: 1.5rem;
+				font-size: 14px;
+				line-height: 24px;
 				margin-left: 8px;
 			}
 		}
 	}
 }

-.reactions-animations-overflow-container {
+.reactions-animations-container {
 	position: absolute;
 	width: 20%;
 	bottom: 0;
@@ -117,13 +117,6 @@
 	position: relative;
 }

-.reactions-animations-container {
-	left: 50%;
-	bottom: 0px;
-	display: inline-block;
-	position: absolute;
-}
-
 $reactionCount: 20;

@function random($min, $max) {
@@ -132,8 +125,8 @@ $reactionCount: 20;

 .reaction-emoji {
 	position: absolute;
-	font-size: 1.5rem;
-	line-height: 2rem;
+	font-size: 24px;
+	line-height: 32px;
 	width: 32px;
 	height: 32px;
 	top: 0;
--- a/css/_recording.scss
+++ b/css/_recording.scss
@@ -12,13 +12,9 @@
        .recording-title {
            display: inline-flex;
            align-items: center;
-            font-size: 0.875rem;
+            font-size: 14px;
            margin-left: 16px;
            max-width: 70%;
-
-            &-no-space {
-                margin-left: 0;
-            }
        }

        &.space-top {
@@ -35,8 +31,8 @@
    .local-recording-warning {
        margin-top: 8px;
        display: block;
-        font-size: 0.875rem;
-        line-height: 1.25rem;
+        font-size: 14px;
+        line-height: 20px;
        padding: 8px 16px;

        &.text {
@@ -126,7 +122,7 @@

    .recording-info-title {
        display: inline-flex;
-        font-size: 0.875rem;
+        font-size: 14px;
        width: 290px
    }

@@ -150,7 +146,7 @@
    /**
     * Set font-size to be consistent with Atlaskit FieldText.
     */
-    font-size: 0.875rem;
+    font-size: 14px;

    .broadcast-dropdown {
        text-align: left;
@@ -194,6 +190,6 @@

    .warning-text {
        color:#FFD740;
-        font-size: 0.75rem;
+        font-size: 12px;
    }
 }
--- a/css/_redirect_page.scss
+++ b/css/_redirect_page.scss
@@ -2,7 +2,7 @@
    width: 30%;
    margin: 20% auto;
    text-align: center;
-    font-size: 1.5rem;
+    font-size: 24px;

    .thanks-msg {
        border-bottom: 1px solid #FFFFFF;
@@ -10,16 +10,16 @@
        padding-right: 30px;
        p {
            margin: 30px auto;
-            font-size: 1.5rem;
-            line-height: 1.5rem;
+            font-size: 24px;
+            line-height: 24px;
        }
    }
    .hint-msg {
        p {
            margin: 26px auto;
            font-weight: 600;
-            font-size: 1rem;
-            line-height: 1.125rem;
+            font-size: 16px;
+            line-height: 18px;
            .hint-msg__holder{
                font-weight: 200;
            }
@@ -33,7 +33,7 @@
    }
    .forbidden-msg {
        p {
-            font-size: 1rem;
+            font-size: 16px;
            margin-top: 15px;
        }
    }
--- a/css/_reset.scss
+++ b/css/_reset.scss
@@ -70,7 +70,7 @@ input[type="reset"] {
 body {
  color: #333;
  font-family: Arial, sans-serif;
-  font-size: 0.875rem;
+  font-size: 14px;
  line-height: 1.42857142857143;
 }
 /* International Font Stacks*/
@@ -113,7 +113,7 @@ pre:first-child {
 /* Headings: desired line height in px / font size = unitless line height */
 h1 {
  color: #333;
-  font-size: 2rem;
+  font-size: 32px;
  font-weight: normal;
  line-height: 1.25;
  text-transform: none;
@@ -121,7 +121,7 @@ h1 {
 }
 h2 {
  color: #333;
-  font-size: 1.5rem;
+  font-size: 24px;
  font-weight: normal;
  line-height: 1.25;
  text-transform: none;
@@ -129,14 +129,14 @@ h2 {
 }
 h3 {
  color: #333;
-  font-size: 1.25rem;
+  font-size: 20px;
  font-weight: normal;
  line-height: 1.5;
  text-transform: none;
  margin: 30px 0 0 0;
 }
 h4 {
-  font-size: 1rem;
+  font-size: 16px;
  font-weight: bold;
  line-height: 1.25;
  text-transform: none;
@@ -144,7 +144,7 @@ h4 {
 }
 h5 {
  color: #333;
-  font-size: 0.875rem;
+  font-size: 14px;
  font-weight: bold;
  line-height: 1.42857143;
  text-transform: none;
@@ -152,7 +152,7 @@ h5 {
 }
 h6 {
  color: #707070;
-  font-size: 0.75rem;
+  font-size: 12px;
  font-weight: bold;
  line-height: 1.66666667;
  text-transform: uppercase;
@@ -179,7 +179,7 @@ h5 + h6 {
 /* Other typographical elements */
 small {
  color: #707070;
-  font-size: 0.75rem;
+  font-size: 12px;
  line-height: 1.33333333333333;
 }
 code,
--- a/css/_responsive.scss
+++ b/css/_responsive.scss
@@ -4,7 +4,7 @@

        #enter_room {
            .welcome-page-button {
-                font-size: 1rem;
+                font-size: 16px;
                left: 0;
                text-align: center;
                width: 100%;
@@ -53,10 +53,7 @@
        }

        .welcome-footer-row-block {
-            display: flex;
-            flex-direction: column;
-            gap:12px;
-            align-items: center;
+            display: block;
        }
    }
 }
--- a/css/_subject.scss
+++ b/css/_subject.scss
@@ -41,6 +41,7 @@
    position: absolute;
    top: 0;
    height: 48px;
+    max-width: calc(100% - 24px);
 }

@keyframes hideSubject {
--- a/css/_toolbars.scss
+++ b/css/_toolbars.scss
@@ -9,9 +9,9 @@
    // Do not inherit the font-family from the toolbar button, because it's an
    // icon style.
    font-family: $baseFontFamily;
-    font-size: 0.5rem;
+    font-size: 9px;
    font-weight: 700;
-    line-height: 0.75rem;
+    line-height: 13px;
    min-width: 13px;
    overflow: hidden;
    text-align: center;
@@ -69,8 +69,8 @@

    .badge-round {
        bottom: -5px;
-        font-size: 0.75rem;
-        line-height: 1.25rem;
+        font-size: 12px;
+        line-height: 20px;
        min-width: 20px;
        pointer-events: none;
        position: absolute;
--- a/css/_transcription-subtitles.scss
+++ b/css/_transcription-subtitles.scss
@@ -0,0 +1,26 @@
+.transcription-subtitles {
+    bottom: $newToolbarSize + 40px;
+    font-size: 16px;
+    font-weight: 1000;
+    left: 50%;
+    max-width: 50vw;
+    opacity: 0.80;
+    overflow-wrap: break-word;
+    pointer-events: none;
+    position: absolute;
+    text-shadow: 0px 0px 1px rgba(0,0,0,0.3),
+    0px 1px 1px rgba(0,0,0,0.3),
+    1px 0px 1px rgba(0,0,0,0.3),
+    0px 0px 1px rgba(0,0,0,0.3);
+    transform: translateX(-50%);
+    z-index: 7;
+
+    &.lifted {
+        // Lift subtitle above toolbar+dominant speaker box.
+        bottom: $newToolbarSize + 36px + 40px;
+    }
+
+    span {
+        background: black;
+    }
+}
--- a/css/_variables.scss
+++ b/css/_variables.scss
@@ -38,8 +38,6 @@ $zindex1: 1;
 $zindex2: 2;
 $zindex3: 3;
 $toolbarZ: 250;
-$watermarkZ: 253;
-
 // Place filmstrip videos over toolbar in order
 // to make connection info visible.
 $filmstripVideosZ: $toolbarZ + 1;
@@ -50,11 +48,11 @@ $filmstripVideosZ: $toolbarZ + 1;
 $primaryUnsupportedBrowserButtonBgColor: #0052CC;
 $unsupportedBrowserButtonBgColor: rgba(9, 30, 66, 0.04);
 $unsupportedBrowserTextColor: #4a4a4a;
-$unsupportedBrowserTextSmallFontSize: 1rem;
+$unsupportedBrowserTextSmallFontSize: 17px;
 $unsupportedBrowserTitleColor: #fff;
-$unsupportedBrowserTitleFontSize: 1.5rem;
+$unsupportedBrowserTitleFontSize: 24px;
 $unsupportedDesktopBrowserTextColor: rgba(255, 255, 255, 0.7);
-$unsupportedDesktopBrowserTextFontSize: 1.25rem;
+$unsupportedDesktopBrowserTextFontSize: 21px;

 /**
 * The size of the default watermark.
@@ -77,19 +75,16 @@ $welcomePageHeaderBackground: linear-gradient(0deg, rgba(0, 0, 0, 0.2), rgba(0,
 $welcomePageHeaderBackgroundPosition: center;
 $welcomePageHeaderBackgroundRepeat: none;
 $welcomePageHeaderBackgroundSize: cover;
-$welcomePageHeaderPadding: 1rem;
+$welcomePageHeaderPaddingBottom: 15px;
 $welcomePageHeaderTitleMaxWidth: initial;
 $welcomePageHeaderTextAlign: center;
-$welcomePageButtonBg: #0074E0;
-$welcomePageButtonHoverBg: #4687ED;
-$welcomePageButtonFocusOutline: #00225A;

 $welcomePageHeaderContainerMarginTop: 104px;
 $welcomePageHeaderContainerDisplay: flex;
 $welcomePageHeaderContainerMargin: $welcomePageHeaderContainerMarginTop auto 0;

 $welcomePageHeaderTextTitleMarginBottom: 0;
-$welcomePageHeaderTextTitleFontSize: 2.625rem;
+$welcomePageHeaderTextTitleFontSize: 42px;
 $welcomePageHeaderTextTitleFontWeight: normal;
 $welcomePageHeaderTextTitleLineHeight: 50px;
 $welcomePageHeaderTextTitleOpacity: 1;
--- a/css/_videolayout_default.scss
+++ b/css/_videolayout_default.scss
@@ -160,7 +160,7 @@
 }

 #alwaysOnTop .displayname {
-    font-size: 0.875rem;
+    font-size: 15px;
    position: inherit;
    width: 100%;
    left: 0px;
@@ -294,7 +294,7 @@
    width: auto;
    z-index: $zindex2;
    font-weight: 600;
-    font-size: 0.875rem;
+    font-size: 14px;
    text-align: center;
    color: #FFF;
    left: 50%;
@@ -340,7 +340,7 @@

 .presence-label {
    color: #fff;
-    font-size: 0.75rem;
+    font-size: 12px;
    font-weight: 100;
    left: 0;
    margin: 0 auto;
--- a/css/_welcome_page.scss
+++ b/css/_welcome_page.scss
@@ -18,7 +18,7 @@ body.welcome-page {
        background-position: $welcomePageHeaderBackgroundPosition;
        background-repeat: $welcomePageHeaderBackgroundRepeat;
        background-size: $welcomePageHeaderBackgroundSize;
-        padding: $welcomePageHeaderPadding;
+        padding-bottom: $welcomePageHeaderPaddingBottom;
        background-color: #131519;
        overflow: hidden;
        position: relative;
@@ -53,43 +53,14 @@ body.welcome-page {

        .header-text-subtitle {
            color: #fff;
-            font-size: 1.25rem;
+            font-size: 20px;
            font-weight: 600;
-            line-height: 1.625rem;
+            line-height: 26px;
            margin: 16px 0 32px 0;
            text-align: $welcomePageHeaderTextAlign;

        }

-        .not-allow-title-character-div {
-            color: #f03e3e;
-            background-color: #fff;
-            font-size: 0.75rem;
-            font-weight: 600;
-            margin: 10px 0px 5px 0px;
-            text-align: $welcomePageHeaderTextAlign;
-            border-radius: 5px;
-            padding: 5px;
-            .not-allow-title-character-text {
-                float: right;
-                line-height: 1.9;
-            };
-            .jitsi-icon {
-                margin-right: 9px;
-                float: left;
-
-
-                svg {
-                    fill:#f03e3e;
-
-                    & > *:first-child {
-                        fill: none !important;
-                    }
-                }
-            }
-
-        }
-
        .insecure-room-name-warning {
            align-items: center;
            color: rgb(215, 121, 118);
@@ -147,7 +118,7 @@ body.welcome-page {
                    display: inline-block;
                    height: 50px;
                    width: 100%;
-                    font-size: 0.875rem;
+                    font-size: 14px;
                    padding-left: 10px;

                    &.focus-visible {
@@ -172,7 +143,7 @@ body.welcome-page {
    }

    .tab-container {
-        font-size: 1rem;
+        font-size: 16px;
        position: relative;
        text-align: left;
        display: $welcomePageTabContainerDisplay;
@@ -191,8 +162,8 @@ body.welcome-page {
            background-color: #c7ddff;
            border-radius: 6px;
            color: #0163FF;
-            font-size: 0.875rem;
-            line-height: 1.125rem;
+            font-size: 14px;
+            line-height: 18px;
            margin: 4px;
            display: $welcomePageTabButtonsDisplay;

@@ -218,19 +189,15 @@ body.welcome-page {

    .welcome-page-button {
        border: 0;
-        font-size: 0.875rem;
-        background: $welcomePageButtonBg;
+        font-size: 14px;
+        background: #0074E0;
        border-radius: 3px;
        color: #FFFFFF;
        cursor: pointer;
        padding: 16px 20px;
-        transition: all 0.2s;
-        &:focus-within {
-            outline: auto 2px $welcomePageButtonFocusOutline;
-        }

-        &:hover {
-            background-color: $welcomePageButtonHoverBg;
+        &:focus-within {
+            outline: auto 2px #022e61;
        }
    }

@@ -246,7 +213,7 @@ body.welcome-page {

        * {
            cursor: pointer;
-            font-size: 2rem;
+            font-size: 32px;
        }

        .toolbox-icon {
@@ -264,11 +231,17 @@ body.welcome-page {
            width: $welcomePageWatermarkWidth;
            height: $welcomePageWatermarkHeight;
        }
+
+        .watermark.leftwatermarknomargin {
+            width: $welcomePageWatermarkWidth;
+            height: $welcomePageWatermarkHeight;
+        }
    }

    &.without-content {
        .welcome-card {
-            max-width: 100dvw;
+            min-width: 500px;
+            max-width: 580px;
        }
    }

@@ -349,6 +322,6 @@ body.welcome-page {

    .welcome-footer-row-1-text {
        max-width: 200px;
-        text-align: center;
+        margin-right: 16px;
    }
 }
--- a/css/filmstrip/_tile_view_overrides.scss
+++ b/css/filmstrip/_tile_view_overrides.scss
@@ -18,7 +18,8 @@
     */
    #dominantSpeaker,
    #largeVideoElementsContainer,
-    #sharedVideo {
+    #sharedVideo,
+    .stage-participant-label {
        display: none;
    }

--- a/css/main.scss
+++ b/css/main.scss
@@ -36,7 +36,6 @@ $flagsImagePath: "../images/";
@import 'modals/invite/info';
@import 'modals/screen-share/share-audio';
@import 'modals/screen-share/share-screen-warning';
-@import 'modals/whiteboard';
@import 'videolayout_default';
@import 'subject';
@import 'popup_menu';
@@ -61,6 +60,7 @@ $flagsImagePath: "../images/";
@import 'filmstrip/vertical_filmstrip_overrides';
@import 'unsupported-browser/main';
@import 'deep-linking/main';
+@import 'transcription-subtitles';
@import '_meetings_list.scss';
@import 'navigate_section_list';
@import 'third-party-branding/google';
--- a/css/modals/_whiteboard.scss
+++ b/css/modals/_whiteboard.scss
@@ -1,7 +0,0 @@
-.whiteboard {
-
-    .excalidraw-wrapper {
-        height: 100vh;
-        width: 100vw;
-    }
-}
--- a/css/modals/invite/_add-people.scss
+++ b/css/modals/invite/_add-people.scss
@@ -20,7 +20,7 @@
            width: 28px;

            i {
-                line-height: 1.75rem;
+                line-height: 28px;
                margin: auto;
            }
        }
@@ -35,7 +35,7 @@
            padding-left: 10px;

            i {
-                line-height: 1.25rem;
+                line-height: 20px;
                margin: auto;
            }
        }
--- a/css/modals/invite/_info.scss
+++ b/css/modals/invite/_info.scss
@@ -1,7 +1,7 @@
 .info-dialog {
    cursor: default;
    display: flex;
-    font-size: 0.875rem;
+    font-size: 14px;

    .info-dialog-column {
        margin-right: 10px;
@@ -53,8 +53,8 @@
    max-width: 334px;
    width: 100%;
    margin-top: 20px;
-    font-size: 0.75rem;
-    line-height: 1.5rem;
+    font-size: 12px;
+    line-height: 24px;
    border-collapse: collapse;

    * {
@@ -107,7 +107,7 @@
    box-sizing: border-box;
    display: flex;
    flex-direction: column;
-    font-size: 0.75rem;
+    font-size: 12px;
    max-height: 100%;
    overflow: auto;
    padding: 15pt;
--- a/css/modals/invite/_invite_more.scss
+++ b/css/modals/invite/_invite_more.scss
@@ -1,8 +1,8 @@
 .invite-more {
    &-dialog {
        color: #fff;
-        font-size: 0.875rem;
-        line-height: 1.5rem;
+        font-size: 15px;
+        line-height: 24px;

        &.separator {
            margin: 24px 0 24px -20px;
--- a/css/modals/screen-share/_share-screen-warning.scss
+++ b/css/modals/screen-share/_share-screen-warning.scss
@@ -1,5 +1,5 @@
 .share-screen-warn-dialog {
-    font-size: 0.875rem;
+    font-size: 14px;

    .separator-line {
        margin: 24px 0 24px -20px;
--- a/css/modals/security/_security.scss
+++ b/css/modals/security/_security.scss
@@ -1,15 +1,15 @@
 .security {
    &-dialog {
        color: #fff;
-        font-size: 0.875rem;
-        line-height: 1.5rem;
+        font-size: 15px;
+        line-height: 24px;

        &.password-section {
            display: flex;
            flex-direction: column;

            .description {
-                font-size: 0.75rem;
+                font-size: 13px;
            }

            .password {
@@ -24,7 +24,7 @@
                    button {
                        cursor: pointer;
                        text-decoration: none;
-                        font-size: 0.875rem;
+                        font-size: 14px;
                        color: #6FB1EA;
                    }

--- a/css/premeeting/_lobby.scss
+++ b/css/premeeting/_lobby.scss
@@ -1,7 +1,7 @@
 .lobby-screen {
-    font-size: 1rem;
+    font-size: 16px;
    font-weight: 400;
-    line-height: 1.625rem;
+    line-height: 26px;

    &-content {
        align-items: center;
@@ -43,7 +43,7 @@
    flex-direction: column;

    .description {
-        font-size: 0.75rem;
+        font-size: 13px;
    }

    .control-row {
@@ -53,7 +53,7 @@
        margin-top: 15px;

        label {
-            font-size: 0.875rem;
+            font-size: 14px;
            font-weight: bold;
        }
    }
@@ -191,9 +191,9 @@
                .title {
                    flex: 1;
                    color: #fff;
-                    font-size: 1.25rem;
+                    font-size: 20px;
                    font-weight: 600;
-                    line-height: 1.75rem;
+                    line-height: 28px;
                    letter-spacing: -1.2%;
                }
            }
@@ -214,8 +214,8 @@
    border-radius: 6px;
    box-sizing: border-box;
    color: white;
-    font-size: 0.75rem;
-    line-height: 1rem;
+    font-size: 12px;
+    line-height: 16px;
    margin-bottom: 16px;
    margin-top: -8px;
    padding: 4px;
--- a/css/premeeting/_premeeting-screens.scss
+++ b/css/premeeting/_premeeting-screens.scss
@@ -5,9 +5,9 @@
        color: #fff;
        cursor: pointer;
        display: inline-block;
-        font-size: 0.875rem;
+        font-size: 14px;
        font-weight: 600;
-        line-height: 1.5rem;
+        line-height: 24px;
        margin-bottom: 16px;
        padding: 7px 16px;
        position: relative;
@@ -26,7 +26,7 @@

        &.text {
            width: auto;
-            font-size: 0.75rem;
+            font-size: 13px;
            margin: 0;
            padding: 0;
        }
@@ -98,7 +98,7 @@
        }

        .action-btn {
-            font-size: 1rem;
+            font-size: 16px;
            margin-bottom: 8px;
            padding: 11px 16px;
        }
--- a/css/reload_overlay/_reload_overlay.scss
+++ b/css/reload_overlay/_reload_overlay.scss
@@ -1,13 +1,13 @@
 .reload_overlay_title {
    display: block;
-    font-size: 1rem;
-    line-height: 1.25rem;
+    font-size: 16px;
+    line-height: 20px;
 }

 .reload_overlay_text {
    display: block;
-    font-size: 0.75rem;
-    line-height: 1.875rem;
+    font-size: 12px;
+    line-height: 30px;
 }

 #reloadProgressBar {
--- a/css/ringing/_ringing.scss
+++ b/css/ringing/_ringing.scss
@@ -34,12 +34,12 @@

    &__status{
        margin-top: 15px;
-        font-size: 0.875rem;
-        line-height: 1.25rem;
+        font-size: 14px;
+        line-height: 20px;
    }

    &__name {
-        font-size: 1.5rem;
-        line-height: 2rem;
+        font-size: 24px;
+        line-height: 32px;
    }
 }
--- a/css/third-party-branding/google.scss
+++ b/css/third-party-branding/google.scss
@@ -8,7 +8,7 @@
    cursor: pointer;
    display: inline-flex;
    font-family: Roboto, arial, sans-serif;
-    font-size: 0.875rem;
+    font-size: 14px;
    padding: 1px;

    .google-cta {
@@ -17,7 +17,7 @@
        /**
         * Hack the line height for vertical centering of text.
         */
-        line-height: 2rem;
+        line-height: 32px;
        margin: 0 15px;
    }

--- a/css/third-party-branding/microsoft.scss
+++ b/css/third-party-branding/microsoft.scss
@@ -17,8 +17,8 @@
    .microsoft-cta {
        display: inline-block;
        color: #5E5E5E;
-        font-size: 0.875rem;
-        line-height: 2.5rem;
+        font-size: 15px;
+        line-height: 41px;
    }

    .microsoft-logo {
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: extra
 Maintainer: Jitsi Team <dev@jitsi.org>
 Uploaders: Emil Ivov <emcho@jitsi.org>, Damian Minkov <damencho@jitsi.org>
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 8.0.0), nodejs
 Standards-Version: 3.9.6
 Homepage: https://jitsi.org/meet

@@ -20,8 +20,7 @@ Description: WebRTC JavaScript video conferences

 Package: jitsi-meet-web-config
 Architecture: all
-Pre-Depends: nginx | nginx-full | nginx-extras | openresty | apache2
-Depends: openssl, curl
+Depends: openssl, nginx | nginx-full | nginx-extras | openresty | apache2, curl
 Description: Configuration for web serving of Jitsi Meet
 Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
 Videobridge to provide high quality, scalable video conferences.
@@ -34,7 +33,7 @@ Description: Configuration for web serving of Jitsi Meet

 Package: jitsi-meet-prosody
 Architecture: all
-Depends: openssl, prosody (>= 0.12.0) | prosody-trunk | prosody-0.12 | prosody-13.0, lua-sec, lua-basexx, lua-luaossl, lua-cjson, lua-inspect
+Depends: openssl, prosody (>= 0.11.7) | prosody-trunk | prosody-0.12 | prosody-0.11, lua-sec, lua-basexx, lua-luaossl, lua-cjson, lua-inspect
 Replaces: jitsi-meet-tokens
 Description: Prosody configuration for Jitsi Meet
 Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
@@ -48,7 +47,7 @@ Description: Prosody configuration for Jitsi Meet

 Package: jitsi-meet-tokens
 Architecture: all
-Depends: ${misc:Depends}, prosody-trunk | prosody-0.12 | prosody-13.0 | prosody (>= 0.12.0), jitsi-meet-prosody
+Depends: ${misc:Depends}, prosody-trunk | prosody-0.11 | prosody-0.12 | prosody (>= 0.11.7), jitsi-meet-prosody
 Description: Prosody token authentication plugin for Jitsi Meet

 Package: jitsi-meet-turnserver
--- a/debian/jitsi-meet-prosody.postinst
+++ b/debian/jitsi-meet-prosody.postinst
@@ -131,6 +131,18 @@ case "$1" in
            fi
        fi

+        if [ "$PROSODY_CREATE_JICOFO_USER" = "true" ]; then
+            # create 'focus@auth.domain' prosody user
+            prosodyctl register $JICOFO_AUTH_USER $JICOFO_AUTH_DOMAIN $JICOFO_AUTH_PASSWORD
+            # trigger a restart
+            PROSODY_CONFIG_PRESENT="false"
+        fi
+
+        USER_EXISTS_CHECK=`prosodyctl adduser jvb@$JICOFO_AUTH_DOMAIN < /dev/null || true`
+        if [ ! "$USER_EXISTS_CHECK" = "That user already exists" ]; then
+            prosodyctl register jvb $JICOFO_AUTH_DOMAIN $JVB_SECRET || true
+        fi
+
        # Check whether prosody config has the internal muc, if not add it,
        # as we are migrating configs
        if [ -f $PROSODY_HOST_CONFIG ] && ! grep -q "internal.$JICOFO_AUTH_DOMAIN" $PROSODY_HOST_CONFIG; then
@@ -174,12 +186,6 @@ case "$1" in
            PROSODY_CONFIG_PRESENT="false"
        fi

-        # Since prosody 13 admins are not automatically room owners and we expect that for jicofo
-        if ! grep -q -- 'component_admins_as_room_owners = ' $PROSODY_HOST_CONFIG ;then
-            sed -i "1s/^/component_admins_as_room_owners = true\n/" $PROSODY_HOST_CONFIG
-            PROSODY_CONFIG_PRESENT="false"
-        fi
-
        JAAS_HOST_CONFIG="/etc/prosody/conf.avail/jaas.cfg.lua"
        if [ "${JAAS_INPUT}" = "true" ] && [ ! -f $JAAS_HOST_CONFIG ]; then
            sed -i "s/enabled = false -- Jitsi meet components/enabled = true -- Jitsi meet components/g" $PROSODY_HOST_CONFIG
@@ -203,6 +209,9 @@ case "$1" in
            fi
        fi

+        # Make sure the focus@auth user's roster includes the proxy component (this is idempotent)
+        prosodyctl mod_roster_command subscribe focus.$JVB_HOSTNAME $JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN
+
        if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
            # prosodyctl takes care for the permissions
            # echo for using all default values
@@ -245,33 +254,9 @@ case "$1" in
        if [ "$PROSODY_CONFIG_PRESENT" = "false" ]; then
            invoke-rc.d prosody restart || true

-            # give it some time to warm up
-            sleep 10
-
-            if [ "$PROSODY_CREATE_JICOFO_USER" = "true" ]; then
-                # create 'focus@auth.domain' prosody user
-                echo -e "$JICOFO_AUTH_PASSWORD\n$JICOFO_AUTH_PASSWORD" | prosodyctl adduser $JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN > /dev/null || true
-
-                # trigger a restart
-                PROSODY_CONFIG_PRESENT="false"
-            fi
-
-            # creates the user if it does not exist
-            echo -e "$JVB_SECRET\n$JVB_SECRET" | prosodyctl adduser jvb@$JICOFO_AUTH_DOMAIN > /dev/null || true
-
-            # Make sure the focus@auth user's roster includes the proxy component (this is idempotent)
-            prosodyctl mod_roster_command subscribe focus.$JVB_HOSTNAME $JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN
-
-            # To make sure the roster command is loaded
-            # Once we have https://issues.prosody.im/1908 we can start using prosodyctl shell roster subscribe
-            # and drop the wait and the prosody restart
-            sleep 1
-            invoke-rc.d prosody restart || true
-
-            # In case we had updated the certificates and restarted prosody, let's restart and the bridge and jicofo if possible
+            # 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
-                systemctl restart jicofo.service >/dev/null || true
            fi
        fi
    ;;
--- a/debian/jitsi-meet-web-config.postinst
+++ b/debian/jitsi-meet-web-config.postinst
@@ -175,6 +175,22 @@ case "$1" in
            fi
        fi

+        # Fixes multi-stream flags to workaround problem with mobile joining a multi-stream call with multi-stream disabled
+        FIX_MSG="// Temporary backwards compatibility with old mobile clients."
+        if ! grep -q "^${FIX_MSG}" $JITSI_MEET_CONFIG; then
+            echo  $FIX_MSG >> $JITSI_MEET_CONFIG
+            echo "config.flags = config.flags || {};" >> $JITSI_MEET_CONFIG
+        fi
+        if ! grep -q "^config.flags.sourceNameSignaling*" $JITSI_MEET_CONFIG; then
+            echo "config.flags.sourceNameSignaling = true;" >> $JITSI_MEET_CONFIG
+        fi
+        if ! grep -q "^config.flags.sendMultipleVideoStreams*" $JITSI_MEET_CONFIG; then
+            echo "config.flags.sendMultipleVideoStreams = true;" >> $JITSI_MEET_CONFIG
+        fi
+        if ! grep -q "^config.flags.receiveMultipleVideoStreams*" $JITSI_MEET_CONFIG; then
+            echo "config.flags.receiveMultipleVideoStreams = true;" >> $JITSI_MEET_CONFIG
+        fi
+
        if [[ "$FORCE_OPENRESTY" = "true" ]]; then
            NGX_COMMON_CONF_PATH="/usr/local/openresty/nginx/conf/$JVB_HOSTNAME.conf"
            NGX_SVC_NAME=openresty
--- a/debian/jitsi-meet-web.install
+++ b/debian/jitsi-meet-web.install
@@ -1,5 +1,6 @@
 interface_config.js		/usr/share/jitsi-meet/
 *.html					/usr/share/jitsi-meet/
+*.ico					/usr/share/jitsi-meet/
 libs					/usr/share/jitsi-meet/
 static                  /usr/share/jitsi-meet/
 css/all.css 			/usr/share/jitsi-meet/css/
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Calin-Teodor	32e018f43b	chore(rnsdk, version): bump to 1.0.0	2023-11-17 13:00:58 +02:00
Abbas Al-Mansoori	e3dd39f6e4	refactor(rnsdk): remove redundant audio and video actions (#14066 ) * refactor(rnsdk): remove redundant audio and video actions	2023-11-17 12:27:56 +02:00
Philipp Fruck	92c43c03ad	fix(native app): Display poll creator name In the jitsi web app, the poll creator is displayed for all published votes whereas in the native app the current username of the participant has been displayed for all polls regardless of the creator	2023-11-16 12:57:28 +02:00
Abbas Al-Mansoori	8d8bd4d8d4	feat(rnsdk): add audio and video muted state changed	2023-11-16 12:57:00 +02:00
Calin-Teodor	8dda34a502	feat(authentication): group config options inside an object param	2023-11-15 16:33:39 +02:00
Calin-Teodor	3a85a915bf	feat(authentication): used config for control over joining audio/video mute/unmute	2023-11-15 12:43:54 +02:00
Calinteodor	17b0a12224	ref(authentication): handle joining in low bandwidth mode (#14032 ) ref(authentication): handle joining in low bandwidth mode	2023-11-14 12:16:53 +02:00
Calin-Teodor	b52394d328	feat(base/ui): removed unneeded lineHeight value	2023-11-09 12:12:10 +02:00
Calinteodor	cadb216cea	feat(base/modal): changed hasTabNavigator to hasExtraHeaderHeight (#14033 ) * feat(base/modal): changed hasTabNavigator to hasExtraHeaderHeight	2023-11-08 12:01:09 +02:00
Calinteodor	2bf8e6cfce	feat(filmstrip): fixed indicators container dissapear when not in tile view (#14031 ) * feat(filmstrip): fixed indicators container dissapear when not in tile view	2023-11-08 10:42:00 +02:00
Calin-Teodor	261a8a6740	feat(participants-pane): fixed visitors label position	2023-11-07 18:40:09 +02:00
Calin-Teodor	35dbcd9b9d	feat(filmstrip): fixed indicators container ui	2023-11-07 18:39:46 +02:00
Calinteodor	45bf00d096	sdk(react-native-sdk): rnsdk screenshare android fix (#13884 ) sdk(react-native-sdk): rnsdk screenshare android fix	2023-11-07 12:23:17 +02:00
Calinteodor	78847148d8	feat(recent-list): fix undefined error that breaks visitor joining (#14024 ) * feat(recent-list): fix undefined error that breaks visitor joining * feat(recent-list): revert variable name change * feat(recent-list): fixed linter	2023-11-06 23:13:10 +02:00
Calin-Teodor	c53e7ff9cd	chore(rn, versions): bump app and sdk versions	2023-10-30 15:46:50 +01:00