util updates

.flowconfig

@@ -2,30 +2,22 @@
 ; We fork some components by platform
 .*/*[.]android.js
 
+; Ignore "BUCK" generated dirs
+<PROJECT_ROOT>/\.buckd/
+
 ; Ignore unexpected extra "@providesModule"
 .*/node_modules/.*/node_modules/fbjs/.*
-node_modules/react-native/Libraries/react-native/React.js
 
 ; Ignore duplicate module providers
 ; For RN Apps installed via npm, "Libraries" folder is inside
 ; "node_modules/react-native" but in the source repo it is in the root
-node_modules/react-native/Libraries/react-native/React.js
-
-; Flow doesn't support platforms
-.*/Libraries/Utilities/LoadingView.js
+.*/Libraries/react-native/React.js
 
 ; Ignore polyfills
-node_modules/react-native/Libraries/polyfills/.*
+.*/Libraries/polyfills/.*
 
-; These should not be required directly
-; require from fbjs/lib instead: require('fbjs/lib/warning')
-node_modules/warning/.*
-
-; Flow doesn't support platforms
-.*/Libraries/Utilities/HMRLoadingView.js
-
-[untyped]
-.*/node_modules/@react-native-community/cli/.*/.*
+; Ignore metro
+.*/node_modules/metro/.*
 
 ; Ignore packages in node_modules which we (i.e. the jitsi-meet project) have
 ; seen to cause errors and we have chosen not to fix.
@@ -48,18 +40,6 @@ emoji=true
 esproposal.optional_chaining=enable
 esproposal.nullish_coalescing=enable
 
-; We (i.e. the jitsi-meet project) are using the haste module system on Web as
-; well, not only on React Native. Unfortunately, Flow does not support .web.js
-; by default. Override Flow's defaults to include .web.js as well. Technically,
-; we have .native.js as well so the choice of .web.js may lead to errors.
-; Practically though, it is a potential future problem that we do not have at
-; the time of this writing.
-module.file_ext=.web.js
-; Flow's defaults:
-module.file_ext=.js
-module.file_ext=.json
-module.file_ext=.ios.js
-
 module.system=haste
 module.system.haste.use_name_reducers=true
 # get basename
@@ -72,11 +52,8 @@ module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
 module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
 module.system.haste.paths.blacklist=.*/__tests__/.*
 module.system.haste.paths.blacklist=.*/__mocks__/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/RNTester/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/IntegrationTests/.*
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation.js
 module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
 
 munge_underscores=true
 
@@ -87,32 +64,22 @@ suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
-
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
-[lints]
-sketchy-null-number=warn
-sketchy-null-mixed=warn
-sketchy-number=warn
-untyped-type-import=warn
-nonstrict-import=warn
-deprecated-type=warn
-unsafe-getters-setters=warn
-inexact-spread=warn
-unnecessary-invariant=warn
-signature-verification-failure=warn
-deprecated-utility=error
-
-[strict]
-deprecated-type
-nonstrict-import
-sketchy-null
-unclear-type
-unsafe-getters-setters
-untyped-import
-untyped-type-import
+; We (i.e. the jitsi-meet project) are using the haste module system on Web as
+; well, not only on React Native. Unfortunately, Flow does not support .web.js
+; by default. Override Flow's defaults to include .web.js as well. Technically,
+; we have .native.js as well so the choice of .web.js may lead to errors.
+; Practically though, it is a potential future problem that we do not have at
+; the time of this writing.
+module.file_ext=.web.js
+; Flow's defaults:
+module.file_ext=.js
+module.file_ext=.jsx
+module.file_ext=.json
 
 [version]
-^0.104.0
+^0.92.0

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

@@ -1,11 +0,0 @@
----
-name: Security issues
-about: Please email security@jitsi.org
-
----
-
-We take security very seriously and develop all Jitsi projects to be secure and safe.
-
-If you find (or simply suspect) a security issue in any of the Jitsi projects, please send us an email to security@jitsi.org.
-
-We encourage responsible disclosure for the sake of our users, so please reach out before posting in a public space.

.gitignore

@@ -73,7 +73,6 @@ buck-out/
 # Build artifacts
 *.jsbundle
 *.framework
-android/app/debug
 android/app/release
 
 # precommit-hook

.travis.yml

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

Makefile

@@ -3,7 +3,6 @@ CLEANCSS = ./node_modules/.bin/cleancss
 DEPLOY_DIR = libs
 LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet/
 LIBFLAC_DIR = node_modules/libflacjs/dist/min/
-RNNOISE_WASM_DIR = node_modules/rnnoise-wasm/dist/
 NODE_SASS = ./node_modules/.bin/node-sass
 NPM = npm
 OUTPUT_DIR = .
@@ -21,7 +20,7 @@ compile:
 clean:
 	rm -fr $(BUILD_DIR)
 
-deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-lib-jitsi-meet deploy-libflac deploy-css deploy-local
+deploy: deploy-init deploy-appbundle deploy-lib-jitsi-meet deploy-libflac deploy-css deploy-local
 
 deploy-init:
 	rm -fr $(DEPLOY_DIR)
@@ -46,10 +45,6 @@ deploy-appbundle:
 		$(OUTPUT_DIR)/analytics-ga.js \
 		$(BUILD_DIR)/analytics-ga.min.js \
 		$(BUILD_DIR)/analytics-ga.min.map \
-		$(BUILD_DIR)/video-blur-effect.min.js \
-		$(BUILD_DIR)/video-blur-effect.min.map \
-		$(BUILD_DIR)/rnnoise-processor.min.js \
-		$(BUILD_DIR)/rnnoise-processor.min.map \
 		$(DEPLOY_DIR)
 
 deploy-lib-jitsi-meet:
@@ -66,11 +61,6 @@ deploy-libflac:
 		$(LIBFLAC_DIR)/libflac4-1.3.2.min.js.mem \
 		$(DEPLOY_DIR)
 
-deploy-rnnoise-binary:
-	cp \
-		$(RNNOISE_WASM_DIR)/rnnoise.wasm \
-		$(DEPLOY_DIR)
-
 deploy-css:
 	$(NODE_SASS) $(STYLES_MAIN) $(STYLES_BUNDLE) && \
 	$(CLEANCSS) $(STYLES_BUNDLE) > $(STYLES_DESTINATION) ; \
@@ -79,7 +69,7 @@ deploy-css:
 deploy-local:
 	([ ! -x deploy-local.sh ] || ./deploy-local.sh)
 
-dev: deploy-init deploy-css deploy-rnnoise-binary deploy-lib-jitsi-meet deploy-libflac
+dev: deploy-init deploy-css deploy-lib-jitsi-meet deploy-libflac
 	$(WEBPACK_DEV_SERVER)
 
 source-package:

README.md

@@ -31,9 +31,82 @@ You can get our mobile versions from here:
 * [Android](https://play.google.com/store/apps/details?id=org.jitsi.meet)
 * [iOS](https://itunes.apple.com/us/app/jitsi-meet/id1165103905)
 
-## Development
+## Building the sources
 
-For web development see [here](doc/development.md), and for mobile see [here](doc/mobile.md).
+Node.js >= 10 and npm >= 6 are required.
+
+On Debian/Ubuntu systems, the required packages can be installed with:
+```
+sudo apt-get install npm nodejs
+cd jitsi-meet
+npm install
+```
+
+To build the Jitsi Meet application, just type
+```
+make
+```
+
+### Working with the library sources (lib-jitsi-meet)
+
+By default the library is build from its git repository sources. The default dependency path in package.json is :
+```json
+"lib-jitsi-meet": "jitsi/lib-jitsi-meet",
+```
+
+To work with local copy you must change the path to:
+```json
+"lib-jitsi-meet": "file:///Users/name/local-lib-jitsi-meet-copy",
+```
+
+To make the project you must force it to take the sources as 'npm update':
+```
+npm install lib-jitsi-meet --force && make
+```
+
+Or if you are making only changes to the library:
+```
+npm install lib-jitsi-meet --force && make deploy-lib-jitsi-meet
+```
+
+Alternative way is to use [npm link](https://docs.npmjs.com/cli/link).
+It allows to link `lib-jitsi-meet` dependency to local source in few steps:
+
+```bash
+cd lib-jitsi-meet
+
+#### create global symlink for lib-jitsi-meet package
+npm link
+
+cd ../jitsi-meet
+
+#### create symlink from the local node_modules folder to the global lib-jitsi-meet symlink
+npm link lib-jitsi-meet
+```
+
+ After changes in local `lib-jitsi-meet` repository, you can rebuild it with `npm run install` and your `jitsi-meet` repository will use that modified library.
+Note: when using node version 4.x, the make file of jitsi-meet do npm update which will delete the link. It is no longer the case with version 6.x.
+
+If you do not want to use local repository anymore you should run
+```bash
+cd jitsi-meet
+npm unlink lib-jitsi-meet
+npm install
+```
+### Running with webpack-dev-server for development
+
+Use it at the CLI, type
+```
+make dev
+```
+
+By default the backend deployment used is `beta.meet.jit.si`. You can point the Jitsi-Meet app at a different backend by using a proxy server. To do this, set the WEBPACK_DEV_SERVER_PROXY_TARGET variable:
+```
+export WEBPACK_DEV_SERVER_PROXY_TARGET=https://your-example-server.com
+make dev
+```
+
+The app should be running at https://localhost:8080/
 
 ## Contributing
 
@@ -45,8 +118,7 @@ see our [guidelines for contributing](CONTRIBUTING.md).
 Jitsi Meet provides a very flexible way of embedding in external applications by using the [Jitsi Meet API](doc/api.md).
 
 ## Security
-
-WebRTC does not (yet) provide a way of conducting multi-party conversations with end-to-end encryption. 
+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.
 
@@ -58,13 +130,9 @@ Jitsi Meet in terms of security.
 The [meet.jit.si](https://meet.jit.si) service is maintained by the Jitsi team
 at [8x8](https://8x8.com).
 
-## Security issues
-
-We take security very seriously and develop all Jitsi projects to be secure and safe.
-
-If you find (or simply suspect) a security issue in any of the Jitsi projects, please send us an email to security@jitsi.org.
-
-**We encourage responsible disclosure for the sake of our users, so please reach out before posting in a public space.**
+## Mobile app
+Jitsi Meet is also available as a React Native app for Android and iOS.
+Instructions on how to build it can be found [here](doc/mobile.md).
 
 ## Acknowledgements
 

android/README.md

@@ -207,6 +207,24 @@ public class MainActivity extends FragmentActivity implements JitsiMeetActivityI
 
 </details>
 
+Starting with SDK version 1.22, a Glide module must be provided by the host app.
+This makes it possible to use the Glide image processing library from both the
+SDK and the host app itself.
+
+You can use the code in `JitsiGlideModule.java` and adjust the package name.
+When building, add the following code in your `app/build.gradle` file, adjusting
+the Glide version to match the one in https://github.com/jitsi/jitsi-meet/blob/master/android/build.gradle
+
+```
+// Glide
+implementation("com.github.bumptech.glide:glide:${glideVersion}") {
+    exclude group: "com.android.support", module: "glide"
+}
+implementation("com.github.bumptech.glide:annotations:${glideVersion}") {
+    exclude group: "com.android.support", module: "annotations"
+}
+```
+
 ### JitsiMeetActivity
 
 This class encapsulates a high level API in the form of an Android `FragmentActivity`

android/app/.classpath

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>

android/app/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>app</name>
-	<comment>Project app created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>

android/app/.settings/org.eclipse.buildship.core.prefs

@@ -1,2 +0,0 @@
-connection.project.dir=..
-eclipse.preferences.version=1

android/app/build.gradle

@@ -34,6 +34,8 @@ android {
 
     buildTypes {
         debug {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules-debug.pro'
             buildConfigField "boolean", "GOOGLE_SERVICES_ENABLED", "${googleServicesEnabled}"
             buildConfigField "boolean", "LIBRE_BUILD", "${rootProject.ext.libreBuild}"
         }
@@ -68,8 +70,8 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
 
     if (!rootProject.ext.libreBuild) {
         implementation 'com.google.android.gms:play-services-auth:16.0.1'
@@ -86,6 +88,15 @@ dependencies {
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.1'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.1'
+
+    // Glide
+    implementation("com.github.bumptech.glide:glide:${rootProject.ext.glideVersion}") {
+        exclude group: "com.android.support", module: "glide"
+    }
+    implementation("com.github.bumptech.glide:annotations:${rootProject.ext.glideVersion}") {
+        exclude group: "com.android.support", module: "annotations"
+    }
+    annotationProcessor "com.github.bumptech.glide:compiler:${rootProject.ext.glideVersion}"
 }
 
 gradle.projectsEvaluated {

android/app/proguard-rules-debug.pro

@@ -0,0 +1,5 @@
+-include proguard-rules.pro
+
+# Disabling obfuscation is useful if you collect stack traces from production crashes
+# (unless you are using a system that supports de-obfuscate the stack traces).
+-dontobfuscate

android/app/proguard-rules.pro

@@ -9,6 +9,13 @@
 
 # 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 *;
+#}
+
 # React Native
 
 # Keep our interfaces so they can be used by other ProGuard rules.
@@ -53,9 +60,19 @@
 -keep class sun.misc.Unsafe { *; }
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
--keep class okio.** { *; }
 -dontwarn okio.**
 
+# FastImage + Glide
+
+-keep public class com.dylanvann.fastimage.* {*;}
+-keep public class com.dylanvann.fastimage.** {*;}
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+
 # WebRTC
 
 -keep class org.webrtc.** { *; }
@@ -83,6 +100,3 @@
 -dontwarn javax.servlet.**
 
 # ^^^ We added the above when we switched minifyEnabled on.
-
-# Rule to avoid build errors related to SVGs.
--keep public class com.horcrux.svg.** {*;}

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

@@ -0,0 +1,16 @@
+package org.jitsi.meet;
+
+import com.bumptech.glide.annotation.GlideModule;
+import com.bumptech.glide.module.AppGlideModule;
+
+/**
+ * An AppGlideModule needs to be present for image loading events to work in
+ * react-native-fast-image. However, if this is defined by the SDK it will cause trouble with
+ * apps which are using Glide themselves.
+ *
+ * In order to avoid the problem, define a Jitsi Glide module here, so applications already using
+ * it are not in trouble.
+ */
+@GlideModule
+public final class JitsiGlideModule extends AppGlideModule {
+}

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

@@ -21,9 +21,9 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.KeyEvent;
-import androidx.annotation.Nullable;
 
 import org.jitsi.meet.sdk.JitsiMeet;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
@@ -106,7 +106,7 @@ public class MainActivity extends JitsiMeetActivity {
     //
 
     @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE
                 && canRequestOverlayPermission()) {
             if (Settings.canDrawOverlays(this)) {

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#66A8DD</color>
-</resources>

android/build.gradle

@@ -25,10 +25,9 @@ allprojects {
     repositories {
         google()
         jcenter()
-        // React Native (JS, Obj-C sources, Android binaries) is installed from npm.
+        // React Native (JS, Obj-C sources, Android binaries) is installed from
+        // npm.
         maven { url "$rootDir/../node_modules/react-native/android" }
-        // Android JSC is installed from npm.
-        maven { url("$rootDir/../node_modules/jsc-android/dist") }
     }
 
     // Make sure we use the react-native version in node_modules and not the one
@@ -75,13 +74,6 @@ allprojects {
     def versionQualifierNumber = (int)(((new Date().getTime()/1000) - 1546297200) / 10)
 
     afterEvaluate { project ->
-        if (project.plugins.hasPlugin('android') || project.plugins.hasPlugin('android-library')) {
-            project.android {
-                compileSdkVersion rootProject.ext.compileSdkVersion
-                buildToolsVersion rootProject.ext.buildToolsVersion
-            }
-        }
-
         if (project.name.startsWith('react-native-')) {
             def npmManifest = project.file('../package.json')
             def json = new JsonSlurper().parseText(npmManifest.text)
@@ -91,6 +83,17 @@ allprojects {
 
             project.version = "${json.version}-jitsi-${versionQualifierNumber}"
 
+            project.android {
+                compileSdkVersion rootProject.ext.compileSdkVersion
+                if (rootProject.ext.has('buildToolsVersion')) {
+                    buildToolsVersion rootProject.ext.buildToolsVersion
+                }
+                defaultConfig {
+                    minSdkVersion rootProject.ext.minSdkVersion
+                    targetSdkVersion rootProject.ext.targetSdkVersion
+                }
+            }
+
             task androidSourcesJar(type: Jar) {
                 classifier = 'sources'
                 from android.sourceSets.main.java.source
@@ -161,8 +164,12 @@ ext {
     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
+
     // Libre build
-    libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
+    libreBuild = (System.env.LIBRE_BUILD ?: "true").toBoolean()
 }
 
 // If Android SDK is not installed, accept its license so that it

android/gradle.properties

@@ -17,8 +17,5 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-android.useAndroidX=true
-android.enableJetifier=true
-
-appVersion=19.4.0
-sdkVersion=2.4.0
+appVersion=19.2.0
+sdkVersion=2.1.0

android/scripts/release-sdk.sh

@@ -10,7 +10,6 @@ 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)
-JSC_VERSION="r"$(jq -r '.dependencies."jsc-android"' ${THIS_DIR}/../../node_modules/react-native/package.json | cut -d . -f 1)
 DO_GIT_TAG=${GIT_TAG:-0}
 
 if [[ $THE_MVN_REPO == http* ]]; then
@@ -38,20 +37,14 @@ if [[ $MVN_HTTP == 1 ]]; then
         -DgeneratePom=false \
         -DpomFile=react-native-${RN_VERSION}.pom || true
     popd
-    # Push JSC
-    echo "Pushing JSC ${JSC_VERSION} to the Maven repo"
-    pushd ${THIS_DIR}/../../node_modules/jsc-android/dist/org/webkit/android-jsc/${JSC_VERSION}
-    mvn \
-        deploy:deploy-file \
-        -Durl=${MVN_REPO} \
-        -DrepositoryId=${MVN_REPO_ID} \
-        -Dfile=android-jsc-${JSC_VERSION}.aar \
-        -Dpackaging=aar \
-        -DgeneratePom=false \
-        -DpomFile=android-jsc-${JSC_VERSION}.pom || true
-    popd
 else
-    # Push React Native, if necessary
+    # 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}
@@ -64,26 +57,6 @@ else
             -DpomFile=react-native-${RN_VERSION}.pom
         popd
     fi
-
-    # Push JSC, if necessary
-    if [[ ! -d ${MVN_REPO}/org/webkit/android-jsc/${JSC_VERSION} ]]; then
-        echo "Pushing JSC ${JSC_VERSION} to the Maven repo"
-        pushd ${THIS_DIR}/../../node_modules/jsc-android/dist/org/webkit/android-jsc/${JSC_VERSION}
-        mvn \
-            deploy:deploy-file \
-            -Durl=${MVN_REPO} \
-            -Dfile=android-jsc-${JSC_VERSION}.aar \
-            -Dpackaging=aar \
-            -DgeneratePom=false \
-            -DpomFile=android-jsc-${JSC_VERSION}.pom
-        popd
-    fi
-
-    # Check if an SDK with that same version has already been released
-    if [[ -d ${MVN_REPO}/org/jitsi/react/jitsi-meet-sdk/${SDK_VERSION} ]]; then
-        echo "There is already a release with that version in the Maven repo!"
-        exit 1
-    fi
 fi
 
 # Now build and publish the Jitsi Meet SDK and its dependencies

android/scripts/run-packager.sh

@@ -8,8 +8,6 @@ THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOUR
 export RCT_METRO_PORT="${RCT_METRO_PORT:=8081}"
 echo "export RCT_METRO_PORT=${RCT_METRO_PORT}" > "${THIS_DIR}/../../node_modules/react-native/scripts/.packager.env"
 
-adb reverse tcp:8081 tcp:8081
-
 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"

android/sdk/.classpath

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>

android/sdk/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sdk</name>
-	<comment>Project sdk created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>

android/sdk/.settings/org.eclipse.buildship.core.prefs

@@ -1,2 +0,0 @@
-connection.project.dir=..
-eclipse.preferences.version=1

android/sdk/build.gradle

@@ -36,34 +36,32 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.fragment:fragment:1.0.0'
+    implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
 
     api 'com.facebook.react:react-native:+'
-    implementation 'org.webkit:android-jsc:+'
 
     implementation 'com.dropbox.core:dropbox-core-sdk:3.0.8'
-    implementation 'com.jakewharton.timber:timber:4.7.1'
-    implementation 'com.squareup.duktape:duktape-android:1.3.0'
 
     if (!rootProject.ext.libreBuild) {
         implementation 'com.amplitude:android-sdk:2.14.1'
         implementation(project(":react-native-google-signin")) {
             exclude group: 'com.google.android.gms'
-            exclude group: 'androidx'
+            exclude group: 'com.android.support'
         }
     }
 
     implementation project(':react-native-background-timer')
     implementation project(':react-native-calendar-events')
     implementation project(':react-native-community-async-storage')
-    implementation project(':react-native-community_netinfo')
+    implementation(project(':react-native-fast-image')) {
+        exclude group: 'com.android.support'
+    }
     implementation project(':react-native-immersive')
     implementation project(':react-native-keep-awake')
     implementation project(':react-native-linear-gradient')
     implementation project(':react-native-sound')
-    implementation project(':react-native-svg')
+    implementation project(':react-native-vector-icons')
     implementation project(':react-native-webrtc')
     implementation project(':react-native-webview')
 
@@ -141,14 +139,19 @@ android.libraryVariants.all { def variant ->
     mergeAssetsTask.doLast {
         def assetsDir = mergeAssetsTask.outputDir
 
+        // Bundle fonts
+        //
+        copy {
+            from("${projectDir}/../../fonts/jitsi.ttf")
+            into("${assetsDir}/fonts")
+        }
+
         // Bundle sounds
         //
         copy {
             from("${projectDir}/../../sounds/incomingMessage.wav")
             from("${projectDir}/../../sounds/joined.wav")
             from("${projectDir}/../../sounds/left.wav")
-            from("${projectDir}/../../sounds/liveStreamingOn.mp3")
-            from("${projectDir}/../../sounds/liveStreamingOff.mp3")
             from("${projectDir}/../../sounds/outgoingRinging.wav")
             from("${projectDir}/../../sounds/outgoingStart.wav")
             from("${projectDir}/../../sounds/recordingOn.mp3")

android/sdk/src/main/AndroidManifest.xml

@@ -12,7 +12,6 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
     <uses-feature
         android:glEsVersion="0x00020000"
@@ -45,8 +44,6 @@
                 <action android:name="android.telecom.ConnectionService" />
             </intent-filter>
         </service>
-
-        <service android:name="org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService" />
     </application>
 
 </manifest>

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

@@ -24,7 +24,6 @@ import com.facebook.react.bridge.ReadableMap;
 import com.amplitude.api.Amplitude;
 import com.facebook.react.module.annotations.ReactModule;
 
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -91,7 +90,7 @@ class AmplitudeModule
             JSONObject eventProps = new JSONObject(eventPropsString);
             Amplitude.getInstance(instanceName).logEvent(eventType, eventProps);
         } catch (JSONException e) {
-            JitsiMeetLogger.e(e, "Error logging event");
+            e.printStackTrace();
         }
     }
 

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

@@ -25,7 +25,8 @@ import android.content.pm.PackageManager;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.os.Build;
-import androidx.annotation.RequiresApi;
+import android.support.annotation.RequiresApi;
+import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
@@ -36,8 +37,6 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -122,7 +121,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
             case DEVICE_SPEAKER:
                 return android.telecom.CallAudioState.ROUTE_SPEAKER;
             default:
-                JitsiMeetLogger.e(TAG + " Unsupported device name: " + audioDevice);
+                Log.e(TAG, "Unsupported device name: " + audioDevice);
                 return android.telecom.CallAudioState.ROUTE_EARPIECE;
         }
     }
@@ -219,7 +218,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
             }
 
             availableDevices = devices;
-            JitsiMeetLogger.i(TAG + " Available audio devices: " +
+            Log.d(TAG, "Available audio devices: " +
                 availableDevices.toString());
 
             // Reset user selection
@@ -231,6 +230,19 @@ class AudioModeModule extends ReactContextBaseJavaModule
         }
     };
 
+    /**
+     * {@link Runnable} for running update operation on the main thread.
+     */
+    private final Runnable updateAudioRouteRunner
+        = new Runnable() {
+            @Override
+            public void run() {
+                if (mode != -1) {
+                    updateAudioRoute(mode);
+                }
+            }
+        };
+
     /**
      * Audio mode currently in use.
      */
@@ -244,11 +256,6 @@ class AudioModeModule extends ReactContextBaseJavaModule
     private static final String DEVICE_HEADPHONES = "HEADPHONES";
     private static final String DEVICE_SPEAKER    = "SPEAKER";
 
-    /**
-     * Device change event.
-     */
-    private static final String DEVICE_CHANGE_EVENT = "org.jitsi.meet:features/audio-mode#devices-update";
-
     /**
      * List of currently available audio devices.
      */
@@ -296,7 +303,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 // Do an initial detection on Android >= M.
-                onAudioDeviceChange();
+                runInAudioThread(onAudioDeviceChangeRunner);
             } else {
                 // On Android < M, detect if we have an earpiece.
                 PackageManager pm = reactContext.getPackageManager();
@@ -320,7 +327,6 @@ class AudioModeModule extends ReactContextBaseJavaModule
     public Map<String, Object> getConstants() {
         Map<String, Object> constants = new HashMap<>();
 
-        constants.put("DEVICE_CHANGE_EVENT", DEVICE_CHANGE_EVENT);
         constants.put("AUDIO_CALL", AUDIO_CALL);
         constants.put("DEFAULT", DEFAULT);
         constants.put("VIDEO_CALL", VIDEO_CALL);
@@ -329,26 +335,31 @@ class AudioModeModule extends ReactContextBaseJavaModule
     }
 
     /**
-     * Notifies JS land that the devices list has changed.
+     * Gets the list of available audio device categories, i.e. 'bluetooth',
+     * 'earpiece ', 'speaker', 'headphones'.
+     *
+     * @param promise a {@link Promise} which will be resolved with an object
+     *                containing a 'devices' key with a list of devices, plus a
+     *                'selected' key with the selected one.
      */
-    private void notifyDevicesChanged() {
+    @ReactMethod
+    public void getAudioDevices(final Promise promise) {
         runInAudioThread(new Runnable() {
             @Override
             public void run() {
-                WritableArray data = Arguments.createArray();
-                final boolean hasHeadphones = availableDevices.contains(DEVICE_HEADPHONES);
+                WritableMap map = Arguments.createMap();
+                map.putString("selected", selectedDevice);
+                WritableArray devices = Arguments.createArray();
                 for (String device : availableDevices) {
-                    if (hasHeadphones && device.equals(DEVICE_EARPIECE)) {
-                        // Skip earpiece when headphones are plugged in.
+                    if (mode == VIDEO_CALL && device.equals(DEVICE_EARPIECE)) {
+                        // Skip earpiece when in video call mode.
                         continue;
                     }
-                    WritableMap deviceInfo = Arguments.createMap();
-                    deviceInfo.putString("type", device);
-                    deviceInfo.putBoolean("selected", device.equals(selectedDevice));
-                    data.pushMap(deviceInfo);
+                    devices.pushString(device);
                 }
-                ReactInstanceManagerHolder.emitEvent(DEVICE_CHANGE_EVENT, data);
-                JitsiMeetLogger.i(TAG + " Updating audio device list");
+                map.putArray("devices", devices);
+
+                promise.resolve(map);
             }
         });
     }
@@ -431,7 +442,8 @@ class AudioModeModule extends ReactContextBaseJavaModule
                 if (audioDevicesChanged) {
                     supportedRouteMask = newSupportedRoutes;
                     availableDevices = routesToDeviceNames(supportedRouteMask);
-                    JitsiMeetLogger.i(TAG + " Available audio devices: "
+                    Log.d(TAG,
+                          "Available audio devices: "
                                   + availableDevices.toString());
                 }
 
@@ -465,7 +477,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
     public void onAudioFocusChange(int focusChange) {
         switch (focusChange) {
         case AudioManager.AUDIOFOCUS_GAIN: {
-            JitsiMeetLogger.d(TAG + " Audio focus gained");
+            Log.d(TAG, "Audio focus gained");
             // Some other application potentially stole our audio focus
             // temporarily. Restore our mode.
             if (audioFocusLost) {
@@ -477,7 +489,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
         case AudioManager.AUDIOFOCUS_LOSS:
         case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
         case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK: {
-            JitsiMeetLogger.d(TAG + " Audio focus lost");
+            Log.d(TAG, "Audio focus lost");
             audioFocusLost = true;
             break;
         }
@@ -504,13 +516,13 @@ class AudioModeModule extends ReactContextBaseJavaModule
             @Override
             public void run() {
                 if (!availableDevices.contains(device)) {
-                    JitsiMeetLogger.w(TAG + " Audio device not available: " + device);
+                    Log.d(TAG, "Audio device not available: " + device);
                     userSelectedDevice = null;
                     return;
                 }
 
                 if (mode != -1) {
-                    JitsiMeetLogger.i(TAG + " User selected device set to: " + device);
+                    Log.d(TAG, "User selected device set to: " + device);
                     userSelectedDevice = device;
                     updateAudioRoute(mode);
                 }
@@ -572,7 +584,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
             return;
         }
 
-        runInAudioThread(new Runnable() {
+        Runnable r = new Runnable() {
             @Override
             public void run() {
                 boolean success;
@@ -581,7 +593,10 @@ class AudioModeModule extends ReactContextBaseJavaModule
                     success = updateAudioRoute(mode);
                 } catch (Throwable e) {
                     success = false;
-                    JitsiMeetLogger.e(e, TAG + " Failed to update audio route for mode: " + mode);
+                    Log.e(
+                            TAG,
+                            "Failed to update audio route for mode: " + mode,
+                            e);
                 }
                 if (success) {
                     AudioModeModule.this.mode = mode;
@@ -592,7 +607,8 @@ class AudioModeModule extends ReactContextBaseJavaModule
                             "Failed to set audio mode to " + mode);
                 }
             }
-        });
+        };
+        runInAudioThread(r);
     }
 
     /**
@@ -617,14 +633,14 @@ class AudioModeModule extends ReactContextBaseJavaModule
                     @Override
                     public void onAudioDevicesAdded(
                             AudioDeviceInfo[] addedDevices) {
-                        JitsiMeetLogger.d(TAG + " Audio devices added");
+                        Log.d(TAG, "Audio devices added");
                         onAudioDeviceChange();
                     }
 
                     @Override
                     public void onAudioDevicesRemoved(
                             AudioDeviceInfo[] removedDevices) {
-                        JitsiMeetLogger.d(TAG + " Audio devices removed");
+                        Log.d(TAG, "Audio devices removed");
                         onAudioDeviceChange();
                     }
                 };
@@ -643,7 +659,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
         BroadcastReceiver wiredHeadsetReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
-                JitsiMeetLogger.d(TAG + " Wired headset added / removed");
+                Log.d(TAG, "Wired headset added / removed");
                 onHeadsetDeviceChange();
             }
         };
@@ -661,7 +677,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
      * {@code false}, otherwise.
      */
     private boolean updateAudioRoute(int mode) {
-        JitsiMeetLogger.i(TAG + " Update audio route for mode: " + mode);
+        Log.d(TAG, "Update audio route for mode: " + mode);
 
         if (mode == DEFAULT) {
             if (!useConnectionService()) {
@@ -674,7 +690,6 @@ class AudioModeModule extends ReactContextBaseJavaModule
             selectedDevice = null;
             userSelectedDevice = null;
 
-            notifyDevicesChanged();
             return true;
         }
 
@@ -687,12 +702,13 @@ class AudioModeModule extends ReactContextBaseJavaModule
                     AudioManager.STREAM_VOICE_CALL,
                     AudioManager.AUDIOFOCUS_GAIN)
                     == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
-                JitsiMeetLogger.w(TAG + " Audio focus request failed");
+                Log.d(TAG, "Audio focus request failed");
                 return false;
             }
         }
 
         boolean bluetoothAvailable = availableDevices.contains(DEVICE_BLUETOOTH);
+        boolean earpieceAvailable = availableDevices.contains(DEVICE_EARPIECE);
         boolean headsetAvailable = availableDevices.contains(DEVICE_HEADPHONES);
 
         // Pick the desired device based on what's available and the mode.
@@ -701,6 +717,8 @@ class AudioModeModule extends ReactContextBaseJavaModule
             audioDevice = DEVICE_BLUETOOTH;
         } else if (headsetAvailable) {
             audioDevice = DEVICE_HEADPHONES;
+        } else if (mode == AUDIO_CALL && earpieceAvailable) {
+            audioDevice = DEVICE_EARPIECE;
         } else {
             audioDevice = DEVICE_SPEAKER;
         }
@@ -718,7 +736,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
         }
 
         selectedDevice = audioDevice;
-        JitsiMeetLogger.i(TAG + " Selected audio device: " + audioDevice);
+        Log.d(TAG, "Selected audio device: " + audioDevice);
 
         if (useConnectionService()) {
             setAudioRoute(audioDevice);
@@ -726,7 +744,6 @@ class AudioModeModule extends ReactContextBaseJavaModule
             setAudioRoutePreO(audioDevice);
         }
 
-        notifyDevicesChanged();
         return true;
     }
 }

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

@@ -20,16 +20,15 @@ package org.jitsi.meet.sdk;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.widget.FrameLayout;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.ReadableMap;
 import com.rnimmersive.RNImmersiveModule;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
@@ -78,15 +77,6 @@ public abstract class BaseReactView<ListenerT>
         return null;
     }
 
-    /**
-     * Gets all registered React views.
-     *
-     * @return An {@link ArrayList} containing all views currently held by React.
-     */
-    static ArrayList<BaseReactView> getViews() {
-        return new ArrayList<>(views);
-    }
-
     /**
      * The unique identifier of this {@code BaseReactView} within the process
      * for the purposes of {@link ExternalAPIModule}. The name scope was
@@ -111,7 +101,8 @@ public abstract class BaseReactView<ListenerT>
 
         setBackgroundColor(BACKGROUND_COLOR);
 
-        ReactInstanceManagerHolder.initReactInstanceManager((Activity)context);
+        ReactInstanceManagerHolder.initReactInstanceManager(
+            ((Activity) context).getApplication());
 
         // Hook this BaseReactView into ExternalAPI.
         externalAPIScope = UUID.randomUUID().toString();

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

@@ -24,8 +24,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioManager;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+import android.util.Log;
 
 /**
  * Helper class to detect and handle Bluetooth device changes.  It monitors
@@ -78,7 +77,7 @@ class BluetoothHeadsetMonitor {
             = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
 
         if (!audioManager.isBluetoothScoAvailableOffCall()) {
-            JitsiMeetLogger.w(AudioModeModule.TAG + " Bluetooth SCO is not available");
+            Log.w(AudioModeModule.TAG, "Bluetooth SCO is not available");
             return;
         }
 
@@ -94,7 +93,7 @@ class BluetoothHeadsetMonitor {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
 
         if (adapter == null) {
-            JitsiMeetLogger.w(AudioModeModule.TAG + " Device doesn't support Bluetooth");
+            Log.w(AudioModeModule.TAG, "Device doesn't support Bluetooth");
             return false;
         }
 
@@ -149,7 +148,9 @@ class BluetoothHeadsetMonitor {
             switch (state) {
             case BluetoothHeadset.STATE_CONNECTED:
             case BluetoothHeadset.STATE_DISCONNECTED:
-                JitsiMeetLogger.d(AudioModeModule.TAG + " BT headset connection state changed: " + state);
+                Log.d(
+                        AudioModeModule.TAG,
+                        "BT headset connection state changed: " + state);
                 updateDevices();
                 break;
             }
@@ -163,7 +164,9 @@ class BluetoothHeadsetMonitor {
             switch (state) {
             case AudioManager.SCO_AUDIO_STATE_CONNECTED:
             case AudioManager.SCO_AUDIO_STATE_DISCONNECTED:
-                JitsiMeetLogger.d(AudioModeModule.TAG + " BT SCO connection state changed: " + state);
+                Log.d(
+                        AudioModeModule.TAG,
+                        "BT SCO connection state changed: " + state);
                 updateDevices();
                 break;
             }

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

@@ -5,6 +5,7 @@ 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;
@@ -13,14 +14,12 @@ import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
-import androidx.annotation.RequiresApi;
+import android.util.Log;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -64,16 +63,6 @@ public class ConnectionService extends android.telecom.ConnectionService {
     static private final HashMap<String, Promise> startCallPromises
             = new HashMap<>();
 
-    /**
-     * Aborts all ongoing connections. This is a last resort mechanism which forces all resources to
-     * be freed on the system in case of fatal error.
-     */
-    static void abortConnections() {
-        for (ConnectionImpl connection: getConnections()) {
-            connection.onAbort();
-        }
-    }
-
     /**
      * Adds {@link ConnectionImpl} to the list.
      *
@@ -130,7 +119,9 @@ public class ConnectionService extends android.telecom.ConnectionService {
         if (connection != null) {
             connection.setActive();
         } else {
-            JitsiMeetLogger.e("%s setConnectionActive - no connection for UUID: %s", TAG, callUUID);
+            Log.e(TAG, String.format(
+                    "setConnectionActive - no connection for UUID: %s",
+                    callUUID));
         }
     }
 
@@ -161,7 +152,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
             connection.setDisconnected(cause);
             connection.destroy();
         } else {
-            JitsiMeetLogger.e(TAG + " endCall no connection for UUID: " + callUUID);
+            Log.e(TAG, "endCall no connection for UUID: " + callUUID);
         }
     }
 
@@ -193,14 +184,15 @@ public class ConnectionService extends android.telecom.ConnectionService {
                 boolean hasVideo
                         = callState.getBoolean(ConnectionImpl.KEY_HAS_VIDEO);
 
-                JitsiMeetLogger.i(" %s updateCall: %s hasVideo: %s", TAG, callUUID, hasVideo);
+                Log.d(TAG, String.format(
+                        "updateCall: %s hasVideo: %s", callUUID, hasVideo));
                 connection.setVideoState(
                         hasVideo
                                 ? VideoProfile.STATE_BIDIRECTIONAL
                                 : VideoProfile.STATE_AUDIO_ONLY);
             }
         } else {
-            JitsiMeetLogger.e(TAG + " updateCall no connection for UUID: " + callUUID);
+            Log.e(TAG, "updateCall no connection for UUID: " + callUUID);
         }
     }
 
@@ -236,11 +228,13 @@ public class ConnectionService extends android.telecom.ConnectionService {
             = unregisterStartCallPromise(connection.getCallUUID());
 
         if (startCallPromise != null) {
-            JitsiMeetLogger.d(TAG + " onCreateOutgoingConnection " + connection.getCallUUID());
+            Log.d(TAG,
+                  "onCreateOutgoingConnection " + connection.getCallUUID());
             startCallPromise.resolve(null);
         } else {
-            JitsiMeetLogger.e(
-                TAG + " onCreateOutgoingConnection: no start call Promise for " + connection.getCallUUID());
+            Log.e(TAG, String.format(
+                "onCreateOutgoingConnection: no start call Promise for %s",
+                connection.getCallUUID()));
         }
 
         return connection;
@@ -264,7 +258,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
         PhoneAccountHandle theAccountHandle = request.getAccountHandle();
         String callUUID = theAccountHandle.getId();
 
-        JitsiMeetLogger.e(TAG + " onCreateOutgoingConnectionFailed " + callUUID);
+        Log.e(TAG, "onCreateOutgoingConnectionFailed " + callUUID);
 
         if (callUUID != null) {
             Promise startCallPromise = unregisterStartCallPromise(callUUID);
@@ -274,10 +268,12 @@ public class ConnectionService extends android.telecom.ConnectionService {
                         "CREATE_OUTGOING_CALL_FAILED",
                         "The request has been denied by the system");
             } else {
-                JitsiMeetLogger.e(TAG + " startCallFailed - no start call Promise for UUID: " + callUUID);
+                Log.e(TAG, String.format(
+                        "startCallFailed - no start call Promise for UUID: %s",
+                        callUUID));
             }
         } else {
-            JitsiMeetLogger.e(TAG + " onCreateOutgoingConnectionFailed - no call UUID");
+            Log.e(TAG, "onCreateOutgoingConnectionFailed - no call UUID");
         }
 
         unregisterPhoneAccount(theAccountHandle);
@@ -289,10 +285,10 @@ public class ConnectionService extends android.telecom.ConnectionService {
             if (phoneAccountHandle != null) {
                 telecom.unregisterPhoneAccount(phoneAccountHandle);
             } else {
-                JitsiMeetLogger.e(TAG + " unregisterPhoneAccount - account handle is null");
+                Log.e(TAG, "unregisterPhoneAccount - account handle is null");
             }
         } else {
-            JitsiMeetLogger.e(TAG + " unregisterPhoneAccount - telecom is null");
+            Log.e(TAG, "unregisterPhoneAccount - telecom is null");
         }
     }
 
@@ -351,7 +347,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
          */
         @Override
         public void onDisconnect() {
-            JitsiMeetLogger.i(TAG + " onDisconnect " + getCallUUID());
+            Log.d(TAG, "onDisconnect " + getCallUUID());
             WritableNativeMap data = new WritableNativeMap();
             data.putString("callUUID", getCallUUID());
             ReactInstanceManagerHolder.emitEvent(
@@ -371,7 +367,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
          */
         @Override
         public void onAbort() {
-            JitsiMeetLogger.i(TAG + " onAbort " + getCallUUID());
+            Log.d(TAG, "onAbort " + getCallUUID());
             WritableNativeMap data = new WritableNativeMap();
             data.putString("callUUID", getCallUUID());
             ReactInstanceManagerHolder.emitEvent(
@@ -389,7 +385,9 @@ public class ConnectionService extends android.telecom.ConnectionService {
             // 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
-            JitsiMeetLogger.w(TAG + " onHold %s - HOLD is not supported, aborting the call...", getCallUUID());
+            Log.d(TAG, String.format(
+                  "onHold %s - HOLD is not supported, aborting the call...",
+                  getCallUUID()));
             this.onAbort();
         }
 
@@ -402,7 +400,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
          */
         @Override
         public void onCallAudioStateChanged(CallAudioState state) {
-            JitsiMeetLogger.d(TAG + " onCallAudioStateChanged: " + state);
+            Log.d(TAG, "onCallAudioStateChanged: " + state);
             AudioModeModule audioModeModule
                     = ReactInstanceManagerHolder
                     .getNativeModule(AudioModeModule.class);
@@ -418,8 +416,10 @@ public class ConnectionService extends android.telecom.ConnectionService {
          */
         @Override
         public void onStateChanged(int state) {
-            JitsiMeetLogger.d(
-                "%s onStateChanged: %s %s", TAG, Connection.stateToString(state), getCallUUID());
+            Log.d(TAG,
+                  String.format("onStateChanged: %s %s",
+                                Connection.stateToString(state),
+                                getCallUUID()));
 
             if (state == STATE_DISCONNECTED) {
                 removeConnection(this);

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

@@ -16,14 +16,14 @@
 
 package org.jitsi.meet.sdk;
 
+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.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
 
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
 /**
  * Module implementing an API for sending events from JavaScript to native code.
  */
@@ -67,20 +67,16 @@ class ExternalAPIModule
      */
     @ReactMethod
     public void sendEvent(String name, ReadableMap data, String scope) {
-        // Keep track of the current ongoing conference.
-        OngoingConferenceTracker.getInstance().onExternalAPIEvent(name, data);
-
         // The JavaScript App needs to provide uniquely identifying information
         // to the native ExternalAPI module so that the latter may match the
         // former to the native BaseReactView which hosts it.
         BaseReactView view = BaseReactView.findViewByExternalAPIScope(scope);
 
         if (view != null) {
-            JitsiMeetLogger.d(TAG + " Sending event: " + name + " with data: " + data);
             try {
                 view.onExternalAPIEvent(name, data);
             } catch(Exception e) {
-                JitsiMeetLogger.e(e, TAG + " onExternalAPIEvent: error sending event");
+                Log.e(TAG, "onExternalAPIEvent: error sending event", e);
             }
         }
     }

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

@@ -1,57 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.module.annotations.ReactModule;
-import com.squareup.duktape.Duktape;
-
-@ReactModule(name = JavaScriptSandboxModule.NAME)
-class JavaScriptSandboxModule extends ReactContextBaseJavaModule {
-    public static final String NAME = "JavaScriptSandbox";
-
-    public JavaScriptSandboxModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    /**
-     * Evaluates the given code in a Duktape VM.
-     * @param code - The code that needs to evaluated.
-     * @param promise - Resolved with the output in case of success or rejected with an exception
-     *                in case of failure.
-     */
-    @ReactMethod
-    public void evaluate(String code, Promise promise) {
-        Duktape vm = Duktape.create();
-        try {
-            Object res = vm.evaluate(code);
-            promise.resolve(res.toString());
-        } catch (Throwable tr) {
-            promise.reject(tr);
-        } finally {
-            vm.close();
-        }
-    }
-
-    @Override
-    public String getName() {
-        return NAME;
-    }
-}

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

@@ -33,21 +33,9 @@ public class JitsiMeet {
     }
 
     public static void setDefaultConferenceOptions(JitsiMeetConferenceOptions options) {
-        if (options != null && options.getRoom() != null) {
-            throw new RuntimeException("'room' must be null in the default conference options");
-        }
         defaultConferenceOptions = options;
     }
 
-    /**
-     * Returns the current conference URL as a string.
-     *
-     * @return the current conference URL.
-     */
-    public static String getCurrentConference() {
-        return OngoingConferenceTracker.getInstance().getCurrentConference();
-    }
-
     /**
      * Helper to get the default conference options as a {@link Bundle}.
      *

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

@@ -20,13 +20,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
+import android.util.Log;
 
 import com.facebook.react.modules.core.PermissionListener;
 
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
 import java.util.Map;
 
 
@@ -39,8 +38,8 @@ public class JitsiMeetActivity extends FragmentActivity
 
     protected static final String TAG = JitsiMeetActivity.class.getSimpleName();
 
-    private static final String ACTION_JITSI_MEET_CONFERENCE = "org.jitsi.meet.CONFERENCE";
-    private static final String JITSI_MEET_CONFERENCE_OPTIONS = "JitsiMeetConferenceOptions";
+    public static final String ACTION_JITSI_MEET_CONFERENCE = "org.jitsi.meet.CONFERENCE";
+    public static final String JITSI_MEET_CONFERENCE_OPTIONS = "JitsiMeetConferenceOptions";
 
     // Helpers for starting the activity
     //
@@ -72,24 +71,6 @@ public class JitsiMeetActivity extends FragmentActivity
         }
     }
 
-    @Override
-    public void onDestroy() {
-        // Here we are trying to handle the following corner case: an application using the SDK
-        // is using this Activity for displaying meetings, but there is another "main" Activity
-        // with other content. If this Activity is "swiped out" from the recent list we will get
-        // Activity#onDestroy() called without warning. At this point we can try to leave the
-        // current meeting, but when our view is detached from React the JS <-> Native bridge won't
-        // be operational so the external API won't be able to notify the native side that the
-        // conference terminated. Thus, try our best to clean up.
-        leave();
-        if (AudioModeModule.useConnectionService()) {
-            ConnectionService.abortConnections();
-        }
-        JitsiMeetOngoingConferenceService.abort(this);
-
-        super.onDestroy();
-    }
-
     @Override
     public void finish() {
         leave();
@@ -162,11 +143,6 @@ public class JitsiMeetActivity extends FragmentActivity
     // Activity lifecycle methods
     //
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        JitsiMeetActivityDelegate.onActivityResult(this, requestCode, resultCode, data);
-    }
-
     @Override
     public void onBackPressed() {
         JitsiMeetActivityDelegate.onBackPressed();
@@ -174,8 +150,6 @@ public class JitsiMeetActivity extends FragmentActivity
 
     @Override
     public void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-
         JitsiMeetConferenceOptions options;
 
         if ((options = getConferenceOptions(intent)) != null) {
@@ -209,19 +183,17 @@ public class JitsiMeetActivity extends FragmentActivity
 
     @Override
     public void onConferenceJoined(Map<String, Object> data) {
-        JitsiMeetLogger.i("Conference joined: " + data);
-        // Launch the service for the ongoing notification.
-        JitsiMeetOngoingConferenceService.launch(this);
+        Log.d(TAG, "Conference joined: " + data);
     }
 
     @Override
     public void onConferenceTerminated(Map<String, Object> data) {
-        JitsiMeetLogger.i("Conference terminated: " + data);
+        Log.d(TAG, "Conference terminated: " + data);
         finish();
     }
 
     @Override
     public void onConferenceWillJoin(Map<String, Object> data) {
-        JitsiMeetLogger.i("Conference will join: " + data);
+        Log.d(TAG, "Conference will join: " + data);
     }
 }

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

@@ -25,7 +25,6 @@ import android.os.Build;
 import com.calendarevents.CalendarEventsPackage;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.PermissionListener;
 
 /**
@@ -118,13 +117,7 @@ public class JitsiMeetActivityDelegate {
             = ReactInstanceManagerHolder.getReactInstanceManager();
 
         if (reactInstanceManager != null) {
-            // Try to avoid a crash because some devices trip on this assert:
-            // https://github.com/facebook/react-native/blob/df4e67fe75d781d1eb264128cadf079989542755/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java#L512
-            // Why this happens is a mystery wrapped in an enigma.
-            ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-            if (reactContext != null && activity == reactContext.getCurrentActivity()) {
-                reactInstanceManager.onHostPause(activity);
-            }
+            reactInstanceManager.onHostPause(activity);
         }
     }
 

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

@@ -1,6 +1,6 @@
 package org.jitsi.meet.sdk;
 
-import androidx.core.app.ActivityCompat;
+import android.support.v4.app.ActivityCompat;
 
 import com.facebook.react.modules.core.PermissionAwareActivity;
 

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

@@ -54,11 +54,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
      */
     private Bundle colorScheme;
 
-    /**
-     * Feature flags. See: https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/flags/constants.js
-     */
-    private Bundle featureFlags;
-
     /**
      * Set to {@code true} to join the conference with audio / video muted or to start in audio
      * only mode respectively.
@@ -68,49 +63,10 @@ public class JitsiMeetConferenceOptions implements Parcelable {
     private Boolean videoMuted;
 
     /**
-     * USer information, to be used when no token is specified.
+     * 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 JitsiMeetUserInfo userInfo;
-
-    public URL getServerURL() {
-        return serverURL;
-    }
-
-    public String getRoom() {
-        return room;
-    }
-
-    public String getSubject() {
-        return subject;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public Bundle getColorScheme() {
-        return colorScheme;
-    }
-
-    public Bundle getFeatureFlags() {
-        return featureFlags;
-    }
-
-    public boolean getAudioMuted() {
-        return audioMuted;
-    }
-
-    public boolean getAudioOnly() {
-        return audioOnly;
-    }
-
-    public boolean getVideoMuted() {
-        return videoMuted;
-    }
-
-    public JitsiMeetUserInfo getUserInfo() {
-        return userInfo;
-    }
+    private Boolean welcomePageEnabled;
 
     /**
      * Class used to build the immutable {@link JitsiMeetConferenceOptions} object.
@@ -122,16 +78,14 @@ public class JitsiMeetConferenceOptions implements Parcelable {
         private String token;
 
         private Bundle colorScheme;
-        private Bundle featureFlags;
 
         private Boolean audioMuted;
         private Boolean audioOnly;
         private Boolean videoMuted;
 
-        private JitsiMeetUserInfo userInfo;
+        private Boolean welcomePageEnabled;
 
         public Builder() {
-            featureFlags = new Bundle();
         }
 
         /**\
@@ -232,31 +186,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
          * @return - The {@link Builder} object itself so the method calls can be chained.
          */
         public Builder setWelcomePageEnabled(boolean enabled) {
-            this.featureFlags.putBoolean("welcomepage.enabled", enabled);
-
-            return this;
-        }
-
-        public Builder setFeatureFlag(String flag, boolean value) {
-            this.featureFlags.putBoolean(flag, value);
-
-            return this;
-        }
-
-        public Builder setFeatureFlag(String flag, String value) {
-            this.featureFlags.putString(flag, value);
-
-            return this;
-        }
-
-        public Builder setFeatureFlag(String flag, int value) {
-            this.featureFlags.putInt(flag, value);
-
-            return this;
-        }
-
-        public Builder setUserInfo(JitsiMeetUserInfo userInfo) {
-            this.userInfo = userInfo;
+            this.welcomePageEnabled = enabled;
 
             return this;
         }
@@ -274,11 +204,10 @@ public class JitsiMeetConferenceOptions implements Parcelable {
             options.subject = this.subject;
             options.token = this.token;
             options.colorScheme = this.colorScheme;
-            options.featureFlags = this.featureFlags;
             options.audioMuted = this.audioMuted;
             options.audioOnly = this.audioOnly;
             options.videoMuted = this.videoMuted;
-            options.userInfo = this.userInfo;
+            options.welcomePageEnabled = this.welcomePageEnabled;
 
             return options;
         }
@@ -292,30 +221,30 @@ public class JitsiMeetConferenceOptions implements Parcelable {
         subject = in.readString();
         token = in.readString();
         colorScheme = in.readBundle();
-        featureFlags = in.readBundle();
-        userInfo = new JitsiMeetUserInfo(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();
 
-        // Android always has the PiP flag set by default.
-        if (!featureFlags.containsKey("pip.enabled")) {
-            featureFlags.putBoolean("pip.enabled", true);
-        }
-
-        props.putBundle("flags", featureFlags);
-
         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) {
@@ -349,10 +278,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
             urlProps.putString("jwt", token);
         }
 
-        if (token == null && userInfo != null) {
-            props.putBundle("userInfo", userInfo.asBundle());
-        }
-
         urlProps.putBundle("config", config);
         props.putBundle("url", urlProps);
 
@@ -380,11 +305,10 @@ public class JitsiMeetConferenceOptions implements Parcelable {
         dest.writeString(subject);
         dest.writeString(token);
         dest.writeBundle(colorScheme);
-        dest.writeBundle(featureFlags);
-        dest.writeBundle(userInfo != null ? userInfo.asBundle() : new Bundle());
         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

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

@@ -19,14 +19,15 @@ package org.jitsi.meet.sdk;
 
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
+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

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

@@ -1,121 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import android.app.Notification;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.IBinder;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-
-/**
- * This class implements an Android {@link Service}, a foreground one specifically, and it's
- * responsible for presenting an ongoing notification when a conference is in progress.
- * The service will help keep the app running while in the background.
- *
- * See: https://developer.android.com/guide/components/services
- */
-public class JitsiMeetOngoingConferenceService extends Service
-        implements OngoingConferenceTracker.OngoingConferenceListener {
-    private static final String TAG = JitsiMeetOngoingConferenceService.class.getSimpleName();
-
-    static final class Actions {
-        static final String START = TAG + ":START";
-        static final String HANGUP = TAG + ":HANGUP";
-    }
-
-    static void launch(Context context) {
-        OngoingNotification.createOngoingConferenceNotificationChannel();
-
-        Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
-        intent.setAction(Actions.START);
-
-        ComponentName componentName;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            componentName = context.startForegroundService(intent);
-        } else {
-            componentName = context.startService(intent);
-        }
-        if (componentName == null) {
-            JitsiMeetLogger.w(TAG + " Ongoing conference service not started");
-        }
-    }
-
-    static void abort(Context context) {
-        Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
-        context.stopService(intent);
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        OngoingConferenceTracker.getInstance().addListener(this);
-    }
-
-    @Override
-    public void onDestroy() {
-        OngoingConferenceTracker.getInstance().removeListener(this);
-
-        super.onDestroy();
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        final String action = intent.getAction();
-        if (Actions.START.equals(action)) {
-            Notification notification = OngoingNotification.buildOngoingConferenceNotification();
-            if (notification == null) {
-                stopSelf();
-                JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
-            } else {
-                startForeground(OngoingNotification.NOTIFICATION_ID, notification);
-                JitsiMeetLogger.i(TAG + " Service started");
-            }
-        } else if (Actions.HANGUP.equals(action)) {
-            JitsiMeetLogger.i(TAG + " Hangup requested");
-            // Abort all ongoing calls
-            if (AudioModeModule.useConnectionService()) {
-                ConnectionService.abortConnections();
-            }
-            stopSelf();
-        } else {
-            JitsiMeetLogger.w(TAG + " Unknown action received: " + action);
-            stopSelf();
-        }
-
-        return START_NOT_STICKY;
-    }
-
-    @Override
-    public void onCurrentConferenceChanged(String conferenceUrl) {
-        if (conferenceUrl == null) {
-            stopSelf();
-            JitsiMeetLogger.i(TAG + "Service stopped");
-        }
-    }
-}

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

@@ -1,51 +0,0 @@
-/*
- * 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 org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-class JitsiMeetUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
-    private final Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler;
-
-    public static void register() {
-        Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
-
-        JitsiMeetUncaughtExceptionHandler uncaughtExceptionHandler
-            = new JitsiMeetUncaughtExceptionHandler(defaultUncaughtExceptionHandler);
-
-        Thread.setDefaultUncaughtExceptionHandler(uncaughtExceptionHandler);
-    }
-
-    private JitsiMeetUncaughtExceptionHandler(Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler) {
-        this.defaultUncaughtExceptionHandler = defaultUncaughtExceptionHandler;
-    }
-
-    @Override
-    public void uncaughtException(Thread t, Throwable e) {
-        JitsiMeetLogger.e(e, this.getClass().getSimpleName() + " FATAL ERROR");
-
-        // Abort all ConnectionService ongoing calls
-        if (AudioModeModule.useConnectionService()) {
-            ConnectionService.abortConnections();
-        }
-
-        if (defaultUncaughtExceptionHandler != null) {
-            defaultUncaughtExceptionHandler.uncaughtException(t, e);
-        }
-    }
-}

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

@@ -1,107 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import android.os.Bundle;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-/**
- * This class represents user information to be passed to {@link JitsiMeetConferenceOptions} for
- * identifying a user.
- */
-public class JitsiMeetUserInfo {
-    /**
-     * User's display name.
-     */
-    private String displayName;
-
-    /**
-     * User's email address.
-     */
-    private String email;
-
-    /**
-     * User's avatar URL.
-     */
-    private URL avatar;
-
-    public JitsiMeetUserInfo() {}
-
-    public JitsiMeetUserInfo(Bundle b) {
-        super();
-
-        if (b.containsKey("displayName")) {
-            displayName = b.getString("displayName");
-        }
-
-        if (b.containsKey("email")) {
-            email = b.getString("email");
-        }
-
-        if (b.containsKey("avatarURL")) {
-            String avatarURL = b.getString("avatarURL");
-            try {
-                avatar = new URL(avatarURL);
-            } catch (MalformedURLException e) {
-            }
-        }
-    }
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public URL getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(URL avatar) {
-        this.avatar = avatar;
-    }
-
-    Bundle asBundle() {
-        Bundle b = new Bundle();
-
-        if (displayName != null) {
-            b.putString("displayName", displayName);
-        }
-
-        if (email != null) {
-            b.putString("email", email);
-        }
-
-        if (avatar != null) {
-            b.putString("avatarURL", avatar.toString());
-        }
-
-        return b;
-    }
-}

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

@@ -19,19 +19,17 @@ package org.jitsi.meet.sdk;
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Log;
 
 import com.facebook.react.bridge.ReadableMap;
 
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
 import java.lang.reflect.Method;
 import java.util.Map;
 
 
-public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
-        implements OngoingConferenceTracker.OngoingConferenceListener {
+public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener> {
 
     /**
      * The {@code Method}s of {@code JitsiMeetViewListener} by event name i.e.
@@ -40,6 +38,12 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
     private static final Map<String, Method> LISTENER_METHODS
         = ListenerUtils.mapListenerMethods(JitsiMeetViewListener.class);
 
+    /**
+     * The {@link Log} tag which identifies the source of the log messages of
+     * {@code JitsiMeetView}.
+     */
+    private static final String TAG = JitsiMeetView.class.getSimpleName();
+
     /**
      * The URL of the current conference.
      */
@@ -102,14 +106,6 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
         if (!(context instanceof JitsiMeetActivityInterface)) {
             throw new RuntimeException("Enclosing Activity must implement JitsiMeetActivityInterface");
         }
-
-        OngoingConferenceTracker.getInstance().addListener(this);
-    }
-
-    @Override
-    public void dispose() {
-        OngoingConferenceTracker.getInstance().removeListener(this);
-        super.dispose();
     }
 
     /**
@@ -132,7 +128,7 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
             try {
                 pipModule.enterPictureInPicture();
             } catch (RuntimeException re) {
-                JitsiMeetLogger.e(re, "Failed to enter PiP mode");
+                Log.e(TAG, "failed to enter PiP mode", re);
             }
         }
     }
@@ -177,17 +173,27 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
     }
 
     /**
-     * Handler for {@link OngoingConferenceTracker} events.
-     * @param conferenceUrl
+     * The internal processing for the URL of the current conference set on the
+     * associated {@link JitsiMeetView}.
+     *
+     * @param eventName the name of the external API event to be processed
+     * @param eventData the details/specifics of the event to process determined
+     * by/associated with the specified {@code eventName}.
      */
-    @Override
-    public void onCurrentConferenceChanged(String conferenceUrl) {
-        // This property 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
-        // reduce these delays do not wait for the call to be transferred to the
-        // UI thread.
-        this.url = conferenceUrl;
+    private void maybeSetViewURL(String eventName, ReadableMap eventData) {
+        String url = eventData.getString("url");
+
+        switch(eventName) {
+        case "CONFERENCE_WILL_JOIN":
+            this.url = url;
+            break;
+
+        case "CONFERENCE_TERMINATED":
+            if (url != null && url.equals(this.url)) {
+                this.url = null;
+            }
+            break;
+        }
     }
 
     /**
@@ -199,6 +205,13 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
      */
     @Override
     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
+        // reduce these delays do not wait for the call to be transferred to the
+        // UI thread.
+        maybeSetViewURL(name, data);
+
         onExternalAPIEvent(LISTENER_METHODS, name, data);
     }
 }

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

@@ -1,73 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.module.annotations.ReactModule;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-import javax.annotation.Nonnull;
-
-/**
- * Module implementing a "bridge" between the JS loggers and the native one.
- */
-@ReactModule(name = LogBridgeModule.NAME)
-class LogBridgeModule extends ReactContextBaseJavaModule {
-    public static final String NAME = "LogBridge";
-
-    public LogBridgeModule(@Nonnull ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    @Override
-    public String getName() {
-        return NAME;
-    }
-
-    @ReactMethod
-    public void trace(final String message) {
-        JitsiMeetLogger.v(message);
-    }
-
-    @ReactMethod
-    public void debug(final String message) {
-        JitsiMeetLogger.d(message);
-    }
-
-    @ReactMethod
-    public void info(final String message) {
-        JitsiMeetLogger.i(message);
-    }
-
-    @ReactMethod
-    public void log(final String message) {
-        JitsiMeetLogger.i(message);
-    }
-
-    @ReactMethod
-    public void warn(final String message) {
-        JitsiMeetLogger.w(message);
-    }
-
-    @ReactMethod
-    public void error(final String message) {
-        JitsiMeetLogger.e(message);
-    }
-}

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

@@ -1,99 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import com.facebook.react.bridge.ReadableMap;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-
-
-/**
- * Helper class to keep track of what the current conference is.
- */
-class OngoingConferenceTracker {
-    private static final OngoingConferenceTracker instance = new OngoingConferenceTracker();
-
-    private static final String CONFERENCE_WILL_JOIN = "CONFERENCE_WILL_JOIN";
-    private static final String CONFERENCE_TERMINATED = "CONFERENCE_TERMINATED";
-
-    private final Collection<OngoingConferenceListener> listeners =
-        Collections.synchronizedSet(new HashSet<OngoingConferenceListener>());
-    private String currentConference;
-
-    public OngoingConferenceTracker() {
-    }
-
-    public static OngoingConferenceTracker getInstance() {
-        return instance;
-    }
-
-    /**
-     * Gets the current active conference URL.
-     *
-     * @return - The current conference URL as a String.
-     */
-    synchronized String getCurrentConference() {
-        return currentConference;
-    }
-
-    synchronized void onExternalAPIEvent(String name, ReadableMap data) {
-        if (!data.hasKey("url")) {
-            return;
-        }
-
-        String url = data.getString("url");
-        if (url == null) {
-            return;
-        }
-
-        switch(name) {
-            case CONFERENCE_WILL_JOIN:
-                currentConference = url;
-                updateListeners();
-                break;
-
-            case CONFERENCE_TERMINATED:
-                if (url.equals(currentConference)) {
-                    currentConference = null;
-                    updateListeners();
-                }
-                break;
-        }
-    }
-
-    void addListener(OngoingConferenceListener listener) {
-        listeners.add(listener);
-    }
-
-    void removeListener(OngoingConferenceListener listener) {
-        listeners.remove(listener);
-    }
-
-    private void updateListeners() {
-        synchronized (listeners) {
-            for (OngoingConferenceListener listener : listeners) {
-                listener.onCurrentConferenceChanged(currentConference);
-            }
-        }
-    }
-
-    public interface OngoingConferenceListener {
-        void onCurrentConferenceChanged(String conferenceUrl);
-    }
-}

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

@@ -1,119 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import androidx.core.app.NotificationCompat;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-import java.util.Random;
-
-
-/**
- * Helper class for creating the ongoing notification which is used with
- * {@link JitsiMeetOngoingConferenceService}. It allows the user to easily get back to the app
- * and to hangup from within the notification itself.
- */
-class OngoingNotification {
-    private static final String TAG = OngoingNotification.class.getSimpleName();
-
-    private static final String CHANNEL_ID = "JitsiNotificationChannel";
-    private static final String CHANNEL_NAME = "Ongoing Conference Notifications";
-
-    static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
-
-
-    static void createOngoingConferenceNotificationChannel() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
-        }
-
-        Context context = ReactInstanceManagerHolder.getCurrentActivity();
-        if (context == null) {
-            JitsiMeetLogger.w(TAG + " Cannot create notification channel: no current context");
-            return;
-        }
-
-        NotificationManager notificationManager
-            = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
-
-        NotificationChannel channel
-            = notificationManager.getNotificationChannel(CHANNEL_ID);
-        if (channel != null) {
-            // The channel was already created, no need to do it again.
-            return;
-        }
-
-        channel = new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT);
-        channel.enableLights(false);
-        channel.enableVibration(false);
-        channel.setShowBadge(false);
-
-        notificationManager.createNotificationChannel(channel);
-    }
-
-    static Notification buildOngoingConferenceNotification() {
-        Context context = ReactInstanceManagerHolder.getCurrentActivity();
-        if (context == null) {
-            JitsiMeetLogger.w(TAG + " Cannot create notification: no current context");
-            return null;
-        }
-
-        Intent notificationIntent = new Intent(context, context.getClass());
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, 0);
-
-        NotificationCompat.Builder builder;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            builder = new NotificationCompat.Builder(context, CHANNEL_ID);
-        } else {
-            builder = new NotificationCompat.Builder(context);
-        }
-
-        builder
-            .setCategory(NotificationCompat.CATEGORY_CALL)
-            .setContentTitle(context.getString(R.string.ongoing_notification_title))
-            .setContentText(context.getString(R.string.ongoing_notification_text))
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setContentIntent(pendingIntent)
-            .setOngoing(true)
-            .setAutoCancel(false)
-            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-            .setUsesChronometer(true)
-            .setOnlyAlertOnce(true)
-            .setSmallIcon(context.getResources().getIdentifier("ic_notification", "drawable", context.getPackageName()));
-
-        // Add a "hang-up" action only if we are using ConnectionService.
-        if (AudioModeModule.useConnectionService()) {
-            Intent hangupIntent = new Intent(context, JitsiMeetOngoingConferenceService.class);
-            hangupIntent.setAction(JitsiMeetOngoingConferenceService.Actions.HANGUP);
-            PendingIntent hangupPendingIntent
-                = PendingIntent.getService(context, 0, hangupIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-            NotificationCompat.Action hangupAction = new NotificationCompat.Action(0, "Hang up", hangupPendingIntent);
-
-            builder.addAction(hangupAction);
-        }
-
-        return builder.build();
-    }
-}

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

@@ -20,6 +20,7 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.PictureInPictureParams;
 import android.os.Build;
+import android.util.Log;
 import android.util.Rational;
 
 import com.facebook.react.bridge.Promise;
@@ -28,8 +29,6 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.module.annotations.ReactModule;
 
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
 @ReactModule(name = PictureInPictureModule.NAME)
 class PictureInPictureModule
     extends ReactContextBaseJavaModule {
@@ -71,7 +70,7 @@ class PictureInPictureModule
             throw new IllegalStateException("No current Activity!");
         }
 
-        JitsiMeetLogger.i(TAG + " Entering Picture-in-Picture");
+        Log.d(TAG, "Entering Picture-in-Picture");
 
         PictureInPictureParams.Builder builder
             = new PictureInPictureParams.Builder()

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

@@ -5,12 +5,13 @@ 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 androidx.annotation.RequiresApi;
+import android.util.Log;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -19,8 +20,6 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
 
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
 /**
  * The react-native side of Jitsi Meet's {@link ConnectionService}. Exposes
  * the Java Script API.
@@ -75,11 +74,11 @@ class RNConnectionService
             String handle,
             boolean hasVideo,
             Promise promise) {
-        JitsiMeetLogger.d("%s startCall UUID=%s, h=%s, v=%s",
-                            TAG,
+        Log.d(TAG,
+              String.format("startCall UUID=%s, h=%s, v=%s",
                             callUUID,
                             handle,
-                            hasVideo);
+                            hasVideo));
 
         ReactApplicationContext ctx = getReactApplicationContext();
 
@@ -119,7 +118,7 @@ class RNConnectionService
      */
     @ReactMethod
     public void reportCallFailed(String callUUID) {
-        JitsiMeetLogger.d(TAG + " reportCallFailed " + callUUID);
+        Log.d(TAG, "reportCallFailed " + callUUID);
         ConnectionService.setConnectionDisconnected(
                 callUUID,
                 new DisconnectCause(DisconnectCause.ERROR));
@@ -132,7 +131,7 @@ class RNConnectionService
      */
     @ReactMethod
     public void endCall(String callUUID) {
-        JitsiMeetLogger.d(TAG + " endCall " + callUUID);
+        Log.d(TAG, "endCall " + callUUID);
         ConnectionService.setConnectionDisconnected(
                 callUUID,
                 new DisconnectCause(DisconnectCause.LOCAL));
@@ -144,10 +143,9 @@ class RNConnectionService
      * @param callUUID - the call's UUID.
      */
     @ReactMethod
-    public void reportConnectedOutgoingCall(String callUUID, Promise promise) {
-        JitsiMeetLogger.d(TAG + " reportConnectedOutgoingCall " + callUUID);
+    public void reportConnectedOutgoingCall(String callUUID) {
+        Log.d(TAG, "reportConnectedOutgoingCall " + callUUID);
         ConnectionService.setConnectionActive(callUUID);
-        promise.resolve(null);
     }
 
     @Override

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

@@ -17,8 +17,8 @@
 
 package org.jitsi.meet.sdk;
 
-import android.app.Activity;
-import androidx.annotation.Nullable;
+import android.app.Application;
+import android.support.annotation.Nullable;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
@@ -27,20 +27,7 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.devsupport.DevInternalSettings;
-import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.facebook.react.uimanager.ViewManager;
-import com.facebook.soloader.SoLoader;
-import com.oney.WebRTCModule.RTCVideoViewManager;
-import com.oney.WebRTCModule.WebRTCModule;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-import org.webrtc.SoftwareVideoDecoderFactory;
-import org.webrtc.SoftwareVideoEncoderFactory;
-import org.webrtc.VideoDecoderFactory;
-import org.webrtc.VideoEncoderFactory;
-import org.webrtc.audio.AudioDeviceModule;
-import org.webrtc.audio.JavaAudioDeviceModule;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -59,7 +46,8 @@ class ReactInstanceManagerHolder {
      */
     private static ReactInstanceManager reactInstanceManager;
 
-    private static List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+    private static List<NativeModule> createNativeModules(
+            ReactApplicationContext reactContext) {
         List<NativeModule> nativeModules
             = new ArrayList<>(Arrays.<NativeModule>asList(
                 new AndroidSettingsModule(reactContext),
@@ -67,9 +55,7 @@ class ReactInstanceManagerHolder {
                 new AudioModeModule(reactContext),
                 new DropboxModule(reactContext),
                 new ExternalAPIModule(reactContext),
-                new JavaScriptSandboxModule(reactContext),
                 new LocaleDetector(reactContext),
-                new LogBridgeModule(reactContext),
                 new PictureInPictureModule(reactContext),
                 new ProximityModule(reactContext),
                 new WiFiStatsModule(reactContext),
@@ -79,21 +65,6 @@ class ReactInstanceManagerHolder {
             nativeModules.add(new RNConnectionService(reactContext));
         }
 
-        // Initialize the WebRTC module by hand, since we want to override some
-        // initialization options.
-        WebRTCModule.Options options = new WebRTCModule.Options();
-
-        AudioDeviceModule adm = JavaAudioDeviceModule.builder(reactContext)
-            .createAudioDeviceModule();
-        VideoDecoderFactory videoDecoderFactory = new SoftwareVideoDecoderFactory();
-        VideoEncoderFactory videoEncoderFactory = new SoftwareVideoEncoderFactory();
-
-        options.setAudioDeviceModule(adm);
-        options.setVideoDecoderFactory(videoDecoderFactory);
-        options.setVideoEncoderFactory(videoEncoderFactory);
-
-        nativeModules.add(new WebRTCModule(reactContext, options));
-
         try {
             Class<?> amplitudeModuleClass = Class.forName("org.jitsi.meet.sdk.AmplitudeModule");
             Constructor constructor = amplitudeModuleClass.getConstructor(ReactApplicationContext.class);
@@ -105,13 +76,6 @@ class ReactInstanceManagerHolder {
         return nativeModules;
     }
 
-    private static List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Arrays.<ViewManager>asList(
-            // WebRTC, see createNativeModules for details.
-            new RTCVideoViewManager()
-        );
-    }
-
     /**
      * Helper function to send an event to JavaScript.
      *
@@ -156,18 +120,6 @@ class ReactInstanceManagerHolder {
                 ? reactContext.getNativeModule(nativeModuleClass) : null;
     }
 
-    /**
-     * Gets the current {@link Activity} linked to React Native.
-     *
-     * @return An activity attached to React Native.
-     */
-    static Activity getCurrentActivity() {
-        ReactContext reactContext
-            = reactInstanceManager != null
-            ? reactInstanceManager.getCurrentReactContext() : null;
-        return reactContext != null ? reactContext.getCurrentActivity() : null;
-    }
-
     static ReactInstanceManager getReactInstanceManager() {
         return reactInstanceManager;
     }
@@ -178,25 +130,24 @@ class ReactInstanceManagerHolder {
      * time. All {@code ReactRootView} instances will be tied to the one and
      * only {@code ReactInstanceManager}.
      *
-     * @param activity {@code Activity} current running Activity.
+     * @param application {@code Application} instance which is running.
      */
-    static void initReactInstanceManager(Activity activity) {
+    static void initReactInstanceManager(Application application) {
         if (reactInstanceManager != null) {
             return;
         }
 
-        SoLoader.init(activity, /* native exopackage */ false);
-
         List<ReactPackage> packages
             = new ArrayList<>(Arrays.asList(
                 new com.BV.LinearGradient.LinearGradientPackage(),
                 new com.calendarevents.CalendarEventsPackage(),
                 new com.corbt.keepawake.KCKeepAwakePackage(),
+                new com.dylanvann.fastimage.FastImageViewPackage(),
                 new com.facebook.react.shell.MainReactPackage(),
-                new com.horcrux.svg.SvgPackage(),
+                new com.oblador.vectoricons.VectorIconsPackage(),
                 new com.ocetnik.timer.BackgroundTimerPackage(),
+                new com.oney.WebRTCModule.WebRTCModulePackage(),
                 new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
-                new com.reactnativecommunity.netinfo.NetInfoPackage(),
                 new com.reactnativecommunity.webview.RNCWebViewPackage(),
                 new com.rnimmersive.RNImmersivePackage(),
                 new com.zmxv.RNSound.RNSoundPackage(),
@@ -205,10 +156,6 @@ class ReactInstanceManagerHolder {
                     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
                         return ReactInstanceManagerHolder.createNativeModules(reactContext);
                     }
-                    @Override
-                    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-                        return ReactInstanceManagerHolder.createViewManagers(reactContext);
-                    }
                 }));
 
         try {
@@ -219,17 +166,11 @@ class ReactInstanceManagerHolder {
             // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
         }
 
-        // Keep on using JSC, the jury is out on Hermes.
-        JSCExecutorFactory jsFactory
-            = new JSCExecutorFactory("", "");
-
         reactInstanceManager
             = ReactInstanceManager.builder()
-                .setApplication(activity.getApplication())
-                .setCurrentActivity(activity)
+                .setApplication(application)
                 .setBundleAssetName("index.android.bundle")
                 .setJSMainModulePath("index.android")
-                .setJavaScriptExecutorFactory(jsFactory)
                 .addPackages(packages)
                 .setUseDeveloperSupport(BuildConfig.DEBUG)
                 .setInitialLifecycleState(LifecycleState.RESUMED)
@@ -241,8 +182,5 @@ class ReactInstanceManagerHolder {
         if (devSettings != null) {
             devSettings.setBundleDeltasEnabled(false);
         }
-
-        // Register our uncaught exception handler.
-        JitsiMeetUncaughtExceptionHandler.register();
     }
 }

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

@@ -19,6 +19,7 @@ package org.jitsi.meet.sdk;
 import android.content.Context;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.util.Log;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -26,7 +27,6 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.module.annotations.ReactModule;
 
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -144,7 +144,8 @@ class WiFiStatsModule
                     JSONObject result = new JSONObject();
                     result.put("rssi", rssi)
                         .put("signal", signalLevel)
-                        .put("timestamp", System.currentTimeMillis());
+                        .put("timestamp",
+                                String.valueOf(System.currentTimeMillis()));
 
                     JSONArray addresses = new JSONArray();
 
@@ -184,15 +185,17 @@ class WiFiStatsModule
 
                         }
                     } catch (SocketException e) {
-                        JitsiMeetLogger.e(e, TAG + " Unable to NetworkInterface.getNetworkInterfaces()");
+                        Log.wtf(TAG,
+                            "Unable to NetworkInterface.getNetworkInterfaces()"
+                        );
                     }
 
                     result.put("addresses", addresses);
                     promise.resolve(result.toString());
 
-                    JitsiMeetLogger.d(TAG + " WiFi stats: " + result.toString());
+                    Log.d(TAG, "WiFi stats: " + result.toString());
                 } catch (Throwable e) {
-                    JitsiMeetLogger.e(e, TAG + " Failed to obtain wifi stats");
+                    Log.e(TAG, "Failed to obtain wifi stats", e);
                     promise.reject(
                         new Exception("Failed to obtain wifi stats"));
                 }

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

@@ -16,7 +16,7 @@
 
 package org.jitsi.meet.sdk.incoming_call;
 
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
 public class IncomingCallInfo {
     /**

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

@@ -18,7 +18,7 @@ package org.jitsi.meet.sdk.incoming_call;
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
 import com.facebook.react.bridge.ReadableMap;
 

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

@@ -1,49 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk.log;
-
-import android.util.Log;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.text.MessageFormat;
-
-import timber.log.Timber;
-
-/**
- * Base class for all custom log handlers. Implementations must inherit from this class and
- * implement a `doLog` method which does the actual logging, in addition with a `getTag` method
- * with which to tag all logs coming into this logger.
- *
- * See {@link JitsiMeetDefaultLogHandler} for an example.
- */
-public abstract class JitsiMeetBaseLogHandler extends Timber.Tree {
-    @Override
-    protected void log(int priority, @Nullable String tag, @NotNull String msg, @Nullable Throwable t) {
-        String errmsg = Log.getStackTraceString(t);
-        if (errmsg.isEmpty()) {
-            doLog(priority, getDefaultTag(), msg);
-        } else {
-            doLog(priority, getDefaultTag(), MessageFormat.format("{0}\n{1}", msg, errmsg));
-        }
-    }
-
-    protected abstract void doLog(int priority, @NotNull String tag, @NotNull String msg);
-
-    protected abstract String getDefaultTag();
-}

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

@@ -1,39 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk.log;
-
-import android.util.Log;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Default implementation of a {@link JitsiMeetBaseLogHandler}. This is the main SDK logger, which
- * logs using the Android util.Log module.
- */
-public class JitsiMeetDefaultLogHandler extends JitsiMeetBaseLogHandler {
-    private static final String TAG = "JitsiMeetSDK";
-
-    @Override
-    protected void doLog(int priority, @NotNull String tag, @NotNull String msg) {
-        Log.println(priority, tag, msg);
-    }
-
-    @Override
-    protected String getDefaultTag() {
-        return TAG;
-    }
-}

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

@@ -1,94 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk.log;
-
-import timber.log.Timber;
-
-public class JitsiMeetLogger {
-    static {
-        addHandler(new JitsiMeetDefaultLogHandler());
-    }
-
-    public static void addHandler(JitsiMeetBaseLogHandler handler) {
-        Timber.plant(handler);
-    }
-
-    public static void removeHandler(JitsiMeetBaseLogHandler handler) {
-        Timber.uproot(handler);
-    }
-
-    public static void v(String message, Object... args) {
-        Timber.v(message, args);
-    }
-
-    public static void v(Throwable t, String message, Object... args) {
-        Timber.v(t, message, args);
-    }
-
-    public static void v(Throwable t) {
-        Timber.v(t);
-    }
-
-    public static void d(String message, Object... args) {
-        Timber.d(message, args);
-    }
-
-    public static void d(Throwable t, String message, Object... args) {
-        Timber.d(t, message, args);
-    }
-
-    public static void d(Throwable t) {
-        Timber.d(t);
-    }
-
-    public static void i(String message, Object... args) {
-        Timber.i(message, args);
-    }
-
-    public static void i(Throwable t, String message, Object... args) {
-        Timber.i(t, message, args);
-    }
-
-    public static void i(Throwable t) {
-        Timber.i(t);
-    }
-
-    public static void w(String message, Object... args) {
-        Timber.w(message, args);
-    }
-
-    public static void w(Throwable t, String message, Object... args) {
-        Timber.w(t, message, args);
-    }
-
-    public static void w(Throwable t) {
-        Timber.w(t);
-    }
-
-    public static void e(String message, Object... args) {
-        Timber.e(message, args);
-    }
-
-    public static void e(Throwable t, String message, Object... args) {
-        Timber.e(t, message, args);
-    }
-
-    public static void e(Throwable t) {
-        Timber.e(t);
-    }
-
-}

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

@@ -15,14 +15,14 @@
  */
 package org.jitsi.meet.sdk.net;
 
+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.module.annotations.ReactModule;
 
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
 import java.net.UnknownHostException;
 
 /**
@@ -43,7 +43,7 @@ public class NAT64AddrInfoModule
      * The host for which the module wil try to resolve both IPv4 and IPv6
      * addresses in order to figure out the NAT64 prefix.
      */
-    private final static String HOST = "ipv4only.arpa";
+    private final static String HOST = "nat64.jitsi.net";
 
     /**
      * How long is the {@link NAT64AddrInfo} instance valid.
@@ -97,7 +97,7 @@ public class NAT64AddrInfoModule
             try {
                 info = NAT64AddrInfo.discover(host);
             } catch (UnknownHostException e) {
-                JitsiMeetLogger.e(e, TAG + " NAT64AddrInfo.discover: " + host);
+                Log.e(TAG, "NAT64AddrInfo.discover: " + host, e);
             }
             infoTimestamp = System.currentTimeMillis();
         }
@@ -107,7 +107,7 @@ public class NAT64AddrInfoModule
         try {
             result = info == null ? null : info.getIPv6Address(ipv4Address);
         } catch (IllegalArgumentException exc) {
-            JitsiMeetLogger.e(exc, TAG + " Failed to get IPv6 address for: " + ipv4Address);
+            Log.e(TAG, "Failed to get IPv6 address for: " + ipv4Address, exc);
 
             // We don't want to reject. It's not a big deal if there's no IPv6
             // address resolved.

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

@@ -1,6 +1,4 @@
 <resources>
     <string name="app_name">Jitsi Meet SDK</string>
     <string name="dropbox_app_key"></string>
-    <string name="ongoing_notification_title">Ongoing meeting</string>
-    <string name="ongoing_notification_text">You are currently in a meeting. Tap to return to it.</string>
 </resources>

android/settings.gradle

@@ -7,10 +7,10 @@ include ':react-native-calendar-events'
 project(':react-native-calendar-events').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-calendar-events/android')
 include ':react-native-community-async-storage'
 project(':react-native-community-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android')
-include ':react-native-community_netinfo'
-project(':react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')
+include ':react-native-fast-image'
+project(':react-native-fast-image').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fast-image/android')
 include ':react-native-google-signin'
-project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/google-signin/android')
+project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-signin/android')
 include ':react-native-immersive'
 project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
 include ':react-native-keep-awake'
@@ -19,8 +19,8 @@ include ':react-native-linear-gradient'
 project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
 include ':react-native-sound'
 project(':react-native-sound').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sound/android')
-include ':react-native-svg'
-project(':react-native-svg').projectDir = new File(rootProject.projectDir, 	'../node_modules/react-native-svg/android')
+include ':react-native-vector-icons'
+project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 include ':react-native-webrtc'
 project(':react-native-webrtc').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webrtc/android')
 include ':react-native-webview'

conference.js

@@ -16,15 +16,13 @@ import * as JitsiMeetConferenceEvents from './ConferenceEvents';
 
 import {
     createDeviceChangedEvent,
-    createStartSilentEvent,
     createScreenSharingEvent,
     createStreamSwitchDelayEvent,
     createTrackMutedEvent,
     sendAnalytics
 } from './react/features/analytics';
 import {
-    maybeRedirectToWelcomePage,
-    redirectToStaticPage,
+    redirectWithStoredParams,
     reloadWithStoredParams
 } from './react/features/app';
 
@@ -44,7 +42,6 @@ import {
     conferenceWillJoin,
     conferenceWillLeave,
     dataChannelOpened,
-    kickedOut,
     lockStateChanged,
     onStartMutedPolicyChanged,
     p2pStatusChanged,
@@ -81,14 +78,13 @@ import {
 import { showNotification } from './react/features/notifications';
 import {
     dominantSpeakerChanged,
+    getAvatarURLByParticipantId,
     getLocalParticipant,
     getNormalizedDisplayName,
     getParticipantById,
     localParticipantConnectionStatusChanged,
     localParticipantRoleChanged,
     participantConnectionStatusChanged,
-    participantKicked,
-    participantMutedUs,
     participantPresenceChanged,
     participantRoleChanged,
     participantUpdated
@@ -98,21 +94,27 @@ import {
     createLocalTracksF,
     destroyLocalTracks,
     isLocalTrackMuted,
-    isUserInteractionRequiredForUnmute,
     replaceLocalTrack,
     trackAdded,
     trackRemoved
 } from './react/features/base/tracks';
-import { getJitsiMeetGlobalNS } from './react/features/base/util';
+import {
+    getLocationContextRoot,
+    getJitsiMeetGlobalNS
+} from './react/features/base/util';
+import { addMessage } from './react/features/chat';
 import { showDesktopPicker } from './react/features/desktop-picker';
 import { appendSuffix } from './react/features/display-name';
 import {
     maybeOpenFeedbackDialog,
     submitFeedback
 } from './react/features/feedback';
-import { mediaPermissionPromptVisibilityChanged } from './react/features/overlay';
-import { suspendDetected } from './react/features/power-monitor';
+import {
+    mediaPermissionPromptVisibilityChanged,
+    suspendDetected
+} from './react/features/overlay';
 import { setSharedVideoStatus } from './react/features/shared-video';
+import { isButtonEnabled } from './react/features/toolbox';
 import { endpointMessageReceived } from './react/features/subtitles';
 
 const logger = require('jitsi-meet-logger').getLogger(__filename);
@@ -206,6 +208,77 @@ function muteLocalVideo(muted) {
     APP.store.dispatch(setVideoMuted(muted));
 }
 
+/**
+ * Check if the welcome page is enabled and redirects to it.
+ * If requested show a thank you dialog before that.
+ * If we have a close page enabled, redirect to it without
+ * showing any other dialog.
+ *
+ * @param {object} options used to decide which particular close page to show
+ * or if close page is disabled, whether we should show the thankyou dialog
+ * @param {boolean} options.showThankYou - whether we should
+ * show thank you dialog
+ * @param {boolean} options.feedbackSubmitted - whether feedback was submitted
+ */
+function maybeRedirectToWelcomePage(options) {
+    // if close page is enabled redirect to it, without further action
+    if (config.enableClosePage) {
+        const { isGuest } = APP.store.getState()['features/base/jwt'];
+
+        // save whether current user is guest or not, before navigating
+        // to close page
+        window.sessionStorage.setItem('guest', isGuest);
+        redirectToStaticPage(`static/${
+            options.feedbackSubmitted ? 'close.html' : 'close2.html'}`);
+
+        return;
+    }
+
+    // else: show thankYou dialog only if there is no feedback
+    if (options.showThankYou) {
+        APP.store.dispatch(showNotification({
+            titleArguments: { appName: interfaceConfig.APP_NAME },
+            titleKey: 'dialog.thankYou'
+        }));
+    }
+
+    // if Welcome page is enabled redirect to welcome page after 3 sec, if
+    // there is a thank you message to be shown, 0.5s otherwise.
+    if (config.enableWelcomePage) {
+        setTimeout(
+            () => {
+                APP.store.dispatch(redirectWithStoredParams('/'));
+            },
+            options.showThankYou ? 3000 : 500);
+    }
+}
+
+/**
+ * Assigns a specific pathname to window.location.pathname taking into account
+ * the context root of the Web app.
+ *
+ * @param {string} pathname - The pathname to assign to
+ * window.location.pathname. If the specified pathname is relative, the context
+ * root of the Web app will be prepended to the specified pathname before
+ * assigning it to window.location.pathname.
+ * @return {void}
+ */
+function redirectToStaticPage(pathname) {
+    const windowLocation = window.location;
+    let newPathname = pathname;
+
+    if (!newPathname.startsWith('/')) {
+        // A pathname equal to ./ specifies the current directory. It will be
+        // fine but pointless to include it because contextRoot is the current
+        // directory.
+        newPathname.startsWith('./')
+            && (newPathname = newPathname.substring(2));
+        newPathname = getLocationContextRoot(windowLocation) + newPathname;
+    }
+
+    windowLocation.pathname = newPathname;
+}
+
 /**
  * A queue for the async replaceLocalTrack action so that multiple audio
  * replacements cannot happen simultaneously. This solves the issue where
@@ -242,6 +315,8 @@ class ConferenceConnector {
             this._handleConferenceJoined.bind(this));
         room.on(JitsiConferenceEvents.CONFERENCE_FAILED,
             this._onConferenceFailed.bind(this));
+        room.on(JitsiConferenceEvents.CONFERENCE_ERROR,
+            this._onConferenceError.bind(this));
     }
 
     /**
@@ -269,7 +344,7 @@ class ConferenceConnector {
 
         case JitsiConferenceErrors.NOT_ALLOWED_ERROR: {
             // let's show some auth not allowed page
-            APP.store.dispatch(redirectToStaticPage('static/authError.html'));
+            redirectToStaticPage('static/authError.html');
             break;
         }
 
@@ -300,6 +375,13 @@ class ConferenceConnector {
             APP.UI.notifyGracefulShutdown();
             break;
 
+        case JitsiConferenceErrors.JINGLE_FATAL_ERROR: {
+            const [ error ] = params;
+
+            APP.UI.notifyInternalError(error);
+            break;
+        }
+
         case JitsiConferenceErrors.CONFERENCE_DESTROYED: {
             const [ reason ] = params;
 
@@ -321,7 +403,6 @@ class ConferenceConnector {
 
         case JitsiConferenceErrors.FOCUS_LEFT:
         case JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE:
-        case JitsiConferenceErrors.OFFER_ANSWER_FAILED:
             APP.store.dispatch(conferenceWillLeave(room));
 
             // FIXME the conference should be stopped by the library and not by
@@ -344,6 +425,31 @@ class ConferenceConnector {
         }
     }
 
+    /**
+     *
+     */
+    _onConferenceError(err, ...params) {
+        logger.error('CONFERENCE Error:', err, params);
+        switch (err) {
+        case JitsiConferenceErrors.CHAT_ERROR:
+            logger.error('Chat error.', err);
+            if (isButtonEnabled('chat') && !interfaceConfig.filmStripOnly) {
+                const [ code, msg ] = params;
+
+                APP.store.dispatch(addMessage({
+                    hasRead: true,
+                    error: code,
+                    message: msg,
+                    messageType: 'error',
+                    timestamp: Date.now()
+                }));
+            }
+            break;
+        default:
+            logger.error('Unknown error.', err);
+        }
+    }
+
     /**
      *
      */
@@ -526,7 +632,8 @@ export default {
             // Resolve with no tracks
             tryCreateLocalTracks = Promise.resolve([]);
         } else {
-            tryCreateLocalTracks = createLocalTracksF({ devices: initialDevices }, true)
+            tryCreateLocalTracks = createLocalTracksF(
+                { devices: initialDevices }, true)
                 .catch(err => {
                     if (requestedAudio && requestedVideo) {
 
@@ -622,7 +729,6 @@ export default {
             // based on preferred devices, loose label matching can be done in
             // cases where the exact ID match is no longer available, such as
             // when the camera device has switched USB ports.
-            // when in startSilent mode we want to start with audio muted
             this._initDeviceList()
                 .catch(error => logger.warn(
                     'initial device list initialization failed', error))
@@ -630,11 +736,8 @@ export default {
                 options.roomName, {
                     startAudioOnly: config.startAudioOnly,
                     startScreenSharing: config.startScreenSharing,
-                    startWithAudioMuted: config.startWithAudioMuted
-                        || config.startSilent
-                        || isUserInteractionRequiredForUnmute(APP.store.getState()),
+                    startWithAudioMuted: config.startWithAudioMuted,
                     startWithVideoMuted: config.startWithVideoMuted
-                        || isUserInteractionRequiredForUnmute(APP.store.getState())
                 }))
             .then(([ tracks, con ]) => {
                 tracks.forEach(track => {
@@ -690,7 +793,6 @@ export default {
                 }
 
                 if (config.startSilent) {
-                    sendAnalytics(createStartSilentEvent());
                     APP.store.dispatch(showNotification({
                         descriptionKey: 'notify.startSilentDescription',
                         titleKey: 'notify.startSilentTitle'
@@ -735,13 +837,6 @@ export default {
      * dialogs in case of media permissions error.
      */
     muteAudio(mute, showUI = true) {
-        if (!mute
-                && isUserInteractionRequiredForUnmute(APP.store.getState())) {
-            logger.error('Unmuting audio requires user interaction');
-
-            return;
-        }
-
         // Not ready to modify track's state yet
         if (!this._localTracksInitialized) {
             // This will only modify base/media.audio.muted which is then synced
@@ -805,13 +900,6 @@ export default {
      * dialogs in case of media permissions error.
      */
     muteVideo(mute, showUI = true) {
-        if (!mute
-                && isUserInteractionRequiredForUnmute(APP.store.getState())) {
-            logger.error('Unmuting video requires user interaction');
-
-            return;
-        }
-
         // If not ready to modify track's state yet adjust the base/media
         if (!this._localTracksInitialized) {
             // This will only modify base/media.video.muted which is then synced
@@ -931,15 +1019,17 @@ export default {
      * Returns the connection times stored in the library.
      */
     getConnectionTimes() {
-        return room.getConnectionTimes();
+        return this._room.getConnectionTimes();
     },
 
     // used by torture currently
     isJoined() {
-        return room && room.isJoined();
+        return this._room
+            && this._room.isJoined();
     },
     getConnectionState() {
-        return room && room.getConnectionState();
+        return this._room
+            && this._room.getConnectionState();
     },
 
     /**
@@ -948,7 +1038,8 @@ export default {
      * P2P connection
      */
     getP2PConnectionState() {
-        return room && room.getP2PConnectionState();
+        return this._room
+            && this._room.getP2PConnectionState();
     },
 
     /**
@@ -957,7 +1048,7 @@ export default {
      */
     _startP2P() {
         try {
-            room && room.startP2PSession();
+            this._room && this._room.startP2PSession();
         } catch (error) {
             logger.error('Start P2P failed', error);
             throw error;
@@ -970,7 +1061,7 @@ export default {
      */
     _stopP2P() {
         try {
-            room && room.stopP2PSession();
+            this._room && this._room.stopP2PSession();
         } catch (error) {
             logger.error('Stop P2P failed', error);
             throw error;
@@ -985,7 +1076,7 @@ export default {
      * false otherwise.
      */
     isConnectionInterrupted() {
-        return room.isConnectionInterrupted();
+        return this._room.isConnectionInterrupted();
     },
 
     /**
@@ -1046,7 +1137,7 @@ export default {
     },
 
     getMyUserId() {
-        return room && room.myUserId();
+        return this._room && this._room.myUserId();
     },
 
     /**
@@ -1069,7 +1160,7 @@ export default {
      * least one track.
      */
     getNumberOfParticipantsWithTracks() {
-        return room.getParticipants()
+        return this._room.getParticipants()
             .filter(p => p.getTracks().length > 0)
             .length;
     },
@@ -1207,34 +1298,17 @@ export default {
         const options = config;
 
         const nick = APP.store.getState()['features/base/settings'].displayName;
-        const { locationURL } = APP.store.getState()['features/base/connection'];
 
         if (nick) {
             options.displayName = nick;
         }
 
         options.applicationName = interfaceConfig.APP_NAME;
-        options.getWiFiStatsMethod = this._getWiFiStatsMethod;
-        options.confID = `${locationURL.host}${locationURL.pathname}`;
+        options.getWiFiStatsMethod = getJitsiMeetGlobalNS().getWiFiStats;
 
         return options;
     },
 
-    /**
-     * Returns the result of getWiFiStats from the global NS or does nothing
-     * (returns empty result).
-     * Fixes a concurrency problem where we need to pass a function when creating
-     * JitsiConference, but that method is added to the context later.
-     *
-     * @returns {Promise}
-     * @private
-     */
-    _getWiFiStatsMethod() {
-        const gloabalNS = getJitsiMeetGlobalNS();
-
-        return gloabalNS.getWiFiStats ? gloabalNS.getWiFiStats() : Promise.resolve('{}');
-    },
-
     /**
      * Start using provided video stream.
      * Stops previous video stream.
@@ -1250,7 +1324,7 @@ export default {
                         this.localVideo = newStream;
                         this._setSharingScreen(newStream);
                         if (newStream) {
-                            APP.UI.addLocalVideoStream(newStream);
+                            APP.UI.addLocalStream(newStream);
                         }
                         this.setVideoMuteStatus(this.isLocalVideoMuted());
                     })
@@ -1301,6 +1375,9 @@ export default {
                 replaceLocalTrack(this.localAudio, newStream, room))
                     .then(() => {
                         this.localAudio = newStream;
+                        if (newStream) {
+                            APP.UI.addLocalStream(newStream);
+                        }
                         this.setAudioMuteStatus(this.isLocalAudioMuted());
                     })
                     .then(resolve)
@@ -1316,7 +1393,8 @@ export default {
      * @returns {boolean}
      */
     isAudioOnly() {
-        return Boolean(APP.store.getState()['features/base/audio-only'].enabled);
+        return Boolean(
+            APP.store.getState()['features/base/conference'].audioOnly);
     },
 
     videoSwitchInProgress: false,
@@ -1428,9 +1506,7 @@ export default {
             return this._switchToScreenSharing(options);
         }
 
-        return this._untoggleScreenSharing
-            ? this._untoggleScreenSharing()
-            : Promise.resolve();
+        return this._untoggleScreenSharing();
     },
 
     /**
@@ -1682,7 +1758,14 @@ export default {
                 return;
             }
 
+            const displayName = user.getDisplayName();
+
             logger.log(`USER ${id} connnected:`, user);
+            APP.API.notifyUserJoined(id, {
+                displayName,
+                formattedDisplayName: appendSuffix(
+                    displayName || interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME)
+            });
             APP.UI.addUser(user);
 
             // check the roles for the new user and reflect them
@@ -1698,7 +1781,12 @@ export default {
             }
 
             logger.log(`USER ${id} LEFT:`, user);
-
+            APP.API.notifyUserLeft(id);
+            APP.UI.messageHandler.participantNotification(
+                user.getDisplayName(),
+                'notify.somebody',
+                'disconnected',
+                'notify.disconnected');
             APP.UI.onSharedVideoStop(id);
         });
 
@@ -1767,12 +1855,9 @@ export default {
             APP.UI.setAudioLevel(id, newLvl);
         });
 
-        room.on(JitsiConferenceEvents.TRACK_MUTE_CHANGED, (track, participantThatMutedUs) => {
-            if (participantThatMutedUs) {
-                APP.store.dispatch(participantMutedUs(participantThatMutedUs));
-            }
+        room.on(JitsiConferenceEvents.TALK_WHILE_MUTED, () => {
+            APP.UI.showToolbar(6000);
         });
-
         room.on(JitsiConferenceEvents.SUBJECT_CHANGED,
             subject => APP.store.dispatch(conferenceSubjectChanged(subject)));
 
@@ -1870,19 +1955,40 @@ export default {
                 }
             });
 
-        room.on(JitsiConferenceEvents.KICKED, participant => {
+        room.on(JitsiConferenceEvents.KICKED, () => {
             APP.UI.hideStats();
-            APP.store.dispatch(kickedOut(room, participant));
+            APP.UI.notifyKicked();
 
             // FIXME close
         });
 
-        room.on(JitsiConferenceEvents.PARTICIPANT_KICKED, (kicker, kicked) => {
-            APP.store.dispatch(participantKicked(kicker, kicked));
-        });
-
         room.on(JitsiConferenceEvents.SUSPEND_DETECTED, () => {
             APP.store.dispatch(suspendDetected());
+
+            // After wake up, we will be in a state where conference is left
+            // there will be dialog shown to user.
+            // We do not want video/audio as we show an overlay and after it
+            // user need to rejoin or close, while waking up we can detect
+            // camera wakeup as a problem with device.
+            // We also do not care about device change, which happens
+            // on resume after suspending PC.
+            if (this.deviceChangeListener) {
+                JitsiMeetJS.mediaDevices.removeEventListener(
+                    JitsiMediaDevicesEvents.DEVICE_LIST_CHANGED,
+                    this.deviceChangeListener);
+            }
+
+            // stop local video
+            if (this.localVideo) {
+                this.localVideo.dispose();
+                this.localVideo = null;
+            }
+
+            // stop local audio
+            if (this.localAudio) {
+                this.localAudio.dispose();
+                this.localAudio = null;
+            }
         });
 
         APP.UI.addListener(UIEvents.AUDIO_MUTED, muted => {
@@ -2138,27 +2244,6 @@ export default {
             });
     },
 
-    /**
-     * Cleanups local conference on suspend.
-     */
-    onSuspendDetected() {
-        // After wake up, we will be in a state where conference is left
-        // there will be dialog shown to user.
-        // We do not want video/audio as we show an overlay and after it
-        // user need to rejoin or close, while waking up we can detect
-        // camera wakeup as a problem with device.
-        // We also do not care about device change, which happens
-        // on resume after suspending PC.
-        if (this.deviceChangeListener) {
-            JitsiMeetJS.mediaDevices.removeEventListener(
-                JitsiMediaDevicesEvents.DEVICE_LIST_CHANGED,
-                this.deviceChangeListener);
-        }
-
-        this.localVideo = null;
-        this.localAudio = null;
-    },
-
     /**
      * Callback invoked when the conference has been successfully joined.
      * Initializes the UI and various other features.
@@ -2171,12 +2256,29 @@ export default {
 
         APP.keyboardshortcut.init();
 
+        if (config.requireDisplayName
+                && !APP.conference.getLocalDisplayName()) {
+            APP.UI.promptDisplayName();
+        }
+
         APP.store.dispatch(conferenceJoined(room));
 
         const displayName
             = APP.store.getState()['features/base/settings'].displayName;
 
         APP.UI.changeDisplayName('localVideoContainer', displayName);
+        APP.API.notifyConferenceJoined(
+            this.roomName,
+            this._room.myUserId(),
+            {
+                displayName,
+                formattedDisplayName: appendSuffix(
+                    displayName,
+                    interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME),
+                avatarURL: getAvatarURLByParticipantId(
+                    APP.store.getState(), this._room.myUserId())
+            }
+        );
     },
 
     /**
@@ -2499,7 +2601,7 @@ export default {
             room = undefined;
 
             APP.API.notifyReadyToClose();
-            APP.store.dispatch(maybeRedirectToWelcomePage(values[0]));
+            maybeRedirectToWelcomePage(values[0]);
         });
     },
 
@@ -2511,11 +2613,7 @@ export default {
     leaveRoomAndDisconnect() {
         APP.store.dispatch(conferenceWillLeave(room));
 
-        if (room.isJoined()) {
-            return room.leave().then(disconnect, disconnect);
-        }
-
-        return disconnect();
+        return room.leave().then(disconnect, disconnect);
     },
 
     /**
@@ -2644,6 +2742,14 @@ export default {
             displayName: formattedNickname
         }));
 
+        APP.API.notifyDisplayNameChanged(id, {
+            displayName: formattedNickname,
+            formattedDisplayName:
+                appendSuffix(
+                    formattedNickname,
+                    interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME)
+        });
+
         if (room) {
             APP.UI.changeDisplayName(id, formattedNickname);
         }
@@ -2697,18 +2803,6 @@ export default {
                  */
                 convertVideoToDesktop: true,
 
-                /**
-                 * Callback invoked when the connection has been closed
-                 * automatically. Triggers cleanup of screensharing if active.
-                 *
-                 * @returns {void}
-                 */
-                onConnectionClosed: () => {
-                    if (this._untoggleScreenSharing) {
-                        this._untoggleScreenSharing();
-                    }
-                },
-
                 /**
                  * Callback invoked to pass messages from the local client back
                  * out to the external client.

config.js

@@ -1,6 +1,16 @@
 /* eslint-disable no-unused-vars, no-var */
 
 var config = {
+    // Configuration
+    //
+
+    // Alternative location for the configuration.
+    // configLocation: './config.json',
+
+    // Custom function which given the URL path should return a room name.
+    // getroomnode: function (path) { return 'someprefixpossiblybasedonpath'; },
+
+
     // Connection
     //
 
@@ -50,10 +60,6 @@ var config = {
 
         // Enables the test specific features consumed by jitsi-meet-torture
         // testMode: false
-
-        // Disables the auto-play behavior of *all* newly created video element.
-        // This is useful when the client runs on a host with limited resources.
-        // noAutoPlayVideo: false
     },
 
     // Disables ICE/UDP by filtering out local and remote UDP candidates in
@@ -117,6 +123,10 @@ var config = {
     // are requested again.
     // enableLayerSuspension: false,
 
+    // Suspend sending video if bandwidth estimation is too low. This may cause
+    // problems with audio playback. Disabled until these are fixed.
+    disableSuspendVideo: true,
+
     // Every participant after the Nth will start video muted.
     // startVideoMuted: 10,
 
@@ -191,9 +201,6 @@ var config = {
     // subtitles and buttons can be configured)
     // transcribingEnabled: false,
 
-    // Enables automatic turning on captions when recording is started
-    // autoCaptionOnRecord: false,
-
     // Misc
 
     // Default value for the channel "last N" attribute. -1 for unlimited.
@@ -411,18 +418,10 @@ var config = {
     // use only.
     // _desktopSharingSourceDevice: 'sample-id-or-label'
 
-    // If true, any checks to handoff to another application will be prevented
-    // and instead the app will continue to display in the current browser.
-    // disableDeepLinking: false
-
     // A property to disable the right click context menu for localVideo
     // the menu has option to flip the locally seen video for local presentations
     // disableLocalVideoFlip: false
 
-    // If specified a 'Help' button will be displayed in the overflow menu with a link to the specified URL for
-    // user documentation.
-    // userDocumentationURL: 'https://docs.example.com/video-meetings.html'
-
     // List of undocumented settings used in jitsi-meet
     /**
      _immediateReloadThreshold

css/_avatar.scss

@@ -1,31 +0,0 @@
-.avatar {
-    align-items: center;
-    background-color: #AAA;
-    display: flex;
-    border-radius: 50%;
-    color: rgba(255, 255, 255, 0.6);
-    font-weight: 100;
-    justify-content: center;
-    object-fit: cover;
-}
-
-.avatar-foreign {
-    align-items: center;
-    bottom: 0;
-    display: flex;
-    font-size: 40pt;
-    justify-content: center;
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-}
-
-.avatar-svg {
-    height: 100%;
-    width: 100%;
-}
-
-.defaultAvatar {
-    opacity: 0.6
-}

css/_base.scss

@@ -33,10 +33,6 @@ body {
     }
 }
 
-.jitsi-icon svg {
-    fill: white;
-}
-
 /**
  * AtlasKitThemeProvider sets a background color on an app-wrapping div, thereby
  * preventing transparency in filmstrip-only mode. The selector chosen to

css/_chat.scss

@@ -80,27 +80,6 @@
     }
 }
 
-#chat-recipient {
-    align-items: center;
-    background-color: $defaultWarningColor;
-    display: flex;
-    flex-direction: row;
-    padding: 10px;
-
-    span {
-        color: white;
-        display: flex;
-        flex: 1;
-    }
-
-    div {
-        svg {
-            cursor: pointer;
-            fill: white
-        }
-    }
-}
-
 .chat-header {
     background-color: $chatHeaderBackgroundColor;
     height: 70px;
@@ -217,11 +196,6 @@
             padding: 0;
         }
     }
-
-    .privatemessagenotice {
-        color: $defaultWarningColor;
-        font-style: italic;
-    }
 }
 
 .smiley {
@@ -254,7 +228,6 @@
 .smileys-panel {
     bottom: 100%;
     box-sizing: border-box;
-    background-color: rgba(0, 0, 0, .6) !important;
     height: auto;
     max-height: 0;
     overflow: hidden;
@@ -339,16 +312,6 @@
 
     .chatmessage-wrapper {
         max-width: 100%;
-
-        .replywrapper {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-
-            .toolbox-icon {
-                cursor: pointer;
-            }
-        }
     }
 
     .chatmessage {

css/_font.scss

@@ -0,0 +1,219 @@
+@font-face {
+    font-family: 'jitsi';
+    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;
+}
+
+[class^="icon-"], [class*=" icon-"] {
+    font-family: 'jitsi';
+    speak: none;
+    font-style: normal;
+    font-weight: normal;
+    font-variant: normal;
+    text-transform: none;
+    line-height: 1.22em;
+    font-size: 1.22em;
+    cursor: default;
+
+    /* Better Font Rendering =========== */
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-signal_cellular_0:before {
+  content: "\e901";
+}
+.icon-signal_cellular_1:before {
+  content: "\e902";
+}
+.icon-signal_cellular_2:before {
+  content: "\e907";
+}
+.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-open_in_new:before {
+  content: "\e89e";
+}
+.icon-restore:before {
+  content: "\e8b3";
+}
+.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-ninja:before {
+  content: "\e909";
+}
+.icon-invite:before {
+  content: "\e145";
+}
+.icon-add:before {
+  content: "\e146";
+}
+.icon-play:before {
+  content: "\f04b";
+}
+.icon-stop:before {
+  content: "\f04d";
+}
+.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";
+}
+.icon-HD:before {
+  content: "\e927";
+}
+.icon-LD:before {
+  content: "\e928";
+}
+.icon-SD:before {
+  content: "\e929";
+}
+.icon-gsm-bars:before {
+  content: "\e926";
+}
+.icon-info:before {
+  content: "\e922";
+}
+.icon-mic-camera-combined:before {
+  content: "\e903";
+}
+.icon-feedback:before {
+  content: "\e91d";
+}
+.icon-hangup:before {
+  content: "\e905";
+}
+.icon-chat:before {
+  content: "\e906";
+}
+.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-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";
+}

css/_popup_menu.scss

@@ -6,7 +6,7 @@
     min-width: 75px;
     text-align: left;
     padding: 0px;
-    width: 180px;
+    width: 150px;
     white-space: nowrap;
 
     &__item {
@@ -87,7 +87,6 @@
         display: inline-block;
         min-width: 20px;
         height: 100%;
-        padding-right: 10px;
 
         > * {
             @include absoluteAligning();

css/_toolbars.scss

@@ -73,62 +73,8 @@
 
         .button-group-center {
             justify-content: center;
-
-            .toolbox-button {
-
-                .toolbox-icon {
-                    background-color: #fff;
-                    border-radius: 50%;
-                    border: 1px solid #d1dbe8;
-                    margin: 0px 4px;
-                    width: 38px;
-                    height: 38px;
-        
-                    &:hover {
-                        background-color: #daebfa;
-                        border: 1px solid #daebfa;
-                    }
-        
-                    &.toggled {
-                        background: #2a3a4b;
-                        border: 1px solid #5e6d7a;
-    
-                        svg {
-                            fill: #fff;
-                        }
-        
-                        &:hover {
-                            background-color: #5e6d7a;
-                        }
-                    }
-        
-                    &.disabled, .disabled & {
-                        cursor: initial;
-                        color: #fff;
-                        background-color: #a4b8d1;
-                    }
-    
-                    svg {
-                        fill: #5e6d7a;
-                    }
-                }
-
-                &:nth-child(2) {
-                    .toolbox-icon {
-                        background-color: $hangupColor;
-                        border: 1px solid $hangupColor;
-                        width: 40px;
-                        height: 40px;
-                
-                        &:hover {
-                            background-color: $hangupColor;
-                        }
-
-                        svg {
-                            fill: #fff;
-                        }
-                    }
-                }
+            .toolbox-icon {
+                margin: 0px 4px;
             }
         }
 
@@ -136,6 +82,75 @@
             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-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;
+            }
+
+            &.toggled {
+                background: #2a3a4b;
+                color: #fff;
+                border: 1px solid #5e6d7a;
+
+                &:hover {
+                    background-color: #5e6d7a;
+                }
+            }
+
+            &.disabled, .disabled & {
+                cursor: initial;
+                color: #fff;
+                background-color: #a4b8d1;
+            }
+        }
+
         .overflow-menu {
             font-size: 1.2em;
             list-style-type: none;
@@ -176,6 +191,14 @@
                     cursor: initial;
                     color: #3b475c;
                 }
+
+                i.toggled {
+                    background: inherit;
+                }
+
+                i.toggled:hover {
+                    background: inherit;
+                }
             }
 
             .beta-tag {
@@ -204,10 +227,6 @@
                     max-width: 24px;
                     max-height: 24px;
                 }
-
-                svg {
-                    fill: #B8C7E0 !important;
-                }
             }
 
             .profile-text {
@@ -246,26 +265,9 @@
         }
 
         .toolbox-icon {
-            display: flex;
-            border-radius: 5px;
-            flex-direction: column;
-            font-size: 24px;
             height: $newToolbarSize;
-            justify-content: center;
+            font-size: 24px;
             width: $newToolbarSize;
-
-            &:hover, &.toggled {
-                background: $newToolbarButtonHoverColor;
-            }
-    
-            &.disabled {
-                cursor: initial !important;
-                background-color: #a4b8d1 !important;
-
-                svg {
-                    fill: #fff !important;
-                }
-            }
         }
     }
 }
@@ -295,6 +297,10 @@
         background-color: $AOTToolbarButtonHoverColor;
     }
 
+    .icon-hangup {
+        color: $hangupColor;
+    }
+
     .toolbox-button {
         color: $toolbarButtonColor;
         cursor: pointer;
@@ -319,6 +325,10 @@
         width: $newToolbarSize;
     }
 
+    .icon-hangup {
+        font-size: $newToolbarHangupFontSize;
+    }
+
     .disabled {
         cursor: initial;
     }

css/_variables.scss

@@ -28,7 +28,6 @@ $defaultColor: #F1F1F1;
 $defaultSideBarFontColor: #44A5FF;
 $defaultSemiDarkColor: #ACACAC;
 $defaultDarkColor: #2b3d5c;
-$defaultWarningColor: rgb(215, 121, 118);
 
 /**
  * Toolbar
@@ -164,45 +163,9 @@ $watermarkHeight: 74px;
  */
 $welcomePageDescriptionColor: #fff;
 $welcomePageFontFamily: inherit;
-$welcomePageBackground: linear-gradient(-90deg, #1251AE 0%, #0074FF 50%, #1251AE 100%);
+$welcomePageHeaderBackground: linear-gradient(-90deg, #1251AE 0%, #0074FF 50%, #1251AE 100%);
 $welcomePageTitleColor: #fff;
 
-$welcomePageHeaderBackground: none;
-$welcomePageHeaderBackgroundSmall: none;
-$welcomePageHeaderBackgroundPosition: none;
-$welcomePageHeaderBackgroundRepeat: none;
-$welcomePageHeaderBackgroundSize: none;
-$welcomePageHeaderPaddingBottom: 0px;
-
-$welcomePageHeaderTextMarginTop: 35px;
-$welcomePageHeaderTextMarginBottom: 35px;
-
-$welcomePageHeaderTextTitleMarginBottom: 16px;
-
-$welcomePageHeaderTextDescriptionDisplay: inherit;
-
-$welcomePageEnterRoomWidth: 680px;
-$welcomePageEnterRoomPadding: 25px 30px;
-$welcomePageEnterRoomBorderRadius: 0px;
-
-$welcomePageEnterRoomInputContainerPadding: 0 8px 5px 0px;
-$welcomePageEnterRoomInputContainerBorderWidth: 0px 0px 2px 0px;
-$welcomePageEnterRoomInputContainerBorderStyle: solid;
-$welcomePageEnterRoomInputContainerBorderImage: linear-gradient(to right, #dee1e6, #fff) 1;
-
-$welcomePageEnterRoomTitleDisplay: inherit;
-
-$welcomePageTabContainerDisplay: flex;
-$welcomePageTabContentDisplay: inherit;
-$welcomePageTabButtonsDisplay: flex;
-$welcomePageTabDisplay: block;
-
-$welcomePageButtonWidth: 51px;
-$welcomePageButtonHeight: 35px;
-$welcomePageButtonFontWeight: inherit;
-$welcomePageButtonBorderRadius: 4px;
-$welcomePageButtonLineHeight: 35px;
-
 /**
  * Deep-linking page variables.
  */

css/_videolayout_default.scss

@@ -23,9 +23,14 @@
     top: 0;
     width: 100%;
 
-    #largeVideoBackground {
-        min-height: 100%;
-        min-width: 100%;
+    &.fit-full-height #largeVideoBackground {
+        height: 100%;
+        width: auto;
+    }
+
+    .fit-full-width #largeVideoBackground {
+        height: auto;
+        width: 100%;
     }
 }
 #largeVideoBackgroundContainer {
@@ -344,11 +349,8 @@
 /**
  * Toolbar icon internal i elements (font icons).
  */
-.toolbar-icon>div {
-    height: $thumbnailToolbarHeight;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
+.toolbar-icon>i {
+    line-height: $thumbnailToolbarHeight;
 }
 
 /**
@@ -496,6 +498,7 @@
 }
 
 #dominantSpeakerAvatarContainer,
+#dominantSpeakerAvatar,
 .dynamic-shadow {
     width: 200px;
     height: 200px;
@@ -505,9 +508,14 @@
     top: 50px;
     margin: auto;
     position: relative;
+    border-radius: 100px;
     overflow: hidden;
     visibility: inherit;
 }
+#dominantSpeakerAvatar {
+    background-color: #000000;
+    object-fit: cover;
+}
 
 .dynamic-shadow {
     border-radius: 50%;
@@ -521,6 +529,7 @@
 .avatar-container {
     @include maxSize(60px);
     @include absoluteAligning();
+    border-radius: 50%;
     display: flex;
     justify-content: center;
     height: 50%;
@@ -537,17 +546,13 @@
 #videoNotAvailableScreen {
     text-align: center;
     #avatarContainer {
-        border-radius: 50%;
-        display: inline-block;
         height: 50vh;
+        display:inline-block;
         margin-top: 25vh;
-        overflow: hidden;
-        width: 50vh;
 
         #avatar {
+            border-radius: 50%;
             height: 100%;
-            object-fit: cover;
-            width: 100%;
         }
     }
 }

css/_welcome_page.scss

@@ -4,7 +4,7 @@ body.welcome-page {
 }
 
 .welcome {
-    background-image: $welcomePageBackground;
+    background-image: $welcomePageHeaderBackground;
     display: flex;
     flex-direction: column;
     font-family: $welcomePageFontFamily;
@@ -13,11 +13,6 @@ body.welcome-page {
     position: relative;
 
     .header {
-        background-image: $welcomePageHeaderBackground;
-        background-position: $welcomePageHeaderBackgroundPosition;
-        background-repeat: $welcomePageHeaderBackgroundRepeat;
-        background-size: $welcomePageHeaderBackgroundSize;
-        padding-bottom: $welcomePageHeaderPaddingBottom;
         align-items: center;
         display: flex;
         flex-direction: column;
@@ -29,8 +24,8 @@ body.welcome-page {
         .header-text {
             display: flex;
             flex-direction: column;
-            margin-top: $watermarkHeight + $welcomePageHeaderTextMarginTop;
-            margin-bottom: $welcomePageHeaderTextMarginBottom;
+            margin-top: $watermarkHeight + 35;
+            margin-bottom: 35px;
             max-width: calc(100% - 40px);
             width: 650px;
             z-index: $zindex2;
@@ -41,11 +36,10 @@ body.welcome-page {
             font-size: 2.5rem;
             font-weight: 500;
             line-height: 1.18;
-            margin-bottom: $welcomePageHeaderTextTitleMarginBottom;
+            margin-bottom: 16px;
         }
 
         .header-text-description {
-            display: $welcomePageHeaderTextDescriptionDisplay;
             color: $welcomePageDescriptionColor;
             font-size: 1rem;
             font-weight: 400;
@@ -57,24 +51,23 @@ body.welcome-page {
             display: flex;
             align-items: center;
             max-width: calc(100% - 40px);
-            width: $welcomePageEnterRoomWidth;
+            width: 680px;
             z-index: $zindex2;
             background-color: #fff;
-            padding: $welcomePageEnterRoomPadding;
-            border-radius: $welcomePageEnterRoomBorderRadius;
+            padding: 25px 30px;
 
             .enter-room-input-container {
                 width: 100%;
-                padding: $welcomePageEnterRoomInputContainerPadding;
+                padding-right: 8px;
+                padding-bottom: 5px;
                 text-align: left;
                 color: #253858;
                 height: fit-content;
-                border-width: $welcomePageEnterRoomInputContainerBorderWidth;
-                border-style: $welcomePageEnterRoomInputContainerBorderStyle;
-                border-image: $welcomePageEnterRoomInputContainerBorderImage;
+                border-width: 0px 0px 2px 0px;
+                border-style: solid;
+                border-image: linear-gradient(to right, #dee1e6, #fff) 1;
 
                 .enter-room-title {
-                    display: $welcomePageEnterRoomTitleDisplay;
                     font-size: 18px;
                     font-weight: bold;
                     padding-bottom: 5px;
@@ -101,11 +94,10 @@ body.welcome-page {
             min-height: 354px;
             width: 710px;
             background: #75A7E7;
-            display: $welcomePageTabContainerDisplay;
+            display: flex;
             flex-direction: column;
 
             .tab-content{
-                display: $welcomePageTabContentDisplay;
                 margin: 5px 0px;
                 overflow: hidden;
                 flex-grow: 1;
@@ -119,14 +111,13 @@ body.welcome-page {
             .tab-buttons {
                 font-size: 18px;
                 color: #FFFFFF;
-                display: $welcomePageTabButtonsDisplay;
+                display: flex;
                 flex-grow: 0;
                 flex-direction: row;
                 min-height: 54px;
                 width: 100%;
 
                 .tab {
-                    display: $welcomePageTabDisplay;
                     text-align: center;
                     background: rgba(9,30,66,0.37);
                     height: 55px;
@@ -147,16 +138,15 @@ body.welcome-page {
     }
 
     .welcome-page-button {
-        width: $welcomePageButtonWidth;
-        height: $welcomePageButtonHeight;
+        width: 51px;
+        height: 35px;
         font-size: 14px;
-        font-weight: $welcomePageButtonFontWeight;
         background: #0074E0;
-        border-radius: $welcomePageButtonBorderRadius;
+        border-radius: 4px;
         color: #FFFFFF;
         text-align: center;
         vertical-align: middle;
-        line-height: $welcomePageButtonLineHeight;
+        line-height: 35px;
         cursor: pointer;
     }
 

css/_welcome_page_settings_toolbar.scss

@@ -1 +0,0 @@
-/** Insert custom CSS for any additional content in the welcome page settings toolbar **/

css/main.scss

@@ -23,6 +23,12 @@ $flagsImagePath: "../images/";
 @import "../node_modules/bc-css-flags/dist/css/bc-css-flags.scss";
 /* Flags END */
 
+/* Fonts BEGIN */
+
+@import 'font';
+
+/* Fonts END */
+
 /* Modules BEGIN */
 
 @import 'aui_reset';
@@ -51,7 +57,6 @@ $flagsImagePath: "../images/";
 @import 'ringing/ringing';
 @import 'welcome_page';
 @import 'welcome_page_content';
-@import 'welcome_page_settings_toolbar';
 @import 'toolbars';
 @import 'jquery.contextMenu';
 @import 'keyboard-shortcuts';
@@ -81,6 +86,5 @@ $flagsImagePath: "../images/";
 @import 'navigate_section_list';
 @import 'third-party-branding/google';
 @import 'third-party-branding/microsoft';
-@import 'avatar';
 
 /* Modules END */

debian/rules

@@ -17,15 +17,8 @@ override_dh_install: $(LANGUAGES)
 	dh_install -X/config.js -X/package.json
 
 $(LANGUAGES):
-	LOCALE=$$(echo $@ | cut -c1-2) ; \
 	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; \
-	else \
-		if [ -f $(COUNTRIES_DIR)/$$LOCALE.json ] ; \
-		then \
-			dh_install -pjitsi-meet-web $(COUNTRIES_DIR)/$$LOCALE.json usr/share/jitsi-meet/lang/; \
-			mv debian/jitsi-meet-web/usr/share/jitsi-meet/lang/$$LOCALE.json debian/jitsi-meet-web/usr/share/jitsi-meet/lang/countries-$@.json; \
-		fi; \
 	fi;

doc/adding-an-icon.md

@@ -0,0 +1,12 @@
+### Adding an icon to the font file (e.g. for the floating menu)
+1. Go to https://icomoon.io/app/
+2. Go to "Manage Projects" from the menu on the top left.
+3. Use "Import project" and select <code>fonts/selection.json</code> from Jitsi Meet.
+4. Click "load".
+5. Add the new icons using the "Add icons from library" button...
+6. Go to "generate font" and make sure the identifiers for the new icons are correct.
+7. Download the result in a zip file using the "download" button.
+8. Copy <code>selection.json</code> and <code>fonts/jitsi.*</code> from the zip file to <code>fonts/</code> in Jitsi Meet
+9. Copy the class for the new icon from <code>style.css</code> in the zip file to <code>css/_font.scss</code> in Jitsi Meet (do *not* copy the whole file)
+
+Sample commit: https://github.com/jitsi/jitsi-meet/commit/68bc819b89aec12364fcf07b81efa83a1900eed6

doc/api.md

@@ -192,20 +192,6 @@ The `command` parameter is String object with the name of the command. The follo
 api.executeCommand('displayName', 'New Nickname');
 ```
 
-* **password** - Sets the password for the room. This command requires one argument - the password name to be set.
-```javascript
-api.executeCommand('password', 'The Password');
-```
-
-* **sendTones** - Play touch tones.
-```javascript
-api.executeCommand('sendTones', {
-    tones: string, // The dial pad touch tones to play. For example, '12345#'.
-    duration: number, // Optional. The number of milliseconds each tone should play. The default is 200.
-    pause: number // Optional. The number of milliseconds between each tone. The default is 200.
-});
-```
-
 * **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');
@@ -331,13 +317,6 @@ changes. The listener will receive an object with the following structure:
 }
 ```
 
-* **dominantSpeakerChanged** - receives event notifications about change in the dominant speaker. The listener will receive object with the following structure:
-```javascript
-{
-    id: string //participantId of the new dominant speaker
-}
-```
-
 * **tileViewChanged** - event notifications about tile view layout mode being entered or exited. The listener will receive object with the following structure:
 ```javascript
 {
@@ -388,13 +367,6 @@ changes. The listener will receive an object with the following structure:
     email: string // the new email
 }
 ```
-* **feedbackSubmitted** - event notifications about conference feedback submission
-```javascript
-{
-    error: string // The error which occurred during submission, if any.
-}
-```
-
 * **filmstripDisplayChanged** - event notifications about the visibility of the filmstrip being updated.
 ```javascript
 {
@@ -410,19 +382,6 @@ changes. The listener will receive an object with the following structure:
 }
 ```
 
-* **participantKickedOut** - event notifications about a participants being removed from the room. The listener will receive an object with the following structure:
-```javascript
-{
-    kicked: {
-        id: string, // the id of the participant removed from the room
-        local: boolean // whether or not the participant is the local particiapnt
-    },
-    kicker: {
-        id: string // the id of the participant who kicked out the other participant
-    }
-}
-```
-
 * **participantLeft** - event notifications about participants that leave the room. The listener will receive an object with the following structure:
 ```javascript
 {
@@ -430,8 +389,6 @@ changes. The listener will receive an object with the following structure:
 }
 ```
 
-* **passwordRequired** - event notifications fired when failing to join a room because it has a password.
-
 * **videoConferenceJoined** - event notifications fired when the local user has joined the video conference. The listener will receive an object with the following structure:
 ```javascript
 {
@@ -473,8 +430,6 @@ The listener will receive an object with the following structure:
 }
 ```
 
-* **suspendDetected** - event notifications about detecting suspend event in host computer.
-
 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.

doc/development.md

@@ -1,78 +0,0 @@
-# Developing Jitsi Meet
-
-## Building the sources
-
-Node.js >= 10 and npm >= 6 are required.
-
-On Debian/Ubuntu systems, the required packages can be installed with:
-```
-sudo apt-get install npm nodejs
-cd jitsi-meet
-npm install
-```
-
-To build the Jitsi Meet application, just type
-```
-make
-```
-
-### Working with the library sources (lib-jitsi-meet)
-
-By default the library is build from its git repository sources. The default dependency path in package.json is :
-```json
-"lib-jitsi-meet": "jitsi/lib-jitsi-meet",
-```
-
-To work with local copy you must change the path to:
-```json
-"lib-jitsi-meet": "file:///Users/name/local-lib-jitsi-meet-copy",
-```
-
-To make the project you must force it to take the sources as 'npm update':
-```
-npm install lib-jitsi-meet --force && make
-```
-
-Or if you are making only changes to the library:
-```
-npm install lib-jitsi-meet --force && make deploy-lib-jitsi-meet
-```
-
-Alternative way is to use [npm link](https://docs.npmjs.com/cli/link).
-It allows to link `lib-jitsi-meet` dependency to local source in few steps:
-
-```bash
-cd lib-jitsi-meet
-
-#### create global symlink for lib-jitsi-meet package
-npm link
-
-cd ../jitsi-meet
-
-#### create symlink from the local node_modules folder to the global lib-jitsi-meet symlink
-npm link lib-jitsi-meet
-```
-
- After changes in local `lib-jitsi-meet` repository, you can rebuild it with `npm run install` and your `jitsi-meet` repository will use that modified library.
-Note: when using node version 4.x, the make file of jitsi-meet do npm update which will delete the link. It is no longer the case with version 6.x.
-
-If you do not want to use local repository anymore you should run
-```bash
-cd jitsi-meet
-npm unlink lib-jitsi-meet
-npm install
-```
-### Running with webpack-dev-server for development
-
-Use it at the CLI, type
-```
-make dev
-```
-
-By default the backend deployment used is `beta.meet.jit.si`. You can point the Jitsi-Meet app at a different backend by using a proxy server. To do this, set the WEBPACK_DEV_SERVER_PROXY_TARGET variable:
-```
-export WEBPACK_DEV_SERVER_PROXY_TARGET=https://your-example-server.com
-make dev
-```
-
-The app should be running at https://localhost:8080/

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

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

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

@@ -1,5 +1,5 @@
-// flow-typed signature: 538d762382091f2239d2d55cab1b574d
-// flow-typed version: c6154227d1/jquery_v3.x.x/flow_>=v0.28.x <=v0.103.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 */
 

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

@@ -1,5 +1,5 @@
-// flow-typed signature: 96e97db746b98786dbff6de500b4b862
-// flow-typed version: 5fe02f287a/lodash_v4.x.x/flow_>=v0.63.x <=v0.103.x
+// flow-typed signature: a9b75804169260d49cda34b56dcfabe1
+// flow-typed version: e9dac1347c/lodash_v4.x.x/flow_>=v0.63.x
 
 declare module "lodash" {
   declare type Path = $ReadOnlyArray<string | number> | string | number;
@@ -149,11 +149,6 @@ declare module "lodash" {
     separator?: RegExp | string
   };
 
-  declare type Cancelable = {
-    cancel: () => void,
-    flush: () => mixed
-  };
-
   declare type DebounceOptions = {
     leading?: boolean,
     maxWait?: number,
@@ -270,14 +265,14 @@ declare module "lodash" {
     ): -1;
     // alias of _.head
     first<T>(array: ?$ReadOnlyArray<T>): T;
-    flatten<T, X>(array?: ?$ReadOnlyArray<$ReadOnlyArray<T> | X>): Array<T | X>;
+    flatten<T, X>(array?: ?Array<Array<T> | X>): Array<T | X>;
     flattenDeep<T>(array?: ?(any[])): Array<T>;
     flattenDepth(array?: ?(any[]), depth?: ?number): any[];
     fromPairs<A, B>(pairs?: ?Array<[A, B]>): { [key: A]: B };
     head<T>(array: ?$ReadOnlyArray<T>): T;
-    indexOf<T>(array: $ReadOnlyArray<T>, value: T, fromIndex?: number): number;
+    indexOf<T>(array: Array<T>, value: T, fromIndex?: number): number;
     indexOf<T>(array: void | null, value?: ?T, fromIndex?: ?number): -1;
-    initial<T>(array: ?$ReadOnlyArray<T>): Array<T>;
+    initial<T>(array: ?Array<T>): Array<T>;
     intersection<T>(...arrays?: Array<$ReadOnlyArray<T>>): Array<T>;
     //Workaround until (...parameter: T, parameter2: U) works
     intersectionBy<T>(
@@ -325,10 +320,10 @@ declare module "lodash" {
       a4?: ?$ReadOnlyArray<T>,
       comparator?: ?Comparator<T>
     ): Array<T>;
-    join<T>(array: $ReadOnlyArray<T>, separator?: ?string): string;
+    join<T>(array: Array<T>, separator?: ?string): string;
     join<T>(array: void | null, separator?: ?string): "";
     last<T>(array: ?$ReadOnlyArray<T>): T;
-    lastIndexOf<T>(array: $ReadOnlyArray<T>, value?: ?T, fromIndex?: ?number): number;
+    lastIndexOf<T>(array: Array<T>, value?: ?T, fromIndex?: ?number): number;
     lastIndexOf<T>(array: void | null, value?: ?T, fromIndex?: ?number): -1;
     nth<T>(array: T[], n?: ?number): T;
     nth(array: void | null, n?: ?number): void;
@@ -362,10 +357,10 @@ declare module "lodash" {
       start?: ?number,
       end?: ?number
     ): Array<T>;
-    sortedIndex<T>(array: $ReadOnlyArray<T>, value: T): number;
+    sortedIndex<T>(array: Array<T>, value: T): number;
     sortedIndex<T>(array: void | null, value: ?T): 0;
     sortedIndexBy<T>(
-      array: $ReadOnlyArray<T>,
+      array: Array<T>,
       value?: ?T,
       iteratee?: ?ValueOnlyIteratee<T>
     ): number;
@@ -374,12 +369,12 @@ declare module "lodash" {
       value?: ?T,
       iteratee?: ?ValueOnlyIteratee<T>
     ): 0;
-    sortedIndexOf<T>(array: $ReadOnlyArray<T>, value: T): number;
+    sortedIndexOf<T>(array: Array<T>, value: T): number;
     sortedIndexOf<T>(array: void | null, value?: ?T): -1;
-    sortedLastIndex<T>(array: $ReadOnlyArray<T>, value: T): number;
+    sortedLastIndex<T>(array: Array<T>, value: T): number;
     sortedLastIndex<T>(array: void | null, value?: ?T): 0;
     sortedLastIndexBy<T>(
-      array: $ReadOnlyArray<T>,
+      array: Array<T>,
       value: T,
       iteratee?: ValueOnlyIteratee<T>
     ): number;
@@ -388,16 +383,16 @@ declare module "lodash" {
       value?: ?T,
       iteratee?: ?ValueOnlyIteratee<T>
     ): 0;
-    sortedLastIndexOf<T>(array: $ReadOnlyArray<T>, value: T): number;
+    sortedLastIndexOf<T>(array: Array<T>, value: T): number;
     sortedLastIndexOf<T>(array: void | null, value?: ?T): -1;
-    sortedUniq<T>(array?: ?$ReadOnlyArray<T>): Array<T>;
+    sortedUniq<T>(array?: ?Array<T>): Array<T>;
     sortedUniqBy<T>(
-      array?: ?$ReadOnlyArray<T>,
+      array?: ?Array<T>,
       iteratee?: ?ValueOnlyIteratee<T>
     ): Array<T>;
-    tail<T>(array?: ?$ReadOnlyArray<T>): Array<T>;
-    take<T>(array?: ?$ReadOnlyArray<T>, n?: ?number): Array<T>;
-    takeRight<T>(array?: ?$ReadOnlyArray<T>, n?: ?number): Array<T>;
+    tail<T>(array?: ?Array<T>): Array<T>;
+    take<T>(array?: ?Array<T>, n?: ?number): Array<T>;
+    takeRight<T>(array?: ?Array<T>, n?: ?number): Array<T>;
     takeRightWhile<T>(array?: ?Array<T>, predicate?: ?Predicate<T>): Array<T>;
     takeWhile<T>(array?: ?Array<T>, predicate?: ?Predicate<T>): Array<T>;
     union<T>(...arrays?: Array<$ReadOnlyArray<T>>): Array<T>;
@@ -447,59 +442,59 @@ declare module "lodash" {
     uniq<T>(array?: ?$ReadOnlyArray<T>): Array<T>;
     uniqBy<T>(array?: ?$ReadOnlyArray<T>, iteratee?: ?ValueOnlyIteratee<T>): Array<T>;
     uniqWith<T>(array?: ?$ReadOnlyArray<T>, comparator?: ?Comparator<T>): Array<T>;
-    unzip<T>(array?: ?$ReadOnlyArray<T>): Array<T>;
+    unzip<T>(array?: ?Array<T>): Array<T>;
     unzipWith<T>(array: ?Array<T>, iteratee?: ?Iteratee<T>): Array<T>;
     without<T>(array?: ?$ReadOnlyArray<T>, ...values?: Array<?T>): Array<T>;
     xor<T>(...array: Array<Array<T>>): Array<T>;
     //Workaround until (...parameter: T, parameter2: U) works
-    xorBy<T>(a1?: ?$ReadOnlyArray<T>, iteratee?: ?ValueOnlyIteratee<T>): Array<T>;
+    xorBy<T>(a1?: ?Array<T>, iteratee?: ?ValueOnlyIteratee<T>): Array<T>;
     xorBy<T>(
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>,
+      a1: Array<T>,
+      a2: Array<T>,
       iteratee?: ValueOnlyIteratee<T>
     ): Array<T>;
     xorBy<T>(
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>,
-      a3: $ReadOnlyArray<T>,
+      a1: Array<T>,
+      a2: Array<T>,
+      a3: Array<T>,
       iteratee?: ValueOnlyIteratee<T>
     ): Array<T>;
     xorBy<T>(
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>,
-      a3: $ReadOnlyArray<T>,
-      a4: $ReadOnlyArray<T>,
+      a1: Array<T>,
+      a2: Array<T>,
+      a3: Array<T>,
+      a4: Array<T>,
       iteratee?: ValueOnlyIteratee<T>
     ): Array<T>;
     //Workaround until (...parameter: T, parameter2: U) works
-    xorWith<T>(a1?: ?$ReadOnlyArray<T>, comparator?: ?Comparator<T>): Array<T>;
+    xorWith<T>(a1?: ?Array<T>, comparator?: ?Comparator<T>): Array<T>;
     xorWith<T>(
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>,
+      a1: Array<T>,
+      a2: Array<T>,
       comparator?: Comparator<T>
     ): Array<T>;
     xorWith<T>(
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>,
-      a3: $ReadOnlyArray<T>,
+      a1: Array<T>,
+      a2: Array<T>,
+      a3: Array<T>,
       comparator?: Comparator<T>
     ): Array<T>;
     xorWith<T>(
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>,
-      a3: $ReadOnlyArray<T>,
-      a4: $ReadOnlyArray<T>,
+      a1: Array<T>,
+      a2: Array<T>,
+      a3: Array<T>,
+      a4: Array<T>,
       comparator?: Comparator<T>
     ): Array<T>;
-    zip<A, B>(a1?: ?($ReadOnlyArray<A>), a2?: ?($ReadOnlyArray<B>)): Array<[A, B]>;
-    zip<A, B, C>(a1: $ReadOnlyArray<A>, a2: $ReadOnlyArray<B>, a3: $ReadOnlyArray<C>): Array<[A, B, C]>;
-    zip<A, B, C, D>(a1: $ReadOnlyArray<A>, a2: $ReadOnlyArray<B>, a3: $ReadOnlyArray<C>, a4: $ReadOnlyArray<D>): Array<[A, B, C, D]>;
+    zip<A, B>(a1?: ?(A[]), a2?: ?(B[])): Array<[A, B]>;
+    zip<A, B, C>(a1: A[], a2: B[], a3: C[]): Array<[A, B, C]>;
+    zip<A, B, C, D>(a1: A[], a2: B[], a3: C[], a4: D[]): Array<[A, B, C, D]>;
     zip<A, B, C, D, E>(
-      a1: $ReadOnlyArray<A>,
-      a2: $ReadOnlyArray<B>,
-      a3: $ReadOnlyArray<C>,
-      a4: $ReadOnlyArray<D>,
-      a5: $ReadOnlyArray<E>
+      a1: A[],
+      a2: B[],
+      a3: C[],
+      a4: D[],
+      a5: E[]
     ): Array<[A, B, C, D, E]>;
 
     zipObject<K, V>(props: Array<K>, values?: ?Array<V>): { [key: K]: V };
@@ -507,44 +502,44 @@ declare module "lodash" {
     zipObjectDeep(props: any[], values?: ?any): Object;
     zipObjectDeep(props: void | null, values?: ?any): {};
 
-    zipWith<A>(a1?: ?$ReadOnlyArray<A>): Array<[A]>;
-    zipWith<T, A>(a1: $ReadOnlyArray<A>, iteratee: (A) => T): Array<T>;
+    zipWith<A>(a1?: ?Array<A>): Array<[A]>;
+    zipWith<T, A>(a1: Array<A>, iteratee: (A) => T): Array<T>;
 
-    zipWith<A, B>(a1: $ReadOnlyArray<A>, a2: $ReadOnlyArray<B>): Array<[A, B]>;
+    zipWith<A, B>(a1: Array<A>, a2: Array<B>): Array<[A, B]>;
     zipWith<T, A, B>(
-      a1: $ReadOnlyArray<A>,
-      a2: $ReadOnlyArray<B>,
+      a1: Array<A>,
+      a2: Array<B>,
       iteratee: (A, B) => T
-    ): $ReadOnlyArray<T>;
+    ): Array<T>;
 
     zipWith<A, B, C>(
-      a1: $ReadOnlyArray<A>,
-      a2: $ReadOnlyArray<B>,
-      a3: $ReadOnlyArray<C>
+      a1: Array<A>,
+      a2: Array<B>,
+      a3: Array<C>
     ): Array<[A, B, C]>;
     zipWith<T, A, B, C>(
-      a1: $ReadOnlyArray<A>,
-      a2: $ReadOnlyArray<B>,
-      a3: $ReadOnlyArray<C>,
+      a1: Array<A>,
+      a2: Array<B>,
+      a3: Array<C>,
       iteratee: (A, B, C) => T
     ): Array<T>;
 
     zipWith<A, B, C, D>(
-      a1: $ReadOnlyArray<A>,
-      a2: $ReadOnlyArray<B>,
-      a3: $ReadOnlyArray<C>,
-      a4: $ReadOnlyArray<D>
+      a1: Array<A>,
+      a2: Array<B>,
+      a3: Array<C>,
+      a4: Array<D>
     ): Array<[A, B, C, D]>;
     zipWith<T, A, B, C, D>(
-      a1: $ReadOnlyArray<A>,
-      a2: $ReadOnlyArray<B>,
-      a3: $ReadOnlyArray<C>,
-      a4: $ReadOnlyArray<D>,
+      a1: Array<A>,
+      a2: Array<B>,
+      a3: Array<C>,
+      a4: Array<D>,
       iteratee: (A, B, C, D) => T
     ): Array<T>;
 
     // Collection
-    countBy<T>(array: $ReadOnlyArray<T>, iteratee?: ?ValueOnlyIteratee<T>): Object;
+    countBy<T>(array: Array<T>, iteratee?: ?ValueOnlyIteratee<T>): Object;
     countBy<T>(array: void | null, iteratee?: ?ValueOnlyIteratee<T>): {};
     countBy<T: Object>(object: T, iteratee?: ?ValueOnlyIteratee<T>): Object;
     // alias of _.forEach
@@ -680,7 +675,7 @@ declare module "lodash" {
       iteratees?: ?$ReadOnlyArray<Iteratee<T>> | ?string,
       orders?: ?$ReadOnlyArray<"asc" | "desc"> | ?string
     ): Array<T>;
-    orderBy<V, T: {}>(
+    orderBy<V, T: Object>(
       object: T,
       iteratees?: $ReadOnlyArray<OIteratee<*>> | string,
       orders?: $ReadOnlyArray<"asc" | "desc"> | string
@@ -748,11 +743,11 @@ declare module "lodash" {
       object?: ?T,
       predicate?: ?OPredicate<A, T>
     ): Array<V>;
-    sample<T>(array: ?$ReadOnlyArray<T>): T;
+    sample<T>(array: ?Array<T>): T;
     sample<V, T: Object>(object: T): V;
-    sampleSize<T>(array?: ?$ReadOnlyArray<T>, n?: ?number): Array<T>;
+    sampleSize<T>(array?: ?Array<T>, n?: ?number): Array<T>;
     sampleSize<V, T: Object>(object: T, n?: number): Array<V>;
-    shuffle<T>(array: ?$ReadOnlyArray<T>): Array<T>;
+    shuffle<T>(array: ?Array<T>): Array<T>;
     shuffle<V, T: Object>(object: T): Array<V>;
     size(collection: $ReadOnlyArray<any> | Object | string): number;
     some<T>(array: void | null, predicate?: ?Predicate<T>): false;
@@ -790,11 +785,7 @@ declare module "lodash" {
     curry: Curry;
     curry(func: Function, arity?: number): Function;
     curryRight(func: Function, arity?: number): Function;
-    debounce<F: (...any[]) => any>(
-      func: F,
-      wait?: number,
-      options?: DebounceOptions
-    ): F & Cancelable;
+    debounce<F: (...any[]) => any>(func: F, wait?: number, options?: DebounceOptions): F;
     defer(func: (...any[]) => any, ...args?: Array<any>): TimeoutID;
     delay(func: Function, wait: number, ...args?: Array<any>): TimeoutID;
     flip<R>(func: (...any[]) => R): (...any[]) => R;
@@ -814,7 +805,7 @@ declare module "lodash" {
       func: F,
       wait?: number,
       options?: ThrottleOptions
-    ): F & Cancelable;
+    ): F;
     unary<F: (...any[]) => any>(func: F): F;
     wrap(value?: any, wrapper?: ?Function): Function;
 
@@ -839,13 +830,13 @@ declare module "lodash" {
     gte(value: any, other: any): boolean;
     isArguments(value: void | null): false;
     isArguments(value: any): boolean;
-    isArray(value: $ReadOnlyArray<any>): true;
+    isArray(value: Array<any>): true;
     isArray(value: any): false;
     isArrayBuffer(value: ArrayBuffer): true;
     isArrayBuffer(value: any): false;
-    isArrayLike(value: $ReadOnlyArray<any> | string | { length: number }): true;
+    isArrayLike(value: Array<any> | string | { length: number }): true;
     isArrayLike(value: any): false;
-    isArrayLikeObject(value: { length: number } | $ReadOnlyArray<any>): true;
+    isArrayLikeObject(value: { length: number } | Array<any>): true;
     isArrayLikeObject(value: any): false;
     isBoolean(value: boolean): true;
     isBoolean(value: any): false;
@@ -948,16 +939,16 @@ declare module "lodash" {
     ceil(number: number, precision?: number): number;
     divide(dividend: number, divisor: number): number;
     floor(number: number, precision?: number): number;
-    max<T>(array: ?$ReadOnlyArray<T>): T;
+    max<T>(array: ?Array<T>): T;
     maxBy<T>(array: ?$ReadOnlyArray<T>, iteratee?: Iteratee<T>): T;
-    mean(array: $ReadOnlyArray<*>): number;
+    mean(array: Array<*>): number;
     meanBy<T>(array: Array<T>, iteratee?: Iteratee<T>): number;
-    min<T>(array: ?$ReadOnlyArray<T>): T;
+    min<T>(array: ?Array<T>): T;
     minBy<T>(array: ?$ReadOnlyArray<T>, iteratee?: Iteratee<T>): T;
     multiply(multiplier: number, multiplicand: number): number;
     round(number: number, precision?: number): number;
     subtract(minuend: number, subtrahend: number): number;
-    sum(array: $ReadOnlyArray<*>): number;
+    sum(array: Array<*>): number;
     sumBy<T>(array: $ReadOnlyArray<T>, iteratee?: Iteratee<T>): number;
 
     // number
@@ -1075,8 +1066,8 @@ declare module "lodash" {
         source: A | B | C | D
       ) => any | void
     ): Object;
-    at(object?: ?Object, ...paths: $ReadOnlyArray<string>): Array<any>;
-    at(object?: ?Object, paths: $ReadOnlyArray<string>): Array<any>;
+    at(object?: ?Object, ...paths: Array<string>): Array<any>;
+    at(object?: ?Object, paths: Array<string>): Array<any>;
     create(prototype: void | null, properties: void | null): {};
     create<T>(prototype: T, properties: Object): T;
     create(prototype: any, properties: void | null): {};
@@ -1246,15 +1237,15 @@ declare module "lodash" {
         source: A | B | C | D
       ) => any | void
     ): Object;
-    omit(object?: ?Object, ...props: $ReadOnlyArray<string>): Object;
-    omit(object?: ?Object, props: $ReadOnlyArray<string>): Object;
+    omit(object?: ?Object, ...props: Array<string>): Object;
+    omit(object?: ?Object, props: Array<string>): Object;
     omitBy<A, T: { [id: any]: A } | { [id: number]: A }>(
       object: T,
       predicate?: ?OPredicate<A, T>
     ): Object;
     omitBy<A, T>(object: void | null, predicate?: ?OPredicate<A, T>): {};
-    pick(object?: ?Object, ...props: $ReadOnlyArray<string>): Object;
-    pick(object?: ?Object, props: $ReadOnlyArray<string>): Object;
+    pick(object?: ?Object, ...props: Array<string>): Object;
+    pick(object?: ?Object, props: Array<string>): Object;
     pickBy<A, T: { [id: any]: A } | { [id: number]: A }>(
       object: T,
       predicate?: ?OPredicate<A, T>
@@ -1767,65 +1758,65 @@ declare module "lodash/fp" {
     ): number;
     // alias of _.head
     first<T>(array: $ReadOnlyArray<T>): T;
-    flatten<T, X>(array: $ReadOnlyArray<$ReadOnlyArray<T> | X>): Array<T | X>;
+    flatten<T, X>(array: Array<Array<T> | X>): Array<T | X>;
     unnest<T, X>(array: Array<Array<T> | X>): Array<T | X>;
     flattenDeep<T>(array: any[]): Array<T>;
     flattenDepth(depth: number): (array: any[]) => any[];
     flattenDepth(depth: number, array: any[]): any[];
     fromPairs<A, B>(pairs: Array<[A, B]>): { [key: A]: B };
     head<T>(array: $ReadOnlyArray<T>): T;
-    indexOf<T>(value: T): (array: $ReadOnlyArray<T>) => number;
-    indexOf<T>(value: T, array: $ReadOnlyArray<T>): number;
+    indexOf<T>(value: T): (array: Array<T>) => number;
+    indexOf<T>(value: T, array: Array<T>): number;
     indexOfFrom<T>(
       value: T
-    ): ((fromIndex: number) => (array: $ReadOnlyArray<T>) => number) &
-      ((fromIndex: number, array: $ReadOnlyArray<T>) => number);
-    indexOfFrom<T>(value: T, fromIndex: number): (array: $ReadOnlyArray<T>) => number;
-    indexOfFrom<T>(value: T, fromIndex: number, array: $ReadOnlyArray<T>): number;
-    initial<T>(array: $ReadOnlyArray<T>): Array<T>;
+    ): ((fromIndex: number) => (array: Array<T>) => number) &
+      ((fromIndex: number, array: Array<T>) => number);
+    indexOfFrom<T>(value: T, fromIndex: number): (array: Array<T>) => number;
+    indexOfFrom<T>(value: T, fromIndex: number, array: Array<T>): number;
+    initial<T>(array: Array<T>): Array<T>;
     init<T>(array: Array<T>): Array<T>;
-    intersection<T>(a1: $ReadOnlyArray<T>): (a2: $ReadOnlyArray<T>) => Array<T>;
-    intersection<T>(a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>): Array<T>;
+    intersection<T>(a1: Array<T>): (a2: Array<T>) => Array<T>;
+    intersection<T>(a1: Array<T>, a2: Array<T>): Array<T>;
     intersectionBy<T>(
       iteratee: ValueOnlyIteratee<T>
-    ): ((a1: $ReadOnlyArray<T>) => (a2: $ReadOnlyArray<T>) => Array<T>) &
-      ((a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>) => Array<T>);
+    ): ((a1: Array<T>) => (a2: Array<T>) => Array<T>) &
+      ((a1: Array<T>, a2: Array<T>) => Array<T>);
     intersectionBy<T>(
       iteratee: ValueOnlyIteratee<T>,
-      a1: $ReadOnlyArray<T>
+      a1: Array<T>
     ): (a2: Array<T>) => Array<T>;
     intersectionBy<T>(
       iteratee: ValueOnlyIteratee<T>,
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>
+      a1: Array<T>,
+      a2: Array<T>
     ): Array<T>;
     intersectionWith<T>(
       comparator: Comparator<T>
-    ): ((a1: $ReadOnlyArray<T>) => (a2: $ReadOnlyArray<T>) => Array<T>) &
-      ((a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>) => Array<T>);
+    ): ((a1: Array<T>) => (a2: Array<T>) => Array<T>) &
+      ((a1: Array<T>, a2: Array<T>) => Array<T>);
     intersectionWith<T>(
       comparator: Comparator<T>,
-      a1: $ReadOnlyArray<T>
-    ): (a2: $ReadOnlyArray<T>) => Array<T>;
+      a1: Array<T>
+    ): (a2: Array<T>) => Array<T>;
     intersectionWith<T>(
       comparator: Comparator<T>,
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>
+      a1: Array<T>,
+      a2: Array<T>
     ): Array<T>;
-    join<T>(separator: string): (array: $ReadOnlyArray<T>) => string;
-    join<T>(separator: string, array: $ReadOnlyArray<T>): string;
-    last<T>(array: $ReadOnlyArray<T>): T;
-    lastIndexOf<T>(value: T): (array: $ReadOnlyArray<T>) => number;
-    lastIndexOf<T>(value: T, array: $ReadOnlyArray<T>): number;
+    join<T>(separator: string): (array: Array<T>) => string;
+    join<T>(separator: string, array: Array<T>): string;
+    last<T>(array: Array<T>): T;
+    lastIndexOf<T>(value: T): (array: Array<T>) => number;
+    lastIndexOf<T>(value: T, array: Array<T>): number;
     lastIndexOfFrom<T>(
       value: T
-    ): ((fromIndex: number) => (array: $ReadOnlyArray<T>) => number) &
-      ((fromIndex: number, array: $ReadOnlyArray<T>) => number);
+    ): ((fromIndex: number) => (array: Array<T>) => number) &
+      ((fromIndex: number, array: Array<T>) => number);
     lastIndexOfFrom<T>(
       value: T,
       fromIndex: number
-    ): (array: $ReadOnlyArray<T>) => number;
-    lastIndexOfFrom<T>(value: T, fromIndex: number, array: $ReadOnlyArray<T>): number;
+    ): (array: Array<T>) => number;
+    lastIndexOfFrom<T>(value: T, fromIndex: number, array: Array<T>): number;
     nth<T>(n: number): (array: T[]) => T;
     nth<T>(n: number, array: T[]): T;
     pull<T>(value: T): (array: Array<T>) => Array<T>;
@@ -1858,154 +1849,154 @@ declare module "lodash/fp" {
     reverse<T>(array: Array<T>): Array<T>;
     slice<T>(
       start: number
-    ): ((end: number) => (array: $ReadOnlyArray<T>) => Array<T>) &
-      ((end: number, array: $ReadOnlyArray<T>) => Array<T>);
-    slice<T>(start: number, end: number): (array: $ReadOnlyArray<T>) => Array<T>;
-    slice<T>(start: number, end: number, array: $ReadOnlyArray<T>): Array<T>;
-    sortedIndex<T>(value: T): (array: $ReadOnlyArray<T>) => number;
-    sortedIndex<T>(value: T, array: $ReadOnlyArray<T>): number;
+    ): ((end: number) => (array: Array<T>) => Array<T>) &
+      ((end: number, array: Array<T>) => Array<T>);
+    slice<T>(start: number, end: number): (array: Array<T>) => Array<T>;
+    slice<T>(start: number, end: number, array: Array<T>): Array<T>;
+    sortedIndex<T>(value: T): (array: Array<T>) => number;
+    sortedIndex<T>(value: T, array: Array<T>): number;
     sortedIndexBy<T>(
       iteratee: ValueOnlyIteratee<T>
-    ): ((value: T) => (array: $ReadOnlyArray<T>) => number) &
+    ): ((value: T) => (array: Array<T>) => number) &
       ((value: T, array: Array<T>) => number);
     sortedIndexBy<T>(
       iteratee: ValueOnlyIteratee<T>,
       value: T
-    ): (array: $ReadOnlyArray<T>) => number;
+    ): (array: Array<T>) => number;
     sortedIndexBy<T>(
       iteratee: ValueOnlyIteratee<T>,
       value: T,
-      array: $ReadOnlyArray<T>
+      array: Array<T>
     ): number;
-    sortedIndexOf<T>(value: T): (array: $ReadOnlyArray<T>) => number;
-    sortedIndexOf<T>(value: T, array: $ReadOnlyArray<T>): number;
-    sortedLastIndex<T>(value: T): (array: $ReadOnlyArray<T>) => number;
-    sortedLastIndex<T>(value: T, array: $ReadOnlyArray<T>): number;
+    sortedIndexOf<T>(value: T): (array: Array<T>) => number;
+    sortedIndexOf<T>(value: T, array: Array<T>): number;
+    sortedLastIndex<T>(value: T): (array: Array<T>) => number;
+    sortedLastIndex<T>(value: T, array: Array<T>): number;
     sortedLastIndexBy<T>(
       iteratee: ValueOnlyIteratee<T>
-    ): ((value: T) => (array: $ReadOnlyArray<T>) => number) &
+    ): ((value: T) => (array: Array<T>) => number) &
       ((value: T, array: Array<T>) => number);
     sortedLastIndexBy<T>(
       iteratee: ValueOnlyIteratee<T>,
       value: T
-    ): (array: $ReadOnlyArray<T>) => number;
+    ): (array: Array<T>) => number;
     sortedLastIndexBy<T>(
       iteratee: ValueOnlyIteratee<T>,
       value: T,
-      array: $ReadOnlyArray<T>
+      array: Array<T>
     ): number;
-    sortedLastIndexOf<T>(value: T): (array: $ReadOnlyArray<T>) => number;
-    sortedLastIndexOf<T>(value: T, array: $ReadOnlyArray<T>): number;
-    sortedUniq<T>(array: $ReadOnlyArray<T>): Array<T>;
-    sortedUniqBy<T>(iteratee: ValueOnlyIteratee<T>, array: $ReadOnlyArray<T>): Array<T>;
-    tail<T>(array: $ReadOnlyArray<T>): Array<T>;
-    take<T>(n: number): (array: $ReadOnlyArray<T>) => Array<T>;
-    take<T>(n: number, array: $ReadOnlyArray<T>): Array<T>;
-    takeRight<T>(n: number): (array: $ReadOnlyArray<T>) => Array<T>;
-    takeRight<T>(n: number, array: $ReadOnlyArray<T>): Array<T>;
-    takeLast<T>(n: number): (array: $ReadOnlyArray<T>) => Array<T>;
-    takeLast<T>(n: number, array: $ReadOnlyArray<T>): Array<T>;
+    sortedLastIndexOf<T>(value: T): (array: Array<T>) => number;
+    sortedLastIndexOf<T>(value: T, array: Array<T>): number;
+    sortedUniq<T>(array: Array<T>): Array<T>;
+    sortedUniqBy<T>(iteratee: ValueOnlyIteratee<T>, array: Array<T>): Array<T>;
+    tail<T>(array: Array<T>): Array<T>;
+    take<T>(n: number): (array: Array<T>) => Array<T>;
+    take<T>(n: number, array: Array<T>): Array<T>;
+    takeRight<T>(n: number): (array: Array<T>) => Array<T>;
+    takeRight<T>(n: number, array: Array<T>): Array<T>;
+    takeLast<T>(n: number): (array: Array<T>) => Array<T>;
+    takeLast<T>(n: number, array: Array<T>): Array<T>;
     takeRightWhile<T>(predicate: Predicate<T>): (array: Array<T>) => Array<T>;
     takeRightWhile<T>(predicate: Predicate<T>, array: Array<T>): Array<T>;
     takeLastWhile<T>(predicate: Predicate<T>): (array: Array<T>) => Array<T>;
     takeLastWhile<T>(predicate: Predicate<T>, array: Array<T>): Array<T>;
     takeWhile<T>(predicate: Predicate<T>): (array: Array<T>) => Array<T>;
     takeWhile<T>(predicate: Predicate<T>, array: Array<T>): Array<T>;
-    union<T>(a1: $ReadOnlyArray<T>): (a2: Array<T>) => Array<T>;
-    union<T>(a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>): Array<T>;
+    union<T>(a1: Array<T>): (a2: Array<T>) => Array<T>;
+    union<T>(a1: Array<T>, a2: Array<T>): Array<T>;
     unionBy<T>(
       iteratee: ValueOnlyIteratee<T>
-    ): ((a1: $ReadOnlyArray<T>) => (a2: $ReadOnlyArray<T>) => Array<T>) &
-      ((a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>) => Array<T>);
+    ): ((a1: Array<T>) => (a2: Array<T>) => Array<T>) &
+      ((a1: Array<T>, a2: Array<T>) => Array<T>);
     unionBy<T>(
       iteratee: ValueOnlyIteratee<T>,
-      a1: $ReadOnlyArray<T>
-    ): (a2: $ReadOnlyArray<T>) => Array<T>;
+      a1: Array<T>
+    ): (a2: Array<T>) => Array<T>;
     unionBy<T>(
       iteratee: ValueOnlyIteratee<T>,
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>
+      a1: Array<T>,
+      a2: Array<T>
     ): Array<T>;
     unionWith<T>(
       comparator: Comparator<T>
-    ): ((a1: $ReadOnlyArray<T>) => (a2: $ReadOnlyArray<T>) => Array<T>) &
-      ((a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>) => Array<T>);
+    ): ((a1: Array<T>) => (a2: Array<T>) => Array<T>) &
+      ((a1: Array<T>, a2: Array<T>) => Array<T>);
     unionWith<T>(
       comparator: Comparator<T>,
-      a1: $ReadOnlyArray<T>
-    ): (a2: $ReadOnlyArray<T>) => Array<T>;
+      a1: Array<T>
+    ): (a2: Array<T>) => Array<T>;
     unionWith<T>(
       comparator: Comparator<T>,
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>
+      a1: Array<T>,
+      a2: Array<T>
     ): Array<T>;
-    uniq<T>(array: $ReadOnlyArray<T>): Array<T>;
-    uniqBy<T>(iteratee: ValueOnlyIteratee<T>): (array: $ReadOnlyArray<T>) => Array<T>;
-    uniqBy<T>(iteratee: ValueOnlyIteratee<T>, array: $ReadOnlyArray<T>): Array<T>;
-    uniqWith<T>(comparator: Comparator<T>): (array: $ReadOnlyArray<T>) => Array<T>;
-    uniqWith<T>(comparator: Comparator<T>, array: $ReadOnlyArray<T>): Array<T>;
-    unzip<T>(array: $ReadOnlyArray<T>): Array<T>;
+    uniq<T>(array: Array<T>): Array<T>;
+    uniqBy<T>(iteratee: ValueOnlyIteratee<T>): (array: Array<T>) => Array<T>;
+    uniqBy<T>(iteratee: ValueOnlyIteratee<T>, array: Array<T>): Array<T>;
+    uniqWith<T>(comparator: Comparator<T>): (array: Array<T>) => Array<T>;
+    uniqWith<T>(comparator: Comparator<T>, array: Array<T>): Array<T>;
+    unzip<T>(array: Array<T>): Array<T>;
     unzipWith<T>(iteratee: Iteratee<T>): (array: Array<T>) => Array<T>;
     unzipWith<T>(iteratee: Iteratee<T>, array: Array<T>): Array<T>;
-    without<T>(values: $ReadOnlyArray<T>): (array: $ReadOnlyArray<T>) => Array<T>;
-    without<T>(values: $ReadOnlyArray<T>, array: $ReadOnlyArray<T>): Array<T>;
-    xor<T>(a1: $ReadOnlyArray<T>): (a2: $ReadOnlyArray<T>) => Array<T>;
-    xor<T>(a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>): Array<T>;
-    symmetricDifference<T>(a1: $ReadOnlyArray<T>): (a2: $ReadOnlyArray<T>) => Array<T>;
-    symmetricDifference<T>(a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>): Array<T>;
+    without<T>(values: Array<T>): (array: Array<T>) => Array<T>;
+    without<T>(values: Array<T>, array: Array<T>): Array<T>;
+    xor<T>(a1: Array<T>): (a2: Array<T>) => Array<T>;
+    xor<T>(a1: Array<T>, a2: Array<T>): Array<T>;
+    symmetricDifference<T>(a1: Array<T>): (a2: Array<T>) => Array<T>;
+    symmetricDifference<T>(a1: Array<T>, a2: Array<T>): Array<T>;
     xorBy<T>(
       iteratee: ValueOnlyIteratee<T>
-    ): ((a1: $ReadOnlyArray<T>) => (a2: $ReadOnlyArray<T>) => Array<T>) &
-      ((a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>) => Array<T>);
+    ): ((a1: Array<T>) => (a2: Array<T>) => Array<T>) &
+      ((a1: Array<T>, a2: Array<T>) => Array<T>);
     xorBy<T>(
       iteratee: ValueOnlyIteratee<T>,
-      a1: $ReadOnlyArray<T>
-    ): (a2: $ReadOnlyArray<T>) => Array<T>;
+      a1: Array<T>
+    ): (a2: Array<T>) => Array<T>;
     xorBy<T>(
       iteratee: ValueOnlyIteratee<T>,
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>
+      a1: Array<T>,
+      a2: Array<T>
     ): Array<T>;
     symmetricDifferenceBy<T>(
       iteratee: ValueOnlyIteratee<T>
-    ): ((a1: $ReadOnlyArray<T>) => (a2: $ReadOnlyArray<T>) => Array<T>) &
-      ((a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>) => Array<T>);
+    ): ((a1: Array<T>) => (a2: Array<T>) => Array<T>) &
+      ((a1: Array<T>, a2: Array<T>) => Array<T>);
     symmetricDifferenceBy<T>(
       iteratee: ValueOnlyIteratee<T>,
-      a1: $ReadOnlyArray<T>
+      a1: Array<T>
     ): (a2: Array<T>) => Array<T>;
     symmetricDifferenceBy<T>(
       iteratee: ValueOnlyIteratee<T>,
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>
+      a1: Array<T>,
+      a2: Array<T>
     ): Array<T>;
     xorWith<T>(
       comparator: Comparator<T>
-    ): ((a1: $ReadOnlyArray<T>) => (a2: $ReadOnlyArray<T>) => Array<T>) &
-      ((a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>) => Array<T>);
+    ): ((a1: Array<T>) => (a2: Array<T>) => Array<T>) &
+      ((a1: Array<T>, a2: Array<T>) => Array<T>);
     xorWith<T>(
       comparator: Comparator<T>,
-      a1: $ReadOnlyArray<T>
-    ): (a2: $ReadOnlyArray<T>) => Array<T>;
-    xorWith<T>(comparator: Comparator<T>, a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>): Array<T>;
+      a1: Array<T>
+    ): (a2: Array<T>) => Array<T>;
+    xorWith<T>(comparator: Comparator<T>, a1: Array<T>, a2: Array<T>): Array<T>;
     symmetricDifferenceWith<T>(
       comparator: Comparator<T>
-    ): ((a1: $ReadOnlyArray<T>) => (a2: $ReadOnlyArray<T>) => Array<T>) &
-      ((a1: $ReadOnlyArray<T>, a2: $ReadOnlyArray<T>) => Array<T>);
+    ): ((a1: Array<T>) => (a2: Array<T>) => Array<T>) &
+      ((a1: Array<T>, a2: Array<T>) => Array<T>);
     symmetricDifferenceWith<T>(
       comparator: Comparator<T>,
-      a1: $ReadOnlyArray<T>
-    ): (a2: $ReadOnlyArray<T>) => Array<T>;
+      a1: Array<T>
+    ): (a2: Array<T>) => Array<T>;
     symmetricDifferenceWith<T>(
       comparator: Comparator<T>,
-      a1: $ReadOnlyArray<T>,
-      a2: $ReadOnlyArray<T>
+      a1: Array<T>,
+      a2: Array<T>
     ): Array<T>;
-    zip<A, B>(a1: $ReadOnlyArray<A>): (a2: $ReadOnlyArray<B>) => Array<[A, B]>;
-    zip<A, B>(a1: $ReadOnlyArray<A>, a2: $ReadOnlyArray<B>): Array<[A, B]>;
-    zipAll(arrays: $ReadOnlyArray<$ReadOnlyArray<any>>): Array<any>;
-    zipObject<K, V>(props?: $ReadOnlyArray<K>): (values?: $ReadOnlyArray<V>) => { [key: K]: V };
-    zipObject<K, V>(props?: $ReadOnlyArray<K>, values?: $ReadOnlyArray<V>): { [key: K]: V };
+    zip<A, B>(a1: A[]): (a2: B[]) => Array<[A, B]>;
+    zip<A, B>(a1: A[], a2: B[]): Array<[A, B]>;
+    zipAll(arrays: Array<Array<any>>): Array<any>;
+    zipObject<K, V>(props?: Array<K>): (values?: Array<V>) => { [key: K]: V };
+    zipObject<K, V>(props?: Array<K>, values?: Array<V>): { [key: K]: V };
     zipObj(props: Array<any>): (values: Array<any>) => Object;
     zipObj(props: Array<any>, values: Array<any>): Object;
     zipObjectDeep(props: any[]): (values: any) => Object;
@@ -2026,10 +2017,10 @@ declare module "lodash/fp" {
     // Collection
     countBy<T>(
       iteratee: ValueOnlyIteratee<T>
-    ): (collection: $ReadOnlyArray<T> | { [id: any]: T }) => { [string]: number };
+    ): (collection: Array<T> | { [id: any]: T }) => { [string]: number };
     countBy<T>(
       iteratee: ValueOnlyIteratee<T>,
-      collection: $ReadOnlyArray<T> | { [id: any]: T }
+      collection: Array<T> | { [id: any]: T }
     ): { [string]: number };
     // alias of _.forEach
     each<T>(
@@ -2955,10 +2946,8 @@ declare module "lodash/fp" {
       predicate: OPredicate<A>
     ): (object: T) => Object;
     omitBy<A, T: { [id: any]: A }>(predicate: OPredicate<A>, object: T): Object;
-    pick(...props: Array<string | {}>): Object;
-    pick(props: $ReadOnlyArray<string>, object: Object): Object;
-    pick(...props: Array<string>): (object: Object) => Object;
-    pick(props: $ReadOnlyArray<string>): (object: Object) => Object;
+    pick(props: Array<string>): (object: Object) => Object;
+    pick(props: Array<string>, object: Object): Object;
     pickAll(props: Array<string>): (object: Object) => Object;
     pickAll(props: Array<string>, object: Object): Object;
     pickBy<A, T: { [id: any]: A }>(

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

@@ -1,5 +1,5 @@
-// flow-typed signature: d2ddacbbca9700881249a9435381e689
-// flow-typed version: c6154227d1/react-redux_v7.x.x/flow_>=v0.89.x <=v0.103.x
+// flow-typed signature: f06f00c3ad0cfedb90c0c6de04b219f3
+// flow-typed version: 3a6d556e4b/react-redux_v5.x.x/flow_>=v0.89.x
 
 /**
 The order of type arguments for connect() is as follows:
@@ -27,7 +27,6 @@ Decrypting the abbreviations:
   RMP = Returned merge props
   CP = Props for returned component
   Com = React Component
-  SS = Selected state
   ST = Static properties of Com
   EFO = Extra factory options (used only in connectAdvanced)
 */
@@ -39,7 +38,7 @@ declare module "react-redux" {
 
   declare export type Options<S, OP, SP, MP> = {|
     pure?: boolean,
-    forwardRef?: boolean,
+    withRef?: boolean,
     areStatesEqual?: (next: S, prev: S) => boolean,
     areOwnPropsEqual?: (next: OP, prev: OP) => boolean,
     areStatePropsEqual?: (next: SP, prev: SP) => boolean,
@@ -199,19 +198,6 @@ declare module "react-redux" {
     options?: ?Options<S, OP, SP, P>,
   ): Connector<P, OP, P>;
 
-  // ------------------------------------------------------------
-  // Typings for Hooks
-  // ------------------------------------------------------------
-
-  declare export function useDispatch<D>(): D;
-
-  declare export function useSelector<S, SS>(
-    selector: (state: S) => SS,
-    equalityFn?: (a: SS, b: SS) => boolean,
-  ): SS;
-
-  declare export function useStore<Store>(): Store;
-
   // ------------------------------------------------------------
   // Typings for Provider
   // ------------------------------------------------------------
@@ -236,7 +222,7 @@ declare module "react-redux" {
     renderCountProp?: string,
     shouldHandleStateChanges?: boolean,
     storeKey?: string,
-    forwardRef?: boolean,
+    withRef?: boolean,
   };
 
   declare type SelectorFactoryOptions<Com> = {
@@ -245,7 +231,7 @@ declare module "react-redux" {
     renderCountProp: ?string,
     shouldHandleStateChanges: boolean,
     storeKey: string,
-    forwardRef: boolean,
+    withRef: boolean,
     displayName: string,
     wrappedComponentName: string,
     WrappedComponent: Com,
@@ -286,8 +272,5 @@ declare module "react-redux" {
     createProvider: typeof createProvider,
     connect: typeof connect,
     connectAdvanced: typeof connectAdvanced,
-    useDispatch: typeof useDispatch,
-    useSelector: typeof useSelector,
-    useStore: typeof useStore,
   };
 }