ref(Thumbnail): Create React component.

fix(jaas) fix double slash for branded invite urls

.github/ISSUE_TEMPLATE/1-bug-report.md

@@ -4,25 +4,45 @@ about: Create a report to help us improve
 
 ---
 
-*This Issue tracker is only for reporting bugs and tracking code related issues.*
+<!--
 
-Before posting, please make sure you check community.jitsi.org to see if the same or similar bugs have already been discussed.
-General questions, installation help, and feature requests can also be posted to community.jitsi.org.
+This issue tracker is only for reporting bugs and tracking issues related to the source code.
 
-## Description
----
+Before posting, please make sure to check if the same or similar bugs have already been discussed: https://github.com/jitsi/jitsi-meet/issues
 
-## Current behavior
----
+General questions regarding usage, installation, etc. should be posted at https://community.jitsi.org. They will be closed if posted here.
 
-## Expected Behavior
----
+-->
 
-## Possible Solution
----
+### Description:
 
-## Steps to reproduce
----
+<!-- Please describe the bug clearly and concisely. -->
 
-# Environment details
----
+### 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. -->

.github/ISSUE_TEMPLATE/2-feature-request.md

@@ -1,7 +1,9 @@
 ---
 name: "Feature request"
 about: Suggest an idea for this project
-
+title: ''
+labels: 'feature-request'
+assignees: ''
 ---
 
 <!--
@@ -9,7 +11,7 @@ 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 decission for implementing features lies on the Jitsi team, not all feature requests shall be accepted.
+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?**

.github/ISSUE_TEMPLATE/2-help.md

@@ -1,10 +0,0 @@
----
-name: Need help with Jitsi Meet?
-about: Please ask it in our community at https://community.jitsi.org
-
----
-
-If you have a question about Jitsi Meet that is not a bug report or feature
-request, please post it in https://community.jitsi.org
-
-Questions posted to this repository will be closed.

.github/ISSUE_TEMPLATE/4-security-issues.md

@@ -1,11 +0,0 @@
----
-name: Security issues
-about: Please email security@jitsi.org
-
----
-
-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 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.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Need help with Jitsi Meet?
+    url: https://community.jitsi.org
+    about: Please ask it in our community.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+<!--
+Thank you for your pull request. Please provide a thorough description below.
+
+Contributors guide: https://github.com/jitsi/jitsi-meet/blob/master/CONTRIBUTING.md
+-->

.gitignore

@@ -84,3 +84,10 @@ android/app/google-services.json
 ios/app/dropbox.key
 ios/app/GoogleService-Info.plist
 
+.vscode
+
+# TWA
+twa/*.apk
+twa/*.aab
+twa/assetlinks.json
+

.npmrc

@@ -0,0 +1 @@
+package-lock=true

CONTRIBUTING.md

@@ -27,3 +27,128 @@ in the agreement, unfortunately, we cannot accept your contribution.
 - 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.
+
+## Coding style
+
+### Comments
+
+* Comments documenting the source code are required.
+
+  * 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.
+
+  * 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.js
+├── 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`, `middlewares.native.js` or `middlewares.web.js` 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.

ConferenceEvents.js

@@ -2,10 +2,3 @@
  * Notifies interested parties that hangup procedure will start.
  */
 export const BEFORE_HANGUP = 'conference.before_hangup';
-
-/**
- * Notifies interested parties that desktop sharing enable/disable state is
- * changed.
- */
-export const DESKTOP_SHARING_ENABLED_CHANGED
-    = 'conference.desktop_sharing_enabled_changed';

Makefile

@@ -3,8 +3,9 @@ CLEANCSS = ./node_modules/.bin/cleancss
 DEPLOY_DIR = libs
 LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet/
 LIBFLAC_DIR = node_modules/libflacjs/dist/min/
+OLM_DIR = node_modules/olm
 RNNOISE_WASM_DIR = node_modules/rnnoise-wasm/dist/
-NODE_SASS = ./node_modules/.bin/node-sass
+NODE_SASS = ./node_modules/.bin/sass
 NPM = npm
 OUTPUT_DIR = .
 STYLES_BUNDLE = css/all.bundle.css
@@ -21,7 +22,8 @@ compile:
 clean:
 	rm -fr $(BUILD_DIR)
 
-deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-lib-jitsi-meet deploy-libflac deploy-css deploy-local
+.NOTPARALLEL:
+deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-lib-jitsi-meet deploy-libflac deploy-olm deploy-css deploy-local
 
 deploy-init:
 	rm -fr $(DEPLOY_DIR)
@@ -50,12 +52,15 @@ deploy-appbundle:
 		$(BUILD_DIR)/video-blur-effect.min.map \
 		$(BUILD_DIR)/rnnoise-processor.min.js \
 		$(BUILD_DIR)/rnnoise-processor.min.map \
+		$(BUILD_DIR)/close3.min.js \
+		$(BUILD_DIR)/close3.min.map \
 		$(DEPLOY_DIR)
 
 deploy-lib-jitsi-meet:
 	cp \
 		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.min.js \
 		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.min.map \
+		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.e2ee-worker.js \
 		$(LIBJITSIMEET_DIR)/connection_optimization/external_connect.js \
 		$(LIBJITSIMEET_DIR)/modules/browser/capabilities.json \
 		$(DEPLOY_DIR)
@@ -66,6 +71,11 @@ deploy-libflac:
 		$(LIBFLAC_DIR)/libflac4-1.3.2.min.js.mem \
 		$(DEPLOY_DIR)
 
+deploy-olm:
+	cp \
+		$(OLM_DIR)/olm.wasm \
+		$(DEPLOY_DIR)
+
 deploy-rnnoise-binary:
 	cp \
 		$(RNNOISE_WASM_DIR)/rnnoise.wasm \
@@ -73,18 +83,19 @@ deploy-rnnoise-binary:
 
 deploy-css:
 	$(NODE_SASS) $(STYLES_MAIN) $(STYLES_BUNDLE) && \
-	$(CLEANCSS) $(STYLES_BUNDLE) > $(STYLES_DESTINATION) ; \
+	$(CLEANCSS) --skip-rebase $(STYLES_BUNDLE) > $(STYLES_DESTINATION) ; \
 	rm $(STYLES_BUNDLE)
 
 deploy-local:
 	([ ! -x deploy-local.sh ] || ./deploy-local.sh)
 
-dev: deploy-init deploy-css deploy-rnnoise-binary deploy-lib-jitsi-meet deploy-libflac
-	$(WEBPACK_DEV_SERVER)
+.NOTPARALLEL:
+dev: deploy-init deploy-css deploy-rnnoise-binary deploy-lib-jitsi-meet deploy-libflac deploy-olm
+	$(WEBPACK_DEV_SERVER) --detect-circular-deps
 
 source-package:
 	mkdir -p source_package/jitsi-meet/css && \
-	cp -r *.js *.html connection_optimization favicon.ico fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
+	cp -r *.js *.html resources/*.txt connection_optimization favicon.ico fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
 	cp css/all.css source_package/jitsi-meet/css && \
 	(cd source_package ; tar cjf ../jitsi-meet.tar.bz2 jitsi-meet) && \
 	rm -rf source_package

README.md

@@ -1,8 +1,8 @@
 # Jitsi Meet - Secure, Simple and Scalable Video Conferences
 
-Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses [Jitsi Videobridge](https://jitsi.org/videobridge) to provide high quality, [secure](#security) and scalable video conferences. Jitsi Meet in action can be seen at [here at the session #482 of the VoIP Users Conference](http://youtu.be/7vFUVClsNh0).
+Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses [Jitsi Videobridge](https://jitsi.org/videobridge) to provide high quality, [secure](https://jitsi.org/security) and scalable video conferences. Jitsi Meet in action can be seen at [here at the session #482 of the VoIP Users Conference](http://youtu.be/7vFUVClsNh0).
 
-The Jitsi Meet client runs in your browser, without installing anything else on your computer. You can try it out at https://meet.jit.si .
+The Jitsi Meet client runs in your browser, without installing anything else on your computer. You can try it out at https://meet.jit.si.
 
 Jitsi Meet allows very efficient collaboration. Users can stream their desktop or only some windows. It also supports shared document editing with Etherpad.
 
@@ -10,9 +10,11 @@ Jitsi Meet allows very efficient collaboration. Users can stream their desktop o
 
 On the client side, no installation is necessary. You just point your browser to the URL of your deployment. This section is about installing a Jitsi Meet suite on your server and hosting your own conferencing service.
 
-Installing Jitsi Meet is a simple experience. For Debian-based system, following the [quick-install](https://github.com/jitsi/jitsi-meet/blob/master/doc/quick-install.md) document, which uses the package system. You can also see a demonstration of the process in [this tutorial video](https://jitsi.org/tutorial).
+Installing Jitsi Meet is a simple experience. For Debian-based system, following the [quick install](https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-quickstart) document, which uses the package system. You can also see a demonstration of the process in [this tutorial video](https://jitsi.org/tutorial).
 
-For other systems, or if you wish to install all components manually, see the [detailed manual installation instructions](https://github.com/jitsi/jitsi-meet/blob/master/doc/manual-install.md).
+For other systems, or if you wish to install all components manually, see the [detailed manual installation instructions](https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-manual).
+
+Installation with Docker is also available. Please see the [instruction](https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-docker).
 
 ## Download
 
@@ -46,9 +48,13 @@ You can also sign up for our open beta testing here:
 * [Android](https://play.google.com/apps/testing/org.jitsi.meet)
 * [iOS](https://testflight.apple.com/join/isy6ja7S)
 
+## Release notes
+
+Release notes for Jitsi Meet are maintained on [this repository](https://github.com/jitsi/jitsi-meet-release-notes).
+
 ## Development
 
-For web development see [here](doc/development.md), and for mobile see [here](doc/mobile.md).
+For web development see [here](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-web), and for mobile see [here](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-mobile).
 
 ## Contributing
 
@@ -61,25 +67,13 @@ Jitsi Meet provides a very flexible way of embedding in external applications by
 
 ## Security
 
-WebRTC does not (yet) provide a way of conducting multi-party conversations with end-to-end encryption. 
-Unless you consistently compare DTLS fingerprints with your peers vocally, the same goes for one-to-one calls.
-As a result, your stream is encrypted on the network but decrypted on the machine that hosts the bridge when using Jitsi Meet.
+The security section here was starting to feel a bit too succinct for the complexity of the topic, so we created a post that covers the topic much more broadly here: https://jitsi.org/security
 
-The Jitsi Meet architecture allows you to deploy your own version, including
-all server components. In that case, your security guarantees will be roughly
-equivalent to a direct one-to-one WebRTC call. This is the uniqueness of
-Jitsi Meet in terms of security.
-
-The [meet.jit.si](https://meet.jit.si) service is maintained by the Jitsi team
-at [8x8](https://8x8.com).
+The section on end-to-end encryption in that document is likely going to be one of the key points of interest: https://jitsi.org/security/#e2ee
 
 ## Security issues
 
-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 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.**
+For information on reporting security vulnerabilities in Jitsi Meet, see [SECURITY.md](./SECURITY.md).
 
 ## Acknowledgements
 

SECURITY.md

@@ -0,0 +1,9 @@
+# Security
+
+## Reporting security issues
+
+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) 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.**

android/README.md

@@ -1,380 +1,3 @@
 # Jitsi Meet SDK for Android
 
-## Sample applications using the SDK
-
-If you want to see how easy integrating the Jitsi Meet SDK into a native application is, take a look at the
-[sample applications repository](https://github.com/jitsi/jitsi-meet-sdk-samples).
-
-## Build your own, or use a pre-build SDK artifacts/binaries
-
-Jitsi conveniently provides a pre-build SDK artifacts/binaries in its Maven repository. When you do not require any
-modification to the SDK itself or any of its dependencies, it's suggested to use the pre-build SDK. This avoids the
-complexity of building and installing your own SDK artifacts/binaries.
-
-### Use pre-build SDK artifacts/binaries
-
-In your project, add the Maven repository
-`https://github.com/jitsi/jitsi-maven-repository/raw/master/releases` and the
-dependency `org.jitsi.react:jitsi-meet-sdk` into your `build.gradle` files.
-
-The repository typically goes into the `build.gradle` file in the root of your project:
-
-```gradle
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        maven {
-            url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases"
-        }
-    }
-}
-```
-
-Dependency definitions belong in the individual module `build.gradle` files:
-
-```gradle
-dependencies {
-    // (other dependencies)
-    implementation ('org.jitsi.react:jitsi-meet-sdk:2.+') { transitive = true }
-}
-```
-
-### Build and use your own SDK artifacts/binaries
-
-<details>
-<summary>Show building instructions</summary>
-
-Start by making sure that your development environment [is set up correctly](https://github.com/jitsi/jitsi-meet/blob/master/doc/mobile.md).
-
-A note on dependencies: Apart from the SDK, Jitsi also publishes a binary Maven artifact for some of the SDK dependencies (that are not otherwise publicly available) to the Jitsi Maven repository. When you're planning to use a SDK that is built from source, you'll likely use a version of the source code that is newer (or at least _different_) than the version of the source that was used to create the binary SDK artifact. As a consequence, the dependencies that your project will need, might also be different from those that are published in the Jitsi Maven repository. This might lead to build problems, caused by dependencies that are unavailable.
-
-If you want to use a SDK that is built from source, you will likely benefit from composing a local Maven repository that contains these dependencies. The text below describes how you create a repository that includes both the SDK as well as these dependencies. For illustration purposes, we'll define the location of this local Maven repository as `/tmp/repo`
-
-In source code form, the Android SDK dependencies are locked/pinned by package.json and package-lock.json of the Jitsi Meet project. To obtain the data, execute NPM in the jitsi-meet project directory:
-
-    npm install
-
-This will pull in the dependencies in either binary format, or in source code format, somewhere under /node_modules/
-
-Third-party React Native _modules_, which Jitsi Meet SDK for Android depends on, are download by NPM in source code 
-or binary form. These need to be assembled into Maven artifacts, and then published to your local Maven repository.
-A script is provided to facilitate this. From the root of the jitsi-meet project repository, run:
-
-    ./android/scripts/release-sdk.sh /tmp/repo
-
-This will build and publish the SDK, and all of its dependencies to the specified Maven repository (`/tmp/repo`) in
-this example.
-
-You're now ready to use the artifacts. In _your_ project, add the Maven repository that you used above (`/tmp/repo`) into your top-level `build.gradle` file:
-
-    allprojects {
-        repositories {
-            maven { url "file:/tmp/repo" }
-            google()
-            jcenter()
-        }
-    }
-
-You can use your local repository to replace the Jitsi repository (`maven { url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases" }`) when you published _all_ subprojects. If you didn't do that, you'll have to add both repositories. Make sure your local repository is listed first!
-
-Then, define the dependency `org.jitsi.react:jitsi-meet-sdk` into the `build.gradle` file of your module:
-
-    implementation ('org.jitsi.react:jitsi-meet-sdk:+') { transitive = true }
-
-Note that there should not be a need to explicitly add the other dependencies, as they will be pulled in as transitive
-dependencies of `jitsi-meet-sdk`.
-
-</details>
-
-## Using the API
-
-Jitsi Meet SDK is an Android library which embodies the whole Jitsi Meet
-experience and makes it reusable by third-party apps.
-
-First, add Java 1.8 compatibility support to your project by adding the
-following lines into your `build.gradle` file:
-
-```
-compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-}
-```
-
-To get started, extends your `android.app.Activity` from
-`org.jitsi.meet.sdk.JitsiMeetActivity`:
-
-```java
-package org.jitsi.example;
-
-import org.jitsi.meet.sdk.JitsiMeetActivity;
-
-public class MainActivity extends JitsiMeetActivity {
-}
-```
-
-Alternatively, you can use the `org.jitsi.meet.sdk.JitsiMeetView` class which
-extends `android.view.View`.
-
-Note that this should only be needed when `JitsiMeetActivity` cannot be used for
-some reason. Extending `JitsiMeetView` requires manual wiring of the view to
-the activity, using a lot of boilerplate code. Using the Activity instead of the
-View is strongly recommended.
-
-<details>
-<summary>Show example</summary>
-
-```java
-package org.jitsi.example;
-
-import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-
-import org.jitsi.meet.sdk.JitsiMeetView;
-import org.jitsi.meet.sdk.ReactActivityLifecycleCallbacks;
-
-// Example
-//
-public class MainActivity extends FragmentActivity implements JitsiMeetActivityInterface {
-    private JitsiMeetView view;
-
-    @Override
-    protected void onActivityResult(
-            int requestCode,
-            int resultCode,
-            Intent data) {
-        JitsiMeetActivityDelegate.onActivityResult(
-                this, requestCode, resultCode, data);
-    }
-
-    @Override
-    public void onBackPressed() {
-        JitsiMeetActivityDelegate.onBackPressed();
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        view = new JitsiMeetView(this);
-        JitsiMeetConferenceOptions options = new JitsiMeetConferenceOptions.Builder()
-            .setRoom("https://meet.jit.si/test123")
-            .build();
-        view.join(options);
-
-        setContentView(view);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        view.dispose();
-        view = null;
-
-        JitsiMeetActivityDelegate.onHostDestroy(this);
-    }
-
-    @Override
-    public void onNewIntent(Intent intent) {
-        JitsiMeetActivityDelegate.onNewIntent(intent);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(
-            final int requestCode,
-            final String[] permissions,
-            final int[] grantResults) {
-        JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        JitsiMeetActivityDelegate.onHostResume(this);
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-
-        JitsiMeetActivityDelegate.onHostPause(this);
-    }
-}
-```
-
-</details>
-
-### JitsiMeetActivity
-
-This class encapsulates a high level API in the form of an Android `FragmentActivity`
-which displays a single `JitsiMeetView`. You can pass a URL as a `ACTION_VIEW`
-on the Intent when starting it and it will join the conference, and will be
-automatically terminated (finish() will be called on the activity) when the
-conference ends or fails.
-
-### JitsiMeetView
-
-The `JitsiMeetView` class is the core of Jitsi Meet SDK. It's designed to
-display a Jitsi Meet conference (or a welcome page).
-
-#### join(options)
-
-Joins the conference specified by the given `JitsiMeetConferenceOptions`.
-
-#### leave()
-
-Leaves the currently active conference. If the welcome page is enabled it will
-go back to it, otherwise a black window will be shown.
-
-#### dispose()
-
-Releases all resources associated with this view. This method MUST be called
-when the Activity holding this view is going to be destroyed, usually in the
-`onDestroy()` method.
-
-#### getListener()
-
-Returns the `JitsiMeetViewListener` instance attached to the view.
-
-#### setListener(listener)
-
-Sets the given listener (class implementing the `JitsiMeetViewListener`
-interface) on the view.
-
-### JitsiMeetConferenceOptions
-
-This object encapsulates all the options that can be tweaked when joining
-a conference.
-
-Example:
-
-```java
-JitsiMeetConferenceOptions options = new JitsiMeetConferenceOptions.Builder()
-    .setServerURL(new URL("https://meet.jit.si"))
-    .setRoom("test123")
-    .setAudioMuted(false)
-    .setVideoMuted(false)
-    .setAudioOnly(false)
-    .setWelcomePageEnabled(false)
-    .build();
-```
-
-See the `JitsiMeetConferenceOptions` implementation for all available options.
-
-### JitsiMeetActivityDelegate
-
-This class handles the interaction between `JitsiMeetView` and its enclosing
-`Activity`. Generally this shouldn't be consumed by users, because they'd be
-using `JitsiMeetActivity` instead, which is already completely integrated.
-
-All its methods are static.
-
-#### onActivityResult(...)
-
-Helper method to handle results of auxiliary activities launched by the SDK.
-Should be called from the activity method of the same name.
-
-#### onBackPressed()
-
-Helper method which should be called from the activity's `onBackPressed` method.
-If this function returns `true`, it means the action was handled and thus no
-extra processing is required; otherwise the app should call the parent's
-`onBackPressed` method.
-
-#### onHostDestroy(...)
-
-Helper method which should be called from the activity's `onDestroy` method.
-
-#### onHostResume(...)
-
-Helper method which should be called from the activity's `onResume` or `onStop`
-method.
-
-#### onHostStop(...)
-
-Helper method which should be called from the activity's `onSstop` method.
-
-#### onNewIntent(...)
-
-Helper method for integrating the *deep linking* functionality. If your app's
-activity is launched in "singleTask" mode this method should be called from the
-activity's `onNewIntent` method.
-
-#### onRequestPermissionsResult(...)
-
-Helper method to handle permission requests inside the SDK. It should be called
-from the activity method of the same name.
-
-#### onUserLeaveHint()
-
-Helper method for integrating automatic Picture-in-Picture. It should be called
-from the activity's `onUserLeaveHint` method.
-
-This is a static method.
-
-#### JitsiMeetViewListener
-
-`JitsiMeetViewListener` provides an interface apps can implement to listen to
-the state of the Jitsi Meet conference displayed in a `JitsiMeetView`.
-
-#### onConferenceJoined
-
-Called when a conference was joined.
-
-The `data` `Map` contains a "url" key with the conference URL.
-
-#### onConferenceTerminated
-
-Called when a conference was terminated either by user choice or due to a
-failure.
-
-The `data` `Map` contains an "error" key with the error and a "url" key
-with the conference URL. If the conference finished gracefully no `error`
-key will be present.
-
-#### onConferenceWillJoin
-
-Called before a conference is joined.
-
-The `data` `Map` contains a "url" key with the conference URL.
-
-## ProGuard rules
-
-When using the SDK on a project some proguard rules have to be added in order
-to avoid necessary code being stripped. Add the following to your project's
-rules file: https://github.com/jitsi/jitsi-meet/blob/master/android/app/proguard-rules.pro
-
-## Picture-in-Picture
-
-`JitsiMeetView` will automatically adjust its UI when presented in a
-Picture-in-Picture style scenario, in a rectangle too small to accommodate its
-"full" UI.
-
-## Dropbox integration
-
-To setup the Dropbox integration, follow these steps:
-
-1. Add the following to the app's AndroidManifest.xml and change `<APP_KEY>` to
-your Dropbox app key:
-```
-<activity
-    android:configChanges="keyboard|orientation"
-    android:launchMode="singleTask"
-    android:name="com.dropbox.core.android.AuthActivity">
-  <intent-filter>
-    <action android:name="android.intent.action.VIEW" />
-    <category android:name="android.intent.category.BROWSABLE" />
-    <category android:name="android.intent.category.DEFAULT" />
-    <data android:scheme="db-<APP_KEY>" />
-  </intent-filter>
-</activity>
-```
-
-2. Add the following to the app's strings.xml and change `<APP_KEY>` to your
-Dropbox app key:
-```
-<string name="dropbox_app_key"><APP_KEY></string>
-```
+This document has been moved to [The Handbook](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-android-sdk).

android/app/build.gradle

@@ -1,24 +1,25 @@
 apply plugin: 'com.android.application'
 
-boolean googleServicesEnabled \
-    = project.file('google-services.json').exists() && !rootProject.ext.libreBuild
-
 // Crashlytics integration is done as part of Firebase now, so it gets
 // automagically activated with google-services.json
 if (googleServicesEnabled) {
-    apply plugin: 'io.fabric'
+    apply plugin: 'com.google.firebase.crashlytics'
 }
 
 // Use the number of seconds/10 since Jan 1 2019 as the versionCode.
 // This lets us upload a new build at most every 10 seconds for the
 // next ~680 years.
 // https://stackoverflow.com/a/38643838
-def vcode = (int)(((new Date().getTime()/1000) - 1546297200) / 10)
+def vcode = (int) (((new Date().getTime() / 1000) - 1546297200) / 10)
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
+    packagingOptions {
+        exclude 'lib/*/libhermes*.so'
+    }
+
     defaultConfig {
         applicationId 'org.jitsi.meet'
         versionCode vcode
@@ -73,16 +74,11 @@ android {
     }
 }
 
-repositories {
-    maven { url 'https://maven.fabric.io/public' }
-}
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-5'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
 
     if (!rootProject.ext.libreBuild) {
         implementation 'com.google.android.gms:play-services-auth:16.0.1'
@@ -90,9 +86,9 @@ dependencies {
         // Firebase
         //  - Crashlytics
         //  - Dynamic Links
-        implementation 'com.google.firebase:firebase-core:16.0.6'
-        implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
-        implementation 'com.google.firebase:firebase-dynamic-links:16.1.5'
+        implementation 'com.google.firebase:firebase-analytics:17.5.0'
+        implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+        implementation 'com.google.firebase:firebase-dynamic-links:19.1.0'
     }
 
     implementation project(':sdk')
@@ -143,8 +139,8 @@ gradle.projectsEvaluated {
         def targetName = variant.name.capitalize()
 
         def currentRunPackagerTask = tasks.create(
-                name: "run${targetName}ReactPackager",
-                type: Exec) {
+            name: "run${targetName}ReactPackager",
+            type: Exec) {
             group = "react"
             description = "Run the React packager."
 
@@ -175,5 +171,5 @@ gradle.projectsEvaluated {
 }
 
 if (googleServicesEnabled) {
-   apply plugin: 'com.google.gms.google-services'
+    apply plugin: 'com.google.gms.google-services'
 }

android/app/proguard-rules.pro

@@ -85,8 +85,4 @@
 # ^^^ We added the above when we switched minifyEnabled on.
 
 # Rule to avoid build errors related to SVGs.
--keep public class com.horcrux.svg.** {*;}
-
-# Hermes
--keep class com.facebook.hermes.unicode.** { *; }
-
+-keep public class com.horcrux.svg.** {*;}

android/app/src/main/AndroidManifest.xml

@@ -1,12 +1,16 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.jitsi.meet">
+    package="org.jitsi.meet"
+    android:installLocation="auto">
   <application
       android:allowBackup="true"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
       android:networkSecurityConfig="@xml/network_security_config"
       android:theme="@style/AppTheme">
+    <meta-data
+        android:name="android.content.APP_RESTRICTIONS"
+        android:resource="@xml/app_restrictions" />
     <activity
         android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
         android:label="@string/app_name"

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

@@ -3,10 +3,10 @@ package org.jitsi.meet;
 import android.net.Uri;
 import android.util.Log;
 
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.google.firebase.dynamiclinks.FirebaseDynamicLinks;
-import io.fabric.sdk.android.Fabric;
 
+import org.jitsi.meet.sdk.JitsiMeet;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
 
 /**
@@ -21,8 +21,7 @@ final class GoogleServicesHelper {
         if (BuildConfig.GOOGLE_SERVICES_ENABLED) {
             Log.d(activity.getClass().getSimpleName(), "Initializing Google Services");
 
-            Fabric.with(activity, new Crashlytics());
-
+            FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!JitsiMeet.isCrashReportingDisabled(activity));
             FirebaseDynamicLinks.getInstance().getDynamicLink(activity.getIntent())
                 .addOnSuccessListener(activity, pendingDynamicLinkData -> {
                     Uri dynamicLink = null;

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

@@ -16,12 +16,18 @@
 
 package org.jitsi.meet;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.RestrictionEntry;
+import android.content.RestrictionsManager;
 import android.net.Uri;
-import android.os.Build;
+import android.os.Bundle;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.KeyEvent;
+
 import androidx.annotation.Nullable;
 
 import org.jitsi.meet.sdk.JitsiMeet;
@@ -31,6 +37,7 @@ import org.jitsi.meet.sdk.JitsiMeetConferenceOptions;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Collection;
 import java.util.Map;
 
 /**
@@ -48,9 +55,36 @@ public class MainActivity extends JitsiMeetActivity {
     private static final int OVERLAY_PERMISSION_REQUEST_CODE
         = (int) (Math.random() * Short.MAX_VALUE);
 
+    /**
+     * ServerURL configuration key for restriction configuration using {@link android.content.RestrictionsManager}
+     */
+    public static final String RESTRICTION_SERVER_URL = "SERVER_URL";
+
+    /**
+     * Broadcast receiver for restrictions handling
+     */
+    private BroadcastReceiver broadcastReceiver;
+
+    /**
+     * Flag if configuration is provided by RestrictionManager
+     */
+    private boolean configurationByRestrictions = false;
+
+    /**
+     * Default URL as could be obtained from RestrictionManager
+     */
+    private String defaultURL;
+
+
     // JitsiMeetActivity overrides
     //
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        JitsiMeet.showSplashScreen(this);
+        super.onCreate(savedInstanceState);
+    }
+
     @Override
     protected boolean extraInitialize() {
         Log.d(this.getClass().getSimpleName(), "LIBRE_BUILD="+BuildConfig.LIBRE_BUILD);
@@ -68,7 +102,7 @@ public class MainActivity extends JitsiMeetActivity {
         // In Debug builds React needs permission to write over other apps in
         // order to display the warning and error overlays.
         if (BuildConfig.DEBUG) {
-            if (canRequestOverlayPermission() && !Settings.canDrawOverlays(this)) {
+            if (!Settings.canDrawOverlays(this)) {
                 Intent intent
                     = new Intent(
                     Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
@@ -85,16 +119,67 @@ public class MainActivity extends JitsiMeetActivity {
 
     @Override
     protected void initialize() {
+        broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                // As new restrictions including server URL are received,
+                // conference should be restarted with new configuration.
+                leave();
+                recreate();
+            }
+        };
+        registerReceiver(broadcastReceiver,
+            new IntentFilter(Intent.ACTION_APPLICATION_RESTRICTIONS_CHANGED));
+
+        resolveRestrictions();
+        setJitsiMeetConferenceDefaultOptions();
+        super.initialize();
+    }
+
+    @Override
+    public void onDestroy() {
+        if (broadcastReceiver != null) {
+            unregisterReceiver(broadcastReceiver);
+            broadcastReceiver = null;
+        }
+
+        super.onDestroy();
+    }
+
+    private void setJitsiMeetConferenceDefaultOptions() {
         // Set default options
         JitsiMeetConferenceOptions defaultOptions
             = new JitsiMeetConferenceOptions.Builder()
-                .setWelcomePageEnabled(true)
-                .setServerURL(buildURL("https://meet.jit.si"))
-                .setFeatureFlag("call-integration.enabled", false)
-                .build();
+            .setWelcomePageEnabled(true)
+            .setServerURL(buildURL(defaultURL))
+            .setFeatureFlag("call-integration.enabled", false)
+            .setFeatureFlag("resolution", 360)
+            .setFeatureFlag("server-url-change.enabled", !configurationByRestrictions)
+            .build();
         JitsiMeet.setDefaultConferenceOptions(defaultOptions);
+    }
 
-        super.initialize();
+    private void resolveRestrictions() {
+        RestrictionsManager manager =
+            (RestrictionsManager) getSystemService(Context.RESTRICTIONS_SERVICE);
+        Bundle restrictions = manager.getApplicationRestrictions();
+        Collection<RestrictionEntry> entries = manager.getManifestRestrictions(
+            getApplicationContext().getPackageName());
+        for (RestrictionEntry restrictionEntry : entries) {
+            String key = restrictionEntry.getKey();
+            if (RESTRICTION_SERVER_URL.equals(key)) {
+                // If restrictions are passed to the application.
+                if (restrictions != null &&
+                    restrictions.containsKey(RESTRICTION_SERVER_URL)) {
+                    defaultURL = restrictions.getString(RESTRICTION_SERVER_URL);
+                    configurationByRestrictions = true;
+                // Otherwise use default URL from app-restrictions.xml.
+                } else {
+                    defaultURL = restrictionEntry.getSelectedString();
+                    configurationByRestrictions = false;
+                }
+            }
+        }
     }
 
     @Override
@@ -107,8 +192,7 @@ public class MainActivity extends JitsiMeetActivity {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE
-                && canRequestOverlayPermission()) {
+        if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE) {
             if (Settings.canDrawOverlays(this)) {
                 initialize();
                 return;
@@ -131,6 +215,18 @@ public class MainActivity extends JitsiMeetActivity {
         return super.onKeyUp(keyCode, event);
     }
 
+    @Override
+    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+        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
     //
 
@@ -141,10 +237,4 @@ public class MainActivity extends JitsiMeetActivity {
             return null;
         }
     }
-
-    private boolean canRequestOverlayPermission() {
-        return
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                && getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.M;
-    }
 }

android/app/src/main/res/drawable/ic_jitsi_logosvg.xml

@@ -0,0 +1,70 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="262.91376dp"
+    android:height="262.91376dp"
+    android:viewportWidth="262.91376"
+    android:viewportHeight="262.91376">
+  <group>
+    <clip-path
+        android:pathData="m0,0 l262.914,-0L262.914,262.914 0,262.914 0,0Z"/>
+    <path
+        android:pathData="m142.646,105.099c0.117,0.026 0.255,0.036 0.406,0.036 3.186,-0 10.297,-4.615 11.617,-6.721l0.1,-0.17 0.153,-0.135c0.451,-0.441 1.746,-2.773 2.374,-4.17 -6.751,-2.023 -7.49,-5.677 -8.153,-8.919 -0.069,-0.376 -0.138,-0.717 -0.204,-1.019 -0.074,-0.397 -0.153,-0.8 -0.226,-1.112C138.668,86.221 135.593,88.094 133.921,89.483 133.056,90.201 132.542,92.251 135.042,97.926 136.323,100.816 140.727,104.733 142.646,105.099"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="m115.413,146.042c5.934,-0 18.464,-3.543 26.748,-5.887 1.21,-0.336 2.33,-0.66 3.351,-0.944 0.166,-0.046 0.321,-0.091 0.472,-0.124 -0.463,-0.461 -1.239,-1.159 -2.497,-2.216 -5.521,-3.741 -10.736,-5.484 -16.403,-5.484 -1.237,-0 -2.522,0.071 -3.923,0.231 -4.801,0.55 -8.8,1.69 -10.722,2.237 -0.967,0.284 -1.263,0.366 -1.567,0.366 -0.58,-0 -1.079,-0.341 -1.273,-0.878 -0.194,-0.534 -0.027,-1.121 0.425,-1.507l0.024,-0.011c3.316,-2.784 9.489,-7.951 21.198,-10.256 2.027,-0.401 4.202,-0.605 6.454,-0.605 5.242,-0 10.67,1.086 16.125,3.219 7.436,2.899 12.521,6.625 16.602,9.62 2.199,1.609 4.105,3.007 5.755,3.771 0.421,0.2 0.637,0.255 0.746,0.265 0.074,-0.095 0.23,-0.365 0.474,-1.069 0.066,-0.185 0.529,-2.161 -2.806,-13.374 -1.931,-6.51 -4.264,-13.156 -5.479,-16.104 -2.356,-5.711 -1.778,-9.76 -1.051,-12.125 -1.999,0.735 -4.033,1.87 -6.174,3.446L161.758,98.711C160.694,99.506 159.599,100.404 158.426,101.454 151.517,107.64 146.344,110.864 143.035,111.04l-0.093,0.004 -0.093,-0.009c-2.912,-0.245 -7.324,-4.489 -9.133,-6.634 -0.373,-0.251 -0.8,-0.366 -1.366,-0.366 -0.564,-0 -1.202,0.116 -1.82,0.235C130.086,104.354 129.623,104.441 129.167,104.489 127.708,104.632 125.668,105.106 123.694,105.561 122.746,105.777 121.762,106.005 120.864,106.189 120.851,106.19 120.463,106.272 119.774,106.454 114.903,107.891 111.228,109.55 109.432,111.111 109.414,111.127 109.352,111.174 109.266,111.242 108.048,112.105 105.124,114.567 104.248,118.762L104.237,118.795C102.398,126.516 105.187,136.087 108.892,141.554 110.636,144.125 112.513,145.727 114.048,145.959 114.437,146.015 114.891,146.042 115.413,146.042"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="m90.093,173.175c-1.252,-1.472 -1.783,-3.324 -1.574,-5.521 0.884,-10.642 -0.329,-13.215 -0.891,-13.829 -0.131,-0.144 -0.207,-0.144 -0.265,-0.144 -0.022,-0 -0.041,0.003 -0.064,0.003 -1.044,0.248 -8.066,5.002 -9.615,19.171 -0.749,6.845 0.561,15.63 1.679,20.974 0.897,-3.155 2.314,-6.624 5.057,-10.204 2.556,-3.326 5.345,-5.955 8.801,-8.253C92.143,174.93 90.991,174.235 90.093,173.175"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="m94.906,156.389c-0.03,2.229 -0.326,4.36 -0.61,6.445 -0.151,1.119 -0.314,2.286 -0.434,3.46 -0.161,2.341 0.346,3.166 0.571,3.406 0.127,0.136 0.326,0.287 0.76,0.287 0.339,-0 0.741,-0.091 1.161,-0.268 4.202,-1.756 8.195,-4.815 10.115,-6.515C103.522,161.892 98.995,159.058 94.906,156.389"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="m154.002,81.595c-0.031,0.074 -0.065,0.148 -0.101,0.216 -0.821,2.403 0.306,5.664 2.419,6.898 0.561,0.327 1.106,0.526 1.624,0.596 0.072,0.006 0.148,0.009 0.219,0.009 1.645,-0 2.971,-1.199 3.961,-3.561C162.752,83.959 162.836,81.827 162.37,79.904 162.003,78.409 161.057,76.627 160.453,75.738 159.332,76.509 157.111,78.207 155.585,79.553 154.518,80.582 154.136,81.229 154.002,81.595"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M148.97,77.699C153.957,73.194 156.988,65.754 158.253,61.334 153.915,65.513 148.633,67.758 145.25,69.198 144.084,69.695 143.08,70.124 142.477,70.476 142.224,70.623 141.965,70.77 141.708,70.919 139.654,72.109 136.55,73.905 136.1,75.011l-0.012,0.036 -0.012,0.034c-1.406,2.956 -2.199,7.401 -2.457,9.95 3.266,-1.99 6.625,-3.322 9.416,-4.42C145.628,79.585 147.863,78.703 148.97,77.699"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="m164.464,51.921c-0.84,5.539 -2.205,10.799 -4.751,16.347 2.781,-3.144 4.396,-6.568 4.941,-10.401C164.886,56.275 165.097,54.756 164.464,51.921"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M148.749,142.639C148.718,142.598 148.684,142.56 148.658,142.519 148.523,142.539 148.307,142.584 147.972,142.683l-0.14,0.04c-1.726,0.644 -4.899,1.708 -8.556,2.946 -4.396,1.479 -9.365,3.154 -13.526,4.649 -5.297,1.975 -7.021,2.755 -7.557,3.024 -0.098,0.266 -0.203,0.599 -0.327,0.965 -1.254,3.816 -4.125,12.541 -18.276,18.653 2.928,2.956 9.289,8.27 21.809,8.27 1.082,-0 2.21,-0.036 3.341,-0.12 9.451,-0.666 18.342,-4.855 25.026,-11.78 6.087,-6.291 9.538,-14.136 9.585,-21.7C157.876,147.509 155.367,147.135 153.043,146.033 153.014,146.02 150.361,144.745 148.749,142.639"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="m189.478,117.853c-0.523,9.749 -2.122,18.424 -4.744,25.8 -2.128,5.988 -4.94,11.134 -8.356,15.316 -5.676,6.931 -11.555,9.256 -12.804,9.304 -0.866,-0 -1.313,-0.309 -3.046,-1.528 -0.17,-0.114 -0.37,-0.252 -0.581,-0.4 -3.313,5.953 -8.505,11.097 -15.065,14.959 -7.079,4.144 -15.297,6.423 -23.157,6.423 -9.078,-0 -17.13,-2.924 -23.341,-8.456 -7.467,4.799 -12.31,9.074 -16.267,27.005l-1.363,6.17 -2.971,-5.564c-0.424,-0.786 -1.929,-3.731 -3.332,-8.887 -1.934,-7.104 -2.86,-15.181 -2.758,-24.01 0.117,-10.049 3.154,-16.526 5.68,-20.186 2.98,-4.314 6.837,-6.994 10.076,-6.994 0.216,-0 0.428,0.006 0.616,0.035 5.159,0.575 8.435,2.75 14.396,6.686l1.899,1.252c2.059,1.344 4.481,2.7 5.259,2.989 0.54,-0.284 1.749,-2.3 2.155,-5.271l0.069,-0.451c0.005,-0.045 0.009,-0.091 0.014,-0.131 -0.036,-0.02 -0.065,-0.029 -0.094,-0.041 -4.008,-1.375 -9.539,-7.7 -12.364,-17.134 -2.684,-9.382 -2.129,-17.185 1.644,-23.193 6.12,-9.736 19.198,-11.974 23.466,-12.702 1.331,-0.266 2.716,-0.511 4.041,-0.717 0.255,-0.061 0.469,-0.121 0.642,-0.168 -0.031,-0.126 -0.071,-0.265 -0.114,-0.43 -0.108,-0.417 -0.23,-0.891 -0.354,-1.447 -1.345,-6.035 -0.664,-11.069 0.181,-15.193 0.928,-4.546 1.489,-7.287 3.747,-9.936 3.029,-4.165 8.319,-5.936 11.479,-6.991 0.746,-0.249 1.511,-0.509 1.894,-0.689 8.988,-4.31 11.82,-8.739 12.615,-11.694 0.656,-2.451 1.699,-8.884 1.251,-13.335 -0.085,-0.805 0.129,-1.521 0.621,-2.065 0.45,-0.505 1.101,-0.794 1.778,-0.794 1.515,-0 2.82,-0 7.511,14.598 2.481,7.698 0.645,14.903 -5.45,21.424l-0.226,0.231c0.024,0.044 0.049,0.09 0.08,0.144 2.57,4.236 3.963,9.54 3.553,13.51 -0.099,0.906 -0.265,1.775 -0.419,2.549 -0.003,0.01 -0.003,0.016 -0.004,0.029 0.516,-0.032 1.119,-0.055 1.775,-0.055 3.052,-0 7.435,0.474 10.989,2.735 2.135,1.352 4.845,3.439 6.835,7.615C189.223,102.942 190.076,109.575 189.478,117.853m4.77,-23.191c-2.916,-6.1 -6.989,-9.177 -9.793,-10.96 -2.355,-1.494 -5.064,-2.584 -8.077,-3.24l-0.676,-0.146 -0.111,-0.689c-0.339,-2.119 -0.918,-4.275 -1.715,-6.406l-0.185,-0.49 0.292,-0.434c5.095,-7.594 6.323,-16.17 3.54,-24.802 -2.191,-6.824 -3.895,-11.211 -5.341,-13.799 -2.954,-5.305 -7.006,-6.417 -9.891,-6.417 -2.964,-0 -5.8,1.261 -7.789,3.457 -2.043,2.254 -2.993,5.207 -2.678,8.31 0.316,3.134 -0.494,8.516 -1.014,10.439 -0.04,0.117 -0.975,2.929 -8.201,6.428 -0.162,0.056 -0.512,0.179 -1.053,0.359 -3.729,1.246 -10.666,3.571 -15.258,9.64 -3.465,4.205 -4.332,8.441 -5.338,13.346 -0.586,2.865 -1.236,6.744 -1.079,11.344l0.026,0.841 -0.824,0.188c-11.646,2.585 -20.025,7.835 -24.909,15.605 -5.054,8.04 -5.919,18.055 -2.543,29.853 0.063,0.204 0.126,0.407 0.189,0.615l0.527,1.608 -1.665,-0.286c-0.561,-0.101 -1.135,-0.18 -1.729,-0.241 -0.493,-0.06 -1.001,-0.082 -1.509,-0.082 -5.633,-0 -11.663,3.585 -16.128,9.592 -3.451,4.641 -7.588,12.849 -7.735,25.601 -0.114,9.573 0.906,18.401 3.038,26.228 1.581,5.795 3.326,9.329 4.004,10.577l13.306,24.94 6.096,-27.619c2.454,-11.09 4.864,-15.262 7.725,-18.111l0.561,-0.563 0.679,0.411c6.605,3.977 14.466,6.084 22.73,6.084 9.286,-0 18.965,-2.682 27.259,-7.551 5.38,-3.16 9.974,-7.036 13.649,-11.531l0.45,-0.369 0.85,-0.02c2.156,-0.068 5.16,-1.164 8.222,-3.004 2.6,-1.555 6.543,-4.428 10.501,-9.262 3.997,-4.884 7.274,-10.854 9.716,-17.734 2.876,-8.073 4.625,-17.489 5.204,-28.004 0.689,-9.668 -0.434,-17.641 -3.327,-23.704"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="m180.026,98.414c-1.67,-2.596 -3.771,-4.206 -5.475,-4.206 -0.313,-0 -0.613,0.051 -0.895,0.161 -0.911,0.361 -2.356,4.532 -1.714,7.566 0.434,2.066 2.938,9.04 4.151,12.394 0.456,1.281 0.68,1.91 0.754,2.142 0.064,0.183 0.145,0.448 0.256,0.774 0.97,2.971 3.467,10.586 4.206,16.761 1.549,-6.579 2.424,-14.512 2.085,-23.997C183.235,105.662 182.04,101.538 180.026,98.414"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M168.088,142.604C169.896,142.111 171.33,141.705 172.398,141.395 170.213,139.874 167.689,137.979 164.247,135.304c-8.418,-6.546 -17.449,-9.87 -26.839,-9.87 -5.135,-0 -9.611,0.991 -13.156,2.186 0.882,-0.05 1.779,-0.079 2.7,-0.079 1.1,-0 2.247,0.04 3.411,0.119 3.652,0.246 13.061,1.901 21.565,12.047 1.714,2.039 3.559,3.73 8.794,3.73 1.873,-0 4.051,-0.207 6.662,-0.645C167.544,142.751 167.793,142.678 168.088,142.604"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="m164.3,147.583c-0.122,1.563 -0.376,4.509 -0.782,6.76 -0.495,2.719 -1.31,5.02 -1.791,6.226 0.85,0.786 1.694,1.553 2.247,2.043 2.214,-1.447 9.47,-6.96 14.483,-19.474C176.847,144.229 174.59,145.178 171.671,146.018 168.701,146.861 165.82,147.357 164.3,147.583"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"/>
+  </group>
+</vector>

android/app/src/main/res/layout/launch_screen.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorPrimary">
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:src="@drawable/ic_jitsi_logosvg"/>
+</RelativeLayout>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#17A0DB</color>
+    <color name="colorPrimaryDark">#1081B2</color>
+</resources>

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

@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">Jitsi Meet</string>
+    <string name="restriction_server_url_description">URL of Jitsi Meet server instance to connect to</string>
+    <string name="restriction_server_url_title">Server URL</string>
 </resources>

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

@@ -2,6 +2,6 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="android:navigationBarColor">#1081B2</item>
+        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
     </style>
 </resources>

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

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

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

@@ -1,6 +1,12 @@
-<network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="false">localhost</domain>
-        <domain includeSubdomains="false">10.0.2.2</domain>
-    </domain-config>
+<network-security-config> 
+   <base-config> 
+      <trust-anchors> 
+         <certificates src="system" /> 
+         <certificates src="user" /> 
+      </trust-anchors> 
+   </base-config> 
+   <domain-config cleartextTrafficPermitted="true"> 
+      <domain includeSubdomains="false">localhost</domain> 
+      <domain includeSubdomains="false">10.0.2.2</domain> 
+   </domain-config> 
 </network-security-config>

android/build.gradle

@@ -1,4 +1,5 @@
 import groovy.json.JsonSlurper
+import org.gradle.util.VersionNumber
 
 // Top-level build file where you can add configuration options common to all
 // sub-projects/modules.
@@ -7,26 +8,46 @@ buildscript {
     repositories {
         google()
         jcenter()
-        repositories {
-            maven { url 'https://maven.fabric.io/public' }
-        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'io.fabric.tools:gradle:1.28.1'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files.
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
     }
 }
 
+ext {
+    buildToolsVersion = "29.0.3"
+    compileSdkVersion = 29
+    minSdkVersion    = 23
+    targetSdkVersion = 29
+    supportLibVersion = "28.0.0"
+
+    // The Maven artifact groupdId of the third-party react-native modules which
+    // Jitsi Meet SDK for Android depends on and which are not available in
+    // third-party Maven repositories so we have to deploy to a Maven repository
+    // of ours.
+    moduleGroupId = 'com.facebook.react'
+
+    // Maven repo where artifacts will be published
+    mavenRepo = System.env.MVN_REPO ?: ""
+    mavenUser = System.env.MVN_USER ?: ""
+    mavenPassword = System.env.MVN_PASSWORD ?: ""
+
+    // Libre build
+    libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
+
+    googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
+}
+
 allprojects {
     repositories {
         google()
         jcenter()
         // React Native (JS, Obj-C sources, Android binaries) is installed from npm.
         maven { url "$rootDir/../node_modules/react-native/android" }
+        // Android JSC is installed from npm.
+        maven { url("$rootDir/../node_modules/jsc-android/dist") }
     }
 
     // Make sure we use the react-native version in node_modules and not the one
@@ -141,28 +162,6 @@ allprojects {
     }
 }
 
-ext {
-    buildToolsVersion = "28.0.3"
-    compileSdkVersion = 28
-    minSdkVersion    = 21
-    targetSdkVersion = 28
-    supportLibVersion = "28.0.0"
-
-    // The Maven artifact groupdId of the third-party react-native modules which
-    // Jitsi Meet SDK for Android depends on and which are not available in
-    // third-party Maven repositories so we have to deploy to a Maven repository
-    // of ours.
-    moduleGroupId = 'com.facebook.react'
-
-    // Maven repo where artifacts will be published
-    mavenRepo = System.env.MVN_REPO ?: ""
-    mavenUser = System.env.MVN_USER ?: ""
-    mavenPassword = System.env.MVN_PASSWORD ?: ""
-
-    // Libre build
-    libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
-}
-
 // Force the version of the Android build tools we have chosen on all
 // subprojects. The forcing was introduced for react-native and the third-party
 // modules that we utilize such as react-native-background-timer.

android/gradle.properties

@@ -10,15 +10,20 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -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
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+# This one fixes a weird WebRTC runtime problem on some devices.
+# https://github.com/jitsi/jitsi-meet/issues/7911#issuecomment-714323255
+android.enableDexingArtifactTransform.desugaring=false
+
 android.useAndroidX=true
 android.enableJetifier=true
 
-appVersion=20.2.0
-sdkVersion=2.8.0
+appVersion=20.5.0
+sdkVersion=2.11.0

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Mar 08 13:36:51 CET 2019
+#Wed Sep 23 11:48:00 EEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip

android/scripts/release-sdk.sh

@@ -10,7 +10,7 @@ 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)
-HERMES_VERSION=$(jq -r '.dependencies."hermes-engine"' ${THIS_DIR}/../../node_modules/react-native/package.json | cut -c 2-)
+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
@@ -38,19 +38,17 @@ if [[ $MVN_HTTP == 1 ]]; then
         -DgeneratePom=false \
         -DpomFile=react-native-${RN_VERSION}.pom || true
     popd
-    # Push Hermes
-    echo "Pushing Hermes ${HERMES_VERSION} to the Maven repo"
-    pushd ${THIS_DIR}/../../node_modules/hermes-engine/android/
+    # 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=hermes-release.aar \
+        -Dfile=android-jsc-${JSC_VERSION}.aar \
         -Dpackaging=aar \
-        -DgroupId=com.facebook \
-        -DartifactId=hermes \
-        -Dversion=${HERMES_VERSION} \
-        -DgeneratePom=true || true
+        -DgeneratePom=false \
+        -DpomFile=android-jsc-${JSC_VERSION}.pom || true
     popd
 else
     # Push React Native, if necessary
@@ -67,19 +65,17 @@ else
         popd
     fi
 
-    # Push Hermes, if necessary
-    if [[ ! -d ${MVN_REPO}/com/facebook/hermes/${HERMES_VERSION} ]]; then
-        echo "Pushing Hermes ${HERMES_VERSION} to the Maven repo"
-        pushd ${THIS_DIR}/../../node_modules/hermes-engine/android/
+    # 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=hermes-release.aar \
+            -Dfile=android-jsc-${JSC_VERSION}.aar \
             -Dpackaging=aar \
-            -DgroupId=com.facebook \
-            -DartifactId=hermes \
-            -Dversion=${HERMES_VERSION} \
-            -DgeneratePom=true
+            -DgeneratePom=false \
+            -DpomFile=android-jsc-${JSC_VERSION}.pom
         popd
     fi
 
@@ -93,7 +89,9 @@ 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 assembleRelease publish
+./gradlew clean 
+./gradlew assembleRelease 
+./gradlew publish
 popd
 
 if [[ $DO_GIT_TAG == 1 ]]; then

android/scripts/run-packager-helper.command

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+
+exec ${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.command --reset-cache

android/scripts/run-packager.sh

@@ -8,7 +8,7 @@ THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOUR
 export RCT_METRO_PORT="${RCT_METRO_PORT:=8081}"
 echo "export RCT_METRO_PORT=${RCT_METRO_PORT}" > "${THIS_DIR}/../../node_modules/react-native/scripts/.packager.env"
 
-adb reverse tcp:8081 tcp:8081
+adb reverse tcp:$RCT_METRO_PORT tcp:$RCT_METRO_PORT
 
 if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then
   if ! curl -s "http://localhost:${RCT_METRO_PORT}/status" | grep -q "packager-status:running" ; then
@@ -16,11 +16,10 @@ if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then
     exit 2
   fi
 else
-    CMD="${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.command"
+    CMD="$THIS_DIR/run-packager-helper.command"
     if [[ `uname` == "Darwin"  ]]; then
         open -g "${CMD}" || echo "Can't start packager automatically"
     else
         xdg-open "${CMD}" || echo "Can't start packager automatically"
     fi
 fi
-

android/sdk/build.gradle

@@ -1,5 +1,3 @@
-import groovy.json.JsonSlurper
-
 apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 
@@ -14,11 +12,13 @@ android {
     buildTypes {
         debug {
             buildConfigField "boolean", "LIBRE_BUILD", "${rootProject.ext.libreBuild}"
+            buildConfigField "boolean", "GOOGLE_SERVICES_ENABLED", "${rootProject.ext.googleServicesEnabled}"
         }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             buildConfigField "boolean", "LIBRE_BUILD", "${rootProject.ext.libreBuild}"
+            buildConfigField "boolean", "GOOGLE_SERVICES_ENABLED", "${rootProject.ext.googleServicesEnabled}"
         }
     }
 
@@ -33,26 +33,19 @@ android {
             }
         }
     }
-
-    packagingOptions {
-        pickFirst '**/libc++_shared.so'
-    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.fragment:fragment:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.fragment:fragment:1.2.5'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
-
-    // Hermes JS engine
-    def hermesPath = "../../node_modules/hermes-engine/android/"
-    debugImplementation files(hermesPath + "hermes-debug.aar")
-    releaseImplementation files(hermesPath + "hermes-release.aar")
+    //noinspection GradleDynamicVersion
+    implementation 'org.webkit:android-jsc:+'
 
     implementation 'com.dropbox.core:dropbox-core-sdk:3.0.8'
     implementation 'com.jakewharton.timber:timber:4.7.1'
@@ -70,6 +63,7 @@ dependencies {
     implementation project(':react-native-calendar-events')
     implementation project(':react-native-community-async-storage')
     implementation project(':react-native-community_netinfo')
+    implementation project(':react-native-default-preference')
     implementation project(':react-native-immersive')
     implementation project(':react-native-keep-awake')
     implementation project(':react-native-linear-gradient')
@@ -77,6 +71,7 @@ dependencies {
     implementation project(':react-native-svg')
     implementation project(':react-native-webrtc')
     implementation project(':react-native-webview')
+    implementation project(':react-native-splash-screen')
 
     testImplementation 'junit:junit:4.12'
 }
@@ -150,7 +145,7 @@ android.libraryVariants.all { def variant ->
     mergeResourcesTask.dependsOn(currentBundleTask)
 
     mergeAssetsTask.doLast {
-        def assetsDir = mergeAssetsTask.outputDir
+        def assetsDir = mergeAssetsTask.outputDir.get()
 
         // Bundle sounds
         //
@@ -184,7 +179,7 @@ android.libraryVariants.all { def variant ->
         if (currentBundleTask.enabled) {
             copy {
                 from(resourcesDir)
-                into(mergeResourcesTask.outputDir)
+                into(mergeResourcesTask.outputDir.get())
             }
         }
     }
@@ -224,14 +219,6 @@ publishing {
                     dependency.appendNode('artifactId', artifactId)
                     dependency.appendNode('version', it.moduleVersion)
                 }
-
-                // Add Hermes dependency.
-                def hermesPkg = new File("$rootDir/../node_modules/hermes-engine/package.json")
-                def hermesVersion = new JsonSlurper().parseText(hermesPkg.text).version
-                def hermesDependency = dependencies.appendNode('dependency')
-                hermesDependency.appendNode('groupId', "com.facebook")
-                hermesDependency.appendNode('artifactId', "hermes")
-                hermesDependency.appendNode('version', hermesVersion)
             }
         }
 

android/sdk/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <uses-feature
         android:glEsVersion="0x00020000"
@@ -34,8 +34,7 @@
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
 
         <service
@@ -46,7 +45,9 @@
             </intent-filter>
         </service>
 
-        <service android:name="org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService" />
+        <service
+            android:name="org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService"
+            android:foregroundServiceType="mediaProjection" />
     </application>
 
 </manifest>

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

@@ -17,6 +17,8 @@
 package org.jitsi.meet.sdk;
 
 import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.provider.Settings;
 import android.text.TextUtils;
 
@@ -40,6 +42,8 @@ class AmplitudeModule
         extends ReactContextBaseJavaModule {
 
     public static final String NAME = "Amplitude";
+    public static final String JITSI_PREFERENCES = "jitsi-preferences";
+    public static final String AMPLITUDE_DEVICE_ID_KEY = "amplitudeDeviceId";
 
     public AmplitudeModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -58,10 +62,14 @@ class AmplitudeModule
         Amplitude.getInstance(instanceName).initialize(getCurrentActivity(), apiKey);
 
         // Set the device ID to something consistent.
-        String android_id
-            = Settings.Secure.getString(getReactApplicationContext().getContentResolver(), Settings.Secure.ANDROID_ID);
+        SharedPreferences sharedPreferences = getReactApplicationContext().getSharedPreferences(JITSI_PREFERENCES, Context.MODE_PRIVATE);
+        String android_id = sharedPreferences.getString(AMPLITUDE_DEVICE_ID_KEY, "");
         if (!TextUtils.isEmpty(android_id)) {
             Amplitude.getInstance(instanceName).setDeviceId(android_id);
+        } else {
+            String amplitudeId = Amplitude.getInstance(instanceName).getDeviceId();
+            SharedPreferences.Editor editor = sharedPreferences.edit();
+            editor.putString(JITSI_PREFERENCES, amplitudeId).apply();
         }
     }
 

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

@@ -76,6 +76,7 @@ class AppInfoModule
             "version",
             packageInfo == null ? "" : packageInfo.versionName);
         constants.put("LIBRE_BUILD", BuildConfig.LIBRE_BUILD);
+        constants.put("GOOGLE_SERVICES_ENABLED", BuildConfig.GOOGLE_SERVICES_ENABLED);
 
         return constants;
     }

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

@@ -16,11 +16,8 @@
 
 package org.jitsi.meet.sdk;
 
-import android.content.Context;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
-import android.os.Build;
-import androidx.annotation.RequiresApi;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -34,7 +31,6 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
  * default it's only used on versions < O, since versions >= O use ConnectionService, but it
  * can be disabled.
  */
-@RequiresApi(Build.VERSION_CODES.M)
 class AudioDeviceHandlerGeneric implements
         AudioModeModule.AudioDeviceHandlerInterface,
         AudioManager.OnAudioFocusChangeListener {

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

@@ -1,230 +0,0 @@
-/*
- * Copyright @ 2017-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.media.AudioManager;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-
-/**
- * {@link AudioModeModule.AudioDeviceHandlerInterface} module implementing device handling for
- * legacy (pre-M) Android versions.
- */
-class AudioDeviceHandlerLegacy implements
-        AudioModeModule.AudioDeviceHandlerInterface,
-        AudioManager.OnAudioFocusChangeListener,
-        BluetoothHeadsetMonitor.Listener {
-
-    private final static String TAG = AudioDeviceHandlerLegacy.class.getSimpleName();
-
-    /**
-     * Reference to the main {@code AudioModeModule}.
-     */
-    private AudioModeModule module;
-
-    /**
-     * Indicator that we have lost audio focus.
-     */
-    private boolean audioFocusLost = false;
-
-    /**
-     * {@link AudioManager} instance used to interact with the Android audio
-     * subsystem.
-     */
-    private AudioManager audioManager;
-
-    /**
-     * {@link BluetoothHeadsetMonitor} for detecting Bluetooth device changes in
-     * old (< M) Android versions.
-     */
-    private BluetoothHeadsetMonitor bluetoothHeadsetMonitor;
-
-    public AudioDeviceHandlerLegacy(AudioManager audioManager) {
-        this.audioManager = audioManager;
-    }
-
-    /**
-     * Helper method to trigger an audio route update when Bluetooth devices are
-     * connected / disconnected.
-     */
-    @Override
-    public void onBluetoothDeviceChange(final boolean deviceAvailable) {
-        module.runInAudioThread(new Runnable() {
-            @Override
-            public void run() {
-                if (deviceAvailable) {
-                    module.addDevice(AudioModeModule.DEVICE_BLUETOOTH);
-                } else {
-                    module.removeDevice(AudioModeModule.DEVICE_BLUETOOTH);
-                }
-
-                module.updateAudioRoute();
-            }
-        });
-    }
-
-    /**
-     * Helper method to trigger an audio route update when a headset is plugged
-     * or unplugged.
-     */
-    private void onHeadsetDeviceChange() {
-        module.runInAudioThread(new Runnable() {
-            @Override
-            public void run() {
-                // XXX: isWiredHeadsetOn is not deprecated when used just for
-                // knowing if there is a wired headset connected, regardless of
-                // audio being routed to it.
-                //noinspection deprecation
-                if (audioManager.isWiredHeadsetOn()) {
-                    module.addDevice(AudioModeModule.DEVICE_HEADPHONES);
-                } else {
-                    module.removeDevice(AudioModeModule.DEVICE_HEADPHONES);
-                }
-
-                module.updateAudioRoute();
-            }
-        });
-    }
-
-    /**
-     * {@link AudioManager.OnAudioFocusChangeListener} interface method. Called
-     * when the audio focus of the system is updated.
-     *
-     * @param focusChange - The type of focus change.
-     */
-    @Override
-    public void onAudioFocusChange(final int focusChange) {
-        module.runInAudioThread(new Runnable() {
-            @Override
-            public void run() {
-                switch (focusChange) {
-                    case AudioManager.AUDIOFOCUS_GAIN: {
-                        JitsiMeetLogger.d(TAG + " Audio focus gained");
-                        // Some other application potentially stole our audio focus
-                        // temporarily. Restore our mode.
-                        if (audioFocusLost) {
-                            module.updateAudioRoute();
-                        }
-                        audioFocusLost = false;
-                        break;
-                    }
-                    case AudioManager.AUDIOFOCUS_LOSS:
-                    case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
-                    case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK: {
-                        JitsiMeetLogger.d(TAG + " Audio focus lost");
-                        audioFocusLost = true;
-                        break;
-                    }
-                }
-            }
-        });
-    }
-
-    /**
-     * Helper method to set the output route to a Bluetooth device.
-     *
-     * @param enabled true if Bluetooth should use used, false otherwise.
-     */
-    private void setBluetoothAudioRoute(boolean enabled) {
-        if (enabled) {
-            audioManager.startBluetoothSco();
-            audioManager.setBluetoothScoOn(true);
-        } else {
-            audioManager.setBluetoothScoOn(false);
-            audioManager.stopBluetoothSco();
-        }
-    }
-
-    @Override
-    public void start(AudioModeModule audioModeModule) {
-        JitsiMeetLogger.i("Using " + TAG + " as the audio device handler");
-
-        module = audioModeModule;
-        Context context = module.getContext();
-
-        // Setup runtime device change detection.
-        //
-
-        // Detect changes in wired headset connections.
-        IntentFilter wiredHeadSetFilter = new IntentFilter(AudioManager.ACTION_HEADSET_PLUG);
-        BroadcastReceiver wiredHeadsetReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                JitsiMeetLogger.d(TAG + " Wired headset added / removed");
-                onHeadsetDeviceChange();
-            }
-        };
-        context.registerReceiver(wiredHeadsetReceiver, wiredHeadSetFilter);
-
-        // Detect Bluetooth device changes.
-        bluetoothHeadsetMonitor = new BluetoothHeadsetMonitor(context, this);
-
-        // On Android < M, detect if we have an earpiece.
-        PackageManager pm = context.getPackageManager();
-        if (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            module.addDevice(AudioModeModule.DEVICE_EARPIECE);
-        }
-
-        // Always assume there is a speaker.
-        module.addDevice(AudioModeModule.DEVICE_SPEAKER);
-    }
-
-    @Override
-    public void stop() {
-        bluetoothHeadsetMonitor.stop();
-        bluetoothHeadsetMonitor = null;
-    }
-
-    @Override
-    public void setAudioRoute(String device) {
-        // Turn speaker on / off
-        audioManager.setSpeakerphoneOn(device.equals(AudioModeModule.DEVICE_SPEAKER));
-
-        // Turn bluetooth on / off
-        setBluetoothAudioRoute(device.equals(AudioModeModule.DEVICE_BLUETOOTH));
-    }
-
-    @Override
-    public boolean setMode(int mode) {
-        if (mode == AudioModeModule.DEFAULT) {
-            audioFocusLost = false;
-            audioManager.setMode(AudioManager.MODE_NORMAL);
-            audioManager.abandonAudioFocus(this);
-            audioManager.setSpeakerphoneOn(false);
-            setBluetoothAudioRoute(false);
-
-            return true;
-        }
-
-        audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-        audioManager.setMicrophoneMute(false);
-
-        if (audioManager.requestAudioFocus(this, AudioManager.STREAM_VOICE_CALL, AudioManager.AUDIOFOCUS_GAIN)
-                == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
-            JitsiMeetLogger.w(TAG + " Audio focus request failed");
-            return false;
-        }
-
-        return true;
-    }
-}

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

@@ -222,10 +222,8 @@ class AudioModeModule extends ReactContextBaseJavaModule {
 
         if (useConnectionService()) {
             audioDeviceHandler = new AudioDeviceHandlerConnectionService(audioManager);
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            audioDeviceHandler = new AudioDeviceHandlerGeneric(audioManager);
         } else {
-            audioDeviceHandler = new AudioDeviceHandlerLegacy(audioManager);
+            audioDeviceHandler = new AudioDeviceHandlerGeneric(audioManager);
         }
 
         audioDeviceHandler.start(this);
@@ -427,15 +425,6 @@ class AudioModeModule extends ReactContextBaseJavaModule {
         }
     }
 
-    /**
-     * Needed on the legacy handler...
-     *
-     * @return Context for the application.
-     */
-    Context getContext() {
-        return getReactApplicationContext();
-    }
-
     /**
      * Interface for the modules implementing the actual audio device management.
      */

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

@@ -1,191 +0,0 @@
-/*
- * Copyright @ 2017-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothHeadset;
-import android.bluetooth.BluetoothProfile;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.media.AudioManager;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-/**
- * Helper class to detect and handle Bluetooth device changes.  It monitors
- * Bluetooth headsets being connected / disconnected and notifies the module
- * about device changes when this occurs.
- */
-class BluetoothHeadsetMonitor {
-    private final static String TAG = BluetoothHeadsetMonitor.class.getSimpleName();
-
-    /**
-     * The {@link Context} in which this module executes.
-     */
-    private final Context context;
-
-    /**
-     * Reference to the {@link BluetoothAdapter} object, used to access Bluetooth functionality.
-     */
-    private BluetoothAdapter adapter;
-
-    /**
-     * Reference to a proxy object which allows us to query connected devices.
-     */
-    private BluetoothHeadset headset;
-
-    /**
-     * receiver registered for receiving Bluetooth connection state changes.
-     */
-    private BroadcastReceiver receiver;
-
-    /**
-     * Listener for receiving Bluetooth device change events.
-     */
-    private Listener listener;
-
-    public BluetoothHeadsetMonitor(Context context, Listener listener) {
-        this.context = context;
-        this.listener = listener;
-    }
-
-    private boolean getBluetoothHeadsetProfileProxy() {
-        adapter = BluetoothAdapter.getDefaultAdapter();
-
-        if (adapter == null) {
-            JitsiMeetLogger.w(TAG + " Device doesn't support Bluetooth");
-            return false;
-        }
-
-        // XXX: The profile listener listens for system services of the given
-        // type being available to the application. That is, if our Bluetooth
-        // adapter has the "headset" profile.
-        BluetoothProfile.ServiceListener listener
-            = new BluetoothProfile.ServiceListener() {
-                @Override
-                public void onServiceConnected(int profile, BluetoothProfile proxy) {
-                    if (profile == BluetoothProfile.HEADSET) {
-                        headset = (BluetoothHeadset) proxy;
-                        updateDevices();
-                    }
-                }
-
-                @Override
-                public void onServiceDisconnected(int profile) {
-                    // The logic is the same as the logic of onServiceConnected.
-                    onServiceConnected(profile, /* proxy */ null);
-                }
-            };
-
-        return adapter.getProfileProxy(context, listener, BluetoothProfile.HEADSET);
-    }
-
-    private void onBluetoothReceiverReceive(Context context, Intent intent) {
-        final String action = intent.getAction();
-
-        if (action.equals(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED)) {
-            // XXX: This action will be fired when a Bluetooth headset is
-            // connected or disconnected to the system. This is not related to
-            // audio routing.
-            int state = intent.getIntExtra(BluetoothHeadset.EXTRA_STATE, -99);
-
-            switch (state) {
-            case BluetoothHeadset.STATE_CONNECTED:
-            case BluetoothHeadset.STATE_DISCONNECTED:
-                JitsiMeetLogger.d(TAG + " BT headset connection state changed: " + state);
-                updateDevices();
-                break;
-            }
-        } else if (action.equals(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED)) {
-            // XXX: This action will be fired when the connection established
-            // with a Bluetooth headset (called a SCO connection) changes state.
-            // When the SCO connection is active we route audio to it.
-            int state = intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, -99);
-
-            switch (state) {
-            case AudioManager.SCO_AUDIO_STATE_CONNECTED:
-            case AudioManager.SCO_AUDIO_STATE_DISCONNECTED:
-                JitsiMeetLogger.d(TAG + " BT SCO connection state changed: " + state);
-                updateDevices();
-                break;
-            }
-        }
-    }
-
-    private void registerBluetoothReceiver() {
-        receiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                onBluetoothReceiverReceive(context, intent);
-            }
-        };
-
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED);
-        filter.addAction(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);
-
-        context.registerReceiver(receiver, filter);
-    }
-
-    /**
-     * Detects if there are new devices connected / disconnected and fires the
-     * {@link Listener} registered event.
-     */
-    private void updateDevices() {
-        boolean headsetAvailable = (headset != null) && !headset.getConnectedDevices().isEmpty();
-        listener.onBluetoothDeviceChange(headsetAvailable);
-    }
-
-    public void start() {
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-
-        if (!audioManager.isBluetoothScoAvailableOffCall()) {
-            JitsiMeetLogger.w(TAG + " Bluetooth SCO is not available");
-            return;
-        }
-
-        if (!getBluetoothHeadsetProfileProxy()) {
-            JitsiMeetLogger.w(TAG + " Couldn't get BT profile proxy");
-            return;
-        }
-
-        registerBluetoothReceiver();
-
-        // Initial detection.
-        updateDevices();
-    }
-
-    public void stop() {
-        if (receiver != null) {
-            context.unregisterReceiver(receiver);
-        }
-
-        if (adapter != null && headset != null) {
-            adapter.closeProfileProxy(BluetoothProfile.HEADSET, headset);
-        }
-
-        receiver = null;
-        headset = null;
-        adapter = null;
-    }
-
-    interface Listener {
-        void onBluetoothDeviceChange(boolean deviceAvailable);
-    }
-}

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

@@ -1,6 +1,5 @@
 /*
- * Copyright @ 2018-present 8x8, Inc.
- * Copyright @ 2017-2018 Atlassian Pty Ltd
+ * Copyright @ 2017-present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +15,18 @@
  */
 package org.jitsi.meet.sdk;
 
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 
 import com.facebook.react.ReactInstanceManager;
 
+import org.devio.rn.splashscreen.SplashScreen;
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+
 public class JitsiMeet {
+
     /**
      * Default {@link JitsiMeetConferenceOptions} which will be used for all conferences. When
      * joining a conference these options will be merged with the ones passed to
@@ -72,4 +78,23 @@ public class JitsiMeet {
             reactInstanceManager.showDevOptionsDialog();
         }
     }
-}
+
+    public static boolean isCrashReportingDisabled(Context context) {
+        SharedPreferences preferences = context.getSharedPreferences("jitsi-default-preferences", Context.MODE_PRIVATE);
+        String value = preferences.getString("isCrashReportingDisabled", "");
+        return Boolean.parseBoolean(value);
+    }
+
+    /**
+     * Helper method to show the SplashScreen.
+     *
+     * @param activity - The activity on which to show the SplashScreen {@link Activity}.
+     */
+    public static void showSplashScreen(Activity activity) {
+        try {
+            SplashScreen.show(activity);
+        } catch (Exception e) {
+            JitsiMeetLogger.e(e, "Failed to show splash screen");
+        }
+    }
+}

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

@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
 
@@ -67,6 +68,9 @@ public class JitsiMeetActivity extends FragmentActivity
 
         setContentView(R.layout.activity_jitsi_meet);
 
+        // Listen for conference events.
+        getJitsiView().setListener(this);
+
         if (!extraInitialize()) {
             initialize();
         }
@@ -151,9 +155,6 @@ public class JitsiMeetActivity extends FragmentActivity
     }
 
     protected void initialize() {
-        // Listen for conference events.
-        getJitsiView().setListener(this);
-
         // Join the room specified by the URL the app was launched with.
         // Joining without the room option displays the welcome page.
         join(getConferenceOptions(getIntent()));
@@ -164,6 +165,8 @@ public class JitsiMeetActivity extends FragmentActivity
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
         JitsiMeetActivityDelegate.onActivityResult(this, requestCode, resultCode, data);
     }
 

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

@@ -1,6 +1,5 @@
 /*
- * Copyright @ 2019-present 8x8, Inc.
- * Copyright @ 2018 Atlassian Pty Ltd
+ * Copyright @ 2018-present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,17 +16,16 @@
 
 package org.jitsi.meet.sdk;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;
 
-import com.calendarevents.CalendarEventsPackage;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.PermissionListener;
 
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+
 /**
  * Helper class to encapsulate the work which needs to be done on
  * {@link Activity} lifecycle methods in order for the React side to be aware of
@@ -167,13 +165,7 @@ public class JitsiMeetActivityDelegate {
     }
 
     public static void onRequestPermissionsResult(
-        final int requestCode,
-        final String[] permissions,
-        final int[] grantResults) {
-        CalendarEventsPackage.onRequestPermissionsResult(
-            requestCode,
-            permissions,
-            grantResults);
+            final int requestCode, final String[] permissions, final int[] grantResults) {
         permissionsCallback = new Callback() {
             @Override
             public void invoke(Object... args) {
@@ -185,9 +177,18 @@ public class JitsiMeetActivityDelegate {
         };
     }
 
-    @TargetApi(Build.VERSION_CODES.M)
     public static void requestPermissions(Activity activity, String[] permissions, int requestCode, PermissionListener listener) {
         permissionListener = listener;
-        activity.requestPermissions(permissions, requestCode);
+
+        // The RN Permissions module calls this in a non-UI thread. What we observe is a crash in ViewGroup.dispatchCancelPendingInputEvents,
+        // which is called on the calling (ie, non-UI) thread. This doesn't look very safe, so try to avoid a crash by pretending the permission
+        // was denied.
+
+        try {
+            activity.requestPermissions(permissions, requestCode);
+        } catch (Exception e) {
+            JitsiMeetLogger.e(e, "Error requesting permissions");
+            onRequestPermissionsResult(requestCode, permissions, new int[0]);
+        }
     }
 }

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

@@ -288,6 +288,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
     }
 
     private JitsiMeetConferenceOptions(Parcel in) {
+        serverURL = (URL) in.readSerializable();
         room = in.readString();
         subject = in.readString();
         token = in.readString();
@@ -376,6 +377,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
+        dest.writeSerializable(serverURL);
         dest.writeString(room);
         dest.writeString(subject);
         dest.writeString(token);

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

@@ -57,22 +57,6 @@ public class JitsiMeetFragment extends Fragment {
         return view;
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        JitsiMeetActivityDelegate.onActivityResult(
-                getActivity(), requestCode, resultCode, data);
-    }
-
-    @Override
-    public void onDestroyView() {
-        if (view != null) {
-            view.dispose();
-            view = null;
-        }
-
-        super.onDestroyView();
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();

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

@@ -1,6 +1,5 @@
 /*
- * Copyright @ 2018-present 8x8, Inc.
- * Copyright @ 2017-2018 Atlassian Pty Ltd
+ * Copyright @ 2017-present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,7 +125,7 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
             = ReactInstanceManagerHolder.getNativeModule(
                 PictureInPictureModule.class);
         if (pipModule != null
-                && PictureInPictureModule.isPictureInPictureSupported()
+                && pipModule.isPictureInPictureSupported()
                 && !JitsiMeetActivityDelegate.arePermissionsBeingRequested()
                 && this.url != null) {
             try {
@@ -201,4 +200,10 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
     protected void onExternalAPIEvent(String name, ReadableMap data) {
         onExternalAPIEvent(LISTENER_METHODS, name, data);
     }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        dispose();
+        super.onDetachedFromWindow();
+    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * Copyright @ 2017-present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.jitsi.meet.sdk;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.PictureInPictureParams;
 import android.os.Build;
 import android.util.Rational;
@@ -30,20 +31,42 @@ import com.facebook.react.module.annotations.ReactModule;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import static android.content.Context.ACTIVITY_SERVICE;
+
 @ReactModule(name = PictureInPictureModule.NAME)
-class PictureInPictureModule
-    extends ReactContextBaseJavaModule {
+class PictureInPictureModule extends ReactContextBaseJavaModule {
 
     public static final String NAME = "PictureInPicture";
-
     private static final String TAG = NAME;
 
-    static boolean isPictureInPictureSupported() {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-    }
+    private static boolean isSupported;
+    private boolean isDisabled;
 
     public PictureInPictureModule(ReactApplicationContext reactContext) {
         super(reactContext);
+
+        ActivityManager am = (ActivityManager) reactContext.getSystemService(ACTIVITY_SERVICE);
+
+        // 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 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !am.isLowRamDevice();
+    }
+
+    /**
+     * Gets a {@code Map} of constants this module exports to JS. Supports JSON
+     * types.
+     *
+     * @return a {@link Map} of constants this module exports to JS
+     */
+    @Override
+    public Map<String, Object> getConstants() {
+        Map<String, Object> constants = new HashMap<>();
+        constants.put("SUPPORTED", isSupported);
+        return constants;
     }
 
     /**
@@ -61,7 +84,11 @@ class PictureInPictureModule
      */
     @TargetApi(Build.VERSION_CODES.O)
     public void enterPictureInPicture() {
-        if (!isPictureInPictureSupported()) {
+        if (isDisabled) {
+            return;
+        }
+
+        if (!isSupported) {
             throw new IllegalStateException("Picture-in-Picture not supported");
         }
 
@@ -104,6 +131,15 @@ class PictureInPictureModule
         }
     }
 
+    @ReactMethod
+    public void setPictureInPictureDisabled(Boolean disabled) {
+        this.isDisabled = disabled;
+    }
+
+    public boolean isPictureInPictureSupported() {
+        return isSupported;
+    }
+
     @Override
     public String getName() {
         return NAME;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * Copyright @ 2017-present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,21 +33,10 @@ import com.facebook.react.module.annotations.ReactModule;
  * is used with the conference audio-only mode.
  */
 @ReactModule(name = ProximityModule.NAME)
-class ProximityModule
-    extends ReactContextBaseJavaModule {
+class ProximityModule extends ReactContextBaseJavaModule {
 
     public static final String NAME = "Proximity";
 
-    /**
-     * This type of wake lock (the one activated by the proximity sensor) has
-     * been available for a while, but the constant was only exported in API
-     * level 21 (Android Marshmallow) so make no assumptions and use its value
-     * directly.
-     *
-     * TODO: Remove when we bump the API level to 21.
-     */
-    private static final int PROXIMITY_SCREEN_OFF_WAKE_LOCK = 32;
-
     /**
      * {@link WakeLock} instance.
      */
@@ -71,7 +60,7 @@ class ProximityModule
         try {
             wakeLock
                 = powerManager.newWakeLock(
-                        PROXIMITY_SCREEN_OFF_WAKE_LOCK,
+                        PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK,
                         "jitsi:"+NAME);
         } catch (Throwable ignored) {
             wakeLock = null;

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

@@ -20,21 +20,21 @@ import android.app.Activity;
 
 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.ReactContext;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.devsupport.DevInternalSettings;
+import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.soloader.SoLoader;
-
 import com.oney.WebRTCModule.RTCVideoViewManager;
 import com.oney.WebRTCModule.WebRTCModule;
 
+import org.devio.rn.splashscreen.SplashScreenModule;
 import org.webrtc.SoftwareVideoDecoderFactory;
 import org.webrtc.SoftwareVideoEncoderFactory;
 import org.webrtc.audio.AudioDeviceModule;
@@ -68,6 +68,7 @@ class ReactInstanceManagerHolder {
                 new JavaScriptSandboxModule(reactContext),
                 new LocaleDetector(reactContext),
                 new LogBridgeModule(reactContext),
+                new SplashScreenModule(reactContext),
                 new PictureInPictureModule(reactContext),
                 new ProximityModule(reactContext),
                 new WiFiStatsModule(reactContext),
@@ -190,6 +191,7 @@ class ReactInstanceManagerHolder {
                 new com.corbt.keepawake.KCKeepAwakePackage(),
                 new com.facebook.react.shell.MainReactPackage(),
                 new com.horcrux.svg.SvgPackage(),
+                new com.kevinresol.react_native_default_preference.RNDefaultPreferencePackage(),
                 new com.ocetnik.timer.BackgroundTimerPackage(),
                 new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
                 new com.reactnativecommunity.netinfo.NetInfoPackage(),
@@ -215,8 +217,9 @@ class ReactInstanceManagerHolder {
             // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
         }
 
-        // Use the Hermes JavaScript engine.
-        HermesExecutorFactory jsFactory = new HermesExecutorFactory();
+        // Keep on using JSC, the jury is out on Hermes.
+        JSCExecutorFactory jsFactory
+            = new JSCExecutorFactory("", "");
 
         reactInstanceManager
             = ReactInstanceManager.builder()

android/settings.gradle

@@ -9,6 +9,8 @@ include ':react-native-community-async-storage'
 project(':react-native-community-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/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'
+project(':react-native-default-preference').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-default-preference/android')
 include ':react-native-google-signin'
 project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/google-signin/android')
 include ':react-native-immersive'
@@ -19,9 +21,11 @@ include ':react-native-linear-gradient'
 project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
 include ':react-native-sound'
 project(':react-native-sound').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sound/android')
+include ':react-native-splash-screen'
+project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
 include ':react-native-svg'
 project(':react-native-svg').projectDir = new File(rootProject.projectDir, 	'../node_modules/react-native-svg/android')
 include ':react-native-webrtc'
 project(':react-native-webrtc').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webrtc/android')
 include ':react-native-webview'
-project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
+project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')

app.js

@@ -4,12 +4,29 @@ import 'jquery';
 import 'jquery-contextmenu';
 import 'jQuery-Impromptu';
 
+import 'olm';
+
+import 'focus-visible';
+
+// 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
+// window.location is not changed and still has all URL parameters.
+import './react/features/base/jitsi-local-storage/setup';
 import conference from './conference';
 import API from './modules/API';
+import UI from './modules/UI/UI';
 import keyboardshortcut from './modules/keyboardshortcut/keyboardshortcut';
 import remoteControl from './modules/remotecontrol/RemoteControl';
 import translation from './modules/translation/translation';
-import UI from './modules/UI/UI';
+
+// Initialize Olm as early as possible.
+if (window.Olm) {
+    window.Olm.init().catch(e => {
+        console.error('Failed to initialize Olm, E2EE will be disabled', e);
+        delete window.Olm;
+    });
+}
 
 window.APP = {
     API,

config.js

@@ -14,9 +14,6 @@ var config = {
         // Domain for authenticated users. Defaults to <domain>.
         // authdomain: 'jitsi-meet.example.com',
 
-        // Jirecon recording component domain.
-        // jirecon: 'jirecon.jitsi-meet.example.com',
-
         // Call control component (Jigasi).
         // call_control: 'callcontrol.jitsi-meet.example.com',
 
@@ -37,6 +34,8 @@ var config = {
     clientNode: 'http://jitsi.org/jitsimeet',
 
     // The real JID of focus participant - can be overridden here
+    // Do not change username - FIXME: Make focus username configurable
+    // https://github.com/jitsi/jitsi-meet/issues/7376
     // focusUserJid: 'focus@auth.jitsi-meet.example.com',
 
 
@@ -44,8 +43,9 @@ var config = {
     //
 
     testing: {
-        // Enables experimental simulcast support on Firefox.
-        enableFirefoxSimulcast: false,
+        // Disables the End to End Encryption feature. Useful for debugging
+        // issues related to insertable streams.
+        // disableE2EE: false,
 
         // P2P test mode disables automatic switching to P2P when there are 2
         // participants in the conference.
@@ -57,6 +57,18 @@ var config = {
         // Disables the auto-play behavior of *all* newly created video element.
         // This is useful when the client runs on a host with limited resources.
         // noAutoPlayVideo: false
+
+        // Enable / disable 500 Kbps bitrate cap on desktop tracks. When enabled,
+        // simulcast is turned off for the desktop share. If presenter is turned
+        // on while screensharing is in progress, the max bitrate is automatically
+        // adjusted to 2.5 Mbps. This takes a value between 0 and 1 which determines
+        // the probability for this to be enabled.
+        // capScreenshareBitrate: 1 // 0 to disable
+
+        // 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 ICE/UDP by filtering out local and remote UDP candidates in
@@ -103,19 +115,30 @@ var config = {
     // participants and to enable it back a reload is needed.
     // startSilent: false
 
+    // Sets the preferred target bitrate for the Opus audio codec by setting its
+    // 'maxaveragebitrate' parameter. Currently not available in p2p mode.
+    // Valid values are in the range 6000 to 510000
+    // opusMaxAverageBitrate: 20000,
+
+    // Enables redundancy for Opus
+    // enableOpusRed: false
+
     // Video
 
     // Sets the preferred resolution (height) for local video. Defaults to 720.
     // resolution: 720,
 
+    // How many participants while in the tile view mode, before the receiving video quality is reduced from HD to SD.
+    // Use -1 to disable.
+    // maxFullResolutionParticipants: 2,
+
     // w3c spec-compliant video constraints to use for video capture. Currently
     // used by browsers that return true from lib-jitsi-meet's
     // util#browser#usesNewGumFlow. The constraints are independent from
-    // this config's resolution value. Defaults to requesting an ideal aspect
-    // ratio of 16:9 with an ideal resolution of 720.
+    // this config's resolution value. Defaults to requesting an ideal
+    // resolution of 720p.
     // constraints: {
     //     video: {
-    //         aspectRatio: 16 / 9,
     //         height: {
     //             ideal: 720,
     //             max: 720,
@@ -143,6 +166,7 @@ var config = {
     // Note that it's not recommended to do this because simulcast is not
     // supported when  using H.264. For 1-to-1 calls this setting is enabled by
     // default and can be toggled in the p2p section.
+    // This option has been deprecated, use preferredCodec under videoQuality section instead.
     // preferH264: true,
 
     // If set to true, disable H.264 video codec by stripping it out of the
@@ -151,22 +175,6 @@ var config = {
 
     // Desktop sharing
 
-    // The ID of the jidesha extension for Chrome.
-    desktopSharingChromeExtId: null,
-
-    // Whether desktop sharing should be disabled on Chrome.
-    // desktopSharingChromeDisabled: false,
-
-    // The media sources to use when using screen sharing with the Chrome
-    // extension.
-    desktopSharingChromeSources: [ 'screen', 'window', 'tab' ],
-
-    // Required version of Chrome extension
-    desktopSharingChromeMinExtVersion: '0.1',
-
-    // Whether desktop sharing should be disabled on Firefox.
-    // desktopSharingFirefoxDisabled: false,
-
     // Optional desktop sharing frame rate options. Default value: min:5, max:5.
     // desktopSharingFrameRate: {
     //     min: 5,
@@ -214,6 +222,79 @@ var config = {
     // Default value for the channel "last N" attribute. -1 for unlimited.
     channelLastN: -1,
 
+    // Provides a way to use different "last N" values based on the number of participants in the conference.
+    // The keys in an Object represent number of participants and the values are "last N" to be used when number of
+    // participants gets to or above the number.
+    //
+    // For the given example mapping, "last N" will be set to 20 as long as there are at least 5, but less than
+    // 29 participants in the call and it will be lowered to 15 when the 30th participant joins. The 'channelLastN'
+    // will be used as default until the first threshold is reached.
+    //
+    // lastNLimits: {
+    //     5: 20,
+    //     30: 15,
+    //     50: 10,
+    //     70: 5,
+    //     90: 2
+    // },
+
+    // Specify the settings for video quality optimizations on the client.
+    // videoQuality: {
+    //    // Provides a way to prevent a video codec from being negotiated on the JVB connection. The codec specified
+    //    // here will be removed from the list of codecs present in the SDP answer generated by the client. If the
+    //    // same codec is specified for both the disabled and preferred option, the disable settings will prevail.
+    //    // Note that 'VP8' cannot be disabled since it's a mandatory codec, the setting will be ignored in this case.
+    //    disabledCodec: 'H264',
+    //
+    //    // Provides a way to set 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',
+    //
+    //    // 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: {
+    //        low: 200000,
+    //        standard: 500000,
+    //        high: 1500000
+    //    },
+    //
+    //    // The options can be used to override default thresholds of video thumbnail heights corresponding to
+    //    // the video quality levels used in the application. At the time of this writing the allowed levels are:
+    //    //     'low' - for the low quality level (180p at the time of this writing)
+    //    //     'standard' - for the medium quality level (360p)
+    //    //     'high' - for the high quality level (720p)
+    //    // The keys should be positive numbers which represent the minimal thumbnail height for the quality level.
+    //    //
+    //    // With the default config value below the application will use 'low' quality until the thumbnails are
+    //    // at least 360 pixels tall. If the thumbnail height reaches 720 pixels then the application will switch to
+    //    // the high quality.
+    //    minHeightForQualityLvl: {
+    //        360: 'standard,
+    //        720: 'high'
+    //    }
+    // },
+
+    // // Options for the recording limit notification.
+    // recordingLimit: {
+    //
+    //    // The recording limit in minutes. Note: This number appears in the notification text
+    //    // but doesn't enforce the actual recording time limit. This should be configured in
+    //    // jibri!
+    //    limit: 60,
+    //
+    //    // The name of the app with unlimited recordings.
+    //    appName: 'Unlimited recordings APP',
+    //
+    //    // The URL of the app with unlimited recordings.
+    //    appURL: 'https://unlimited.recordings.app.com/'
+    // },
+
     // Disables or enables RTX (RFC 4588) (defaults to false).
     // disableRtx: false,
 
@@ -230,28 +311,36 @@ var config = {
     // disabled, then bandwidth estimations are disabled.
     // enableRemb: false,
 
+    // 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,
+
     // Defines the minimum number of participants to start a call (the default
     // is set in Jicofo and set to 2).
     // minParticipants: 2,
 
-    // Use XEP-0215 to fetch STUN and TURN servers.
-    // useStunTurn: true,
-
-    // Enable IPv6 support.
-    // useIPv6: true,
+    // Use TURN/UDP servers for the jitsi-videobridge connection (by default
+    // we filter out TURN/UDP because it is usually not needed since the
+    // bridge itself is reachable via UDP)
+    // useTurnUdp: false
 
     // Enables / disables a data communication channel with the Videobridge.
     // Values can be 'datachannel', 'websocket', true (treat it as
     // 'datachannel'), undefined (treat it as 'datachannel') and false (don't
     // open any channel).
     // openBridgeChannel: true,
+    openBridgeChannel: 'websocket',
 
 
     // UI
     //
 
-    // Use display name as XMPP nickname.
-    // useNicks: false,
+    // Hides lobby button
+    // hideLobbyButton: false,
 
     // Require users to always specify a display name.
     // requireDisplayName: true,
@@ -293,6 +382,18 @@ var config = {
     // and microsoftApiApplicationClientID
     // enableCalendarIntegration: false,
 
+    // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
+    // prejoinPageEnabled: false,
+
+    // If true, shows the unsafe room name warning label when a room name is
+    // deemed unsafe (due to the simplicity in the name) and a password is not
+    // 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,
+
     // Stats
     //
 
@@ -310,10 +411,10 @@ var config = {
     // callStatsID: '',
     // callStatsSecret: '',
 
-    // enables sending participants display name to callstats
+    // Enables sending participants' display names to callstats
     // enableDisplayNameInStats: false,
 
-    // enables sending participants email if available to callstats and other analytics
+    // Enables sending participants' emails (if available) to callstats and other analytics
     // enableEmailInStats: false,
 
     // Privacy
@@ -337,15 +438,12 @@ var config = {
         // connection.
         enabled: true,
 
-        // Use XEP-0215 to fetch STUN and TURN servers.
-        // useStunTurn: true,
-
         // The STUN servers that will be used in the peer to peer connections
         stunServers: [
 
-            // { urls: 'stun:jitsi-meet.example.com:443' },
+            // { urls: 'stun:jitsi-meet.example.com:3478' },
             { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' }
-        ],
+        ]
 
         // Sets the ICE transport policy for the p2p connection. At the time
         // of this writing the list of possible values are 'all' and 'relay',
@@ -356,13 +454,20 @@ var config = {
         // iceTransportPolicy: 'all',
 
         // If set to true, it will prefer to use H.264 for P2P calls (if H.264
-        // is supported).
-        preferH264: true
+        // is supported). This setting is deprecated, use preferredCodec instead.
+        // preferH264: true
+
+        // Provides a way to set the video codec preference on the p2p connection. Acceptable
+        // codec values are 'VP8', 'VP9' and 'H264'.
+        // preferredCodec: 'H264',
 
         // If set to true, disable H.264 video codec by stripping it out of the
-        // SDP.
+        // SDP. This setting is deprecated, use disabledCodec instead.
         // disableH264: false,
 
+        // Provides a way to prevent a video codec from being negotiated on the p2p connection.
+        // disabledCodec: '',
+
         // How long we're going to wait, before going back to P2P after the 3rd
         // participant has left the conference (to filter out page reload).
         // backToP2PDelay: 5
@@ -372,9 +477,28 @@ var config = {
         // The Google Analytics Tracking ID:
         // googleAnalyticsTrackingId: 'your-tracking-id-UA-123456-1'
 
+        // Matomo configuration:
+        // matomoEndpoint: 'https://your-matomo-endpoint/',
+        // matomoSiteID: '42',
+
         // The Amplitude APP Key:
         // amplitudeAPPKey: '<APP_KEY>'
 
+        // Configuration for the rtcstats server:
+        // By enabling rtcstats server every time a conference is joined the rtcstats
+        // module connects to the provided rtcstatsEndpoint and sends statistics regarding
+        // PeerConnection states along with getStats metrics polled at the specified
+        // interval.
+        // rtcstatsEnabled: true,
+
+        // In order to enable rtcstats one needs to provide a endpoint url.
+        // rtcstatsEndpoint: wss://rtcstats-server-pilot.jitsi.net/,
+
+        // The interval at which rtcstats will poll getStats, defaults to 1000ms.
+        // If the value is set to 0 getStats won't be polled and the rtcstats client
+        // will only send data related to RTCPeerConnection events.
+        // rtcstatsPolIInterval: 1000
+
         // Array of script URLs to load as lib-jitsi-meet "analytics handlers".
         // scriptURLs: [
         //      "libs/analytics-ga.min.js", // google-analytics
@@ -382,6 +506,9 @@ var config = {
         // ],
     },
 
+    // Logs that should go be passed through the 'log' event if a handler is defined for it
+    // apiLogLevels: ['warn', 'log', 'error', 'info', 'debug'],
+
     // Information about the jitsi-meet instance we are connecting to, including
     // the user region as seen by the server.
     deploymentInfo: {
@@ -452,6 +579,14 @@ var config = {
     // the menu has option to flip the locally seen video for local presentations
     // disableLocalVideoFlip: false,
 
+    // Mainly privacy related settings
+
+    // Disables all invite functions from the app (share, invite, dial out...etc)
+    // disableInviteFunctions: true,
+
+    // Disables storing the room name to the recents list
+    // doNotStoreRoom: true,
+
     // Deployment specific URLs.
     // deploymentUrls: {
     //    // If specified a 'Help' button will be displayed in the overflow menu with a link to the specified URL for
@@ -471,11 +606,31 @@ var config = {
     // If set to true all muting operations of remote participants will be disabled.
     // disableRemoteMute: true,
 
+    /**
+     External API url used to receive branding specific information.
+     If there is no url set or there are missing fields, the defaults are applied.
+     None of the fields are mandatory and the response must have the shape:
+     {
+         // The hex value for the colour used as background
+         backgroundColor: '#fff',
+         // The url for the image used as background
+         backgroundImageUrl: 'https://example.com/background-img.png',
+         // The anchor url used when clicking the logo image
+         logoClickUrl: 'https://example-company.org',
+         // The url used for the image used as logo
+         logoImageUrl: 'https://example.com/logo-img.png'
+     }
+    */
+    // brandingDataUrl: '',
+
+    // The URL of the moderated rooms microservice, if available. If it
+    // is present, a link to the service will be rendered on the welcome page,
+    // otherwise the app doesn't render it.
+    // moderatedRoomServiceUrl: 'https://moderated.jitsi-meet.example.com',
+
     // List of undocumented settings used in jitsi-meet
     /**
      _immediateReloadThreshold
-     autoRecord
-     autoRecordToken
      debug
      debugAudioLevels
      deploymentInfo
@@ -498,6 +653,13 @@ var config = {
      tokenAuthUrl
      */
 
+    /**
+     * This property can be used to alter the generated meeting invite links (in combination with a branding domain
+     * which is retrieved internally by jitsi meet) (e.g. https://meet.jit.si/someMeeting
+     * can become https://brandedDomain/roomAlias)
+     */
+    // brandingRoomAlias: null,
+
     // List of undocumented settings used in lib-jitsi-meet
     /**
      _peerConnStatusOutOfLastNTimeout

connection.js

@@ -1,19 +1,21 @@
 /* global APP, JitsiMeetJS, config */
 
-import AuthHandler from './modules/UI/authentication/AuthHandler';
-import jitsiLocalStorage from './modules/util/JitsiLocalStorage';
+import { jitsiLocalStorage } from '@jitsi/js-utils';
+import Logger from 'jitsi-meet-logger';
 
+import AuthHandler from './modules/UI/authentication/AuthHandler';
 import {
     connectionEstablished,
     connectionFailed
-} from './react/features/base/connection';
+} from './react/features/base/connection/actions';
 import {
     isFatalJitsiConnectionError,
     JitsiConnectionErrors,
     JitsiConnectionEvents
 } from './react/features/base/lib-jitsi-meet';
+import { setPrejoinDisplayNameRequired } from './react/features/prejoin/actions';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
+const logger = Logger.getLogger(__filename);
 
 /**
  * The feature announced so we can distinguish jibri participants.
@@ -80,7 +82,7 @@ function checkForAttachParametersAndConnect(id, password, connection) {
  */
 function connect(id, password, roomName) {
     const connectionConfig = Object.assign({}, config);
-    const { issuer, jwt } = APP.store.getState()['features/base/jwt'];
+    const { jwt } = APP.store.getState()['features/base/jwt'];
 
     // Use Websocket URL for the web app if configured. Note that there is no 'isWeb' check, because there's assumption
     // that this code executes only on web browsers/electron. This needs to be changed when mobile and web are unified.
@@ -92,11 +94,7 @@ function connect(id, password, roomName) {
     //  in future). It's included for the time being for Jitsi Meet and lib-jitsi-meet versions interoperability.
     connectionConfig.serviceUrl = connectionConfig.bosh = serviceUrl;
 
-    const connection
-        = new JitsiMeetJS.JitsiConnection(
-            null,
-            jwt && issuer && issuer !== 'anonymous' ? jwt : undefined,
-            connectionConfig);
+    const connection = new JitsiMeetJS.JitsiConnection(null, jwt, connectionConfig);
 
     if (config.iAmRecorder) {
         connection.addFeature(DISCO_JIBRI_FEATURE);
@@ -112,6 +110,10 @@ function connect(id, password, roomName) {
         connection.addEventListener(
             JitsiConnectionEvents.CONNECTION_FAILED,
             connectionFailedHandler);
+        connection.addEventListener(
+            JitsiConnectionEvents.DISPLAY_NAME_REQUIRED,
+            displayNameRequiredHandler
+        );
 
         /* eslint-disable max-params */
         /**
@@ -165,6 +167,14 @@ function connect(id, password, roomName) {
             reject(err);
         }
 
+        /**
+         * Marks the display name for the prejoin screen as required.
+         * This can happen if a user tries to join a room with lobby enabled.
+         */
+        function displayNameRequiredHandler() {
+            APP.store.dispatch(setPrejoinDisplayNameRequired());
+        }
+
         checkForAttachParametersAndConnect(id, password, connection);
     });
 }
@@ -197,10 +207,9 @@ export function openConnection({ id, password, retry, roomName }) {
 
     return connect(id, password, roomName).catch(err => {
         if (retry) {
-            const { issuer, jwt } = APP.store.getState()['features/base/jwt'];
+            const { jwt } = APP.store.getState()['features/base/jwt'];
 
-            if (err === JitsiConnectionErrors.PASSWORD_REQUIRED
-                    && (!jwt || issuer === 'anonymous')) {
+            if (err === JitsiConnectionErrors.PASSWORD_REQUIRED && !jwt) {
                 return AuthHandler.requestAuth(roomName, connect);
             }
         }

connection_optimization/do_external_connect.js

@@ -1,7 +1,7 @@
 /* global config, createConnectionExternally */
 
 import getRoomName from '../react/features/base/config/getRoomName';
-import parseURLParams from '../react/features/base/config/parseURLParams';
+import { parseURLParams } from '../react/features/base/util/parseURLParams';
 
 /**
  * Implements external connect using createConnectionExternally function defined

css/_atlaskit_overrides.scss

@@ -2,7 +2,7 @@
  * Move the @atlaskit/flag container up a little bit so it does not cover the
  * toolbar with the first notification.
  */
-.cjMOOK{
+.jIMojv{
     bottom: calc(#{$newToolbarSizeWithPadding}) !important;
 }
 

css/_audio-preview.scss

@@ -1,5 +1,6 @@
 .audio-preview {
     &-content {
+        background: #2A3A4B;
         font-size: 15px;
         line-height: 24px;
         max-height: 456px;
@@ -13,6 +14,7 @@
         padding: 16px;
 
         &-icon {
+            color: #A4B8D1;
             display: inline-block;
         }
 
@@ -31,7 +33,7 @@
         margin-left: 48px;
 
         &--selected {
-            background: rgba(28,32,37,0.5);
+            background: #1C2025;
             cursor: initial;
             margin-left: 0;
             padding-left: 21px;
@@ -54,7 +56,7 @@
 
         &:hover {
             .audio-preview-entry {
-                background: rgba(255,255,255, 0.2);
+                background: #3F4E5E;
                 margin-left: 0;
                 padding-left: 48px;
 
@@ -66,6 +68,10 @@
             .audio-preview-test-button {
                 display: inline-block;
             }
+
+            .audio-preview-entry-text {
+                max-width: 196px;
+            }
         }
 
         .audio-preview-entry-text {
@@ -75,8 +81,23 @@
 
     &-microphone {
         position: relative;
-    }
 
+        &:hover {
+            .audio-preview-entry {
+                background: #3F4E5E;
+                margin-left: 0;
+                padding-left: 48px;
+
+                &--selected {
+                    padding-left: 21px;
+                }
+            }
+        }
+
+        .audio-preview-entry-text {
+            max-width: 196px;
+        }
+    }
 
     &-icon {
         border-radius: 50%;

css/_avatar.scss

@@ -20,18 +20,6 @@
     }
 }
 
-.avatar-foreign {
-    align-items: center;
-    bottom: 0;
-    display: flex;
-    font-size: 40pt;
-    justify-content: center;
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-}
-
 .avatar-svg {
     height: 100%;
     width: 100%;
@@ -63,4 +51,4 @@
         @include avatarBadge;
         background-color: $presence-idle;
     }
-}
+}

css/_base.scss

@@ -33,6 +33,34 @@ body {
     }
 }
 
+/**
+ * This will hide the focus indicator if an element receives focus via the mouse,
+ * but it will still show up on keyboard focus, thus preserving accessibility.
+ */
+.js-focus-visible :focus:not(.focus-visible) {
+  outline: none;
+}
+
+/**
+ * AtlasKit sets a default margin on the rendered modals, so
+ * when the shift-right class is set when the chat opens, we
+ * pad the modal container in order for the modals to be centered
+ * while also taking the chat size into consideration.
+*/
+@media (min-width: 480px + $sidebarWidth) {
+    .shift-right [class^="Modal__FillScreen"] {
+        padding-left: $sidebarWidth;
+    }
+}
+
+/**
+ * Similarly, we offset the notifications when the chat is open by
+ * padding the container.
+*/
+.shift-right [class^="styledFlagGroup-"] {
+    padding-left: $sidebarWidth;
+}
+
 .jitsi-icon svg {
     fill: white;
 }
@@ -115,8 +143,9 @@ form {
 .leftwatermark {
     left: 32px;
     top: 32px;
-    background-image: url($defaultWatermarkLink);
     background-position: center left;
+    background-repeat: no-repeat;
+    background-size: contain;
 }
 
 .rightwatermark {

css/_chat.scss

@@ -4,16 +4,11 @@
     color: #FFF;
     display: flex;
     flex-direction: column;
-    /**
-     * Make the sidebar flush with the top of the toolbar. Take the size of
-     * the toolbar and subtract from 100%.
-     */
-    height: calc(100% - #{$newToolbarSizeWithPadding});
+    height: 100%;
     left: -$sidebarWidth;
     overflow: hidden;
     position: absolute;
     top: 0;
-    transition: left 0.5s;
     width: $sidebarWidth;
     z-index: $sideToolbarContainerZ;
 

css/_connection-info.scss

@@ -45,10 +45,8 @@
         @extend .connection-info__icon;
     }
 
-    .showmore {
-        display: block;
+    .connection-actions {
         margin: 10px auto;
         text-align: center;
-        width: 90px;
     }
 }

css/_connection-status.scss

@@ -0,0 +1,84 @@
+.con-status {
+    position: absolute;
+    top: 24px;
+    width: 100%;
+    z-index: $toolbarZ + 3;
+
+    &-container {
+        border-radius: 3px;
+        color: #fff;
+        font-size: 13px;
+        line-height: 13px;
+        margin: 0 auto;
+        width: 320px;
+    }
+
+    &-header {
+        background: rgba(28, 32, 37, .5);
+        align-items: center;
+        display: flex;
+        justify-content: space-between;
+    }
+
+    &-circle {
+        border-radius: 50%;
+        display: inline-block;
+        padding: 4px;
+        margin: 8px;
+    }
+
+    &--good {
+        background: #31B76A;
+    }
+
+    &--poor {
+        background: #E12D2D;
+    }
+
+    &--non-optimal {
+        background: #E39623;
+    }
+
+    &-arrow {
+        height: 36px;
+        width: 36px;
+        border-radius: 3px;
+        margin-left: 8px;
+        margin-right: 2px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transition: background-color 0.16s ease-out;
+
+        &--up {
+            transform: rotate(180deg);
+        }
+
+        &>svg {
+            cursor: pointer;
+        }
+
+        &:hover {
+            background-color: rgba(1,1,1, 0.1);
+        }
+    }
+
+    &-text {
+        text-align: center;
+    }
+
+    &-details {
+        background: rgba(28, 32, 37, .5);
+        border-top: 1px solid #5E6D7A;
+        padding: 16px;
+        transition: opacity 0.16s ease-out;
+
+        &-visible {
+            opacity: 1;
+        }
+
+        &-hidden {
+            opacity: 0;
+        }
+    }
+}

css/_country-picker.scss

@@ -0,0 +1,75 @@
+.cpick {
+    border: 1px solid #A4B8D1;
+    color: #fff;
+    display: flex;
+    font-size: 15px;
+    height: 38px;
+    line-height: 24px;
+
+    &-selector {
+        align-items: center;
+        background-color: #283447;
+        border-right: 1px solid #A4B8D1;
+        cursor: pointer;
+        display: flex;
+        padding: 8px 10px;
+        position: relative;
+        width: 88px;
+    }
+
+    &-icon {
+        margin-right: 8px;
+        position: absolute;
+        right: 0;
+        top: 12px;
+
+        & > svg {
+            fill: #fff;
+        }
+    }
+
+    &-input {
+        padding: 8px;
+        background: #1C2025;
+        border: 0;
+        margin: 0;
+        color: #fff;
+        caret-color: #0376DA;
+        flex-grow: 1;
+    }
+
+    &-dropdown {
+        height: 190px;
+        overflow-y: auto;
+        width: 343px;
+    }
+
+    &-dropdown-entry {
+        align-items: center;
+        cursor: pointer;
+        display: flex;
+        height: 40px;
+        padding: 0 10px;
+
+        &:hover {
+            background-color: #66768b;
+        }
+
+        &-text {
+            color: #fff;
+            flex-grow: 1;
+            font-size: 15px;
+            line-height: 24px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+
+        }
+    }
+}
+
+// Override @Atlaskit/inline-dialog styles
+.cpick-container > div > div:nth-child(2) > div > div {
+    outline: none;
+    padding: 8px 0 0 0;
+}

css/_e2ee.scss

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

css/_labels.scss

@@ -0,0 +1,68 @@
+.large-video-labels {
+    display: flex;
+    position: absolute;
+    top: 30px;
+    right: 30px;
+    transition: right 0.5s;
+    z-index: $filmstripVideosZ + 1;
+
+    .circular-label {
+        align-items: center;
+        color: white;
+        display: flex;
+        font-weight: bold;
+        justify-content: center;
+        margin-left: 8px;
+        opacity: 0.8;
+    }
+
+    .circular-label {
+        background: #B8C7E0;
+    }
+
+    .circular-label.e2ee {
+        align-items: center;
+        background: #76CF9C;
+        display: flex;
+        justify-content: center;
+    }
+
+    .circular-label.file {
+        background: #FF5630;
+    }
+
+    .circular-label.local-rec {
+        background: #FF5630;
+    }
+
+    .circular-label.stream {
+        background: #0065FF;
+    }
+
+    .circular-label.insecure {
+        background: $defaultWarningColor;
+    }
+
+    .recording-label.center-message {
+        background: $videoStateIndicatorBackground;
+        bottom: 50%;
+        display: block;
+        left: 50%;
+        padding: 10px;
+        position: fixed;
+        transform: translate(-50%, -50%);
+        z-index: $centeredVideoLabelZ;
+    }
+}
+
+.circular-label {
+    background: $videoStateIndicatorBackground;
+    border-radius: 50%;
+    box-sizing: border-box;
+    cursor: default;
+    font-size: 13px;
+    height: $videoStateIndicatorSize;
+    line-height: $videoStateIndicatorSize;
+    text-align: center;
+    min-width: $videoStateIndicatorSize;
+}

css/_lobby.scss

@@ -0,0 +1,118 @@
+#lobby-screen {
+    .content {
+
+        .container {
+            align-items: center;
+            display: flex;
+            flex-direction: column;
+
+            .spinner {
+                margin: 30px;
+            }
+    
+            .joining-message {
+                margin: 10px;
+            }
+        }
+    }
+}
+
+#lobby-section {
+    display: flex;
+    flex-direction: column;
+
+    .description {
+        font-size: 13px;
+    }
+
+    .control-row {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        margin-top: 15px;
+
+        label {
+            font-size: 14px;
+            font-weight: bold;
+        }
+    }
+}
+
+#knocking-participant-list {
+    background-color: $newToolbarBackgroundColor;
+    border: 1px solid rgba(255, 255, 255, .4);
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    left: 0;
+    margin: 20px;
+    position: fixed;
+    top: 20;
+    transition: top 1s ease;
+    z-index: 100;
+
+    &.toolbox-visible {
+        // Same as toolbox subject position
+        top: 120px;
+    }
+
+    .title {
+        background-color: rgba(0, 0, 0, .2);
+        font-size: 1.2em;
+        padding: 15px
+    }
+
+    ul {
+        list-style-type: none;
+        padding: 0 15px 15px 15px;
+
+        li {
+            align-items: center;
+            display: flex;
+            flex-direction: row;
+            margin: 8px 0;
+
+            .details {
+                display: flex;
+                flex: 1;
+                flex-direction: column;
+                justify-content: space-evenly;
+                margin: 0 30px 0 10px;
+            }
+
+            button {
+                align-self: unset;
+                margin: 0 5px;
+            }
+        }
+    }
+
+    button {
+        align-self: stretch;
+        margin: 8px 0;
+        padding: 12px;
+        transition: .2s transform ease;
+
+        &:disabled {
+            opacity: .5;
+        }
+
+        &:hover {
+            transform: scale(1.05);
+
+            &:disabled {
+                transform: none;
+            }
+        }
+
+        &.borderLess {
+            background-color: transparent;
+            border-width: 0;
+        }
+
+        &.primary {
+            background-color: rgb(3, 118, 218);
+            border-width: 0;
+        }
+    }
+}

css/_prejoin-dialog.scss

@@ -0,0 +1,187 @@
+.prejoin-dialog {
+    background: #1C2025;
+    box-shadow: 0px 2px 20px rgba(0, 0, 0, 0.5);
+    border-radius: 5px;
+    color: #fff;
+    height: 400px;
+    width: 375px;
+
+    &--small {
+        height: 300;
+        width: 400;
+    }
+
+    &-label {
+        font-size: 15px;
+        line-height: 24px;
+
+        &-num {
+            background: #2b3b4b;
+            border: 1px solid #A4B8D1;
+            border-radius: 50%;
+            color: #fff;
+            display: inline-block;
+            height: 24px;
+            margin-right: 8px;
+            width: 24px;
+        }
+    }
+
+    &-container {
+        align-items: center;
+        background: rgba(0,0,0,0.6);
+        display: flex;
+        height: 100vh;
+        justify-content: center;
+        left: 0;
+        position: absolute;
+        top: 0;
+        width: 100vw;
+        z-index: 3;
+    }
+
+    &-flag {
+        display: inline-block;
+        margin-right: 8px;
+        transform: scale(1.2);
+    }
+
+    &-title {
+        display: inline-block;
+        font-size: 24px;
+        line-height: 32px;
+    }
+
+    &-icon {
+        cursor: pointer;
+
+        > svg {
+            fill: #A4B8D1;
+        }
+    }
+
+    &-btn {
+        width: 309px;
+    }
+
+    &-dialin-container {
+        text-align: center;
+    }
+
+    &-delimiter {
+        background: #5f6266;
+        border: 0;
+        height: 1px;
+        margin: 0;
+        padding: 0;
+        width: 100%;
+
+        &-container {
+            margin: 16px 0 24px 0;
+            position: relative;
+        }
+
+        &-txt-container {
+            position: absolute;
+            text-align: center;
+            top: -8px;
+            width: 100%;
+        }
+
+        &-txt {
+            background: #1C2025;
+            color: #5f6266;
+            font-size: 11px;
+            text-transform: uppercase;
+            padding: 0 8px;
+        }
+    }
+
+    .prejoin-dialog-btn.primary,
+    .action-btn.prejoin-dialog-btn.text {
+        width: 310px;
+    }
+}
+
+.prejoin-dialog-callout {
+    padding: 16px;
+
+    &-header {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 24px;
+    }
+
+    &-picker {
+        margin: 8px 0 16px 0;
+    }
+}
+
+.prejoin-dialog-dialin {
+    text-align: center;
+
+    &-header {
+        align-items: center;
+        margin: 16px 0 32px 16px;
+        display: flex;
+    }
+
+    &-icon {
+        margin-right: 16px;
+    }
+
+    &-num {
+        background: #3e474f;
+        border-radius: 4px;
+        display: inline-block;
+        font-size: 15px;
+        line-height: 24px;
+        margin: 4px;
+        padding: 8px;
+
+        &-container {
+            min-height: 48px;
+            margin: 8px 0;
+        }
+    }
+
+    &-link {
+        color: #6FB1EA;
+        cursor: pointer;
+        display: inline-block;
+        font-size: 13px;
+        line-height: 20px;
+        margin-bottom: 24px;
+    }
+
+    &-spaced-label {
+        margin-bottom: 16px;
+        margin-top: 28px;
+    }
+
+    &-btns {
+        &> div {
+            margin-bottom: 16px;
+        }
+    }
+}
+
+.prejoin-dialog-calling {
+    padding: 16px;
+    text-align: center;
+
+    &-header {
+        text-align: right;
+    }
+
+    &-label {
+        font-size: 15px;
+        margin: 8px 0 16px 0;
+    }
+
+    &-number {
+        font-size: 19px;
+        line-height: 28px;
+        margin: 16px 0;
+    }
+}

css/_prejoin.scss

@@ -0,0 +1,138 @@
+.prejoin {
+
+    &-input-area {
+        margin: 0 auto;
+        text-align: center;
+    }
+
+    &-title {
+        color: #fff;
+        font-size: 24px;
+        line-height: 32px;
+        margin-bottom: 16px;
+    }
+
+    &-text-btns {
+        display: flex;
+        justify-content: space-between;
+    }
+
+    &-input-label {
+        color: #A4B8D1;
+        font-size: 13px;
+        line-height: 20px;
+        margin-top: 32px 0 8px 0;
+        text-align: center;
+        width: 100%;
+    }
+
+    &-checkbox {
+        border: 0;
+        height: 16px;
+        margin-right: 8px;
+        padding: 0;
+        width: 16px;
+    }
+
+    &-checkbox-container {
+        margin-bottom: 14px;
+        width: 100%;
+    }
+
+    &-error {
+        color: white;
+        background-color: rgba(225, 45, 45, 0.6);
+        border-radius: 3px;
+        width: 100%;
+        padding: 2px;
+        box-sizing: border-box;
+        margin-top: 4px;
+        font-size: 13px;
+        text-align: center;
+    }
+}
+
+@mixin name-placeholder {
+    color: #fff;
+    font-weight: 300;
+    opacity: 0.6;
+}
+
+.prejoin-preview {
+    &-status {
+        align-items: center;
+        align-self: stretch;
+        bottom: 0;
+        color: #fff;
+        display: flex;
+        font-size: 13px;
+        min-height: 24px;
+        justify-content: center;
+        position: absolute;
+        text-align: center;
+        width: 100%;
+        z-index: 1;
+
+        &--warning {
+            background: rgba(241, 173, 51, 0.7)
+        }
+        &--ok {
+            background: rgba(49, 183, 106, 0.7);
+        }
+    }
+
+    &-icon {
+        background-position: center;
+        background-repeat: no-repeat;
+        display: inline-block;
+        height: 16px;
+        margin-right: 8px;
+        width: 16px;
+    }
+
+    &-error-desc {
+        margin-right: 4px;
+    }
+
+    .settings-button-container {
+        width: 49px;
+        margin: 0 8px;
+    }
+
+    &-dropdown-btns {
+        width: 320px;
+        padding: 8px 0;
+    }
+
+    &-dropdown-btn {
+        align-items: center;
+        color: #1C2025;
+        cursor: pointer;
+        display: flex;
+        height: 40px;
+        font-size: 15px;
+        line-height: 24px;
+        padding: 0 16px;
+
+        &:hover {
+            background-color: #DAEBFA;
+        }
+    }
+
+    &-dropdown-icon {
+        display: inline-block;
+        margin-right: 16px;
+
+        & > svg {
+            fill:  #1C2025;
+        }
+    }
+
+    &-dropdown-container {
+        & > div > div:nth-child(2) > div > div {
+            background: #fff;
+            padding: 0;
+        }
+    }
+
+}

css/_premeeting-screens.scss

@@ -0,0 +1,288 @@
+/**
+ * Shared style for full screen local track based dialogs/modals.
+ */
+ .premeeting-screen,
+  .preview-overlay {
+     position: absolute;
+     left: 0;
+     right: 0;
+     top: 0;
+     bottom: 0;
+  }
+
+ .premeeting-screen {
+    align-items: stretch;
+    background: radial-gradient(50% 50% at 50% 50%, #2A3A4B 20.83%, #1E2A36 100%);
+    display: flex;
+    flex-direction: column;
+    font-size: 1.3em;
+    z-index: $toolbarZ + 1;
+
+    &-avatar {
+        background-color: #A4B8D1;
+        margin-bottom: 24px;
+
+        text {
+            fill: black;
+            font-size: 26px;
+            font-weight: 400;  
+        }
+    }
+
+    .action-btn {
+        border-radius: 3px;
+        color: #fff;
+        cursor: pointer;
+        display: inline-block;
+        font-size: 15px;
+        line-height: 24px;
+        margin-top: 16px;
+        padding: 7px 16px;
+        position: relative;
+        text-align: center;
+        width: 286px;
+
+        &.primary {
+            background: #0376DA;
+            border: 1px solid #0376DA;
+        }
+
+        &.secondary {
+            background: transparent;
+            border: 1px solid #5E6D7A;
+        }
+
+        &.text {
+            width: auto;
+            font-size: 13px;
+            margin: 0;
+            padding: 0;
+        }
+
+        &.disabled {
+            background: #5E6D7A;
+            border: 1px solid #5E6D7A;
+            color: #AFB6BC;
+            cursor: initial;
+
+            .icon {
+                & > svg {
+                    fill: #AFB6BC;
+                }
+            }
+        }
+
+        .options {
+            border-radius: 3px;
+            align-items: center;
+            display: flex;
+            height: 100%;
+            justify-content: center;
+            position: absolute;
+            right: 0;
+            top: 0;
+            width: 36px;
+
+            &:hover {
+                background-color: #0262B6;
+            }
+
+            svg {
+                pointer-events: none;
+            }
+        }
+    }
+
+    .preview-overlay {
+        background-image: linear-gradient(transparent, black);
+        z-index: $toolbarZ + 1;
+    }
+
+    .content {
+        align-items: center;
+        display: flex;
+        flex: 1;
+        flex-direction: column;
+        justify-content: flex-end;
+        padding-bottom: 24px;
+        z-index: $toolbarZ + 2;
+
+        .title {
+            color: #fff;
+            font-size: 24px;
+            line-height: 32px;
+            margin-bottom: 16px;
+        }
+
+        .copy-meeting {
+            align-items: center;
+            cursor: pointer;
+            color: #fff;
+            display: flex;
+            flex-direction: row;
+            font-size: 15px;
+            font-weight: 300;
+            justify-content: center;
+            line-height: 24px;
+            margin-bottom: 16px;
+
+            .url {
+                background: rgba(28, 32, 37, 0.5);
+                border-radius: 4px;
+                display: flex;
+                padding: 8px 10px;
+                transition: background 0.16s ease-out;
+
+                &:hover {
+                    background: #1C2025;
+                }
+
+                &.done {
+                    background: #31B76A;
+                }
+
+                .jitsi-icon {
+                    margin-left: 10px;
+                }
+            }
+
+            .copy-meeting-text {
+                width: 266px;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+
+            &:hover {
+                align-self: stretch;
+            }
+
+            textarea {
+                border-width: 0;
+                height: 0;
+                opacity: 0;
+                padding: 0;
+                width: 0;
+            }
+        }
+
+        input.field {
+            background-color: white;
+            border: none;
+            outline: none;
+            border-radius: 3px;
+            font-size: 15px;
+            line-height: 24px;
+            color: #1C2025;
+            padding: 8px 0;
+            text-align: center;
+            width: 320px;
+
+            &.error {
+                box-shadow: 0px 0px 4px 3px rgba(225, 45, 45, 0.4);
+            }
+
+            &.focused {
+                box-shadow: 0px 0px 4px 3px #0376DA;
+            }
+        }
+    }
+
+    .media-btn-container {
+        display: flex;
+        justify-content: center;
+        margin: 24px 0 16px 0;
+        width: 100%;
+
+        &> div {
+            margin: 0 12px;
+        }
+
+        .settings-button-small-icon {
+            right: -8px;
+
+            &--hovered {
+                right: -10px;
+            }
+        }
+    }
+}
+
+#preview {
+    height: 100%;
+    position: absolute;
+    width: 100%;
+
+    &.no-video {
+        background: radial-gradient(50% 50% at 50% 50%, #5B6F80 0%, #365067 100%), #FFFFFF;
+        text-align: center;
+    }
+
+    .avatar {
+        background: #A4B8D1;
+        margin: 0 auto;
+    }
+
+    video {
+        height: 100%;
+        object-fit: cover;
+        position: absolute;
+        width: 100%;
+    }
+}
+
+@mixin flex-centered() {
+    align-items: center;
+    display: flex;
+    justify-content: center;
+}
+
+@mixin icon-container($bg, $fill) {
+    .toggle-button-icon-container {
+        background: $bg;
+
+        svg {
+            fill: $fill
+        }
+    }
+}
+
+.toggle-button {
+    border-radius: 3px;
+    cursor: pointer;
+    color: #fff;
+    font-size: 13px;
+    height: 40px;
+    margin: 0 auto;
+    transition: background 0.16s ease-out;
+    width: 320px;
+
+    @include flex-centered();
+
+    svg {
+        fill: transparent;
+    }
+
+    &:hover {
+        background: rgba(255, 255, 255, 0.1);
+
+        @include icon-container(#A4B8D1, #1C2025);
+    }
+
+    &-container {
+        position: relative;
+
+        @include flex-centered();
+    }
+
+    &-icon-container {
+        border-radius: 50%;
+        left: -22px;
+        padding: 2px;
+        position: absolute;
+    }
+
+    &--toggled {
+        @include icon-container(white, #1C2025);
+    }
+}

css/_recording.scss

@@ -71,6 +71,11 @@
         display: flex;
         margin-top: 5px;
         text-align: right;
+        flex-direction: column;
+
+        .help-container {
+            display: flex;
+        }
     }
 
     .live-stream-cta {

css/_responsive.scss

@@ -0,0 +1,70 @@
+@media only screen and (max-width: $smallScreen) {
+    .watermark {
+        width: 20%;
+        height: 20%;
+    }
+
+    .new-toolbox {
+        .toolbox-content {
+            .button-group-center, .button-group-left, .button-group-right {
+                .toolbox-button {
+                    .toolbox-icon {
+                        width: 28px;
+                        height: 28px;
+                        svg {
+                            width: 18px;
+                            height: 18px;
+                        }
+                    }
+
+                    &:nth-child(2) {
+                        .toolbox-icon {
+                            width: 30px;
+                            height: 30px;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@media only screen and (max-width: $verySmallScreen) {
+    #videoResolutionLabel {
+        display: none;
+    }
+    .desktop-browser {
+        .vertical-filmstrip .filmstrip {
+            display: none;
+        }
+    }
+    .new-toolbox {
+        .toolbox-content {
+            .button-group-center, .button-group-left, .button-group-right {
+                .settings-button-small-icon {
+                    display: none;
+                }
+                .toolbox-button {
+                    .toolbox-icon {
+                        width: 18px;
+                        height: 18px;
+                        svg {
+                            width: 12px;
+                            height: 12px;
+                        }
+                    }
+
+                    &:nth-child(2) {
+                        .toolbox-icon {
+                            width: 20px;
+                            height: 20px;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    .chrome-extension-banner {
+        display: none;
+    }
+}

css/_settings-button.scss

@@ -35,6 +35,10 @@
                 cursor: initial;
                 color: #fff;
                 background-color: #a4b8d1;
+
+                &:hover {
+                    background-color: #a4b8d1;
+                }
             }
 
             svg {
@@ -57,6 +61,7 @@
         width: 16px;
 
         &> svg {
+            fill: #5e6d7a;
             margin-top: 5px;
         }
 

css/_toolbars.scss

@@ -42,6 +42,11 @@
         display: none;
     }
 
+    &.shift-right {
+        margin-left: $sidebarWidth;
+        width: calc(100% - #{$sidebarWidth});
+    }
+
     .toolbox-background {
         background-image: linear-gradient(to top, rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0));
         transition: bottom .3s ease-in;

css/_variables.scss

@@ -101,7 +101,6 @@ $sidebarWidth: 375px;
  * Misc.
  */
 $borderRadius: 4px;
-$defaultWatermarkLink: '../images/watermark.png';
 $popoverMenuPadding: 13px;
 $happySoftwareBackground: transparent;
 $desktopAppDragBarHeight: 25px;
@@ -165,6 +164,9 @@ $unsupportedDesktopBrowserTextFontSize: 21px;
 $watermarkWidth: 186px;
 $watermarkHeight: 74px;
 
+$welcomePageWatermarkWidth: 186px;
+$welcomePageWatermarkHeight: 74px;
+
 /**
  * Welcome page variables.
  */
@@ -179,9 +181,12 @@ $welcomePageHeaderBackgroundPosition: none;
 $welcomePageHeaderBackgroundRepeat: none;
 $welcomePageHeaderBackgroundSize: none;
 $welcomePageHeaderPaddingBottom: 0px;
+$welcomePageHeaderMinHeight: fit-content;
 
 $welcomePageHeaderTextMarginTop: 35px;
 $welcomePageHeaderTextMarginBottom: 35px;
+$welcomePageHeaderTextDisplay: flex;
+$welcomePageHeaderTextWidth: 650px;
 
 $welcomePageHeaderTextTitleMarginBottom: 16px;
 $welcomePageHeaderTextTitleFontSize: 2.5rem;
@@ -196,6 +201,7 @@ $welcomePageHeaderTextDescriptionLineHeight: 24px;
 $welcomePageHeaderTextDescriptionMarginBottom: 20px;
 $welcomePageHeaderTextDescriptionAlignSelf: inherit;
 
+$welcomePageEnterRoomDisplay: flex;
 $welcomePageEnterRoomWidth: 680px;
 $welcomePageEnterRoomPadding: 25px 30px;
 $welcomePageEnterRoomBorderRadius: 0px;
@@ -271,3 +277,8 @@ $chromeExtensionBannerRight: 16px;
 $chromeExtensionBannerTopInMeeting: 10px;
 $chromeExtensionBannerRightInMeeeting: 10px;
 
+/**
+* media type thresholds
+*/
+$smallScreen: 700px;
+$verySmallScreen: 500px;

css/_video-preview.scss

@@ -1,6 +1,11 @@
 .video-preview {
+    background: none;
     max-height: 290px;
-    overflow: auto;
+
+    &-container {
+        overflow: auto;
+        padding: 16px;
+    }
 
     &-entry {
         cursor: pointer;
@@ -60,6 +65,6 @@
     // Override @atlaskit/InlineDialog container which is made with styled components
     & > div > div:nth-child(2) > div > div {
         outline: none;
-        padding: 16px;
+        padding: 0;
     }
 }

css/_videolayout_default.scss

@@ -181,6 +181,13 @@
         visibility: hidden;
         z-index: $zindex2;
     }
+
+    &.shift-right {
+        &#largeVideoContainer {
+            margin-left: $sidebarWidth;
+            width: calc(100% - #{$sidebarWidth});
+        }
+    }
 }
 
 #localVideoWrapper {

css/_welcome_page.scss

@@ -21,18 +21,18 @@ body.welcome-page {
         align-items: center;
         display: flex;
         flex-direction: column;
-        min-height: fit-content;
+        min-height: $welcomePageHeaderMinHeight;
         overflow: hidden;
         position: relative;
         text-align: center;
 
         .header-text {
-            display: flex;
+            display: $welcomePageHeaderTextDisplay;
             flex-direction: column;
             margin-top: $watermarkHeight + $welcomePageHeaderTextMarginTop;
             margin-bottom: $welcomePageHeaderTextMarginBottom;
             max-width: calc(100% - 40px);
-            width: 650px;
+            width: $welcomePageHeaderTextWidth;
             z-index: $zindex2;
         }
 
@@ -56,7 +56,7 @@ body.welcome-page {
         }
 
         #enter_room {
-            display: flex;
+            display: $welcomePageEnterRoomDisplay;
             align-items: center;
             max-width: calc(100% - 40px);
             width: $welcomePageEnterRoomWidth;
@@ -71,9 +71,6 @@ body.welcome-page {
                 text-align: left;
                 color: #253858;
                 height: fit-content;
-                border-width: $welcomePageEnterRoomInputContainerBorderWidth;
-                border-style: $welcomePageEnterRoomInputContainerBorderStyle;
-                border-image: $welcomePageEnterRoomInputContainerBorderImage;
 
                 .enter-room-title {
                     display: $welcomePageEnterRoomTitleDisplay;
@@ -83,12 +80,30 @@ body.welcome-page {
                 }
 
                 .enter-room-input {
-                    border: none;
+                    border-width: $welcomePageEnterRoomInputContainerBorderWidth;
+                    border-style: $welcomePageEnterRoomInputContainerBorderStyle;
+                    border-image: $welcomePageEnterRoomInputContainerBorderImage;
                     display: inline-block;
                     width: 100%;
                     font-size: 14px;
                 }
 
+                .insecure-room-name-warning {
+                    align-items: center;
+                    color: $defaultWarningColor;
+                    display: flex;
+                    flex-direction: row;
+                    margin-top: 5px;
+
+                    .jitsi-icon {
+                        margin-right: 15px;
+
+                        svg {
+                            fill: $defaultWarningColor
+                        }
+                    }
+                }
+
                 ::placeholder {
                     color: #253858;
                 }
@@ -96,6 +111,22 @@ body.welcome-page {
 
         }
 
+        #moderated-meetings {
+            max-width: calc(100% - 40px);
+            padding: 16px 0 39px 0;
+            width: $welcomePageEnterRoomWidth;
+
+            p {
+                color: $welcomePageDescriptionColor;
+                text-align: left;
+
+                a {
+                    color: inherit;
+                    font-weight: 600;
+                }
+            }
+        }
+
         .tab-container {
             font-size: 16px;
             position: relative;
@@ -180,5 +211,10 @@ body.welcome-page {
         position: absolute;
         width: 100%;
         height: 100%;
+
+        .watermark.leftwatermark {
+            width: $welcomePageWatermarkWidth;
+            height: $welcomePageWatermarkHeight;
+        }
     }
 }

css/buttons/copy.scss

@@ -0,0 +1,38 @@
+.copy-button {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 8px 8px 8px 16px;
+    margin-top: 8px;
+    width: calc(100% - 24px);
+    height: 24px;
+
+    background: #0376DA;
+    border-radius: 4px;
+    cursor: pointer;
+
+    &:hover {
+        background: #278ADF;
+        font-weight: 600;
+    }
+
+    &-content {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        max-width: 292px;
+        margin-right: 16px;
+
+        &.selected {
+            font-weight: 600;
+        }
+    }
+
+    &.clicked {
+        background: #31B76A;
+    }
+
+    & > div > svg > path {
+        fill: #fff;
+    }
+}

css/filmstrip/_tile_view.scss

@@ -15,8 +15,9 @@
         box-sizing: border-box;
         display: flex;
         flex-direction: column;
-        height: 100vh;
+        height: calc(100vh - 200px);
         width: 100vw;
+        margin: 100px 0px;
     }
 
     .filmstrip__videos .videocontainer {
@@ -45,7 +46,16 @@
         position: fixed;
         top: 0;
         width: 100%;
-        z-index: $filmstripVideosZ
+        z-index: $filmstripVideosZ;
+
+        &.shift-right {
+            margin-left: $sidebarWidth;
+            width: calc(100% - #{$sidebarWidth});
+
+            #filmstripRemoteVideos {
+                width: calc(100vw - #{$sidebarWidth});
+            }
+        }
     }
 
     /**
@@ -77,9 +87,9 @@
         box-sizing: border-box;
         display: flex;
         flex-wrap: wrap;
-        height: 100vh;
+        margin-top: auto;
+        margin-bottom: auto;
         justify-content: center;
-        padding: 100px 0;
 
         .videocontainer {
             border: 0;

css/filmstrip/_tile_view_overrides.scss

@@ -40,9 +40,6 @@
     #remotePresenceMessage {
         display: none !important;
     }
-    #largeVideoContainer {
-        background-color: $defaultBackground !important;
-    }
 
     /**
      * Thumbnail popover menus can overlap other thumbnails. Setting an auto

css/main.scss

@@ -33,9 +33,11 @@ $flagsImagePath: "../images/";
 @import 'inlay';
 @import 'reload_overlay/reload_overlay';
 @import 'mini_toolbox';
+@import 'buttons/copy.scss';
 @import 'modals/desktop-picker/desktop-picker';
 @import 'modals/device-selection/device-selection';
 @import 'modals/dialog';
+@import 'modals/embed-meeting/embed-meeting';
 @import 'modals/feedback/feedback';
 @import 'modals/invite/info';
 @import 'modals/settings/settings';
@@ -75,6 +77,8 @@ $flagsImagePath: "../images/";
 @import 'filmstrip/tile_view_overrides';
 @import 'filmstrip/vertical_filmstrip';
 @import 'filmstrip/vertical_filmstrip_overrides';
+@import 'labels';
+@import 'lobby';
 @import 'unsupported-browser/main';
 @import 'modals/invite/add-people';
 @import 'deep-linking/main';
@@ -90,5 +94,14 @@ $flagsImagePath: "../images/";
 @import 'meter';
 @import 'audio-preview';
 @import 'video-preview';
+@import 'prejoin';
+@import 'prejoin-dialog';
+@import 'country-picker';
+@import 'modals/invite/invite_more';
+@import 'modals/security/security';
+@import 'premeeting-screens';
+@import 'e2ee';
+@import 'responsive';
+@import 'connection-status';
 
 /* Modules END */

css/modals/embed-meeting/_embed-meeting.scss

@@ -0,0 +1,59 @@
+.embed-meeting {
+    &-dialog {
+        display: flex;
+        flex-direction: column;
+
+        &-header {
+            display: flex;
+            justify-content: space-between;
+            margin: 16px 16px 24px;
+            width: calc(100% - 32px);
+            color: #fff;
+            font-weight: 600;
+            font-size: 24px;
+            line-height: 32px;
+
+            & > div > svg {
+                cursor: pointer;
+                fill: #A4B8D1;
+            }
+        }
+    }
+
+    &-copy {
+        color: white;
+        font-size: 15px;
+        margin-left: auto;
+        margin-top: 16px;
+        width: auto;
+    }
+
+    &-code {
+        background: transparent;
+        border: 1px solid #A4B8D1;
+        color: white;
+        font-size: 15px;
+        height: 165px;
+        line-height: 24px;
+        padding: 8px;
+        width: 100%;
+        resize: vertical;
+    }
+
+    &-trigger {
+        display: flex;
+        align-items: center;
+        padding: 8px 8px 8px 16px;
+        margin-top: 24px;
+        width: calc(100% - 24px);
+        height: 24px;
+        background: #2A3A4B;
+        border: 1px solid #5E6D7A;
+        border-radius: 4px;
+        cursor: pointer;
+
+        .jitsi-icon {
+            margin-right: 20px;
+        }
+    }
+}

css/modals/invite/_add-people.scss

@@ -3,6 +3,7 @@
  */
 .modal-dialog-form {
     .add-people-form-wrap {
+        margin-top: 8px;
 
         .error {
             padding-left: 5px;

css/modals/invite/_info.scss

@@ -3,47 +3,6 @@
     display: flex;
     font-size: 14px;
 
-    .info-dialog-action-link {
-        display: inline-block;
-        line-height: 1.5em;
-
-        a {
-            cursor: pointer;
-            vertical-align: middle;
-        }
-    }
-
-    .info-dialog-action-link:before {
-        color: $linkFontColor;
-        content: '\2022';
-        font-size: 1.5em;
-        padding: 0 10px;
-        vertical-align: middle;
-    }
-
-    .info-dialog-action-link:first-child:before {
-        content: '';
-        padding: 0;
-    }
-
-    .info-dialog-action-links {
-        font-weight: bold;
-        margin-top: 10px;
-        white-space: nowrap;
-    }
-
-    .info-dialog-action-separator {
-        display: inline-block;
-    }
-
-    .info-dialog-copy-element {
-        opacity: 0;
-        pointer-events: none;
-        position: absolute;
-        -webkit-user-select: text;
-        user-select: text;
-    }
-
     .info-dialog-column {
         margin-right: 10px;
         overflow: hidden;
@@ -56,52 +15,6 @@
         }
     }
 
-    .info-dialog-conference-url,
-    .info-dialog-live-stream-url {
-        width: max-content;
-        width: -moz-max-content;
-        width: -webkit-max-content;
-        word-break: break-all;
-        max-width: 400px;
-        display: flex;
-        align-items: center;
-    }
-
-    .info-dialog-dial-in {
-        word-break: break-all;
-
-        .conference-id,
-        .phone-number {
-            user-select: text;
-        }
-    }
-
-    .info-dialog-icon {
-        color: #6453C0;
-        font-size: 16px;
-        min-width: 30px;
-    }
-
-    .info-dialog-url-text,
-    .info-dialog-url-text:hover {
-        color: inherit;
-        cursor: inherit;
-    }
-
-    .info-dialog-url-icon {
-        display: inline-block;
-        margin-left: 5px;
-
-        svg {
-            cursor: pointer;
-        }
-    }
-
-    .info-dialog-title {
-        font-weight: bold;
-        margin-bottom: 10px;
-    }
-
     .info-dialog-password,
     .info-password,
     .info-password-form {
@@ -125,6 +38,7 @@
     }
 
     .info-password-input {
+        width: 100%;
         background-color: transparent;
         border: none;
         color: inherit;
@@ -223,10 +137,4 @@
         -moz-user-select: text;
         -webkit-user-select: text;
     }
-
-    .info-dialog-url-text-unselectable {
-        user-select: none;
-        -moz-user-select: none;
-        -webkit-user-select: none;
-    }
 }

css/modals/invite/_invite_more.scss

@@ -0,0 +1,216 @@
+.invite-more {
+    &-container {
+        color: #fff;
+        font-weight: 600;
+        position: absolute;
+        width: 100%;
+        text-align: center;
+        z-index: $zindex2;
+        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+
+        &.elevated {
+            z-index: $filmstripVideosZ + 1;
+        }
+    }
+
+    &-header {
+        font-size: 19px;
+        line-height: 28px;
+        margin: 24px 0 16px 0;
+    }
+
+    &-button {
+        display: flex;
+        margin: auto;
+        padding: 8px 16px;
+        width: fit-content;
+        width: -moz-fit-content;
+        height: 24px;
+        background: #0376DA;
+        border-radius: 3px;
+        font-size: 14px;
+        line-height: 24px;
+        cursor: pointer;
+
+        &:hover {
+            background: #278ADF;
+        }
+
+        &-text {
+            margin-left: 8px;
+            font-size: 15px;
+            line-height: 24px;
+        }
+    }
+    &-dialog {
+        color: #fff;
+        font-size: 15px;
+        line-height: 24px;
+
+        &.header {
+            display: flex;
+            justify-content: space-between;
+            margin: 16px 16px 24px;
+            width: calc(100% - 32px);
+            color: #fff;
+            font-weight: 600;
+            font-size: 24px;
+            line-height: 32px;
+
+            & > div > svg {
+                cursor: pointer;
+                fill: #A4B8D1;
+            }
+        }
+
+        &.separator {
+            margin: 24px 0 24px -20px;
+            padding: 0 20px;
+            width: 100%;
+            height: 1px;
+            background: #5E6D7A;
+        }
+
+        &.email-container {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 8px 8px 8px 16px;
+            margin-top: 24px;
+            width: calc(100% - 26px);
+            height: 22px;
+
+            background: #2A3A4B;
+            border: 1px solid #5E6D7A;
+            border-radius: 3px;
+            cursor: pointer;
+
+            &.active {
+                border-radius: 3px 3px 0 0;
+            }
+        }
+
+        &.icon-container {
+            display: none;
+
+            &.active {
+                display: flex;
+                width: calc(100% - 26px);
+                padding: 8px 8px 8px 16px;
+
+                background: #2A3A4B;
+                border: 1px solid #5E6D7A;
+                border-top: none;
+                border-radius: 0 0 3px 3px;
+
+                & > * {
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    height: 40px;
+                    width: 40px;
+                    border-radius: 4px;
+                    cursor: pointer;
+                }
+    
+                &:hover > div:hover {
+                    background-color: rgba(255, 255, 255, 0.2);
+                }
+    
+                & > :not(:last-child) {
+                    margin-right: 16px;
+                }
+
+                .copy-invite-icon > div > svg > path {
+                    fill: #A4B8D1;
+                }
+            }
+        }
+
+        &.dial-in-display {
+            .info-label {
+                color: #A4B8D1;
+            }
+
+            .dial-in-copy {
+                display: inline-block;
+                vertical-align: middle;
+                margin-left: 21px;
+                cursor: pointer;
+            }
+        }
+
+        &.invite-buttons {
+            width: 100%;
+            text-align: right;
+            margin-top: 8px;
+
+            & > a {
+                display: inline-block;
+                height: 24px;
+                width: 48px;
+                border-radius: 3px;
+                text-align: center;
+                text-decoration: none;
+                cursor: pointer;
+            }
+
+            &-cancel {
+                margin-right: 16px;
+                padding: 7px 15px;
+                background: #2A3A4B;
+                border: 1px solid #5E6D7A;
+            }
+
+            &-add {
+                padding: 8px 16px;
+                background: #0376DA;
+            }
+
+            &.disabled {
+                & > a {
+                    pointer-events: none;
+                }
+            }
+        }
+
+        &.stream {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 8px 8px 8px 16px;
+            margin-top: 8px;
+            width: calc(100% - 26px);
+            height: 22px;
+
+            background: #2A3A4B;
+            border: 1px solid #5E6D7A;
+            border-radius: 3px;
+            cursor: pointer;
+
+            &:hover {
+                font-weight: 600;
+            }
+
+            &-text {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                max-width: 292px;
+
+                &.selected {
+                    font-weight: 600;
+                }
+            }
+
+            &.clicked {
+                background: #31B76A;
+                border: 1px solid #31B76A;
+            }
+
+            & > div > svg > path {
+                fill: #fff;
+            }
+        }
+    }
+}

css/modals/security/_security.scss

@@ -0,0 +1,56 @@
+.security {
+    &-dialog {
+        color: #fff;
+        font-size: 15px;
+        line-height: 24px;
+
+        &.password-section {
+            display: flex;
+            flex-direction: column;
+
+            .description {
+                font-size: 13px;
+            }
+
+            .password {
+                align-items: center;
+                display: flex;
+                justify-content: space-between;
+                margin-top: 15px;
+
+                &-actions {
+                    a {
+                        cursor: pointer;
+                        text-decoration: none;
+                        font-size: 14px;
+                        color: #6FB1EA;
+                    }
+
+                    & > :first-child:not(:last-child) {	
+                        margin-right: 24px;	
+                    }
+                }
+            }
+        }
+
+        .separator-line {
+            margin: 24px 0 24px -20px;
+            padding: 0 20px;
+            width: 100%;
+            height: 1px;
+            background: #5E6D7A;
+
+            &:last-child {
+                display: none;
+            }
+        }
+    }
+}
+
+.new-toolbox .toolbox-content .toolbox-icon.toggled.security-toolbar-button {
+    border-width: 0;
+
+    &:not(:hover) {
+        background: unset;
+    }
+}

css/modals/settings/_settings.scss

@@ -30,10 +30,12 @@
         width: 100%;
     }
 
-    .profile-edit-field,
-    .settings-sub-pane {
+    .profile-edit-field {
         flex: 1;
     }
+    .settings-sub-pane {
+        flex-grow: 1;
+    }
 
     .profile-edit-field {
         margin-right: 20px;

css/modals/video-quality/_video-quality.scss

@@ -144,58 +144,3 @@
 #videoResolutionLabel {
     z-index: $zindex3 + 1;
 }
-
-.large-video-labels {
-    display: flex;
-    position: absolute;
-    top: 30px;
-    right: 30px;
-    transition: right 0.5s;
-    z-index: $zindex3;
-
-    .circular-label {
-        color: white;
-        font-weight: bold;
-        margin-left: 8px;
-        opacity: 0.8;
-    }
-
-    .circular-label {
-        background: #B8C7E0;
-    }
-
-    .circular-label.file {
-        background: #FF5630;
-    }
-
-    .circular-label.local-rec {
-        background: #FF5630;
-    }
-
-    .circular-label.stream {
-        background: #0065FF;
-    }
-
-    .recording-label.center-message {
-        background: $videoStateIndicatorBackground;
-        bottom: 50%;
-        display: block;
-        left: 50%;
-        padding: 10px;
-        position: fixed;
-        transform: translate(-50%, -50%);
-        z-index: $centeredVideoLabelZ;
-    }
-}
-
-.circular-label {
-    background: $videoStateIndicatorBackground;
-    border-radius: 50%;
-    box-sizing: border-box;
-    cursor: default;
-    font-size: 13px;
-    height: $videoStateIndicatorSize;
-    line-height: $videoStateIndicatorSize;
-    text-align: center;
-    min-width: $videoStateIndicatorSize;
-}

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
 
@@ -47,11 +47,12 @@ Description: Prosody configuration for Jitsi Meet
 
 Package: jitsi-meet-tokens
 Architecture: all
-Depends: ${misc:Depends}, prosody-trunk (>= 1nightly747) | prosody-0.11 | prosody (>= 0.11.2), libssl-dev, luarocks, jitsi-meet-prosody
+Depends: ${misc:Depends}, prosody-trunk (>= 1nightly747) | prosody-0.11 | prosody (>= 0.11.2), libssl1.0-dev | libssl-dev, luarocks, jitsi-meet-prosody, git
 Description: Prosody token authentication plugin for Jitsi Meet
 
 Package: jitsi-meet-turnserver
 Architecture: all
 Breaks: apache2
+Pre-Depends: jitsi-meet-web-config
 Depends: ${misc:Depends}, nginx (>= 1.13.10) | nginx-full (>= 1.13.10) | nginx-extras (>= 1.13.10), jitsi-meet-prosody, coturn, dnsutils
 Description: Configures coturn to be used with Jitsi Meet

debian/jitsi-meet-prosody.postinst

@@ -17,6 +17,9 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+function generateRandomPassword() {
+    cat /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c 16
+}
 
 case "$1" in
     configure)
@@ -51,7 +54,7 @@ case "$1" in
         db_get jicofo/jicofo-authpassword
         if [ -z "$RET" ] ; then
             # if password is missing generate it, and store it
-            JICOFO_AUTH_PASSWORD=`head -c 8 /dev/urandom | tr '\0-\377' 'a-zA-Z0-9a-zA-Z0-9a-zA-Z0-9a-zA-Z0-9@@@@####'`
+            JICOFO_AUTH_PASSWORD=`generateRandomPassword`
             db_set jicofo/jicofo-authpassword "$JICOFO_AUTH_PASSWORD"
         else
             JICOFO_AUTH_PASSWORD="$RET"
@@ -60,7 +63,7 @@ case "$1" in
         db_get jicofo/jicofosecret
         if [ -z "$RET" ] ; then
             # if secret is missing generate it, and store it
-            JICOFO_SECRET=`head -c 8 /dev/urandom | tr '\0-\377' 'a-zA-Z0-9a-zA-Z0-9a-zA-Z0-9a-zA-Z0-9@@@@####'`
+            JICOFO_SECRET=`generateRandomPassword`
             db_set jicofo/jicofosecret "$JICOFO_SECRET"
         else
             JICOFO_SECRET="$RET"
@@ -83,7 +86,7 @@ case "$1" in
         db_get jitsi-meet-prosody/turn-secret
         if [ -z "$RET" ] ; then
             # 8-chars random secret used for the turnserver
-            TURN_SECRET=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1`
+            TURN_SECRET=`generateRandomPassword`
             db_set jitsi-meet-prosody/turn-secret "$TURN_SECRET"
         else
             TURN_SECRET="$RET"
@@ -134,7 +137,7 @@ case "$1" in
         # as we are migrating configs
         if [ -f $PROSODY_HOST_CONFIG ] && ! grep -q "internal.auth.$JVB_HOSTNAME" $PROSODY_HOST_CONFIG; then
             echo -e "\nComponent \"internal.auth.$JVB_HOSTNAME\" \"muc\"" >> $PROSODY_HOST_CONFIG
-            echo -e "    storage = \"null\"" >> $PROSODY_HOST_CONFIG
+            echo -e "    storage = \"memory\"" >> $PROSODY_HOST_CONFIG
             echo -e "    modules_enabled = { \"ping\"; }" >> $PROSODY_HOST_CONFIG
             echo -e "    admins = { \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\", \"jvb@auth.$JVB_HOSTNAME\" }" >> $PROSODY_HOST_CONFIG
         fi
@@ -148,14 +151,13 @@ case "$1" in
             ln -sf /var/lib/prosody/$JVB_HOSTNAME.crt /etc/prosody/certs/$JVB_HOSTNAME.crt
         fi
 
-        PR11_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.11' 2>/dev/null | awk '{print $3}' || true)"
+        PRTRUNK_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-trunk' 2>/dev/null | awk '{print $3}' || true)"
         PR10_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.10' 2>/dev/null | awk '{print $3}' || true)"
         PR_VER_INSTALLED=$(dpkg-query -f='${Version}\n' --show prosody  2>/dev/null || true)
-        if [ "$PR11_INSTALL_CHECK" = "installed" ] \
-            || [ "$PR11_INSTALL_CHECK" = "unpacked" ] \
-            || dpkg --compare-versions "$PR_VER_INSTALLED" gt "0.11" ; then
+        if [ "$PRTRUNK_INSTALL_CHECK" = "installed" ] \
+            || [ "$PRTRUNK_INSTALL_CHECK" = "unpacked" ] ; then
             if [ -f $PROSODY_HOST_CONFIG ]; then
-                sed -i 's/storage = \"null\"/storage = \"memory\"/g' $PROSODY_HOST_CONFIG
+                sed -i 's/storage = \"memory\"/storage = \"null\"/g' $PROSODY_HOST_CONFIG
 
                 # trigger a restart
                 PROSODY_CONFIG_PRESENT="false"
@@ -168,7 +170,7 @@ case "$1" in
             # if the version is 0.10.X (>0.10 and <0.11)
             if [ -f $PROSODY_HOST_CONFIG ] \
                 && dpkg --compare-versions "$PR_VER_INSTALLED" lt "0.11" ; then
-                sed -i 's/storage = \"null\"/storage = \"none\"/g' $PROSODY_HOST_CONFIG
+                sed -i 's/storage = \"memory\"/storage = \"none\"/g' $PROSODY_HOST_CONFIG
 
                 # trigger a restart
                 PROSODY_CONFIG_PRESENT="false"

debian/jitsi-meet-prosody.postrm

@@ -45,8 +45,12 @@ case "$1" in
             rm -rf /var/lib/prosody/$JICOFO_AUTH_DOMAIN.*
             rm -rf /var/lib/prosody/$JVB_HOSTNAME.*
 
-            # clean created users
-            rm -rf /var/lib/prosody/`echo $JICOFO_AUTH_DOMAIN | sed -e "s/\./%2e/g"`
+            # clean created users, replace '.' with '%2e', replace '-' with '%2d'
+            rm -rf /var/lib/prosody/`echo $JICOFO_AUTH_DOMAIN | sed -e "s/\./%2e/g"| sed -e "s/-/%2d/g"`
+
+            # clean the prosody cert from the trust store
+            rm -rf /usr/local/share/ca-certificates/$JICOFO_AUTH_DOMAIN.*
+            update-ca-certificates -f
         fi
 
         # Clear the debconf variable

debian/jitsi-meet-tokens.postinst

@@ -48,9 +48,9 @@ case "$1" in
         db_stop
 
         if [ -f "$PROSODY_HOST_CONFIG" ] ; then
-            # search for --plugin_paths, if this is not enabled this is the
+            # search for the token auth, if this is not enabled this is the
             # first time we install tokens package and needs a config change
-            if grep -q "\-\-plugin_paths" "$PROSODY_HOST_CONFIG"; then
+            if ! egrep -q '^\s*authentication\s*=\s*"token"' "$PROSODY_HOST_CONFIG"; then
                 # enable tokens in prosody host config
                 sed -i 's/--plugin_paths/plugin_paths/g' $PROSODY_HOST_CONFIG
                 sed -i 's/authentication = "anonymous"/authentication = "token"/g' $PROSODY_HOST_CONFIG
@@ -58,6 +58,7 @@ case "$1" in
                 sed -i "s/ --app_id=\"example_app_id\"/ app_id=\"$APP_ID\"/g" $PROSODY_HOST_CONFIG
                 sed -i "s/ --app_secret=\"example_app_secret\"/ app_secret=\"$APP_SECRET\"/g" $PROSODY_HOST_CONFIG
                 sed -i 's/ --modules_enabled = { "token_verification" }/ modules_enabled = { "token_verification" }/g' $PROSODY_HOST_CONFIG
+                sed -i '/^\s*--\s*"token_verification"/ s/--\s*//' $PROSODY_HOST_CONFIG
 
                 # Install luajwt
                 if ! luarocks install luajwtjitsi; then
@@ -69,12 +70,15 @@ case "$1" in
                    echo "Failed to install basexx - try installing it manually"
                 fi
 
-                PR11_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.11' 2>/dev/null | awk '{print $3}' || true)"
+                PR10_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.10' 2>/dev/null | awk '{print $3}' || true)"
+                PRTRUNK_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-trunk' 2>/dev/null | awk '{print $3}' || true)"
                 PR_VER_INSTALLED=$(dpkg-query -f='${Version}\n' --show prosody  2>/dev/null || true)
-                if [ "$PR11_INSTALL_CHECK" = "installed" ] \
-                    || [ "$PR11_INSTALL_CHECK" = "unpacked" ] \
-                    || dpkg --compare-versions "$PR_VER_INSTALLED" gt "0.11" ; then
-                    sed -i 's/module:hook/module:hook_global/g' /usr/share/jitsi-meet/prosody-plugins/mod_auth_token.lua
+                if [ "$PR10_INSTALL_CHECK" = "installed" ] \
+                    || [ "$PR10_INSTALL_CHECK" = "unpacked" ] \
+                    || [ "$PRTRUNK_INSTALL_CHECK" = "installed" ] \
+                    || [ "$PRTRUNK_INSTALL_CHECK" = "unpacked" ] \
+                    || dpkg --compare-versions "$PR_VER_INSTALLED" lt "0.11" ; then
+                    sed -i 's/module:hook_global(/module:hook(/g' /usr/share/jitsi-meet/prosody-plugins/mod_auth_token.lua
                 fi
 
                 if [ -x "/etc/init.d/prosody" ]; then

debian/jitsi-meet-tokens.postrm

@@ -37,11 +37,10 @@ case "$1" in
             APP_SECRET=$RET
 
             # Revert prosody config
-            sed -i 's/plugin_paths/--plugin_paths/g' $PROSODY_HOST_CONFIG
             sed -i 's/authentication = "token"/authentication = "anonymous"/g' $PROSODY_HOST_CONFIG
             sed -i "s/ app_id=\"$APP_ID\"/ --app_id=\"example_app_id\"/g" $PROSODY_HOST_CONFIG
             sed -i "s/ app_secret=\"$APP_SECRET\"/ --app_secret=\"example_app_secret\"/g" $PROSODY_HOST_CONFIG
-            sed -i 's/ -- "token_verification"/   "token_verification"/g' $PROSODY_HOST_CONFIG
+            sed -i '/^\s*"token_verification"/ s/"token_verification"/-- "token_verification"/' $PROSODY_HOST_CONFIG
 
             if [ -x "/etc/init.d/prosody" ]; then
                 invoke-rc.d prosody restart || true

debian/jitsi-meet-turnserver.install

@@ -1,2 +1,3 @@
-doc/debian/jitsi-meet-turn/turnserver.conf  /usr/share/jitsi-meet-turnserver/
-doc/debian/jitsi-meet/jitsi-meet.conf       /usr/share/jitsi-meet-turnserver/
+doc/debian/jitsi-meet-turn/turnserver.conf          /usr/share/jitsi-meet-turnserver/
+doc/debian/jitsi-meet/jitsi-meet.conf               /usr/share/jitsi-meet-turnserver/
+doc/debian/jitsi-meet-turn/coturn-certbot-deploy.sh /usr/share/jitsi-meet-turnserver/

debian/jitsi-meet-turnserver.postinst

@@ -36,26 +36,6 @@ case "$1" in
         NGINX_CONFIG="/etc/nginx/sites-available/$JVB_HOSTNAME.conf"
         JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js"
 
-        NGINX_SITES_ENABLED="/etc/nginx/sites-enabled/"
-        NGINX_CONFIG_ENABLED="${NGINX_SITES_ENABLED}${JVB_HOSTNAME}.conf"
-        for site in ${NGINX_SITES_ENABLED}*; do
-            # if it is not a file continue
-            [ -f "${site}" ] || continue
-            # if it is our config skip
-            [ "${site}" != "${NGINX_CONFIG_ENABLED}" ] || continue
-            # check whether other enabled hosts has listen 443
-            if cat ${site} | grep -v "^[[:space:]]*#" | grep listen | grep -q "^.*[[:space:]:]443[;[:space:]].*" ; then
-                # nothing to do
-                echo "------------------------------------------------"
-                echo ""
-                echo "turnserver not configured as other nginx sites use port 443"
-                echo ""
-                echo "------------------------------------------------"
-                db_stop
-                exit 0
-            fi
-        done
-
         # if there was a turn config backup it so we can configure
         # we cannot recognize at the moment is this a user config or default config when installing coturn
         if [[ -f $TURN_CONFIG ]] && ! grep -q "jitsi-meet coturn config" "$TURN_CONFIG" ; then
@@ -77,7 +57,7 @@ case "$1" in
             # nothing to do
             echo "------------------------------------------------"
             echo ""
-            echo "turnserver not configured as no nginx found to multiplex traffic"
+            echo "turnserver not configured"
             echo ""
             echo "------------------------------------------------"
             db_stop
@@ -87,9 +67,36 @@ case "$1" in
         if [[ -f $TURN_CONFIG ]] ; then
             echo "------------------------------------------------"
             echo ""
-            echo "turnserver is already configured on this machine, skipping."
+            echo "turnserver is already configured on this machine."
             echo ""
             echo "------------------------------------------------"
+
+            if grep -q "jitsi-meet coturn config" "$TURN_CONFIG" && ! grep -q "jitsi-meet coturn relay disable config" "$TURN_CONFIG" ; then
+                echo "Updating coturn config"
+                echo "# jitsi-meet coturn relay disable config. Do not modify this line
+no-multicast-peers
+no-cli
+no-loopback-peers
+no-tcp-relay
+denied-peer-ip=0.0.0.0-0.255.255.255
+denied-peer-ip=10.0.0.0-10.255.255.255
+denied-peer-ip=100.64.0.0-100.127.255.255
+denied-peer-ip=127.0.0.0-127.255.255.255
+denied-peer-ip=169.254.0.0-169.254.255.255
+denied-peer-ip=127.0.0.0-127.255.255.255
+denied-peer-ip=172.16.0.0-172.31.255.255
+denied-peer-ip=192.0.0.0-192.0.0.255
+denied-peer-ip=192.0.2.0-192.0.2.255
+denied-peer-ip=192.88.99.0-192.88.99.255
+denied-peer-ip=192.168.0.0-192.168.255.255
+denied-peer-ip=198.18.0.0-198.19.255.255
+denied-peer-ip=198.51.100.0-198.51.100.255
+denied-peer-ip=203.0.113.0-203.0.113.255
+denied-peer-ip=240.0.0.0-255.255.255.255" >> $TURN_CONFIG
+
+                invoke-rc.d coturn restart || true
+            fi
+
             db_stop
             exit 0
         fi
@@ -106,18 +113,9 @@ case "$1" in
         TURN_SECRET="$RET"
 
         # no turn config exists, lt's copy template and fill it in
-        PUBLIC_IP=$(dig +short myip.opendns.com @resolver1.opendns.com)
         cp /usr/share/jitsi-meet-turnserver/turnserver.conf $TURN_CONFIG
         sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $TURN_CONFIG
         sed -i "s/__turnSecret__/$TURN_SECRET/g" $TURN_CONFIG
-        sed -i "s/__external_ip_address__/$JVB_HOSTNAME/g" $TURN_CONFIG
-
-        # Hack Debian Buster coturn to be able to bind privileged port 443
-        COTURN_UNIT_FILE="/lib/systemd/system/coturn.service"
-        if [[ -f $COTURN_UNIT_FILE ]] && ! grep -q "CAP_NET_BIND_SERVICE" "$COTURN_UNIT_FILE" ; then
-            sed -i "s/\[Service\]/\[Service\]\nAmbientCapabilities=CAP_NET_BIND_SERVICE/g" $COTURN_UNIT_FILE
-            systemctl daemon-reload
-        fi
 
         # SSL for nginx
         db_get jitsi-meet/cert-choice
@@ -142,16 +140,14 @@ case "$1" in
         invoke-rc.d coturn restart || true
 
         NGINX_STREAM_CONFIG="/etc/nginx/modules-enabled/60-jitsi-meet.conf"
-        if [ ! -f $NGINX_STREAM_CONFIG ] && [ -f $NGINX_CONFIG ] ; then
-            ln -s /usr/share/jitsi-meet-turnserver/jitsi-meet.conf $NGINX_STREAM_CONFIG
-            sed -i "s/listen 443 ssl/listen 4444 ssl http2/g" $NGINX_CONFIG
-            sed -i "s/listen \[\:\:\]\:443 ssl/listen \[\:\:\]\:4444 ssl http2/g" $NGINX_CONFIG
-            invoke-rc.d nginx reload || true
-        fi
-
-        # Enable turn server in config.js
-        if [ -f $JITSI_MEET_CONFIG ] ; then
-            sed -i "s/\/\/ useStunTurn: true/useStunTurn: true/g" $JITSI_MEET_CONFIG
+        if [ -f $NGINX_STREAM_CONFIG ] ; then
+            echo "------------------------------------------------"
+            echo ""
+            echo "You have multiplexing enabled, it is recommended to disable it and migrate to using websockets for the bridge channel."
+            echo "The support for sctp data channels is deprecated and will be dropped at some point."
+            echo "How to do it at: https://jitsi.org/multiplexing-to-bridge-ws-howto"
+            echo ""
+            echo "------------------------------------------------"
         fi
 
         # and we're done with debconf

debian/jitsi-meet-turnserver.postrm

@@ -24,7 +24,6 @@ set -e
 
 case "$1" in
     remove)
-        rm -rf /etc/nginx/modules-enabled/60-jitsi-meet.conf
         if [ -x "/etc/init.d/nginx" ]; then
             invoke-rc.d nginx reload || true
         fi
@@ -33,7 +32,6 @@ case "$1" in
         fi
     ;;
     purge)
-        rm -rf /etc/nginx/modules-enabled/60-jitsi-meet.conf
         rm -rf /etc/turnserver.conf
         if [ -x "/etc/init.d/nginx" ]; then
             invoke-rc.d nginx reload || true

debian/jitsi-meet-web-config.postinst

@@ -91,10 +91,14 @@ case "$1" in
                 CERT_CRT="/etc/jitsi/meet/$JVB_HOSTNAME.crt"
                 HOST="$( (hostname -s; echo localhost) | head -n 1)"
                 DOMAIN="$( (hostname -d; echo localdomain) | head -n 1)"
-                openssl req -new -newkey rsa:4096 -days 365 -nodes -x509 -subj \
+                openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj \
                     "/O=$DOMAIN/OU=$HOST/CN=$JVB_HOSTNAME/emailAddress=webmaster@$HOST.$DOMAIN" \
                     -keyout $CERT_KEY \
-                    -out $CERT_CRT
+                    -out $CERT_CRT \
+                    -reqexts SAN \
+                    -extensions SAN \
+                    -config <(cat /etc/ssl/openssl.cnf \
+                        <(printf "[SAN]\nsubjectAltName=DNS:localhost,DNS:$JVB_HOSTNAME"))
             fi
         fi
 

debian/jitsi-meet-web.install

@@ -13,3 +13,5 @@ lang					/usr/share/jitsi-meet/
 connection_optimization	/usr/share/jitsi-meet/
 resources/robots.txt	/usr/share/jitsi-meet/
 resources/*.sh			/usr/share/jitsi-meet/scripts/
+pwa-worker.js			/usr/share/jitsi-meet/
+manifest.json			/usr/share/jitsi-meet/

doc/README.md

@@ -1,43 +1,3 @@
 # Documentation
 
-This document is the entrypoint to different guides, divided in three groups:
-
-* User guide: these documents are designed to help users of the service, to better
-understand all the available features and how to use them.
-
-* Developer guide: these documents are designed to help developers who want to either
-integrate the Jitsi Meet API / SDK in their products or want to improve Jitsi Meet
-itself by developing new features or fixing bugs.
-
-* DevOps guide: these documents are designed for DevOps folks, system administrators
-or anyone who wishes to deploy and operate their own Jitsi Meet instance.
-
-## User guide
-
-Work in progress.
-
-## Developer guide
-
-### Web
-
-* [iframe API](https://github.com/jitsi/jitsi-meet/blob/master/doc/api.md)
-* [Jitsi Meet development](https://github.com/jitsi/jitsi-meet/blob/master/doc/development.md)
-
-### Mobile
-
-* [Building the mobile apps](https://github.com/jitsi/jitsi-meet/blob/master/doc/mobile.md)
-* [SDK usage examples](https://github.com/jitsi/jitsi-meet-sdk-samples)
-* [Enabling Dropbox support](https://github.com/jitsi/jitsi-meet/blob/master/doc/mobile-dropbox.md)
-* [Enabling Google authentication](https://github.com/jitsi/jitsi-meet/blob/master/doc/mobile-google-auth.md)
-
-## DevOps guide
-
-* [Quick install](https://github.com/jitsi/jitsi-meet/blob/master/doc/quick-install.md)
-* [Docker install](https://github.com/jitsi/docker-jitsi-meet/blob/master/README.md)
-* [Google Calendar, MS Calendar, Dropbox integrations](https://github.com/jitsi/jitsi-meet/blob/master/doc/integrations.md)
-* [Video tutorials on deployment and scalability](https://jitsi.org/tutorials/)
-* [Configuring a video SIP gateway](https://github.com/jitsi/jitsi-meet/blob/master/doc/sipgw-config.md)
-* [Enabling speaker stats](https://github.com/jitsi/jitsi-meet/blob/master/doc/speakerstats-prosody.md)
-* [Enabling TURN](https://github.com/jitsi/jitsi-meet/blob/master/doc/turn.md)
-* [Networking FAQ](https://github.com/jitsi/jitsi-meet/blob/master/doc/faq.md)
-* [Cloud APIs](https://github.com/jitsi/jitsi-meet/blob/master/doc/cloud-api.md)
+The Jitsi documentation has been moved to [The Handbook](https://jitsi.github.io/handbook/). The repo is https://github.com/jitsi/handbook.