android: raise SDK and app versions

Avoid Android crashes.

.eslintignore

@@ -5,9 +5,6 @@ build/*
 # modify as little as possible.
 flow-typed/*
 libs/*
-resources/*
-react/features/stream-effects/virtual-background/vendor/*
-load-test/*
 
 # ESLint will by default ignore its own configuration file. However, there does
 # not seem to be a reason why we will want to risk being inconsistent with our

.flowconfig

@@ -11,9 +11,6 @@ node_modules/react-native/Libraries/react-native/React.js
 ; "node_modules/react-native" but in the source repo it is in the root
 node_modules/react-native/Libraries/react-native/React.js
 
-; Flow doesn't support platforms
-.*/Libraries/Utilities/LoadingView.js
-
 ; Ignore polyfills
 node_modules/react-native/Libraries/polyfills/.*
 
@@ -115,4 +112,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.104.0
+^0.98.0

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

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

.github/ISSUE_TEMPLATE/2-help.md

@@ -0,0 +1,10 @@
+---
+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/3-feature-request.md

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

@@ -1,5 +0,0 @@
-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

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

.github/workflows/ci.yml

@@ -1,18 +0,0 @@
-name: Simple CI
-
-on: [pull_request]
-
-jobs:
-  run-ci:
-    name: Build Frontend
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '12.x'
-    - run: npm install
-    - name: Check if the git repository is clean
-      run: exit $( git status --porcelain --untracked-files=no | head -255 | wc -l )
-    - run: npm run lint
-    - run: make

.gitignore

@@ -61,15 +61,20 @@ buck-out/
 
 # fastlane
 #
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/
+
 */fastlane/report.xml
 */fastlane/Preview.html
+*/fastlane/screenshots
 
 # Build artifacts
 *.jsbundle
 *.framework
 android/app/debug
 android/app/release
-ios/sdk/out
 
 # precommit-hook
 .jshintignore
@@ -85,10 +90,3 @@ android/app/google-services.json
 ios/app/dropbox.key
 ios/app/GoogleService-Info.plist
 
-.vscode
-
-# TWA
-twa/*.apk
-twa/*.aab
-twa/assetlinks.json
-

.npmrc

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

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode11.1
+osx_image: xcode10.2
 language: objective-c
 script:
 - "./ios/travis-ci/build-ipa.sh"

CONTRIBUTING.md

@@ -27,145 +27,3 @@ 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.
-
-
-### Avoiding bundle bloat
-
-When adding a new feature it's possible that it triggers a build failure due to the increased bundle size. We have safeguards inplace to avoid bundles growing disproportionatelly. While there are legit reasons for increasing the limits, please analyze the bundle first to make sure no unintended dependencies have been included, causing the increase in size.
-
-First, make a production build with bundle-analysis enabled:
-
-```
-npx webpack -p --analyze-bundle
-```
-
-Then open the interactive bundle analyzer tool:
-
-```
-npx webpack-bundle-analyzer build/app-stats.json
-```

ConferenceEvents.js

@@ -0,0 +1,11 @@
+/**
+ * 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,11 +3,7 @@ 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/
-TFLITE_WASM = react/features/stream-effects/virtual-background/vendor/tflite
-MEET_MODELS_DIR  = react/features/stream-effects/virtual-background/vendor/models/
-NODE_SASS = ./node_modules/.bin/sass
+NODE_SASS = ./node_modules/.bin/node-sass
 NPM = npm
 OUTPUT_DIR = .
 STYLES_BUNDLE = css/all.bundle.css
@@ -18,17 +14,13 @@ WEBPACK_DEV_SERVER = ./node_modules/.bin/webpack-dev-server
 
 all: compile deploy clean
 
-compile: compile-load-test
+compile:
 	$(WEBPACK) -p
 
-compile-load-test:
-	${NPM} install --prefix resources/load-test && ${NPM} run build --prefix resources/load-test
-
 clean:
 	rm -fr $(BUILD_DIR)
 
-.NOTPARALLEL:
-deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-libflac deploy-olm deploy-css deploy-local
+deploy: deploy-init deploy-appbundle deploy-lib-jitsi-meet deploy-libflac deploy-css deploy-local
 
 deploy-init:
 	rm -fr $(DEPLOY_DIR)
@@ -44,6 +36,8 @@ deploy-appbundle:
 		$(BUILD_DIR)/external_api.min.map \
 		$(BUILD_DIR)/flacEncodeWorker.min.js \
 		$(BUILD_DIR)/flacEncodeWorker.min.map \
+		$(BUILD_DIR)/device_selection_popup_bundle.min.js \
+		$(BUILD_DIR)/device_selection_popup_bundle.min.map \
 		$(BUILD_DIR)/dial_in_info_bundle.min.js \
 		$(BUILD_DIR)/dial_in_info_bundle.min.map \
 		$(BUILD_DIR)/alwaysontop.min.js \
@@ -51,15 +45,14 @@ deploy-appbundle:
 		$(OUTPUT_DIR)/analytics-ga.js \
 		$(BUILD_DIR)/analytics-ga.min.js \
 		$(BUILD_DIR)/analytics-ga.min.map \
-		$(BUILD_DIR)/close3.min.js \
-		$(BUILD_DIR)/close3.min.map \
+		$(BUILD_DIR)/video-blur-effect.min.js \
+		$(BUILD_DIR)/video-blur-effect.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)
@@ -70,41 +63,20 @@ 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 \
-		$(DEPLOY_DIR)
-
-deploy-tflite:
-	cp \
-		$(TFLITE_WASM)/*.wasm \
-		$(DEPLOY_DIR)		
-
-deploy-meet-models:
-	cp \
-		$(MEET_MODELS_DIR)/*.tflite \
-		$(DEPLOY_DIR)	
-
 deploy-css:
 	$(NODE_SASS) $(STYLES_MAIN) $(STYLES_BUNDLE) && \
-	$(CLEANCSS) --skip-rebase $(STYLES_BUNDLE) > $(STYLES_DESTINATION) ; \
+	$(CLEANCSS) $(STYLES_BUNDLE) > $(STYLES_DESTINATION) ; \
 	rm $(STYLES_BUNDLE)
 
 deploy-local:
 	([ ! -x deploy-local.sh ] || ./deploy-local.sh)
 
-.NOTPARALLEL:
-dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-libflac deploy-olm
-	$(WEBPACK_DEV_SERVER) --detect-circular-deps
+dev: deploy-init deploy-css deploy-lib-jitsi-meet deploy-libflac
+	$(WEBPACK_DEV_SERVER)
 
 source-package:
 	mkdir -p source_package/jitsi-meet/css && \
-	cp -r *.js *.html resources/*.txt connection_optimization favicon.ico fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
+	cp -r *.js *.html 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,22 +1,18 @@
 # 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](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).
+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).
 
-The Jitsi Meet client runs in your browser, without installing anything on your computer. You can try it out at https://meet.jit.si.
+The Jitsi Meet client runs in your browser, without installing anything on your computer. You can try it out at https://meet.jit.si .
 
-Jitsi Meet allows for very efficient collaboration. Users can stream their desktop or only some windows. It also supports shared document editing with Etherpad.
-
-**NOTE:** If you are looking for Jitsi as a Service (JaaS) please start [here](https://jaas.8x8.vc).
+Jitsi Meet allows very efficient collaboration. Users can stream their desktop or only some windows. It also supports shared document editing with Etherpad.
 
 ## Installation
 
 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://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).
+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).
 
-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).
+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).
 
 ## Download
 
@@ -31,32 +27,86 @@ You can download Debian/Ubuntu binaries:
 You can download source archives (produced by ```make source-package```):
 * [source builds](https://download.jitsi.org/jitsi-meet/src/)
 
-### Mobile apps
-
+You can get our mobile versions from here:
 * [Android](https://play.google.com/store/apps/details?id=org.jitsi.meet)
-
-[<img src="resources/img/google-play-badge.png" height="50">](https://play.google.com/store/apps/details?id=org.jitsi.meet)
-
-* [Android (F-Droid)](https://f-droid.org/en/packages/org.jitsi.meet/)
-
-[<img src="resources/img/f-droid-badge.png" height="50">](https://f-droid.org/en/packages/org.jitsi.meet/)
-
 * [iOS](https://itunes.apple.com/us/app/jitsi-meet/id1165103905)
 
-[<img src="resources/img/appstore-badge.png" height="50">](https://itunes.apple.com/us/app/jitsi-meet/id1165103905)
+## Building the sources
 
-You can also sign up for our open beta testing here:
+Node.js >= 10 and npm >= 6 are required.
 
-* [Android](https://play.google.com/apps/testing/org.jitsi.meet)
-* [iOS](https://testflight.apple.com/join/isy6ja7S)
+On Debian/Ubuntu systems, the required packages can be installed with:
+```
+sudo apt-get install npm nodejs
+cd jitsi-meet
+npm install
+```
 
-## Release notes
+To build the Jitsi Meet application, just type
+```
+make
+```
 
-Release notes for Jitsi Meet are maintained on [this repository](https://github.com/jitsi/jitsi-meet-release-notes).
+### Working with the library sources (lib-jitsi-meet)
 
-## Development
+By default the library is build from its git repository sources. The default dependency path in package.json is :
+```json
+"lib-jitsi-meet": "jitsi/lib-jitsi-meet",
+```
 
-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).
+To work with local copy you must change the path to:
+```json
+"lib-jitsi-meet": "file:///Users/name/local-lib-jitsi-meet-copy",
+```
+
+To make the project you must force it to take the sources as 'npm update':
+```
+npm install lib-jitsi-meet --force && make
+```
+
+Or if you are making only changes to the library:
+```
+npm install lib-jitsi-meet --force && make deploy-lib-jitsi-meet
+```
+
+Alternative way is to use [npm link](https://docs.npmjs.com/cli/link).
+It allows to link `lib-jitsi-meet` dependency to local source in few steps:
+
+```bash
+cd lib-jitsi-meet
+
+#### create global symlink for lib-jitsi-meet package
+npm link
+
+cd ../jitsi-meet
+
+#### create symlink from the local node_modules folder to the global lib-jitsi-meet symlink
+npm link lib-jitsi-meet
+```
+
+ After changes in local `lib-jitsi-meet` repository, you can rebuild it with `npm run install` and your `jitsi-meet` repository will use that modified library.
+Note: when using node version 4.x, the make file of jitsi-meet do npm update which will delete the link. It is no longer the case with version 6.x.
+
+If you do not want to use local repository anymore you should run
+```bash
+cd jitsi-meet
+npm unlink lib-jitsi-meet
+npm install
+```
+### Running with webpack-dev-server for development
+
+Use it at the CLI, type
+```
+make dev
+```
+
+By default the backend deployment used is `beta.meet.jit.si`. You can point the Jitsi-Meet app at a different backend by using a proxy server. To do this, set the WEBPACK_DEV_SERVER_PROXY_TARGET variable:
+```
+export WEBPACK_DEV_SERVER_PROXY_TARGET=https://your-example-server.com
+make dev
+```
+
+The app should be running at https://localhost:8080/
 
 ## Contributing
 
@@ -68,14 +118,21 @@ see our [guidelines for contributing](CONTRIBUTING.md).
 Jitsi Meet provides a very flexible way of embedding in external applications by using the [Jitsi Meet API](doc/api.md).
 
 ## Security
+WebRTC does not 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 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
+The [meet.jit.si](https://meet.jit.si) service is maintained by the Jitsi team
+at [8x8](https://8x8.com).
 
-## Security issues
-
-For information on reporting security vulnerabilities in Jitsi Meet, see [SECURITY.md](./SECURITY.md).
+## Mobile app
+Jitsi Meet is also available as a React Native app for Android and iOS.
+Instructions on how to build it can be found [here](doc/mobile.md).
 
 ## Acknowledgements
 

SECURITY.md

@@ -1,9 +0,0 @@
-# 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,3 +1,380 @@
 # Jitsi Meet SDK for Android
 
-This document has been moved to [The Handbook](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-android-sdk).
+## 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>
+```

android/app/build.gradle

@@ -1,25 +1,24 @@
 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: 'com.google.firebase.crashlytics'
+    apply plugin: 'io.fabric'
 }
 
 // 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
@@ -33,23 +32,12 @@ android {
         }
     }
 
-    signingConfigs {
-        debug {
-            storeFile file('debug.keystore')
-            storePassword 'android'
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-        }
-    }
-
     buildTypes {
         debug {
             buildConfigField "boolean", "GOOGLE_SERVICES_ENABLED", "${googleServicesEnabled}"
             buildConfigField "boolean", "LIBRE_BUILD", "${rootProject.ext.libreBuild}"
         }
         release {
-            // Uncomment the following line for singing a test release build.
-            //signingConfig signingConfigs.debug
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules-release.pro'
             buildConfigField "boolean", "GOOGLE_SERVICES_ENABLED", "${googleServicesEnabled}"
@@ -74,11 +62,14 @@ android {
     }
 }
 
+repositories {
+    maven { url 'https://maven.fabric.io/public' }
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
 
     if (!rootProject.ext.libreBuild) {
         implementation 'com.google.android.gms:play-services-auth:16.0.1'
@@ -86,12 +77,15 @@ dependencies {
         // Firebase
         //  - Crashlytics
         //  - Dynamic Links
-        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 '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 project(':sdk')
+
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.1'
+    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.1'
 }
 
 gradle.projectsEvaluated {
@@ -122,7 +116,7 @@ gradle.projectsEvaluated {
         android.applicationVariants.all { variant ->
             variant.outputs.each { output ->
                 output.getProcessManifestProvider().get().doLast {
-                    def outputDir = multiApkManifestOutputDirectory.get().asFile
+                    def outputDir = manifestOutputDirectory.get().asFile
                     def manifestPath = new File(outputDir, 'AndroidManifest.xml')
                     def charset = 'UTF-8'
                     def text
@@ -139,8 +133,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."
 
@@ -171,5 +165,5 @@ gradle.projectsEvaluated {
 }
 
 if (googleServicesEnabled) {
-    apply plugin: 'com.google.gms.google-services'
+   apply plugin: 'com.google.gms.google-services'
 }

android/app/src/main/AndroidManifest.xml

@@ -1,16 +1,13 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.jitsi.meet"
-    android:installLocation="auto">
+    package="org.jitsi.meet">
   <application
       android:allowBackup="true"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
+      android:name=".MainApplication"
       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.google.firebase.crashlytics.FirebaseCrashlytics;
+import com.crashlytics.android.Crashlytics;
 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,7 +21,8 @@ final class GoogleServicesHelper {
         if (BuildConfig.GOOGLE_SERVICES_ENABLED) {
             Log.d(activity.getClass().getSimpleName(), "Initializing Google Services");
 
-            FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!JitsiMeet.isCrashReportingDisabled(activity));
+            Fabric.with(activity, new Crashlytics());
+
             FirebaseDynamicLinks.getInstance().getDynamicLink(activity.getIntent())
                 .addOnSuccessListener(activity, pendingDynamicLinkData -> {
                     Uri dynamicLink = null;

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

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +17,12 @@
 
 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.Bundle;
+import android.os.Build;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.KeyEvent;
-
 import androidx.annotation.Nullable;
 
 import org.jitsi.meet.sdk.JitsiMeet;
@@ -37,8 +32,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.HashMap;
+import java.util.Map;
 
 /**
  * The one and only Activity that the Jitsi Meet app needs. The
@@ -55,36 +49,9 @@ 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);
@@ -102,7 +69,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 (!Settings.canDrawOverlays(this)) {
+            if (canRequestOverlayPermission() && !Settings.canDrawOverlays(this)) {
                 Intent intent
                     = new Intent(
                     Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
@@ -119,72 +86,20 @@ 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));
+        // Set default options
+        JitsiMeetConferenceOptions defaultOptions
+            = new JitsiMeetConferenceOptions.Builder()
+                .setWelcomePageEnabled(true)
+                .setServerURL(buildURL("https://meet.jit.si"))
+                .build();
+        JitsiMeet.setDefaultConferenceOptions(defaultOptions);
 
-        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(defaultURL))
-            .setFeatureFlag("call-integration.enabled", false)
-            .setFeatureFlag("resolution", 360)
-            .setFeatureFlag("server-url-change.enabled", !configurationByRestrictions)
-            .build();
-        JitsiMeet.setDefaultConferenceOptions(defaultOptions);
-    }
-
-    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
-    protected void onConferenceTerminated(HashMap<String, Object> extraData) {
-        Log.d(TAG, "Conference terminated: " + extraData);
+    public void onConferenceTerminated(Map<String, Object> data) {
+        Log.d(TAG, "Conference terminated: " + data);
     }
 
     // Activity lifecycle method overrides
@@ -192,7 +107,8 @@ public class MainActivity extends JitsiMeetActivity {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE) {
+        if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE
+                && canRequestOverlayPermission()) {
             if (Settings.canDrawOverlays(this)) {
                 initialize();
                 return;
@@ -215,18 +131,6 @@ 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
     //
 
@@ -237,4 +141,10 @@ 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/java/org/jitsi/meet/MainApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2021-present 8x8, Inc.
+ * Copyright @ 2018-present Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,23 @@
  * limitations under the License.
  */
 
-#import <Foundation/Foundation.h>
+package org.jitsi.meet;
 
-NS_ASSUME_NONNULL_BEGIN
+import android.app.Application;
 
-@interface ScheenshareEventEmiter : NSObject
+import com.squareup.leakcanary.LeakCanary;
 
-@end
+/**
+ * Simple {@link Application} for hooking up LeakCanary:
+ * https://github.com/square/leakcanary
+ */
+public class MainApplication extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
 
-NS_ASSUME_NONNULL_END
+        if (!LeakCanary.isInAnalyzerProcess(this)) {
+            LeakCanary.install(this);
+        }
+    }
+}

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

@@ -1,70 +0,0 @@
-<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

@@ -1,11 +0,0 @@
-<?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

@@ -1,5 +0,0 @@
-<?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,5 +1,3 @@
 <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">@color/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">#1081B2</item>
     </style>
 </resources>

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

@@ -1,11 +0,0 @@
-<?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,12 +1,6 @@
-<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>
+    <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,5 +1,4 @@
 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.
@@ -8,38 +7,20 @@ buildscript {
     repositories {
         google()
         jcenter()
+        repositories {
+            maven { url 'https://maven.fabric.io/public' }
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
-        classpath 'com.google.gms:google-services:4.3.4'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'io.fabric.tools:gradle:1.27.0'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files.
     }
 }
 
-ext {
-    buildToolsVersion = "30.0.3"
-    compileSdkVersion = 30
-    minSdkVersion    = 23
-    targetSdkVersion = 30
-    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()
@@ -162,6 +143,72 @@ 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()
+}
+
+// If Android SDK is not installed, accept its license so that it
+// is automatically downloaded.
+afterEvaluate { project ->
+    // Either the environment variable ANDROID_HOME or the property sdk.dir in
+    // local.properties identifies where Android SDK is installed.
+    def androidHome = System.env.ANDROID_HOME
+    if (!androidHome) {
+        // ANDROID_HOME is not set. Is sdk.dir set?
+        def file = file("${project.rootDir}/local.properties")
+        def props = new Properties()
+        if (file.canRead()) {
+            file.withInputStream {
+                props.load(it)
+                androidHome = props.'sdk.dir'
+            }
+        }
+        if (!androidHome && (!file.exists() || file.canWrite())) {
+            // Neither ANDROID_HOME nor sdk.dir is set. Set sdk.dir (because
+            // environment variables cannot be set).
+            props.'sdk.dir' = "${project.buildDir}/android-sdk".toString()
+            file.withOutputStream {
+                props.store(it, null)
+                androidHome = props.'sdk.dir'
+            }
+        }
+    }
+    // If the license is not accepted, accept it so that automatic downloading
+    // kicks in.
+    // The license hash can be taken from the accepted licenses, by doing this
+    // on your local machine the file is
+    // ${androidHome}/licenses/android-sdk-license
+    if (androidHome) {
+        def dir = file("${androidHome}/licenses")
+        dir.mkdirs()
+        def file = file("${dir.path}/android-sdk-license")
+        if (!file.exists()) {
+            file.withWriter {
+                def hash = 'd56f5187479451eabf01fb78af6dfcb131a6481e'
+                it.write(hash, 0, hash.length())
+            }
+        }
+    }
+}
+
 // 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/fastlane/Fastfile

@@ -24,7 +24,7 @@ platform :android do
 
         # Upload built artifact to the Closed Beta track
         upload_to_play_store(
-            track: "beta",
+            track: "Closed Beta",
             json_key: ENV["JITSI_JSON_KEY_FILE"],
             skip_upload_metadata: true,
             skip_upload_images: true,

android/gradle.properties

@@ -10,20 +10,15 @@
 # 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=21.2.0
-sdkVersion=3.7.0
+appVersion=19.3.1
+sdkVersion=2.3.2

android/gradle/wrapper/gradle-wrapper.properties

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

android/scripts/release-sdk.sh

@@ -9,8 +9,8 @@ THE_MVN_REPO=${MVN_REPO:-${1:-$DEFAULT_MVN_REPO}}
 MVN_HTTP=0
 DEFAULT_SDK_VERSION=$(grep sdkVersion ${THIS_DIR}/../gradle.properties | cut -d"=" -f2)
 SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
-RN_VERSION=$(jq -r '.version' ${THIS_DIR}/../../node_modules/react-native/package.json)
-JSC_VERSION="r"$(jq -r '.dependencies."jsc-android"' ${THIS_DIR}/../../node_modules/react-native/package.json | cut -d . -f 1 | cut -c 2-)
+RN_VERSION=$(jq -r '.dependencies."react-native"' ${THIS_DIR}/../../package.json)
+JSC_VERSION="r"$(jq -r '.dependencies."jsc-android"' ${THIS_DIR}/../../node_modules/react-native/package.json | cut -d . -f 1)
 DO_GIT_TAG=${GIT_TAG:-0}
 
 if [[ $THE_MVN_REPO == http* ]]; then
@@ -89,9 +89,7 @@ fi
 # Now build and publish the Jitsi Meet SDK and its dependencies
 echo "Building and publishing the Jitsi Meet SDK"
 pushd ${THIS_DIR}/../
-./gradlew clean 
-./gradlew assembleRelease 
-./gradlew publish
+./gradlew clean assembleRelease publish
 popd
 
 if [[ $DO_GIT_TAG == 1 ]]; then

android/scripts/run-packager-helper.command

@@ -1,5 +0,0 @@
-#!/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:$RCT_METRO_PORT tcp:$RCT_METRO_PORT
+adb reverse tcp:8081 tcp:8081
 
 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,10 +16,11 @@ if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then
     exit 2
   fi
 else
-    CMD="$THIS_DIR/run-packager-helper.command"
+    CMD="${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.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

@@ -12,19 +12,21 @@ 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}"
         }
     }
 
     sourceSets {
         main {
             java {
+                if (rootProject.ext.libreBuild) {
+                    srcDir "src"
+                    exclude "**/AmplitudeModule.java"
+                }
                 exclude "test/"
             }
         }
@@ -34,45 +36,32 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.fragment:fragment:1.2.5'
-    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.fragment:fragment:1.0.0'
 
-    //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
-    //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'
-    implementation 'com.squareup.duktape:duktape-android:1.3.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
 
-    if (rootProject.ext.libreBuild) {
-        implementation(project(':react-native-device-info')) {
-            exclude group: 'com.google.firebase'
-            exclude group: 'com.google.android.gms'
-            exclude group: 'com.android.installreferrer'
-        }
-    } else {
-        implementation project(':react-native-device-info')
+    if (!rootProject.ext.libreBuild) {
+        implementation 'com.amplitude:android-sdk:2.14.1'
         implementation(project(":react-native-google-signin")) {
             exclude group: 'com.google.android.gms'
             exclude group: 'androidx'
         }
     }
 
-    implementation project(':react-native-async-storage')
     implementation project(':react-native-background-timer')
     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-slider')
+    implementation project(':react-native-linear-gradient')
     implementation project(':react-native-sound')
-    implementation project(':react-native-splash-screen')
     implementation project(':react-native-svg')
     implementation project(':react-native-webrtc')
     implementation project(':react-native-webview')
@@ -149,7 +138,7 @@ android.libraryVariants.all { def variant ->
     mergeResourcesTask.dependsOn(currentBundleTask)
 
     mergeAssetsTask.doLast {
-        def assetsDir = mergeAssetsTask.outputDir.get()
+        def assetsDir = mergeAssetsTask.outputDir
 
         // Bundle sounds
         //
@@ -183,7 +172,7 @@ android.libraryVariants.all { def variant ->
         if (currentBundleTask.enabled) {
             copy {
                 from(resourcesDir)
-                into(mergeResourcesTask.outputDir.get())
+                into(mergeResourcesTask.outputDir)
             }
         }
     }

android/sdk/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="org.jitsi.meet.sdk">
     <!-- XXX ACCESS_NETWORK_STATE is required by WebRTC. -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -13,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"
@@ -35,28 +34,19 @@
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true"
-            android:windowSoftInputMode="adjustResize"/>
+            android:windowSoftInputMode="adjustResize">
+        </activity>
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
 
         <service
             android:name=".ConnectionService"
-            android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
-            android:exported="true">
+            android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE">
             <intent-filter>
                 <action android:name="android.telecom.ConnectionService" />
             </intent-filter>
         </service>
 
-        <service
-            android:name="org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService"
-            android:foregroundServiceType="mediaProjection" />
-
-        <provider
-            android:name="com.reactnativecommunity.webview.RNCWebViewFileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:enabled="false"
-            tools:replace="android:authorities">
-        </provider>
+        <service android:name="org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService" />
     </application>
 
 </manifest>

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

@@ -0,0 +1,102 @@
+/*
+ * Copyright @ 2019-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 com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+
+import com.amplitude.api.Amplitude;
+import com.facebook.react.module.annotations.ReactModule;
+
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Implements the react-native module for the Amplitude integration.
+ */
+@ReactModule(name = AmplitudeModule.NAME)
+class AmplitudeModule
+        extends ReactContextBaseJavaModule {
+
+    public static final String NAME = "Amplitude";
+
+    public AmplitudeModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    /**
+     * Initializes the Amplitude SDK.
+     *
+     * @param instanceName The name of the Amplitude instance. Should
+     * be used only for multi-project logging.
+     * @param apiKey The API_KEY of the Amplitude project.
+     */
+    @ReactMethod
+    public void init(String instanceName, String apiKey) {
+        Amplitude.getInstance(instanceName).initialize(getCurrentActivity(), apiKey);
+    }
+
+    /**
+     * Sets the user ID for an Amplitude instance.
+     *
+     * @param instanceName The name of the Amplitude instance.
+     * @param userId The new value for the user ID.
+     */
+    @ReactMethod
+    public void setUserId(String instanceName, String userId) {
+            Amplitude.getInstance(instanceName).setUserId(userId);
+    }
+
+    /**
+     * Sets the user properties for an Amplitude instance.
+     *
+     * @param instanceName The name of the Amplitude instance.
+     * @param userProps JSON string with user properties to be set.
+     */
+    @ReactMethod
+    public void setUserProperties(String instanceName, ReadableMap userProps) {
+        if (userProps != null) {
+            Amplitude.getInstance(instanceName).setUserProperties(
+                    new JSONObject(userProps.toHashMap()));
+        }
+    }
+
+    /**
+     * Log an analytics event.
+     *
+     * @param instanceName The name of the Amplitude instance.
+     * @param eventType The event type.
+     * @param eventPropsString JSON string with the event properties.
+     */
+    @ReactMethod
+    public void logEvent(String instanceName, String eventType, String eventPropsString) {
+        try {
+            JSONObject eventProps = new JSONObject(eventPropsString);
+            Amplitude.getInstance(instanceName).logEvent(eventType, eventProps);
+        } catch (JSONException e) {
+            JitsiMeetLogger.e(e, "Error logging event");
+        }
+    }
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+}

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

@@ -76,7 +76,6 @@ 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/AudioDeviceHandlerConnectionService.java

@@ -1,183 +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.Context;
-import android.media.AudioManager;
-import android.os.Build;
-import android.telecom.CallAudioState;
-import androidx.annotation.RequiresApi;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-
-/**
- * {@link AudioModeModule.AudioDeviceHandlerInterface} module implementing device handling for
- * Android versions >= O when ConnectionService is enabled.
- */
-@RequiresApi(Build.VERSION_CODES.O)
-class AudioDeviceHandlerConnectionService implements
-        AudioModeModule.AudioDeviceHandlerInterface,
-        RNConnectionService.CallAudioStateListener {
-
-    private final static String TAG = AudioDeviceHandlerConnectionService.class.getSimpleName();
-
-    /**
-     * {@link AudioManager} instance used to interact with the Android audio subsystem.
-     */
-    private AudioManager audioManager;
-
-    /**
-     * Reference to the main {@code AudioModeModule}.
-     */
-    private AudioModeModule module;
-
-    /**
-     * Converts any of the "DEVICE_" constants into the corresponding
-     * {@link android.telecom.CallAudioState} "ROUTE_" number.
-     *
-     * @param audioDevice one of the "DEVICE_" constants.
-     * @return a route number {@link android.telecom.CallAudioState#ROUTE_EARPIECE} if
-     * no match is found.
-     */
-    private static int audioDeviceToRouteInt(String audioDevice) {
-        if (audioDevice == null) {
-            return CallAudioState.ROUTE_SPEAKER;
-        }
-        switch (audioDevice) {
-            case AudioModeModule.DEVICE_BLUETOOTH:
-                return CallAudioState.ROUTE_BLUETOOTH;
-            case AudioModeModule.DEVICE_EARPIECE:
-                return CallAudioState.ROUTE_EARPIECE;
-            case AudioModeModule.DEVICE_HEADPHONES:
-                return CallAudioState.ROUTE_WIRED_HEADSET;
-            case AudioModeModule.DEVICE_SPEAKER:
-                return CallAudioState.ROUTE_SPEAKER;
-            default:
-                JitsiMeetLogger.e(TAG + " Unsupported device name: " + audioDevice);
-                return CallAudioState.ROUTE_SPEAKER;
-        }
-    }
-
-    /**
-     * Populates given route mask into the "DEVICE_" list.
-     *
-     * @param supportedRouteMask an integer coming from
-     * {@link android.telecom.CallAudioState#getSupportedRouteMask()}.
-     * @return a list of device names.
-     */
-    private static Set<String> routesToDeviceNames(int supportedRouteMask) {
-        Set<String> devices = new HashSet<>();
-        if ((supportedRouteMask & CallAudioState.ROUTE_EARPIECE) == CallAudioState.ROUTE_EARPIECE) {
-            devices.add(AudioModeModule.DEVICE_EARPIECE);
-        }
-        if ((supportedRouteMask & CallAudioState.ROUTE_BLUETOOTH) == CallAudioState.ROUTE_BLUETOOTH) {
-            devices.add(AudioModeModule.DEVICE_BLUETOOTH);
-        }
-        if ((supportedRouteMask & CallAudioState.ROUTE_SPEAKER) == CallAudioState.ROUTE_SPEAKER) {
-            devices.add(AudioModeModule.DEVICE_SPEAKER);
-        }
-        if ((supportedRouteMask & CallAudioState.ROUTE_WIRED_HEADSET) == CallAudioState.ROUTE_WIRED_HEADSET) {
-            devices.add(AudioModeModule.DEVICE_HEADPHONES);
-        }
-        return devices;
-    }
-
-    /**
-     * Used to store the most recently reported audio devices.
-     * Makes it easier to compare for a change, because the devices are stored
-     * as a mask in the {@link android.telecom.CallAudioState}. The mask is populated into
-     * the {@code availableDevices} on each update.
-     */
-    private int supportedRouteMask = -1;
-
-    public AudioDeviceHandlerConnectionService(AudioManager audioManager) {
-        this.audioManager = audioManager;
-    }
-
-    @Override
-    public void onCallAudioStateChange(final CallAudioState state) {
-        module.runInAudioThread(new Runnable() {
-            @Override
-            public void run() {
-                boolean audioRouteChanged
-                    = audioDeviceToRouteInt(module.getSelectedDevice()) != state.getRoute();
-                int newSupportedRoutes = state.getSupportedRouteMask();
-                boolean audioDevicesChanged = supportedRouteMask != newSupportedRoutes;
-                if (audioDevicesChanged) {
-                    supportedRouteMask = newSupportedRoutes;
-                    Set<String> devices = routesToDeviceNames(supportedRouteMask);
-                    module.replaceDevices(devices);
-                    JitsiMeetLogger.i(TAG + " Available audio devices: " + devices.toString());
-                }
-
-                if (audioRouteChanged || audioDevicesChanged) {
-                    module.resetSelectedDevice();
-                    module.updateAudioRoute();
-                }
-            }
-        });
-    }
-
-    @Override
-    public void start(AudioModeModule audioModeModule) {
-        JitsiMeetLogger.i("Using " + TAG + " as the audio device handler");
-
-        module = audioModeModule;
-
-        RNConnectionService rcs = ReactInstanceManagerHolder.getNativeModule(RNConnectionService.class);
-        if (rcs != null) {
-            rcs.setCallAudioStateListener(this);
-        } else {
-            JitsiMeetLogger.w(TAG + " Couldn't set call audio state listener, module is null");
-        }
-    }
-
-    @Override
-    public void stop() {
-        RNConnectionService rcs = ReactInstanceManagerHolder.getNativeModule(RNConnectionService.class);
-        if (rcs != null) {
-            rcs.setCallAudioStateListener(null);
-        } else {
-            JitsiMeetLogger.w(TAG + " Couldn't set call audio state listener, module is null");
-        }
-    }
-
-    public void setAudioRoute(String audioDevice) {
-        int newAudioRoute = audioDeviceToRouteInt(audioDevice);
-
-        RNConnectionService.setAudioRoute(newAudioRoute);
-    }
-
-    @Override
-    public boolean setMode(int mode) {
-        if (mode != AudioModeModule.DEFAULT) {
-            // This shouldn't be needed when using ConnectionService, but some devices have been
-            // observed not doing it.
-            try {
-                audioManager.setMicrophoneMute(false);
-            } catch (Throwable tr) {
-                JitsiMeetLogger.w(tr, TAG + " Failed to unmute the microphone");
-            }
-        }
-
-        return true;
-    }
-}

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

@@ -1,246 +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.media.AudioAttributes;
-import android.media.AudioDeviceInfo;
-import android.media.AudioFocusRequest;
-import android.media.AudioManager;
-import android.os.Build;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-
-/**
- * {@link AudioModeModule.AudioDeviceHandlerInterface} module implementing device handling for
- * all post-M Android versions. This handler can be used on any Android versions >= M, but by
- * default it's only used on versions < O, since versions >= O use ConnectionService, but it
- * can be disabled.
- */
-class AudioDeviceHandlerGeneric implements
-        AudioModeModule.AudioDeviceHandlerInterface,
-        AudioManager.OnAudioFocusChangeListener {
-
-    private final static String TAG = AudioDeviceHandlerGeneric.class.getSimpleName();
-
-    /**
-     * Reference to the main {@code AudioModeModule}.
-     */
-    private AudioModeModule module;
-
-    /**
-     * Constant defining a USB headset. Only available on API level >= 26.
-     * The value of: AudioDeviceInfo.TYPE_USB_HEADSET
-     */
-    private static final int TYPE_USB_HEADSET = 22;
-
-    /**
-     * 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 Runnable} for running audio device detection in the audio thread.
-     * This is only used on Android >= M.
-     */
-    private final Runnable onAudioDeviceChangeRunner = new Runnable() {
-        @Override
-        public void run() {
-            Set<String> devices = new HashSet<>();
-            AudioDeviceInfo[] deviceInfos = audioManager.getDevices(AudioManager.GET_DEVICES_ALL);
-
-            for (AudioDeviceInfo info: deviceInfos) {
-                switch (info.getType()) {
-                    case AudioDeviceInfo.TYPE_BLUETOOTH_SCO:
-                        devices.add(AudioModeModule.DEVICE_BLUETOOTH);
-                        break;
-                    case AudioDeviceInfo.TYPE_BUILTIN_EARPIECE:
-                        devices.add(AudioModeModule.DEVICE_EARPIECE);
-                        break;
-                    case AudioDeviceInfo.TYPE_BUILTIN_SPEAKER:
-                        devices.add(AudioModeModule.DEVICE_SPEAKER);
-                        break;
-                    case AudioDeviceInfo.TYPE_WIRED_HEADPHONES:
-                    case AudioDeviceInfo.TYPE_WIRED_HEADSET:
-                    case TYPE_USB_HEADSET:
-                        devices.add(AudioModeModule.DEVICE_HEADPHONES);
-                        break;
-                }
-            }
-
-            module.replaceDevices(devices);
-
-            JitsiMeetLogger.i(TAG + " Available audio devices: " + devices.toString());
-
-            module.updateAudioRoute();
-        }
-    };
-
-    private final android.media.AudioDeviceCallback audioDeviceCallback =
-        new android.media.AudioDeviceCallback() {
-            @Override
-            public void onAudioDevicesAdded(
-                AudioDeviceInfo[] addedDevices) {
-                JitsiMeetLogger.d(TAG + " Audio devices added");
-                onAudioDeviceChange();
-            }
-
-            @Override
-            public void onAudioDevicesRemoved(
-                AudioDeviceInfo[] removedDevices) {
-                JitsiMeetLogger.d(TAG + " Audio devices removed");
-                onAudioDeviceChange();
-            }
-        };
-
-    public AudioDeviceHandlerGeneric(AudioManager audioManager) {
-        this.audioManager = audioManager;
-    }
-
-    /**
-     * Helper method to trigger an audio route update when devices change. It
-     * makes sure the operation is performed on the audio thread.
-     */
-    private void onAudioDeviceChange() {
-        module.runInAudioThread(onAudioDeviceChangeRunner);
-    }
-
-    /**
-     * {@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.resetAudioRoute();
-                        }
-                        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;
-
-        // Setup runtime device change detection.
-        audioManager.registerAudioDeviceCallback(audioDeviceCallback, null);
-
-        // Do an initial detection.
-        onAudioDeviceChange();
-    }
-
-    @Override
-    public void stop() {
-        audioManager.unregisterAudioDeviceCallback(audioDeviceCallback);
-    }
-
-    @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);
-
-        int gotFocus;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            gotFocus = audioManager.requestAudioFocus(new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
-                .setAudioAttributes(
-                    new AudioAttributes.Builder()
-                        .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
-                        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-                        .build()
-                )
-                .setAcceptsDelayedFocusGain(true)
-                .setOnAudioFocusChangeListener(this)
-                .build()
-            );
-        } else {
-            gotFocus = audioManager.requestAudioFocus(this, AudioManager.STREAM_VOICE_CALL, AudioManager.AUDIOFOCUS_GAIN);
-        }
-
-        if (gotFocus == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
-            JitsiMeetLogger.w(TAG + " Audio focus request failed");
-            return false;
-        }
-
-        return true;
-    }
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2017-present Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,16 @@
 
 package org.jitsi.meet.sdk;
 
-import android.app.Activity;
+import android.annotation.TargetApi;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.os.Build;
+import androidx.annotation.RequiresApi;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
@@ -55,7 +61,9 @@ import java.util.concurrent.Executors;
  * {@code AudioModeModule.DEFAULT} mode should be used.
  */
 @ReactModule(name = AudioModeModule.NAME)
-class AudioModeModule extends ReactContextBaseJavaModule {
+class AudioModeModule extends ReactContextBaseJavaModule
+    implements AudioManager.OnAudioFocusChangeListener {
+
     public static final String NAME = "AudioMode";
 
     /**
@@ -67,39 +75,161 @@ class AudioModeModule extends ReactContextBaseJavaModule {
      * - VIDEO_CALL: Used for video calls. It will use the speaker by default,
      *   unless a wired or Bluetooth headset is connected.
      */
-    static final int DEFAULT    = 0;
-    static final int AUDIO_CALL = 1;
-    static final int VIDEO_CALL = 2;
+    private static final int DEFAULT    = 0;
+    private static final int AUDIO_CALL = 1;
+    private static final int VIDEO_CALL = 2;
+
+    /**
+     * Constant defining the action for plugging in a headset. This is used on
+     * our device detection system for API < 23.
+     */
+    private static final String ACTION_HEADSET_PLUG
+        = (Build.VERSION.SDK_INT >= 21)
+            ? AudioManager.ACTION_HEADSET_PLUG
+            : Intent.ACTION_HEADSET_PLUG;
+
+    /**
+     * Constant defining a USB headset. Only available on API level >= 26.
+     * The value of: AudioDeviceInfo.TYPE_USB_HEADSET
+     */
+    private static final int TYPE_USB_HEADSET = 22;
 
     /**
      * The {@code Log} tag {@code AudioModeModule} is to log messages with.
      */
     static final String TAG = NAME;
 
+    /**
+     * Converts any of the "DEVICE_" constants into the corresponding
+     * {@link android.telecom.CallAudioState} "ROUTE_" number.
+     *
+     * @param audioDevice one of the "DEVICE_" constants.
+     * @return a route number {@link android.telecom.CallAudioState#ROUTE_EARPIECE} if
+     * no match is found.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private static int audioDeviceToRouteInt(String audioDevice) {
+        if (audioDevice == null) {
+            return android.telecom.CallAudioState.ROUTE_EARPIECE;
+        }
+        switch (audioDevice) {
+            case DEVICE_BLUETOOTH:
+                return android.telecom.CallAudioState.ROUTE_BLUETOOTH;
+            case DEVICE_EARPIECE:
+                return android.telecom.CallAudioState.ROUTE_EARPIECE;
+            case DEVICE_HEADPHONES:
+                return android.telecom.CallAudioState.ROUTE_WIRED_HEADSET;
+            case DEVICE_SPEAKER:
+                return android.telecom.CallAudioState.ROUTE_SPEAKER;
+            default:
+                JitsiMeetLogger.e(TAG + " Unsupported device name: " + audioDevice);
+                return android.telecom.CallAudioState.ROUTE_EARPIECE;
+        }
+    }
+
+    /**
+     * Populates given route mask into the "DEVICE_" list.
+     *
+     * @param supportedRouteMask an integer coming from
+     * {@link android.telecom.CallAudioState#getSupportedRouteMask()}.
+     * @return a list of device names.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private static Set<String> routesToDeviceNames(int supportedRouteMask) {
+        Set<String> devices = new HashSet<>();
+        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_EARPIECE)
+                == android.telecom.CallAudioState.ROUTE_EARPIECE) {
+            devices.add(DEVICE_EARPIECE);
+        }
+        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_BLUETOOTH)
+                == android.telecom.CallAudioState.ROUTE_BLUETOOTH) {
+            devices.add(DEVICE_BLUETOOTH);
+        }
+        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_SPEAKER)
+                == android.telecom.CallAudioState.ROUTE_SPEAKER) {
+            devices.add(DEVICE_SPEAKER);
+        }
+        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_WIRED_HEADSET)
+                == android.telecom.CallAudioState.ROUTE_WIRED_HEADSET) {
+            devices.add(DEVICE_HEADPHONES);
+        }
+        return devices;
+    }
+
     /**
      * Whether or not the ConnectionService is used for selecting audio devices.
      */
-
-    private static final boolean supportsConnectionService = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-    private static boolean useConnectionService_ = supportsConnectionService;
-
     static boolean useConnectionService() {
-        return supportsConnectionService && useConnectionService_;
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
     }
 
+    /**
+     * 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;
+    private final AudioManager audioManager;
 
-    private AudioDeviceHandlerInterface audioDeviceHandler;
+    /**
+     * {@link BluetoothHeadsetMonitor} for detecting Bluetooth device changes in
+     * old (< M) Android versions.
+     */
+    private BluetoothHeadsetMonitor bluetoothHeadsetMonitor;
 
     /**
      * {@link ExecutorService} for running all audio operations on a dedicated
      * thread.
      */
-    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
+    private static final ExecutorService executor
+        = Executors.newSingleThreadExecutor();
+
+    /**
+     * {@link Runnable} for running audio device detection the main thread.
+     * This is only used on Android >= M.
+     */
+    private final Runnable onAudioDeviceChangeRunner = new Runnable() {
+        @TargetApi(Build.VERSION_CODES.M)
+        @Override
+        public void run() {
+            Set<String> devices = new HashSet<>();
+            AudioDeviceInfo[] deviceInfos
+                = audioManager.getDevices(AudioManager.GET_DEVICES_ALL);
+
+            for (AudioDeviceInfo info: deviceInfos) {
+                switch (info.getType()) {
+                case AudioDeviceInfo.TYPE_BLUETOOTH_SCO:
+                    devices.add(DEVICE_BLUETOOTH);
+                    break;
+                case AudioDeviceInfo.TYPE_BUILTIN_EARPIECE:
+                    devices.add(DEVICE_EARPIECE);
+                    break;
+                case AudioDeviceInfo.TYPE_BUILTIN_SPEAKER:
+                    devices.add(DEVICE_SPEAKER);
+                    break;
+                case AudioDeviceInfo.TYPE_WIRED_HEADPHONES:
+                case AudioDeviceInfo.TYPE_WIRED_HEADSET:
+                case TYPE_USB_HEADSET:
+                    devices.add(DEVICE_HEADPHONES);
+                    break;
+                }
+            }
+
+            availableDevices = devices;
+            JitsiMeetLogger.i(TAG + " Available audio devices: " +
+                availableDevices.toString());
+
+            // Reset user selection
+            userSelectedDevice = null;
+
+            if (mode != -1) {
+                updateAudioRoute(mode);
+            }
+        }
+    };
 
     /**
      * Audio mode currently in use.
@@ -109,10 +239,10 @@ class AudioModeModule extends ReactContextBaseJavaModule {
     /**
      * Audio device types.
      */
-    static final String DEVICE_BLUETOOTH  = "BLUETOOTH";
-    static final String DEVICE_EARPIECE   = "EARPIECE";
-    static final String DEVICE_HEADPHONES = "HEADPHONES";
-    static final String DEVICE_SPEAKER    = "SPEAKER";
+    private static final String DEVICE_BLUETOOTH  = "BLUETOOTH";
+    private static final String DEVICE_EARPIECE   = "EARPIECE";
+    private static final String DEVICE_HEADPHONES = "HEADPHONES";
+    private static final String DEVICE_SPEAKER    = "SPEAKER";
 
     /**
      * Device change event.
@@ -129,6 +259,15 @@ class AudioModeModule extends ReactContextBaseJavaModule {
      */
     private String selectedDevice;
 
+    /**
+     * Used on API >= 26 to store the most recently reported audio devices.
+     * Makes it easier to compare for a change, because the devices are stored
+     * as a mask in the {@link android.telecom.CallAudioState}. The mask is populated into
+     * the {@link #availableDevices} on each update.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private int supportedRouteMask;
+
     /**
      * User selected device. When null the default is used depending on the
      * mode.
@@ -145,7 +284,30 @@ class AudioModeModule extends ReactContextBaseJavaModule {
     public AudioModeModule(ReactApplicationContext reactContext) {
         super(reactContext);
 
-        audioManager = (AudioManager)reactContext.getSystemService(Context.AUDIO_SERVICE);
+        audioManager
+            = (AudioManager)
+                reactContext.getSystemService(Context.AUDIO_SERVICE);
+
+        // Starting Oreo the ConnectionImpl from ConnectionService is used to
+        // detect the available devices.
+        if (!useConnectionService()) {
+            // Setup runtime device change detection.
+            setupAudioRouteChangeDetection();
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                // Do an initial detection on Android >= M.
+                onAudioDeviceChange();
+            } else {
+                // On Android < M, detect if we have an earpiece.
+                PackageManager pm = reactContext.getPackageManager();
+                if (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+                    availableDevices.add(DEVICE_EARPIECE);
+                }
+
+                // Always assume there is a speaker.
+                availableDevices.add(DEVICE_SPEAKER);
+            }
+        }
     }
 
     /**
@@ -202,39 +364,132 @@ class AudioModeModule extends ReactContextBaseJavaModule {
     }
 
     /**
-     * Initializes the audio device handler module. This function is called *after* all Catalyst
-     * modules have been created, and that's why we use it, because {@link AudioDeviceHandlerConnectionService}
-     * needs access to another Catalyst module, so doing this in the constructor would be too early.
+     * Helper method to trigger an audio route update when devices change. It
+     * makes sure the operation is performed on the main thread.
+     *
+     * Only used on Android >= M.
      */
-    @Override
-    public void initialize() {
+    void onAudioDeviceChange() {
+        runInAudioThread(onAudioDeviceChangeRunner);
+    }
+
+    /**
+     * Helper method to trigger an audio route update when Bluetooth devices are
+     * connected / disconnected.
+     *
+     * Only used on Android < M. Runs on the main thread.
+     */
+    void onBluetoothDeviceChange() {
+        if (bluetoothHeadsetMonitor != null && bluetoothHeadsetMonitor.isHeadsetAvailable()) {
+            availableDevices.add(DEVICE_BLUETOOTH);
+        } else {
+            availableDevices.remove(DEVICE_BLUETOOTH);
+        }
+
+        if (mode != -1) {
+            updateAudioRoute(mode);
+        }
+    }
+
+    /**
+     * Helper method to trigger an audio route update when a headset is plugged
+     * or unplugged.
+     *
+     * Only used on Android < M.
+     */
+    void onHeadsetDeviceChange() {
         runInAudioThread(new Runnable() {
             @Override
             public void run() {
-                setAudioDeviceHandler();
+                // 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()) {
+                    availableDevices.add(DEVICE_HEADPHONES);
+                } else {
+                    availableDevices.remove(DEVICE_HEADPHONES);
+                }
+
+                if (mode != -1) {
+                    updateAudioRoute(mode);
+                }
             }
         });
     }
 
-    private void setAudioDeviceHandler() {
-        if (audioDeviceHandler != null) {
-            audioDeviceHandler.stop();
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    void onCallAudioStateChange(Object callAudioState_) {
+        final android.telecom.CallAudioState callAudioState
+            = (android.telecom.CallAudioState)callAudioState_;
+        runInAudioThread(new Runnable() {
+            @Override
+            public void run() {
+                int newSupportedRoutes = callAudioState.getSupportedRouteMask();
+                boolean audioDevicesChanged
+                        = supportedRouteMask != newSupportedRoutes;
+                if (audioDevicesChanged) {
+                    supportedRouteMask = newSupportedRoutes;
+                    availableDevices = routesToDeviceNames(supportedRouteMask);
+                    JitsiMeetLogger.i(TAG + " Available audio devices: "
+                                  + availableDevices.toString());
+                }
+
+                boolean audioRouteChanged
+                    = audioDeviceToRouteInt(selectedDevice)
+                            != callAudioState.getRoute();
+
+                if (audioRouteChanged || audioDevicesChanged) {
+                    // Reset user selection
+                    userSelectedDevice = null;
+
+                    // If the OS changes the Audio Route or Devices we could have lost
+                    // the selected audio device
+                    selectedDevice = null;
+
+                    if (mode != -1) {
+                        updateAudioRoute(mode);
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * {@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(int focusChange) {
+        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) {
+                updateAudioRoute(mode);
+            }
+            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;
         }
 
-        if (useConnectionService()) {
-            audioDeviceHandler = new AudioDeviceHandlerConnectionService(audioManager);
-        } else {
-            audioDeviceHandler = new AudioDeviceHandlerGeneric(audioManager);
         }
-
-        audioDeviceHandler.start(this);
     }
 
     /**
      * Helper function to run operations on a dedicated thread.
      * @param runnable
      */
-    void runInAudioThread(Runnable runnable) {
+    public void runInAudioThread(Runnable runnable) {
         executor.execute(runnable);
     }
 
@@ -257,12 +512,52 @@ class AudioModeModule extends ReactContextBaseJavaModule {
                 if (mode != -1) {
                     JitsiMeetLogger.i(TAG + " User selected device set to: " + device);
                     userSelectedDevice = device;
-                    updateAudioRoute(mode, false);
+                    updateAudioRoute(mode);
                 }
             }
         });
     }
 
+    /**
+     * The API >= 26 way of adjusting the audio route.
+     *
+     * @param audioDevice one of the "DEVICE_" names to set as the audio route.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private void setAudioRoute(String audioDevice) {
+        int newAudioRoute = audioDeviceToRouteInt(audioDevice);
+
+        RNConnectionService.setAudioRoute(newAudioRoute);
+    }
+
+    /**
+     * The API < 26 way of adjusting the audio route.
+     *
+     * @param audioDevice one of the "DEVICE_" names to set as the audio route.
+     */
+    private void setAudioRoutePreO(String audioDevice) {
+        // Turn bluetooth on / off
+        setBluetoothAudioRoute(audioDevice.equals(DEVICE_BLUETOOTH));
+
+        // Turn speaker on / off
+        audioManager.setSpeakerphoneOn(audioDevice.equals(DEVICE_SPEAKER));
+    }
+
+    /**
+     * 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();
+        }
+    }
+
     /**
      * Public method to set the current audio mode.
      *
@@ -277,22 +572,13 @@ class AudioModeModule extends ReactContextBaseJavaModule {
             return;
         }
 
-        Activity currentActivity = getCurrentActivity();
-        if (currentActivity != null) {
-            if (mode == DEFAULT) {
-                currentActivity.setVolumeControlStream(AudioManager.USE_DEFAULT_STREAM_TYPE);
-            } else {
-                currentActivity.setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
-            }
-        }
-
         runInAudioThread(new Runnable() {
             @Override
             public void run() {
                 boolean success;
 
                 try {
-                    success = updateAudioRoute(mode, false);
+                    success = updateAudioRoute(mode);
                 } catch (Throwable e) {
                     success = false;
                     JitsiMeetLogger.e(e, TAG + " Failed to update audio route for mode: " + mode);
@@ -301,27 +587,70 @@ class AudioModeModule extends ReactContextBaseJavaModule {
                     AudioModeModule.this.mode = mode;
                     promise.resolve(null);
                 } else {
-                    promise.reject("setMode", "Failed to set audio mode to " + mode);
+                    promise.reject(
+                            "setMode",
+                            "Failed to set audio mode to " + mode);
                 }
             }
         });
     }
 
     /**
-     * Sets whether ConnectionService should be used (if available) for setting the audio mode
-     * or not.
-     *
-     * @param use Boolean indicator of where it should be used or not.
+     * Setup the audio route change detection mechanism. We use the
+     * {@link android.media.AudioDeviceCallback} on 23 >= Android API < 26.
      */
-    @ReactMethod
-    public void setUseConnectionService(final boolean use) {
-        runInAudioThread(new Runnable() {
+    private void setupAudioRouteChangeDetection() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            setupAudioRouteChangeDetectionM();
+        } else {
+            setupAudioRouteChangeDetectionPreM();
+        }
+    }
+
+    /**
+     * Audio route change detection mechanism for 23 >= Android API < 26.
+     */
+    @TargetApi(Build.VERSION_CODES.M)
+    private void setupAudioRouteChangeDetectionM() {
+        android.media.AudioDeviceCallback audioDeviceCallback =
+                new android.media.AudioDeviceCallback() {
+                    @Override
+                    public void onAudioDevicesAdded(
+                            AudioDeviceInfo[] addedDevices) {
+                        JitsiMeetLogger.d(TAG + " Audio devices added");
+                        onAudioDeviceChange();
+                    }
+
+                    @Override
+                    public void onAudioDevicesRemoved(
+                            AudioDeviceInfo[] removedDevices) {
+                        JitsiMeetLogger.d(TAG + " Audio devices removed");
+                        onAudioDeviceChange();
+                    }
+                };
+
+        audioManager.registerAudioDeviceCallback(audioDeviceCallback, null);
+    }
+
+    /**
+     * Audio route change detection mechanism for Android API < 23.
+     */
+    private void setupAudioRouteChangeDetectionPreM() {
+        Context context = getReactApplicationContext();
+
+        // Detect changes in wired headset connections.
+        IntentFilter wiredHeadSetFilter = new IntentFilter(ACTION_HEADSET_PLUG);
+        BroadcastReceiver wiredHeadsetReceiver = new BroadcastReceiver() {
             @Override
-            public void run() {
-                useConnectionService_ = use;
-                setAudioDeviceHandler();
+            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(this, context);
     }
 
     /**
@@ -331,14 +660,17 @@ class AudioModeModule extends ReactContextBaseJavaModule {
      * @return {@code true} if the audio route was updated successfully;
      * {@code false}, otherwise.
      */
-    private boolean updateAudioRoute(int mode, boolean force) {
+    private boolean updateAudioRoute(int mode) {
         JitsiMeetLogger.i(TAG + " Update audio route for mode: " + mode);
 
-        if (!audioDeviceHandler.setMode(mode)) {
-            return false;
-        }
-
         if (mode == DEFAULT) {
+            if (!useConnectionService()) {
+                audioFocusLost = false;
+                audioManager.setMode(AudioManager.MODE_NORMAL);
+                audioManager.abandonAudioFocus(this);
+                audioManager.setSpeakerphoneOn(false);
+                setBluetoothAudioRoute(false);
+            }
             selectedDevice = null;
             userSelectedDevice = null;
 
@@ -346,6 +678,20 @@ class AudioModeModule extends ReactContextBaseJavaModule {
             return true;
         }
 
+        if (!useConnectionService()) {
+            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;
+            }
+        }
+
         boolean bluetoothAvailable = availableDevices.contains(DEVICE_BLUETOOTH);
         boolean headsetAvailable = availableDevices.contains(DEVICE_HEADPHONES);
 
@@ -360,118 +706,27 @@ class AudioModeModule extends ReactContextBaseJavaModule {
         }
 
         // Consider the user's selection
-        if (userSelectedDevice != null && availableDevices.contains(userSelectedDevice)) {
+        if (userSelectedDevice != null
+                && availableDevices.contains(userSelectedDevice)) {
             audioDevice = userSelectedDevice;
         }
 
         // If the previously selected device and the current default one
         // match, do nothing.
-        if (!force && selectedDevice != null && selectedDevice.equals(audioDevice)) {
+        if (selectedDevice != null && selectedDevice.equals(audioDevice)) {
             return true;
         }
 
         selectedDevice = audioDevice;
         JitsiMeetLogger.i(TAG + " Selected audio device: " + audioDevice);
 
-        audioDeviceHandler.setAudioRoute(audioDevice);
+        if (useConnectionService()) {
+            setAudioRoute(audioDevice);
+        } else {
+            setAudioRoutePreO(audioDevice);
+        }
 
         notifyDevicesChanged();
         return true;
     }
-
-    /**
-     * Gets the currently selected audio device.
-     *
-     * @return The selected audio device.
-     */
-    String getSelectedDevice() {
-        return selectedDevice;
-    }
-
-    /**
-     * Resets the current device selection.
-     */
-    void resetSelectedDevice() {
-        selectedDevice = null;
-        userSelectedDevice = null;
-    }
-
-    /**
-     * Adds a new device to the list of available devices.
-     *
-     * @param device The new device.
-     */
-    void addDevice(String device) {
-        availableDevices.add(device);
-        resetSelectedDevice();
-    }
-
-    /**
-     * Removes a device from the list of available devices.
-     *
-     * @param device The old device to the removed.
-     */
-    void removeDevice(String device) {
-        availableDevices.remove(device);
-        resetSelectedDevice();
-    }
-
-    /**
-     * Replaces the current list of available devices with a new one.
-     *
-     * @param devices The new devices list.
-     */
-    void replaceDevices(Set<String> devices) {
-        availableDevices = devices;
-        resetSelectedDevice();
-    }
-
-    /**
-     * Re-sets the current audio route. Needed when devices changes have happened.
-     */
-    void updateAudioRoute() {
-        if (mode != -1) {
-            updateAudioRoute(mode, false);
-        }
-    }
-
-    /**
-     * Re-sets the current audio route. Needed when focus is lost and regained.
-     */
-    void resetAudioRoute() {
-        if (mode != -1) {
-            updateAudioRoute(mode, true);
-        }
-    }
-
-    /**
-     * Interface for the modules implementing the actual audio device management.
-     */
-    interface AudioDeviceHandlerInterface {
-        /**
-         * Start detecting audio device changes.
-         * @param audioModeModule Reference to the main {@link AudioModeModule}.
-         */
-        void start(AudioModeModule audioModeModule);
-
-        /**
-         * Stop audio device detection.
-         */
-        void stop();
-
-        /**
-         * Set the appropriate route for the given audio device.
-         *
-         * @param device Audio device for which the route must be set.
-         */
-        void setAudioRoute(String device);
-
-        /**
-         * Set the given audio mode.
-         *
-         * @param mode The new audio mode to be used.
-         * @return Whether the operation was successful or not.
-         */
-        boolean setMode(int mode);
-    }
 }

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

@@ -99,7 +99,6 @@ public abstract class BaseReactView<ListenerT>
      * The listener (e.g. {@link JitsiMeetViewListener}) instance for reporting
      * events occurring in Jitsi Meet.
      */
-    @Deprecated
     private ListenerT listener;
 
     /**
@@ -168,7 +167,6 @@ public abstract class BaseReactView<ListenerT>
      *
      * @return The listener set on this {@code BaseReactView}.
      */
-    @Deprecated
     public ListenerT getListener() {
         return listener;
     }
@@ -181,10 +179,8 @@ public abstract class BaseReactView<ListenerT>
      * @param data - The details of the event associated with/specific to the
      * specified {@code name}.
      */
-    @Deprecated
     protected abstract void onExternalAPIEvent(String name, ReadableMap data);
 
-    @Deprecated
     protected void onExternalAPIEvent(
             Map<String, Method> listenerMethods,
             String name, ReadableMap data) {
@@ -219,7 +215,6 @@ public abstract class BaseReactView<ListenerT>
      *
      * @param listener The listener to set on this {@code BaseReactView}.
      */
-    @Deprecated
     public void setListener(ListenerT listener) {
         this.listener = listener;
     }

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

@@ -0,0 +1,194 @@
+/*
+ * Copyright @ 2017-present Atlassian Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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 {
+    /**
+     * {@link AudioModeModule} where this monitor reports.
+     */
+    private final AudioModeModule audioModeModule;
+
+    /**
+     * The {@link Context} in which {@link #audioModeModule} executes.
+     */
+    private final Context context;
+
+    /**
+     * Reference to a proxy object which allows us to query connected devices.
+     */
+    private BluetoothHeadset headset;
+
+    /**
+     * Flag indicating if there are any Bluetooth headset devices currently
+     * available.
+     */
+    private boolean headsetAvailable = false;
+
+    /**
+     * Helper for running Bluetooth operations on the main thread.
+     */
+    private final Runnable updateDevicesRunnable
+        = new Runnable() {
+            @Override
+            public void run() {
+                headsetAvailable
+                    = (headset != null)
+                        && !headset.getConnectedDevices().isEmpty();
+                audioModeModule.onBluetoothDeviceChange();
+            }
+        };
+
+    public BluetoothHeadsetMonitor(
+            AudioModeModule audioModeModule,
+            Context context) {
+        this.audioModeModule = audioModeModule;
+        this.context = context;
+
+        AudioManager audioManager
+            = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+
+        if (!audioManager.isBluetoothScoAvailableOffCall()) {
+            JitsiMeetLogger.w(AudioModeModule.TAG + " Bluetooth SCO is not available");
+            return;
+        }
+
+        if (getBluetoothHeadsetProfileProxy()) {
+            registerBluetoothReceiver();
+
+            // Initial detection.
+            updateDevices();
+        }
+    }
+
+    private boolean getBluetoothHeadsetProfileProxy() {
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+
+        if (adapter == null) {
+            JitsiMeetLogger.w(AudioModeModule.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);
+    }
+
+    /**
+     * Returns the current headset availability.
+     *
+     * @return {@code true} if there is a Bluetooth headset connected;
+     * {@code false}, otherwise.
+     */
+    public boolean isHeadsetAvailable() {
+        return headsetAvailable;
+    }
+
+    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(AudioModeModule.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(AudioModeModule.TAG + " BT SCO connection state changed: " + state);
+                updateDevices();
+                break;
+            }
+        }
+    }
+
+    private void registerBluetoothReceiver() {
+        BroadcastReceiver 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 AudioModeModule#onAudioDeviceChange()} callback.
+     */
+    private void updateDevices() {
+        audioModeModule.runInAudioThread(updateDevicesRunnable);
+    }
+}

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

@@ -1,100 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.facebook.react.bridge.WritableNativeMap;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-import java.util.HashMap;
-
-/**
- * Wraps the name and extra data for events that were broadcasted locally.
- */
-public class BroadcastAction {
-    private static final String TAG = BroadcastAction.class.getSimpleName();
-
-    private final Type type;
-    private final HashMap<String, Object> data;
-
-    public BroadcastAction(Intent intent) {
-        this.type = Type.buildTypeFromAction(intent.getAction());
-        this.data = buildDataFromBundle(intent.getExtras());
-    }
-
-    public Type getType() {
-        return this.type;
-    }
-
-    public HashMap<String, Object> getData() {
-        return this.data;
-    }
-
-    public WritableNativeMap getDataAsWritableNativeMap() {
-        WritableNativeMap nativeMap = new WritableNativeMap();
-
-        for (String key : this.data.keySet()) {
-            try {
-                if (this.data.get(key) instanceof Boolean) {
-                    nativeMap.putBoolean(key, (Boolean) this.data.get(key));
-                } else if (this.data.get(key) instanceof Integer) {
-                    nativeMap.putInt(key, (Integer) this.data.get(key));
-                } else if (this.data.get(key) instanceof Double) {
-                    nativeMap.putDouble(key, (Double) this.data.get(key));
-                } else if (this.data.get(key) instanceof String) {
-                    nativeMap.putString(key, (String) this.data.get(key));
-                } else {
-                    throw new Exception("Unsupported extra data type");
-                }
-            } catch (Exception e) {
-                JitsiMeetLogger.w(TAG + " invalid extra data in event", e);
-            }
-        }
-
-        return nativeMap;
-    }
-
-    private static HashMap<String, Object> buildDataFromBundle(Bundle bundle) {
-        HashMap<String, Object> map = new HashMap<>();
-
-        if (bundle != null) {
-            for (String key : bundle.keySet()) {
-                map.put(key, bundle.get(key));
-            }
-        }
-
-        return map;
-    }
-
-    enum Type {
-        SET_AUDIO_MUTED("org.jitsi.meet.SET_AUDIO_MUTED"),
-        HANG_UP("org.jitsi.meet.HANG_UP"),
-        SEND_ENDPOINT_TEXT_MESSAGE("org.jitsi.meet.SEND_ENDPOINT_TEXT_MESSAGE"),
-        TOGGLE_SCREEN_SHARE("org.jitsi.meet.TOGGLE_SCREEN_SHARE"),
-        RETRIEVE_PARTICIPANTS_INFO("org.jitsi.meet.RETRIEVE_PARTICIPANTS_INFO"),
-        OPEN_CHAT("org.jitsi.meet.OPEN_CHAT"),
-        CLOSE_CHAT("org.jitsi.meet.CLOSE_CHAT"),
-        SEND_CHAT_MESSAGE("org.jitsi.meet.SEND_CHAT_MESSAGE"),
-        SET_VIDEO_MUTED("org.jitsi.meet.SET_VIDEO_MUTED");
-
-        private final String action;
-
-        Type(String action) {
-            this.action = action;
-        }
-
-        public String getAction() {
-            return action;
-        }
-
-        private static Type buildTypeFromAction(String action) {
-            for (Type type : Type.values()) {
-                if (type.action.equalsIgnoreCase(action)) {
-                    return type;
-                }
-            }
-            return null;
-        }
-    }
-}

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

@@ -1,30 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import com.facebook.react.bridge.ReadableMap;
-
-/**
- * Class used to emit events through the LocalBroadcastManager, called when events
- * from JS occurred. Takes an action name from JS, builds and broadcasts the {@link BroadcastEvent}
- */
-public class BroadcastEmitter {
-    private final LocalBroadcastManager localBroadcastManager;
-
-    public BroadcastEmitter(Context context) {
-        localBroadcastManager = LocalBroadcastManager.getInstance(context);
-    }
-
-    public void sendBroadcast(String name, ReadableMap data) {
-        BroadcastEvent event = new BroadcastEvent(name, data);
-
-        Intent intent = event.buildIntent();
-
-        if (intent != null) {
-            localBroadcastManager.sendBroadcast(intent);
-        }
-    }
-}

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

@@ -1,155 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.facebook.react.bridge.ReadableMap;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-import java.util.HashMap;
-
-/**
- * Wraps the name and extra data for the events that occur on the JS side and are
- * to be broadcasted.
- */
-public class BroadcastEvent {
-
-    private static final String TAG = BroadcastEvent.class.getSimpleName();
-
-    private final Type type;
-    private final HashMap<String, Object> data;
-
-    public BroadcastEvent(String name, ReadableMap data) {
-        this.type = Type.buildTypeFromName(name);
-        this.data = data.toHashMap();
-    }
-
-    public BroadcastEvent(Intent intent) {
-        this.type = Type.buildTypeFromAction(intent.getAction());
-        this.data = buildDataFromBundle(intent.getExtras());
-    }
-
-    public Type getType() {
-        return this.type;
-    }
-
-    public HashMap<String, Object> getData() {
-        return this.data;
-    }
-
-    public Intent buildIntent() {
-        if (type != null && type.action != null) {
-            Intent intent = new Intent(type.action);
-
-            for (String key : this.data.keySet()) {
-                try {
-                    intent.putExtra(key, this.data.get(key).toString());
-                } catch (Exception e) {
-                    JitsiMeetLogger.w(TAG + " invalid extra data in event", e);
-                }
-            }
-
-            return intent;
-        }
-
-        return null;
-    }
-
-    private static HashMap<String, Object> buildDataFromBundle(Bundle bundle) {
-        if (bundle != null) {
-            try {
-                HashMap<String, Object> map = new HashMap<>();
-
-                for (String key : bundle.keySet()) {
-                    map.put(key, bundle.get(key));
-                }
-
-                return map;
-            } catch (Exception e) {
-                JitsiMeetLogger.w(TAG + " invalid extra data", e);
-            }
-        }
-
-        return null;
-    }
-
-    public enum Type {
-        CONFERENCE_JOINED("org.jitsi.meet.CONFERENCE_JOINED"),
-        CONFERENCE_TERMINATED("org.jitsi.meet.CONFERENCE_TERMINATED"),
-        CONFERENCE_WILL_JOIN("org.jitsi.meet.CONFERENCE_WILL_JOIN"),
-        AUDIO_MUTED_CHANGED("org.jitsi.meet.AUDIO_MUTED_CHANGED"),
-        PARTICIPANT_JOINED("org.jitsi.meet.PARTICIPANT_JOINED"),
-        PARTICIPANT_LEFT("org.jitsi.meet.PARTICIPANT_LEFT"),
-        ENDPOINT_TEXT_MESSAGE_RECEIVED("org.jitsi.meet.ENDPOINT_TEXT_MESSAGE_RECEIVED"),
-        SCREEN_SHARE_TOGGLED("org.jitsi.meet.SCREEN_SHARE_TOGGLED"),
-        PARTICIPANTS_INFO_RETRIEVED("org.jitsi.meet.PARTICIPANTS_INFO_RETRIEVED"),
-        CHAT_MESSAGE_RECEIVED("org.jitsi.meet.CHAT_MESSAGE_RECEIVED"),
-        CHAT_TOGGLED("org.jitsi.meet.CHAT_TOGGLED"),
-        VIDEO_MUTED_CHANGED("org.jitsi.meet.VIDEO_MUTED_CHANGED");
-
-
-        private static final String CONFERENCE_WILL_JOIN_NAME = "CONFERENCE_WILL_JOIN";
-        private static final String CONFERENCE_JOINED_NAME = "CONFERENCE_JOINED";
-        private static final String CONFERENCE_TERMINATED_NAME = "CONFERENCE_TERMINATED";
-        private static final String AUDIO_MUTED_CHANGED_NAME = "AUDIO_MUTED_CHANGED";
-        private static final String PARTICIPANT_JOINED_NAME = "PARTICIPANT_JOINED";
-        private static final String PARTICIPANT_LEFT_NAME = "PARTICIPANT_LEFT";
-        private static final String ENDPOINT_TEXT_MESSAGE_RECEIVED_NAME = "ENDPOINT_TEXT_MESSAGE_RECEIVED";
-        private static final String SCREEN_SHARE_TOGGLED_NAME = "SCREEN_SHARE_TOGGLED";
-        private static final String PARTICIPANTS_INFO_RETRIEVED_NAME = "PARTICIPANTS_INFO_RETRIEVED";
-        private static final String CHAT_MESSAGE_RECEIVED_NAME = "CHAT_MESSAGE_RECEIVED";
-        private static final String CHAT_TOGGLED_NAME = "CHAT_TOGGLED";
-        private static final String VIDEO_MUTED_CHANGED_NAME = "VIDEO_MUTED_CHANGED";
-
-        private final String action;
-
-        Type(String action) {
-            this.action = action;
-        }
-
-        public String getAction() {
-            return action;
-        }
-
-        private static Type buildTypeFromAction(String action) {
-            for (Type type : Type.values()) {
-                if (type.action.equalsIgnoreCase(action)) {
-                    return type;
-                }
-            }
-            return null;
-        }
-
-        private static Type buildTypeFromName(String name) {
-            switch (name) {
-                case CONFERENCE_WILL_JOIN_NAME:
-                    return CONFERENCE_WILL_JOIN;
-                case CONFERENCE_JOINED_NAME:
-                    return CONFERENCE_JOINED;
-                case CONFERENCE_TERMINATED_NAME:
-                    return CONFERENCE_TERMINATED;
-                case AUDIO_MUTED_CHANGED_NAME:
-                    return AUDIO_MUTED_CHANGED;
-                case PARTICIPANT_JOINED_NAME:
-                    return PARTICIPANT_JOINED;
-                case PARTICIPANT_LEFT_NAME:
-                    return PARTICIPANT_LEFT;
-                case ENDPOINT_TEXT_MESSAGE_RECEIVED_NAME:
-                    return ENDPOINT_TEXT_MESSAGE_RECEIVED;
-                case SCREEN_SHARE_TOGGLED_NAME:
-                    return SCREEN_SHARE_TOGGLED;
-                case PARTICIPANTS_INFO_RETRIEVED_NAME:
-                    return PARTICIPANTS_INFO_RETRIEVED;
-                case CHAT_MESSAGE_RECEIVED_NAME:
-                    return CHAT_MESSAGE_RECEIVED;
-                case CHAT_TOGGLED_NAME:
-                    return CHAT_TOGGLED;
-                case VIDEO_MUTED_CHANGED_NAME:
-                    return VIDEO_MUTED_CHANGED;
-            }
-
-            return null;
-        }
-    }
-}

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

@@ -1,51 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.content.Intent;
-
-public class BroadcastIntentHelper {
-    public static Intent buildSetAudioMutedIntent(boolean muted) {
-        Intent intent = new Intent(BroadcastAction.Type.SET_AUDIO_MUTED.getAction());
-        intent.putExtra("muted", muted);
-        return intent;
-    }
-
-    public static Intent buildHangUpIntent() {
-        return new Intent(BroadcastAction.Type.HANG_UP.getAction());
-    }
-
-    public static Intent buildSendEndpointTextMessageIntent(String to, String message) {
-        Intent intent = new Intent(BroadcastAction.Type.SEND_ENDPOINT_TEXT_MESSAGE.getAction());
-        intent.putExtra("to", to);
-        intent.putExtra("message", message);
-        return intent;
-    }
-
-    public static Intent buildToggleScreenShareIntent(boolean enabled) {
-        Intent intent = new Intent(BroadcastAction.Type.TOGGLE_SCREEN_SHARE.getAction());
-        intent.putExtra("enabled", enabled);
-        return intent;
-    }
-
-    public static Intent buildOpenChatIntent(String participantId) {
-        Intent intent = new Intent(BroadcastAction.Type.OPEN_CHAT.getAction());
-        intent.putExtra("to", participantId);
-        return intent;
-    }
-
-    public static Intent buildCloseChatIntent() {
-        return new Intent(BroadcastAction.Type.CLOSE_CHAT.getAction());
-    }
-
-    public static Intent buildSendChatMessageIntent(String participantId, String message) {
-        Intent intent = new Intent(BroadcastAction.Type.SEND_CHAT_MESSAGE.getAction());
-        intent.putExtra("to", participantId);
-        intent.putExtra("message", message);
-        return intent;
-    }
-
-    public static Intent buildSetVideoMutedIntent(boolean muted) {
-        Intent intent = new Intent(BroadcastAction.Type.SET_VIDEO_MUTED.getAction());
-        intent.putExtra("muted", muted);
-        return intent;
-    }
-}

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

@@ -1,34 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-/**
- * Listens for {@link BroadcastAction}s on LocalBroadcastManager. When one occurs,
- * it emits it to JS.
- */
-public class BroadcastReceiver extends android.content.BroadcastReceiver {
-
-    public BroadcastReceiver(Context context) {
-        LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(context);
-
-        IntentFilter intentFilter = new IntentFilter();
-
-        for (BroadcastAction.Type type : BroadcastAction.Type.values()) {
-            intentFilter.addAction(type.getAction());
-        }
-
-        localBroadcastManager.registerReceiver(this, intentFilter);
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        BroadcastAction action = new BroadcastAction(intent);
-        String actionName = action.getType().getAction();
-
-        ReactInstanceManagerHolder.emitEvent(actionName, action.getDataAsWritableNativeMap());
-    }
-}

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

@@ -123,17 +123,14 @@ public class ConnectionService extends android.telecom.ConnectionService {
      * {@link android.telecom.Connection#STATE_ACTIVE}.
      *
      * @param callUUID the call UUID which identifies the connection.
-     * @return Whether the connection was set as active or not.
      */
-    static boolean setConnectionActive(String callUUID) {
+    static void setConnectionActive(String callUUID) {
         ConnectionImpl connection = connections.get(callUUID);
 
         if (connection != null) {
             connection.setActive();
-            return true;
         } else {
-            JitsiMeetLogger.w("%s setConnectionActive - no connection for UUID: %s", TAG, callUUID);
-            return false;
+            JitsiMeetLogger.e("%s setConnectionActive - no connection for UUID: %s", TAG, callUUID);
         }
     }
 
@@ -406,9 +403,11 @@ public class ConnectionService extends android.telecom.ConnectionService {
         @Override
         public void onCallAudioStateChanged(CallAudioState state) {
             JitsiMeetLogger.d(TAG + " onCallAudioStateChanged: " + state);
-            RNConnectionService module = ReactInstanceManagerHolder.getNativeModule(RNConnectionService.class);
-            if (module != null) {
-                module.onCallAudioStateChange(state);
+            AudioModeModule audioModeModule
+                    = ReactInstanceManagerHolder
+                    .getNativeModule(AudioModeModule.class);
+            if (audioModeModule != null) {
+                audioModeModule.onCallAudioStateChange(state);
             }
         }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2017-present Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,6 @@ import com.facebook.react.module.annotations.ReactModule;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Module implementing an API for sending events from JavaScript to native code.
  */
@@ -38,9 +35,6 @@ class ExternalAPIModule
 
     private static final String TAG = NAME;
 
-    private final BroadcastEmitter broadcastEmitter;
-    private final BroadcastReceiver broadcastReceiver;
-
     /**
      * Initializes a new module instance. There shall be a single instance of
      * this module throughout the lifetime of the app.
@@ -50,11 +44,6 @@ class ExternalAPIModule
      */
     public ExternalAPIModule(ReactApplicationContext reactContext) {
         super(reactContext);
-
-        broadcastEmitter = new BroadcastEmitter(reactContext);
-        broadcastReceiver = new BroadcastReceiver(reactContext);
-
-        ParticipantsService.init(reactContext);
     }
 
     /**
@@ -67,29 +56,6 @@ class ExternalAPIModule
         return NAME;
     }
 
-    /**
-     * Gets a mapping with the constants this module is exporting.
-     *
-     * @return a {@link Map} mapping the constants to be exported with their
-     * values.
-     */
-    @Override
-    public Map<String, Object> getConstants() {
-        Map<String, Object> constants = new HashMap<>();
-
-        constants.put("SET_AUDIO_MUTED", BroadcastAction.Type.SET_AUDIO_MUTED.getAction());
-        constants.put("HANG_UP", BroadcastAction.Type.HANG_UP.getAction());
-        constants.put("SEND_ENDPOINT_TEXT_MESSAGE", BroadcastAction.Type.SEND_ENDPOINT_TEXT_MESSAGE.getAction());
-        constants.put("TOGGLE_SCREEN_SHARE", BroadcastAction.Type.TOGGLE_SCREEN_SHARE.getAction());
-        constants.put("RETRIEVE_PARTICIPANTS_INFO", BroadcastAction.Type.RETRIEVE_PARTICIPANTS_INFO.getAction());
-        constants.put("OPEN_CHAT", BroadcastAction.Type.OPEN_CHAT.getAction());
-        constants.put("CLOSE_CHAT", BroadcastAction.Type.CLOSE_CHAT.getAction());
-        constants.put("SEND_CHAT_MESSAGE", BroadcastAction.Type.SEND_CHAT_MESSAGE.getAction());
-        constants.put("SET_VIDEO_MUTED", BroadcastAction.Type.SET_VIDEO_MUTED.getAction());
-
-        return constants;
-    }
-
     /**
      * Dispatches an event that occurred on the JavaScript side of the SDK to
      * the specified {@link BaseReactView}'s listener.
@@ -113,8 +79,7 @@ class ExternalAPIModule
             JitsiMeetLogger.d(TAG + " Sending event: " + name + " with data: " + data);
             try {
                 view.onExternalAPIEvent(name, data);
-                broadcastEmitter.sendBroadcast(name, data);
-            } catch (Exception e) {
+            } catch(Exception e) {
                 JitsiMeetLogger.e(e, TAG + " onExternalAPIEvent: error sending event");
             }
         }

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

@@ -1,57 +0,0 @@
-/*
- * Copyright @ 2019-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 com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.module.annotations.ReactModule;
-import com.squareup.duktape.Duktape;
-
-@ReactModule(name = JavaScriptSandboxModule.NAME)
-class JavaScriptSandboxModule extends ReactContextBaseJavaModule {
-    public static final String NAME = "JavaScriptSandbox";
-
-    public JavaScriptSandboxModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    /**
-     * Evaluates the given code in a Duktape VM.
-     * @param code - The code that needs to evaluated.
-     * @param promise - Resolved with the output in case of success or rejected with an exception
-     *                in case of failure.
-     */
-    @ReactMethod
-    public void evaluate(String code, Promise promise) {
-        Duktape vm = Duktape.create();
-        try {
-            Object res = vm.evaluate(code);
-            promise.resolve(res.toString());
-        } catch (Throwable tr) {
-            promise.reject(tr);
-        } finally {
-            vm.close();
-        }
-    }
-
-    @Override
-    public String getName() {
-        return NAME;
-    }
-}

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

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,18 +16,11 @@
  */
 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
@@ -39,9 +33,6 @@ public class JitsiMeet {
     }
 
     public static void setDefaultConferenceOptions(JitsiMeetConferenceOptions options) {
-        if (options != null && options.getRoom() != null) {
-            throw new RuntimeException("'room' must be null in the default conference options");
-        }
         defaultConferenceOptions = options;
     }
 
@@ -78,23 +69,4 @@ 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

@@ -16,42 +16,32 @@
 
 package org.jitsi.meet.sdk;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Bundle;
-
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.facebook.react.modules.core.PermissionListener;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
-import java.util.HashMap;
-import android.app.Activity;
+import java.util.Map;
+
 
 /**
  * A base activity for SDK users to embed. It uses {@link JitsiMeetFragment} to do the heavy
  * lifting and wires the remaining Activity lifecycle methods so it works out of the box.
  */
 public class JitsiMeetActivity extends FragmentActivity
-    implements JitsiMeetActivityInterface {
+        implements JitsiMeetActivityInterface, JitsiMeetViewListener {
 
     protected static final String TAG = JitsiMeetActivity.class.getSimpleName();
 
     private static final String ACTION_JITSI_MEET_CONFERENCE = "org.jitsi.meet.CONFERENCE";
     private static final String JITSI_MEET_CONFERENCE_OPTIONS = "JitsiMeetConferenceOptions";
 
-    private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            onBroadcastReceived(intent);
-        }
-    };
     // Helpers for starting the activity
     //
 
@@ -59,9 +49,6 @@ public class JitsiMeetActivity extends FragmentActivity
         Intent intent = new Intent(context, JitsiMeetActivity.class);
         intent.setAction(ACTION_JITSI_MEET_CONFERENCE);
         intent.putExtra(JITSI_MEET_CONFERENCE_OPTIONS, options);
-        if (!(context instanceof Activity)) {
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        }
         context.startActivity(intent);
     }
 
@@ -80,8 +67,6 @@ public class JitsiMeetActivity extends FragmentActivity
 
         setContentView(R.layout.activity_jitsi_meet);
 
-        registerForBroadcastMessages();
-
         if (!extraInitialize()) {
             initialize();
         }
@@ -102,8 +87,6 @@ public class JitsiMeetActivity extends FragmentActivity
         }
         JitsiMeetOngoingConferenceService.abort(this);
 
-        LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver);
-
         super.onDestroy();
     }
 
@@ -120,39 +103,26 @@ public class JitsiMeetActivity extends FragmentActivity
     protected JitsiMeetView getJitsiView() {
         JitsiMeetFragment fragment
             = (JitsiMeetFragment) getSupportFragmentManager().findFragmentById(R.id.jitsiFragment);
-        return fragment != null ? fragment.getJitsiView() : null;
+        return fragment.getJitsiView();
     }
 
     public void join(@Nullable String url) {
         JitsiMeetConferenceOptions options
             = new JitsiMeetConferenceOptions.Builder()
-            .setRoom(url)
-            .build();
+                .setRoom(url)
+                .build();
         join(options);
     }
 
     public void join(JitsiMeetConferenceOptions options) {
-        JitsiMeetView view = getJitsiView();
-
-        if (view != null) {
-            view.join(options);
-        } else {
-            JitsiMeetLogger.w("Cannot join, view is null");
-        }
+        getJitsiView().join(options);
     }
 
     public void leave() {
-        JitsiMeetView view = getJitsiView();
-
-        if (view != null) {
-            view.leave();
-        } else {
-            JitsiMeetLogger.w("Cannot leave, view is null");
-        }
+        getJitsiView().leave();
     }
 
-    private @Nullable
-    JitsiMeetConferenceOptions getConferenceOptions(Intent intent) {
+    private @Nullable JitsiMeetConferenceOptions getConferenceOptions(Intent intent) {
         String action = intent.getAction();
 
         if (Intent.ACTION_VIEW.equals(action)) {
@@ -171,7 +141,7 @@ public class JitsiMeetActivity extends FragmentActivity
      * Helper function called during activity initialization. If {@code true} is returned, the
      * initialization is delayed and the {@link JitsiMeetActivity#initialize()} method is not
      * called. In this case, it's up to the subclass to call the initialize method when ready.
-     * <p>
+     *
      * This is mainly required so we do some extra initialization in the Jitsi Meet app.
      *
      * @return {@code true} if the initialization will be delayed, {@code false} otherwise.
@@ -181,49 +151,19 @@ 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()));
     }
 
-    protected void onConferenceJoined(HashMap<String, Object> extraData) {
-        JitsiMeetLogger.i("Conference joined: " + extraData);
-        // Launch the service for the ongoing notification.
-        JitsiMeetOngoingConferenceService.launch(this);
-    }
-
-    protected void onConferenceTerminated(HashMap<String, Object> extraData) {
-        JitsiMeetLogger.i("Conference terminated: " + extraData);
-        finish();
-    }
-
-    protected void onConferenceWillJoin(HashMap<String, Object> extraData) {
-        JitsiMeetLogger.i("Conference will join: " + extraData);
-    }
-
-    protected void onParticipantJoined(HashMap<String, Object> extraData) {
-        try {
-            JitsiMeetLogger.i("Participant joined: ", extraData);
-        } catch (Exception e) {
-            JitsiMeetLogger.w("Invalid participant joined extraData", e);
-        }
-    }
-
-    protected void onParticipantLeft(HashMap<String, Object> extraData) {
-        try {
-            JitsiMeetLogger.i("Participant left: ", extraData);
-        } catch (Exception e) {
-            JitsiMeetLogger.w("Invalid participant left extraData", e);
-        }
-    }
-
     // Activity lifecycle methods
     //
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
         JitsiMeetActivityDelegate.onActivityResult(this, requestCode, resultCode, data);
     }
 
@@ -248,11 +188,7 @@ public class JitsiMeetActivity extends FragmentActivity
 
     @Override
     protected void onUserLeaveHint() {
-        JitsiMeetView view = getJitsiView();
-
-        if (view != null) {
-            view.enterPictureInPicture();
-        }
+        getJitsiView().enterPictureInPicture();
     }
 
     // JitsiMeetActivityInterface
@@ -268,37 +204,24 @@ public class JitsiMeetActivity extends FragmentActivity
         JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
-    private void registerForBroadcastMessages() {
-        IntentFilter intentFilter = new IntentFilter();
+    // JitsiMeetViewListener
+    //
 
-        for (BroadcastEvent.Type type : BroadcastEvent.Type.values()) {
-            intentFilter.addAction(type.getAction());
-        }
-
-        LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, intentFilter);
+    @Override
+    public void onConferenceJoined(Map<String, Object> data) {
+        JitsiMeetLogger.i("Conference joined: " + data);
+        // Launch the service for the ongoing notification.
+        JitsiMeetOngoingConferenceService.launch(this);
     }
 
-    private void onBroadcastReceived(Intent intent) {
-        if (intent != null) {
-            BroadcastEvent event = new BroadcastEvent(intent);
+    @Override
+    public void onConferenceTerminated(Map<String, Object> data) {
+        JitsiMeetLogger.i("Conference terminated: " + data);
+        finish();
+    }
 
-            switch (event.getType()) {
-                case CONFERENCE_JOINED:
-                    onConferenceJoined(event.getData());
-                    break;
-                case CONFERENCE_WILL_JOIN:
-                    onConferenceWillJoin(event.getData());
-                    break;
-                case CONFERENCE_TERMINATED:
-                    onConferenceTerminated(event.getData());
-                    break;
-                case PARTICIPANT_JOINED:
-                    onParticipantJoined(event.getData());
-                    break;
-                case PARTICIPANT_LEFT:
-                    onParticipantLeft(event.getData());
-                    break;
-            }
-        }
+    @Override
+    public void onConferenceWillJoin(Map<String, Object> data) {
+        JitsiMeetLogger.i("Conference will join: " + data);
     }
 }

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

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2019-present 8x8, Inc.
+ * Copyright @ 2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +17,17 @@
 
 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
@@ -165,7 +167,13 @@ public class JitsiMeetActivityDelegate {
     }
 
     public static void onRequestPermissionsResult(
-            final int requestCode, final String[] permissions, final int[] grantResults) {
+        final int requestCode,
+        final String[] permissions,
+        final int[] grantResults) {
+        CalendarEventsPackage.onRequestPermissionsResult(
+            requestCode,
+            permissions,
+            grantResults);
         permissionsCallback = new Callback() {
             @Override
             public void invoke(Object... args) {
@@ -177,18 +185,9 @@ public class JitsiMeetActivityDelegate {
         };
     }
 
+    @TargetApi(Build.VERSION_CODES.M)
     public static void requestPermissions(Activity activity, String[] permissions, int requestCode, PermissionListener listener) {
         permissionListener = listener;
-
-        // 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]);
-        }
+        activity.requestPermissions(permissions, requestCode);
     }
 }

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

@@ -72,46 +72,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
      */
     private JitsiMeetUserInfo userInfo;
 
-    public URL getServerURL() {
-        return serverURL;
-    }
-
-    public String getRoom() {
-        return room;
-    }
-
-    public String getSubject() {
-        return subject;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public Bundle getColorScheme() {
-        return colorScheme;
-    }
-
-    public Bundle getFeatureFlags() {
-        return featureFlags;
-    }
-
-    public boolean getAudioMuted() {
-        return audioMuted;
-    }
-
-    public boolean getAudioOnly() {
-        return audioOnly;
-    }
-
-    public boolean getVideoMuted() {
-        return videoMuted;
-    }
-
-    public JitsiMeetUserInfo getUserInfo() {
-        return userInfo;
-    }
-
     /**
      * Class used to build the immutable {@link JitsiMeetConferenceOptions} object.
      */
@@ -288,7 +248,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
     }
 
     private JitsiMeetConferenceOptions(Parcel in) {
-        serverURL = (URL) in.readSerializable();
         room = in.readString();
         subject = in.readString();
         token = in.readString();
@@ -350,7 +309,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
             urlProps.putString("jwt", token);
         }
 
-        if (userInfo != null) {
+        if (token == null && userInfo != null) {
             props.putBundle("userInfo", userInfo.asBundle());
         }
 
@@ -377,7 +336,6 @@ 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,6 +57,22 @@ 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/JitsiMeetOngoingConferenceService.java

@@ -21,14 +21,12 @@ import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Build;
 import android.os.IBinder;
 
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
+
 /**
  * This class implements an Android {@link Service}, a foreground one specifically, and it's
  * responsible for presenting an ongoing notification when a conference is in progress.
@@ -37,18 +35,19 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
  * See: https://developer.android.com/guide/components/services
  */
 public class JitsiMeetOngoingConferenceService extends Service
-    implements OngoingConferenceTracker.OngoingConferenceListener {
+        implements OngoingConferenceTracker.OngoingConferenceListener {
     private static final String TAG = JitsiMeetOngoingConferenceService.class.getSimpleName();
 
-    private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver();
-
-    private boolean isAudioMuted;
+    static final class Actions {
+        static final String START = TAG + ":START";
+        static final String HANGUP = TAG + ":HANGUP";
+    }
 
     static void launch(Context context) {
         OngoingNotification.createOngoingConferenceNotificationChannel();
 
         Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
-        intent.setAction(Action.START.getName());
+        intent.setAction(Actions.START);
 
         ComponentName componentName;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -71,16 +70,11 @@ public class JitsiMeetOngoingConferenceService extends Service
         super.onCreate();
 
         OngoingConferenceTracker.getInstance().addListener(this);
-
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(BroadcastEvent.Type.AUDIO_MUTED_CHANGED.getAction());
-        LocalBroadcastManager.getInstance(getApplicationContext()).registerReceiver(broadcastReceiver, intentFilter);
     }
 
     @Override
     public void onDestroy() {
         OngoingConferenceTracker.getInstance().removeListener(this);
-        LocalBroadcastManager.getInstance(getApplicationContext()).unregisterReceiver(broadcastReceiver);
 
         super.onDestroy();
     }
@@ -92,37 +86,26 @@ public class JitsiMeetOngoingConferenceService extends Service
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        final String actionName = intent.getAction();
-        final Action action = Action.fromName(actionName);
-
-        switch (action) {
-            case UNMUTE:
-            case MUTE:
-                Intent muteBroadcastIntent = BroadcastIntentHelper.buildSetAudioMutedIntent(action == Action.MUTE);
-                LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(muteBroadcastIntent);
-                break;
-            case START:
-                Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
-                if (notification == null) {
-                    stopSelf();
-                    JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
-                } else {
-                    startForeground(OngoingNotification.NOTIFICATION_ID, notification);
-                    JitsiMeetLogger.i(TAG + " Service started");
-                }
-                break;
-            case HANGUP:
-                JitsiMeetLogger.i(TAG + " Hangup requested");
-
-                Intent hangupBroadcastIntent = BroadcastIntentHelper.buildHangUpIntent();
-                LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(hangupBroadcastIntent);
-
+        final String action = intent.getAction();
+        if (action.equals(Actions.START)) {
+            Notification notification = OngoingNotification.buildOngoingConferenceNotification();
+            if (notification == null) {
                 stopSelf();
-                break;
-            default:
-                JitsiMeetLogger.w(TAG + " Unknown action received: " + action);
-                stopSelf();
-                break;
+                JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
+            } else {
+                startForeground(OngoingNotification.NOTIFICATION_ID, notification);
+                JitsiMeetLogger.i(TAG + " Service started");
+            }
+        } else if (action.equals(Actions.HANGUP)) {
+            JitsiMeetLogger.i(TAG + " Hangup requested");
+            // Abort all ongoing calls
+            if (AudioModeModule.useConnectionService()) {
+                ConnectionService.abortConnections();
+            }
+            stopSelf();
+        } else {
+            JitsiMeetLogger.w(TAG + " Unknown action received: " + action);
+            stopSelf();
         }
 
         return START_NOT_STICKY;
@@ -132,50 +115,7 @@ public class JitsiMeetOngoingConferenceService extends Service
     public void onCurrentConferenceChanged(String conferenceUrl) {
         if (conferenceUrl == null) {
             stopSelf();
-            OngoingNotification.resetStartingtime();
             JitsiMeetLogger.i(TAG + "Service stopped");
         }
     }
-
-    public enum Action {
-        START(TAG + ":START"),
-        HANGUP(TAG + ":HANGUP"),
-        MUTE(TAG + ":MUTE"),
-        UNMUTE(TAG + ":UNMUTE");
-
-        private final String name;
-
-        Action(String name) {
-            this.name = name;
-        }
-
-        public static Action fromName(String name) {
-            for (Action action : Action.values()) {
-                if (action.name.equalsIgnoreCase(name)) {
-                    return action;
-                }
-            }
-            return null;
-        }
-
-        public String getName() {
-            return name;
-        }
-    }
-
-    private class BroadcastReceiver extends android.content.BroadcastReceiver {
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));
-            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
-            if (notification == null) {
-                stopSelf();
-                JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
-            } else {
-                startForeground(OngoingNotification.NOTIFICATION_ID, notification);
-                JitsiMeetLogger.i(TAG + " Service started");
-            }
-        }
-    }
 }

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

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -125,7 +126,7 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
             = ReactInstanceManagerHolder.getNativeModule(
                 PictureInPictureModule.class);
         if (pipModule != null
-                && pipModule.isPictureInPictureSupported()
+                && PictureInPictureModule.isPictureInPictureSupported()
                 && !JitsiMeetActivityDelegate.arePermissionsBeingRequested()
                 && this.url != null) {
             try {
@@ -197,14 +198,7 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
      * by/associated with the specified {@code name}.
      */
     @Override
-    @Deprecated
     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/JitsiMeetViewListener.java

@@ -21,7 +21,6 @@ import java.util.Map;
 /**
  * Interface for listening to events coming from Jitsi Meet.
  */
-@Deprecated
 public interface JitsiMeetViewListener {
     /**
      * Called when a conference was joined.

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

@@ -32,7 +32,6 @@ import java.util.regex.Pattern;
  * Utility methods for helping with transforming {@link ExternalAPIModule}
  * events into listener methods. Used with descendants of {@link BaseReactView}.
  */
-@Deprecated
 public final class ListenerUtils {
     /**
      * Extracts the methods defined in a listener and creates a mapping of this

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

@@ -47,7 +47,7 @@ class LocaleDetector extends ReactContextBaseJavaModule {
     public Map<String, Object> getConstants() {
         Context context = getReactApplicationContext();
         HashMap<String,Object> constants = new HashMap<>();
-        constants.put("locale", context.getResources().getConfiguration().locale.toLanguageTag());
+        constants.put("locale", context.getResources().getConfiguration().locale.toString());
         return constants;
     }
 
@@ -55,4 +55,4 @@ class LocaleDetector extends ReactContextBaseJavaModule {
     public String getName() {
         return "LocaleDetector";
     }
-}
+}

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

@@ -23,14 +23,13 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-
-import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
 import java.util.Random;
 
+
 /**
  * Helper class for creating the ongoing notification which is used with
  * {@link JitsiMeetOngoingConferenceService}. It allows the user to easily get back to the app
@@ -43,7 +42,7 @@ class OngoingNotification {
     private static final String CHANNEL_NAME = "Ongoing Conference Notifications";
 
     static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
-    private static long startingTime = 0;
+
 
     static void createOngoingConferenceNotificationChannel() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
@@ -57,7 +56,7 @@ class OngoingNotification {
         }
 
         NotificationManager notificationManager
-            = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+            = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
 
         NotificationChannel channel
             = notificationManager.getNotificationChannel(CHANNEL_ID);
@@ -74,7 +73,7 @@ class OngoingNotification {
         notificationManager.createNotificationChannel(channel);
     }
 
-    static Notification buildOngoingConferenceNotification(boolean isMuted) {
+    static Notification buildOngoingConferenceNotification() {
         Context context = ReactInstanceManagerHolder.getCurrentActivity();
         if (context == null) {
             JitsiMeetLogger.w(TAG + " Cannot create notification: no current context");
@@ -84,10 +83,11 @@ class OngoingNotification {
         Intent notificationIntent = new Intent(context, context.getClass());
         PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, 0);
 
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID);
-
-        if (startingTime == 0) {
-            startingTime = System.currentTimeMillis();
+        NotificationCompat.Builder builder;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            builder = new NotificationCompat.Builder(context, CHANNEL_ID);
+        } else {
+            builder = new NotificationCompat.Builder(context);
         }
 
         builder
@@ -97,36 +97,23 @@ class OngoingNotification {
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .setContentIntent(pendingIntent)
             .setOngoing(true)
-            .setWhen(startingTime)
-            .setUsesChronometer(true)
             .setAutoCancel(false)
             .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+            .setUsesChronometer(true)
             .setOnlyAlertOnce(true)
             .setSmallIcon(context.getResources().getIdentifier("ic_notification", "drawable", context.getPackageName()));
 
-        NotificationCompat.Action hangupAction = createAction(context, JitsiMeetOngoingConferenceService.Action.HANGUP, R.string.ongoing_notification_action_hang_up);
+        // Add a "hang-up" action only if we are using ConnectionService.
+        if (AudioModeModule.useConnectionService()) {
+            Intent hangupIntent = new Intent(context, JitsiMeetOngoingConferenceService.class);
+            hangupIntent.setAction(JitsiMeetOngoingConferenceService.Actions.HANGUP);
+            PendingIntent hangupPendingIntent
+                = PendingIntent.getService(context, 0, hangupIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+            NotificationCompat.Action hangupAction = new NotificationCompat.Action(0, "Hang up", hangupPendingIntent);
 
-        JitsiMeetOngoingConferenceService.Action toggleAudioAction = isMuted
-            ? JitsiMeetOngoingConferenceService.Action.UNMUTE : JitsiMeetOngoingConferenceService.Action.MUTE;
-        int toggleAudioTitle = isMuted ? R.string.ongoing_notification_action_unmute : R.string.ongoing_notification_action_mute;
-        NotificationCompat.Action audioAction = createAction(context, toggleAudioAction, toggleAudioTitle);
-
-        builder.addAction(hangupAction);
-        builder.addAction(audioAction);
+            builder.addAction(hangupAction);
+        }
 
         return builder.build();
     }
-
-    static void resetStartingtime() {
-        startingTime = 0;
-    }
-
-    private static NotificationCompat.Action createAction(Context context, JitsiMeetOngoingConferenceService.Action action, @StringRes int titleId) {
-        Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
-        intent.setAction(action.getName());
-        PendingIntent pendingIntent
-            = PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-        String title = context.getString(titleId);
-        return new NotificationCompat.Action(0, title, pendingIntent);
-    }
 }

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

@@ -1,27 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import com.google.gson.annotations.SerializedName;
-
-public class ParticipantInfo {
-
-    @SerializedName("participantId")
-    public String id;
-
-    @SerializedName("displayName")
-    public String displayName;
-
-    @SerializedName("avatarUrl")
-    public String avatarUrl;
-
-    @SerializedName("email")
-    public String email;
-
-    @SerializedName("name")
-    public String name;
-
-    @SerializedName("isLocal")
-    public boolean isLocal;
-
-    @SerializedName("role")
-    public String role;
-}

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

@@ -1,90 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-
-public class ParticipantsService extends android.content.BroadcastReceiver {
-
-    private static final String TAG = ParticipantsService.class.getSimpleName();
-    private static final String REQUEST_ID = "requestId";
-
-    private final Map<String, WeakReference<ParticipantsInfoCallback>> participantsInfoCallbackMap = new HashMap<>();
-
-    private static ParticipantsService instance;
-
-    @Nullable
-    public static ParticipantsService getInstance() {
-        return instance;
-    }
-
-    private ParticipantsService(Context context) {
-        LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(context);
-
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(BroadcastEvent.Type.PARTICIPANTS_INFO_RETRIEVED.getAction());
-        localBroadcastManager.registerReceiver(this, intentFilter);
-    }
-
-    static void init(Context context) {
-        instance = new ParticipantsService(context);
-    }
-
-    public void retrieveParticipantsInfo(ParticipantsInfoCallback participantsInfoCallback) {
-        String callbackKey = UUID.randomUUID().toString();
-        this.participantsInfoCallbackMap.put(callbackKey, new WeakReference<>(participantsInfoCallback));
-
-        String actionName = BroadcastAction.Type.RETRIEVE_PARTICIPANTS_INFO.getAction();
-        WritableMap data = Arguments.createMap();
-        data.putString(REQUEST_ID, callbackKey);
-        ReactInstanceManagerHolder.emitEvent(actionName, data);
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        BroadcastEvent event = new BroadcastEvent(intent);
-
-        switch (event.getType()) {
-            case PARTICIPANTS_INFO_RETRIEVED:
-                try {
-                    List<ParticipantInfo> participantInfoList = new Gson().fromJson(
-                        event.getData().get("participantsInfo").toString(),
-                        new TypeToken<ArrayList<ParticipantInfo>>() {
-                        }.getType());
-
-                    ParticipantsInfoCallback participantsInfoCallback = this.participantsInfoCallbackMap.get(event.getData().get(REQUEST_ID).toString()).get();
-
-                    if (participantsInfoCallback != null) {
-                        participantsInfoCallback.onReceived(participantInfoList);
-                        this.participantsInfoCallbackMap.remove(participantsInfoCallback);
-                    }
-                } catch (Exception e) {
-                    JitsiMeetLogger.w(TAG + "error parsing participantsList", e);
-                }
-
-                break;
-        }
-    }
-
-    public interface ParticipantsInfoCallback {
-        void onReceived(List<ParticipantInfo> participantInfoList);
-    }
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2017-present Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ 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;
@@ -31,42 +30,20 @@ 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;
 
-    private static boolean isSupported;
-    private boolean isDisabled;
+    static boolean isPictureInPictureSupported() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+    }
 
     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;
     }
 
     /**
@@ -84,11 +61,7 @@ class PictureInPictureModule extends ReactContextBaseJavaModule {
      */
     @TargetApi(Build.VERSION_CODES.O)
     public void enterPictureInPicture() {
-        if (isDisabled) {
-            return;
-        }
-
-        if (!isSupported) {
+        if (!isPictureInPictureSupported()) {
             throw new IllegalStateException("Picture-in-Picture not supported");
         }
 
@@ -131,15 +104,6 @@ class PictureInPictureModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @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 8x8, Inc.
+ * Copyright @ 2017-present Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,10 +33,21 @@ 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.
      */
@@ -60,7 +71,7 @@ class ProximityModule extends ReactContextBaseJavaModule {
         try {
             wakeLock
                 = powerManager.newWakeLock(
-                        PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK,
+                        PROXIMITY_SCREEN_OFF_WAKE_LOCK,
                         "jitsi:"+NAME);
         } catch (Throwable ignored) {
             wakeLock = null;

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

@@ -29,18 +29,13 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
  */
 @RequiresApi(api = Build.VERSION_CODES.O)
 @ReactModule(name = RNConnectionService.NAME)
-class RNConnectionService extends ReactContextBaseJavaModule {
+class RNConnectionService
+    extends ReactContextBaseJavaModule {
 
     public static final String NAME = "ConnectionService";
 
     private static final String TAG = ConnectionService.TAG;
 
-    /**
-     * Handler for dealing with call state changes. We are acting as a proxy between ConnectionService
-     * and other modules such as {@link AudioModeModule}.
-     */
-    private CallAudioStateListener callAudioStateListener;
-
     /**
      * Sets the audio route on all existing {@link android.telecom.Connection}s
      *
@@ -89,17 +84,9 @@ class RNConnectionService extends ReactContextBaseJavaModule {
         ReactApplicationContext ctx = getReactApplicationContext();
 
         Uri address = Uri.fromParts(PhoneAccount.SCHEME_SIP, handle, null);
-        PhoneAccountHandle accountHandle;
-
-        try {
-            accountHandle
-                = ConnectionService.registerPhoneAccount(getReactApplicationContext(), address, callUUID);
-        } catch (Throwable tr) {
-            JitsiMeetLogger.e(tr, TAG + " error in startCall");
-
-            promise.reject(tr);
-            return;
-        }
+        PhoneAccountHandle accountHandle
+            = ConnectionService.registerPhoneAccount(
+                    getReactApplicationContext(), address, callUUID);
 
         Bundle extras = new Bundle();
         extras.putParcelable(
@@ -113,23 +100,15 @@ class RNConnectionService extends ReactContextBaseJavaModule {
 
         ConnectionService.registerStartCallPromise(callUUID, promise);
 
-        TelecomManager tm = null;
-
         try {
-            tm = (TelecomManager) ctx.getSystemService(Context.TELECOM_SERVICE);
+            TelecomManager tm
+                = (TelecomManager) ctx.getSystemService(
+                        Context.TELECOM_SERVICE);
+
             tm.placeCall(address, extras);
-        } catch (Throwable tr) {
-            JitsiMeetLogger.e(tr, TAG + " error in startCall");
-            if (tm != null) {
-                try {
-                    tm.unregisterPhoneAccount(accountHandle);
-                } catch (Throwable tr1) {
-                    // UnsupportedOperationException: System does not support feature android.software.connectionservice
-                    // was observed here. Ignore.
-                }
-            }
+        } catch (Exception e) {
             ConnectionService.unregisterStartCallPromise(callUUID);
-            promise.reject(tr);
+            promise.reject(e);
         }
     }
 
@@ -167,11 +146,8 @@ class RNConnectionService extends ReactContextBaseJavaModule {
     @ReactMethod
     public void reportConnectedOutgoingCall(String callUUID, Promise promise) {
         JitsiMeetLogger.d(TAG + " reportConnectedOutgoingCall " + callUUID);
-        if (ConnectionService.setConnectionActive(callUUID)) {
-            promise.resolve(null);
-        } else {
-            promise.reject("CONNECTION_NOT_FOUND_ERROR", "Connection wasn't found.");
-        }
+        ConnectionService.setConnectionActive(callUUID);
+        promise.resolve(null);
     }
 
     @Override
@@ -192,28 +168,4 @@ class RNConnectionService extends ReactContextBaseJavaModule {
     public void updateCall(String callUUID, ReadableMap callState) {
         ConnectionService.updateCall(callUUID, callState);
     }
-
-    public CallAudioStateListener getCallAudioStateListener() {
-        return callAudioStateListener;
-    }
-
-    public void setCallAudioStateListener(CallAudioStateListener callAudioStateListener) {
-        this.callAudioStateListener = callAudioStateListener;
-    }
-
-    /**
-     * Handler for call state changes. {@code ConnectionServiceImpl} will call this handler when the
-     * call audio state changes.
-     *
-     * @param callAudioState The current call's audio state.
-     */
-    void onCallAudioStateChange(android.telecom.CallAudioState callAudioState) {
-        if (callAudioStateListener != null) {
-            callAudioStateListener.onCallAudioStateChange(callAudioState);
-        }
-    }
-
-    interface CallAudioStateListener {
-        void onCallAudioStateChange(android.telecom.CallAudioState callAudioState);
-    }
 }

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

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2019-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +18,13 @@
 package org.jitsi.meet.sdk;
 
 import android.app.Activity;
-
 import androidx.annotation.Nullable;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.devsupport.DevInternalSettings;
 import com.facebook.react.jscexecutor.JSCExecutorFactory;
@@ -34,9 +34,11 @@ import com.facebook.soloader.SoLoader;
 import com.oney.WebRTCModule.RTCVideoViewManager;
 import com.oney.WebRTCModule.WebRTCModule;
 
-import org.devio.rn.splashscreen.SplashScreenModule;
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 import org.webrtc.SoftwareVideoDecoderFactory;
 import org.webrtc.SoftwareVideoEncoderFactory;
+import org.webrtc.VideoDecoderFactory;
+import org.webrtc.VideoEncoderFactory;
 import org.webrtc.audio.AudioDeviceModule;
 import org.webrtc.audio.JavaAudioDeviceModule;
 
@@ -65,10 +67,8 @@ class ReactInstanceManagerHolder {
                 new AudioModeModule(reactContext),
                 new DropboxModule(reactContext),
                 new ExternalAPIModule(reactContext),
-                new JavaScriptSandboxModule(reactContext),
                 new LocaleDetector(reactContext),
                 new LogBridgeModule(reactContext),
-                new SplashScreenModule(reactContext),
                 new PictureInPictureModule(reactContext),
                 new ProximityModule(reactContext),
                 new WiFiStatsModule(reactContext),
@@ -84,13 +84,23 @@ class ReactInstanceManagerHolder {
 
         AudioDeviceModule adm = JavaAudioDeviceModule.builder(reactContext)
             .createAudioDeviceModule();
-        options.setAudioDeviceModule(adm);
+        VideoDecoderFactory videoDecoderFactory = new SoftwareVideoDecoderFactory();
+        VideoEncoderFactory videoEncoderFactory = new SoftwareVideoEncoderFactory();
 
-        options.setVideoDecoderFactory(new SoftwareVideoDecoderFactory());
-        options.setVideoEncoderFactory(new SoftwareVideoEncoderFactory());
+        options.setAudioDeviceModule(adm);
+        options.setVideoDecoderFactory(videoDecoderFactory);
+        options.setVideoEncoderFactory(videoEncoderFactory);
 
         nativeModules.add(new WebRTCModule(reactContext, options));
 
+        try {
+            Class<?> amplitudeModuleClass = Class.forName("org.jitsi.meet.sdk.AmplitudeModule");
+            Constructor constructor = amplitudeModuleClass.getConstructor(ReactApplicationContext.class);
+            nativeModules.add((NativeModule)constructor.newInstance(reactContext));
+        } catch (Exception e) {
+            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
+        }
+
         return nativeModules;
     }
 
@@ -178,16 +188,14 @@ class ReactInstanceManagerHolder {
 
         List<ReactPackage> packages
             = new ArrayList<>(Arrays.asList(
+                new com.BV.LinearGradient.LinearGradientPackage(),
                 new com.calendarevents.CalendarEventsPackage(),
                 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.learnium.RNDeviceInfo.RNDeviceInfo(),
                 new com.ocetnik.timer.BackgroundTimerPackage(),
                 new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
                 new com.reactnativecommunity.netinfo.NetInfoPackage(),
-                new com.reactnativecommunity.slider.ReactSliderPackage(),
                 new com.reactnativecommunity.webview.RNCWebViewPackage(),
                 new com.rnimmersive.RNImmersivePackage(),
                 new com.zmxv.RNSound.RNSoundPackage(),

android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetLogger.java

@@ -24,24 +24,11 @@ public class JitsiMeetLogger {
     }
 
     public static void addHandler(JitsiMeetBaseLogHandler handler) {
-        if (!Timber.forest().contains(handler)) {
-            try {
-                Timber.plant(handler);
-            } catch (Throwable t) {
-                Timber.w(t, "Couldn't add log handler");
-            }
-
-        }
+        Timber.plant(handler);
     }
 
     public static void removeHandler(JitsiMeetBaseLogHandler handler) {
-        if (Timber.forest().contains(handler)) {
-            try {
-                Timber.uproot(handler);
-            } catch (Throwable t) {
-                Timber.w(t, "Couldn't remove log handler");
-            }
-        }
+        Timber.uproot(handler);
     }
 
     public static void v(String message, Object... args) {

android/sdk/src/main/java/org/jitsi/meet/sdk/net/NAT64AddrInfoModule.java

@@ -43,7 +43,7 @@ public class NAT64AddrInfoModule
      * The host for which the module wil try to resolve both IPv4 and IPv6
      * addresses in order to figure out the NAT64 prefix.
      */
-    private final static String HOST = "ipv4only.arpa";
+    private final static String HOST = "nat64.jitsi.net";
 
     /**
      * How long is the {@link NAT64AddrInfo} instance valid.

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

@@ -3,7 +3,4 @@
     <string name="dropbox_app_key"></string>
     <string name="ongoing_notification_title">Ongoing meeting</string>
     <string name="ongoing_notification_text">You are currently in a meeting. Tap to return to it.</string>
-    <string name="ongoing_notification_action_hang_up">Hang up</string>
-    <string name="ongoing_notification_action_mute">Mute</string>
-    <string name="ongoing_notification_action_unmute">Unmute</string>
 </resources>

android/settings.gradle

@@ -1,30 +1,24 @@
 rootProject.name = 'jitsi-meet'
 
 include ':app', ':sdk'
-include ':react-native-async-storage'
-project(':react-native-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-async-storage/async-storage/android')
 include ':react-native-background-timer'
 project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android')
 include ':react-native-calendar-events'
 project(':react-native-calendar-events').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-calendar-events/android')
+include ':react-native-community-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-device-info'
-project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
 include ':react-native-google-signin'
-project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/google-signin/android')
+project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-signin/android')
 include ':react-native-immersive'
 project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
 include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
-include ':react-native-slider'
-project(':react-native-slider').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/slider/android')
+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'

app.js

@@ -1,29 +1,15 @@
 /* application specific logic */
 
 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';
-
-// 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;
-    });
-}
+import UI from './modules/UI/UI';
 
 window.APP = {
     API,
@@ -46,6 +32,7 @@ window.APP = {
     },
 
     keyboardshortcut,
+    remoteControl,
     translation,
     UI
 };

babel.config.js

@@ -1,9 +0,0 @@
-module.exports = {
-    presets: [ 'module:metro-react-native-babel-preset' ],
-    env: {
-        production: {
-            plugins: [ 'react-native-paper/babel' ]
-        }
-    },
-    plugins: [ 'optional-require' ]
-};

base.html

@@ -1 +0,0 @@
-<base href="/" />

config.js

@@ -1,6 +1,16 @@
 /* eslint-disable no-unused-vars, no-var */
 
 var config = {
+    // Configuration
+    //
+
+    // Alternative location for the configuration.
+    // configLocation: './config.json',
+
+    // Custom function which given the URL path should return a room name.
+    // getroomnode: function (path) { return 'someprefixpossiblybasedonpath'; },
+
+
     // Connection
     //
 
@@ -14,6 +24,12 @@ 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',
+
         // Focus component domain. Defaults to focus.<domain>.
         // focus: 'focus.jitsi-meet.example.com',
 
@@ -24,15 +40,10 @@ var config = {
     // BOSH URL. FIXME: use XEP-0156 to discover it.
     bosh: '//jitsi-meet.example.com/http-bind',
 
-    // Websocket URL
-    // websocket: 'wss://jitsi-meet.example.com/xmpp-websocket',
-
     // The name of client node advertised in XEP-0115 'c' stanza
     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',
 
 
@@ -40,9 +51,8 @@ var config = {
     //
 
     testing: {
-        // Disables the End to End Encryption feature. Useful for debugging
-        // issues related to insertable streams.
-        // disableE2EE: false,
+        // Enables experimental simulcast support on Firefox.
+        enableFirefoxSimulcast: false,
 
         // P2P test mode disables automatic switching to P2P when there are 2
         // participants in the conference.
@@ -50,29 +60,8 @@ var config = {
 
         // Enables the test specific features consumed by jitsi-meet-torture
         // testMode: false
-
-        // 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. This setting has been deprecated.
-        // desktopSharingFrameRate.max now determines whether simulcast will be enabled
-        // or disabled for the screenshare.
-        // capScreenshareBitrate: 1 // 0 to disable - deprecated.
-
-        // 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.
     },
 
-    // Enables reactions feature.
-    enableReactions: false,
-
     // Disables ICE/UDP by filtering out local and remote UDP candidates in
     // signalling.
     // webrtcIceUdpDisable: false,
@@ -85,34 +74,10 @@ var config = {
     // Media
     //
 
-    // Enable unified plan implementation support on Chromium based browsers.
-    // enableUnifiedOnChrome: false,
-
     // Audio
 
     // Disable measuring of audio levels.
     // disableAudioLevels: false,
-    // audioLevelsInterval: 200,
-
-    // Enabling this will run the lib-jitsi-meet no audio detection module which
-    // will notify the user if the current selected microphone has no audio
-    // input and will suggest another valid device if one is present.
-    enableNoAudioDetection: true,
-
-    // Enabling this will show a "Save Logs" link in the GSM popover that can be
-    // used to collect debug information (XMPP IQs, SDP offer/answer cycles)
-    // about the call.
-    // enableSaveLogs: false,
-
-    // Enabling this will hide the "Show More" link in the GSM popover that can be
-    // used to display more statistics about the connection (IP, Port, protocol, etc).
-    // disableShowMoreStats: true,
-
-    // Enabling this will run the lib-jitsi-meet noise detection module which will
-    // notify the user if there is noise, other than voice, coming from the current
-    // selected microphone. The purpose it to let the user know that the input could
-    // be potentially unpleasant for other meeting participants.
-    enableNoisyMicDetection: true,
 
     // Start the conference in audio only mode (no video is being received nor
     // sent).
@@ -129,32 +94,19 @@ var config = {
     // participants and to enable it back a reload is needed.
     // startSilent: false
 
-    // Enables support for opus-red (redundancy for Opus).
-    // enableOpusRed: false,
-
-    // Specify audio quality stereo and opusMaxAverageBitrate values in order to enable HD audio.
-    // Beware, by doing so, you are disabling echo cancellation, noise suppression and AGC.
-    // audioQuality: {
-    //     stereo: false,
-    //     opusMaxAverageBitrate: null // Value to fit the 6000 to 510000 range.
-    // },
-
     // 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
-    // resolution of 720p.
+    // util#browser#usesNewGumFlow. The constraints are independency from
+    // this config's resolution value. Defaults to requesting an ideal aspect
+    // ratio of 16:9 with an ideal resolution of 720.
     // constraints: {
     //     video: {
+    //         aspectRatio: 16 / 9,
     //         height: {
     //             ideal: 720,
     //             max: 720,
@@ -182,7 +134,6 @@ 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
@@ -191,6 +142,22 @@ 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,
@@ -238,147 +205,44 @@ var config = {
     // Default value for the channel "last N" attribute. -1 for unlimited.
     channelLastN: -1,
 
-    // Provides a way for the lastN value to be controlled through the UI.
-    // When startLastN is present, conference starts with a last-n value of startLastN and channelLastN
-    // value will be used when the quality level is selected using "Manage Video Quality" slider.
-    // startLastN: 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
-    // },
-
-    // Provides a way to translate the legacy bridge signaling messages, 'LastNChangedEvent',
-    // 'SelectedEndpointsChangedEvent' and 'ReceiverVideoConstraint' into the new 'ReceiverVideoConstraints' message
-    // that invokes the new bandwidth allocation algorithm in the bridge which is described here
-    // - https://github.com/jitsi/jitsi-videobridge/blob/master/doc/allocation.md.
-    // useNewBandwidthAllocationStrategy: false,
-
-    // 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 enforce the preferred codec for the conference even when the conference has endpoints
-    //    // that do not support the preferred codec. For example, older versions of Safari do not support VP9 yet.
-    //    // This will result in Safari not being able to decode video from endpoints sending VP9 video.
-    //    // When set to false, the conference falls back to VP8 whenever there is an endpoint that doesn't support the
-    //    // preferred codec and goes back to the preferred codec when that endpoint leaves.
-    //    // enforcePreferredCodec: false,
-    //
-    //    // Provides a way to configure the maximum bitrates that will be enforced on the simulcast streams for
-    //    // video tracks. The keys in the object represent the type of the stream (LD, SD or HD) and the values
-    //    // are the max.bitrates to be set on that particular type of stream. The actual send may vary based on
-    //    // the available bandwidth calculated by the browser, but it will be capped by the values specified here.
-    //    // This is currently not implemented on app based clients on mobile.
-    //    maxBitratesVideo: {
-    //          H264: {
-    //              low: 200000,
-    //              standard: 500000,
-    //              high: 1500000
-    //          },
-    //          VP8 : {
-    //              low: 200000,
-    //              standard: 500000,
-    //              high: 1500000
-    //          },
-    //          VP9: {
-    //              low: 100000,
-    //              standard: 300000,
-    //              high:  1200000
-    //          }
-    //    },
-    //
-    //    // The options can be used to override default thresholds of video thumbnail heights corresponding to
-    //    // 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'
-    //    },
-    //
-    //    // Provides a way to resize the desktop track to 720p (if it is greater than 720p) before creating a canvas
-    //    // for the presenter mode (camera picture-in-picture mode with screenshare).
-    //    resizeDesktopForPresenter: false
-    // },
-
-    // // 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,
 
-    // Disables or enables TCC support in this client (default: enabled).
+    // Disables or enables TCC (the default is in Jicofo and set to true)
+    // (draft-holmer-rmcat-transport-wide-cc-extensions-01). This setting
+    // affects congestion control, it practically enables send-side bandwidth
+    // estimations.
     // enableTcc: true,
 
-    // Disables or enables REMB support in this client (default: enabled).
-    // enableRemb: true,
+    // Disables or enables REMB (the default is in Jicofo and set to false)
+    // (draft-alvestrand-rmcat-remb-03). This setting affects congestion
+    // control, it practically enables recv-side bandwidth estimations. When
+    // both TCC and REMB are enabled, TCC takes precedence. When both are
+    // 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,
 
-    // Enables forced reload of the client when the call is migrated as a result of
-    // the bridge going down.
-    // enableForcedReload: true,
+    // Use XEP-0215 to fetch STUN and TURN servers.
+    // useStunTurn: true,
+
+    // Enable IPv6 support.
+    // useIPv6: true,
+
+    // 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,
 
-    // 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
 
     // UI
     //
 
-    // Disables responsive tiles.
-    // disableResponsiveTiles: false,
-
-    // Hides lobby button
-    // hideLobbyButton: false,
+    // Use display name as XMPP nickname.
+    // useNicks: false,
 
     // Require users to always specify a display name.
     // requireDisplayName: true,
@@ -387,31 +251,27 @@ var config = {
     // will be joined when no room is specified.
     enableWelcomePage: true,
 
-    // Disable app shortcuts that are registered upon joining a conference
-    // disableShortcuts: false,
-
-    // Disable initial browser getUserMedia requests.
-    // This is useful for scenarios where users might want to start a conference for screensharing only
-    // disableInitialGUM: false,
-
     // Enabling the close page will ignore the welcome page redirection when
     // a call is hangup.
     // enableClosePage: false,
 
     // Disable hiding of remote thumbnails when in a 1-on-1 conference call.
-    // Setting this to null, will also disable showing the remote videos
-    // when the toolbar is shown on mouse movements
-    // disable1On1Mode: null | false | true,
+    // disable1On1Mode: false,
 
     // Default language for the user interface.
     // defaultLanguage: 'en',
 
-    // Disables profile and the edit of all fields from the profile settings (display name and email)
-    // disableProfile: false,
+    // If true all users without a token will be considered guests and all users
+    // with token will be considered non-guests. Only guests will be allowed to
+    // edit their profile.
+    enableUserRolesBasedOnToken: false,
 
     // Whether or not some features are checked based on token.
     // enableFeaturesBasedOnToken: false,
 
+    // Enable lock room for all moderators, even when userRolesBasedOnToken is enabled and participants are guests.
+    // lockRoomGuestEnabled: false,
+
     // When enabled the password used for locking a room is restricted to up to the number of digits specified
     // roomPasswordNumberOfDigits: 10,
     // default: roomPasswordNumberOfDigits: false,
@@ -424,78 +284,6 @@ 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 etherpad integration is enabled, setting this to true will
-    // automatically open the etherpad when a participant joins.  This
-    // does not affect the mobile app since opening an etherpad
-    // obscures the conference controls -- it's better to let users
-    // choose to open the pad on their own in that case.
-    // openSharedDocumentOnJoin: 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,
-
-    // Base URL for a Gravatar-compatible service. Defaults to libravatar.
-    // gravatarBaseURL: 'https://seccdn.libravatar.org/avatar/',
-
-    // App name to be displayed in the invitation email subject, as an alternative to
-    // interfaceConfig.APP_NAME.
-    // inviteAppName: null,
-
-    // Moved from interfaceConfig(TOOLBAR_BUTTONS).
-    // The name of the toolbar buttons to display in the toolbar, including the
-    // "More actions" menu. If present, the button will display. Exceptions are
-    // "livestreaming" and "recording" which also require being a moderator and
-    // some other values in config.js to be enabled. Also, the "profile" button will
-    // not display for users with a JWT.
-    // Notes:
-    // - it's impossible to choose which buttons go in the "More actions" menu
-    // - it's impossible to control the placement of buttons
-    // - 'desktop' controls the "Share your screen" button
-    // - if `toolbarButtons` is undefined, we fallback to enabling all buttons on the UI
-    // toolbarButtons: [
-    //    'camera',
-    //    'chat',
-    //    'closedcaptions',
-    //    'desktop',
-    //    'download',
-    //    'embedmeeting',
-    //    'etherpad',
-    //    'feedback',
-    //    'filmstrip',
-    //    'fullscreen',
-    //    'hangup',
-    //    'help',
-    //    'invite',
-    //    'livestreaming',
-    //    'microphone',
-    //    'mute-everyone',
-    //    'mute-video-everyone',
-    //    'participants-pane',
-    //    'profile',
-    //    'raisehand',
-    //    'recording',
-    //    'security',
-    //    'select-background',
-    //    'settings',
-    //    'shareaudio',
-    //    'sharedvideo',
-    //    'shortcuts',
-    //    'stats',
-    //    'tileview',
-    //    'toggle-camera',
-    //    'videoquality',
-    //    '__end'
-    // ],
-
     // Stats
     //
 
@@ -505,23 +293,18 @@ var config = {
     // estimation tests.
     // gatherStats: false,
 
-    // The interval at which PeerConnection.getStats() is called. Defaults to 10000
-    // pcStatsInterval: 10000,
-
     // To enable sending statistics to callstats.io you must provide the
     // Application ID and Secret.
     // callStatsID: '',
     // callStatsSecret: '',
 
-    // Enables sending participants' display names to callstats
-    // enableDisplayNameInStats: false,
+    // enables callstatsUsername to be reported as statsId and used
+    // by callstats as repoted remote id
+    // enableStatsID: false
 
-    // Enables sending participants' emails (if available) to callstats and other analytics
-    // enableEmailInStats: false,
+    // enables sending participants display name to callstats
+    // enableDisplayNameInStats: false
 
-    // Controls the percentage of automatic feedback shown to participants when callstats is enabled.
-    // The default value is 100%. If set to 0, no automatic feedback will be requested
-    // feedbackPercentage: 100,
 
     // Privacy
     //
@@ -544,8 +327,15 @@ var config = {
         // connection.
         enabled: true,
 
-        // Enable unified plan implementation support on Chromium for p2p connection.
-        // enableUnifiedOnChrome: false,
+        // 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:stun.l.google.com:19302' },
+            { urls: 'stun:stun1.l.google.com:19302' },
+            { urls: 'stun:stun2.l.google.com:19302' }
+        ],
 
         // Sets the ICE transport policy for the p2p connection. At the time
         // of this writing the list of possible values are 'all' and 'relay',
@@ -556,58 +346,25 @@ var config = {
         // iceTransportPolicy: 'all',
 
         // If set to true, it will prefer to use H.264 for P2P calls (if H.264
-        // 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',
+        // is supported).
+        preferH264: true
 
         // If set to true, disable H.264 video codec by stripping it out of the
-        // SDP. This setting is deprecated, use disabledCodec instead.
+        // SDP.
         // 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,
-
-        // The STUN servers that will be used in the peer to peer connections
-        stunServers: [
-
-            // { urls: 'stun:jitsi-meet.example.com:3478' },
-            { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' }
-        ]
+        // backToP2PDelay: 5
     },
 
     analytics: {
         // 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
@@ -615,40 +372,13 @@ 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: {
         // shard: "shard1",
         // region: "europe",
         // userRegion: "asia"
-    },
-
-    // Decides whether the start/stop recording audio notifications should play on record.
-    // disableRecordAudioNotification: false,
-
-    // Disables the sounds that play when other participants join or leave the
-    // conference (if set to true, these sounds will not be played).
-    // disableJoinLeaveSounds: false,
-
-    // Disables the sounds that play when a chat message is received.
-    // disableIncomingMessageSound: false,
-
-    // Information for the chrome extension banner
-    // chromeExtensionBanner: {
-    //     // The chrome extension to be installed address
-    //     url: 'https://chrome.google.com/webstore/detail/jitsi-meetings/kglhbbefdnlheedjiejgomgmfplipfeb',
-
-    //     // Extensions info which allows checking if they are installed or not
-    //     chromeExtensionsInfo: [
-    //         {
-    //             id: 'kglhbbefdnlheedjiejgomgmfplipfeb',
-    //             path: 'jitsi-logo-48x48.png'
-    //         }
-    //     ]
-    // },
+    }
 
     // Local Recording
     //
@@ -656,8 +386,8 @@ var config = {
     // localRecording: {
     // Enables local recording.
     // Additionally, 'localrecording' (all lowercase) needs to be added to
-    // the `toolbarButtons`-array for the Local Recording button to show up
-    // on the toolbar.
+    // TOOLBAR_BUTTONS in interface_config.js for the Local Recording
+    // button to show up on the toolbar.
     //
     //     enabled: true,
     //
@@ -666,7 +396,7 @@ var config = {
     //     format: 'flac'
     //
 
-    // },
+    // }
 
     // Options related to end-to-end (participant to participant) ping.
     // e2eping: {
@@ -678,125 +408,28 @@ var config = {
     //   // with the measured RTT will be sent. Defaults to 60000, set
     //   // to <= 0 to disable.
     //   analyticsInterval: 60000,
-    //   },
+    //   }
 
     // If set, will attempt to use the provided video input device label when
     // triggering a screenshare, instead of proceeding through the normal flow
     // for obtaining a desktop stream.
     // NOTE: This option is experimental and is currently intended for internal
     // use only.
-    // _desktopSharingSourceDevice: 'sample-id-or-label',
+    // _desktopSharingSourceDevice: 'sample-id-or-label'
 
     // If true, any checks to handoff to another application will be prevented
     // and instead the app will continue to display in the current browser.
-    // disableDeepLinking: false,
+    // disableDeepLinking: false
 
     // A property to disable the right click context menu for localVideo
     // the menu has option to flip the locally seen video for local presentations
-    // disableLocalVideoFlip: false,
-
-    // A property used to unset the default flip state of the local video.
-    // When it is set to 'true', the local(self) video will not be mirrored anymore.
-    // doNotFlipLocalVideo: 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
-    //    // user documentation.
-    //    userDocumentationURL: 'https://docs.example.com/video-meetings.html',
-    //    // If specified a 'Download our apps' button will be displayed in the overflow menu with a link
-    //    // to the specified URL for an app download page.
-    //    downloadAppsUrl: 'https://docs.example.com/our-apps.html'
-    // },
-
-    // Options related to the remote participant menu.
-    // remoteVideoMenu: {
-    //     // If set to true the 'Kick out' button will be disabled.
-    //     disableKick: true,
-    //     // If set to true the 'Grant moderator' button will be disabled.
-    //     disableGrantModerator: true
-    // },
-
-    // If set to true all muting operations of remote participants will be disabled.
-    // disableRemoteMute: true,
-
-    // Enables support for lip-sync for this client (if the browser supports it).
-    // enableLipSync: false
-
-    /**
-     External API url used to receive branding specific information.
-     If there is no url set or there are missing fields, the defaults are applied.
-     The config file should be in JSON.
-     None of the fields are mandatory and the response must have the shape:
-     {
-         // The domain url to apply (will replace the domain in the sharing conference link/embed section)
-         inviteDomain: 'example-company.org,
-         // 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'
-     }
-    */
-    // dynamicBrandingUrl: '',
-
-    // Sets the background transparency level. '0' is fully transparent, '1' is opaque.
-    // backgroundAlpha: 1,
-
-    // 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',
-
-    // If true, tile view will not be enabled automatically when the participants count threshold is reached.
-    // disableTileView: true,
-
-    // Hides the conference subject
-    // hideConferenceSubject: true,
-
-    // Hides the recording label
-    // hideRecordingLabel: false,
-
-    // Hides the conference timer.
-    // hideConferenceTimer: true,
-
-    // Hides the participants stats
-    // hideParticipantsStats: true,
-
-    // Sets the conference subject
-    // subject: 'Conference Subject',
-
-    // This property is related to the use case when jitsi-meet is used via the IFrame API. When the property is true
-    // jitsi-meet will use the local storage of the host page instead of its own. This option is useful if the browser
-    // is not persisting the local storage inside the iframe.
-    // useHostPageLocalStorage: true,
-
-    // etherpad ("shared document") integration.
-    //
-
-    // If set, add a "Open shared document" link to the bottom right menu that
-    // will open an etherpad document.
-    // etherpad_base: 'https://your-etherpad-installati.on/p/',
-
-    // If etherpad_base is set, and useRoomAsSharedDocumentName is set to true,
-    // open a pad with the name of the room (lowercased) instead of a pad with a
-    // random UUID.
-    // useRoomAsSharedDocumentName: true,
+    // disableLocalVideoFlip: false
 
     // List of undocumented settings used in jitsi-meet
     /**
      _immediateReloadThreshold
+     autoRecord
+     autoRecordToken
      debug
      debugAudioLevels
      deploymentInfo
@@ -806,6 +439,7 @@ var config = {
      dialOutCodesUrl
      disableRemoteControl
      displayJids
+     etherpad_base
      externalConnectUrl
      firefox_fake_device
      googleApiApplicationClientID
@@ -818,13 +452,6 @@ 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
@@ -839,89 +466,15 @@ var config = {
      disableAP
      disableHPF
      disableNS
+     enableLipSync
      enableTalkWhileMuted
      forceJVB121Ratio
-     forceTurnRelay
      hiddenDomain
      ignoreStartMuted
-     websocketKeepAlive
-     websocketKeepAliveUrl
+     nick
+     startBitrate
      */
 
-    /**
-     * Default interval (milliseconds) for triggering mouseMoved iframe API event
-     */
-    mouseMoveCallbackInterval: 1000,
-
-    /**
-        Use this array to configure which notifications will be shown to the user
-        The items correspond to the title or description key of that notification
-        Some of these notifications also depend on some other internal logic to be displayed or not,
-        so adding them here will not ensure they will always be displayed
-
-        A falsy value for this prop will result in having all notifications enabled (e.g null, undefined, false)
-    */
-    // notifications: [
-    //     'connection.CONNFAIL', // shown when the connection fails,
-    //     'dialog.cameraNotSendingData', // shown when there's no feed from user's camera
-    //     'dialog.kickTitle', // shown when user has been kicked
-    //     'dialog.liveStreaming', // livestreaming notifications (pending, on, off, limits)
-    //     'dialog.lockTitle', // shown when setting conference password fails
-    //     'dialog.maxUsersLimitReached', // shown when maximmum users limit has been reached
-    //     'dialog.micNotSendingData', // shown when user's mic is not sending any audio
-    //     'dialog.passwordNotSupportedTitle', // shown when setting conference password fails due to password format
-    //     'dialog.recording', // recording notifications (pending, on, off, limits)
-    //     'dialog.remoteControlTitle', // remote control notifications (allowed, denied, start, stop, error)
-    //     'dialog.reservationError',
-    //     'dialog.serviceUnavailable', // shown when server is not reachable
-    //     'dialog.sessTerminated', // shown when there is a failed conference session
-    //     'dialog.sessionRestarted', // show when a client reload is initiated because of bridge migration
-    //     'dialog.tokenAuthFailed', // show when an invalid jwt is used
-    //     'dialog.transcribing', // transcribing notifications (pending, off)
-    //     'dialOut.statusMessage', // shown when dial out status is updated.
-    //     'liveStreaming.busy', // shown when livestreaming service is busy
-    //     'liveStreaming.failedToStart', // shown when livestreaming fails to start
-    //     'liveStreaming.unavailableTitle', // shown when livestreaming service is not reachable
-    //     'lobby.joinRejectedMessage', // shown when while in a lobby, user's request to join is rejected
-    //     'lobby.notificationTitle', // shown when lobby is toggled and when join requests are allowed / denied
-    //     'localRecording.localRecording', // shown when a local recording is started
-    //     'notify.disconnected', // shown when a participant has left
-    //     'notify.grantedTo', // shown when moderator rights were granted to a participant
-    //     'notify.invitedOneMember', // shown when 1 participant has been invited
-    //     'notify.invitedThreePlusMembers', // shown when 3+ participants have been invited
-    //     'notify.invitedTwoMembers', // shown when 2 participants have been invited
-    //     'notify.kickParticipant', // shown when a participant is kicked
-    //     'notify.mutedRemotelyTitle', // shown when user is muted by a remote party
-    //     'notify.mutedTitle', // shown when user has been muted upon joining,
-    //     'notify.newDeviceAudioTitle', // prompts the user to use a newly detected audio device
-    //     'notify.newDeviceCameraTitle', // prompts the user to use a newly detected camera
-    //     'notify.passwordRemovedRemotely', // shown when a password has been removed remotely
-    //     'notify.passwordSetRemotely', // shown when a password has been set remotely
-    //     'notify.raisedHand', // shown when a partcipant used raise hand,
-    //     'notify.startSilentTitle', // shown when user joined with no audio
-    //     'prejoin.errorDialOut',
-    //     'prejoin.errorDialOutDisconnected',
-    //     'prejoin.errorDialOutFailed',
-    //     'prejoin.errorDialOutStatus',
-    //     'prejoin.errorStatusCode',
-    //     'prejoin.errorValidation',
-    //     'recording.busy', // shown when recording service is busy
-    //     'recording.failedToStart', // shown when recording fails to start
-    //     'recording.unavailableTitle', // shown when recording service is not reachable
-    //     'toolbar.noAudioSignalTitle', // shown when a broken mic is detected
-    //     'toolbar.noisyAudioInputTitle', // shown when noise is detected for the current microphone
-    //     'toolbar.talkWhileMutedPopup', // shown when user tries to speak while muted
-    //     'transcribing.failedToStart' // shown when transcribing fails to start
-    // ],
-
-    // Prevent the filmstrip from autohiding when screen width is under a certain threshold
-    // disableFilmstripAutohiding: false,
-
-    // Allow all above example options to include a trailing comma and
-    // prevent fear when commenting out the last value.
-    makeJsonParserHappy: 'even if last key had a trailing comma'
-
-    // no configuration value should follow this line.
 };
 
 /* eslint-enable no-unused-vars, no-var */

connection.js

@@ -1,32 +1,19 @@
 /* global APP, JitsiMeetJS, config */
 
-import { jitsiLocalStorage } from '@jitsi/js-utils';
-import Logger from 'jitsi-meet-logger';
+import AuthHandler from './modules/UI/authentication/AuthHandler';
+import jitsiLocalStorage from './modules/util/JitsiLocalStorage';
 
-import { redirectToTokenAuthService } from './modules/UI/authentication/AuthHandler';
-import { LoginDialog } from './react/features/authentication/components';
-import { isTokenAuthEnabled } from './react/features/authentication/functions';
 import {
     connectionEstablished,
     connectionFailed
-} from './react/features/base/connection/actions';
-import { openDialog } from './react/features/base/dialog/actions';
-import { setJWT } from './react/features/base/jwt';
+} from './react/features/base/connection';
 import {
     isFatalJitsiConnectionError,
     JitsiConnectionErrors,
     JitsiConnectionEvents
 } from './react/features/base/lib-jitsi-meet';
-import { isVpaasMeeting, getJaasJWT } from './react/features/jaas/functions';
-import { setPrejoinDisplayNameRequired } from './react/features/prejoin/actions';
-const logger = Logger.getLogger(__filename);
 
-/**
- * The feature announced so we can distinguish jibri participants.
- *
- * @type {string}
- */
-export const DISCO_JIBRI_FEATURE = 'http://jitsi.org/protocol/jibri';
+const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * Checks if we have data to use attach instead of connect. If we have the data
@@ -84,36 +71,17 @@ function checkForAttachParametersAndConnect(id, password, connection) {
  * @returns {Promise<JitsiConnection>} connection if
  * everything is ok, else error.
  */
-export async function connect(id, password, roomName) {
+function connect(id, password, roomName) {
     const connectionConfig = Object.assign({}, config);
-    const state = APP.store.getState();
-    let { jwt } = state['features/base/jwt'];
-    const { iAmRecorder, iAmSipGateway } = state['features/base/config'];
+    const { issuer, jwt } = APP.store.getState()['features/base/jwt'];
 
-    if (!iAmRecorder && !iAmSipGateway && !jwt && isVpaasMeeting(state)) {
-        jwt = await getJaasJWT(state);
-        APP.store.dispatch(setJWT(jwt));
-    }
+    connectionConfig.bosh += `?room=${roomName}`;
 
-    // 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.
-    let serviceUrl = connectionConfig.websocket || connectionConfig.bosh;
-
-    serviceUrl += `?room=${roomName}`;
-
-    // FIXME Remove deprecated 'bosh' option assignment at some point(LJM will be accepting only 'serviceUrl' option
-    //  in future). It's included for the time being for Jitsi Meet and lib-jitsi-meet versions interoperability.
-    connectionConfig.serviceUrl = connectionConfig.bosh = serviceUrl;
-
-    if (connectionConfig.websocketKeepAliveUrl) {
-        connectionConfig.websocketKeepAliveUrl += `?room=${roomName}`;
-    }
-
-    const connection = new JitsiMeetJS.JitsiConnection(null, jwt, connectionConfig);
-
-    if (config.iAmRecorder) {
-        connection.addFeature(DISCO_JIBRI_FEATURE);
-    }
+    const connection
+        = new JitsiMeetJS.JitsiConnection(
+            null,
+            jwt && issuer && issuer !== 'anonymous' ? jwt : undefined,
+            connectionConfig);
 
     return new Promise((resolve, reject) => {
         connection.addEventListener(
@@ -125,10 +93,6 @@ export async function connect(id, password, roomName) {
         connection.addEventListener(
             JitsiConnectionEvents.CONNECTION_FAILED,
             connectionFailedHandler);
-        connection.addEventListener(
-            JitsiConnectionEvents.DISPLAY_NAME_REQUIRED,
-            displayNameRequiredHandler
-        );
 
         /* eslint-disable max-params */
         /**
@@ -182,14 +146,6 @@ export async 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);
     });
 }
@@ -222,41 +178,14 @@ export function openConnection({ id, password, retry, roomName }) {
 
     return connect(id, password, roomName).catch(err => {
         if (retry) {
-            const { jwt } = APP.store.getState()['features/base/jwt'];
+            const { issuer, jwt } = APP.store.getState()['features/base/jwt'];
 
-            if (err === JitsiConnectionErrors.PASSWORD_REQUIRED && !jwt) {
-                return requestAuth(roomName);
+            if (err === JitsiConnectionErrors.PASSWORD_REQUIRED
+                    && (!jwt || issuer === 'anonymous')) {
+                return AuthHandler.requestAuth(roomName, connect);
             }
         }
 
         throw err;
     });
 }
-
-/**
- * Show Authentication Dialog and try to connect with new credentials.
- * If failed to connect because of PASSWORD_REQUIRED error
- * then ask for password again.
- * @param {string} [roomName] name of the conference room
- *
- * @returns {Promise<JitsiConnection>}
- */
-function requestAuth(roomName) {
-    const config = APP.store.getState()['features/base/config'];
-
-    if (isTokenAuthEnabled(config)) {
-        // This Promise never resolves as user gets redirected to another URL
-        return new Promise(() => redirectToTokenAuthService(roomName));
-    }
-
-    return new Promise(resolve => {
-        const onSuccess = connection => {
-            resolve(connection);
-        };
-
-        APP.store.dispatch(
-            openDialog(LoginDialog, { onSuccess,
-                roomName })
-        );
-    });
-}