android: add ability to override SDK version when releasing

- don't hardcode defaults in gradle files
- allow for uploading also to HTTP URLs
- support HTTP authentication when publishing

.flowconfig

@@ -33,7 +33,6 @@
 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
 node_modules/react-native/flow/
-node_modules/react-native/flow-github/
 
 [options]
 emoji=true
@@ -83,4 +82,4 @@ module.file_ext=.jsx
 module.file_ext=.json
 
 [version]
-^0.78.0
+^0.92.0

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

@@ -1,12 +1,13 @@
 ---
-name: Bug Report
-about: Before posting, please make sure you check https://community.jitsi.org
+name: Bug report
+about: Create a report to help us improve
 
 ---
 
 *This Issue tracker is only for reporting bugs and tracking code related issues.*
 
-Before posting, please make sure you check community.jitsi.org to see if the same or similar bugs have already been discussed. General questions, installation help, and feature requests can also be posted to community.jitsi.org.
+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.
 
 ## Description
 ---

.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

@@ -0,0 +1,23 @@
+---
+name: "Feature request"
+about: Suggest an idea for this project
+
+---
+
+<!--
+Thank you for suggesting an idea to make Jitsi Meet better.
+
+Please fill in as much of the template below as you're able.
+
+Note that the ultimate decission for implementing features lies on the Jitsi team, not all feature requests shall be accepted.
+-->
+
+**Is your feature request related to a problem you are facing?**
+Please describe the problem you are trying to solve.
+
+**Describe the solution you'd like**
+Please describe the desired behavior.
+
+**Describe alternatives you've considered**
+Please describe alternative solutions or features you have considered.
+

.gitignore

@@ -35,6 +35,7 @@ xcuserdata
 DerivedData
 *.hmap
 *.ipa
+*.dSYM.zip
 *.xcuserstate
 project.xcworkspace
 
@@ -69,10 +70,22 @@ buck-out/
 */fastlane/Preview.html
 */fastlane/screenshots
 
-# Bundle artifact
+# Build artifacts
 *.jsbundle
+*.framework
+android/app/release
 
 # precommit-hook
 .jshintignore
 .jshintrc
 
+# VSCode files
+android/.project
+android/.settings/org.eclipse.buildship.core.prefs
+
+# Secrets
+android/app/dropbox.key
+android/app/google-services.json
+ios/app/dropbox.key
+ios/app/GoogleService-Info.plist
+

CONTRIBUTING.md

@@ -13,7 +13,7 @@ Found a bug and know how to fix it? Great! Please read on.
 ## Contributor License Agreement
 While the Jitsi projects are released under the
 [Apache License 2.0](https://github.com/jitsi/jitsi-meet/blob/master/LICENSE), the copyright
-holder and principal creator is [Atlassian](https://www.atlassian.com/). To
+holder and principal creator is [8x8](https://www.8x8.com/). To
 ensure that we can continue making these projects available under an Open Source license,
 we need you to sign our Apache-based contributor
 license agreement as either a [corporation](https://jitsi.org/ccla) or an

Makefile

@@ -45,8 +45,6 @@ deploy-appbundle:
 		$(OUTPUT_DIR)/analytics-ga.js \
 		$(BUILD_DIR)/analytics-ga.min.js \
 		$(BUILD_DIR)/analytics-ga.min.map \
-		$(BUILD_DIR)/analytics-amplitude.min.js \
-		$(BUILD_DIR)/analytics-amplitude.min.map \
 		$(DEPLOY_DIR)
 
 deploy-lib-jitsi-meet:

README.md

@@ -1,16 +1,16 @@
 # Jitsi Meet - Secure, Simple and Scalable Video Conferences
 
-Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses [Jitsi Videobridge](https://jitsi.org/videobridge) to provide high quality, [secure](#security) and scalable video conferences. You can see Jitsi Meet in action [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 the need for installing anything on your computer. You can also try it out yourself 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. It allows users to stream their desktop or only some windows. It also supports shared document editing with Etherpad.
+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 the Jitsi Meet suite on your server and hosting your own conferencing service.
+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 quite a simple experience. For Debian-based systems, we recommend following the [quick-install](https://github.com/jitsi/jitsi-meet/blob/master/doc/quick-install.md) document, which uses the package system. You can also see a demonstration of the process in [this tutorial video](https://jitsi.org/tutorial).
+Installing Jitsi Meet is a simple experience. For Debian-based system, following the [quick-install](https://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://github.com/jitsi/jitsi-meet/blob/master/doc/manual-install.md).
 
@@ -59,7 +59,7 @@ To work with local copy you must change the path to:
 "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' will not do it.
+To make the project you must force it to take the sources as 'npm update':
 ```
 npm install lib-jitsi-meet --force && make
 ```
@@ -84,8 +84,8 @@ cd ../jitsi-meet
 npm link lib-jitsi-meet
 ```
 
-So now 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, no longer the case with version 6.x.
+ 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
@@ -100,7 +100,7 @@ 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:
+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
@@ -115,18 +115,16 @@ see our [guidelines for contributing](CONTRIBUTING.md).
 
 ## Embedding in external applications
 
-Jitsi Meet provides a very flexible way of embedding it in external applications by using the [Jitsi Meet API](doc/api.md).
+Jitsi Meet provides a very flexible way of embedding in external applications by using the [Jitsi Meet API](doc/api.md).
 
 ## Security
-WebRTC today does not provide a way of conducting multiparty conversations with
-end-to-end encryption. As a matter of fact, unless you consistently vocally
-compare DTLS fingerprints with your peers, the same goes for one-to-one calls.
-As a result when using a Jitsi Meet instance, your stream is encrypted on the
-network but decrypted on the machine that hosts the bridge.
+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 Jitsi Meet architecture allows you to deploy your own version, including
-all server components, and in that case your security guarantees will be roughly
-equivalent to these of a direct one-to-one WebRTC call. This is what's unique to
+all server components. In that case, your security guarantees will be roughly
+equivalent to a direct one-to-one WebRTC call. This is the uniqueness of
 Jitsi Meet in terms of security.
 
 The [meet.jit.si](https://meet.jit.si) service is maintained by the Jitsi team
@@ -138,4 +136,4 @@ Instructions on how to build it can be found [here](doc/mobile.md).
 
 ## Acknowledgements
 
-Jitsi Meet started out as a sample conferencing application using Jitsi Videobridge. It was originally developed by then ESTOS' developer Philipp Hancke who then contributed it to the community where development continues with joint forces!
+Jitsi Meet started out as a sample conferencing application using Jitsi Videobridge. It was originally developed by ESTOS' developer Philipp Hancke who then contributed it to the community where development continues with joint forces!

android/README.md

@@ -2,7 +2,9 @@
 
 ## 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, it's suggested to use the pre-build SDK. This avoids the complexity of building and installing your own 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
 
@@ -29,23 +31,10 @@ Dependency definitions belong in the individual module `build.gradle` files:
 ```gradle
 dependencies {
     // (other dependencies)
-    implementation ('org.jitsi.react:jitsi-meet-sdk:+') { transitive = true }
+    implementation ('org.jitsi.react:jitsi-meet-sdk:2.+') { transitive = true }
 }
 ```
 
-Also, enable 32bit mode for react-native, since react-native only supports 32bit apps. (If you have a 64bit device, it will not run unless this setting it set)
-
-```gradle
-android {
-    ...
-    defaultConfig {
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
-    }
-    ...
-```
-
 ### Build and use your own SDK artifacts/binaries
 
 <details>
@@ -57,49 +46,20 @@ A note on dependencies: Apart from the SDK, Jitsi also publishes a binary Maven
 
 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 parent directory:
+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:
 
-    $ (cd ..; npm install)
+    npm install
 
 This will pull in the dependencies in either binary format, or in source code format, somewhere under /node_modules/
 
-At the time of writing, there are two packages pulled in in binary format.
+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:
 
-To copy React Native to your local Maven repository, you can simply copy part of the directory structure that was pulled in by NPM:
+    ./android/scripts/release-sdk.sh /tmp/repo
 
-    $ cp -r ../node_modules/react-native/android/com /tmp/repo/
-
-In the same way, copy the JavaScriptCore dependency:
-
-    $ cp -r ../node_modules/jsc-android/dist/org /tmp/repo/
-
-Alternatively, you can use the scripts located in the android/scripts directory to publish these dependencies to your Maven repo.
-
-Third-party React Native _modules_, which Jitsi Meet SDK for Android depends on, are download by NPM in source code form. These need to be assembled into Maven artifacts, and then published to your local Maven repository. The SDK project facilitates this.
-
-To prepare, Configure the Maven repositories in which you are going to publish the SDK artifacts/binaries. In `android/sdk/build.gradle` as well as in `android/build.gradle` modify the lines that contain:
-
-    "file:${rootProject.projectDir}/../../jitsi-maven-repository/releases"
-
-Change this value (which represents the Maven repository location used internally by the Jitsi Developers) to the location of the repository that you'd like to use:
-
-    "file:/tmp/repo"
-
-Make sure to do this in both files! Each file should require one line to be changed.
-
-To create the release assembly for any _specific_ third-party React Native module that you need, you can execture the following commands, replace the module name in the examples below.
-
-    $ ./gradlew :react-native-webrtc:assembleRelease
-    $ ./gradlew :react-native-webrtc:publish
-
-You build and publish the SDK itself in the same way:
-
-    $ ./gradlew :sdk:assembleRelease
-    $ ./gradlew :sdk:publish
-
-Alternatively, you can assemble and publish _all_ subprojects, which include the react-native modules, but also the SDK itself, with a single command:
-
-    $ ./gradlew assembleRelease publish
+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:
 
@@ -117,7 +77,8 @@ Then, define the dependency `org.jitsi.react:jitsi-meet-sdk` into the `build.gra
 
     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`.
+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>
 
@@ -163,14 +124,14 @@ View is strongly recommended.
 package org.jitsi.example;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import android.support.v4.app.FragmentActivity;
 
 import org.jitsi.meet.sdk.JitsiMeetView;
 import org.jitsi.meet.sdk.ReactActivityLifecycleCallbacks;
 
 // Example
 //
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends FragmentActivity implements JitsiMeetActivityInterface {
     private JitsiMeetView view;
 
     @Override
@@ -178,13 +139,13 @@ public class MainActivity extends AppCompatActivity {
             int requestCode,
             int resultCode,
             Intent data) {
-        ReactActivityLifecycleCallbacks.onActivityResult(
+        JitsiMeetActivityDelegate.onActivityResult(
                 this, requestCode, resultCode, data);
     }
 
     @Override
     public void onBackPressed() {
-        ReactActivityLifecycleCallbacks.onBackPressed();
+        JitsiMeetActivityDelegate.onBackPressed();
     }
 
     @Override
@@ -192,7 +153,10 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         view = new JitsiMeetView(this);
-        view.loadURL(null);
+        JitsiMeetConferenceOptions options = new JitsiMeetConferenceOptions.Builder()
+            .setRoom("https://meet.jit.si/test123")
+            .build();
+        view.join(options);
 
         setContentView(view);
     }
@@ -204,12 +168,12 @@ public class MainActivity extends AppCompatActivity {
         view.dispose();
         view = null;
 
-        ReactActivityLifecycleCallbacks.onHostDestroy(this);
+        JitsiMeetActivityDelegate.onHostDestroy(this);
     }
 
     @Override
     public void onNewIntent(Intent intent) {
-        ReactActivityLifecycleCallbacks.onNewIntent(intent);
+        JitsiMeetActivityDelegate.onNewIntent(intent);
     }
 
     @Override
@@ -217,21 +181,21 @@ public class MainActivity extends AppCompatActivity {
             final int requestCode,
             final String[] permissions,
             final int[] grantResults) {
-        ReactActivityLifecycleCallbacks.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
-        ReactActivityLifecycleCallbacks.onHostResume(this);
+        JitsiMeetActivityDelegate.onHostResume(this);
     }
 
     @Override
     protected void onStop() {
         super.onStop();
 
-        ReactActivityLifecycleCallbacks.onHostPause(this);
+        JitsiMeetActivityDelegate.onHostPause(this);
     }
 }
 ```
@@ -258,103 +222,62 @@ implementation("com.github.bumptech.glide:annotations:${glideVersion}") {
 
 ### JitsiMeetActivity
 
-This class encapsulates a high level API in the form of an Android `Activity`
-which displays a single `JitsiMeetView`.
+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.
 
-#### getDefaultURL()
-
-Returns the default base URL used to join a conference when a partial URL (e.g.
-a room name only) is specified to `loadURLString`/`loadURLObject`. If not set or
-if set to `null`, the default built in JavaScript is used: https://meet.jit.si.
-
 #### getListener()
 
 Returns the `JitsiMeetViewListener` instance attached to the view.
 
-#### isPictureInPictureEnabled()
-
-Returns `true` if Picture-in-Picture is enabled; `false`, otherwise. If not
-explicitly set (by a preceding `setPictureInPictureEnabled` call), defaults to
-`true` if the platform supports Picture-in-Picture natively; `false`, otherwise.
-
-#### isWelcomePageEnabled()
-
-Returns true if the Welcome page is enabled; otherwise, false. If false, a black
-empty view will be rendered when not in a conference. Defaults to false.
-
-#### loadURL(URL)
-
-Loads a specific URL which may identify a conference to join. If the specified
-URL is null and the Welcome page is enabled, the Welcome page is displayed
-instead.
-
-#### loadURLString(String)
-
-Loads a specific URL which may identify a conference to join. If the specified
-URL is null and the Welcome page is enabled, the Welcome page is displayed
-instead.
-
-#### loadURLObject(Bundle)
-
-Loads a specific URL which may identify a conference to join. The URL is
-specified in the form of a Bundle of properties which (1) internally are
-sufficient to construct a URL (string) while (2) abstracting the specifics of
-constructing the URL away from API clients/consumers. If the specified URL is
-null and the Welcome page is enabled, the Welcome page is displayed instead.
-
-Example:
-
-```java
-Bundle config = new Bundle();
-config.putBoolean("startWithAudioMuted", true);
-config.putBoolean("startWithVideoMuted", false);
-Bundle urlObject = new Bundle();
-urlObject.putBundle("config", config);
-urlObject.putString("url", "https://meet.jit.si/Test123");
-view.loadURLObject(urlObject);
-```
-
-#### setDefaultURL(URL)
-
-Sets the default URL. See `getDefaultURL` for more information.
-
-NOTE: Must be called before (if at all) `loadURL`/`loadURLString` for it to take
-effect.
-
 #### setListener(listener)
 
 Sets the given listener (class implementing the `JitsiMeetViewListener`
 interface) on the view.
 
-#### setPictureInPictureEnabled(boolean)
+### JitsiMeetConferenceOptions
 
-Sets whether Picture-in-Picture is enabled. If not set, Jitsi Meet SDK
-automatically enables/disables Picture-in-Picture based on native platform
-support.
+This object encapsulates all the options that can be tweaked when joining
+a conference.
 
-NOTE: Must be called (if at all) before `loadURL`/`loadURLString` for it to take
-effect.
+Example:
 
-#### setWelcomePageEnabled(boolean)
+```java
+JitsiMeetConferenceOptions options = new JitsiMeetConferenceOptions.Builder()
+    .setServerURL(new URL("https://meet.jit.si"))
+    .setRoom("test123")
+    .setAudioMuted(false)
+    .setVideoMuted(false)
+    .setAudioOnly(false)
+    .setWelcomePageEnabled(false)
+    .build();
+```
 
-Sets whether the Welcome page is enabled. See `isWelcomePageEnabled` for more
-information.
+See the `JitsiMeetConferenceOptions` implementation for all available options.
 
-NOTE: Must be called (if at all) before `loadURL`/`loadURLString` for it to take
-effect.
-
-### ReactActivityLifecycleCallbacks
+### JitsiMeetActivityDelegate
 
 This class handles the interaction between `JitsiMeetView` and its enclosing
 `Activity`. Generally this shouldn't be consumed by users, because they'd be
@@ -410,29 +333,20 @@ This is a static method.
 `JitsiMeetViewListener` provides an interface apps can implement to listen to
 the state of the Jitsi Meet conference displayed in a `JitsiMeetView`.
 
-`JitsiMeetViewAdapter`, a default implementation of the
-`JitsiMeetViewListener` interface is also provided. Apps may extend the class
-instead of implementing the interface in order to minimize boilerplate.
-
-##### onConferenceFailed
-
-Called when a joining a conference was unsuccessful or when there was an error
-while in a conference.
-
-The `data` `Map` contains an "error" key describing the error and a "url" key
-with the conference URL.
-
 #### onConferenceJoined
 
 Called when a conference was joined.
 
 The `data` `Map` contains a "url" key with the conference URL.
 
-#### onConferenceLeft
+#### onConferenceTerminated
 
-Called when a conference was left.
+Called when a conference was terminated either by user choice or due to a
+failure.
 
-The `data` `Map` contains a "url" key with the conference URL.
+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
 
@@ -440,20 +354,6 @@ Called before a conference is joined.
 
 The `data` `Map` contains a "url" key with the conference URL.
 
-#### onConferenceWillLeave
-
-Called before a conference is left.
-
-The `data` `Map` contains a "url" key with the conference URL.
-
-#### onLoadConfigError
-
-Called when loading the main configuration file from the Jitsi Meet deployment
-fails.
-
-The `data` `Map` contains an "error" key with the error and a "url" key with the
-conference URL which necessitated the loading of the configuration file.
-
 ## ProGuard rules
 
 When using the SDK on a project some proguard rules have to be added in order
@@ -466,10 +366,6 @@ rules file: https://github.com/jitsi/jitsi-meet/blob/master/android/app/proguard
 Picture-in-Picture style scenario, in a rectangle too small to accommodate its
 "full" UI.
 
-Jitsi Meet SDK automatically enables (unless explicitly disabled by a
-`setPictureInPictureEnabled(false)` call) Android's native Picture-in-Picture
-mode iff the platform is supported i.e. Android >= Oreo.
-
 ## Dropbox integration
 
 To setup the Dropbox integration, follow these steps:

android/app/build.gradle

@@ -8,6 +8,11 @@ if (googleServicesEnabled) {
     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)
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -15,24 +20,14 @@ android {
 
     defaultConfig {
         applicationId 'org.jitsi.meet'
-        versionCode Integer.parseInt(project.buildNumber)
+        versionCode vcode
         versionName project.appVersion
 
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
         ndk {
-            abiFilters 'armeabi-v7a', 'x86'
-        }
-
-        packagingOptions {
-            // The project react-native does not provide 64-bit binaries at the
-            // time of this writing. Unfortunately, packaging any 64-bit
-            // binaries into the .apk will crash the app at runtime on 64-bit
-            // platforms.
-            exclude '/lib/mips64/**'
-            exclude '/lib/arm64-v8a/**'
-            exclude '/lib/x86_64/**'
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
     }
 
@@ -91,18 +86,10 @@ gradle.projectsEvaluated {
     // Dropbox integration
     //
 
-    def plistParser = new XmlSlurper(
-            /* validating */ false,
-            /* namespaceAware */ false,
-            /* allowDocTypeDeclaration */ true)
-    plistParser.setFeature(
-            'http://apache.org/xml/features/nonvalidating/load-external-dtd',
-            false)
-    def plist = plistParser.parse('../ios/app/src/Info.plist')
-    def dropboxScheme = plist.dict.array.dict.array.string.find { string ->
-        string.text().startsWith('db-')
+    def dropboxAppKey
+    if (project.file('dropbox.key').exists()) {
+        dropboxAppKey = project.file('dropbox.key').text.trim() - 'db-'
     }
-    def dropboxAppKey = dropboxScheme?.text() - 'db-'
 
     if (dropboxAppKey) {
         android.defaultConfig.resValue('string', 'dropbox_app_key', "${dropboxAppKey}")
@@ -118,25 +105,57 @@ gradle.projectsEvaluated {
               <category android:name="android.intent.category.DEFAULT" />
               <data android:scheme="db-${dropboxAppKey}" />
             </intent-filter>
-          </activity>""";
+          </activity>"""
 
         android.applicationVariants.all { variant ->
             variant.outputs.each { output ->
-                output.processManifest.doLast {
-                    def f = new File(manifestOutputDirectory, 'AndroidManifest.xml')
-                    if (!f.isFile()) {
-                        f = new File(new File(manifestOutputDirectory, output.dirName), 'AndroidManifest.xml')
-                    }
-                    if (f.exists()) {
-                        def charset = 'UTF-8'
-                        def s = f.getText(charset)
-                        s = s.replace('</application>', "${dropboxActivity}</application>")
-                        f.write(s, charset)
-                    }
+                output.getProcessManifestProvider().get().doLast {
+                    def outputDir = manifestOutputDirectory.get().asFile
+                    def manifestPath = new File(outputDir, 'AndroidManifest.xml')
+                    def charset = 'UTF-8'
+                    def text
+                    text = manifestPath.getText(charset)
+                    text = text.replace('</application>', "${dropboxActivity}</application>")
+                    manifestPath.write(text, charset)
                 }
             }
         }
     }
+
+    // Run React packager
+    android.applicationVariants.all { variant ->
+        def targetName = variant.name.capitalize()
+
+        def currentRunPackagerTask = tasks.create(
+                name: "run${targetName}ReactPackager",
+                type: Exec) {
+            group = "react"
+            description = "Run the React packager."
+
+            doFirst {
+                println "Starting the React packager..."
+
+                def androidRoot = file("${projectDir}/../")
+
+                // Set up the call to the script
+                workingDir androidRoot
+
+                // Run the packager
+                commandLine("scripts/run-packager.sh")
+            }
+
+            // Set up dev mode
+            def devEnabled = !targetName.toLowerCase().contains("release")
+
+            // Only enable for dev builds
+            enabled devEnabled
+        }
+
+        def packageTask = variant.packageApplicationProvider.get()
+
+        packageTask.dependsOn(currentRunPackagerTask)
+    }
+
 }
 
 if (googleServicesEnabled) {

android/app/proguard-rules.pro

@@ -73,6 +73,15 @@
   public *;
 }
 
+# WebRTC
+
+-keep class org.webrtc.** { *; }
+-dontwarn org.chromium.build.BuildHooksAndroid
+
+# Jisti Meet SDK
+
+-keep class org.jitsi.meet.sdk.** { *; }
+
 # We added the following when we switched minifyEnabled on. Probably because we
 # ran the app and hit problems...
 
@@ -83,7 +92,6 @@
 -keep class com.facebook.react.bridge.ReadableType { *; }
 -keep class com.facebook.react.bridge.queue.NativeRunnable { *; }
 -keep class com.facebook.react.devsupport.** { *; }
--keep class org.webrtc.** { *; }
 
 -dontwarn com.facebook.react.devsupport.**
 -dontwarn com.google.appengine.**

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

@@ -17,179 +17,46 @@
 
 package org.jitsi.meet;
 
+import android.content.Intent;
 import android.net.Uri;
-import android.os.Bundle;
+import android.os.Build;
+import android.provider.Settings;
+import android.support.annotation.Nullable;
 import android.util.Log;
+import android.view.KeyEvent;
 
+import org.jitsi.meet.sdk.JitsiMeet;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
-import org.jitsi.meet.sdk.JitsiMeetView;
-import org.jitsi.meet.sdk.JitsiMeetViewListener;
-import org.jitsi.meet.sdk.invite.AddPeopleController;
-import org.jitsi.meet.sdk.invite.AddPeopleControllerListener;
-import org.jitsi.meet.sdk.invite.InviteController;
-import org.jitsi.meet.sdk.invite.InviteControllerListener;
+import org.jitsi.meet.sdk.JitsiMeetConferenceOptions;
 
 import com.crashlytics.android.Crashlytics;
-import com.facebook.react.bridge.UiThreadUtil;
 import com.google.firebase.dynamiclinks.FirebaseDynamicLinks;
 import io.fabric.sdk.android.Fabric;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 /**
- * The one and only {@link Activity} that the Jitsi Meet app needs. The
+ * The one and only Activity that the Jitsi Meet app needs. The
  * {@code Activity} is launched in {@code singleTask} mode, so it will be
  * created upon application initialization and there will be a single instance
  * of it. Further attempts at launching the application once it was already
- * launched will result in {@link Activity#onNewIntent(Intent)} being called.
- *
- * This {@code Activity} extends {@link JitsiMeetActivity} to keep the React
- * Native CLI working, since the latter always tries to launch an
- * {@code Activity} named {@code MainActivity} when doing
- * {@code react-native run-android}.
+ * launched will result in {@link MainActivity#onNewIntent(Intent)} being called.
  */
 public class MainActivity extends JitsiMeetActivity {
     /**
-     * The query to perform through {@link AddPeopleController} when the
-     * {@code InviteButton} is tapped in order to exercise the public API of the
-     * feature invite. If {@code null}, the {@code InviteButton} will not be
-     * rendered.
+     * The request code identifying requests for the permission to draw on top
+     * of other apps. The value must be 16-bit and is arbitrarily chosen here.
      */
-    private static final String ADD_PEOPLE_CONTROLLER_QUERY = null;
+    private static final int OVERLAY_PERMISSION_REQUEST_CODE
+        = (int) (Math.random() * Short.MAX_VALUE);
+
+    // JitsiMeetActivity overrides
+    //
 
     @Override
-    protected JitsiMeetView initializeView() {
-        JitsiMeetView view = super.initializeView();
-
-        // XXX In order to increase (1) awareness of API breakages and (2) API
-        // coverage, utilize JitsiMeetViewListener in the Debug configuration of
-        // the app.
-        if (BuildConfig.DEBUG && view != null) {
-            view.setListener(new JitsiMeetViewListener() {
-                private void on(String name, Map<String, Object> data) {
-                    UiThreadUtil.assertOnUiThread();
-
-                    // Log with the tag "ReactNative" in order to have the log
-                    // visible in react-native log-android as well.
-                    Log.d(
-                        "ReactNative",
-                        JitsiMeetViewListener.class.getSimpleName() + " "
-                            + name + " "
-                            + data);
-                }
-
-                @Override
-                public void onConferenceFailed(Map<String, Object> data) {
-                    on("CONFERENCE_FAILED", data);
-                }
-
-                @Override
-                public void onConferenceJoined(Map<String, Object> data) {
-                    on("CONFERENCE_JOINED", data);
-                }
-
-                @Override
-                public void onConferenceLeft(Map<String, Object> data) {
-                    on("CONFERENCE_LEFT", data);
-                }
-
-                @Override
-                public void onConferenceWillJoin(Map<String, Object> data) {
-                    on("CONFERENCE_WILL_JOIN", data);
-                }
-
-                @Override
-                public void onConferenceWillLeave(Map<String, Object> data) {
-                    on("CONFERENCE_WILL_LEAVE", data);
-                }
-
-                @Override
-                public void onLoadConfigError(Map<String, Object> data) {
-                    on("LOAD_CONFIG_ERROR", data);
-                }
-            });
-
-            // inviteController
-            final InviteController inviteController
-                = view.getInviteController();
-
-            inviteController.setListener(new InviteControllerListener() {
-                public void beginAddPeople(
-                        AddPeopleController addPeopleController) {
-                    onInviteControllerBeginAddPeople(
-                        inviteController,
-                        addPeopleController);
-                }
-            });
-            inviteController.setAddPeopleEnabled(
-                ADD_PEOPLE_CONTROLLER_QUERY != null);
-            inviteController.setDialOutEnabled(
-                inviteController.isAddPeopleEnabled());
-        }
-
-        return view;
-    }
-
-    private void onAddPeopleControllerInviteSettled(
-            AddPeopleController addPeopleController,
-            List<Map<String, Object>> failedInvitees) {
-        UiThreadUtil.assertOnUiThread();
-
-        // XXX Explicitly invoke endAddPeople on addPeopleController; otherwise,
-        // it is going to be memory-leaked in the associated InviteController
-        // and no subsequent InviteButton clicks/taps will be delivered.
-        // Technically, endAddPeople will automatically be invoked if there are
-        // no failedInviteees i.e. the invite succeeeded for all specified
-        // invitees.
-        addPeopleController.endAddPeople();
-    }
-
-    private void onAddPeopleControllerReceivedResults(
-            AddPeopleController addPeopleController,
-            List<Map<String, Object>> results,
-            String query) {
-        UiThreadUtil.assertOnUiThread();
-
-        int size = results.size();
-
-        if (size > 0) {
-            // Exercise AddPeopleController's inviteById implementation.
-            List<String> ids = new ArrayList<>(size);
-
-            for (Map<String, Object> result : results) {
-                Object id = result.get("id");
-
-                if (id != null) {
-                    ids.add(id.toString());
-                }
-            }
-
-            addPeopleController.inviteById(ids);
-
-            return;
-        }
-
-        // XXX Explicitly invoke endAddPeople on addPeopleController; otherwise,
-        // it is going to be memory-leaked in the associated InviteController
-        // and no subsequent InviteButton clicks/taps will be delivered.
-        addPeopleController.endAddPeople();
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // As this is the Jitsi Meet app (i.e. not the Jitsi Meet SDK), we do
-        // want to enable some options.
-
-        // The welcome page defaults to disabled in the SDK at the time of this
-        // writing but it is clearer to be explicit about what we want anyway.
-        setWelcomePageEnabled(true);
-
-        super.onCreate(savedInstanceState);
-
+    protected boolean extraInitialize() {
         // Setup Crashlytics and Firebase Dynamic Links
         if (BuildConfig.GOOGLE_SERVICES_ENABLED) {
             Fabric.with(this, new Crashlytics());
@@ -203,57 +70,90 @@ public class MainActivity extends JitsiMeetActivity {
                     }
 
                     if (dynamicLink != null) {
-                        try {
-                            loadURL(new URL(dynamicLink.toString()));
-                        } catch (MalformedURLException e) {
-                            Log.d("ReactNative", "Malformed dynamic link", e);
-                        }
+                        join(dynamicLink.toString());
                     }
                 });
         }
+
+        // In Debug builds React needs permission to write over other apps in
+        // order to display the warning and error overlays.
+        if (BuildConfig.DEBUG) {
+            if (canRequestOverlayPermission() && !Settings.canDrawOverlays(this)) {
+                Intent intent
+                    = new Intent(
+                    Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                    Uri.parse("package:" + getPackageName()));
+
+                startActivityForResult(intent, OVERLAY_PERMISSION_REQUEST_CODE);
+
+                return true;
+            }
+        }
+
+        return false;
     }
 
-    private void onInviteControllerBeginAddPeople(
-            InviteController inviteController,
-            AddPeopleController addPeopleController) {
-        UiThreadUtil.assertOnUiThread();
+    @Override
+    protected void initialize() {
+        // Set default options
+        JitsiMeetConferenceOptions defaultOptions
+            = new JitsiMeetConferenceOptions.Builder()
+                .setWelcomePageEnabled(true)
+                .setServerURL(buildURL("https://meet.jit.si"))
+                .build();
+        JitsiMeet.setDefaultConferenceOptions(defaultOptions);
 
-        // Log with the tag "ReactNative" in order to have the log visible in
-        // react-native log-android as well.
-        Log.d(
-            "ReactNative",
-            InviteControllerListener.class.getSimpleName() + ".beginAddPeople");
+        super.initialize();
+    }
 
-        String query = ADD_PEOPLE_CONTROLLER_QUERY;
-    
-        if (query != null
-                && (inviteController.isAddPeopleEnabled()
-                    || inviteController.isDialOutEnabled())) {
-            addPeopleController.setListener(new AddPeopleControllerListener() {
-                public void onInviteSettled(
-                        AddPeopleController addPeopleController,
-                        List<Map<String, Object>> failedInvitees) {
-                    onAddPeopleControllerInviteSettled(
-                        addPeopleController,
-                        failedInvitees);
-                }
+    @Override
+    public void onConferenceTerminated(Map<String, Object> data) {
+        Log.d(TAG, "Conference terminated: " + data);
+    }
 
-                public void onReceivedResults(
-                        AddPeopleController addPeopleController,
-                        List<Map<String, Object>> results,
-                        String query) {
-                    onAddPeopleControllerReceivedResults(
-                        addPeopleController,
-                        results, query);
-                }
-            });
-            addPeopleController.performQuery(query);
-        } else {
-            // XXX Explicitly invoke endAddPeople on addPeopleController;
-            // otherwise, it is going to be memory-leaked in the associated
-            // InviteController and no subsequent InviteButton clicks/taps will
-            // be delivered.
-            addPeopleController.endAddPeople();
+    // Activity lifecycle method overrides
+    //
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE
+                && canRequestOverlayPermission()) {
+            if (Settings.canDrawOverlays(this)) {
+                initialize();
+                return;
+            }
+
+            throw new RuntimeException("Overlay permission is required when running in Debug mode.");
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    // ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_MENU) {
+            JitsiMeet.showDevOptions();
+            return true;
+        }
+
+        return super.onKeyUp(keyCode, event);
+    }
+
+    // Helper methods
+    //
+
+    private @Nullable URL buildURL(String urlStr) {
+        try {
+            return new URL(urlStr);
+        } catch (MalformedURLException e) {
+            return null;
         }
     }
+
+    private boolean canRequestOverlayPermission() {
+        return
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                && getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.M;
+    }
 }

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

@@ -1,5 +1,6 @@
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">localhost</domain>
+        <domain includeSubdomains="false">localhost</domain>
+        <domain includeSubdomains="false">10.0.2.2</domain>
     </domain-config>
 </network-security-config>

android/build.gradle

@@ -12,7 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.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'
 
@@ -25,7 +25,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url "$rootDir/../node_modules/jsc-android/dist" }
         // React Native (JS, Obj-C sources, Android binaries) is installed from
         // npm.
         maven { url "$rootDir/../node_modules/react-native/android" }
@@ -42,12 +41,6 @@ allprojects {
                     def version = new JsonSlurper().parseText(file.text).version
                     details.useVersion version
                 }
-                if (details.requested.group == 'org.webkit'
-                        && details.requested.name == 'android-jsc') {
-                    def file = new File("$rootDir/../node_modules/jsc-android/package.json")
-                    def version = new JsonSlurper().parseText(file.text).version
-                    details.useVersion "r${version.tokenize('.')[0]}"
-                }
             }
         }
     }
@@ -62,45 +55,33 @@ allprojects {
         publishing {
             publications {}
             repositories {
-                maven { url "file:${rootProject.projectDir}/../../jitsi-maven-repository/releases" }
+                maven {
+                    url rootProject.ext.mavenRepo
+                    if (!rootProject.ext.mavenRepo.startsWith("file")) {
+                        credentials {
+                            username rootProject.ext.mavenUser
+                            password rootProject.ext.mavenPassword
+                        }
+                    }
+                }
             }
         }
     }
 
+    // Use the number of seconds/10 since Jan 1 2019 as the version qualifier number.
+    // This will last for the next ~680 years.
+    // https://stackoverflow.com/a/38643838
+    def versionQualifierNumber = (int)(((new Date().getTime()/1000) - 1546297200) / 10)
+
     afterEvaluate { project ->
         if (project.name.startsWith('react-native-')) {
             def npmManifest = project.file('../package.json')
             def json = new JsonSlurper().parseText(npmManifest.text)
 
-            // React Native modules have an npm peer dependency on react-native,
-            // they do not have an npm dependency on it. Further below though we
-            // choose a react-native version (range) when we represent them as
-            // Maven artifacts. Effectively, we are forking the projects by not
-            // complying with the full range of their npm peer dependency and,
-            // consequently, we should qualify their version.
-            def versionQualifier = '-jitsi-1'
-            if ('react-native-background-timer' == project.name)
-                versionQualifier = '-jitsi-3' // 2.0.0 + react-native 0.57
-            else if ('react-native-calendar-events' == project.name)
-                versionQualifier = '-jitsi-2' // 1.6.4 + react-native 0.57
-            else if ('react-native-fast-image' == project.name)
-                versionQualifier = '-jitsi-2' // 5.1.1 + react-native 0.57
-            else if ('react-native-google-signin' == project.name)
-                versionQualifier = '-jitsi-2' // 1.0.2 + react-native 0.57
-            else if ('react-native-immersive' == project.name)
-                versionQualifier = '-jitsi-5' // 2.0.0 + react-native 0.57
-            else if ('react-native-keep-awake' == project.name)
-                versionQualifier = '-jitsi-4' // 4.0.0 + react-native 0.57
-            else if ('react-native-linear-gradient' == project.name)
-                versionQualifier = '-jitsi-1' // 2.4.0 + react-native 0.57
-            else if ('react-native-sound' == project.name)
-                versionQualifier = '-jitsi-2' // 0.10.9 + react-native 0.57
-            else if ('react-native-vector-icons' == project.name)
-                versionQualifier = '-jitsi-3' // 6.0.2 + react-native 0.57
-            else if ('react-native-webrtc' == project.name)
-                versionQualifier = '-jitsi-9' // 6322a9b5a38ce590cfaea4041072ea87c8dbf558 + react-native 0.57
+            // Release every dependency the SDK has with a -jitsi-XXX qualified version. This allows
+            // us to pin the dependencies and make sure they are always updated, no matter what.
 
-            project.version = "${json.version}${versionQualifier}"
+            project.version = "${json.version}-jitsi-${versionQualifierNumber}"
 
             project.android {
                 compileSdkVersion rootProject.ext.compileSdkVersion
@@ -113,15 +94,6 @@ allprojects {
                 }
             }
 
-            task androidJavadocs(type: Javadoc) {
-                source = android.sourceSets.main.java.source
-                classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-                failOnError false
-            }
-            task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-                classifier = 'javadoc'
-                from androidJavadocs.destinationDir
-            }
             task androidSourcesJar(type: Jar) {
                 classifier = 'sources'
                 from android.sourceSets.main.java.source
@@ -137,7 +109,6 @@ allprojects {
                         extension "aar"
                     }
                     artifact(androidSourcesJar)
-                    artifact(androidJavadocsJar)
                     pom.withXml {
                         def pomXml = asNode()
                         pomXml.appendNode('name', project.name)
@@ -188,6 +159,11 @@ ext {
     // 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 ?: ""
+
     // Glide
     excludeAppGlideModule = true
     glideVersion = "4.7.1"  // keep in sync with react-native-fast-image

android/fastlane/Appfile

@@ -0,0 +1,2 @@
+json_key_file("")
+package_name("org.jitsi.meet")

android/fastlane/Fastfile

@@ -0,0 +1,34 @@
+ENV["FASTLANE_SKIP_UPDATE_CHECK"] = "1"
+opt_out_usage
+
+default_platform(:android)
+
+platform :android do
+    desc "Deploy a new version to Goolge Play (Closed Beta)"
+    lane :deploy do
+        # Cleanup
+        gradle(task: "clean")
+
+        # Build and sign the app
+        gradle(
+            task: "assemble",
+            build_type: "Release",
+            print_command: false,
+            properties: {
+                "android.injected.signing.store.file" => ENV["JITSI_KEYSTORE"],
+                "android.injected.signing.store.password" => ENV["JITSI_KEYSTORE_PASSWORD"],
+                "android.injected.signing.key.alias" => ENV["JITSI_KEY_ALIAS"],
+                "android.injected.signing.key.password" => ENV["JITSI_KEY_PASSWORD"],
+            }
+        )
+
+        # Upload built artifact to the Closed Beta track
+        upload_to_play_store(
+            track: "Closed Beta",
+            json_key: ENV["JITSI_JSON_KEY_FILE"],
+            skip_upload_metadata: true,
+            skip_upload_images: true,
+            skip_upload_screenshots: true
+        )
+    end
+end

android/fastlane/README.md

@@ -0,0 +1,29 @@
+fastlane documentation
+================
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```
+xcode-select --install
+```
+
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew cask install fastlane`
+
+# Available Actions
+## Android
+### android deploy
+```
+fastlane android deploy
+```
+Deploy a new version to Goolge Play (Closed Beta)
+
+----
+
+This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
+More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
+The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

android/gradle.properties

@@ -17,6 +17,5 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-buildNumber=2
-appVersion=1.21.0
-sdkVersion=1.21.0
+appVersion=19.2.0
+sdkVersion=2.1.0

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Dec 19 12:02:47 CET 2018
+#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-4.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

android/scripts/publish-android-jsc.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-CWD=$(dirname $0)
-MVN_REPO=$(realpath $1)
-JSC_VERSION="r"$(jq -r '.dependencies."jsc-android"' ${CWD}/../../package.json | cut -d . -f 1)
-
-pushd ${CWD}/../../node_modules/jsc-android/dist/org/webkit/android-jsc/${JSC_VERSION}
-
-mvn \
-    deploy:deploy-file \
-    -Durl=file://${MVN_REPO} \
-    -Dfile=android-jsc-${JSC_VERSION}.aar \
-    -Dpackaging=aar \
-    -DgeneratePom=false \
-    -DpomFile=android-jsc-${JSC_VERSION}.pom
-
-popd

android/scripts/publish-react-native.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-CWD=$(dirname $0)
-MVN_REPO=$(realpath $1)
-RN_VERSION=$(jq -r '.dependencies."react-native"' ${CWD}/../../package.json)
-
-pushd ${CWD}/../../node_modules/react-native/android/com/facebook/react/react-native/${RN_VERSION}
-
-mvn \
-    deploy:deploy-file \
-    -Durl=file://${MVN_REPO} \
-    -Dfile=react-native-${RN_VERSION}.aar \
-    -Dpackaging=aar \
-    -Dsources=react-native-${RN_VERSION}-sources.jar \
-    -Djavadoc=react-native-${RN_VERSION}-javadoc.jar \
-    -DgeneratePom=false \
-    -DpomFile=react-native-${RN_VERSION}.pom
-
-popd

android/scripts/release-sdk.sh

@@ -0,0 +1,81 @@
+#!/bin/bash
+
+set -e -u
+
+
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+DEFAULT_MVN_REPO="${THIS_DIR}/../../../jitsi-maven-repository/releases"
+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 '.dependencies."react-native"' ${THIS_DIR}/../../package.json)
+
+if [[ $THE_MVN_REPO == http* ]]; then
+    MVN_HTTP=1
+else
+    MVN_REPO_PATH=$(realpath $THE_MVN_REPO)
+    THE_MVN_REPO="file:${MVN_REPO_PATH}"
+fi
+
+export MVN_REPO=$THE_MVN_REPO
+
+echo "Releasing Jitsi Meet SDK ${SDK_VERSION}"
+echo "Using ${MVN_REPO} as the Maven repo"
+
+if [[ $MVN_HTTP == 1 ]]; then
+    # Push React Native
+    echo "Pushing React Native ${RN_VERSION} to the Maven repo"
+    pushd ${THIS_DIR}/../../node_modules/react-native/android/com/facebook/react/react-native/${RN_VERSION}
+    mvn \
+        deploy:deploy-file \
+        -Durl=${MVN_REPO} \
+        -DrepositoryId=${MVN_REPO_ID} \
+        -Dfile=react-native-${RN_VERSION}.aar \
+        -Dpackaging=aar \
+        -DgeneratePom=false \
+        -DpomFile=react-native-${RN_VERSION}.pom || true
+    popd
+else
+    # Check if an SDK with that same version has already been released
+    if [[ -d ${MVN_REPO}/org/jitsi/react/jitsi-meet-sdk/${SDK_VERSION} ]]; then
+        echo "There is already a release with that version in the Maven repo!"
+        exit 1
+    fi
+
+    # First push React Native, if necessary
+    if [[ ! -d ${MVN_REPO}/com/facebook/react/react-native/${RN_VERSION} ]]; then
+        echo "Pushing React Native ${RN_VERSION} to the Maven repo"
+        pushd ${THIS_DIR}/../../node_modules/react-native/android/com/facebook/react/react-native/${RN_VERSION}
+        mvn \
+            deploy:deploy-file \
+            -Durl=${MVN_REPO} \
+            -Dfile=react-native-${RN_VERSION}.aar \
+            -Dpackaging=aar \
+            -DgeneratePom=false \
+            -DpomFile=react-native-${RN_VERSION}.pom
+        popd
+    fi
+fi
+
+# Now build and publish the Jitsi Meet SDK and its dependencies
+echo "Building and publishing the Jitsi Meet SDK"
+pushd ${THIS_DIR}/../
+./gradlew clean assembleRelease publish
+popd
+
+if [[ $MVN_HTTP == 0 ]]; then
+    # The artifacts are now on the Maven repo, commit them
+    pushd ${MVN_REPO_PATH}
+    if [[ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" == "true" ]]; then
+        git add -A .
+        git commit -m "Jitsi Meet SDK + dependencies"
+    fi
+    popd
+
+    # Tag the release
+    git tag -a android-sdk-${SDK_VERSION}
+fi
+
+# Done!
+echo "Finished! Don't forget to push the tag and the Maven repo artifacts."

android/scripts/run-packager.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# This script is executed bt Gradle to start the React packager for Debug
+# targets.
+
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+
+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"
+
+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
+    echo "Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly"
+    exit 2
+  fi
+else
+    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

@@ -24,7 +24,7 @@ dependencies {
     implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
 
-    implementation 'org.webkit:android-jsc:+'
+    implementation 'com.amplitude:android-sdk:2.14.1'
     implementation 'com.dropbox.core:dropbox-core-sdk:3.0.8'
     api 'com.facebook.react:react-native:+'
 
@@ -107,13 +107,17 @@ android.libraryVariants.all { def variant ->
 
     currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
     currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
-
     variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)
-    variant.mergeResources.dependsOn(currentBundleTask)
 
-    def assetsDir = variant.mergeAssets.outputDir
+    def mergeAssetsTask = variant.mergeAssetsProvider.get()
+    def mergeResourcesTask = variant.mergeResourcesProvider.get()
+
+    mergeAssetsTask.dependsOn(currentBundleTask)
+    mergeResourcesTask.dependsOn(currentBundleTask)
+
+    mergeAssetsTask.doLast {
+        def assetsDir = mergeAssetsTask.outputDir
 
-    variant.mergeAssets.doLast {
         // Bundle fonts
         //
         copy {
@@ -124,6 +128,7 @@ android.libraryVariants.all { def variant ->
         // Bundle sounds
         //
         copy {
+            from("${projectDir}/../../sounds/incomingMessage.wav")
             from("${projectDir}/../../sounds/joined.wav")
             from("${projectDir}/../../sounds/left.wav")
             from("${projectDir}/../../sounds/outgoingRinging.wav")
@@ -138,19 +143,19 @@ android.libraryVariants.all { def variant ->
         //
         if (currentBundleTask.enabled) {
             copy {
-                from(jsBundleDir)
+                from(jsBundleFile)
                 into(assetsDir)
             }
         }
     }
 
-    variant.mergeResources.doLast {
+    mergeResourcesTask.doLast {
         // Copy React resources
         //
         if (currentBundleTask.enabled) {
             copy {
                 from(resourcesDir)
-                into(variant.mergeResources.outputDir)
+                into(mergeResourcesTask.outputDir)
             }
         }
     }
@@ -162,7 +167,7 @@ publishing {
         aarArchive(MavenPublication) {
             groupId 'org.jitsi.react'
             artifactId 'jitsi-meet-sdk'
-            version project.sdkVersion
+            version System.env.OVERRIDE_SDK_VERSION ?: project.sdkVersion
 
             artifact("${project.buildDir}/outputs/aar/${project.name}-release.aar") {
                 extension "aar"
@@ -196,6 +201,14 @@ publishing {
 
     }
     repositories {
-        maven { url "file:${rootProject.projectDir}/../../jitsi-maven-repository/releases" }
+        maven {
+            url rootProject.ext.mavenRepo
+            if (!rootProject.ext.mavenRepo.startsWith("file")) {
+                credentials {
+                    username rootProject.ext.mavenUser
+                    password rootProject.ext.mavenPassword
+                }
+            }
+        }
     }
 }

android/sdk/proguard-rules.pro

@@ -1,25 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/scorretge/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

android/sdk/src/main/AndroidManifest.xml

@@ -1,30 +1,49 @@
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.jitsi.meet.sdk">
-  <!-- XXX ACCESS_NETWORK_STATE is required by WebRTC. -->
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.BLUETOOTH" />
-  <uses-permission android:name="android.permission.CAMERA" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-  <uses-permission android:name="android.permission.RECORD_AUDIO" />
-  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <!-- XXX ACCESS_NETWORK_STATE is required by WebRTC. -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
-  <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-  <uses-feature
-      android:name="android.hardware.camera"
-      android:required="false" />
-  <uses-feature
-      android:name="android.hardware.camera.autofocus"
-      android:required="false" />
+    <uses-feature
+        android:glEsVersion="0x00020000"
+        android:required="true" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />
 
-  <application
-      android:allowBackup="true"
-      android:label="@string/app_name"
-      android:supportsRtl="true">
-    <activity
-        android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-  </application>
-</manifest>
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true">
+        <activity
+            android:name=".JitsiMeetActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
+            android:launchMode="singleTask"
+            android:resizeableActivity="true"
+            android:supportsPictureInPicture="true"
+            android:windowSoftInputMode="adjustResize">
+        </activity>
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+
+        <service
+            android:name=".ConnectionService"
+            android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE">
+            <intent-filter>
+                <action android:name="android.telecom.ConnectionService" />
+            </intent-filter>
+        </service>
+    </application>
+
+</manifest>

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

@@ -0,0 +1,90 @@
+/*
+ * 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.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 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) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+}

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

@@ -15,17 +15,21 @@ 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;
 
+@ReactModule(name = AndroidSettingsModule.NAME)
 class AndroidSettingsModule
     extends ReactContextBaseJavaModule {
 
+    public static final String NAME = "AndroidSettings";
+
     public AndroidSettingsModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
 
     @Override
     public String getName() {
-        return "AndroidSettings";
+        return NAME;
     }
 
     @ReactMethod

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

@@ -23,13 +23,17 @@ import android.content.pm.PackageManager;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.module.annotations.ReactModule;
 
 import java.util.HashMap;
 import java.util.Map;
 
+@ReactModule(name = AppInfoModule.NAME)
 class AppInfoModule
     extends ReactContextBaseJavaModule {
 
+    public static final String NAME = "AppInfo";
+
     public AppInfoModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
@@ -60,6 +64,9 @@ class AppInfoModule
 
         Map<String, Object> constants = new HashMap<>();
 
+        constants.put(
+            "buildNumber",
+            packageInfo == null ? "" : String.valueOf(packageInfo.versionCode));
         constants.put(
             "name",
             applicationInfo == null
@@ -74,6 +81,6 @@ class AppInfoModule
 
     @Override
     public String getName() {
-        return "AppInfo";
+        return NAME;
     }
 }

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

@@ -25,6 +25,7 @@ import android.content.pm.PackageManager;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.os.Build;
+import android.support.annotation.RequiresApi;
 import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
@@ -34,6 +35,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.module.annotations.ReactModule;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -57,10 +59,12 @@ import java.util.concurrent.Executors;
  * Before a call has started and after it has ended the
  * {@code AudioModeModule.DEFAULT} mode should be used.
  */
-class AudioModeModule
-    extends ReactContextBaseJavaModule
+@ReactModule(name = AudioModeModule.NAME)
+class AudioModeModule extends ReactContextBaseJavaModule
     implements AudioManager.OnAudioFocusChangeListener {
 
+    public static final String NAME = "AudioMode";
+
     /**
      * Constants representing the audio mode.
      * - DEFAULT: Used before and after every call. It represents the default
@@ -89,16 +93,74 @@ class AudioModeModule
      */
     private static final int TYPE_USB_HEADSET = 22;
 
-    /**
-     * The name of {@code AudioModeModule} to be used in the React Native
-     * bridge.
-     */
-    private static final String MODULE_NAME = "AudioMode";
-
     /**
      * The {@code Log} tag {@code AudioModeModule} is to log messages with.
      */
-    static final String TAG = MODULE_NAME;
+    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:
+                Log.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.
+     */
+    static boolean useConnectionService() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+    }
 
     /**
      * Indicator that we have lost audio focus.
@@ -204,6 +266,15 @@ class AudioModeModule
      */
     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.
@@ -224,21 +295,25 @@ class AudioModeModule
             = (AudioManager)
                 reactContext.getSystemService(Context.AUDIO_SERVICE);
 
-        // Setup runtime device change detection.
-        setupAudioRouteChangeDetection();
+        // Starting Oreo the ConnectionImpl from ConnectionService is used to
+        // detect the available devices.
+        if (!useConnectionService()) {
+            // Setup runtime device change detection.
+            setupAudioRouteChangeDetection();
 
-        // Do an initial detection on Android >= M.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            runInAudioThread(onAudioDeviceChangeRunner);
-        } else {
-            // On Android < M, detect if we have an earpiece.
-            PackageManager pm = reactContext.getPackageManager();
-            if (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-                availableDevices.add(DEVICE_EARPIECE);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                // Do an initial detection on Android >= M.
+                runInAudioThread(onAudioDeviceChangeRunner);
+            } 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);
             }
-
-            // Always assume there is a speaker.
-            availableDevices.add(DEVICE_SPEAKER);
         }
     }
 
@@ -296,7 +371,7 @@ class AudioModeModule
      */
     @Override
     public String getName() {
-        return MODULE_NAME;
+        return NAME;
     }
 
     /**
@@ -354,6 +429,44 @@ class AudioModeModule
         });
     }
 
+    @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);
+                    Log.d(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.
@@ -417,6 +530,31 @@ class AudioModeModule
         });
     }
 
+    /**
+     * 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.
      *
@@ -475,7 +613,7 @@ class AudioModeModule
 
     /**
      * Setup the audio route change detection mechanism. We use the
-     * {@link android.media.AudioDeviceCallback} API on Android >= 23 only.
+     * {@link android.media.AudioDeviceCallback} on 23 >= Android API < 26.
      */
     private void setupAudioRouteChangeDetection() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -486,7 +624,7 @@ class AudioModeModule
     }
 
     /**
-     * Audio route change detection mechanism for Android API >= 23.
+     * Audio route change detection mechanism for 23 >= Android API < 26.
      */
     @TargetApi(Build.VERSION_CODES.M)
     private void setupAudioRouteChangeDetectionM() {
@@ -542,27 +680,31 @@ class AudioModeModule
         Log.d(TAG, "Update audio route for mode: " + mode);
 
         if (mode == DEFAULT) {
-            audioFocusLost = false;
-            audioManager.setMode(AudioManager.MODE_NORMAL);
-            audioManager.abandonAudioFocus(this);
-            audioManager.setSpeakerphoneOn(false);
-            setBluetoothAudioRoute(false);
+            if (!useConnectionService()) {
+                audioFocusLost = false;
+                audioManager.setMode(AudioManager.MODE_NORMAL);
+                audioManager.abandonAudioFocus(this);
+                audioManager.setSpeakerphoneOn(false);
+                setBluetoothAudioRoute(false);
+            }
             selectedDevice = null;
             userSelectedDevice = null;
 
             return true;
         }
 
-        audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-        audioManager.setMicrophoneMute(false);
+        if (!useConnectionService()) {
+            audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+            audioManager.setMicrophoneMute(false);
 
-        if (audioManager.requestAudioFocus(
+            if (audioManager.requestAudioFocus(
                     this,
                     AudioManager.STREAM_VOICE_CALL,
                     AudioManager.AUDIOFOCUS_GAIN)
-                == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
-            Log.d(TAG, "Audio focus request failed");
-            return false;
+                    == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
+                Log.d(TAG, "Audio focus request failed");
+                return false;
+            }
         }
 
         boolean bluetoothAvailable = availableDevices.contains(DEVICE_BLUETOOTH);
@@ -596,11 +738,11 @@ class AudioModeModule
         selectedDevice = audioDevice;
         Log.d(TAG, "Selected audio device: " + audioDevice);
 
-        // Turn bluetooth on / off
-        setBluetoothAudioRoute(audioDevice.equals(DEVICE_BLUETOOTH));
-
-        // Turn speaker on / off
-        audioManager.setSpeakerphoneOn(audioDevice.equals(DEVICE_SPEAKER));
+        if (useConnectionService()) {
+            setAudioRoute(audioDevice);
+        } else {
+            setAudioRoutePreO(audioDevice);
+        }
 
         return true;
     }

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

@@ -170,7 +170,7 @@ public abstract class BaseReactView<ListenerT>
      * @param data - The details of the event associated with/specific to the
      * specified {@code name}.
      */
-    public abstract void onExternalAPIEvent(String name, ReadableMap data);
+    protected abstract void onExternalAPIEvent(String name, ReadableMap data);
 
     protected void onExternalAPIEvent(
             Map<String, Method> listenerMethods,

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

@@ -0,0 +1,451 @@
+package org.jitsi.meet.sdk;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.RequiresApi;
+import android.telecom.CallAudioState;
+import android.telecom.Connection;
+import android.telecom.ConnectionRequest;
+import android.telecom.DisconnectCause;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telecom.VideoProfile;
+import android.util.Log;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableNativeMap;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Jitsi Meet implementation of {@link ConnectionService}. At the time of this
+ * writing it implements only the outgoing call scenario.
+ *
+ * NOTE the class needs to be public, but is not part of the SDK API and should
+ * never be used directly.
+ *
+ * @author Pawel Domas
+ */
+@RequiresApi(api = Build.VERSION_CODES.O)
+public class ConnectionService extends android.telecom.ConnectionService {
+
+    /**
+     * Tag used for logging.
+     */
+    static final String TAG = "JitsiConnectionService";
+
+    /**
+     * The extra added to the {@link ConnectionImpl} and
+     * {@link ConnectionRequest} which stores the {@link PhoneAccountHandle}
+     * created for the call.
+     */
+    static final String EXTRA_PHONE_ACCOUNT_HANDLE
+        = "org.jitsi.meet.sdk.connection_service.PHONE_ACCOUNT_HANDLE";
+
+    /**
+     * Connections mapped by call UUID.
+     */
+    static private final Map<String, ConnectionImpl> connections
+            = new HashMap<>();
+
+    /**
+     * The start call Promises mapped by call UUID.
+     */
+    static private final HashMap<String, Promise> startCallPromises
+            = new HashMap<>();
+
+    /**
+     * Adds {@link ConnectionImpl} to the list.
+     *
+     * @param connection - {@link ConnectionImpl}
+     */
+    static void addConnection(ConnectionImpl connection) {
+        connections.put(connection.getCallUUID(), connection);
+    }
+
+    /**
+     * Returns all {@link ConnectionImpl} instances held in this list.
+     *
+     * @return a list of {@link ConnectionImpl}.
+     */
+    static List<ConnectionImpl> getConnections() {
+        return new ArrayList<>(connections.values());
+    }
+
+    /**
+     * @return {@code true} if running a Samsung device.
+     */
+    static boolean isSamsungDevice() {
+        return android.os.Build.MANUFACTURER.toLowerCase().contains("samsung");
+    }
+
+    /**
+     * Registers a start call promise.
+     *
+     * @param uuid - the call UUID to which the start call promise belongs to.
+     * @param promise - the Promise instance to be stored for later use.
+     */
+    static void registerStartCallPromise(String uuid, Promise promise) {
+        startCallPromises.put(uuid, promise);
+    }
+
+    /**
+     * Removes {@link ConnectionImpl} from the list.
+     *
+     * @param connection - {@link ConnectionImpl}
+     */
+    static void removeConnection(ConnectionImpl connection) {
+        connections.remove(connection.getCallUUID());
+    }
+
+    /**
+     * Used to adjusts the connection's state to
+     * {@link android.telecom.Connection#STATE_ACTIVE}.
+     *
+     * @param callUUID the call UUID which identifies the connection.
+     */
+    static void setConnectionActive(String callUUID) {
+        ConnectionImpl connection = connections.get(callUUID);
+
+        if (connection != null) {
+            connection.setActive();
+        } else {
+            Log.e(TAG, String.format(
+                    "setConnectionActive - no connection for UUID: %s",
+                    callUUID));
+        }
+    }
+
+    /**
+     * Used to adjusts the connection's state to
+     * {@link android.telecom.Connection#STATE_DISCONNECTED}.
+     *
+     * @param callUUID the call UUID which identifies the connection.
+     * @param cause disconnection reason.
+     */
+    static void setConnectionDisconnected(String callUUID, DisconnectCause cause) {
+        ConnectionImpl connection = connections.get(callUUID);
+
+        if (connection != null) {
+            if (isSamsungDevice()) {
+                // Required to release the audio focus correctly.
+                connection.setOnHold();
+                // Prevents from including in the native phone calls history
+                connection.setConnectionProperties(
+                    Connection.PROPERTY_SELF_MANAGED
+                        | Connection.PROPERTY_IS_EXTERNAL_CALL);
+            }
+            // Note that the connection is not removed from the list here, but
+            // in ConnectionImpl's state changed callback. It's a safer
+            // approach, because in case the app would crash on the JavaScript
+            // side the calls would be cleaned up by the system they would still
+            // be removed from the ConnectionList.
+            connection.setDisconnected(cause);
+            connection.destroy();
+        } else {
+            Log.e(TAG, "endCall no connection for UUID: " + callUUID);
+        }
+    }
+
+    /**
+     * Unregisters a start call promise. Must be called after the Promise is
+     * rejected or resolved.
+     *
+     * @param uuid the call UUID which identifies the call to which the promise
+     *        belongs to.
+     * @return the unregistered Promise instance or <tt>null</tt> if there
+     *         wasn't any for the given call UUID.
+     */
+    static Promise unregisterStartCallPromise(String uuid) {
+        return startCallPromises.remove(uuid);
+    }
+
+    /**
+     * Used to adjusts the call's state.
+     *
+     * @param callUUID the call UUID which identifies the connection.
+     * @param callState a map which carries the properties to be modified. See
+     *        "KEY_*" constants in {@link ConnectionImpl} for the list of keys.
+     */
+    static void updateCall(String callUUID, ReadableMap callState) {
+        ConnectionImpl connection = connections.get(callUUID);
+
+        if (connection != null) {
+            if (callState.hasKey(ConnectionImpl.KEY_HAS_VIDEO)) {
+                boolean hasVideo
+                        = callState.getBoolean(ConnectionImpl.KEY_HAS_VIDEO);
+
+                Log.d(TAG, String.format(
+                        "updateCall: %s hasVideo: %s", callUUID, hasVideo));
+                connection.setVideoState(
+                        hasVideo
+                                ? VideoProfile.STATE_BIDIRECTIONAL
+                                : VideoProfile.STATE_AUDIO_ONLY);
+            }
+        } else {
+            Log.e(TAG, "updateCall no connection for UUID: " + callUUID);
+        }
+    }
+
+    @Override
+    public Connection onCreateOutgoingConnection(
+            PhoneAccountHandle accountHandle, ConnectionRequest request) {
+        ConnectionImpl connection = new ConnectionImpl();
+
+        connection.setConnectionProperties(Connection.PROPERTY_SELF_MANAGED);
+        connection.setAddress(
+            request.getAddress(),
+            TelecomManager.PRESENTATION_UNKNOWN);
+        connection.setExtras(request.getExtras());
+
+        connection.setAudioModeIsVoip(true);
+
+        // NOTE there's a time gap between the placeCall and this callback when
+        // things could get out of sync, but they are put back in sync once
+        // the startCall Promise is resolved below. That's because on
+        // the JavaScript side there's a logic to sync up in .then() callback.
+        connection.setVideoState(request.getVideoState());
+
+        Bundle moreExtras = new Bundle();
+
+        moreExtras.putParcelable(
+            EXTRA_PHONE_ACCOUNT_HANDLE,
+            Objects.requireNonNull(request.getAccountHandle(), "accountHandle"));
+        connection.putExtras(moreExtras);
+
+        addConnection(connection);
+
+        Promise startCallPromise
+            = unregisterStartCallPromise(connection.getCallUUID());
+
+        if (startCallPromise != null) {
+            Log.d(TAG,
+                  "onCreateOutgoingConnection " + connection.getCallUUID());
+            startCallPromise.resolve(null);
+        } else {
+            Log.e(TAG, String.format(
+                "onCreateOutgoingConnection: no start call Promise for %s",
+                connection.getCallUUID()));
+        }
+
+        return connection;
+    }
+
+    @Override
+    public Connection onCreateIncomingConnection(
+            PhoneAccountHandle accountHandle, ConnectionRequest request) {
+        throw new RuntimeException("Not implemented");
+    }
+
+    @Override
+    public void onCreateIncomingConnectionFailed(
+            PhoneAccountHandle accountHandle, ConnectionRequest request) {
+        throw new RuntimeException("Not implemented");
+    }
+
+    @Override
+    public void onCreateOutgoingConnectionFailed(
+            PhoneAccountHandle accountHandle, ConnectionRequest request) {
+        PhoneAccountHandle theAccountHandle = request.getAccountHandle();
+        String callUUID = theAccountHandle.getId();
+
+        Log.e(TAG, "onCreateOutgoingConnectionFailed " + callUUID);
+
+        if (callUUID != null) {
+            Promise startCallPromise = unregisterStartCallPromise(callUUID);
+
+            if (startCallPromise != null) {
+                startCallPromise.reject(
+                        "CREATE_OUTGOING_CALL_FAILED",
+                        "The request has been denied by the system");
+            } else {
+                Log.e(TAG, String.format(
+                        "startCallFailed - no start call Promise for UUID: %s",
+                        callUUID));
+            }
+        } else {
+            Log.e(TAG, "onCreateOutgoingConnectionFailed - no call UUID");
+        }
+
+        unregisterPhoneAccount(theAccountHandle);
+    }
+
+    private void unregisterPhoneAccount(PhoneAccountHandle phoneAccountHandle) {
+        TelecomManager telecom = getSystemService(TelecomManager.class);
+        if (telecom != null) {
+            if (phoneAccountHandle != null) {
+                telecom.unregisterPhoneAccount(phoneAccountHandle);
+            } else {
+                Log.e(TAG, "unregisterPhoneAccount - account handle is null");
+            }
+        } else {
+            Log.e(TAG, "unregisterPhoneAccount - telecom is null");
+        }
+    }
+
+    /**
+     * Registers new {@link PhoneAccountHandle}.
+     *
+     * @param context the current Android context.
+     * @param address the phone account's address. At the time of this writing
+     *        it's the call handle passed from the Java Script side.
+     * @param callUUID the call's UUID for which the account is to be created.
+     *        It will be used as the account's id.
+     * @return {@link PhoneAccountHandle} described by the given arguments.
+     */
+    static PhoneAccountHandle registerPhoneAccount(
+            Context context, Uri address, String callUUID) {
+        PhoneAccountHandle phoneAccountHandle
+            = new PhoneAccountHandle(
+                    new ComponentName(context, ConnectionService.class),
+                    callUUID);
+
+        PhoneAccount.Builder builder
+            = PhoneAccount.builder(phoneAccountHandle, address.toString())
+                .setAddress(address)
+                .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED |
+                        PhoneAccount.CAPABILITY_VIDEO_CALLING |
+                        PhoneAccount.CAPABILITY_SUPPORTS_VIDEO_CALLING)
+                .addSupportedUriScheme(PhoneAccount.SCHEME_SIP);
+
+        PhoneAccount account = builder.build();
+
+        TelecomManager telecomManager
+            = context.getSystemService(TelecomManager.class);
+        telecomManager.registerPhoneAccount(account);
+
+        return phoneAccountHandle;
+    }
+
+    /**
+     * Connection implementation for Jitsi Meet's {@link ConnectionService}.
+     *
+     * @author Pawel Domas
+     */
+    class ConnectionImpl extends Connection {
+
+        /**
+         * The constant which defines the key for the "has video" property.
+         * The key is used in the map which carries the call's state passed as
+         * the argument of the {@link RNConnectionService#updateCall} method.
+         */
+        static final String KEY_HAS_VIDEO = "hasVideo";
+
+        /**
+         * Called when system wants to disconnect the call.
+         *
+         * {@inheritDoc}
+         */
+        @Override
+        public void onDisconnect() {
+            Log.d(TAG, "onDisconnect " + getCallUUID());
+            WritableNativeMap data = new WritableNativeMap();
+            data.putString("callUUID", getCallUUID());
+            ReactInstanceManagerHolder.emitEvent(
+                    "org.jitsi.meet:features/connection_service#disconnect",
+                    data);
+            // The JavaScript side will not go back to the native with
+            // 'endCall', so the Connection must be removed immediately.
+            setConnectionDisconnected(
+                    getCallUUID(),
+                    new DisconnectCause(DisconnectCause.LOCAL));
+        }
+
+        /**
+         * Called when system wants to abort the call.
+         *
+         * {@inheritDoc}
+         */
+        @Override
+        public void onAbort() {
+            Log.d(TAG, "onAbort " + getCallUUID());
+            WritableNativeMap data = new WritableNativeMap();
+            data.putString("callUUID", getCallUUID());
+            ReactInstanceManagerHolder.emitEvent(
+                    "org.jitsi.meet:features/connection_service#abort",
+                    data);
+            // The JavaScript side will not go back to the native with
+            // 'endCall', so the Connection must be removed immediately.
+            setConnectionDisconnected(
+                    getCallUUID(),
+                    new DisconnectCause(DisconnectCause.CANCELED));
+        }
+
+        @Override
+        public void onHold() {
+            // What ?! Android will still call this method even if we do not add
+            // the HOLD capability, so do the same thing as on abort.
+            // TODO implement HOLD
+            Log.d(TAG, String.format(
+                  "onHold %s - HOLD is not supported, aborting the call...",
+                  getCallUUID()));
+            this.onAbort();
+        }
+
+        /**
+         * Called when there's change to the call audio state. Either by
+         * the system after the connection is initialized or in response to
+         * {@link #setAudioRoute(int)}.
+         *
+         * @param state the new {@link CallAudioState}
+         */
+        @Override
+        public void onCallAudioStateChanged(CallAudioState state) {
+            Log.d(TAG, "onCallAudioStateChanged: " + state);
+            AudioModeModule audioModeModule
+                    = ReactInstanceManagerHolder
+                    .getNativeModule(AudioModeModule.class);
+            if (audioModeModule != null) {
+                audioModeModule.onCallAudioStateChange(state);
+            }
+        }
+
+        /**
+         * Unregisters the account when the call is disconnected.
+         *
+         * @param state - the new connection's state.
+         */
+        @Override
+        public void onStateChanged(int state) {
+            Log.d(TAG,
+                  String.format("onStateChanged: %s %s",
+                                Connection.stateToString(state),
+                                getCallUUID()));
+
+            if (state == STATE_DISCONNECTED) {
+                removeConnection(this);
+                unregisterPhoneAccount(getPhoneAccountHandle());
+            }
+        }
+
+        /**
+         * Retrieves the UUID of the call associated with this connection.
+         *
+         * @return call UUID
+         */
+        String getCallUUID() {
+            return getPhoneAccountHandle().getId();
+        }
+
+        private PhoneAccountHandle getPhoneAccountHandle() {
+            return getExtras().getParcelable(
+                    ConnectionService.EXTRA_PHONE_ACCOUNT_HANDLE);
+        }
+
+        @Override
+        public String toString() {
+            return String.format(
+                    "ConnectionImpl[address=%s, uuid=%s]@%d",
+                    getAddress(), getCallUUID(), hashCode());
+        }
+    }
+}

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

@@ -22,7 +22,7 @@ import android.app.Activity;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 
 /**
- * Defines the default behavior of {@code JitsiMeetActivity} and
+ * Defines the default behavior of {@code JitsiMeetFragment} and
  * {@code JitsiMeetView} upon invoking the back button if no
  * {@code JitsiMeetView} handles the invocation. For example, a
  * {@code JitsiMeetView} may (1) handle the invocation of the back button

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

@@ -1,4 +1,4 @@
-package org.jitsi.meet.sdk.dropbox;
+package org.jitsi.meet.sdk;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -20,6 +20,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.dropbox.core.android.Auth;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.module.annotations.ReactModule;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,9 +28,13 @@ import java.util.Map;
 /**
  * Implements the react-native module for the dropbox integration.
  */
-public class Dropbox
+@ReactModule(name = DropboxModule.NAME)
+class DropboxModule
         extends ReactContextBaseJavaModule
         implements LifecycleEventListener {
+
+    public static final String NAME = "Dropbox";
+
     private String appKey;
 
     private String clientId;
@@ -38,12 +43,14 @@ public class Dropbox
 
     private Promise promise;
 
-    public Dropbox(ReactApplicationContext reactContext) {
+    public DropboxModule(ReactApplicationContext reactContext) {
         super(reactContext);
 
+        String pkg = reactContext.getApplicationContext().getPackageName();
+        int resId = reactContext.getResources()
+            .getIdentifier("dropbox_app_key", "string", pkg);
         appKey
-            = reactContext.getString(
-                org.jitsi.meet.sdk.R.string.dropbox_app_key);
+            = reactContext.getString(resId);
         isEnabled = !TextUtils.isEmpty(appKey);
 
         clientId = generateClientId();
@@ -129,7 +136,7 @@ public class Dropbox
 
     @Override
     public String getName() {
-        return "Dropbox";
+        return NAME;
     }
 
     /**

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

@@ -22,14 +22,18 @@ 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.facebook.react.module.annotations.ReactModule;
 
 /**
  * Module implementing an API for sending events from JavaScript to native code.
  */
+@ReactModule(name = ExternalAPIModule.NAME)
 class ExternalAPIModule
     extends ReactContextBaseJavaModule {
 
-    private static final String TAG = ExternalAPIModule.class.getSimpleName();
+    public static final String NAME = "ExternalAPI";
+
+    private static final String TAG = NAME;
 
     /**
      * Initializes a new module instance. There shall be a single instance of
@@ -49,7 +53,7 @@ class ExternalAPIModule
      */
     @Override
     public String getName() {
-        return "ExternalAPI";
+        return NAME;
     }
 
     /**

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

@@ -0,0 +1,63 @@
+/*
+ * 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.
+ * 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.os.Bundle;
+
+import com.facebook.react.ReactInstanceManager;
+
+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
+     * {@link JitsiMeetView} join().
+     */
+    private static JitsiMeetConferenceOptions defaultConferenceOptions;
+
+    public static JitsiMeetConferenceOptions getDefaultConferenceOptions() {
+        return defaultConferenceOptions;
+    }
+
+    public static void setDefaultConferenceOptions(JitsiMeetConferenceOptions options) {
+        defaultConferenceOptions = options;
+    }
+
+    /**
+     * Helper to get the default conference options as a {@link Bundle}.
+     *
+     * @return a {@link Bundle} with the default conference options.
+     */
+    static Bundle getDefaultProps() {
+        if (defaultConferenceOptions != null) {
+            return defaultConferenceOptions.asProps();
+        }
+
+        return new Bundle();
+    }
+
+    /**
+     * Used in development mode. It displays the React Native development menu.
+     */
+    public static void showDevOptions() {
+        ReactInstanceManager reactInstanceManager
+            = ReactInstanceManagerHolder.getReactInstanceManager();
+
+        if (reactInstanceManager != null) {
+            reactInstanceManager.showDevOptionsDialog();
+        }
+    }
+}

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

@@ -1,6 +1,5 @@
 /*
  * 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,309 +16,180 @@
 
 package org.jitsi.meet.sdk;
 
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.view.KeyEvent;
+import android.support.v4.app.FragmentActivity;
+import android.util.Log;
 
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.modules.core.PermissionListener;
 
-import java.net.URL;
+import java.util.Map;
+
 
 /**
- * Base Activity for applications integrating Jitsi Meet at a higher level. It
- * contains all the required wiring between the {@code JitsiMeetView} and
- * the Activity lifecycle methods already implemented.
- *
- * In this activity we use a single {@code JitsiMeetView} instance. This
- * instance gives us access to a view which displays the welcome page and the
- * conference itself. All lifetime methods associated with this Activity are
- * hooked to the React Native subsystem via proxy calls through the
- * {@code JitsiMeetView} static methods.
+ * 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 AppCompatActivity implements JitsiMeetActivityInterface {
+public class JitsiMeetActivity extends FragmentActivity
+        implements JitsiMeetActivityInterface, JitsiMeetViewListener {
 
-    /**
-     * The request code identifying requests for the permission to draw on top
-     * of other apps. The value must be 16-bit and is arbitrarily chosen here.
-     */
-    private static final int OVERLAY_PERMISSION_REQUEST_CODE
-        = (int) (Math.random() * Short.MAX_VALUE);
+    protected static final String TAG = JitsiMeetActivity.class.getSimpleName();
 
-    /**
-     * The default base {@code URL} used to join a conference when a partial URL
-     * (e.g. a room name only) is specified. The value is used only while
-     * {@link #view} equals {@code null}.
-     */
-    private URL defaultURL;
+    public static final String ACTION_JITSI_MEET_CONFERENCE = "org.jitsi.meet.CONFERENCE";
+    public static final String JITSI_MEET_CONFERENCE_OPTIONS = "JitsiMeetConferenceOptions";
 
-    /**
-     * Instance of the {@link JitsiMeetView} which this activity will display.
-     */
-    private JitsiMeetView view;
+    // Helpers for starting the activity
+    //
 
-    /**
-     * Whether Picture-in-Picture is enabled. The value is used only while
-     * {@link #view} equals {@code null}.
-     */
-    private Boolean pictureInPictureEnabled;
-
-    /**
-     * Whether the Welcome page is enabled. The value is used only while
-     * {@link #view} equals {@code null}.
-     */
-    private boolean welcomePageEnabled;
-
-    private boolean canRequestOverlayPermission() {
-        return
-            BuildConfig.DEBUG
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                && getApplicationInfo().targetSdkVersion
-                    >= Build.VERSION_CODES.M;
+    public static void launch(Context context, JitsiMeetConferenceOptions options) {
+        Intent intent = new Intent(context, JitsiMeetActivity.class);
+        intent.setAction(ACTION_JITSI_MEET_CONFERENCE);
+        intent.putExtra(JITSI_MEET_CONFERENCE_OPTIONS, options);
+        context.startActivity(intent);
     }
 
-    /**
-     *
-     * @see JitsiMeetView#getDefaultURL()
-     */
-    public URL getDefaultURL() {
-        return view == null ? defaultURL : view.getDefaultURL();
+    public static void launch(Context context, String url) {
+        JitsiMeetConferenceOptions options
+            = new JitsiMeetConferenceOptions.Builder().setRoom(url).build();
+        launch(context, options);
     }
 
-    /**
-     * Initializes the {@link #view} of this {@code JitsiMeetActivity} with a
-     * new {@link JitsiMeetView} instance.
-     */
-    private void initializeContentView() {
-        JitsiMeetView view = initializeView();
-
-        if (view != null) {
-            // XXX Allow extenders who override initializeView() to configure
-            // the view before the first loadURL(). Probably works around a
-            // problem related to ReactRootView#setAppProperties().
-            view.loadURL(null);
-
-            this.view = view;
-            setContentView(this.view);
-        }
-    }
-
-    /**
-     * Initializes a new {@link JitsiMeetView} instance.
-     *
-     * @return a new {@code JitsiMeetView} instance.
-     */
-    protected JitsiMeetView initializeView() {
-        JitsiMeetView view = new JitsiMeetView(this);
-
-        // XXX Before calling JitsiMeetView#loadURL, make sure to call whatever
-        // is documented to need such an order in order to take effect:
-        view.setDefaultURL(defaultURL);
-        if (pictureInPictureEnabled != null) {
-            view.setPictureInPictureEnabled(
-                pictureInPictureEnabled.booleanValue());
-        }
-        view.setWelcomePageEnabled(welcomePageEnabled);
-
-        return view;
-    }
-
-    /**
-     *
-     * @see JitsiMeetView#isPictureInPictureEnabled()
-     */
-    public boolean isPictureInPictureEnabled() {
-        return
-            view == null
-                ? pictureInPictureEnabled
-                : view.isPictureInPictureEnabled();
-    }
-
-    /**
-     *
-     * @see JitsiMeetView#isWelcomePageEnabled()
-     */
-    public boolean isWelcomePageEnabled() {
-        return view == null ? welcomePageEnabled : view.isWelcomePageEnabled();
-    }
-
-    /**
-     * Loads the given URL and displays the conference. If the specified URL is
-     * null, the welcome page is displayed instead.
-     *
-     * @param url The conference URL.
-     */
-    public void loadURL(@Nullable URL url) {
-        view.loadURL(url);
-    }
-
-    @Override
-    protected void onActivityResult(
-            int requestCode,
-            int resultCode,
-            Intent data) {
-        if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE
-                && canRequestOverlayPermission()) {
-            if (Settings.canDrawOverlays(this)) {
-                initializeContentView();
-            }
-
-            return;
-        }
-
-        ReactActivityLifecycleCallbacks.onActivityResult(
-                this, requestCode, resultCode, data);
-    }
-
-    @Override
-    public void onBackPressed() {
-        ReactActivityLifecycleCallbacks.onBackPressed();
-    }
+    // Overrides
+    //
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // In Debug builds React needs permission to write over other apps in
-        // order to display the warning and error overlays.
-        if (canRequestOverlayPermission() && !Settings.canDrawOverlays(this)) {
-            Intent intent
-                = new Intent(
-                        Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-                        Uri.parse("package:" + getPackageName()));
+        setContentView(R.layout.activity_jitsi_meet);
 
-            startActivityForResult(intent, OVERLAY_PERMISSION_REQUEST_CODE);
-            return;
+        if (!extraInitialize()) {
+            initialize();
         }
-
-        initializeContentView();
     }
 
     @Override
-    protected void onDestroy() {
-        super.onDestroy();
+    public void finish() {
+        getJitsiView().leave();
 
-        if (view != null) {
-            view.dispose();
-            view = null;
-        }
-
-        ReactActivityLifecycleCallbacks.onHostDestroy(this);
+        super.finish();
     }
 
-    // ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        ReactInstanceManager reactInstanceManager;
+    // Helper methods
+    //
 
-        if (!super.onKeyUp(keyCode, event)
-                && BuildConfig.DEBUG
-                && (reactInstanceManager
-                        = ReactInstanceManagerHolder.getReactInstanceManager())
-                    != null
-                && keyCode == KeyEvent.KEYCODE_MENU) {
-            reactInstanceManager.showDevOptionsDialog();
-            return true;
+    protected JitsiMeetView getJitsiView() {
+        JitsiMeetFragment fragment
+            = (JitsiMeetFragment) getSupportFragmentManager().findFragmentById(R.id.jitsiFragment);
+        return fragment.getJitsiView();
+    }
+
+    protected void join(@Nullable String url) {
+        JitsiMeetConferenceOptions options
+            = new JitsiMeetConferenceOptions.Builder()
+                .setRoom(url)
+                .build();
+        join(options);
+    }
+
+    protected void join(JitsiMeetConferenceOptions options) {
+        getJitsiView().join(options);
+    }
+
+    private @Nullable JitsiMeetConferenceOptions getConferenceOptions(Intent intent) {
+        String action = intent.getAction();
+
+        if (Intent.ACTION_VIEW.equals(action)) {
+            Uri uri = intent.getData();
+            if (uri != null) {
+                return new JitsiMeetConferenceOptions.Builder().setRoom(uri.toString()).build();
+            }
+        } else if (ACTION_JITSI_MEET_CONFERENCE.equals(action)) {
+            return intent.getParcelableExtra(JITSI_MEET_CONFERENCE_OPTIONS);
         }
+
+        return null;
+    }
+
+    /**
+     * 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.
+     *
+     * 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.
+     */
+    protected boolean extraInitialize() {
         return false;
     }
 
+    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()));
+    }
+
+    // Activity lifecycle methods
+    //
+
+    @Override
+    public void onBackPressed() {
+        JitsiMeetActivityDelegate.onBackPressed();
+    }
+
     @Override
     public void onNewIntent(Intent intent) {
-        // XXX At least twice we received bug reports about malfunctioning
-        // loadURL in the Jitsi Meet SDK while the Jitsi Meet app seemed to
-        // functioning as expected in our testing. But that was to be expected
-        // because the app does not exercise loadURL. In order to increase the
-        // test coverage of loadURL, channel deep linking through loadURL.
-        Uri uri;
+        JitsiMeetConferenceOptions options;
 
-        if (Intent.ACTION_VIEW.equals(intent.getAction())
-                && (uri = intent.getData()) != null
-                && JitsiMeetView.loadURLStringInViews(uri.toString())) {
+        if ((options = getConferenceOptions(intent)) != null) {
+            join(options);
             return;
         }
 
-        ReactActivityLifecycleCallbacks.onNewIntent(intent);
-    }
-
-    // https://developer.android.com/reference/android/support/v4/app/ActivityCompat.OnRequestPermissionsResultCallback
-    @Override
-    public void onRequestPermissionsResult(
-            final int requestCode,
-            final String[] permissions,
-            final int[] grantResults) {
-        ReactActivityLifecycleCallbacks.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        ReactActivityLifecycleCallbacks.onHostResume(this);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-
-        ReactActivityLifecycleCallbacks.onHostPause(this);
+        JitsiMeetActivityDelegate.onNewIntent(intent);
     }
 
     @Override
     protected void onUserLeaveHint() {
-        if (view != null) {
-            view.enterPictureInPicture();
-        }
+        getJitsiView().enterPictureInPicture();
     }
 
-    /**
-     * Implementation of the {@code PermissionAwareActivity} interface.
-     */
+    // JitsiMeetActivityInterface
+    //
+
     @Override
     public void requestPermissions(String[] permissions, int requestCode, PermissionListener listener) {
-        ReactActivityLifecycleCallbacks.requestPermissions(this, permissions, requestCode, listener);
+        JitsiMeetActivityDelegate.requestPermissions(this, permissions, requestCode, listener);
     }
 
-    /**
-     *
-     * @see JitsiMeetView#setDefaultURL(URL)
-     */
-    public void setDefaultURL(URL defaultURL) {
-        if (view == null) {
-            this.defaultURL = defaultURL;
-        } else {
-            view.setDefaultURL(defaultURL);
-        }
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
-    /**
-     *
-     * @see JitsiMeetView#setPictureInPictureEnabled(boolean)
-     */
-    public void setPictureInPictureEnabled(boolean pictureInPictureEnabled) {
-        if (view == null) {
-            this.pictureInPictureEnabled
-                = Boolean.valueOf(pictureInPictureEnabled);
-        } else {
-            view.setPictureInPictureEnabled(pictureInPictureEnabled);
-        }
+    // JitsiMeetViewListener
+    //
+
+    @Override
+    public void onConferenceJoined(Map<String, Object> data) {
+        Log.d(TAG, "Conference joined: " + data);
     }
 
-    /**
-     *
-     * @see JitsiMeetView#setWelcomePageEnabled(boolean)
-     */
-    public void setWelcomePageEnabled(boolean welcomePageEnabled) {
-        if (view == null) {
-            this.welcomePageEnabled = welcomePageEnabled;
-        } else {
-            view.setWelcomePageEnabled(welcomePageEnabled);
-        }
+    @Override
+    public void onConferenceTerminated(Map<String, Object> data) {
+        Log.d(TAG, "Conference terminated: " + data);
+        finish();
+    }
+
+    @Override
+    public void onConferenceWillJoin(Map<String, Object> data) {
+        Log.d(TAG, "Conference will join: " + data);
     }
 }

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

@@ -32,7 +32,13 @@ import com.facebook.react.modules.core.PermissionListener;
  * {@link Activity} lifecycle methods in order for the React side to be aware of
  * it.
  */
-public class ReactActivityLifecycleCallbacks {
+public class JitsiMeetActivityDelegate {
+    /**
+     * Needed for making sure this class working with the "PermissionsAndroid"
+     * React Native module.
+     */
+    private static PermissionListener permissionListener;
+    private static Callback permissionsCallback;
 
     /**
      * {@link Activity} lifecycle method which should be called from
@@ -57,13 +63,6 @@ public class ReactActivityLifecycleCallbacks {
         }
     }
 
-    /**
-     * Needed for making sure this class working with the "PermissionsAndroid"
-     * React Native module.
-     */
-    private static PermissionListener permissionListener;
-    private static Callback permissionsCallback;
-
     /**
      * {@link Activity} lifecycle method which should be called from
      * {@link Activity#onBackPressed} so we can do the required internal

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

@@ -6,7 +6,7 @@ import com.facebook.react.modules.core.PermissionAwareActivity;
 
 /**
  * This interface serves as the umbrella interface that applications not using
- * {@code JitsiMeetActivity} must implement in order to ensure full
+ * {@code JitsiMeetFragment} must implement in order to ensure full
  * functionality.
  */
 public interface JitsiMeetActivityInterface

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

@@ -0,0 +1,296 @@
+/*
+ * 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 android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.net.URL;
+
+
+/**
+ * This class represents the options when joining a Jitsi Meet conference. The user can create an
+ * instance by using {@link JitsiMeetConferenceOptions.Builder} and setting the desired options
+ * there.
+ *
+ * The resulting {@link JitsiMeetConferenceOptions} object is immutable and represents how the
+ * conference will be joined.
+ */
+public class JitsiMeetConferenceOptions implements Parcelable {
+    /**
+     * Server where the conference should take place.
+     */
+    private URL serverURL;
+    /**
+     * Room name.
+     */
+    private String room;
+    /**
+     * JWT token used for authentication.
+     */
+    private String token;
+
+    /**
+     * Color scheme override, see: https://github.com/jitsi/jitsi-meet/blob/dbedee5e22e5dcf9c92db96ef5bb3c9982fc526d/react/features/base/color-scheme/defaultScheme.js
+     */
+    private Bundle colorScheme;
+
+    /**
+     * Set to {@code true} to join the conference with audio / video muted or to start in audio
+     * only mode respectively.
+     */
+    private Boolean audioMuted;
+    private Boolean audioOnly;
+    private Boolean videoMuted;
+
+    /**
+     * Set to {@code true} to enable the welcome page. Typically SDK users won't need this enabled
+     * since the host application decides which meeting to join.
+     */
+    private Boolean welcomePageEnabled;
+
+    /**
+     * Class used to build the immutable {@link JitsiMeetConferenceOptions} object.
+     */
+    public static class Builder {
+        private URL serverURL;
+        private String room;
+        private String token;
+
+        private Bundle colorScheme;
+
+        private Boolean audioMuted;
+        private Boolean audioOnly;
+        private Boolean videoMuted;
+
+        private Boolean welcomePageEnabled;
+
+        public Builder() {
+        }
+
+        /**\
+         * Sets the server URL.
+         * @param url - {@link URL} of the server where the conference should take place.
+         * @return - The {@link Builder} object itself so the method calls can be chained.
+         */
+        public Builder setServerURL(URL url) {
+            this.serverURL = url;
+
+            return this;
+        }
+
+        /**
+         * Sets the room where the conference will take place.
+         * @param room - Name of the room.
+         * @return - The {@link Builder} object itself so the method calls can be chained.
+         */
+        public Builder setRoom(String room) {
+            this.room = room;
+
+            return this;
+        }
+
+        /**
+         * Sets the JWT token to be used for authentication when joining a conference.
+         * @param token - The JWT token to be used for authentication.
+         * @return - The {@link Builder} object itself so the method calls can be chained.
+         */
+        public Builder setToken(String token) {
+            this.token = token;
+
+            return this;
+        }
+
+        /**
+         * Sets the color scheme override so the app is themed. See:
+         * https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/color-scheme/defaultScheme.js
+         * for the structure.
+         * @param colorScheme - A color scheme to be applied to the app.
+         * @return - The {@link Builder} object itself so the method calls can be chained.
+         */
+        public Builder setColorScheme(Bundle colorScheme) {
+            this.colorScheme = colorScheme;
+
+            return this;
+        }
+
+        /**
+         * Indicates the conference will be joined with the microphone muted.
+         * @param muted - Muted indication.
+         * @return - The {@link Builder} object itself so the method calls can be chained.
+         */
+        public Builder setAudioMuted(boolean muted) {
+            this.audioMuted = muted;
+
+            return this;
+        }
+
+        /**
+         * Indicates the conference will be joined in audio-only mode. In this mode no video is
+         * sent or received.
+         * @param audioOnly - Audio-mode indicator.
+         * @return - The {@link Builder} object itself so the method calls can be chained.
+         */
+        public Builder setAudioOnly(boolean audioOnly) {
+            this.audioOnly = audioOnly;
+
+            return this;
+        }
+        /**
+         * Indicates the conference will be joined with the camera muted.
+         * @param videoMuted - Muted indication.
+         * @return - The {@link Builder} object itself so the method calls can be chained.
+         */
+        public Builder setVideoMuted(boolean videoMuted) {
+            this.videoMuted = videoMuted;
+
+            return this;
+        }
+
+        /**
+         * Sets the welcome page enabled / disabled. The welcome page lists recent meetings and
+         * calendar appointments and it's meant to be used by standalone applications. Defaults to
+         * false.
+         * @param enabled - Whether the welcome page should be enabled or not.
+         * @return - The {@link Builder} object itself so the method calls can be chained.
+         */
+        public Builder setWelcomePageEnabled(boolean enabled) {
+            this.welcomePageEnabled = enabled;
+
+            return this;
+        }
+
+        /**
+         * Builds the immutable {@link JitsiMeetConferenceOptions} object with the configuration
+         * that this {@link Builder} instance specified.
+         * @return - The built {@link JitsiMeetConferenceOptions} object.
+         */
+        public JitsiMeetConferenceOptions build() {
+            JitsiMeetConferenceOptions options = new JitsiMeetConferenceOptions();
+
+            options.serverURL = this.serverURL;
+            options.room = this.room;
+            options.token = this.token;
+            options.colorScheme = this.colorScheme;
+            options.audioMuted = this.audioMuted;
+            options.audioOnly = this.audioOnly;
+            options.videoMuted = this.videoMuted;
+            options.welcomePageEnabled = this.welcomePageEnabled;
+
+            return options;
+        }
+    }
+
+    private JitsiMeetConferenceOptions() {
+    }
+
+    private JitsiMeetConferenceOptions(Parcel in) {
+        room = in.readString();
+        token = in.readString();
+        colorScheme = in.readBundle();
+        byte tmpAudioMuted = in.readByte();
+        audioMuted = tmpAudioMuted == 0 ? null : tmpAudioMuted == 1;
+        byte tmpAudioOnly = in.readByte();
+        audioOnly = tmpAudioOnly == 0 ? null : tmpAudioOnly == 1;
+        byte tmpVideoMuted = in.readByte();
+        videoMuted = tmpVideoMuted == 0 ? null : tmpVideoMuted == 1;
+        byte tmpWelcomePageEnabled = in.readByte();
+        welcomePageEnabled = tmpWelcomePageEnabled == 0 ? null : tmpWelcomePageEnabled == 1;
+    }
+
+    Bundle asProps() {
+        Bundle props = new Bundle();
+
+        if (colorScheme != null) {
+            props.putBundle("colorScheme", colorScheme);
+        }
+
+        if (welcomePageEnabled != null) {
+            props.putBoolean("welcomePageEnabled", welcomePageEnabled);
+        }
+
+        // TODO: get rid of this.
+        props.putBoolean("pictureInPictureEnabled", true);
+
+        Bundle config = new Bundle();
+
+        if (audioMuted != null) {
+            config.putBoolean("startWithAudioMuted", audioMuted);
+        }
+        if (audioOnly != null) {
+            config.putBoolean("startAudioOnly", audioOnly);
+        }
+        if (videoMuted != null) {
+            config.putBoolean("startWithVideoMuted", videoMuted);
+        }
+
+        Bundle urlProps = new Bundle();
+
+        // The room is fully qualified
+        if (room != null && room.contains("://")) {
+            urlProps.putString("url", room);
+        } else {
+            if (serverURL != null) {
+                urlProps.putString("serverURL", serverURL.toString());
+            }
+            if (room != null) {
+                urlProps.putString("room", room);
+            }
+        }
+
+        if (token != null) {
+            urlProps.putString("jwt", token);
+        }
+
+        urlProps.putBundle("config", config);
+        props.putBundle("url", urlProps);
+
+        return props;
+    }
+
+    // Parcelable interface
+    //
+
+    public static final Creator<JitsiMeetConferenceOptions> CREATOR = new Creator<JitsiMeetConferenceOptions>() {
+        @Override
+        public JitsiMeetConferenceOptions createFromParcel(Parcel in) {
+            return new JitsiMeetConferenceOptions(in);
+        }
+
+        @Override
+        public JitsiMeetConferenceOptions[] newArray(int size) {
+            return new JitsiMeetConferenceOptions[size];
+        }
+    };
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(room);
+        dest.writeString(token);
+        dest.writeBundle(colorScheme);
+        dest.writeByte((byte) (audioMuted == null ? 0 : audioMuted ? 1 : 2));
+        dest.writeByte((byte) (audioOnly == null ? 0 : audioOnly ? 1 : 2));
+        dest.writeByte((byte) (videoMuted == null ? 0 : videoMuted ? 1 : 2));
+        dest.writeByte((byte) (welcomePageEnabled == null ? 0 : welcomePageEnabled ? 1 : 2));
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+}

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

@@ -0,0 +1,97 @@
+/*
+ * 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.
+ * 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.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.net.URL;
+
+/**
+ * Base {@link Fragment} for applications integrating Jitsi Meet at a higher level. It
+ * contains all the required wiring between the {@code JitsiMeetView} and
+ * the Fragment lifecycle methods already implemented.
+ *
+ * In this fragment we use a single {@code JitsiMeetView} instance. This
+ * instance gives us access to a view which displays the welcome page and the
+ * conference itself. All lifecycle methods associated with this Fragment are
+ * hooked to the React Native subsystem via proxy calls through the
+ * {@code JitsiMeetActivityDelegate} static methods.
+ */
+public class JitsiMeetFragment extends Fragment {
+
+    /**
+     * Instance of the {@link JitsiMeetView} which this activity will display.
+     */
+    private JitsiMeetView view;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        return this.view = new JitsiMeetView(getActivity());
+    }
+
+    public JitsiMeetView getJitsiView() {
+        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();
+
+        JitsiMeetActivityDelegate.onHostDestroy(getActivity());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        JitsiMeetActivityDelegate.onHostResume(getActivity());
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+
+        JitsiMeetActivityDelegate.onHostPause(getActivity());
+    }
+}

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

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * 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.
@@ -24,14 +25,11 @@ import android.util.Log;
 
 import com.facebook.react.bridge.ReadableMap;
 
-import org.jitsi.meet.sdk.invite.InviteController;
-
 import java.lang.reflect.Method;
-import java.net.URL;
 import java.util.Map;
 
-public class JitsiMeetView
-    extends BaseReactView<JitsiMeetViewListener> {
+
+public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener> {
 
     /**
      * The {@code Method}s of {@code JitsiMeetViewListener} by event name i.e.
@@ -46,51 +44,6 @@ public class JitsiMeetView
      */
     private static final String TAG = JitsiMeetView.class.getSimpleName();
 
-    /**
-     * Loads a specific URL {@code String} in all existing
-     * {@code JitsiMeetView}s.
-     *
-     * @param urlString he URL {@code String} to load in all existing
-     * {@code JitsiMeetView}s.
-     * @return If the specified {@code urlString} was submitted for loading in
-     * at least one {@code JitsiMeetView}, then {@code true}; otherwise,
-     * {@code false}.
-     */
-    public static boolean loadURLStringInViews(String urlString) {
-        boolean loaded = false;
-
-        synchronized (views) {
-            for (BaseReactView view : views) {
-                if (view instanceof JitsiMeetView) {
-                    ((JitsiMeetView)view).loadURLString(urlString);
-                    loaded = true;
-                }
-            }
-        }
-
-        return loaded;
-    }
-
-    /**
-     * The default base {@code URL} used to join a conference when a partial URL
-     * (e.g. a room name only) is specified to {@link #loadURLString(String)} or
-     * {@link #loadURLObject(Bundle)}.
-     */
-    private URL defaultURL;
-
-    /**
-     * The entry point into the invite feature of Jitsi Meet. The Java
-     * counterpart of the JavaScript {@code InviteButton}.
-     */
-    private final InviteController inviteController;
-
-    /**
-     * Whether Picture-in-Picture is enabled. If {@code null}, defaults to
-     * {@code true} iff the Android platform supports Picture-in-Picture
-     * natively.
-     */
-    private Boolean pictureInPictureEnabled;
-
     /**
      * The URL of the current conference.
      */
@@ -99,17 +52,55 @@ public class JitsiMeetView
     private volatile String url;
 
     /**
-     * Whether the Welcome page is enabled.
+     * Helper method to recursively merge 2 {@link Bundle} objects representing React Native props.
+     *
+     * @param a - The first {@link Bundle}.
+     * @param b - The second {@link Bundle}.
+     * @return The merged {@link Bundle} object.
      */
-    private boolean welcomePageEnabled;
+    private static Bundle mergeProps(@Nullable Bundle a, @Nullable Bundle b) {
+        Bundle result = new Bundle();
+
+        if (a == null) {
+            if (b != null) {
+                result.putAll(b);
+            }
+
+            return result;
+        }
+
+        if (b == null) {
+            result.putAll(a);
+
+            return result;
+        }
+
+        // Start by putting all of a in the result.
+        result.putAll(a);
+
+        // Iterate over each key in b and override if appropriate.
+        for (String key : b.keySet()) {
+            Object bValue = b.get(key);
+            Object aValue = a.get(key);
+            String valueType = bValue.getClass().getSimpleName();
+
+            if (valueType.contentEquals("Boolean")) {
+                result.putBoolean(key, (Boolean)bValue);
+            } else if (valueType.contentEquals("String")) {
+                result.putString(key, (String)bValue);
+            } else if (valueType.contentEquals("Bundle")) {
+                result.putBundle(key, mergeProps((Bundle)aValue, (Bundle)bValue));
+            } else {
+                throw new RuntimeException("Unsupported type: " + valueType);
+            }
+        }
+
+        return result;
+    }
 
     public JitsiMeetView(@NonNull Context context) {
         super(context);
 
-        // The entry point into the invite feature of Jitsi Meet. The Java
-        // counterpart of the JavaScript InviteButton.
-        inviteController = new InviteController(externalAPIScope);
-
         // Check if the parent Activity implements JitsiMeetActivityInterface,
         // otherwise things may go wrong.
         if (!(context instanceof JitsiMeetActivityInterface)) {
@@ -127,176 +118,59 @@ public class JitsiMeetView
      * page.
      */
     public void enterPictureInPicture() {
-        if (isPictureInPictureEnabled() && getURL() != null) {
-            PictureInPictureModule pipModule
-                = ReactInstanceManagerHolder.getNativeModule(
+        PictureInPictureModule pipModule
+            = ReactInstanceManagerHolder.getNativeModule(
                 PictureInPictureModule.class);
-
-            if (pipModule != null) {
-                try {
-                    pipModule.enterPictureInPicture();
-                } catch (RuntimeException re) {
-                    Log.e(TAG, "onUserLeaveHint: failed to enter PiP mode", re);
-                }
+        if (pipModule != null
+                && PictureInPictureModule.isPictureInPictureSupported()
+                && this.url != null) {
+            try {
+                pipModule.enterPictureInPicture();
+            } catch (RuntimeException re) {
+                Log.e(TAG, "failed to enter PiP mode", re);
             }
         }
     }
 
     /**
-     * Gets the default base {@code URL} used to join a conference when a
-     * partial URL (e.g. a room name only) is specified to
-     * {@link #loadURLString(String)} or {@link #loadURLObject(Bundle)}. If not
-     * set or if set to {@code null}, the default built in JavaScript is used:
-     * https://meet.jit.si
-     *
-     * @return The default base {@code URL} or {@code null}.
+     * Joins the conference specified by the given {@link JitsiMeetConferenceOptions}. If there is
+     * already an active conference, it will be left and the new one will be joined.
+     * @param options - Description of what conference must be joined and what options will be used
+     *                when doing so.
      */
-    public URL getDefaultURL() {
-        return defaultURL;
+    public void join(@Nullable JitsiMeetConferenceOptions options) {
+        setProps(options != null ? options.asProps() : new Bundle());
     }
 
     /**
-     * Gets the {@link InviteController} which represents the entry point into
-     * the invite feature of Jitsi Meet and is the Java counterpart of the
-     * JavaScript {@code InviteButton}.
-     *
-     * @return the {@link InviteController} which represents the entry point
-     * into the invite feature of Jitsi Meet and is the Java counterpart of the
-     * JavaScript {@code InviteButton}
+     * Leaves the currently active conference.
      */
-    public InviteController getInviteController() {
-        return inviteController;
+    public void leave() {
+        setProps(new Bundle());
     }
 
     /**
-     * Gets the URL of the current conference.
-     *
-     * XXX The method is meant for internal purposes only at the time of this
-     * writing because there is no equivalent API on iOS.
-     *
-     * @return the URL {@code String} of the current conference if any;
-     * otherwise, {@code null}.
+     * Helper method to set the React Native props.
+     * @param newProps - New props to be set on the React Native view.
      */
-    String getURL() {
-        return url;
-    }
+    private void setProps(@NonNull Bundle newProps) {
+        // Merge the default options with the newly provided ones.
+        Bundle props = mergeProps(JitsiMeet.getDefaultProps(), newProps);
 
-    /**
-     * Gets whether Picture-in-Picture is enabled. Picture-in-Picture is
-     * natively supported on Android API >= 26 (Oreo), so it should not be
-     * enabled on older platform versions.
-     *
-     * @return If Picture-in-Picture is enabled, {@code true}; {@code false},
-     * otherwise.
-     */
-    public boolean isPictureInPictureEnabled() {
-        return
-            PictureInPictureModule.isPictureInPictureSupported()
-                && (pictureInPictureEnabled == null
-                    || pictureInPictureEnabled);
-    }
-
-    /**
-     * Gets whether the Welcome page is enabled. If {@code true}, the Welcome
-     * page is rendered when this {@code JitsiMeetView} is not at a URL
-     * identifying a Jitsi Meet conference/room.
-     *
-     * @return {@code true} if the Welcome page is enabled; otherwise,
-     * {@code false}.
-     */
-    public boolean isWelcomePageEnabled() {
-        return welcomePageEnabled;
-    }
-
-    /**
-     * Loads a specific {@link URL} which may identify a conference to join. If
-     * the specified {@code URL} is {@code null} and the Welcome page is
-     * enabled, the Welcome page is displayed instead.
-     *
-     * @param url The {@code URL} to load which may identify a conference to
-     * join.
-     */
-    public void loadURL(@Nullable URL url) {
-        loadURLString(url == null ? null : url.toString());
-    }
-
-    /**
-     * Loads a specific URL which may identify a conference to join. The URL is
-     * specified in the form of a {@link Bundle} of properties which (1)
-     * internally are sufficient to construct a URL {@code String} while (2)
-     * abstracting the specifics of constructing the URL away from API
-     * clients/consumers. If the specified URL is {@code null} and the Welcome
-     * page is enabled, the Welcome page is displayed instead.
-     *
-     * @param urlObject The URL to load which may identify a conference to join.
-     */
-    public void loadURLObject(@Nullable Bundle urlObject) {
-        Bundle props = new Bundle();
-
-        // defaultURL
-        if (defaultURL != null) {
-            props.putString("defaultURL", defaultURL.toString());
-        }
-
-        // inviteController
-        InviteController inviteController = getInviteController();
-
-        if (inviteController != null) {
-            props.putBoolean(
-                "addPeopleEnabled",
-                inviteController.isAddPeopleEnabled());
-            props.putBoolean(
-                "dialOutEnabled",
-                inviteController.isDialOutEnabled());
-        }
-
-        // pictureInPictureEnabled
-        props.putBoolean(
-            "pictureInPictureEnabled",
-            isPictureInPictureEnabled());
-
-        // url
-        if (urlObject != null) {
-            props.putBundle("url", urlObject);
-        }
-
-        // welcomePageEnabled
-        props.putBoolean("welcomePageEnabled", welcomePageEnabled);
-
-        // XXX The method loadURLObject: is supposed to be imperative i.e.
+        // XXX The setProps() method is supposed to be imperative i.e.
         // a second invocation with one and the same URL is expected to join
         // the respective conference again if the first invocation was followed
         // by leaving the conference. However, React and, respectively,
         // appProperties/initialProperties are declarative expressions i.e. one
         // and the same URL will not trigger an automatic re-render in the
         // JavaScript source code. The workaround implemented bellow introduces
-        // imperativeness in React Component props by defining a unique value
-        // per loadURLObject: invocation.
+        // "imperativeness" in React Component props by defining a unique value
+        // per setProps() invocation.
         props.putLong("timestamp", System.currentTimeMillis());
 
         createReactRootView("App", props);
     }
 
-    /**
-     * Loads a specific URL {@link String} which may identify a conference to
-     * join. If the specified URL {@code String} is {@code null} and the Welcome
-     * page is enabled, the Welcome page is displayed instead.
-     *
-     * @param urlString The URL {@code String} to load which may identify a
-     * conference to join.
-     */
-    public void loadURLString(@Nullable String urlString) {
-        Bundle urlObject;
-
-        if (urlString == null) {
-            urlObject = null;
-        } else {
-            urlObject = new Bundle();
-            urlObject.putString("url", urlString);
-        }
-        loadURLObject(urlObject);
-    }
-
     /**
      * The internal processing for the URL of the current conference set on the
      * associated {@link JitsiMeetView}.
@@ -306,18 +180,16 @@ public class JitsiMeetView
      * by/associated with the specified {@code eventName}.
      */
     private void maybeSetViewURL(String eventName, ReadableMap eventData) {
+        String url = eventData.getString("url");
+
         switch(eventName) {
         case "CONFERENCE_WILL_JOIN":
-            setURL(eventData.getString("url"));
+            this.url = url;
             break;
 
-        case "CONFERENCE_FAILED":
-        case "CONFERENCE_WILL_LEAVE":
-        case "LOAD_CONFIG_ERROR":
-            String url = eventData.getString("url");
-
-            if (url != null && url.equals(getURL())) {
-                setURL(null);
+        case "CONFERENCE_TERMINATED":
+            if (url != null && url.equals(this.url)) {
+                this.url = null;
             }
             break;
         }
@@ -331,7 +203,7 @@ public class JitsiMeetView
      * by/associated with the specified {@code name}.
      */
     @Override
-    public void onExternalAPIEvent(String name, ReadableMap data) {
+    protected void onExternalAPIEvent(String name, ReadableMap data) {
         // XXX The JitsiMeetView property URL was introduced in order to address
         // an exception in the Picture-in-Picture functionality which arose
         // because of delays related to bridging between JavaScript and Java. To
@@ -341,53 +213,4 @@ public class JitsiMeetView
 
         onExternalAPIEvent(LISTENER_METHODS, name, data);
     }
-
-    /**
-     * Sets the default base {@code URL} used to join a conference when a
-     * partial URL (e.g. a room name only) is specified to
-     * {@link #loadURLString(String)} or {@link #loadURLObject(Bundle)}. Must be
-     * called before {@link #loadURL(URL)} for it to take effect.
-     *
-     * @param defaultURL The {@code URL} to be set as the default base URL.
-     * @see #getDefaultURL()
-     */
-    public void setDefaultURL(URL defaultURL) {
-        this.defaultURL = defaultURL;
-    }
-
-    /**
-     * Sets whether Picture-in-Picture is enabled. Because Picture-in-Picture is
-     * natively supported only since certain platform versions, specifying
-     * {@code true} will have no effect on unsupported platform versions.
-     *
-     * @param pictureInPictureEnabled To enable Picture-in-Picture,
-     * {@code true}; otherwise, {@code false}.
-     */
-    public void setPictureInPictureEnabled(boolean pictureInPictureEnabled) {
-        this.pictureInPictureEnabled = pictureInPictureEnabled;
-    }
-
-    /**
-     * Sets the URL of the current conference.
-     *
-     * XXX The method is meant for internal purposes only. It does not
-     * {@code loadURL}, it merely remembers the specified URL.
-     *
-     * @param url the URL {@code String} which to be set as the URL of the
-     * current conference.
-     */
-    void setURL(String url) {
-        this.url = url;
-    }
-
-    /**
-     * Sets whether the Welcome page is enabled. Must be called before
-     * {@link #loadURL(URL)} for it to take effect.
-     *
-     * @param welcomePageEnabled {@code true} to enable the Welcome page;
-     * otherwise, {@code false}.
-     */
-    public void setWelcomePageEnabled(boolean welcomePageEnabled) {
-        this.welcomePageEnabled = welcomePageEnabled;
-    }
 }

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

@@ -1,51 +0,0 @@
-/*
- * 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 java.util.Map;
-
-/**
- * Implements {@link JitsiMeetViewListener} so apps don't have to add stubs for
- * all methods in the interface if they are only interested in some.
- */
-public abstract class JitsiMeetViewAdapter
-    implements JitsiMeetViewListener {
-
-    @Override
-    public void onConferenceFailed(Map<String, Object> data) {
-    }
-
-    @Override
-    public void onConferenceJoined(Map<String, Object> data) {
-    }
-
-    @Override
-    public void onConferenceLeft(Map<String, Object> data) {
-    }
-
-    @Override
-    public void onConferenceWillJoin(Map<String, Object> data) {
-    }
-
-    @Override
-    public void onConferenceWillLeave(Map<String, Object> data) {
-    }
-
-    @Override
-    public void onLoadConfigError(Map<String, Object> data) {
-    }
-}

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

@@ -22,15 +22,6 @@ import java.util.Map;
  * Interface for listening to events coming from Jitsi Meet.
  */
 public interface JitsiMeetViewListener {
-    /**
-     * Called when joining a conference fails or an ongoing conference is
-     * interrupted due to a failure.
-     *
-     * @param data Map with an "error" key describing the problem, and a "url"
-     * key with the conference URL.
-     */
-    void onConferenceFailed(Map<String, Object> data);
-
     /**
      * Called when a conference was joined.
      *
@@ -39,11 +30,16 @@ public interface JitsiMeetViewListener {
     void onConferenceJoined(Map<String, Object> data);
 
     /**
-     * Called when the conference was left, typically after hanging up.
+     * Called when the active conference ends, be it because of user choice or
+     * because of a failure.
      *
-     * @param data Map with a "url" key with the conference URL.
+     * @param data Map with 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. The possible values for "error" are described here:
+     * https://github.com/jitsi/lib-jitsi-meet/blob/master/JitsiConnectionErrors.js
+     * https://github.com/jitsi/lib-jitsi-meet/blob/master/JitsiConferenceErrors.js
      */
-    void onConferenceLeft(Map<String, Object> data);
+    void onConferenceTerminated(Map<String, Object> data);
 
     /**
      * Called before the conference is joined.
@@ -51,21 +47,4 @@ public interface JitsiMeetViewListener {
      * @param data Map with a "url" key with the conference URL.
      */
     void onConferenceWillJoin(Map<String, Object> data);
-
-    /**
-     * Called before the conference is left.
-     *
-     * @param data Map with a "url" key with the conference URL.
-     */
-    void onConferenceWillLeave(Map<String, Object> data);
-
-    /**
-     * Called when loading the main configuration file from the Jitsi Meet
-     * deployment fails.
-     *
-     * @param data Map with an "error" key with the error and a "url" key with
-     * the conference URL which necessitated the loading of the configuration
-     * file.
-     */
-    void onLoadConfigError(Map<String, Object> data);
 }

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

@@ -16,6 +16,7 @@
 
 package org.jitsi.meet.sdk;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.PictureInPictureParams;
 import android.os.Build;
@@ -26,11 +27,15 @@ 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;
 
+@ReactModule(name = PictureInPictureModule.NAME)
 class PictureInPictureModule
     extends ReactContextBaseJavaModule {
 
-    private final static String TAG = "PictureInPicture";
+    public static final String NAME = "PictureInPicture";
+
+    private static final String TAG = NAME;
 
     static boolean isPictureInPictureSupported() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
@@ -53,6 +58,7 @@ class PictureInPictureModule
      * including when the activity is not visible (paused or stopped), if the
      * screen is locked or if the user has an activity pinned.
      */
+    @TargetApi(Build.VERSION_CODES.O)
     public void enterPictureInPicture() {
         if (!isPictureInPictureSupported()) {
             throw new IllegalStateException("Picture-in-Picture not supported");
@@ -99,6 +105,6 @@ class PictureInPictureModule
 
     @Override
     public String getName() {
-        return TAG;
+        return NAME;
     }
 }

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

@@ -24,6 +24,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.module.annotations.ReactModule;
 
 /**
  * Module implementing a simple API to enable a proximity sensor-controlled
@@ -31,14 +32,11 @@ import com.facebook.react.bridge.UiThreadUtil;
  * object it will dim the screen and disable touch controls. The functionality
  * is used with the conference audio-only mode.
  */
+@ReactModule(name = ProximityModule.NAME)
 class ProximityModule
     extends ReactContextBaseJavaModule {
 
-    /**
-     * The name of {@code ProximityModule} to be used in the React Native
-     * bridge.
-     */
-    private static final String MODULE_NAME = "Proximity";
+    public static final String NAME = "Proximity";
 
     /**
      * This type of wake lock (the one activated by the proximity sensor) has
@@ -74,7 +72,7 @@ class ProximityModule
             wakeLock
                 = powerManager.newWakeLock(
                         PROXIMITY_SCREEN_OFF_WAKE_LOCK,
-                        MODULE_NAME);
+                        "jitsi:"+NAME);
         } catch (Throwable ignored) {
             wakeLock = null;
         }
@@ -89,7 +87,7 @@ class ProximityModule
      */
     @Override
     public String getName() {
-        return MODULE_NAME;
+        return NAME;
     }
 
     /**

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

@@ -0,0 +1,169 @@
+package org.jitsi.meet.sdk;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.RequiresApi;
+import android.telecom.DisconnectCause;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telecom.VideoProfile;
+import android.util.Log;
+
+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.bridge.ReadableMap;
+import com.facebook.react.module.annotations.ReactModule;
+
+/**
+ * The react-native side of Jitsi Meet's {@link ConnectionService}. Exposes
+ * the Java Script API.
+ *
+ * @author Pawel Domas
+ */
+@RequiresApi(api = Build.VERSION_CODES.O)
+@ReactModule(name = RNConnectionService.NAME)
+class RNConnectionService
+    extends ReactContextBaseJavaModule {
+
+    public static final String NAME = "ConnectionService";
+
+    private static final String TAG = ConnectionService.TAG;
+
+    /**
+     * Sets the audio route on all existing {@link android.telecom.Connection}s
+     *
+     * @param audioRoute the new audio route to be set. See
+     * {@link android.telecom.CallAudioState} constants prefixed with "ROUTE_".
+     */
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    static void setAudioRoute(int audioRoute) {
+        for (ConnectionService.ConnectionImpl c
+                : ConnectionService.getConnections()) {
+            c.setAudioRoute(audioRoute);
+        }
+    }
+
+    RNConnectionService(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    /**
+     * Starts a new outgoing call.
+     *
+     * @param callUUID - unique call identifier assigned by Jitsi Meet to
+     *        a conference call.
+     * @param handle - a call handle which by default is Jitsi Meet room's URL.
+     * @param hasVideo - whether or not user starts with the video turned on.
+     * @param promise - the Promise instance passed by the React-native bridge,
+     *        so that this method returns a Promise on the JS side.
+     *
+     * NOTE regarding the "missingPermission" suppress - SecurityException will
+     * be handled as part of the Exception try catch block and the Promise will
+     * be rejected.
+     */
+    @SuppressLint("MissingPermission")
+    @ReactMethod
+    public void startCall(
+            String callUUID,
+            String handle,
+            boolean hasVideo,
+            Promise promise) {
+        Log.d(TAG,
+              String.format("startCall UUID=%s, h=%s, v=%s",
+                            callUUID,
+                            handle,
+                            hasVideo));
+
+        ReactApplicationContext ctx = getReactApplicationContext();
+
+        Uri address = Uri.fromParts(PhoneAccount.SCHEME_SIP, handle, null);
+        PhoneAccountHandle accountHandle
+            = ConnectionService.registerPhoneAccount(
+                    getReactApplicationContext(), address, callUUID);
+
+        Bundle extras = new Bundle();
+        extras.putParcelable(
+                TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE,
+                accountHandle);
+        extras.putInt(
+            TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE,
+            hasVideo
+                ? VideoProfile.STATE_BIDIRECTIONAL
+                : VideoProfile.STATE_AUDIO_ONLY);
+
+        ConnectionService.registerStartCallPromise(callUUID, promise);
+
+        try {
+            TelecomManager tm
+                = (TelecomManager) ctx.getSystemService(
+                        Context.TELECOM_SERVICE);
+
+            tm.placeCall(address, extras);
+        } catch (Exception e) {
+            ConnectionService.unregisterStartCallPromise(callUUID);
+            promise.reject(e);
+        }
+    }
+
+    /**
+     * Called by the JS side of things to mark the call as failed.
+     *
+     * @param callUUID - the call's UUID.
+     */
+    @ReactMethod
+    public void reportCallFailed(String callUUID) {
+        Log.d(TAG, "reportCallFailed " + callUUID);
+        ConnectionService.setConnectionDisconnected(
+                callUUID,
+                new DisconnectCause(DisconnectCause.ERROR));
+    }
+
+    /**
+     * Called by the JS side of things to mark the call as disconnected.
+     *
+     * @param callUUID - the call's UUID.
+     */
+    @ReactMethod
+    public void endCall(String callUUID) {
+        Log.d(TAG, "endCall " + callUUID);
+        ConnectionService.setConnectionDisconnected(
+                callUUID,
+                new DisconnectCause(DisconnectCause.LOCAL));
+    }
+
+    /**
+     * Called by the JS side of things to mark the call as active.
+     *
+     * @param callUUID - the call's UUID.
+     */
+    @ReactMethod
+    public void reportConnectedOutgoingCall(String callUUID) {
+        Log.d(TAG, "reportConnectedOutgoingCall " + callUUID);
+        ConnectionService.setConnectionActive(callUUID);
+    }
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+
+    /**
+     * Called by the JS side to update the call's state.
+     *
+     * @param callUUID - the call's UUID.
+     * @param callState - the map which carries infor about the current call's
+     * state. See static fields in {@link ConnectionService.ConnectionImpl}
+     * prefixed with "KEY_" for the values supported by the Android
+     * implementation.
+     */
+    @ReactMethod
+    public void updateCall(String callUUID, ReadableMap callState) {
+        ConnectionService.updateCall(callUUID, callState);
+    }
+}

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

@@ -1,43 +0,0 @@
-/*
- * 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.support.annotation.Nullable;
-
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-
-public class ReactContextUtils {
-    public static boolean emitEvent(
-            ReactContext reactContext,
-            String eventName,
-            @Nullable Object data) {
-        if (reactContext == null) {
-            // XXX If no ReactContext is specified, emit through the
-            // ReactContext of ReactInstanceManager. ReactInstanceManager
-            // cooperates with ReactContextUtils i.e. ReactInstanceManager will
-            // not invoke ReactContextUtils without a ReactContext.
-            return ReactInstanceManagerHolder.emitEvent(eventName, data);
-        }
-
-        reactContext
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-            .emit(eventName, data);
-
-        return true;
-    }
-}

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

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * 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.
@@ -24,12 +25,20 @@ import com.facebook.react.bridge.NativeModule;
 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.modules.core.DeviceEventManagerModule;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 class ReactInstanceManagerHolder {
     /**
+     * FIXME (from linter): Do not place Android context classes in static
+     * fields (static reference to ReactInstanceManager which has field
+     * mApplicationContext pointing to Context); this is a memory leak (and
+     * also breaks Instant Run).
+     *
      * React Native bridge. The instance manager allows embedding applications
      * to create multiple root views off the same JavaScript bundle.
      */
@@ -37,19 +46,25 @@ class ReactInstanceManagerHolder {
 
     private static List<NativeModule> createNativeModules(
             ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(
-            new AndroidSettingsModule(reactContext),
-            new AppInfoModule(reactContext),
-            new AudioModeModule(reactContext),
-            new ExternalAPIModule(reactContext),
-            new LocaleDetector(reactContext),
-            new PictureInPictureModule(reactContext),
-            new ProximityModule(reactContext),
-            new WiFiStatsModule(reactContext),
-            new org.jitsi.meet.sdk.dropbox.Dropbox(reactContext),
-            new org.jitsi.meet.sdk.invite.InviteModule(reactContext),
-            new org.jitsi.meet.sdk.net.NAT64AddrInfoModule(reactContext)
-        );
+        List<NativeModule> nativeModules
+            = new ArrayList<>(Arrays.<NativeModule>asList(
+                new AmplitudeModule(reactContext),
+                new AndroidSettingsModule(reactContext),
+                new AppInfoModule(reactContext),
+                new AudioModeModule(reactContext),
+                new DropboxModule(reactContext),
+                new ExternalAPIModule(reactContext),
+                new LocaleDetector(reactContext),
+                new PictureInPictureModule(reactContext),
+                new ProximityModule(reactContext),
+                new WiFiStatsModule(reactContext),
+                new org.jitsi.meet.sdk.net.NAT64AddrInfoModule(reactContext)));
+
+        if (AudioModeModule.useConnectionService()) {
+            nativeModules.add(new RNConnectionService(reactContext));
+        }
+
+        return nativeModules;
     }
 
     /**
@@ -58,7 +73,7 @@ class ReactInstanceManagerHolder {
      * @param eventName {@code String} containing the event name.
      * @param data {@code Object} optional ancillary data for the event.
      */
-    public static boolean emitEvent(
+    static void emitEvent(
             String eventName,
             @Nullable Object data) {
         ReactInstanceManager reactInstanceManager
@@ -68,15 +83,12 @@ class ReactInstanceManagerHolder {
             ReactContext reactContext
                 = reactInstanceManager.getCurrentReactContext();
 
-            return
-                reactContext != null
-                    && ReactContextUtils.emitEvent(
-                        reactContext,
-                        eventName,
-                        data);
+            if (reactContext != null) {
+                reactContext
+                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                    .emit(eventName, data);
+            }
         }
-
-        return false;
     }
 
     /**
@@ -144,5 +156,12 @@ class ReactInstanceManagerHolder {
                 .setUseDeveloperSupport(BuildConfig.DEBUG)
                 .setInitialLifecycleState(LifecycleState.RESUMED)
                 .build();
+
+        // Disable delta updates on Android, they have caused trouble.
+        DevInternalSettings devSettings
+            = (DevInternalSettings)reactInstanceManager.getDevSupportManager().getDevSettings();
+        if (devSettings != null) {
+            devSettings.setBundleDeltasEnabled(false);
+        }
     }
 }

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

@@ -17,7 +17,6 @@
 package org.jitsi.meet.sdk;
 
 import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;

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

@@ -25,6 +25,7 @@ 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 org.json.JSONArray;
 import org.json.JSONObject;
@@ -43,19 +44,16 @@ import java.util.concurrent.Executors;
  * Gathers rssi, signal in percentage, timestamp and the addresses of the wifi
  * device.
  */
+@ReactModule(name = WiFiStatsModule.NAME)
 class WiFiStatsModule
     extends ReactContextBaseJavaModule {
 
-    /**
-     * The name of {@code WiFiStatsModule} to be used in the React Native
-     * bridge.
-     */
-    private static final String MODULE_NAME = "WiFiStats";
+    public static final String NAME = "WiFiStats";
 
     /**
      * The {@code Log} tag {@code WiFiStatsModule} is to log messages with.
      */
-    static final String TAG = MODULE_NAME;
+    static final String TAG = NAME;
 
     /**
      * The scale used for the signal value. A level of the signal, given in the
@@ -87,7 +85,7 @@ class WiFiStatsModule
      */
     @Override
     public String getName() {
-        return MODULE_NAME;
+        return NAME;
     }
 
     /**

android/sdk/src/main/java/org/jitsi/meet/sdk/incoming_call/IncomingCallView.java

@@ -50,7 +50,7 @@ public class IncomingCallView
      * by/associated with the specified {@code name}.
      */
     @Override
-    public void onExternalAPIEvent(String name, ReadableMap data) {
+    protected void onExternalAPIEvent(String name, ReadableMap data) {
         onExternalAPIEvent(LISTENER_METHODS, name, data);
     }
 

android/sdk/src/main/java/org/jitsi/meet/sdk/invite/AddPeopleController.java

@@ -1,211 +0,0 @@
-/*
- * 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.invite;
-
-import android.util.Log;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableNativeArray;
-import com.facebook.react.bridge.WritableNativeMap;
-
-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;
-
-/**
- * Controller object used by native code to query and submit user selections for
- * the user invitation flow.
- */
-public class AddPeopleController {
-
-    /**
-     * The AddPeopleControllerListener for this controller, used to pass query
-     * results back to the native code that initiated the query.
-     */
-    private AddPeopleControllerListener listener;
-
-    /**
-     * Local cache of search query results. Used to re-hydrate the list of
-     * selected items based on their ids passed to inviteById in order to pass
-     * the full item maps back to the JitsiMeetView during submission.
-     */
-    private final Map<String, ReadableMap> items = new HashMap<>();
-
-    private final WeakReference<InviteController> owner;
-
-    private final WeakReference<ReactApplicationContext> reactContext;
-
-    /**
-     * Randomly generated UUID, used for identification in the InviteModule.
-     */
-    private final String uuid = UUID.randomUUID().toString();
-
-    public AddPeopleController(
-            InviteController owner,
-            ReactApplicationContext reactContext) {
-        this.owner = new WeakReference<>(owner);
-        this.reactContext = new WeakReference<>(reactContext);
-    }
-
-    /**
-     * Cancel the invitation flow and free memory allocated to the
-     * AddPeopleController. After calling this method, this object is invalid -
-     * a new AddPeopleController will be passed to the caller through
-     * beginAddPeople.
-     */
-    public void endAddPeople() {
-        InviteController owner = this.owner.get();
-
-        if (owner != null) {
-            owner.endAddPeople(this);
-        }
-    }
-
-    /**
-     *
-     * @return the AddPeopleControllerListener for this controller, used to pass
-     * query results back to the native code that initiated the query.
-     */
-    public AddPeopleControllerListener getListener() {
-        return listener;
-    }
-
-    final ReactApplicationContext getReactApplicationContext() {
-        return reactContext.get();
-    }
-
-    /**
-     *
-     * @return the unique identifier for this AddPeopleController
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Send invites to selected users based on their item ids
-     *
-     * @param ids
-     */
-    public void inviteById(List<String> ids) {
-        InviteController owner = this.owner.get();
-
-        if (owner != null) {
-            WritableArray invitees = new WritableNativeArray();
-
-            for(int i = 0, size = ids.size(); i < size; i++) {
-                String id = ids.get(i);
-
-                if(items.containsKey(id)) {
-                    WritableNativeMap map = new WritableNativeMap();
-                    map.merge(items.get(id));
-                    invitees.pushMap(map);
-                } else {
-                    // If the id doesn't exist in the map, we can't do anything,
-                    // so just skip it.
-                }
-            }
-
-            owner.invite(this, invitees);
-        }
-    }
-
-    void inviteSettled(ReadableArray failedInvitees) {
-        AddPeopleControllerListener listener = getListener();
-
-        if (listener != null) {
-            ArrayList<Map<String, Object>> jFailedInvitees = new ArrayList<>();
-
-            for (int i = 0, size = failedInvitees.size(); i < size; ++i) {
-                jFailedInvitees.add(failedInvitees.getMap(i).toHashMap());
-            }
-
-            listener.onInviteSettled(this, jFailedInvitees);
-        }
-    }
-
-    /**
-     * Start a search for entities to invite with the given query. Results will
-     * be returned through the associated AddPeopleControllerListener's
-     * onReceivedResults method.
-     *
-     * @param query
-     */
-    public void performQuery(String query) {
-        InviteController owner = this.owner.get();
-
-        if (owner != null) {
-            owner.performQuery(this, query);
-        }
-    }
-
-    /**
-     * Caches results received by the search into a local map for use later when
-     * the items are submitted.  Submission requires the full map of
-     * information, but only the IDs are returned back to the delegate. Using
-     * this map means we don't have to send the whole map back to the delegate.
-     *
-     * @param results
-     * @param query
-     */
-    void receivedResultsForQuery(ReadableArray results, String query) {
-        AddPeopleControllerListener listener = getListener();
-
-        if (listener != null) {
-            List<Map<String, Object>> jvmResults = new ArrayList<>();
-
-            // cache results for use in submission later
-            // convert to jvm array
-            for(int i = 0; i < results.size(); i++) {
-                ReadableMap map = results.getMap(i);
-
-                if(map.hasKey("id")) {
-                    items.put(map.getString("id"), map);
-                } else if(map.hasKey("type")
-                        && map.getString("type").equals("phone")
-                        && map.hasKey("number")) {
-                    items.put(map.getString("number"), map);
-                } else {
-                    Log.w(
-                        "AddPeopleController",
-                        "Received result without id and that was not a phone number, so not adding it to suggestions: "
-                            + map);
-                }
-
-                jvmResults.add(map.toHashMap());
-            }
-
-            listener.onReceivedResults(this, jvmResults, query);
-        }
-    }
-
-    /**
-     * Sets the AddPeopleControllerListener for this controller, used to pass
-     * query results back to the native code that initiated the query.
-     *
-     * @param listener
-     */
-    public void setListener(AddPeopleControllerListener listener) {
-        this.listener = listener;
-    }
-}

android/sdk/src/main/java/org/jitsi/meet/sdk/invite/AddPeopleControllerListener.java

@@ -1,56 +0,0 @@
-/*
- * 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.invite;
-
-import java.util.List;
-import java.util.Map;
-
-public interface AddPeopleControllerListener {
-    /**
-     * Called when the call to {@link AddPeopleController#inviteById(List)}
-     * completes.
-     *
-     * @param addPeopleController the active {@link AddPeopleController} for
-     * this invite flow.  This object should be cleaned up by calling
-     * {@link AddPeopleController#endAddPeople()} if the user exits the invite
-     * flow. Otherwise, it can stay active if the user will attempt to invite
-     * @param failedInvitees a {@code List} of {@code Map<String, Object>}
-     * dictionaries that represent the invitations that failed. The data type of
-     * the objects is identical to the results returned in onReceivedResuls.
-     */
-    void onInviteSettled(
-        AddPeopleController addPeopleController,
-        List<Map<String, Object>> failedInvitees);
-
-    /**
-     * Called when results are received for a query called through
-     * AddPeopleController.query().
-     *
-     * @param addPeopleController
-     * @param results a List of Map<String, Object> objects that represent items
-     * returned by the query. The object at key "type" describes the type of
-     * item: "user", "videosipgw" (conference room), or "phone". "user" types
-     * have properties at "id", "name", and "avatar". "videosipgw" types have
-     * properties at "id" and "name". "phone" types have properties at "number",
-     * "title", "and "subtitle"
-     * @param query the query that generated the given results
-     */
-    void onReceivedResults(
-        AddPeopleController addPeopleController,
-        List<Map<String, Object>> results,
-        String query);
-}

android/sdk/src/main/java/org/jitsi/meet/sdk/invite/InviteController.java

@@ -1,265 +0,0 @@
-/*
- * 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.invite;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableNativeMap;
-
-import org.jitsi.meet.sdk.ReactContextUtils;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-
-/**
- * Represents the entry point into the invite feature of Jitsi Meet and is the
- * Java counterpart of the JavaScript {@code InviteButton}.
- */
-public class InviteController {
-    private AddPeopleController addPeopleController;
-
-    /**
-     * Whether adding/inviting people by name (as opposed to phone number) is
-     * enabled.
-     */
-    private Boolean addPeopleEnabled;
-
-    /**
-     * Whether adding/inviting people by phone number (as opposed to name) is
-     * enabled.
-     */
-    private Boolean dialOutEnabled;
-
-    private final String externalAPIScope;
-
-    private InviteControllerListener listener;
-
-    public InviteController(String externalAPIScope) {
-        this.externalAPIScope = externalAPIScope;
-    }
-
-    void beginAddPeople(ReactApplicationContext reactContext) {
-        InviteControllerListener listener = getListener();
-
-        if (listener != null) {
-            // XXX For the sake of simplicity and in order to reduce the risk of
-            // memory leaks, allow a single AddPeopleController at a time.
-            AddPeopleController addPeopleController = this.addPeopleController;
-
-            if (addPeopleController != null) {
-                return;
-            }
-
-            // Initialize a new AddPeopleController to represent the click/tap
-            // on the InviteButton and notify the InviteControllerListener
-            // about the event.
-            addPeopleController = new AddPeopleController(this, reactContext);
-
-            boolean success = false;
-
-            this.addPeopleController = addPeopleController;
-            try {
-                listener.beginAddPeople(addPeopleController);
-                success = true;
-            } finally {
-                if (!success) {
-                    endAddPeople(addPeopleController);
-                }
-            }
-        }
-    }
-
-    void endAddPeople(AddPeopleController addPeopleController) {
-        if (this.addPeopleController == addPeopleController) {
-            this.addPeopleController = null;
-        }
-    }
-
-    public InviteControllerListener getListener() {
-        return listener;
-    }
-
-    /**
-     * Sends JavaScript event to submit invitations to the given item ids
-     *
-     * @param invitees a WritableArray of WritableNativeMaps representing
-     * selected items. Each map representing a selected item should match the
-     * data passed back in the return from a query.
-     */
-    boolean invite(
-            AddPeopleController addPeopleController,
-            WritableArray invitees) {
-        return
-            invite(
-                addPeopleController.getUuid(),
-                addPeopleController.getReactApplicationContext(),
-                invitees);
-    }
-
-    public Future<List<Map<String, Object>>> invite(
-            final List<Map<String, Object>> invitees) {
-        final boolean inviteBegan
-            = invite(
-                UUID.randomUUID().toString(),
-                /* reactContext */ null,
-                Arguments.makeNativeArray(invitees));
-        FutureTask futureTask
-            = new FutureTask(new Callable() {
-                @Override
-                public List<Map<String, Object>> call() {
-                    if (inviteBegan) {
-                        // TODO Complete the returned Future when the invite
-                        // settles.
-                        return Collections.emptyList();
-                    } else {
-                        // The invite failed to even begin so report that all
-                        // invitees failed.
-                        return invitees;
-                    }
-                }
-            });
-
-        // If the invite failed to even begin, complete the returned Future
-        // already and the Future implementation will report that all invitees
-        // failed.
-        if (!inviteBegan) {
-            futureTask.run();
-        }
-
-        return futureTask;
-    }
-
-    private boolean invite(
-            String addPeopleControllerScope,
-            ReactContext reactContext,
-            WritableArray invitees) {
-        WritableNativeMap data = new WritableNativeMap();
-
-        data.putString("addPeopleControllerScope", addPeopleControllerScope);
-        data.putString("externalAPIScope", externalAPIScope);
-        data.putArray("invitees", invitees);
-
-        return
-            ReactContextUtils.emitEvent(
-                reactContext,
-                "org.jitsi.meet:features/invite#invite",
-                data);
-    }
-
-    void inviteSettled(
-            String addPeopleControllerScope,
-            ReadableArray failedInvitees) {
-        AddPeopleController addPeopleController = this.addPeopleController;
-
-        if (addPeopleController != null
-                && addPeopleController.getUuid().equals(
-                    addPeopleControllerScope)) {
-            try {
-                addPeopleController.inviteSettled(failedInvitees);
-            } finally {
-                if (failedInvitees.size() == 0) {
-                    endAddPeople(addPeopleController);
-                }
-            }
-        }
-    }
-
-    public boolean isAddPeopleEnabled() {
-        Boolean b = this.addPeopleEnabled;
-
-        return
-            (b == null || b.booleanValue()) ? (getListener() != null) : false;
-    }
-
-    public boolean isDialOutEnabled() {
-        Boolean b = this.dialOutEnabled;
-
-        return
-            (b == null || b.booleanValue()) ? (getListener() != null) : false;
-    }
-
-    /**
-     * Starts a query for users to invite to the conference. Results will be
-     * returned through
-     * {@link AddPeopleControllerListener#onReceivedResults(AddPeopleController, List, String)}.
-     *
-     * @param query {@code String} to use for the query
-     */
-    void performQuery(AddPeopleController addPeopleController, String query) {
-        WritableNativeMap params = new WritableNativeMap();
-
-        params.putString("addPeopleControllerScope", addPeopleController.getUuid());
-        params.putString("externalAPIScope", externalAPIScope);
-        params.putString("query", query);
-        ReactContextUtils.emitEvent(
-            addPeopleController.getReactApplicationContext(),
-            "org.jitsi.meet:features/invite#performQuery",
-            params);
-    }
-
-    void receivedResultsForQuery(
-            String addPeopleControllerScope,
-            String query,
-            ReadableArray results) {
-        AddPeopleController addPeopleController = this.addPeopleController;
-
-        if (addPeopleController != null
-                && addPeopleController.getUuid().equals(
-                    addPeopleControllerScope)) {
-            addPeopleController.receivedResultsForQuery(results, query);
-        }
-    }
-
-    /**
-     * Sets whether the ability to add users to the call is enabled. If this is
-     * enabled, an add user button will appear on the {@link JitsiMeetView}. If
-     * enabled, and the user taps the add user button,
-     * {@link InviteControllerListener#beginAddPeople(AddPeopleController)}
-     * will be called.
-     *
-     * @param addPeopleEnabled {@code true} to enable the add people button;
-     * otherwise, {@code false}
-     */
-    public void setAddPeopleEnabled(boolean addPeopleEnabled) {
-        this.addPeopleEnabled = Boolean.valueOf(addPeopleEnabled);
-    }
-
-    /**
-     * Sets whether the ability to add phone numbers to the call is enabled.
-     * Must be enabled along with {@link #setAddPeopleEnabled(boolean)} to be
-     * effective.
-     *
-     * @param dialOutEnabled {@code true} to enable the ability to add phone
-     * numbers to the call; otherwise, {@code false}
-     */
-    public void setDialOutEnabled(boolean dialOutEnabled) {
-        this.dialOutEnabled = Boolean.valueOf(dialOutEnabled);
-    }
-
-    public void setListener(InviteControllerListener listener) {
-        this.listener = listener;
-    }
-}

android/sdk/src/main/java/org/jitsi/meet/sdk/invite/InviteControllerListener.java

@@ -1,29 +0,0 @@
-/*
- * 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.invite;
-
-public interface InviteControllerListener {
-    /**
-     * Called when the add user button is tapped.
-     *
-     * @param addPeopleController {@code AddPeopleController} scoped for this
-     * user invite flow. The {@code AddPeopleController} is used to start user
-     * queries and accepts an {@code AddPeopleControllerListener} for receiving
-     * user query responses.
-     */
-    void beginAddPeople(AddPeopleController addPeopleController);
-}

android/sdk/src/main/java/org/jitsi/meet/sdk/invite/InviteModule.java

@@ -1,171 +0,0 @@
-/*
- * 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.invite;
-
-import android.util.Log;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.UiThreadUtil;
-
-import org.jitsi.meet.sdk.BaseReactView;
-import org.jitsi.meet.sdk.JitsiMeetView;
-
-/**
- * Implements the react-native module of the feature invite.
- */
-public class InviteModule
-    extends ReactContextBaseJavaModule {
-
-    public InviteModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    /**
-     * Signals that a click/tap has been performed on {@code InviteButton} and
-     * that the execution flow for adding/inviting people to the current
-     * conference/meeting is to begin
-     *
-     * @param externalAPIScope the unique identifier of the
-     * {@code JitsiMeetView} whose {@code InviteButton} was clicked/tapped.
-     */
-    @ReactMethod
-    public void beginAddPeople(final String externalAPIScope) {
-        // Make sure InviteControllerListener (like all other listeners of the
-        // SDK) is invoked on the UI thread. It was requested by SDK consumers.
-        if (!UiThreadUtil.isOnUiThread()) {
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    beginAddPeople(externalAPIScope);
-                }
-            });
-            return;
-        }
-
-        InviteController inviteController
-            = findInviteControllerByExternalAPIScope(externalAPIScope);
-
-        if (inviteController != null) {
-            inviteController.beginAddPeople(getReactApplicationContext());
-        }
-    }
-
-    private InviteController findInviteControllerByExternalAPIScope(
-            String externalAPIScope) {
-        JitsiMeetView view
-            = (JitsiMeetView)
-                BaseReactView.findViewByExternalAPIScope(externalAPIScope);
-
-        return view == null ? null : view.getInviteController();
-    }
-
-    @Override
-    public String getName() {
-        return "Invite";
-    }
-
-    /**
-     * Callback for invitation failures
-     *
-     * @param failedInvitees the items for which the invitation failed
-     * @param addPeopleControllerScope a string that represents a connection to
-     * a specific AddPeopleController
-     */
-    @ReactMethod
-    public void inviteSettled(
-            final String externalAPIScope,
-            final String addPeopleControllerScope,
-            final ReadableArray failedInvitees) {
-        // Make sure AddPeopleControllerListener (like all other listeners of
-        // the SDK) is invoked on the UI thread. It was requested by SDK
-        // consumers.
-        if (!UiThreadUtil.isOnUiThread()) {
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    inviteSettled(
-                        externalAPIScope, 
-                        addPeopleControllerScope,
-                        failedInvitees);
-                }
-            });
-            return;
-        }
-
-        InviteController inviteController
-            = findInviteControllerByExternalAPIScope(externalAPIScope);
-
-        if (inviteController == null) {
-            Log.w(
-                "InviteModule",
-                "Invite settled, but failed to find active controller to notify");
-        } else {
-            inviteController.inviteSettled(
-                addPeopleControllerScope,
-                failedInvitees);
-        }
-    }
-
-    /**
-     * Callback for results received from the JavaScript invite search call
-     *
-     * @param results the results in a ReadableArray of ReadableMap objects
-     * @param query the query associated with the search
-     * @param addPeopleControllerScope a string that represents a connection to
-     * a specific AddPeopleController
-     */
-    @ReactMethod
-    public void receivedResults(
-            final String externalAPIScope,
-            final String addPeopleControllerScope,
-            final String query,
-            final ReadableArray results) {
-        // Make sure AddPeopleControllerListener (like all other listeners of
-        // the SDK) is invoked on the UI thread. It was requested by SDK
-        // consumers.
-        if (!UiThreadUtil.isOnUiThread()) {
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    receivedResults(
-                        externalAPIScope,
-                        addPeopleControllerScope,
-                        query,
-                        results);
-                }
-            });
-            return;
-        }
-
-        InviteController inviteController
-            = findInviteControllerByExternalAPIScope(externalAPIScope);
-
-        if (inviteController == null) {
-            Log.w(
-                "InviteModule",
-                "Received results, but failed to find active controller to send results back");
-        } else {
-            inviteController.receivedResultsForQuery(
-                addPeopleControllerScope,
-                query,
-                results);
-        }
-    }
-}

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

@@ -21,6 +21,7 @@ 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 java.net.UnknownHostException;
 
@@ -32,9 +33,12 @@ import java.net.UnknownHostException;
  * [1]: https://tools.ietf.org/html/rfc6146
  * [2]: https://tools.ietf.org/html/rfc6052
  */
+@ReactModule(name = NAT64AddrInfoModule.NAME)
 public class NAT64AddrInfoModule
     extends ReactContextBaseJavaModule {
 
+    public final static String NAME = "NAT64AddrInfo";
+
     /**
      * The host for which the module wil try to resolve both IPv4 and IPv6
      * addresses in order to figure out the NAT64 prefix.
@@ -46,15 +50,10 @@ public class NAT64AddrInfoModule
      */
     private final static long INFO_LIFETIME = 60 * 1000;
 
-    /**
-     * The name of this module.
-     */
-    private final static String MODULE_NAME = "NAT64AddrInfo";
-
     /**
      * The {@code Log} tag {@code NAT64AddrInfoModule} is to log messages with.
      */
-    private final static String TAG = MODULE_NAME;
+    private final static String TAG = NAME;
 
     /**
      * The {@link NAT64AddrInfo} instance which holds NAT64 prefix/suffix.
@@ -119,6 +118,6 @@ public class NAT64AddrInfoModule
 
     @Override
     public String getName() {
-        return MODULE_NAME;
+        return NAME;
     }
 }

android/sdk/src/main/res/layout/activity_jitsi_meet.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".JitsiMeetActivity">
+    <fragment
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:name="org.jitsi.meet.sdk.JitsiMeetFragment"
+        android:id="@+id/jitsiFragment"/>
+</FrameLayout>

conference.js

@@ -38,6 +38,7 @@ import {
     conferenceFailed,
     conferenceJoined,
     conferenceLeft,
+    conferenceSubjectChanged,
     conferenceWillJoin,
     conferenceWillLeave,
     dataChannelOpened,
@@ -76,10 +77,10 @@ import {
     dominantSpeakerChanged,
     getAvatarURLByParticipantId,
     getLocalParticipant,
+    getNormalizedDisplayName,
     getParticipantById,
     localParticipantConnectionStatusChanged,
     localParticipantRoleChanged,
-    MAX_DISPLAY_NAME_LENGTH,
     participantConnectionStatusChanged,
     participantPresenceChanged,
     participantRoleChanged,
@@ -347,7 +348,10 @@ class ConferenceConnector {
         // not enough rights to create conference
         case JitsiConferenceErrors.AUTHENTICATION_REQUIRED: {
             // Schedule reconnect to check if someone else created the room.
-            this.reconnectTimeout = setTimeout(() => room.join(), 5000);
+            this.reconnectTimeout = setTimeout(() => {
+                APP.store.dispatch(conferenceWillJoin(room));
+                room.join();
+            }, 5000);
 
             const { password }
                 = APP.store.getState()['features/base/conference'];
@@ -1234,6 +1238,7 @@ export default {
             = connection.initJitsiConference(
                 APP.conference.roomName,
                 this._getConferenceOptions());
+
         APP.store.dispatch(conferenceWillJoin(room));
         this._setLocalAudioVideoStreams(localTracks);
         this._room = room; // FIXME do not use this
@@ -1321,7 +1326,14 @@ export default {
         this.isSharingScreen = newStream && newStream.videoType === 'desktop';
 
         if (wasSharingScreen !== this.isSharingScreen) {
-            APP.API.notifyScreenSharingStatusChanged(this.isSharingScreen);
+            const details = {};
+
+            if (this.isSharingScreen) {
+                details.sourceType = newStream.sourceType;
+            }
+
+            APP.API.notifyScreenSharingStatusChanged(
+                this.isSharingScreen, details);
         }
     },
 
@@ -1397,6 +1409,8 @@ export default {
             receiver.stop();
         }
 
+        this._stopProxyConnection();
+
         let promise = null;
 
         if (didHaveVideo) {
@@ -1472,9 +1486,12 @@ export default {
 
     /**
      * Creates desktop (screensharing) {@link JitsiLocalTrack}
+     *
      * @param {Object} [options] - Screen sharing options that will be passed to
      * createLocalTracks.
-     *
+     * @param {Object} [options.desktopSharing]
+     * @param {Object} [options.desktopStream] - An existing desktop stream to
+     * use instead of creating a new desktop stream.
      * @return {Promise.<JitsiLocalTrack>} - A Promise resolved with
      * {@link JitsiLocalTrack} for the screensharing or rejected with
      * {@link JitsiTrackError}.
@@ -1487,47 +1504,52 @@ export default {
         const didHaveVideo = Boolean(this.localVideo);
         const wasVideoMuted = this.isLocalVideoMuted();
 
-        return createLocalTracksF({
-            desktopSharingSources: options.desktopSharingSources,
-            devices: [ 'desktop' ],
-            desktopSharingExtensionExternalInstallation: {
-                interval: 500,
-                checkAgain: () => DSExternalInstallationInProgress,
-                listener: (status, url) => {
-                    switch (status) {
-                    case 'waitingForExtension': {
-                        DSExternalInstallationInProgress = true;
-                        externalInstallation = true;
-                        const listener = () => {
-                            // Wait a little bit more just to be sure that we
-                            // won't miss the extension installation
-                            setTimeout(
-                                () => {
+        const getDesktopStreamPromise = options.desktopStream
+            ? Promise.resolve([ options.desktopStream ])
+            : createLocalTracksF({
+                desktopSharingSourceDevice: options.desktopSharingSources
+                    ? null : config._desktopSharingSourceDevice,
+                desktopSharingSources: options.desktopSharingSources,
+                devices: [ 'desktop' ],
+                desktopSharingExtensionExternalInstallation: {
+                    interval: 500,
+                    checkAgain: () => DSExternalInstallationInProgress,
+                    listener: (status, url) => {
+                        switch (status) {
+                        case 'waitingForExtension': {
+                            DSExternalInstallationInProgress = true;
+                            externalInstallation = true;
+                            const listener = () => {
+                                // Wait a little bit more just to be sure that
+                                // we won't miss the extension installation
+                                setTimeout(() => {
                                     DSExternalInstallationInProgress = false;
                                 },
                                 500);
-                            APP.UI.removeListener(
+                                APP.UI.removeListener(
+                                    UIEvents.EXTERNAL_INSTALLATION_CANCELED,
+                                    listener);
+                            };
+
+                            APP.UI.addListener(
                                 UIEvents.EXTERNAL_INSTALLATION_CANCELED,
                                 listener);
-                        };
+                            APP.UI.showExtensionExternalInstallationDialog(url);
+                            break;
+                        }
+                        case 'extensionFound':
+                            // Close the dialog.
+                            externalInstallation && $.prompt.close();
+                            break;
+                        default:
 
-                        APP.UI.addListener(
-                            UIEvents.EXTERNAL_INSTALLATION_CANCELED,
-                            listener);
-                        APP.UI.showExtensionExternalInstallationDialog(url);
-                        break;
-                    }
-                    case 'extensionFound':
-                        // Close the dialog.
-                        externalInstallation && $.prompt.close();
-                        break;
-                    default:
-
-                        // Unknown status
+                            // Unknown status
+                        }
                     }
                 }
-            }
-        }).then(([ desktopStream ]) => {
+            });
+
+        return getDesktopStreamPromise.then(([ desktopStream ]) => {
             // Stores the "untoggle" handler which remembers whether was
             // there any video before and whether was it muted.
             this._untoggleScreenSharing
@@ -1645,6 +1667,7 @@ export default {
         // Handling:
         // JitsiTrackErrors.PERMISSION_DENIED
         // JitsiTrackErrors.CHROME_EXTENSION_INSTALLATION_ERROR
+        // JitsiTrackErrors.CONSTRAINT_FAILED
         // JitsiTrackErrors.GENERAL
         // and any other
         let descriptionKey;
@@ -1668,6 +1691,9 @@ export default {
                 descriptionKey = 'dialog.screenSharingPermissionDeniedError';
                 titleKey = 'dialog.screenSharingFailedToInstallTitle';
             }
+        } else if (error.name === JitsiTrackErrors.CONSTRAINT_FAILED) {
+            descriptionKey = 'dialog.cameraConstraintFailedError';
+            titleKey = 'deviceError.cameraError';
         } else {
             descriptionKey = 'dialog.screenSharingFailedToInstall';
             titleKey = 'dialog.screenSharingFailedToInstallTitle';
@@ -1807,6 +1833,8 @@ export default {
         room.on(JitsiConferenceEvents.TALK_WHILE_MUTED, () => {
             APP.UI.showToolbar(6000);
         });
+        room.on(JitsiConferenceEvents.SUBJECT_CHANGED,
+            subject => APP.store.dispatch(conferenceSubjectChanged(subject)));
 
         room.on(
             JitsiConferenceEvents.LAST_N_ENDPOINTS_CHANGED,
@@ -1841,7 +1869,7 @@ export default {
             JitsiConferenceEvents.DISPLAY_NAME_CHANGED,
             (id, displayName) => {
                 const formattedDisplayName
-                    = displayName.substr(0, MAX_DISPLAY_NAME_LENGTH);
+                    = getNormalizedDisplayName(displayName);
 
                 APP.store.dispatch(participantUpdated({
                     conference: room,
@@ -1891,21 +1919,6 @@ export default {
             JitsiConferenceEvents.PARTICIPANT_PROPERTY_CHANGED,
             (participant, name, oldValue, newValue) => {
                 switch (name) {
-                case 'features_screen-sharing': {
-                    APP.store.dispatch(participantUpdated({
-                        conference: room,
-                        id: participant.getId(),
-                        features: { 'screen-sharing': true }
-                    }));
-                    break;
-                }
-                case 'raisedHand':
-                    APP.store.dispatch(participantUpdated({
-                        conference: room,
-                        id: participant.getId(),
-                        raisedHand: newValue === 'true'
-                    }));
-                    break;
                 case 'remoteControlSessionStatus':
                     APP.UI.setRemoteControlActiveStatus(
                         participant.getId(),
@@ -2217,34 +2230,6 @@ export default {
      * @returns {void}
      */
     _onConferenceJoined() {
-        if (APP.logCollector) {
-            // Start the LogCollector's periodic "store logs" task
-            APP.logCollector.start();
-            APP.logCollectorStarted = true;
-
-            // Make an attempt to flush in case a lot of logs have been
-            // cached, before the collector was started.
-            APP.logCollector.flush();
-
-            // This event listener will flush the logs, before
-            // the statistics module (CallStats) is stopped.
-            //
-            // NOTE The LogCollector is not stopped, because this event can
-            // be triggered multiple times during single conference
-            // (whenever statistics module is stopped). That includes
-            // the case when Jicofo terminates the single person left in the
-            // room. It will then restart the media session when someone
-            // eventually join the room which will start the stats again.
-            APP.conference.addConferenceListener(
-                JitsiConferenceEvents.BEFORE_STATISTICS_DISPOSED,
-                () => {
-                    if (APP.logCollector) {
-                        APP.logCollector.flush();
-                    }
-                }
-            );
-        }
-
         APP.UI.initConference();
 
         APP.keyboardshortcut.init();
@@ -2322,7 +2307,8 @@ export default {
                         }));
                     }
 
-                    if (this.localVideo) {
+                    if (this.localVideo
+                        && this.localVideo.videoType === 'camera') {
                         dispatch(updateSettings({
                             cameraDeviceId: this.localVideo.getDeviceId()
                         }));
@@ -2416,7 +2402,7 @@ export default {
      */
     updateAudioIconEnabled() {
         const audioMediaDevices
-            = APP.store.getState()['features/base/devices'].audioInput;
+            = APP.store.getState()['features/base/devices'].availableDevices.audioInput;
         const audioDeviceCount
             = audioMediaDevices ? audioMediaDevices.length : 0;
 
@@ -2439,7 +2425,7 @@ export default {
      */
     updateVideoIconEnabled() {
         const videoMediaDevices
-            = APP.store.getState()['features/base/devices'].videoInput;
+            = APP.store.getState()['features/base/devices'].availableDevices.videoInput;
         const videoDeviceCount
             = videoMediaDevices ? videoMediaDevices.length : 0;
 
@@ -2468,6 +2454,8 @@ export default {
     hangup(requestFeedback = false) {
         eventEmitter.emit(JitsiMeetConferenceEvents.BEFORE_HANGUP);
 
+        this._stopProxyConnection();
+
         APP.store.dispatch(destroyLocalTracks());
         this._localTracksInitialized = false;
         this.localVideo = null;
@@ -2503,6 +2491,9 @@ export default {
             requestFeedbackPromise,
             this.leaveRoomAndDisconnect()
         ]).then(values => {
+            this._room = undefined;
+            room = undefined;
+
             APP.API.notifyReadyToClose();
             maybeRedirectToWelcomePage(values[0]);
         });
@@ -2517,11 +2508,7 @@ export default {
         APP.store.dispatch(conferenceWillLeave(room));
 
         return room.leave()
-            .then(disconnect, disconnect)
-            .then(() => {
-                this._room = undefined;
-                room = undefined;
-            });
+            .then(disconnect, disconnect);
     },
 
     /**
@@ -2627,8 +2614,7 @@ export default {
      * @param nickname {string} the new display name
      */
     changeLocalDisplayName(nickname = '') {
-        const formattedNickname
-            = nickname.trim().substr(0, MAX_DISPLAY_NAME_LENGTH);
+        const formattedNickname = getNormalizedDisplayName(nickname);
         const { id, name } = getLocalParticipant(APP.store.getState());
 
         if (formattedNickname === name) {
@@ -2660,7 +2646,6 @@ export default {
         });
 
         if (room) {
-            room.setDisplayName(formattedNickname);
             APP.UI.changeDisplayName(id, formattedNickname);
         }
     },
@@ -2688,6 +2673,72 @@ export default {
         return this.localVideo.sourceType;
     },
 
+    /**
+     * Callback invoked by the external api create or update a direct connection
+     * from the local client to an external client.
+     *
+     * @param {Object} event - The object containing information that should be
+     * passed to the {@code ProxyConnectionService}.
+     * @returns {void}
+     */
+    onProxyConnectionEvent(event) {
+        if (!this._proxyConnection) {
+            this._proxyConnection = new JitsiMeetJS.ProxyConnectionService({
+
+                /**
+                 * Pass the {@code JitsiConnection} instance which will be used
+                 * to fetch TURN credentials.
+                 */
+                jitsiConnection: APP.connection,
+
+                /**
+                 * The proxy connection feature is currently tailored towards
+                 * taking a proxied video stream and showing it as a local
+                 * desktop screen.
+                 */
+                convertVideoToDesktop: true,
+
+                /**
+                 * Callback invoked to pass messages from the local client back
+                 * out to the external client.
+                 *
+                 * @param {string} peerJid - The jid of the intended recipient
+                 * of the message.
+                 * @param {Object} data - The message that should be sent. For
+                 * screensharing this is an iq.
+                 * @returns {void}
+                 */
+                onSendMessage: (peerJid, data) =>
+                    APP.API.sendProxyConnectionEvent({
+                        data,
+                        to: peerJid
+                    }),
+
+                /**
+                 * Callback invoked when the remote peer of the proxy connection
+                 * has provided a video stream, intended to be used as a local
+                 * desktop stream.
+                 *
+                 * @param {JitsiLocalTrack} remoteProxyStream - The media
+                 * stream to use as a local desktop stream.
+                 * @returns {void}
+                 */
+                onRemoteStream: desktopStream => {
+                    if (desktopStream.videoType !== 'desktop') {
+                        logger.warn('Received a non-desktop stream to proxy.');
+                        desktopStream.dispose();
+
+                        return;
+                    }
+
+                    this.toggleScreenSharing(undefined, { desktopStream });
+                }
+            });
+        }
+
+        this._proxyConnection.processMessage(event);
+    },
+
     /**
      * Sets the video muted status.
      *
@@ -2722,5 +2773,19 @@ export default {
         if (score === -1 || (score >= 1 && score <= 5)) {
             APP.store.dispatch(submitFeedback(score, message, room));
         }
+    },
+
+    /**
+     * Terminates any proxy screensharing connection that is active.
+     *
+     * @private
+     * @returns {void}
+     */
+    _stopProxyConnection() {
+        if (this._proxyConnection) {
+            this._proxyConnection.stop();
+        }
+
+        this._proxyConnection = null;
     }
 };

config.js

@@ -146,7 +146,7 @@ var config = {
     desktopSharingChromeExtId: null,
 
     // Whether desktop sharing should be disabled on Chrome.
-    desktopSharingChromeDisabled: true,
+    // desktopSharingChromeDisabled: false,
 
     // The media sources to use when using screen sharing with the Chrome
     // extension.
@@ -156,7 +156,7 @@ var config = {
     desktopSharingChromeMinExtVersion: '0.1',
 
     // Whether desktop sharing should be disabled on Firefox.
-    desktopSharingFirefoxDisabled: false,
+    // desktopSharingFirefoxDisabled: false,
 
     // Optional desktop sharing frame rate options. Default value: min:5, max:5.
     // desktopSharingFrameRate: {
@@ -174,7 +174,17 @@ var config = {
     // Enable the dropbox integration.
     // dropbox: {
     //     appKey: '<APP_KEY>' // Specify your app key here.
+    //     // A URL to redirect the user to, after authenticating
+    //     // by default uses:
+    //     // 'https://jitsi-meet.example.com/static/oauth.html'
+    //     redirectURI:
+    //          'https://jitsi-meet.example.com/subfolder/static/oauth.html'
     // },
+    // When integrations like dropbox are enabled only that will be shown,
+    // by enabling fileRecordingsServiceEnabled, we show both the integrations
+    // and the generic recording service (its configuration and storage type
+    // depends on jibri configuration)
+    // fileRecordingsServiceEnabled: false
 
     // Whether to enable live streaming or not.
     // liveStreamingEnabled: false,
@@ -386,6 +396,13 @@ var config = {
     //   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'
+
     // List of undocumented settings used in jitsi-meet
     /**
      _immediateReloadThreshold
@@ -405,7 +422,6 @@ var config = {
      externalConnectUrl
      firefox_fake_device
      googleApiApplicationClientID
-     googleApiIOSClientID
      iAmRecorder
      iAmSipGateway
      microsoftApiApplicationClientID

css/_atlaskit_overrides.scss

@@ -40,3 +40,11 @@
 .videocontainer .tOoji {
     background: none;
 }
+
+/**
+ * Override @atlaskit/InlineDialog styling for the overflowmenu so it displays
+ * with the correct height.
+ */
+.toolbox-button-wth-dialog .eYJELv {
+    max-height: initial;
+}

css/_font.scss

@@ -1,10 +1,10 @@
 @font-face {
     font-family: 'jitsi';
-    src:url('../fonts/jitsi.eot?94d075');
-    src:url('../fonts/jitsi.eot?#iefix94d075') format('embedded-opentype'),
-        url('../fonts/jitsi.woff?94d075') format('woff'),
-        url('../fonts/jitsi.ttf?94d075') format('truetype'),
-        url('../fonts/jitsi.svg?94d075#jitsi') format('svg');
+    src:  url('../fonts/jitsi.eot?3vw865');
+    src:  url('../fonts/jitsi.eot?3vw865#iefix') format('embedded-opentype'),
+        url('../fonts/jitsi.ttf?3vw865') format('truetype'),
+        url('../fonts/jitsi.woff?3vw865') format('woff'),
+        url('../fonts/jitsi.svg?3vw865#jitsi') format('svg');
     font-weight: normal;
     font-style: normal;
 }
@@ -25,167 +25,89 @@
     -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-arrow_back:before {
-  content: "\e5c4";
+.icon-phone:before {
+  content: "\e0cd";
+}
+.icon-radio_button_unchecked:before {
+  content: "\e836";
+}
+.icon-radio_button_checked:before {
+  content: "\e837";
+}
+.icon-search:before {
+  content: "\e8b6";
+}
+.icon-chat-unread:before {
+  content: "\e0b7";
+}
+.icon-closed_caption:before {
+  content: "\e930";
+}
+.icon-tiles-many:before {
+  content: "\e92e";
 }
 .icon-close:before {
   content: "\e5cd";
 }
-.icon-event_note:before {
-    content: "\e616";
-}
-.icon-menu:before {
-  content: "\e5d2";
-}
-.icon-navigate_before:before {
-  content: "\e408";
-}
-.icon-navigate_next:before {
-  content: "\e409";
-}
-.icon-public:before {
-    content: "\e80b";
+.icon-open_in_new:before {
+  content: "\e89e";
 }
 .icon-restore:before {
   content: "\e8b3";
 }
-.icon-timer:before {
-    content: "\e425";
+.icon-navigate_next:before {
+  content: "\e409";
+}
+.icon-menu:before {
+  content: "\e5d2";
+}
+.icon-arrow_back:before {
+  content: "\e5c4";
+}
+.icon-public:before {
+  content: "\e80b";
+}
+.icon-event_note:before {
+  content: "\e616";
+}
+.icon-bluetooth:before {
+  content: "\e1aa";
+}
+.icon-headset:before {
+  content: "\e310";
+}
+.icon-phone-talk:before {
+  content: "\e61d";
 }
 .icon-thumb-menu:before {
-    content: "\e5d4";
-}
-.icon-mic-camera-combined:before {
-    content: "\e903";
-}
-.icon-feedback:before {
-    content: "\e91d";
-}
-.icon-toggle-filmstrip:before {
-    content: "\e91c";
-}
-.icon-avatar:before {
-    content: "\e901";
-}
-.icon-hangup:before {
-    content: "\e905";
-}
-.icon-chat:before {
-    content: "\e906";
-}
-.icon-download:before {
-    content: "\e902";
-}
-.icon-edit:before {
-    content: "\e907";
-}
-.icon-share-doc:before {
-    content: "\e908";
-}
-.icon-kick:before {
-    content: "\e904";
-}
-.icon-menu-up:before {
-    content: "\e91f";
-}
-.icon-menu-down:before {
-    content: "\e920";
-}
-.icon-full-screen:before {
-    content: "\e90b";
-}
-.icon-exit-full-screen:before {
-    content: "\e90c";
-}
-.icon-star-full:before {
-    content: "\e90a";
-}
-.icon-security:before {
-    content: "\e90d";
-}
-.icon-security-locked:before {
-    content: "\e90e";
-}
-.icon-reload:before {
-    content: "\e90f";
-}
-.icon-microphone:before {
-    content: "\e910";
-}
-.icon-mic-empty:before {
-    content: "\e911";
-}
-.icon-mic-disabled:before {
-    content: "\e912";
+  content: "\e5d4";
 }
 .icon-ninja:before {
-    content: "\e909";
+  content: "\e909";
 }
-.icon-raised-hand:before {
-    content: "\e91e";
-}
-.icon-contactList:before {
-    content: "\e91b";
-}
-.icon-link:before {
-    content: "\e913";
-}
-.icon-shared-video:before {
-    content: "\e914";
-}
-.icon-settings:before {
-    content: "\e915";
-}
-.icon-star:before {
-    content: "\e916";
-}
-.icon-switch-camera:before {
-    content: "\e921";
-}
-.icon-share-desktop:before {
-    content: "\e917";
-}
-.icon-camera:before {
-    content: "\e918";
-}
-.icon-camera-disabled:before {
-    content: "\e919";
-}
-.icon-volume:before {
-    content: "\e91a";
-}
-.icon-recDisable:before {
-    content: "\e613";
-}
-.icon-recEnable:before {
-    content: "\e614";
-}
-.icon-presentation:before {
-    content: "\e603";
-}
-.icon-dialpad:before {
-    content: "\e925";
-}
-.icon-visibility:before {
-    content: "\e923";
-}
-.icon-visibility-off:before {
-    content: "\e924";
-}
-.icon-telephone:before {
-    content: "\e0cd";
+.icon-invite:before {
+  content: "\e145";
 }
 .icon-add:before {
-    content: "\e145";
+  content: "\e146";
 }
-.icon-info:before {
-    content: "\e922";
+.icon-play:before {
+  content: "\f04b";
 }
-.icon-gsm-bars:before {
-    content: "\e926";
+.icon-stop:before {
+  content: "\f04d";
 }
-.icon-open_in_new:before {
-  content: "\e89e";
+.icon-dominant-speaker:before {
+  content: "\f0a1";
+}
+.icon-speaker:before {
+  content: "\e92d";
+}
+.icon-rec:before {
+  content: "\e92b";
+}
+.icon-camera-take-picture:before {
+  content: "\e92a";
 }
 .icon-AUD:before {
   content: "\e900";
@@ -199,33 +121,90 @@
 .icon-SD:before {
   content: "\e929";
 }
-.icon-camera-take-picture:before {
-  content: "\e92a";
+.icon-gsm-bars:before {
+  content: "\e926";
 }
-.icon-rec:before {
-  content: "\e92b";
+.icon-info:before {
+  content: "\e922";
 }
-.icon-live:before {
-  content: "\e92c";
+.icon-mic-camera-combined:before {
+  content: "\e903";
 }
-.icon-speaker:before {
-    content: "\e92d";
+.icon-feedback:before {
+  content: "\e91d";
 }
-.icon-tiles-many:before {
-  content: "\e92e";
+.icon-hangup:before {
+  content: "\e905";
 }
-.icon-tiles-one:before {
-  content: "\e92f";
+.icon-chat:before {
+  content: "\e906";
 }
-.icon-closed_caption:before {
-    content: "\e930";
+.icon-share-doc:before {
+  content: "\e908";
 }
-.icon-play:before {
-    content: "\f04b";
+.icon-kick:before {
+  content: "\e904";
 }
-.icon-stop:before {
-    content: "\f04d";
+.icon-menu-up:before {
+  content: "\e91f";
+}
+.icon-menu-down:before {
+  content: "\e920";
+}
+.icon-full-screen:before {
+  content: "\e90b";
+}
+.icon-exit-full-screen:before {
+  content: "\e90c";
+}
+.icon-security:before {
+  content: "\e90d";
+}
+.icon-security-locked:before {
+  content: "\e90e";
+}
+.icon-microphone:before {
+  content: "\e910";
+}
+.icon-mic-disabled:before {
+  content: "\e912";
+}
+.icon-raised-hand:before {
+  content: "\e91e";
+}
+.icon-link:before {
+  content: "\e913";
+}
+.icon-shared-video:before {
+  content: "\e914";
+}
+.icon-settings:before {
+  content: "\e915";
+}
+.icon-star:before {
+  content: "\e916";
+}
+.icon-switch-camera:before {
+  content: "\e921";
+}
+.icon-share-desktop:before {
+  content: "\e917";
+}
+.icon-camera:before {
+  content: "\e918";
+}
+.icon-camera-disabled:before {
+  content: "\e919";
+}
+.icon-volume:before {
+  content: "\e91a";
+}
+.icon-presentation:before {
+  content: "\e603";
+}
+.icon-visibility:before {
+  content: "\e923";
+}
+.icon-visibility-off:before {
+  content: "\e924";
 }
-.icon-dominant-speaker:before {
-    content: "\f0a1";
-}

css/_meetings_list.scss

@@ -29,7 +29,7 @@
         background: #0074E0;
         border-radius: 4px;
         color: #FFFFFF;
-        display: inline-block;
+        display: flex;
         justify-content: center;
         align-items: center;
         padding: 5px 10px;

css/_popover.scss

@@ -41,3 +41,10 @@
     top: -25px;
     width: 100%;
 }
+
+.popover {
+    background-color: $popoverBg;
+    border-radius: 3px;
+    margin: -16px -24px;
+    padding: 16px 24px;
+}

css/_popup_menu.scss

@@ -5,16 +5,13 @@
 .popupmenu {
     min-width: 75px;
     text-align: left;
-    padding: 0;
+    padding: 0px;
+    width: 150px;
     white-space: nowrap;
 
     &__item {
         list-style-type: none;
         height: 35px;
-
-        &:hover {
-            background-color: rgba(9, 30, 66, 0.04);
-        }
     }
 
     // Link Appearance
@@ -28,6 +25,12 @@
         width: 100%;
         cursor: pointer;
         padding: 0 5px;
+        color: $popupMenuColor;
+
+        &:hover {
+            background-color: $popupMenuHoverBackground;
+            color: $popupMenuHoverColor;
+        }
 
         &.disabled {
             pointer-events: none;
@@ -62,6 +65,18 @@
                 top: 50%;
                 transform: translate(0, -50%);
                 width: 100%;
+
+                &::-webkit-slider-runnable-track {
+                    background-color: $popupSliderColor;
+                }
+
+                &::-moz-range-track {
+                    background-color: $popupSliderColor;
+                }
+
+                &::-ms-fill-lower {
+                    background-color: $popupSliderColor;
+                }
             }
         }
     }
@@ -91,7 +106,7 @@
  * InlineDialogs.
  */
 ul.popupmenu {
-    margin: -15px;
+    margin: -16px -24px;
 }
 
 span.remotevideomenu:hover ul.popupmenu, ul.popupmenu:hover {

css/_recording.scss

@@ -11,42 +11,37 @@
         flex: 0;
         flex-direction: row;
         justify-content: space-between;
-        align-items: center;
+        margin-top: 32px;
 
         .recording-title {
+            display: inline-flex;
+            align-items: center;
             font-size: 16px;
-            font-weight: bold;
+            margin-left: 16px;
         }
     }
 
+    .recording-icon-container {
+        display: inline-flex;
+        align-items: center;
+    }
+
+    .recording-icon {
+        width: 32px;
+        height: 32px;
+        object-fit: contain;
+    }
+
+    .recording-switch {
+        margin-left: auto;
+    }
+
     .authorization-panel {
         display: flex;
         flex-direction: column;
-        margin-bottom: 10px;
+        margin: 0 40px 10px 40px;
         padding-bottom: 10px;
 
-        .dropbox-sign-in {
-            align-items: center;
-            border: 1px solid #4285f4;
-            background-color: white;
-            border-radius: 2px;
-            cursor: pointer;
-            display: inline-flex;
-            padding: 10px;
-            font-size: 18px;
-            font-weight: 600;
-            margin: 10px 0px;
-            color: #4285f4;
-
-            .dropbox-logo {
-                background-color: white;
-                border-radius: 2px;
-                display: inline-block;
-                padding-right: 5px;
-                height: 18px;
-            }
-        }
-
         .logged-in-panel {
             padding: 10px;
         }

css/_subject.scss

@@ -0,0 +1,21 @@
+.subject {
+    top: -120px;
+    transition: top .3s ease-in;
+    height: 95px;
+    width: 100%;
+    position: absolute;
+    padding: 25px 140px 0 140px;
+    text-align: center;
+    font-size: 17px;
+    color: #fff;
+    z-index: $toolbarBackgroundZ;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    box-sizing: border-box;
+    white-space: nowrap;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+
+    &.visible {
+        top: 0px;
+    }
+}

css/_toolbars.scss

@@ -23,192 +23,251 @@
  * TODO: when the old filmstrip has been removed, remove the "new-" prefix.
  */
 .new-toolbox {
-    background-color: $newToolbarBackgroundColor;
     bottom: calc((#{$newToolbarSize} * 2) * -1);
-    box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
     left: 0;
-    margin-left: auto;
-    margin-right: auto;
-    padding: 12px 8px;
     position: absolute;
     right: 0;
     transition: bottom .3s ease-in;
     width: 100%;
-    z-index: $toolbarZ;
+
 
     &.visible {
         bottom: 0;
+        .toolbox-background {
+            bottom: 0px;
+        }
     }
 
     &.no-buttons {
         display: none;
     }
 
-    .button-group-center,
-    .button-group-left,
-    .button-group-right {
-        display: flex;
-        width: 33%;
-    }
-
-    .button-group-center {
-        justify-content: center;
-    }
-
-    .button-group-right {
-        justify-content: flex-end;
-    }
-
-    i {
-        border-radius: 5px;
-        cursor: pointer;
-        display: block;
-        font-size: inherit;
-        height: 100%;
-        line-height: inherit;
+    .toolbox-background {
+        background-image: linear-gradient(to top, rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0));
+        transition: bottom .3s ease-in;
+        height: 160px;
         width: 100%;
+        bottom: -160px;
+        position: absolute;
+        z-index: $toolbarBackgroundZ;
     }
 
-    i:hover {
-        background-color: $newToolbarButtonHoverColor;
-    }
+    .toolbox-content {
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        margin-left: auto;
+        margin-right: auto;
+        padding: 20px 16px;
+        position: relative;
+        width: 100%;
+        z-index: $toolbarZ;
 
-    i.toggled {
-        background: $newToolbarButtonToggleColor;
-    }
-
-    i.toggled:hover {
-        background-color: $newToolbarButtonHoverColor;
-    }
-
-    i.disabled {
-        cursor: initial;
-        color: #3b475c;
-    }
-
-    .disabled i {
-        cursor: initial;
-        color: #3b475c;
-    }
-
-    i.disabled:hover {
-        background-color: initial;
-    }
-
-    .icon-hangup {
-        color: $hangupColor;
-        font-size: $newToolbarHangupFontSize;
-    }
-
-    .overflow-menu {
-        font-size: 1.2em;
-        list-style-type: none;
-        /**
-         * Undo atlaskit padding by reducing margins.
-         */
-        margin: -15px -24px;
-        padding: 4px 0;
-
-        .overflow-menu-item {
-            align-items: center;
-            color: #B8C7E0;
-            cursor: pointer;
+        .button-group-center,
+        .button-group-left,
+        .button-group-right {
             display: flex;
-            font-size: 14px;
-            height: 22px;
-            padding: 5px 12px;
+            width: 33%;
+        }
 
-            div {
-                display: flex;
-                flex-direction: row;
-                align-items: center;
+        .button-group-center {
+            justify-content: center;
+            .toolbox-icon {
+                margin: 0px 4px;
             }
+        }
+
+        .button-group-right {
+            justify-content: flex-end;
+        }
+
+        i {
+            border-radius: 5px;
+            cursor: pointer;
+            display: block;
+            font-size: inherit;
+            height: 100%;
+            line-height: inherit;
+            width: 100%;
+        }
+
+        i:hover {
+            background: $newToolbarButtonHoverColor;
+        }
+
+        i.toggled {
+            background: $newToolbarButtonToggleColor;
+        }
+
+        i.toggled:hover {
+            background: $newToolbarButtonHoverColor;
+        }
+
+        .icon-hangup {
+            background-color: #e12d2d;
+            color: #fff;
+            border-radius: 50%;
+            width: 40px;
+            height: 40px;
 
             &:hover {
-                background: #313D52;
+                background-color: #e54b4b;
+            }
+        }
+        i.disabled, .disabled i {
+            cursor: initial;
+            color: #fff;
+            background-color: #a4b8d1;
+        }
+
+        .icon-mic-disabled, .icon-microphone, .icon-camera-disabled, .icon-camera {
+            background-color: #fff;
+            color: #5e6d7a;
+            border-radius: 50%;
+            border: 1px solid #d1dbe8;
+            width: 38px;
+            height: 38px;
+
+            &:hover {
+                background-color: #daebfa;
+                border: 1px solid #daebfa;
             }
 
-            &.unclickable {
-                cursor: default;
+            &.toggled {
+                background: #2a3a4b;
+                color: #fff;
+                border: 1px solid #5e6d7a;
+
+                &:hover {
+                    background-color: #5e6d7a;
+                }
             }
-            &.unclickable:hover {
-                background: inherit;
-            }
-            &.disabled {
+
+            &.disabled, .disabled & {
                 cursor: initial;
-                color: #3b475c;
+                color: #fff;
+                background-color: #a4b8d1;
             }
         }
 
-        .beta-tag {
-            background: #B8C7E0;
-            border-radius: 2px;
-            color: $newToolbarBackgroundColor;
-            font-size: 11px;
-            font-weight: bold;
-            margin-left: 8px;
-            padding: 0 6px;
-        }
+        .overflow-menu {
+            font-size: 1.2em;
+            list-style-type: none;
+            background-color: $overflowMenuBG;
+            /**
+             * Undo atlaskit padding by reducing margins.
+             */
+            margin: -16px -24px;
+            padding: 4px 0;
 
-        .overflow-menu-item-icon {
-            margin-right: 10px;
+            .overflow-menu-item {
+                align-items: center;
+                color: $overflowMenuItemColor;
+                cursor: pointer;
+                display: flex;
+                font-size: 14px;
+                height: 22px;
+                padding: 5px 12px;
 
-            i {
-                display: inline;
-                font-size: 24px;
+                div {
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                }
+
+                &:hover {
+                    background-color: $overflowMenuItemHoverBG;
+                    color: $overflowMenuItemHoverColor;
+                }
+
+                &.unclickable {
+                    cursor: default;
+                }
+                &.unclickable:hover {
+                    background: inherit;
+                }
+                &.disabled {
+                    cursor: initial;
+                    color: #3b475c;
+                }
+
+                i.toggled {
+                    background: inherit;
+                }
+
+                i.toggled:hover {
+                    background: inherit;
+                }
             }
 
-            i:hover {
-                background-color: initial;
+            .beta-tag {
+                background: $overflowMenuItemColor;
+                border-radius: 2px;
+                color: $overflowMenuBG;
+                font-size: 11px;
+                font-weight: bold;
+                margin-left: 8px;
+                padding: 0 6px;
             }
 
-            img {
-                max-width: 24px;
-                max-height: 24px;
+            .overflow-menu-item-icon {
+                margin-right: 10px;
+
+                i {
+                    display: inline;
+                    font-size: 24px;
+                }
+
+                i:hover {
+                    background-color: initial;
+                }
+
+                img {
+                    max-width: 24px;
+                    max-height: 24px;
+                }
+            }
+
+            .profile-text {
+                max-width: 150px;
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
             }
         }
 
-        .profile-text {
-            max-width: 150px;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            white-space: nowrap;
+        .toolbox-button {
+            color: $toolbarButtonColor;
+            cursor: pointer;
+            display: inline-block;
+            line-height: $newToolbarSize;
+            margin: 0 8px;
+            text-align: center;
         }
-    }
 
-    .toolbox-button {
-        color: $toolbarButtonColor;
-        cursor: pointer;
-        display: inline-block;
-        line-height: $newToolbarSize;
-        margin: 0 4px;
-        text-align: center;
-    }
+        .toolbar-button-with-badge {
+            position: relative;
 
-    .toolbar-button-with-badge {
-        position: relative;
-
-        .badge-round {
-            bottom: -5px;
-            font-size: 12px;
-            line-height: 20px;
-            min-width: 20px;
-            pointer-events: none;
-            position: absolute;
-            right: -5px;
+            .badge-round {
+                bottom: -5px;
+                font-size: 12px;
+                line-height: 20px;
+                min-width: 20px;
+                pointer-events: none;
+                position: absolute;
+                right: -5px;
+            }
         }
-    }
 
-    .toolbox-button-wth-dialog {
-        display: inline-block;
-    }
+        .toolbox-button-wth-dialog {
+            display: inline-block;
+        }
 
-    .toolbox-icon {
-        height: $newToolbarSize;
-        font-size: 24px;
-        width: $newToolbarSize;
+        .toolbox-icon {
+            height: $newToolbarSize;
+            font-size: 24px;
+            width: $newToolbarSize;
+        }
     }
 }
 
@@ -226,15 +285,15 @@
     }
 
     i:hover {
-        background-color: $newToolbarButtonHoverColor;
+        background-color: $AOTToolbarButtonHoverColor;
     }
 
     i.toggled {
-        background: $newToolbarButtonToggleColor;
+        background: $AOTToolbarButtonToggleColor;
     }
 
     i.toggled:hover:not(.disabled) {
-        background-color: $newToolbarButtonHoverColor;
+        background-color: $AOTToolbarButtonHoverColor;
     }
 
     .icon-hangup {

css/_variables.scss

@@ -34,13 +34,19 @@ $defaultDarkColor: #2b3d5c;
  */
 $defaultToolbarSize: 50px;
 $newToolbarBackgroundColor: rgba(22, 38, 55, 0.8);
-$newToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
-$newToolbarButtonToggleColor: rgba(14, 20, 35, 1);
+$newToolbarButtonHoverColor: rgba(255, 255, 255, 0.15);
+$newToolbarButtonToggleColor: rgba(255, 255, 255, 0.2);
+$AOTToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
+$AOTToolbarButtonToggleColor: rgba(14, 20, 35, 1);
 $newToolbarFontSize: 24px;
 $newToolbarHangupFontSize: 32px;
 $newToolbarSize: 40px;
 $newToolbarSizeWithPadding: calc(#{$newToolbarSize} + 24px);
 $toolbarTitleFontSize: 19px;
+$overflowMenuBG: initial;
+$overflowMenuItemHoverBG: #313D52;
+$overflowMenuItemHoverColor: #B8C7E0;
+$overflowMenuItemColor: #B8C7E0;
 
 /**
  * Video layout
@@ -57,6 +63,7 @@ $audioLevelShadow: rgba(9, 36, 77, 0.9);
 $videoStateIndicatorColor: $defaultColor;
 $videoStateIndicatorBackground: $toolbarBackground;
 $videoStateIndicatorSize: 40px;
+$remoteVideoMenuIconMargin: initial;
 
 /**
  * Feedback Modal
@@ -91,6 +98,7 @@ $zindex0: 0;
 $zindex1: 1;
 $zindex2: 2;
 $zindex3: 3;
+$toolbarBackgroundZ: 4;
 $filmstripVideosZ: 5;
 $zindex10: 10;
 $reloadZ: 20;
@@ -148,3 +156,9 @@ $welcomePageDescriptionColor: #fff;
 $welcomePageFontFamily: inherit;
 $welcomePageHeaderBackground: linear-gradient(-90deg, #1251AE 0%, #0074FF 50%, #1251AE 100%);
 $welcomePageTitleColor: #fff;
+
+/**
+ * Deep-linking page variables.
+ */
+$deepLinkingMobileLogoHeight: 40px;
+$deepLinkingMobileHeaderBackground: #f1f2f5;

css/_videolayout_default.scss

@@ -409,6 +409,7 @@
     height: 13px;
     color: #FFF;
     font-size: 10pt;
+    margin-right: $remoteVideoMenuIconMargin;
 
     >i{
         cursor: hand;
@@ -496,18 +497,22 @@
     display:none !important;
 }
 
+#dominantSpeakerAvatarContainer,
 #dominantSpeakerAvatar,
 .dynamic-shadow {
     width: 200px;
     height: 200px;
 }
 
-#dominantSpeakerAvatar {
+#dominantSpeakerAvatarContainer {
     top: 50px;
     margin: auto;
     position: relative;
     border-radius: 100px;
+    overflow: hidden;
     visibility: inherit;
+}
+#dominantSpeakerAvatar {
     background-color: #000000;
 }
 

css/deep-linking/_mobile.scss

@@ -8,13 +8,13 @@
     .header {
         width: 100%;
         height: 70px;
-        background-color: #f1f2f5;
+        background-color: $deepLinkingMobileHeaderBackground;
         text-align: center;
         .logo {
             margin-top: 15px;
             margin-left: auto;
             margin-right: auto;
-            height: 40px;
+            height: $deepLinkingMobileLogoHeight;
         }
     }
 
@@ -28,7 +28,7 @@
         max-width: 40em;
         padding: 35px 0 40px 0;
         text-align: center;
-        width: 75%;
+        width: 90%;
 
         a:active {
             text-decoration: none;
@@ -46,7 +46,7 @@
 
     &__text,
     .deep-linking-dial-in  {
-        font-size: 1.2em;
+        font-size: 1em;
         line-height: em(29px, 21px);
         margin-bottom: 0.65em;
 
@@ -59,6 +59,31 @@
                 font-size: em(21, 18);
             }
         }
+
+        table {
+            font-size: 1em;
+        }
+
+        .dial-in-conference-id {
+            margin: 10px 0 10px 0;
+        }
+
+        .dial-in-conference-description {
+            font-size: 0.8em;
+        }
+
+        .toll-free-list {
+            min-width: 80px;
+        }
+
+        .numbers-list {
+            min-width: 150px;
+        }
+
+        li.toll-free:empty:before {
+            content: '.';
+            visibility: hidden;
+        }
     }
 
     &__href {
@@ -108,6 +133,7 @@
 
         .dial-in-numbers-list {
             color: $unsupportedBrowserTextColor;
+            padding-left: 20px;
         }
 
         .dial-in-numbers-body {

css/filmstrip/_vertical_filmstrip_overrides.scss

@@ -74,6 +74,7 @@
 
     .remote-video-menu-trigger {
         margin-bottom: 7px;
+        margin-left: $remoteVideoMenuIconMargin;
     }
 }
 

css/main.scss

@@ -18,6 +18,11 @@
 
 /* Animations END */
 
+/* Flags BEGIN */
+$flagsImagePath: "../images/";
+@import "../node_modules/bc-css-flags/dist/css/bc-css-flags.scss";
+/* Flags END */
+
 /* Fonts BEGIN */
 
 @import 'font';
@@ -44,6 +49,7 @@
 @import 'modals/local-recording/local-recording';
 @import 'videolayout_default';
 @import 'notice';
+@import 'subject';
 @import 'popup_menu';
 @import 'recording';
 @import 'login_menu';

css/modals/invite/_info.scss

@@ -66,7 +66,7 @@
     }
 
     .info-dialog-dial-in {
-        white-space: nowrap;
+        word-break: break-all;
 
         .conference-id,
         .phone-number {
@@ -77,6 +77,7 @@
     .info-dialog-icon {
         color: #6453C0;
         font-size: 16px;
+        min-width: 30px;
     }
 
     .info-dialog-url-text,
@@ -124,29 +125,84 @@
     }
 }
 
+.dial-in-numbers-list {
+    margin-top: 20px;
+    font-size: 12px;
+    line-height: 24px;
+    border-collapse: separate;
+    border-spacing: 0 5px;
+
+    thead {
+        text-align: left;
+    }
+
+    td,
+    th {
+        border-bottom: 1px solid #d1dbe8;
+    }
+
+    .flag-cell {
+        vertical-align: top;
+        width: 30px;
+    }
+    .flag {
+        display: block;
+        margin: 5px 5px 0px 5px;
+    }
+
+    .country {
+        font-weight: bold;
+        vertical-align: top;
+        padding: 0 20px 0 0;
+    }
+
+    ul {
+        padding: 0px 0px 0px 0px;
+    }
+
+    .numbers-list {
+        list-style: none;
+        padding: 0 20px 0 0;
+    }
+
+    .toll-free-list {
+        font-weight: bold;
+        list-style: none;
+        vertical-align: top;
+    }
+
+    li.toll-free:empty:before {
+        content: '.';
+        visibility: hidden;
+    }
+}
+
 .dial-in-page {
     align-items: center;
     box-sizing: border-box;
     display: flex;
     flex-direction: column;
-    font-size: 24px;
+    font-size: 12px;
     max-height: 100%;
     overflow: auto;
-    padding: 25px;
     position: absolute;
     transform: translateY(-50%);
     top: 50%;
     width: 100%;
 
-    .dial-in-numbers-list {
-        font-size: 24px;
-        margin-top: 20px;
-    }
-
     .dial-in-conference-id {
         text-align: center;
         min-width: 200px;
-        width: 30%;
+        margin-top: 40px;
+    }
+
+    .dial-in-conference-name,
+    .dial-in-conference-pin {
+        font-size: 18px;
+    }
+
+    .dial-in-conference-description {
+        margin: 12px;
     }
 }
 

css/themes/_light.scss

@@ -80,9 +80,12 @@ $errorColor: #c61600;
 $feedbackCancelFontColor: #333;
 
 // Popover colors
-$popoverBg: #000;
-$popoverFontColor: #ffffff;
-$popupMenuSelectedItemBackground: rgba(256, 256, 256, .2);
+$popoverBg: initial;
+$popoverFontColor: #ffffff !important;
+$popupMenuColor: #ffffff !important;
+$popupMenuHoverColor: #ffffff !important;
+$popupMenuHoverBackground: rgba(255, 255, 255, 0.1);
+$popupSliderColor: #0376da;
 
 // Toolbar
 $secondaryToolbarBg: rgba(0, 0, 0, 0.5);

debian/control

@@ -21,7 +21,7 @@ Description: WebRTC JavaScript video conferences
 
 Package: jitsi-meet-web-config
 Architecture: all
-Depends: openssl, openjdk-8-jre-headless | nginx | apache2
+Depends: openssl, openjdk-8-jre-headless | nginx | nginx-extras | apache2
 Description: Configuration for web serving of Jitsi Meet
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
  Videobridge to provide high quality, scalable video conferences.
@@ -36,7 +36,7 @@ Description: Configuration for web serving of Jitsi Meet
 
 Package: jitsi-meet-prosody
 Architecture: all
-Depends: openssl, prosody | prosody-trunk
+Depends: openssl, prosody | prosody-trunk | prosody-0.11
 Description: Prosody configuration for Jitsi Meet
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
  Videobridge to provide high quality, scalable video conferences.
@@ -50,6 +50,6 @@ Description: Prosody configuration for Jitsi Meet
 
 Package: jitsi-meet-tokens
 Architecture: all
-Depends: ${misc:Depends}, prosody-trunk (>= 1nightly607), libssl-dev, luarocks, jitsi-meet-prosody
+Depends: ${misc:Depends}, prosody-trunk (>= 1nightly747) | prosody-0.11 | prosody (>= 0.11.2), libssl-dev, luarocks, jitsi-meet-prosody
 Description: Prosody token authentication plugin for Jitsi Meet
 

debian/jitsi-meet-prosody.postinst

@@ -125,6 +125,19 @@ case "$1" in
             ln -sf /var/lib/prosody/$JVB_HOSTNAME.crt /etc/prosody/certs/$JVB_HOSTNAME.crt
         fi
 
+        PR11_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.11' 2>/dev/null | awk '{print $3}' || true)"
+        echo "PR11_INSTALL_CHECK is $PR11_INSTALL_CHECK"
+        PR_VER_INSTALLED=$(dpkg-query -f='${Version}\n' --show prosody  2>/dev/null || true)
+        echo "PR_VER_INSTALLED is $PR_VER_INSTALLED"
+        if [ "$PR11_INSTALL_CHECK" = "installed" ] \
+            || [ "$PR11_INSTALL_CHECK" = "unpacked" ] \
+            || dpkg --compare-versions "$PR_VER_INSTALLED" gt "0.11" ; then
+            sed -i 's/storage = \"null\"/storage = \"memory\"/g' $PROSODY_HOST_CONFIG
+
+            # trigger a restart
+            PROSODY_CONFIG_PRESENT="false"
+        fi
+
         if [ ! -f /var/lib/prosody/$JICOFO_AUTH_DOMAIN.crt ]; then
             # prosodyctl takes care for the permissions
             # echo for using all default values

debian/jitsi-meet-tokens.postinst

@@ -69,14 +69,17 @@ case "$1" in
                    echo "Failed to install basexx - try installing it manually"
                 fi
 
+                PR11_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.11' 2>/dev/null | awk '{print $3}' || true)"
+                PR_VER_INSTALLED=$(dpkg-query -f='${Version}\n' --show prosody  2>/dev/null || true)
+                if [ "$PR11_INSTALL_CHECK" = "installed" ] \
+                    || [ "$PR11_INSTALL_CHECK" = "unpacked" ] \
+                    || dpkg --compare-versions "$PR_VER_INSTALLED" gt "0.11" ; then
+                    sed -i 's/module:hook/module:hook_global/g' /usr/share/jitsi-meet/prosody-plugins/mod_auth_token.lua
+                fi
+
                 if [ -x "/etc/init.d/prosody" ]; then
                     invoke-rc.d prosody restart
                 fi
-
-                echo "This package requires BOSH Prosody module to be patched !"
-                echo "Use the following command, after this package has been installed and"
-                echo "after every prosody-trunk upgrade:"
-                echo "sudo patch -N /usr/lib/prosody/modules/mod_bosh.lua /usr/share/jitsi-meet/prosody-plugins/mod_bosh.lua.patch"
             fi
         else
             echo "Prosody config not found at $PROSODY_HOST_CONFIG - unable to auto-configure token authentication"

debian/jitsi-meet-web-config.postinst

@@ -52,7 +52,11 @@ case "$1" in
         db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
 
         NGINX_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx' 2>/dev/null | awk '{print $3}' || true)"
-        if [ "$NGINX_INSTALL_CHECK" = "installed" ] || [ "$NGINX_INSTALL_CHECK" = "unpacked" ] ; then
+        NGINX_EXTRAS_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx-extras' 2>/dev/null | awk '{print $3}' || true)"
+        if [ "$NGINX_INSTALL_CHECK" = "installed" ] \
+           || [ "$NGINX_INSTALL_CHECK" = "unpacked" ] \
+           || [ "$NGINX_EXTRAS_INSTALL_CHECK" = "installed" ] \
+           || [ "$NGINX_EXTRAS_INSTALL_CHECK" = "unpacked" ] ; then
             FORCE_NGINX="true"
         fi
         APACHE_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'apache2' 2>/dev/null | awk '{print $3}' || true)"

debian/rules

@@ -3,12 +3,22 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+LANGUAGES := $(shell node -p "Object.keys(require('./lang/languages.json')).join(' ')")
+COUNTRIES_DIR := node_modules/i18n-iso-countries/langs
+
 %:
 	dh $@
 
 # we skip making Makefile exists for updating browserify modules when developing
 override_dh_auto_build:
 
-override_dh_install:
+override_dh_install: $(LANGUAGES)
 	dh_installdirs
 	dh_install -X/config.js -X/package.json
+
+$(LANGUAGES):
+	if [ -f $(COUNTRIES_DIR)/$@.json ] ; \
+	then \
+		dh_install -pjitsi-meet-web $(COUNTRIES_DIR)/$@.json usr/share/jitsi-meet/lang/; \
+		mv debian/jitsi-meet-web/usr/share/jitsi-meet/lang/$@.json debian/jitsi-meet-web/usr/share/jitsi-meet/lang/countries-$@.json; \
+	fi;

doc/api.md

@@ -1,13 +1,13 @@
 # Jitsi Meet API
 
-You can use the Jitsi Meet API to embed Jitsi Meet in to your application.
+You can use the Jitsi Meet API to embed Jitsi Meet in to your application. You are also welcome to use it for embedding the globally distributed and highly available deployment on meet.jit.si itself. The only thing we ask for in that case is that you please DO NOT remove the jitsi.org logo from the top left corner.
 
 ## Installation
 
 To embed Jitsi Meet in your application you need to add the Jitsi Meet API library:
 
 ```javascript
-<script src="https://meet.jit.si/external_api.js"></script>
+<script src='https://meet.jit.si/external_api.js'></script>
 ```
 ## API
 
@@ -16,7 +16,7 @@ To embed Jitsi Meet in your application you need to add the Jitsi Meet API libra
 The next step for embedding Jitsi Meet is to create the Jitsi Meet API object.
 Its constructor gets a number of options:
 
-* **domain**: domain used to build the conference URL, "meet.jit.si" for
+* **domain**: domain used to build the conference URL, 'meet.jit.si' for
   example.
 * **options**: object with properties - the optional arguments:
     * **roomName**: (optional) name of the room to join.
@@ -29,46 +29,160 @@ Its constructor gets a number of options:
     * **jwt**: (optional) [JWT](https://jwt.io/) token.
     * **onload**: (optional) handler for the iframe onload event.
     * **invitees**: (optional) Array of objects containing information about new participants that will be invited in the call.
+    * **devices**: (optional) A map containing information about the initial devices that will be used in the call.
 
 Example:
 
 ```javascript
-var domain = "meet.jit.si";
-var options = {
-    roomName: "JitsiMeetAPIExample",
+const domain = 'meet.jit.si';
+const options = {
+    roomName: 'JitsiMeetAPIExample',
     width: 700,
     height: 700,
     parentNode: document.querySelector('#meet')
-}
-var api = new JitsiMeetExternalAPI(domain, options);
+};
+const api = new JitsiMeetExternalAPI(domain, options);
+```
+
+You can set the initial media devices for the call:
+
+```javascript
+const domain = 'meet.jit.si';
+const options = {
+    ...
+    devices: {
+        audioInput: '<deviceLabel>',
+        audioOutput: '<deviceLabel>',
+        videoInput: '<deviceLabel>'
+    },
+    ...
+};
+const api = new JitsiMeetExternalAPI(domain, options);
 ```
 
 You can overwrite options set in [config.js] and [interface_config.js].
 For example, to enable the filmstrip-only interface mode, you can use:
 
 ```javascript
-var options = {
-    interfaceConfigOverwrite: {filmStripOnly: true}
+const options = {
+    ...
+    interfaceConfigOverwrite: { filmStripOnly: true },
+    ...
 };
-var api = new JitsiMeetExternalAPI(domain, options);
+const api = new JitsiMeetExternalAPI(domain, options);
 ```
 
 You can also pass a jwt token to Jitsi Meet:
 
  ```javascript
-var options = {
-    jwt: "<jwt_token>",
-    noSsl: false
+const options = {
+    ...
+    jwt: '<jwt_token>',
+    noSsl: false,
+    ...
 };
-var api = new JitsiMeetExternalAPI(domain, options);
+const api = new JitsiMeetExternalAPI(domain, options);
  ```
 
 ### Controlling the embedded Jitsi Meet Conference
 
+Device management `JitsiMeetExternalAPI` methods:
+* **getAvailableDevices** - Retrieve a list of available devices.
+
+```javascript
+api.getAvailableDevices().then(devices => {
+    // devices = {
+    //     audioInput: [{
+    //         deviceId: 'ID'
+    //         groupId: 'grpID'
+    //         kind: 'audioinput'
+    //         label: 'label'
+    //     },....],
+    //     audioOutput: [{
+    //         deviceId: 'ID'
+    //         groupId: 'grpID'
+    //         kind: 'audioOutput'
+    //         label: 'label'
+    //     },....],
+    //     videoInput: [{
+    //         deviceId: 'ID'
+    //         groupId: 'grpID'
+    //         kind: 'videoInput'
+    //         label: 'label'
+    //     },....]
+    // }
+    ...
+});
+```
+* **getCurrentDevices** - Retrieve a list with the devices that are currently selected.
+
+```javascript
+api.getCurrentDevices().then(devices => {
+    // devices = {
+    //     audioInput: {
+    //         deviceId: 'ID'
+    //         groupId: 'grpID'
+    //         kind: 'videoInput'
+    //         label: 'label'
+    //     },
+    //     audioOutput: {
+    //         deviceId: 'ID'
+    //         groupId: 'grpID'
+    //         kind: 'videoInput'
+    //         label: 'label'
+    //     },
+    //     videoInput: {
+    //         deviceId: 'ID'
+    //         groupId: 'grpID'
+    //         kind: 'videoInput'
+    //         label: 'label'
+    //     }
+    // }
+    ...
+});
+```
+* **isDeviceChangeAvailable** - Resolves with true if the device change is available and with false if not.
+
+```javascript
+// The accepted deviceType values are - 'output', 'input' or undefined.
+api.isDeviceChangeAvailable(deviceType).then(isDeviceChangeAvailable => {
+    ...
+});
+```
+* **isDeviceListAvailable** - Resolves with true if the device list is available and with false if not.
+
+```javascript
+api.isDeviceListAvailable().then(isDeviceListAvailable => {
+    ...
+});
+```
+* **isMultipleAudioInputSupported** - Resolves with true if multiple audio input is supported and with false if not.
+
+```javascript
+api.isMultipleAudioInputSupported().then(isMultipleAudioInputSupported => {
+    ...
+});
+```
+* **setAudioInputDevice** - Sets the audio input device to the one with the label or id that is passed.
+
+```javascript
+api.setAudioInputDevice(deviceLabel, deviceId);
+```
+* **setAudioOutputDevice** - Sets the audio output device to the one with the label or id that is passed.
+
+```javascript
+api.setAudioOutputDevice(deviceLabel, deviceId);
+```
+* **setVideoInputDevice** - Sets the video input device to the one with the label or id that is passed.
+
+```javascript
+api.setVideoInputDevice(deviceLabel, deviceId);
+```
+
 You can control the embedded Jitsi Meet conference using the `JitsiMeetExternalAPI` object by using `executeCommand`:
 
 ```javascript
-api.executeCommand(command, ...arguments)
+api.executeCommand(command, ...arguments);
 ```
 
 The `command` parameter is String object with the name of the command. The following commands are currently supported:
@@ -78,59 +192,67 @@ The `command` parameter is String object with the name of the command. The follo
 api.executeCommand('displayName', 'New Nickname');
 ```
 
+* **subject** - Sets the subject of the conference. This command requires one argument - the new subject to be set.
+```javascript
+api.executeCommand('subject', 'New Conference Subject');
+```
+
 * **toggleAudio** - Mutes / unmutes the audio for the local participant. No arguments are required.
 ```javascript
-api.executeCommand('toggleAudio')
+api.executeCommand('toggleAudio');
 ```
 
 * **toggleVideo** - Mutes / unmutes the video for the local participant. No arguments are required.
 ```javascript
-api.executeCommand('toggleVideo')
+api.executeCommand('toggleVideo');
 ```
 
 * **toggleFilmStrip** - Hides / shows the filmstrip. No arguments are required.
 ```javascript
-api.executeCommand('toggleFilmStrip')
+api.executeCommand('toggleFilmStrip');
 ```
 
 * **toggleChat** - Hides / shows the chat. No arguments are required.
 ```javascript
-api.executeCommand('toggleChat')
+api.executeCommand('toggleChat');
 ```
 
 * **toggleShareScreen** - Starts / stops screen sharing. No arguments are required.
 ```javascript
-api.executeCommand('toggleShareScreen')
+api.executeCommand('toggleShareScreen');
 ```
 
 * **hangup** - Hangups the call. No arguments are required.
 ```javascript
-api.executeCommand('hangup')
+api.executeCommand('hangup');
 ```
 
 * **email** - Changes the local email address. This command requires one argument - the new email address to be set.
 ```javascript
-api.executeCommand('email', 'example@example.com')
+api.executeCommand('email', 'example@example.com');
 ```
 
 * **avatarUrl** - Changes the local avatar URL. This command requires one argument - the new avatar URL to be set.
 ```javascript
-api.executeCommand('avatarUrl', 'https://avatars0.githubusercontent.com/u/3671647')
+api.executeCommand('avatarUrl', 'https://avatars0.githubusercontent.com/u/3671647');
 ```
 
 You can also execute multiple commands using the `executeCommands` method:
 ```javascript
-api.executeCommands(commands)
+api.executeCommands(commands);
 ```
 The `commands` parameter is an object with the names of the commands as keys and the arguments for the commands as values:
 ```javascript
-api.executeCommands({displayName: ['nickname'], toggleAudio: []});
+api.executeCommands({
+    displayName: [ 'nickname' ],
+    toggleAudio: []
+});
 ```
 
 You can add event listeners to the embedded Jitsi Meet using the `addEventListener` method.
 **NOTE: This method still exists but it is deprecated. JitsiMeetExternalAPI class extends [EventEmitter]. Use [EventEmitter] methods (`addListener` or `on`).**
 ```javascript
-api.addEventListener(event, listener)
+api.addEventListener(event, listener);
 ```
 
 The `event` parameter is a String object with the name of the event.
@@ -141,29 +263,36 @@ The following events are currently supported:
 changes. The listener will receive an object with the following structure:
 ```javascript
 {
-"id": id, // the id of the participant that changed his avatar.
-"avatarURL": avatarURL // the new avatar URL.
+    id: string, // the id of the participant that changed his avatar.
+    avatarURL: string // the new avatar URL.
 }
 ```
 
 * **audioAvailabilityChanged** - event notifications about audio availability status changes. The listener will receive an object with the following structure:
 ```javascript
 {
-"available": available // new available status - boolean
+    available: boolean // new available status - boolean
 }
 ```
 
 * **audioMuteStatusChanged** - event notifications about audio mute status changes. The listener will receive an object with the following structure:
 ```javascript
 {
-"muted": muted // new muted status - boolean
+    muted: boolean // new muted status - boolean
 }
 ```
 
 * **screenSharingStatusChanged** - receives event notifications about turning on/off the local user screen sharing. The listener will receive object with the following structure:
 ```javascript
 {
-"on": on //whether screen sharing is on
+    on: boolean, //whether screen sharing is on
+    details: {
+
+        // From where the screen sharing is capturing, if known. Values which are
+        // passed include 'window', 'screen', 'proxy', 'device'. The value undefined
+        // will be passed if the source type is unknown or screen share is off.
+        sourceType: string|undefined
+    }
 }
 ```
 
@@ -171,9 +300,9 @@ changes. The listener will receive an object with the following structure:
 messages. The listener will receive an object with the following structure:
 ```javascript
 {
-"from": from, // The id of the user that sent the message
-"nick": nick, // the nickname of the user that sent the message
-"message": txt // the text of the message
+    from: string, // The id of the user that sent the message
+    nick: string, // the nickname of the user that sent the message
+    message: string // the text of the message
 }
 ```
 
@@ -181,7 +310,7 @@ messages. The listener will receive an object with the following structure:
 messages. The listener will receive an object with the following structure:
 ```javascript
 {
-"message": txt // the text of the message
+    message: string // the text of the message
 }
 ```
 
@@ -189,68 +318,90 @@ messages. The listener will receive an object with the following structure:
 changes. The listener will receive an object with the following structure:
 ```javascript
 {
-"id": id, // the id of the participant that changed his display name
-"displayname": displayName // the new display name
+    id: string, // the id of the participant that changed his display name
+    displayname: string // the new display name
 }
 ```
 
+* **deviceListChanged** - event notifications about device list changes. The listener will receive an object with the following structure:
+```javascript
+{
+    devices: Object // the new list of available devices.
+}
+```
+NOTE: The devices object has the same format as the getAvailableDevices result format.
+
 * **emailChange** - event notifications about email
 changes. The listener will receive an object with the following structure:
 ```javascript
 {
-"id": id, // the id of the participant that changed his email
-"email": email // the new email
+    id: string, // the id of the participant that changed his email
+    email: string // the new email
+}
+```
+* **filmstripDisplayChanged** - event notifications about the visibility of the filmstrip being updated.
+```javascript
+{
+    visible: boolean // Whether or not the filmstrip is displayed or hidden.
 }
 ```
 
 * **participantJoined** - event notifications about new participants who join the room. The listener will receive an object with the following structure:
 ```javascript
 {
-"id": id, // the id of the participant
-"displayName": displayName // the display name of the participant
+    id: string, // the id of the participant
+    displayName: string // the display name of the participant
 }
 ```
 
 * **participantLeft** - event notifications about participants that leave the room. The listener will receive an object with the following structure:
 ```javascript
 {
-"id": id // the id of the participant
+    id: string // the id of the participant
 }
 ```
 
 * **videoConferenceJoined** - event notifications fired when the local user has joined the video conference. The listener will receive an object with the following structure:
 ```javascript
 {
-"roomName": room, // the room name of the conference
-"id": id, // the id of the local participant
-"displayName": displayName, // the display name of the local participant
-"avatarURL": avatarURL // the avatar URL of the local participant
+    roomName: string, // the room name of the conference
+    id: string, // the id of the local participant
+    displayName: string, // the display name of the local participant
+    avatarURL: string // the avatar URL of the local participant
 }
 ```
 
 * **videoConferenceLeft** - event notifications fired when the local user has left the video conference. The listener will receive an object with the following structure:
 ```javascript
 {
-"roomName": room // the room name of the conference
+    roomName: string // the room name of the conference
 }
 ```
 
 * **videoAvailabilityChanged** - event notifications about video availability status changes. The listener will receive an object with the following structure:
 ```javascript
 {
-"available": available // new available status - boolean
+    available: boolean // new available status - boolean
 }
 ```
 
 * **videoMuteStatusChanged** - event notifications about video mute status changes. The listener will receive an object with the following structure:
 ```javascript
 {
-"muted": muted // new muted status - boolean
+    muted: boolean // new muted status - boolean
 }
 ```
 
 * **readyToClose** - event notification fired when Jitsi Meet is ready to be closed (hangup operations are completed).
 
+* **subjectChange** - event notifications about subject of conference changes.
+The listener will receive an object with the following structure:
+```javascript
+{
+    subject: string // the new subject
+}
+```
+
 You can also add multiple event listeners by using `addEventListeners`.
 This method requires one argument of type Object. The object argument must
 have the names of the events as keys and the listeners of the events as values.
@@ -269,79 +420,80 @@ function outgoingMessageListener(object)
 
 api.addEventListeners({
     incomingMessage: incomingMessageListener,
-    outgoingMessage: outgoingMessageListener})
+    outgoingMessage: outgoingMessageListener
+});
 ```
 
 If you want to remove a listener you can use `removeEventListener` method with argument the name of the event.
 **NOTE: This method still exists but it is deprecated. JitsiMeetExternalAPI class extends [EventEmitter]. Use [EventEmitter] methods( `removeListener`).**
 ```javascript
-api.removeEventListener("incomingMessage");
+api.removeEventListener('incomingMessage');
 ```
 
 If you want to remove more than one event you can use `removeEventListeners` method with an Array with the names of the events as an argument.
 **NOTE: This method still exists but it is deprecated. JitsiMeetExternalAPI class extends [EventEmitter]. Use [EventEmitter] methods.**
 ```javascript
-api.removeEventListeners(["incomingMessage", "outgoingMessageListener"]);
+api.removeEventListeners([ 'incomingMessage', 'outgoingMessageListener' ]);
 ```
 
 You can get the number of participants in the conference with the following API function:
 ```javascript
-var numberOfParticipants = api.getNumberOfParticipants();
+const numberOfParticipants = api.getNumberOfParticipants();
 ```
 
 You can get the avatar URL of a participant in the conference with the following API function:
 ```javascript
-var avatarURL = api.getAvatarURL(participantId);
+const avatarURL = api.getAvatarURL(participantId);
 ```
 
 You can get the display name of a participant in the conference with the following API function:
 ```javascript
-var displayName = api.getDisplayName(participantId);
+const displayName = api.getDisplayName(participantId);
 ```
 
 You can get the email of a participant in the conference with the following API function:
 ```javascript
-var email = api.getEmail(participantId);
+const email = api.getEmail(participantId);
 ```
 
 You can get the iframe HTML element where Jitsi Meet is loaded with the following API function:
 ```javascript
-var iframe = api.getIFrame();
+const iframe = api.getIFrame();
 ```
 
 You can check whether the audio is muted with the following API function:
 ```javascript
-api.isAudioMuted().then(function(muted) {
+api.isAudioMuted().then(muted => {
     ...
 });
 ```
 
 You can check whether the video is muted with the following API function:
 ```javascript
-api.isVideoMuted().then(function(muted) {
+api.isVideoMuted().then(muted => {
     ...
 });
 ```
 
 You can check whether the audio is available with the following API function:
 ```javascript
-api.isAudioAvailable().then(function(available) {
+api.isAudioAvailable().then(available => {
     ...
 });
 ```
 
 You can check whether the video is available with the following API function:
 ```javascript
-api.isVideoAvailable().then(function(available) {
+api.isVideoAvailable().then(available => {
     ...
 });
 ```
 
 You can invite new participants to the call with the following API function:
 ```javascript
-api.invite([{...}, {...}, {...}]).then(function() {
+api.invite([ {...}, {...}, {...} ]).then(() => {
     // success
-}).catch(function() {
+}).catch(() => {
     // failure
 });
 ```
@@ -349,7 +501,7 @@ api.invite([{...}, {...}, {...}]).then(function() {
 
 You can remove the embedded Jitsi Meet Conference with the following API function:
 ```javascript
-api.dispose()
+api.dispose();
 ```
 
 NOTE: It's a good practice to remove the conference before the page is unloaded.

doc/cloud-api.swagger

@@ -71,7 +71,7 @@ paths:
             $ref: "#/definitions/ConferenceMapperDetails"
         405:
           description: "Invalid input"
- 
+
   /phoneNumberList:
     get:
       tags:
@@ -96,7 +96,7 @@ securityDefinitions:
     name: "Authorization"
     in: "header"
 definitions:
- 
+
   ConferenceMapperRequest:
     description: "Request to create or find a conference mapping"
     type: "object"
@@ -114,7 +114,7 @@ definitions:
       domain:
         type: "string"
         description: "Domain part of the conference.  Used if 'conference' is not provided.  Defaults to domain of the API endpoint.   Used to generate a 'conference' value (search by conference)"
- 
+
   ConferenceMapperDetails:
     description: "Conference mapping between conference JID and numeric ID"
     type: "object"
@@ -126,22 +126,26 @@ definitions:
         type: "string"
         format: "JID"
         description: "Full JID for the conference OR boolean false if no conference was found (search by ID)"
- 
+
   PhoneNumberList:
-    type: "object"
-    properties:
-      numbersEnabled:
-        type: "boolean"
-        description: "Control flag for Jitsi Meet user interface.  Must be set to true for Jitsi Meet to display phone-in UI elements"
-      numbers:
+    description: "List of dial in numbers for the conference."
+    type: "array"
+    items:
         type: "object"
-        description: "Keys are Country Names, each value is an array of phone numbers"
-        additionalProperties:
-          type: "array"
-          items:
+        properties:
+          countryCode:
             type: "string"
-            format: "phone"
- 
+            description: "ISO 3166-1 country code. Alpha-2 supported."
+          default:
+            type: "boolean"
+            description: "Whether this number is the default one to show. Optional."
+          formattedNumber:
+            type: "string"
+            description: "The formatted telephone number to show."
+          tollFree:
+            type: "boolean"
+            description: "Whether the number is toll free number."
+
 externalDocs:
   description: "Find out more about the Jitsi Cloud API"
-  url: "https://jitsi.org/CloudAPI"
+  url: "https://jitsi.org/CloudAPI"

doc/faq.md

@@ -0,0 +1,7 @@
+**1. How to tell if my server instance is behind NAT?**
+
+A. In general, if the tool ifconfig (or ipconfig) shows the assigned IP address to be some local address (10.x.x.x or 192.x.x.x) but you know that its public IP address is different from that, the server is most probably behind NAT
+
+**2. Clients could communicate well in room created at meet.jit.si . The same clients still could connect to my self-hosted instance but can neither hear nor see one another. What's wrong?**
+
+A. Most probably, the server is behind NAT. See this [resolved question](https://community.jitsi.org/t/cannot-see-video-or-hear-audio-on-self-hosted-instance/). You need to follow the steps detailed [here](https://github.com/jitsi/ice4j/blob/master/doc/quick-install.md#Advanced-configuration)

doc/integrations.md

@@ -0,0 +1,38 @@
+Document describing enabling various jitsi-meet integrations.
+
+## Creating the Google API client for Google Calendar and Youtube integration
+1. Log into a Google admin account.
+1. Go to Google cloud platform dashboard. https://console.cloud.google.com/apis/dashboard
+1. In the Select a Project dropdown, click New Project.
+1. Give the project a name.
+1. Proceed to the Credentials settings of the new project.
+1. In the Credentials tab of the Credentials settings, click Create Credentials and select the type OAuth client ID.
+1. Proceed with creating a Web application and add the domains (origins) on which the application will be hosted. Local development environments (http://localhost:8000 for example) can be added here.
+1. While still in the Google cloud platform dashboard, click the Library settings for the calendar project.
+1. Search for the Google Calendar API (used for calendar accessing), click its result, and enable it.
+1. Do the same for YouTube Data API v3
+
+## Creating the Microsoft app for Microsoft Outlook integration
+1. Go to https://apps.dev.microsoft.com/
+1. Proceed through the "Add an app" flow. Once created, a page with several Graph Permissions fields should display.
+1. Under "Platforms" add "Web"
+1. Add a redirect URL for the Microsoft auth flow to visit once a user has confirmed authentication. Target domain if available is just 'yourdomain.com' (the deployment address) and the redirect URL is `https://yourdomain.com/static/msredirect.html`.
+1. Add Microsoft Graph delegated permissions, if this option is available: Calendars.Read, Calendars.ReadWrite, Calendars.Read.Shared, Calendars.ReadWrite.Shared.
+1. Check `Allow Implicit Flow` (and `Restrict token issuing to this app` if available).
+1. Save the changes.
+
+## Creating the Dropbox app for Dropbox recording integration
+1. You need a Dropbox account (If you don't already have one, you can sign up for a free account [here](https://www.dropbox.com/register).)
+1. Create new App as described in [Getting Started Guide](https://www.dropbox.com/developers/reference/getting-started?_tk=guides_lp&_ad=guides2&_camp=get_started#app%20console) in App Console section.
+1. Choose
+    1. 'Dropbox API - For apps that need to access files in Dropbox.' 
+    1. 'App folder– Access to a single folder created specifically for your app.'
+    1. Fill in the name of your app
+1. You need only, the newly created App key, goes in config.js in 
+    ```
+        dropbox: {
+            appKey: '__dropbox_app_key__'
+        }
+    ```
+1. Add your Redirect URIs in the form `https://yourdeployment.com//static/oauth.html`
+1. Fill in Branding

doc/quick-install.md

@@ -55,7 +55,7 @@ Simply run the following in your shell
 ```
 
 #### Advanced configuration
-If installation is on a machine behind NAT further configuration of jitsi-videobridge is needed in order for it to be accessible.
+If installation is on a machine [behind NAT](https://github.com/jitsi/jitsi-meet/blob/master/doc/faq.md) further configuration of jitsi-videobridge is needed in order for it to be accessible.
 Provided that all required ports are routed (forwarded) to the machine that it runs on. By default these ports are (TCP/443 or TCP/4443 and UDP 10000).
 The following extra lines need to be added the file `/etc/jitsi/videobridge/sip-communicator.properties`:
 ```

doc/sipgw-config.md

@@ -19,10 +19,6 @@ edit /etc/jitsi/jicofo/sip-communicator.properties (or similar), set the appropr
   peopleSearchQueryTypes: ['conferenceRooms'],
   peopleSearchUrl: 'https://api.yourdomain.com/testpath/searchpeople',
 ```
- - interface_config.js:
-```
-  ADD_PEOPLE_APP_NAME: 'Jitsi'
-```
 
 The combination of the above settings and providing a jwt token will enable a button under invite option which will show the dialog 'Add people'.
 

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

@@ -1,5 +1,5 @@
-// flow-typed signature: d71d314ca25fc6c20610a3ba80af9df0
-// flow-typed version: 9698a46399/jquery_v3.x.x/flow_>=v0.28.x
+// flow-typed signature: f26fda66e3a551aef37d3b0f53058e6a
+// flow-typed version: 44ad941b7a/jquery_v3.x.x/flow_>=v0.28.x
 
 /* eslint-disable max-len, no-unused-vars, flowtype/no-weak-types */
 
@@ -364,6 +364,13 @@ declare class JQueryGenericPromise<T> {
     failFilter?: (...reasons: any[]) => any,
     progressFilter?: (...progression: any[]) => any
   ): JQueryPromise<void>;
+
+  /**
+   * Add handlers to be called when the Deferred object is rejected.
+   *
+   * @param  failFilter An function that is called when the Deferred is rejected.
+   */
+  catch(failFilter: (...reasons: any[]) => any): JQueryPromise<T>;
 }
 
 /**
@@ -822,7 +829,7 @@ declare class JQueryStatic {
    */
   get(
     url: string,
-    data?: Object | string,
+    data?: {} | string,
     success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any,
     dataType?: string
   ): JQueryXHR;
@@ -845,7 +852,7 @@ declare class JQueryStatic {
    */
   getJSON(
     url: string,
-    data?: Object | string,
+    data?: {} | string,
     success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any
   ): JQueryXHR;
   /**
@@ -886,7 +893,7 @@ declare class JQueryStatic {
    */
   post(
     url: string,
-    data?: Object | string,
+    data?: {} | string,
     success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any,
     dataType?: string
   ): JQueryXHR;
@@ -967,7 +974,7 @@ declare class JQueryStatic {
    * @param html A string defining a single, standalone, HTML element (e.g. <div/> or <div></div>).
    * @param attributes An object of attributes, events, and methods to call on the newly-created element.
    */
-  (html: string, attributes: Object): JQuery;
+  (html: string, attributes: {}): JQuery;
 
   /**
    * Relinquish jQuery's control of the $ variable.
@@ -1425,7 +1432,7 @@ declare class JQuery {
    */
   load(
     url: string,
-    data?: string | Object,
+    data?: string | {},
     complete?: (
       responseText: string,
       textStatus: string,
@@ -1482,7 +1489,7 @@ declare class JQuery {
    *
    * @param attributes An object of attribute-value pairs to set.
    */
-  attr(attributes: Object): JQuery;
+  attr(attributes: {}): JQuery;
   /**
    * Get the value of an attribute for the first element in the set of matched elements.
    *
@@ -1532,7 +1539,7 @@ declare class JQuery {
    *
    * @param properties An object of property-value pairs to set.
    */
-  prop(properties: Object): JQuery;
+  prop(properties: {}): JQuery;
   /**
    * Set one or more properties for the set of matched elements.
    *
@@ -1598,7 +1605,7 @@ declare class JQuery {
   /**
    * Get the current value of the first element in the set of matched elements.
    */
-  val(_: void): any;
+  val(_: void): string | string[] | number;
   /**
    * Set the value of each element in the set of matched elements.
    *
@@ -1634,7 +1641,7 @@ declare class JQuery {
    *
    * @param properties An object of property-value pairs to set.
    */
-  css(properties: Object): JQuery;
+  css(properties: {}): JQuery;
   /**
    * Get the value of style properties for the first element in the set of matched elements.
    *
@@ -1847,7 +1854,7 @@ declare class JQuery {
    * @param complete A function to call once the animation is complete.
    */
   animate(
-    properties: Object,
+    properties: {},
     duration?: string | number,
     complete?: Function
   ): JQuery;
@@ -1860,7 +1867,7 @@ declare class JQuery {
    * @param complete A function to call once the animation is complete.
    */
   animate(
-    properties: Object,
+    properties: {},
     duration?: string | number,
     easing?: string,
     complete?: Function
@@ -1871,7 +1878,7 @@ declare class JQuery {
    * @param properties An object of CSS properties and values that the animation will move toward.
    * @param options A map of additional options to pass to the method.
    */
-  animate(properties: Object, options: JQueryAnimationOptions): JQuery;
+  animate(properties: {}, options: JQueryAnimationOptions): JQuery;
 
   /**
    * Set a timer to delay execution of subsequent items in the queue.
@@ -2920,14 +2927,14 @@ declare class JQuery {
    * @param eventType A string containing a JavaScript event type, such as click or submit.
    * @param extraParameters Additional parameters to pass along to the event handler.
    */
-  trigger(eventType: string, extraParameters?: any[] | Object): JQuery;
+  trigger(eventType: string, extraParameters?: any[] | {}): JQuery;
   /**
    * Execute all handlers and behaviors attached to the matched elements for the given event type.
    *
    * @param event A jQuery.Event object.
    * @param extraParameters Additional parameters to pass along to the event handler.
    */
-  trigger(event: JQueryEventObject, extraParameters?: any[] | Object): JQuery;
+  trigger(event: JQueryEventObject, extraParameters?: any[] | {}): JQuery;
 
   /**
    * Execute all handlers attached to an element for an event.

flow-typed/npm/moment_v2.3.x.js

@@ -1,329 +0,0 @@
-// flow-typed signature: c30aa20539f52183d4d30dd36d8ab9c2
-// flow-typed version: 886cf7c002/moment_v2.3.x/flow_>=v0.63.x
-
-type moment$MomentOptions = {
-  y?: number | string,
-  year?: number | string,
-  years?: number | string,
-  M?: number | string,
-  month?: number | string,
-  months?: number | string,
-  d?: number | string,
-  day?: number | string,
-  days?: number | string,
-  date?: number | string,
-  h?: number | string,
-  hour?: number | string,
-  hours?: number | string,
-  m?: number | string,
-  minute?: number | string,
-  minutes?: number | string,
-  s?: number | string,
-  second?: number | string,
-  seconds?: number | string,
-  ms?: number | string,
-  millisecond?: number | string,
-  milliseconds?: number | string
-};
-
-type moment$MomentObject = {
-  years: number,
-  months: number,
-  date: number,
-  hours: number,
-  minutes: number,
-  seconds: number,
-  milliseconds: number
-};
-
-type moment$MomentCreationData = {
-  input: string,
-  format: string,
-  locale: Object,
-  isUTC: boolean,
-  strict: boolean
-};
-
-type moment$CalendarFormat = string | ((moment: moment$Moment) => string);
-
-type moment$CalendarFormats = {
-  sameDay?: moment$CalendarFormat,
-  nextDay?: moment$CalendarFormat,
-  nextWeek?: moment$CalendarFormat,
-  lastDay?: moment$CalendarFormat,
-  lastWeek?: moment$CalendarFormat,
-  sameElse?: moment$CalendarFormat
-};
-
-declare class moment$LocaleData {
-  months(moment: moment$Moment): string,
-  monthsShort(moment: moment$Moment): string,
-  monthsParse(month: string): number,
-  weekdays(moment: moment$Moment): string,
-  weekdaysShort(moment: moment$Moment): string,
-  weekdaysMin(moment: moment$Moment): string,
-  weekdaysParse(weekDay: string): number,
-  longDateFormat(dateFormat: string): string,
-  isPM(date: string): boolean,
-  meridiem(hours: number, minutes: number, isLower: boolean): string,
-  calendar(
-    key:
-      | "sameDay"
-      | "nextDay"
-      | "lastDay"
-      | "nextWeek"
-      | "prevWeek"
-      | "sameElse",
-    moment: moment$Moment
-  ): string,
-  relativeTime(
-    number: number,
-    withoutSuffix: boolean,
-    key: "s" | "m" | "mm" | "h" | "hh" | "d" | "dd" | "M" | "MM" | "y" | "yy",
-    isFuture: boolean
-  ): string,
-  pastFuture(diff: any, relTime: string): string,
-  ordinal(number: number): string,
-  preparse(str: string): any,
-  postformat(str: string): any,
-  week(moment: moment$Moment): string,
-  invalidDate(): string,
-  firstDayOfWeek(): number,
-  firstDayOfYear(): number
-}
-declare class moment$MomentDuration {
-  humanize(suffix?: boolean): string,
-  milliseconds(): number,
-  asMilliseconds(): number,
-  seconds(): number,
-  asSeconds(): number,
-  minutes(): number,
-  asMinutes(): number,
-  hours(): number,
-  asHours(): number,
-  days(): number,
-  asDays(): number,
-  months(): number,
-  asMonths(): number,
-  years(): number,
-  asYears(): number,
-  add(value: number | moment$MomentDuration | Object, unit?: string): this,
-  subtract(value: number | moment$MomentDuration | Object, unit?: string): this,
-  as(unit: string): number,
-  get(unit: string): number,
-  toJSON(): string,
-  toISOString(): string,
-  isValid(): boolean
-}
-declare class moment$Moment {
-  static ISO_8601: string,
-  static (
-    string?: string,
-    format?: string | Array<string>,
-    strict?: boolean
-  ): moment$Moment,
-  static (
-    string?: string,
-    format?: string | Array<string>,
-    locale?: string,
-    strict?: boolean
-  ): moment$Moment,
-  static (
-    initDate: ?Object | number | Date | Array<number> | moment$Moment | string
-  ): moment$Moment,
-  static unix(seconds: number): moment$Moment,
-  static utc(): moment$Moment,
-  static utc(number: number | Array<number>): moment$Moment,
-  static utc(
-    str: string,
-    str2?: string | Array<string>,
-    str3?: string
-  ): moment$Moment,
-  static utc(moment: moment$Moment): moment$Moment,
-  static utc(date: Date): moment$Moment,
-  static parseZone(): moment$Moment,
-  static parseZone(rawDate: string): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string | Array<string>
-  ): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string,
-    strict: boolean
-  ): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string,
-    locale: string,
-    strict: boolean
-  ): moment$Moment,
-  isValid(): boolean,
-  invalidAt(): 0 | 1 | 2 | 3 | 4 | 5 | 6,
-  creationData(): moment$MomentCreationData,
-  millisecond(number: number): this,
-  milliseconds(number: number): this,
-  millisecond(): number,
-  milliseconds(): number,
-  second(number: number): this,
-  seconds(number: number): this,
-  second(): number,
-  seconds(): number,
-  minute(number: number): this,
-  minutes(number: number): this,
-  minute(): number,
-  minutes(): number,
-  hour(number: number): this,
-  hours(number: number): this,
-  hour(): number,
-  hours(): number,
-  date(number: number): this,
-  dates(number: number): this,
-  date(): number,
-  dates(): number,
-  day(day: number | string): this,
-  days(day: number | string): this,
-  day(): number,
-  days(): number,
-  weekday(number: number): this,
-  weekday(): number,
-  isoWeekday(number: number): this,
-  isoWeekday(): number,
-  dayOfYear(number: number): this,
-  dayOfYear(): number,
-  week(number: number): this,
-  weeks(number: number): this,
-  week(): number,
-  weeks(): number,
-  isoWeek(number: number): this,
-  isoWeeks(number: number): this,
-  isoWeek(): number,
-  isoWeeks(): number,
-  month(number: number): this,
-  months(number: number): this,
-  month(): number,
-  months(): number,
-  quarter(number: number): this,
-  quarter(): number,
-  year(number: number): this,
-  years(number: number): this,
-  year(): number,
-  years(): number,
-  weekYear(number: number): this,
-  weekYear(): number,
-  isoWeekYear(number: number): this,
-  isoWeekYear(): number,
-  weeksInYear(): number,
-  isoWeeksInYear(): number,
-  get(string: string): number,
-  set(unit: string, value: number): this,
-  set(options: { [unit: string]: number }): this,
-  static max(...dates: Array<moment$Moment>): moment$Moment,
-  static max(dates: Array<moment$Moment>): moment$Moment,
-  static min(...dates: Array<moment$Moment>): moment$Moment,
-  static min(dates: Array<moment$Moment>): moment$Moment,
-  add(
-    value: number | moment$MomentDuration | moment$Moment | Object,
-    unit?: string
-  ): this,
-  subtract(
-    value: number | moment$MomentDuration | moment$Moment | string | Object,
-    unit?: string
-  ): this,
-  startOf(unit: string): this,
-  endOf(unit: string): this,
-  local(): this,
-  utc(): this,
-  utcOffset(
-    offset: number | string,
-    keepLocalTime?: boolean,
-    keepMinutes?: boolean
-  ): this,
-  utcOffset(): number,
-  format(format?: string): string,
-  fromNow(removeSuffix?: boolean): string,
-  from(
-    value: moment$Moment | string | number | Date | Array<number>,
-    removePrefix?: boolean
-  ): string,
-  toNow(removePrefix?: boolean): string,
-  to(
-    value: moment$Moment | string | number | Date | Array<number>,
-    removePrefix?: boolean
-  ): string,
-  calendar(refTime?: any, formats?: moment$CalendarFormats): string,
-  diff(
-    date: moment$Moment | string | number | Date | Array<number>,
-    format?: string,
-    floating?: boolean
-  ): number,
-  valueOf(): number,
-  unix(): number,
-  daysInMonth(): number,
-  toDate(): Date,
-  toArray(): Array<number>,
-  toJSON(): string,
-  toISOString(
-    keepOffset?: boolean
-  ): string,
-  toObject(): moment$MomentObject,
-  isBefore(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSame(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isAfter(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSameOrBefore(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSameOrAfter(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isBetween(
-    fromDate: moment$Moment | string | number | Date | Array<number>,
-    toDate?: ?moment$Moment | string | number | Date | Array<number>,
-    granularity?: ?string,
-    inclusion?: ?string
-  ): boolean,
-  isDST(): boolean,
-  isDSTShifted(): boolean,
-  isLeapYear(): boolean,
-  clone(): moment$Moment,
-  static isMoment(obj: any): boolean,
-  static isDate(obj: any): boolean,
-  static locale(locale: string, localeData?: Object): string,
-  static updateLocale(locale: string, localeData?: ?Object): void,
-  static locale(locales: Array<string>): string,
-  locale(locale: string, customization?: Object | null): moment$Moment,
-  locale(): string,
-  static months(): Array<string>,
-  static monthsShort(): Array<string>,
-  static weekdays(): Array<string>,
-  static weekdaysShort(): Array<string>,
-  static weekdaysMin(): Array<string>,
-  static months(): string,
-  static monthsShort(): string,
-  static weekdays(): string,
-  static weekdaysShort(): string,
-  static weekdaysMin(): string,
-  static localeData(key?: string): moment$LocaleData,
-  static duration(
-    value: number | Object | string,
-    unit?: string
-  ): moment$MomentDuration,
-  static isDuration(obj: any): boolean,
-  static normalizeUnits(unit: string): string,
-  static invalid(object: any): moment$Moment
-}
-
-declare module "moment" {
-  declare module.exports: Class<moment$Moment>;
-}

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

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

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

@@ -1,3 +1,6 @@
+// flow-typed signature: df80bdd535bfed9cf3223e077f3b4543
+// flow-typed version: c4c8963c9c/redux_v4.x.x/flow_>=v0.55.x
+
 declare module 'redux' {
 
   /*

fonts/jitsi.svg

@@ -7,43 +7,38 @@
 <font-face units-per-em="1024" ascent="1024" descent="0" />
 <missing-glyph horiz-adv-x="1024" />
 <glyph unicode="&#x20;" d="" />
+<glyph unicode="&#xe0b7;" glyph-name="chat-unread" d="M768 682v86h-512v-86h512zM598 426v86h-342v-86h342zM256 640v-86h512v86h-512zM854 938c46 0 84-38 84-84v-512c0-46-38-86-84-86h-598l-170-170v768c0 46 38 84 84 84h684z" />
 <glyph unicode="&#xe0cd;" glyph-name="phone" d="M282 564c62-120 162-220 282-282l94 94c12 12 30 16 44 10 48-16 100-24 152-24 24 0 42-18 42-42v-150c0-24-18-42-42-42-400 0-726 326-726 726 0 24 18 42 42 42h150c24 0 42-18 42-42 0-54 8-104 24-152 4-14 2-32-10-44z" />
-<glyph unicode="&#xe145;" glyph-name="add" d="M810 470h-256v-256h-84v256h-256v84h256v256h84v-256h256v-84z" />
+<glyph unicode="&#xe145;" glyph-name="invite" d="M810 470h-256v-256h-84v256h-256v84h256v256h84v-256h256v-84z" />
+<glyph unicode="&#xe146;" glyph-name="add" d="M810 470h-256v-256h-84v256h-256v84h256v256h84v-256h256v-84z" />
 <glyph unicode="&#xe1aa;" glyph-name="bluetooth" d="M550 328l-80 82v-162zM470 776v-162l80 82zM670 696l-184-184 184-184-244-242h-42v324l-196-196-60 60 238 238-238 238 60 60 196-196v324h42zM834 738c40-64 62-142 62-222 0-84-24-160-66-226l-50 50c26 52 42 110 42 172s-16 120-42 172zM608 512l98 98c12-30 20-64 20-98s-8-70-20-100z" />
 <glyph unicode="&#xe310;" glyph-name="headset" d="M512 982c212 0 384-172 384-384v-300c0-70-58-128-128-128h-128v342h170v86c0 166-132 298-298 298s-298-132-298-298v-86h170v-342h-128c-70 0-128 58-128 128v300c0 212 172 384 384 384z" />
-<glyph unicode="&#xe408;" glyph-name="navigate_before" d="M658 708l-196-196 196-196-60-60-256 256 256 256z" />
 <glyph unicode="&#xe409;" glyph-name="navigate_next" d="M426 768l256-256-256-256-60 60 196 196-196 196z" />
-<glyph unicode="&#xe425;" glyph-name="timer" d="M512 170c166 0 298 134 298 300s-132 298-298 298-298-132-298-298 132-300 298-300zM812 708c52-66 84-148 84-238 0-212-172-384-384-384s-384 172-384 384 172 384 384 384c90 0 174-34 240-86l60 62c22-18 42-38 60-60zM470 426v256h84v-256h-84zM640 982v-86h-256v86h256z" />
 <glyph unicode="&#xe5c4;" glyph-name="arrow_back" d="M854 554v-84h-520l238-240-60-60-342 342 342 342 60-60-238-240h520z" />
 <glyph unicode="&#xe5cd;" glyph-name="close" d="M810 750l-238-238 238-238-60-60-238 238-238-238-60 60 238 238-238 238 60 60 238-238 238 238z" />
 <glyph unicode="&#xe5d2;" glyph-name="menu" d="M128 768h768v-86h-768v86zM128 470v84h768v-84h-768zM128 256v86h768v-86h-768z" />
 <glyph unicode="&#xe5d4;" glyph-name="thumb-menu" d="M512 342c46 0 86-40 86-86s-40-86-86-86-86 40-86 86 40 86 86 86zM512 598c46 0 86-40 86-86s-40-86-86-86-86 40-86 86 40 86 86 86zM512 682c-46 0-86 40-86 86s40 86 86 86 86-40 86-86-40-86-86-86z" />
 <glyph unicode="&#xe603;" glyph-name="presentation" horiz-adv-x="1088" d="M952.495 1019.065h-818.689c-72.81 0-132.183-60.63-132.183-135.162v-750.719c0-74.473 59.372-135.101 132.183-135.101h818.686c72.936 0 132.314 60.625 132.314 135.101v750.722c0.003 74.532-59.378 135.159-132.311 135.159zM946.346 139.651h-806.14v737.822h806.015l0.126-737.822zM685.753 738.544h216.911v-566.758h-216.911v566.758zM428.672 610.002h216.911v-438.216h-216.911v438.216zM172.339 481.46h216.161v-309.677h-216.161v309.677z" />
-<glyph unicode="&#xe613;" glyph-name="recDisable" horiz-adv-x="1140" d="M1123.444 1003.015c-23.593 26.481-64.131 28.989-90.74 5.395l-1008.269-893.436c-26.609-23.468-28.991-64.131-5.46-90.676 12.674-14.306 30.308-21.649 48.126-21.649 15.123 0 30.372 5.401 42.544 16.195l130.045 115.22c90.743-81.844 210.569-132.165 342.473-132.101 282.816 0.061 510.913 227.969 511.287 510.972 0.126 109.934-34.682 211.367-93.499 294.72l118.088 104.625c26.483 23.526 28.997 64.129 5.404 90.735zM944.422 513.818c0.128-200.922-161.896-363.201-362.509-362.952-87.56 0.123-167.573 31.151-230.061 82.569l331.277 293.509v-73.176c1.071-60.993 32.696-92.18 94.944-93.692 61.997 1.512 93.686 32.763 95.131 93.756v41.096h-72.227v-47.499c0.251-4.642-0.564-10.607-2.511-17.949-1.25-3.261-3.448-6.020-6.525-8.093-3.197-2.572-7.845-3.828-13.868-3.828-10.543 0.31-17.132 4.268-19.827 11.921-1.068 3.512-1.947 6.905-2.508 10.163-0.254 2.887-0.377 5.532-0.377 7.786v143.511l42.477 37.634c0.215-0.432 0.452-0.851 0.63-1.303 1.947-6.467 2.762-12.799 2.511-19.076v-36.772h72.227v30.121c-0.246 31.245-9.086 54.699-26.363 70.447l40.711 36.069c35.787-56.055 56.803-122.585 56.867-194.244zM239.795 395.47c-12.613 37.023-19.827 76.557-19.827 117.913-0.19 200.236 161.584 362.009 361.945 362.135 56.853 0 110.313-13.302 158.133-36.398l117.846 104.421c-79.444 50.952-173.758 80.817-275.292 80.948-283.377 0.181-511.354-227.729-511.789-511.675-0.126-79.567 18.636-154.679 51.137-221.882l117.848 104.538zM388.576 690.020h-97.514v-249.057l72.23 64.070v0.689h0.815l117.72 104.418c0 0.564 0.123 0.94 0.123 1.509 0.753 53.898-30.369 80.069-93.374 78.37zM405.959 625.517c1.942-2.767 3.074-6.469 3.323-11.112 0.312-4.452 0.438-9.6 0.438-15.246 0.251-10.916-0.689-19.83-2.949-26.985-2.952-7.594-10.983-11.357-24.159-11.357h-19.325v74.043h15.31c7.842 0 13.865-0.683 18.072-2.19 4.397-1.573 7.468-3.953 9.29-7.153z" />
-<glyph unicode="&#xe614;" glyph-name="recEnable" horiz-adv-x="1142" d="M581.278 1025.708c284.857-0.19 514.807-230.517 514.427-514.997-0.378-285.047-230.073-514.553-514.869-514.615-284.541-0.062-515.311 230.517-514.933 514.422 0.439 285.936 230.009 515.439 515.375 515.19zM580.579 875.756c-201.764-0.123-364.666-163.032-364.478-364.663 0-202.018 162.524-364.735 364.478-364.984 202.018-0.316 365.174 163.030 365.048 365.423-0.252 201.767-163.156 364.35-365.048 364.224zM287.698 688.907h98.196c63.442 1.767 94.785-24.518 94.027-78.863 0.254-19.081-2.211-34.882-7.456-47.521-6.005-12.508-18.706-21.988-38.167-28.181v-0.819c28.373-6.259 43.031-23.573 43.981-51.946v-57.689c0-11.247 0.254-22.813 0.758-34.756 0.819-12.005 3.033-20.979 6.696-27.043h-71.846c-3.727 6.064-6.128 15.038-7.14 27.043-1.012 11.943-1.454 23.509-1.138 34.756v52.321c0 9.603-2.214 16.553-6.573 20.979-4.675 4.107-12.701 6.19-24.012 6.19h-14.599v-141.291h-72.73v326.82zM360.428 558.861h19.463c13.271 0 21.359 3.794 24.331 11.375 2.276 7.204 3.221 16.304 2.969 27.171 0 5.815-0.126 10.867-0.442 15.418-0.252 4.675-1.392 8.404-3.352 11.247-1.831 3.157-4.926 5.561-9.352 7.14-4.233 1.454-10.299 2.211-18.2 2.211h-15.418v-74.564zM498.372 688.907h162.082v-62.687h-89.35v-65.587h78.103v-62.685h-78.103v-73.11h92.822v-62.749h-165.557v326.818zM682.507 599.999c0.316 31.782 9.416 55.542 27.425 71.407 17.44 15.29 40.185 22.936 68.181 22.936 28.247 0 51.119-7.646 68.623-23 17.82-15.798 26.92-39.623 27.171-71.407v-30.333h-72.73v37.031c0.254 6.192-0.57 12.639-2.527 19.209-1.264 3.157-3.475 5.938-6.573 8.214-3.221 1.515-7.898 2.404-13.964 2.404-10.615-0.316-17.249-3.855-19.967-10.618-2.211-6.573-3.223-13.017-2.907-19.209v-161.956c0-2.273 0.126-4.865 0.38-7.772 0.568-3.411 1.454-6.824 2.527-10.233 2.717-7.775 9.352-11.756 19.967-12.007 6.067 0 10.744 1.261 13.964 3.791 3.098 2.15 5.309 4.867 6.573 8.216 1.96 7.33 2.782 13.33 2.527 18.007v47.837h72.73v-41.328c-1.451-61.547-33.364-93.015-95.794-94.469-62.685 1.454-94.53 32.922-95.607 94.343v148.937z" />
 <glyph unicode="&#xe616;" glyph-name="event_note" d="M598 426v-84h-300v84h300zM810 214v468h-596v-468h596zM810 896c46 0 86-40 86-86v-596c0-46-40-86-86-86h-596c-48 0-86 40-86 86v596c0 46 38 86 86 86h42v86h86v-86h340v86h86v-86h42zM726 598v-86h-428v86h428z" />
 <glyph unicode="&#xe61d;" glyph-name="phone-talk" d="M640 512c0 70-58 128-128 128v86c118 0 214-96 214-214h-86zM810 512c0 166-132 298-298 298v86c212 0 384-172 384-384h-86zM854 362c24 0 42-18 42-42v-150c0-24-18-42-42-42-400 0-726 326-726 726 0 24 18 42 42 42h150c24 0 42-18 42-42 0-54 8-104 24-152 4-14 2-32-10-44l-94-94c62-122 162-220 282-282l94 94c12 12 30 14 44 10 48-16 98-24 152-24z" />
 <glyph unicode="&#xe80b;" glyph-name="public" d="M764 282c56 60 90 142 90 230 0 142-88 266-214 316v-18c0-46-40-84-86-84h-84v-86c0-24-20-42-44-42h-84v-86h256c24 0 42-18 42-42v-128h42c38 0 70-26 82-60zM470 174v82c-46 0-86 40-86 86v42l-204 204c-6-24-10-50-10-76 0-174 132-318 300-338zM512 938c236 0 426-190 426-426s-190-426-426-426-426 190-426 426 190 426 426 426z" />
+<glyph unicode="&#xe836;" glyph-name="radio_button_unchecked" d="M512 170c188 0 342 154 342 342s-154 342-342 342-342-154-342-342 154-342 342-342zM512 938c236 0 426-190 426-426s-190-426-426-426-426 190-426 426 190 426 426 426z" />
+<glyph unicode="&#xe837;" glyph-name="radio_button_checked" d="M512 170c188 0 342 154 342 342s-154 342-342 342-342-154-342-342 154-342 342-342zM512 938c236 0 426-190 426-426s-190-426-426-426-426 190-426 426 190 426 426 426zM512 726c118 0 214-96 214-214s-96-214-214-214-214 96-214 214 96 214 214 214z" />
 <glyph unicode="&#xe89e;" glyph-name="open_in_new" d="M598 896h298v-298h-86v152l-418-418-60 60 418 418h-152v86zM810 214v298h86v-298c0-46-40-86-86-86h-596c-48 0-86 40-86 86v596c0 46 38 86 86 86h298v-86h-298v-596h596z" />
 <glyph unicode="&#xe8b3;" glyph-name="restore" d="M512 682h64v-180l150-90-32-52-182 110v212zM554 896c212 0 384-172 384-384s-172-384-384-384c-106 0-200 42-270 112l60 62c54-54 128-88 210-88 166 0 300 132 300 298s-134 298-300 298-298-132-298-298h128l-172-172-4 6-166 166h128c0 212 172 384 384 384z" />
+<glyph unicode="&#xe8b6;" glyph-name="search" d="M406 426c106 0 192 86 192 192s-86 192-192 192-192-86-192-192 86-192 192-192zM662 426l212-212-64-64-212 212v34l-12 12c-48-42-112-66-180-66-154 0-278 122-278 276s124 278 278 278 276-124 276-278c0-68-24-132-66-180l12-12h34z" />
 <glyph unicode="&#xe900;" glyph-name="AUD" d="M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512zM308.25 387.3h57.225l-87.675 252.525h-62.125l-87.675-252.525h53.025l19.425 60.2h88.725l19.075-60.2zM461.9 639.825h-52.85v-165.375c0-56 41.125-93.625 105.7-93.625 64.75 0 105.875 37.625 105.875 93.625v165.375h-52.85v-159.95c0-31.85-19.075-52.15-53.025-52.15-33.775 0-52.85 20.3-52.85 52.15v159.95zM682.225 640v-252.7h99.4c75.6 0 118.475 46.025 118.475 128.1 0 79.1-43.4 124.6-118.475 124.6h-99.4zM735.075 594.85v-162.4h38.15c46.725 0 72.975 28.7 72.975 82.075 0 51.1-27.125 80.325-72.975 80.325h-38.15zM243.5 587.325l-31.675-99.050h66.15l-31.325 99.050h-3.15z" />
-<glyph unicode="&#xe901;" glyph-name="avatar" d="M512 204c106 0 200 56 256 138-2 84-172 132-256 132-86 0-254-48-256-132 56-82 150-138 256-138zM512 810c-70 0-128-58-128-128s58-128 128-128 128 58 128 128-58 128-128 128zM512 938c236 0 426-190 426-426s-190-426-426-426-426 190-426 426 190 426 426 426z" />
-<glyph unicode="&#xe902;" glyph-name="download" d="M726 470h-128v170h-172v-170h-128l214-214zM826 596c110-8 198-100 198-212 0-118-96-214-214-214h-554c-142 0-256 114-256 256 0 132 100 240 228 254 54 102 160 174 284 174 156 0 284-110 314-258z" />
 <glyph unicode="&#xe903;" glyph-name="mic-camera-combined" d="M756.704 628.138l267.296 202.213v-635.075l-267.296 202.213v-191.923c0-12.085-11.296-21.863-25.216-21.863h-706.272c-13.92 0-25.216 9.777-25.216 21.863v612.25c0 12.085 11.296 21.863 25.216 21.863h706.272c13.92 0 25.216-9.777 25.216-21.863v-189.679zM371.338 376.228c47.817 0 86.529 40.232 86.529 89.811v184.835c0 49.651-38.713 89.883-86.529 89.883-47.788 0-86.515-40.232-86.515-89.883v-184.835c0-49.579 38.756-89.811 86.515-89.811v0zM356.754 314.070v-32.78h33.718v33.412c73.858 9.606 131.235 73.73 131.235 151.351v88.232h-30.636v-88.232c0-67.57-53.696-122.534-119.734-122.534-66.024 0-119.691 54.964-119.691 122.534v88.232h-30.636v-88.232c0-79.215 59.674-144.502 135.744-151.969v-0.014z" />
 <glyph unicode="&#xe904;" glyph-name="kick" d="M512 810l284-426h-568zM214 298h596v-84h-596v84z" />
 <glyph unicode="&#xe905;" glyph-name="hangup" d="M512 640c-68 0-134-10-196-30v-132c0-16-10-34-24-40-42-20-80-46-114-78-8-8-18-12-30-12s-22 4-30 12l-106 106c-8 8-12 18-12 30s4 22 12 30c130 124 306 200 500 200s370-76 500-200c8-8 12-18 12-30s-4-22-12-30l-106-106c-8-8-18-12-30-12s-22 4-30 12c-34 32-72 58-114 78-14 6-24 20-24 38v132c-62 20-128 32-196 32z" />
 <glyph unicode="&#xe906;" glyph-name="chat" d="M854 342v512h-684v-598l86 86h598zM854 938c46 0 84-38 84-84v-512c0-46-38-86-84-86h-598l-170-170v768c0 46 38 84 84 84h684z" />
-<glyph unicode="&#xe907;" glyph-name="edit" d="M884 724l-78-78-160 160 78 78c16 16 44 16 60 0l100-100c16-16 16-44 0-60zM128 288l472 472 160-160-472-472h-160v160z" />
 <glyph unicode="&#xe908;" glyph-name="share-doc" d="M554 640h236l-236 234v-234zM682 426v86h-340v-86h340zM682 256v86h-340v-86h340zM598 938l256-256v-512c0-46-40-84-86-84h-512c-46 0-86 38-86 84l2 684c0 46 38 84 84 84h342z" />
 <glyph unicode="&#xe909;" glyph-name="ninja" d="M330.667 469.333c-0.427 14.933 6.4 29.44 17.92 39.253 32-6.827 61.867-20.053 88.747-39.253 0-29.013-23.893-52.907-53.333-52.907s-52.907 23.467-53.333 52.907zM586.667 469.333c26.88 18.773 56.747 32 88.747 38.827 11.52-9.813 18.347-24.32 17.92-38.827 0-29.867-23.893-53.76-53.333-53.76s-53.333 23.893-53.333 53.76v0zM512 640c-118.187 1.707-234.667-27.733-338.347-85.333l-2.987-42.667c0-52.48 12.373-104.107 35.84-151.040 101.12 15.36 203.093 23.040 305.493 23.040s204.373-7.68 305.493-23.040c23.467 46.933 35.84 98.56 35.84 151.040l-2.987 42.667c-103.68 57.6-220.16 87.040-338.347 85.333zM512 938.667c235.641 0 426.667-191.025 426.667-426.667s-191.025-426.667-426.667-426.667c-235.641 0-426.667 191.025-426.667 426.667s191.025 426.667 426.667 426.667z" />
-<glyph unicode="&#xe90a;" glyph-name="star-full" d="M512 288l-264-160 70 300-232 202 306 26 120 282 120-282 306-26-232-202 70-300z" />
 <glyph unicode="&#xe90b;" glyph-name="full-screen" d="M598 810h212v-212h-84v128h-128v84zM726 298v128h84v-212h-212v84h128zM214 598v212h212v-84h-128v-128h-84zM298 426v-128h128v-84h-212v212h84z" />
 <glyph unicode="&#xe90c;" glyph-name="exit-full-screen" d="M682 682h128v-84h-212v212h84v-128zM598 214v212h212v-84h-128v-128h-84zM342 682v128h84v-212h-212v84h128zM214 342v84h212v-212h-84v128h-128z" />
 <glyph unicode="&#xe90d;" glyph-name="security" d="M768 170v428h-512v-428h512zM768 682c46 0 86-38 86-84v-428c0-46-40-84-86-84h-512c-46 0-86 38-86 84v428c0 46 40 84 86 84h388v86c0 72-60 132-132 132s-132-60-132-132h-82c0 118 96 214 214 214s214-96 214-214v-86h42zM512 298c-46 0-86 40-86 86s40 86 86 86 86-40 86-86-40-86-86-86z" />
 <glyph unicode="&#xe90e;" glyph-name="security-locked" d="M768 170v428h-512v-428h512zM380 768v-86h264v86c0 72-60 132-132 132s-132-60-132-132zM768 682c46 0 86-38 86-84v-428c0-46-40-84-86-84h-512c-46 0-86 38-86 84v428c0 46 40 84 86 84h42v86c0 118 96 214 214 214s214-96 214-214v-86h42zM512 298c-46 0-86 40-86 86s40 86 86 86 86-40 86-86-40-86-86-86z" />
-<glyph unicode="&#xe90f;" glyph-name="reload" d="M512 256v128l170-170-170-172v128c-188 0-342 154-342 342 0 66 20 130 54 182l62-62c-20-36-30-76-30-120 0-142 114-256 256-256zM512 854c188 0 342-154 342-342 0-66-20-130-54-182l-62 62c20 36 30 76 30 120 0 142-114 256-256 256v-128l-170 170 170 172v-128z" />
 <glyph unicode="&#xe910;" glyph-name="microphone" d="M738 554h72c0-146-116-266-256-286v-140h-84v140c-140 20-256 140-256 286h72c0-128 108-216 226-216s226 88 226 216zM512 426c-70 0-128 58-128 128v256c0 70 58 128 128 128s128-58 128-128v-256c0-70-58-128-128-128z" />
-<glyph unicode="&#xe911;" glyph-name="mic-empty" d="M738 554h72c0-146-116-266-256-286v-140h-84v140c-140 20-256 140-256 286h72c0-128 108-216 226-216s226 88 226 216zM460 814v-264c0-28 24-50 52-50s50 22 50 50l2 264c0 28-24 52-52 52s-52-24-52-52zM512 426c-70 0-128 58-128 128v256c0 70 58 128 128 128s128-58 128-128v-256c0-70-58-128-128-128z" />
 <glyph unicode="&#xe912;" glyph-name="mic-disabled" d="M182 896l714-714-54-54-178 178c-32-20-72-32-110-38v-140h-84v140c-140 20-256 140-256 286h72c0-128 108-216 226-216 34 0 68 8 98 22l-70 70c-8-2-18-4-28-4-70 0-128 58-128 128v32l-256 256zM640 548l-256 254v8c0 70 58 128 128 128s128-58 128-128v-262zM810 554c0-50-14-98-38-140l-52 54c12 26 18 54 18 86h72z" />
 <glyph unicode="&#xe913;" glyph-name="link" d="M640 426c114 0 342-56 342-170v-86h-684v86c0 114 228 170 342 170zM256 598h128v-86h-128v-128h-86v128h-128v86h128v128h86v-128zM640 512c-94 0-170 76-170 170s76 172 170 172 170-78 170-172-76-170-170-170z" />
 <glyph unicode="&#xe914;" glyph-name="shared-video" d="M512 170c188 0 342 154 342 342s-154 342-342 342-342-154-342-342 154-342 342-342zM512 938c236 0 426-190 426-426s-190-426-426-426-426 190-426 426 190 426 426 426zM426 320v384l256-192z" />
@@ -53,8 +48,6 @@
 <glyph unicode="&#xe918;" glyph-name="camera" d="M726 576l170 170v-468l-170 170v-150c0-24-20-42-44-42h-512c-24 0-42 18-42 42v428c0 24 18 42 42 42h512c24 0 44-18 44-42v-150z" />
 <glyph unicode="&#xe919;" glyph-name="camera-disabled" d="M140 938l756-756-54-54-136 136c-6-4-16-8-24-8h-512c-24 0-42 18-42 42v428c0 24 18 42 42 42h32l-116 116zM896 746v-456l-478 478h264c24 0 44-18 44-42v-150z" />
 <glyph unicode="&#xe91a;" glyph-name="volume" d="M598 886c172-38 298-192 298-374s-126-336-298-374v88c124 36 212 150 212 286s-88 250-212 286v88zM704 512c0-76-42-140-106-172v344c64-32 106-96 106-172zM128 640h170l214 214v-684l-214 214h-170v256z" />
-<glyph unicode="&#xe91b;" glyph-name="contactList" d="M704 746c-46 0-86-38-86-84s40-86 86-86 86 40 86 86-40 84-86 84zM704 512c-82 0-150 68-150 150s68 148 150 148 150-66 150-148-68-150-150-150zM320 746c-46 0-86-38-86-84s40-86 86-86 86 40 86 86-40 84-86 84zM320 512c-82 0-150 68-150 150s68 148 150 148 150-66 150-148-68-150-150-150zM918 278v52c0 24-110 76-214 76-46 0-90-12-128-24 14-16 22-32 22-52v-52h320zM534 278v52c0 24-110 76-214 76s-214-52-214-76v-52h428zM704 470c92 0 278-48 278-140v-116h-940v116c0 92 186 140 278 140 52 0 130-16 192-44 62 28 140 44 192 44z" />
-<glyph unicode="&#xe91c;" glyph-name="toggle-filmstrip" d="M896 896h-768c-46.933 0-85.333-38.4-85.333-85.333v-597.333c0-46.933 38.4-85.333 85.333-85.333h768c46.933 0 85.333 38.4 85.333 85.333v597.333c0 46.933-38.4 85.333-85.333 85.333zM896 213.333h-768v128h768v-128z" />
 <glyph unicode="&#xe91d;" glyph-name="feedback" d="M42.667 128h170.667v512h-170.667v-512zM981.333 597.333c0 46.933-38.4 85.333-85.333 85.333h-269.227l40.533 194.987 1.28 13.653c0 17.493-7.253 33.707-18.773 45.227l-45.227 44.8-280.747-281.173c-15.787-15.36-25.173-36.693-25.173-60.16v-426.667c0-46.933 38.4-85.333 85.333-85.333h384c35.413 0 65.707 21.333 78.507 52.053l128.853 300.8c3.84 9.813 5.973 20.053 5.973 31.147v81.493l-0.427 0.427 0.427 3.413z" />
 <glyph unicode="&#xe91e;" glyph-name="raised-hand" d="M982 790v-620c0-94-78-170-172-170h-310c-46 0-90 18-122 50l-336 342s54 52 56 52c10 8 22 12 34 12 10 0 18-2 26-6 2 0 184-104 184-104v508c0 36 28 64 64 64s64-28 64-64v-300h42v406c0 36 28 64 64 64s64-28 64-64v-406h42v364c0 36 28 64 64 64s64-28 64-64v-364h44v236c0 36 28 64 64 64s64-28 64-64z" />
 <glyph unicode="&#xe91f;" glyph-name="menu-up" d="M512 682l256-256-60-60-196 196-196-196-60 60z" />
@@ -63,17 +56,14 @@
 <glyph unicode="&#xe922;" glyph-name="info" d="M512 938.667c-235.52 0-426.667-191.147-426.667-426.667s191.147-426.667 426.667-426.667 426.667 191.147 426.667 426.667-191.147 426.667-426.667 426.667zM554.667 298.667h-85.333v256h85.333v-256zM554.667 640h-85.333v85.333h85.333v-85.333z" />
 <glyph unicode="&#xe923;" glyph-name="visibility" d="M512 640c70 0 128-58 128-128s-58-128-128-128-128 58-128 128 58 128 128 128zM512 298c118 0 214 96 214 214s-96 214-214 214-214-96-214-214 96-214 214-214zM512 832c214 0 396-132 470-320-74-188-256-320-470-320s-396 132-470 320c74 188 256 320 470 320z" />
 <glyph unicode="&#xe924;" glyph-name="visibility-off" d="M506 640h6c70 0 128-58 128-128v-8zM322 606c-14-28-24-60-24-94 0-118 96-214 214-214 34 0 66 10 94 24l-66 66c-8-2-18-4-28-4-70 0-128 58-128 128 0 10 2 20 4 28zM86 842l54 54 756-756-54-54c-47.968 47.365-96.266 94.401-144 142-58-24-120-36-186-36-214 0-396 132-470 320 34 84 90 156 160 212-39.017 38.983-77.307 78.693-116 118zM512 726c-28 0-54-6-78-16l-92 92c52 20 110 30 170 30 214 0 394-132 468-320-32-80-82-148-146-202l-124 124c10 24 16 50 16 78 0 118-96 214-214 214z" />
-<glyph unicode="&#xe925;" glyph-name="dialpad" d="M512 982c46 0 86-40 86-86s-40-86-86-86-86 40-86 86 40 86 86 86zM512 726c46 0 86-40 86-86s-40-86-86-86-86 40-86 86 40 86 86 86zM768 726c46 0 86-40 86-86s-40-86-86-86-86 40-86 86 40 86 86 86zM768 470c46 0 86-40 86-86s-40-86-86-86-86 40-86 86 40 86 86 86zM512 470c46 0 86-40 86-86s-40-86-86-86-86 40-86 86 40 86 86 86zM768 810c-46 0-86 40-86 86s40 86 86 86 86-40 86-86-40-86-86-86zM256 470c46 0 86-40 86-86s-40-86-86-86-86 40-86 86 40 86 86 86zM256 726c46 0 86-40 86-86s-40-86-86-86-86 40-86 86 40 86 86 86zM256 982c46 0 86-40 86-86s-40-86-86-86-86 40-86 86 40 86 86 86zM512 214c46 0 86-40 86-86s-40-86-86-86-86 40-86 86 40 86 86 86z" />
-<glyph unicode="&#xe926;" glyph-name="gsm-bars-black" d="M896 1024c70.692 0 128-57.308 128-128v-768c0-70.692-57.308-128-128-128s-128 57.308-128 128v768c0 70.692 57.308 128 128 128zM512 768c70.692 0 128-57.308 128-128v-512c0-70.692-57.308-128-128-128s-128 57.308-128 128v512c0 70.692 57.308 128 128 128zM128 384v0c70.692 0 128-57.308 128-128v-128c0-70.692-57.308-128-128-128s-128 57.308-128 128v128c0 70.692 57.308 128 128 128v0z" />
+<glyph unicode="&#xe926;" glyph-name="gsm-bars" d="M896 1024c70.692 0 128-57.308 128-128v-768c0-70.692-57.308-128-128-128s-128 57.308-128 128v768c0 70.692 57.308 128 128 128zM512 768c70.692 0 128-57.308 128-128v-512c0-70.692-57.308-128-128-128s-128 57.308-128 128v512c0 70.692 57.308 128 128 128zM128 384v0c70.692 0 128-57.308 128-128v-128c0-70.692-57.308-128-128-128s-128 57.308-128 128v128c0 70.692 57.308 128 128 128v0z" />
 <glyph unicode="&#xe927;" glyph-name="HD" d="M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512zM481.359 384v255.823h-54.273v-103.18h-116.813v103.18h-54.273v-255.823h54.273v106.903h116.813v-106.903h54.273zM544.258 640v-256h102.077c77.636 0 121.665 46.626 121.665 129.773 0 80.133-44.569 126.227-121.665 126.227h-102.077zM598.531 594.26v-164.521h39.177c47.983 0 74.94 29.075 74.94 83.147 0 51.767-27.855 81.374-74.94 81.374h-39.177z" />
 <glyph unicode="&#xe928;" glyph-name="LD" d="M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512zM472.4 433.325h-112.35v206.5h-52.85v-252.525h165.2v46.025zM520.35 640v-252.7h99.4c75.6 0 118.475 46.025 118.475 128.1 0 79.1-43.4 124.6-118.475 124.6h-99.4zM573.2 594.85v-162.4h38.15c46.725 0 72.975 28.7 72.975 82.075 0 51.1-27.125 80.325-72.975 80.325h-38.15z" />
 <glyph unicode="&#xe929;" glyph-name="SD" d="M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512zM281.6 451.175c1.925-47.075 40.95-76.65 101.15-76.65 63.35 0 102.375 31.15 102.375 82.075 0 39.2-21.875 61.075-72.625 71.75l-30.45 6.475c-29.575 6.3-41.65 15.225-41.65 30.8 0 19.25 17.5 31.5 43.925 31.5 25.55 0 44.1-13.3 46.55-33.25h49.7c-1.575 44.975-40.95 76.125-96.6 76.125-58.275 0-96.6-31.325-96.6-78.925 0-38.5 22.575-62.475 68.6-72.1l32.9-7c30.975-6.65 43.575-15.925 43.575-32.025 0-19.075-19.425-32.375-46.9-32.375-29.75 0-50.4 13.125-52.85 33.6h-51.1zM535 633.7v-252.7h99.4c75.6 0 118.475 46.025 118.475 128.1 0 79.1-43.4 124.6-118.475 124.6h-99.4zM587.85 588.55v-162.4h38.15c46.725 0 72.975 28.7 72.975 82.075 0 51.1-27.125 80.325-72.975 80.325h-38.15z" />
 <glyph unicode="&#xe92a;" glyph-name="camera-take-picture" d="M725.333 512c0-117.821-95.513-213.333-213.333-213.333s-213.333 95.513-213.333 213.333c0 117.821 95.513 213.333 213.333 213.333s213.333-95.513 213.333-213.333zM512 256c141.385 0 256 114.615 256 256s-114.615 256-256 256v0c-141.385 0-256-114.615-256-256s114.615-256 256-256v0zM512 213.333c-164.949 0-298.667 133.718-298.667 298.667s133.718 298.667 298.667 298.667v0c164.949 0 298.667-133.718 298.667-298.667s-133.718-298.667-298.667-298.667v0z" />
 <glyph unicode="&#xe92b;" glyph-name="rec" d="M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512zM581.333 433.782h-110.595v59.233h104.338v40.332h-104.338v56.87h110.595v43.539h-161.665v-243.512h161.665v43.539zM738.771 384c58.849 0 101.802 36.282 106.029 88.933h-49.717c-4.904-26.832-26.888-44.045-56.143-44.045-38.556 0-62.4 31.895-62.4 83.196s23.844 83.027 62.231 83.027c29.086 0 51.239-18.394 56.143-46.407h49.717c-3.72 52.989-48.026 91.296-105.86 91.296-70.855 0-114.485-48.77-114.485-127.916 0-79.314 43.798-128.084 114.485-128.084zM230.27 478.502h41.769l45.489-88.258h57.834l-51.408 96.19c28.072 11.138 44.306 38.138 44.306 69.189 0 48.432-32.976 78.133-86.582 78.133h-102.478v-243.512h51.070v88.258zM230.27 592.58v-74.927h44.813c25.704 0 40.754 13.838 40.754 37.295 0 23.119-15.896 37.632-41.262 37.632h-44.306z" />
-<glyph unicode="&#xe92c;" glyph-name="live" d="M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512zM298.225 430.025h-112.35v206.5h-52.85v-252.525h165.2v46.025zM399.025 384v252.525h-52.85v-252.525h52.85zM591.525 384l84.175 252.525h-56.875l-56.35-193.025h-3.15l-57.4 193.025h-59.675l85.4-252.525h63.875zM886.050 429.15h-114.45v61.425h107.975v41.825h-107.975v58.975h114.45v45.15h-167.3v-252.525h167.3v45.15z" />
 <glyph unicode="&#xe92d;" glyph-name="speaker" d="M0 512c0-282.795 229.205-512 512-512s512 229.205 512 512c0 282.795-229.205 512-512 512s-512-229.205-512-512zM525.005 759.362c-20.475 24.944-16.326 61.342 9.268 81.297s62.94 15.911 83.416-9.033c16.036-19.536 38.593-52.97 60.894-97.797 81.621-164.065 89.461-340.992-26.857-506.352-8.384-11.919-17.386-23.69-27.012-35.307-20.593-24.851-57.959-28.727-83.458-8.657s-29.476 56.487-8.882 81.338c7.686 9.275 14.833 18.621 21.455 28.035 88.66 126.041 82.71 260.306 17.953 390.475-10.599 21.305-21.94 40.51-33.198 57.196-6.515 9.657-11.322 16.057-13.578 18.805zM353.479 647.46c-19.353 24.679-15.129 60.448 9.434 79.893s60.164 15.2 79.517-9.479c9.635-12.287 22.577-32.644 35.209-60.034 50.35-109.176 50.35-231.689-33.639-349.612-18.198-25.551-53.566-31.441-78.997-13.157s-31.294 53.819-13.096 79.37c57.564 80.822 57.564 160.581 22.983 235.565-8.601 18.65-16.892 31.691-21.412 37.455z" />
 <glyph unicode="&#xe92e;" glyph-name="tiles-many" d="M113.778 1024h227.556c62.838 0 113.778-50.94 113.778-113.778v-227.556c0-62.838-50.94-113.778-113.778-113.778h-227.556c-62.838 0-113.778 50.94-113.778 113.778v227.556c0 62.838 50.94 113.778 113.778 113.778zM170.667 910.222c-31.419 0-56.889-25.47-56.889-56.889v-113.778c0-31.419 25.47-56.889 56.889-56.889h113.778c31.419 0 56.889 25.47 56.889 56.889v113.778c0 31.419-25.47 56.889-56.889 56.889h-113.778zM113.778 455.111h227.556c62.838 0 113.778-50.94 113.778-113.778v-227.556c0-62.838-50.94-113.778-113.778-113.778h-227.556c-62.838 0-113.778 50.94-113.778 113.778v227.556c0 62.838 50.94 113.778 113.778 113.778zM170.667 341.333c-31.419 0-56.889-25.47-56.889-56.889v-113.778c0-31.419 25.47-56.889 56.889-56.889h113.778c31.419 0 56.889 25.47 56.889 56.889v113.778c0 31.419-25.47 56.889-56.889 56.889h-113.778zM682.667 1024h227.556c62.838 0 113.778-50.94 113.778-113.778v-227.556c0-62.838-50.94-113.778-113.778-113.778h-227.556c-62.838 0-113.778 50.94-113.778 113.778v227.556c0 62.838 50.94 113.778 113.778 113.778zM739.556 910.222c-31.419 0-56.889-25.47-56.889-56.889v-113.778c0-31.419 25.47-56.889 56.889-56.889h113.778c31.419 0 56.889 25.47 56.889 56.889v113.778c0 31.419-25.47 56.889-56.889 56.889h-113.778zM682.667 455.111h227.556c62.838 0 113.778-50.94 113.778-113.778v-227.556c0-62.838-50.94-113.778-113.778-113.778h-227.556c-62.838 0-113.778 50.94-113.778 113.778v227.556c0 62.838 50.94 113.778 113.778 113.778zM739.556 341.333c-31.419 0-56.889-25.47-56.889-56.889v-113.778c0-31.419 25.47-56.889 56.889-56.889h113.778c31.419 0 56.889 25.47 56.889 56.889v113.778c0 31.419-25.47 56.889-56.889 56.889h-113.778z" />
-<glyph unicode="&#xe92f;" glyph-name="tiles-one" d="M170.667 810.667h682.667c47.128 0 85.333-38.205 85.333-85.333v-426.667c0-47.128-38.205-85.333-85.333-85.333h-682.667c-47.128 0-85.333 38.205-85.333 85.333v426.667c0 47.128 38.205 85.333 85.333 85.333zM213.333 725.333c-23.564 0-42.667-19.103-42.667-42.667v-341.333c0-23.564 19.103-42.667 42.667-42.667h597.333c23.564 0 42.667 19.103 42.667 42.667v341.333c0 23.564-19.103 42.667-42.667 42.667h-597.333z" />
 <glyph unicode="&#xe930;" glyph-name="closed_caption" d="M768 554v44c0 24-18 42-42 42h-128c-24 0-44-18-44-42v-172c0-24 20-42 44-42h128c24 0 42 18 42 42v44h-64v-22h-86v128h86v-22h64zM470 554v44c0 24-20 42-44 42h-128c-24 0-42-18-42-42v-172c0-24 18-42 42-42h128c24 0 44 18 44 42v44h-64v-22h-86v128h86v-22h64zM810 854c46 0 86-40 86-86v-512c0-46-40-86-86-86h-596c-48 0-86 40-86 86v512c0 46 38 86 86 86h596z" />
 <glyph unicode="&#xf04b;" glyph-name="play" horiz-adv-x="809" d="M790.857 494.286l-758.857-421.714c-17.714-9.714-32-1.143-32 18.857v841.143c0 20 14.286 28.571 32 18.857l758.857-421.714c17.714-9.714 17.714-25.714 0-35.429z" />
 <glyph unicode="&#xf04d;" glyph-name="stop" horiz-adv-x="878" d="M877.714 914.286v-804.571c0-20-16.571-36.571-36.571-36.571h-804.571c-20 0-36.571 16.571-36.571 36.571v804.571c0 20 16.571 36.571 36.571 36.571h804.571c20 0 36.571-16.571 36.571-36.571z" />