misc: s/Atlassian/8x8/

On some Samsung devices the call done with the ConnectionService end up
in the native call history which we don't want. That's fixable by
marking the Connection as "external" just before the call is
disconnected.

Another issue specific to Samsung devices about the audio focus not
always being release when that call ends. That's fixable by marking
the call as holding just before disconnecting it.

.flowconfig

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

.gitignore

@@ -70,8 +70,10 @@ buck-out/
 */fastlane/Preview.html
 */fastlane/screenshots
 
-# Bundle artifact
+# Build artifacts
 *.jsbundle
+*.framework
+android/app/release
 
 # precommit-hook
 .jshintignore
@@ -80,3 +82,10 @@ buck-out/
 # VSCode files
 android/.project
 android/.settings/org.eclipse.buildship.core.prefs
+
+# Secrets
+android/app/dropbox.key
+android/app/google-services.json
+ios/app/dropbox.key
+ios/app/GoogleService-Info.plist
+

CONTRIBUTING.md

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

Makefile

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

README.md

@@ -1,16 +1,16 @@
 # Jitsi Meet - Secure, Simple and Scalable Video Conferences
 
-Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses [Jitsi Videobridge](https://jitsi.org/videobridge) to provide high quality, [secure](#security) and scalable video conferences. You can see Jitsi Meet in action [here at the session #482 of the VoIP Users Conference](http://youtu.be/7vFUVClsNh0).
+Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses [Jitsi Videobridge](https://jitsi.org/videobridge) to provide high quality, [secure](#security) and scalable video conferences. Jitsi Meet in action can be seen at [here at the session #482 of the VoIP Users Conference](http://youtu.be/7vFUVClsNh0).
 
-The Jitsi Meet client runs in your browser, without the need for installing anything on your computer. You can also try it out yourself at https://meet.jit.si .
+The Jitsi Meet client runs in your browser, without installing anything on your computer. You can try it out at https://meet.jit.si .
 
-Jitsi Meet allows for very efficient collaboration. It allows users to stream their desktop or only some windows. It also supports shared document editing with Etherpad.
+Jitsi Meet allows very efficient collaboration. Users can stream their desktop or only some windows. It also supports shared document editing with Etherpad.
 
 ## Installation
 
-On the client side, no installation is necessary. You just point your browser to the URL of your deployment. This section is about installing the Jitsi Meet suite on your server and hosting your own conferencing service.
+On the client side, no installation is necessary. You just point your browser to the URL of your deployment. This section is about installing a Jitsi Meet suite on your server and hosting your own conferencing service.
 
-Installing Jitsi Meet is quite a simple experience. For Debian-based systems, we recommend following the [quick-install](https://github.com/jitsi/jitsi-meet/blob/master/doc/quick-install.md) document, which uses the package system. You can also see a demonstration of the process in [this tutorial video](https://jitsi.org/tutorial).
+Installing Jitsi Meet is a simple experience. For Debian-based system, following the [quick-install](https://github.com/jitsi/jitsi-meet/blob/master/doc/quick-install.md) document, which uses the package system. You can also see a demonstration of the process in [this tutorial video](https://jitsi.org/tutorial).
 
 For other systems, or if you wish to install all components manually, see the [detailed manual installation instructions](https://github.com/jitsi/jitsi-meet/blob/master/doc/manual-install.md).
 
@@ -59,7 +59,7 @@ To work with local copy you must change the path to:
 "lib-jitsi-meet": "file:///Users/name/local-lib-jitsi-meet-copy",
 ```
 
-To make the project you must force it to take the sources as 'npm update' will not do it.
+To make the project you must force it to take the sources as 'npm update':
 ```
 npm install lib-jitsi-meet --force && make
 ```
@@ -84,8 +84,8 @@ cd ../jitsi-meet
 npm link lib-jitsi-meet
 ```
 
-So now after changes in local `lib-jitsi-meet` repository you can rebuild it with `npm run install` and your `jitsi-meet` repository will use that modified library.
-Note: when using node version 4.x, the make file of jitsi-meet do npm update which will delete the link, no longer the case with version 6.x.
+ After changes in local `lib-jitsi-meet` repository, you can rebuild it with `npm run install` and your `jitsi-meet` repository will use that modified library.
+Note: when using node version 4.x, the make file of jitsi-meet do npm update which will delete the link. It is no longer the case with version 6.x.
 
 If you do not want to use local repository anymore you should run
 ```bash
@@ -100,7 +100,7 @@ Use it at the CLI, type
 make dev
 ```
 
-By default the backend deployment used is `beta.meet.jit.si`, you can point the Jitsi-Meet app at a different backend by using a proxy server. To do this set the WEBPACK_DEV_SERVER_PROXY_TARGET variable:
+By default the backend deployment used is `beta.meet.jit.si`. You can point the Jitsi-Meet app at a different backend by using a proxy server. To do this, set the WEBPACK_DEV_SERVER_PROXY_TARGET variable:
 ```
 export WEBPACK_DEV_SERVER_PROXY_TARGET=https://your-example-server.com
 make dev
@@ -115,18 +115,16 @@ see our [guidelines for contributing](CONTRIBUTING.md).
 
 ## Embedding in external applications
 
-Jitsi Meet provides a very flexible way of embedding it in external applications by using the [Jitsi Meet API](doc/api.md).
+Jitsi Meet provides a very flexible way of embedding in external applications by using the [Jitsi Meet API](doc/api.md).
 
 ## Security
-WebRTC today does not provide a way of conducting multiparty conversations with
-end-to-end encryption. As a matter of fact, unless you consistently vocally
-compare DTLS fingerprints with your peers, the same goes for one-to-one calls.
-As a result when using a Jitsi Meet instance, your stream is encrypted on the
-network but decrypted on the machine that hosts the bridge.
+WebRTC does not provide a way of conducting multi-party conversations with end-to-end encryption. 
+Unless you consistently compare DTLS fingerprints with your peers vocally, the same goes for one-to-one calls.
+As a result, your stream is encrypted on the network but decrypted on the machine that hosts the bridge when using Jitsi Meet.
 
 The Jitsi Meet architecture allows you to deploy your own version, including
-all server components, and in that case your security guarantees will be roughly
-equivalent to these of a direct one-to-one WebRTC call. This is what's unique to
+all server components. In that case, your security guarantees will be roughly
+equivalent to a direct one-to-one WebRTC call. This is the uniqueness of
 Jitsi Meet in terms of security.
 
 The [meet.jit.si](https://meet.jit.si) service is maintained by the Jitsi team
@@ -138,4 +136,4 @@ Instructions on how to build it can be found [here](doc/mobile.md).
 
 ## Acknowledgements
 
-Jitsi Meet started out as a sample conferencing application using Jitsi Videobridge. It was originally developed by then ESTOS' developer Philipp Hancke who then contributed it to the community where development continues with joint forces!
+Jitsi Meet started out as a sample conferencing application using Jitsi Videobridge. It was originally developed by ESTOS' developer Philipp Hancke who then contributed it to the community where development continues with joint forces!

android/README.md

@@ -33,19 +33,6 @@ dependencies {
 }
 ```
 
-Also, enable 32bit mode for react-native, since react-native only supports 32bit apps. (If you have a 64bit device, it will not run unless this setting it set)
-
-```gradle
-android {
-    ...
-    defaultConfig {
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
-    }
-    ...
-```
-
 ### Build and use your own SDK artifacts/binaries
 
 <details>
@@ -69,10 +56,6 @@ To copy React Native to your local Maven repository, you can simply copy part of
 
     $ cp -r ../node_modules/react-native/android/com /tmp/repo/
 
-In the same way, copy the JavaScriptCore dependency:
-
-    $ cp -r ../node_modules/jsc-android/dist/org /tmp/repo/
-
 Alternatively, you can use the scripts located in the android/scripts directory to publish these dependencies to your Maven repo.
 
 Third-party React Native _modules_, which Jitsi Meet SDK for Android depends on, are download by NPM in source code form. These need to be assembled into Maven artifacts, and then published to your local Maven repository. The SDK project facilitates this.
@@ -167,14 +150,14 @@ View is strongly recommended.
 package org.jitsi.example;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import android.support.v4.app.FragmentActivity;
 
 import org.jitsi.meet.sdk.JitsiMeetView;
 import org.jitsi.meet.sdk.ReactActivityLifecycleCallbacks;
 
 // Example
 //
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends FragmentActivity implements JitsiMeetActivityInterface {
     private JitsiMeetView view;
 
     @Override
@@ -182,13 +165,13 @@ public class MainActivity extends AppCompatActivity {
             int requestCode,
             int resultCode,
             Intent data) {
-        ReactActivityLifecycleCallbacks.onActivityResult(
+        JitsiMeetActivityDelegate.onActivityResult(
                 this, requestCode, resultCode, data);
     }
 
     @Override
     public void onBackPressed() {
-        ReactActivityLifecycleCallbacks.onBackPressed();
+        JitsiMeetActivityDelegate.onBackPressed();
     }
 
     @Override
@@ -196,7 +179,10 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         view = new JitsiMeetView(this);
-        view.loadURL(null);
+        JitsiMeetConferenceOptions options = new JitsiMeetConferenceOptions.Builder()
+            .setRoom("https://meet.jit.si/test123")
+            .build();
+        view.join(options);
 
         setContentView(view);
     }
@@ -208,12 +194,12 @@ public class MainActivity extends AppCompatActivity {
         view.dispose();
         view = null;
 
-        ReactActivityLifecycleCallbacks.onHostDestroy(this);
+        JitsiMeetActivityDelegate.onHostDestroy(this);
     }
 
     @Override
     public void onNewIntent(Intent intent) {
-        ReactActivityLifecycleCallbacks.onNewIntent(intent);
+        JitsiMeetActivityDelegate.onNewIntent(intent);
     }
 
     @Override
@@ -221,21 +207,21 @@ public class MainActivity extends AppCompatActivity {
             final int requestCode,
             final String[] permissions,
             final int[] grantResults) {
-        ReactActivityLifecycleCallbacks.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
-        ReactActivityLifecycleCallbacks.onHostResume(this);
+        JitsiMeetActivityDelegate.onHostResume(this);
     }
 
     @Override
     protected void onStop() {
         super.onStop();
 
-        ReactActivityLifecycleCallbacks.onHostPause(this);
+        JitsiMeetActivityDelegate.onHostPause(this);
     }
 }
 ```
@@ -262,103 +248,62 @@ implementation("com.github.bumptech.glide:annotations:${glideVersion}") {
 
 ### JitsiMeetActivity
 
-This class encapsulates a high level API in the form of an Android `Activity`
-which displays a single `JitsiMeetView`.
+This class encapsulates a high level API in the form of an Android `FragmentActivity`
+which displays a single `JitsiMeetView`. You can pass a URL as a `ACTION_VIEW`
+on the Intent when starting it and it will join the conference, and will be
+automatically terminated (finish() will be called on the activity) when the
+conference ends or fails.
 
 ### JitsiMeetView
 
 The `JitsiMeetView` class is the core of Jitsi Meet SDK. It's designed to
 display a Jitsi Meet conference (or a welcome page).
 
+#### join(options)
+
+Joins the conference specified by the given `JitsiMeetConferenceOptions`.
+
+#### leave()
+
+Leaves the currently active conference. If the welcome page is enabled it will
+go back to it, otherwise a black window will be shown.
+
 #### dispose()
 
 Releases all resources associated with this view. This method MUST be called
 when the Activity holding this view is going to be destroyed, usually in the
 `onDestroy()` method.
 
-#### getDefaultURL()
-
-Returns the default base URL used to join a conference when a partial URL (e.g.
-a room name only) is specified to `loadURLString`/`loadURLObject`. If not set or
-if set to `null`, the default built in JavaScript is used: https://meet.jit.si.
-
 #### getListener()
 
 Returns the `JitsiMeetViewListener` instance attached to the view.
 
-#### isPictureInPictureEnabled()
-
-Returns `true` if Picture-in-Picture is enabled; `false`, otherwise. If not
-explicitly set (by a preceding `setPictureInPictureEnabled` call), defaults to
-`true` if the platform supports Picture-in-Picture natively; `false`, otherwise.
-
-#### isWelcomePageEnabled()
-
-Returns true if the Welcome page is enabled; otherwise, false. If false, a black
-empty view will be rendered when not in a conference. Defaults to false.
-
-#### loadURL(URL)
-
-Loads a specific URL which may identify a conference to join. If the specified
-URL is null and the Welcome page is enabled, the Welcome page is displayed
-instead.
-
-#### loadURLString(String)
-
-Loads a specific URL which may identify a conference to join. If the specified
-URL is null and the Welcome page is enabled, the Welcome page is displayed
-instead.
-
-#### loadURLObject(Bundle)
-
-Loads a specific URL which may identify a conference to join. The URL is
-specified in the form of a Bundle of properties which (1) internally are
-sufficient to construct a URL (string) while (2) abstracting the specifics of
-constructing the URL away from API clients/consumers. If the specified URL is
-null and the Welcome page is enabled, the Welcome page is displayed instead.
-
-Example:
-
-```java
-Bundle config = new Bundle();
-config.putBoolean("startWithAudioMuted", true);
-config.putBoolean("startWithVideoMuted", false);
-Bundle urlObject = new Bundle();
-urlObject.putBundle("config", config);
-urlObject.putString("url", "https://meet.jit.si/Test123");
-view.loadURLObject(urlObject);
-```
-
-#### setDefaultURL(URL)
-
-Sets the default URL. See `getDefaultURL` for more information.
-
-NOTE: Must be called before (if at all) `loadURL`/`loadURLString` for it to take
-effect.
-
 #### setListener(listener)
 
 Sets the given listener (class implementing the `JitsiMeetViewListener`
 interface) on the view.
 
-#### setPictureInPictureEnabled(boolean)
+### JitsiMeetConferenceOptions
 
-Sets whether Picture-in-Picture is enabled. If not set, Jitsi Meet SDK
-automatically enables/disables Picture-in-Picture based on native platform
-support.
+This object encapsulates all the options that can be tweaked when joining
+a conference.
 
-NOTE: Must be called (if at all) before `loadURL`/`loadURLString` for it to take
-effect.
+Example:
 
-#### setWelcomePageEnabled(boolean)
+```java
+JitsiMeetConferenceOptions options = new JitsiMeetConferenceOptions.Builder()
+    .setServerURL(new URL("https://meet.jit.si"))
+    .setRoom("test123")
+    .setAudioMuted(false)
+    .setVideoMuted(false)
+    .setAudioOnly(false)
+    .setWelcomePageEnabled(false)
+    .build();
+```
 
-Sets whether the Welcome page is enabled. See `isWelcomePageEnabled` for more
-information.
+See the `JitsiMeetConferenceOptions` implementation for all available options.
 
-NOTE: Must be called (if at all) before `loadURL`/`loadURLString` for it to take
-effect.
-
-### ReactActivityLifecycleCallbacks
+### JitsiMeetActivityDelegate
 
 This class handles the interaction between `JitsiMeetView` and its enclosing
 `Activity`. Generally this shouldn't be consumed by users, because they'd be
@@ -414,29 +359,20 @@ This is a static method.
 `JitsiMeetViewListener` provides an interface apps can implement to listen to
 the state of the Jitsi Meet conference displayed in a `JitsiMeetView`.
 
-`JitsiMeetViewAdapter`, a default implementation of the
-`JitsiMeetViewListener` interface is also provided. Apps may extend the class
-instead of implementing the interface in order to minimize boilerplate.
-
-##### onConferenceFailed
-
-Called when a joining a conference was unsuccessful or when there was an error
-while in a conference.
-
-The `data` `Map` contains an "error" key describing the error and a "url" key
-with the conference URL.
-
 #### onConferenceJoined
 
 Called when a conference was joined.
 
 The `data` `Map` contains a "url" key with the conference URL.
 
-#### onConferenceLeft
+#### onConferenceTerminated
 
-Called when a conference was left.
+Called when a conference was terminated either by user choice or due to a
+failure.
 
-The `data` `Map` contains a "url" key with the conference URL.
+The `data` `Map` contains an "error" key with the error and a "url" key
+with the conference URL. If the conference finished gracefully no `error`
+key will be present.
 
 #### onConferenceWillJoin
 
@@ -444,20 +380,6 @@ Called before a conference is joined.
 
 The `data` `Map` contains a "url" key with the conference URL.
 
-#### onConferenceWillLeave
-
-Called before a conference is left.
-
-The `data` `Map` contains a "url" key with the conference URL.
-
-#### onLoadConfigError
-
-Called when loading the main configuration file from the Jitsi Meet deployment
-fails.
-
-The `data` `Map` contains an "error" key with the error and a "url" key with the
-conference URL which necessitated the loading of the configuration file.
-
 ## ProGuard rules
 
 When using the SDK on a project some proguard rules have to be added in order
@@ -470,10 +392,6 @@ rules file: https://github.com/jitsi/jitsi-meet/blob/master/android/app/proguard
 Picture-in-Picture style scenario, in a rectangle too small to accommodate its
 "full" UI.
 
-Jitsi Meet SDK automatically enables (unless explicitly disabled by a
-`setPictureInPictureEnabled(false)` call) Android's native Picture-in-Picture
-mode iff the platform is supported i.e. Android >= Oreo.
-
 ## Dropbox integration
 
 To setup the Dropbox integration, follow these steps:

android/app/build.gradle

@@ -8,6 +8,11 @@ if (googleServicesEnabled) {
     apply plugin: 'io.fabric'
 }
 
+// Use the number of seconds/10 since Jan 1 2019 as the versionCode.
+// This lets us upload a new build at most every 10 seconds for the
+// next ~680 years.
+// https://stackoverflow.com/a/38643838
+def vcode = (int)(((new Date().getTime()/1000) - 1546297200) / 10)
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -15,24 +20,14 @@ android {
 
     defaultConfig {
         applicationId 'org.jitsi.meet'
-        versionCode Integer.parseInt(project.buildNumber)
+        versionCode vcode
         versionName project.appVersion
 
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
         ndk {
-            abiFilters 'armeabi-v7a', 'x86'
-        }
-
-        packagingOptions {
-            // The project react-native does not provide 64-bit binaries at the
-            // time of this writing. Unfortunately, packaging any 64-bit
-            // binaries into the .apk will crash the app at runtime on 64-bit
-            // platforms.
-            exclude '/lib/mips64/**'
-            exclude '/lib/arm64-v8a/**'
-            exclude '/lib/x86_64/**'
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
     }
 
@@ -114,7 +109,7 @@ gradle.projectsEvaluated {
 
         android.applicationVariants.all { variant ->
             variant.outputs.each { output ->
-                output.processManifest.doLast {
+                output.getProcessManifestProvider().get().doLast {
                     def outputDir = manifestOutputDirectory.get().asFile
                     def manifestPath = new File(outputDir, 'AndroidManifest.xml')
                     def charset = 'UTF-8'
@@ -126,6 +121,41 @@ gradle.projectsEvaluated {
             }
         }
     }
+
+    // Run React packager
+    android.applicationVariants.all { variant ->
+        def targetName = variant.name.capitalize()
+
+        def currentRunPackagerTask = tasks.create(
+                name: "run${targetName}ReactPackager",
+                type: Exec) {
+            group = "react"
+            description = "Run the React packager."
+
+            doFirst {
+                println "Starting the React packager..."
+
+                def androidRoot = file("${projectDir}/../")
+
+                // Set up the call to the script
+                workingDir androidRoot
+
+                // Run the packager
+                commandLine("scripts/run-packager.sh")
+            }
+
+            // Set up dev mode
+            def devEnabled = !targetName.toLowerCase().contains("release")
+
+            // Only enable for dev builds
+            enabled devEnabled
+        }
+
+        def packageTask = variant.packageApplicationProvider.get()
+
+        packageTask.dependsOn(currentRunPackagerTask)
+    }
+
 }
 
 if (googleServicesEnabled) {

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

@@ -17,16 +17,19 @@
 
 package org.jitsi.meet;
 
+import android.content.Intent;
 import android.net.Uri;
-import android.os.Bundle;
+import android.os.Build;
+import android.provider.Settings;
+import android.support.annotation.Nullable;
 import android.util.Log;
+import android.view.KeyEvent;
 
+import org.jitsi.meet.sdk.JitsiMeet;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
-import org.jitsi.meet.sdk.JitsiMeetView;
-import org.jitsi.meet.sdk.JitsiMeetViewListener;
+import org.jitsi.meet.sdk.JitsiMeetConferenceOptions;
 
 import com.crashlytics.android.Crashlytics;
-import com.facebook.react.bridge.UiThreadUtil;
 import com.google.firebase.dynamiclinks.FirebaseDynamicLinks;
 import io.fabric.sdk.android.Fabric;
 
@@ -35,87 +38,25 @@ import java.net.URL;
 import java.util.Map;
 
 /**
- * The one and only {@link Activity} that the Jitsi Meet app needs. The
+ * The one and only Activity that the Jitsi Meet app needs. The
  * {@code Activity} is launched in {@code singleTask} mode, so it will be
  * created upon application initialization and there will be a single instance
  * of it. Further attempts at launching the application once it was already
- * launched will result in {@link Activity#onNewIntent(Intent)} being called.
- *
- * This {@code Activity} extends {@link JitsiMeetActivity} to keep the React
- * Native CLI working, since the latter always tries to launch an
- * {@code Activity} named {@code MainActivity} when doing
- * {@code react-native run-android}.
+ * launched will result in {@link MainActivity#onNewIntent(Intent)} being called.
  */
 public class MainActivity extends JitsiMeetActivity {
+    /**
+     * The request code identifying requests for the permission to draw on top
+     * of other apps. The value must be 16-bit and is arbitrarily chosen here.
+     */
+    private static final int OVERLAY_PERMISSION_REQUEST_CODE
+        = (int) (Math.random() * Short.MAX_VALUE);
+
+    // JitsiMeetActivity overrides
+    //
 
     @Override
-    protected JitsiMeetView initializeView() {
-        JitsiMeetView view = super.initializeView();
-
-        // XXX In order to increase (1) awareness of API breakages and (2) API
-        // coverage, utilize JitsiMeetViewListener in the Debug configuration of
-        // the app.
-        if (BuildConfig.DEBUG && view != null) {
-            view.setListener(new JitsiMeetViewListener() {
-                private void on(String name, Map<String, Object> data) {
-                    UiThreadUtil.assertOnUiThread();
-
-                    // Log with the tag "ReactNative" in order to have the log
-                    // visible in react-native log-android as well.
-                    Log.d(
-                        "ReactNative",
-                        JitsiMeetViewListener.class.getSimpleName() + " "
-                            + name + " "
-                            + data);
-                }
-
-                @Override
-                public void onConferenceFailed(Map<String, Object> data) {
-                    on("CONFERENCE_FAILED", data);
-                }
-
-                @Override
-                public void onConferenceJoined(Map<String, Object> data) {
-                    on("CONFERENCE_JOINED", data);
-                }
-
-                @Override
-                public void onConferenceLeft(Map<String, Object> data) {
-                    on("CONFERENCE_LEFT", data);
-                }
-
-                @Override
-                public void onConferenceWillJoin(Map<String, Object> data) {
-                    on("CONFERENCE_WILL_JOIN", data);
-                }
-
-                @Override
-                public void onConferenceWillLeave(Map<String, Object> data) {
-                    on("CONFERENCE_WILL_LEAVE", data);
-                }
-
-                @Override
-                public void onLoadConfigError(Map<String, Object> data) {
-                    on("LOAD_CONFIG_ERROR", data);
-                }
-            });
-
-        }
-
-        return view;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // As this is the Jitsi Meet app (i.e. not the Jitsi Meet SDK), we do
-        // want to enable some options.
-
-        // The welcome page defaults to disabled in the SDK at the time of this
-        // writing but it is clearer to be explicit about what we want anyway.
-        setWelcomePageEnabled(true);
-
-        super.onCreate(savedInstanceState);
-
+    protected boolean extraInitialize() {
         // Setup Crashlytics and Firebase Dynamic Links
         if (BuildConfig.GOOGLE_SERVICES_ENABLED) {
             Fabric.with(this, new Crashlytics());
@@ -129,14 +70,90 @@ public class MainActivity extends JitsiMeetActivity {
                     }
 
                     if (dynamicLink != null) {
-                        try {
-                            loadURL(new URL(dynamicLink.toString()));
-                        } catch (MalformedURLException e) {
-                            Log.d("ReactNative", "Malformed dynamic link", e);
-                        }
+                        join(dynamicLink.toString());
                     }
                 });
         }
+
+        // In Debug builds React needs permission to write over other apps in
+        // order to display the warning and error overlays.
+        if (BuildConfig.DEBUG) {
+            if (canRequestOverlayPermission() && !Settings.canDrawOverlays(this)) {
+                Intent intent
+                    = new Intent(
+                    Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                    Uri.parse("package:" + getPackageName()));
+
+                startActivityForResult(intent, OVERLAY_PERMISSION_REQUEST_CODE);
+
+                return true;
+            }
+        }
+
+        return false;
     }
 
+    @Override
+    protected void initialize() {
+        // Set default options
+        JitsiMeetConferenceOptions defaultOptions
+            = new JitsiMeetConferenceOptions.Builder()
+                .setWelcomePageEnabled(true)
+                .setServerURL(buildURL("https://meet.jit.si"))
+                .build();
+        JitsiMeet.setDefaultConferenceOptions(defaultOptions);
+
+        super.initialize();
+    }
+
+    @Override
+    public void onConferenceTerminated(Map<String, Object> data) {
+        Log.d(TAG, "Conference terminated: " + data);
+    }
+
+    // Activity lifecycle method overrides
+    //
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE
+                && canRequestOverlayPermission()) {
+            if (Settings.canDrawOverlays(this)) {
+                initialize();
+                return;
+            }
+
+            throw new RuntimeException("Overlay permission is required when running in Debug mode.");
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    // ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_MENU) {
+            JitsiMeet.showDevOptions();
+            return true;
+        }
+
+        return super.onKeyUp(keyCode, event);
+    }
+
+    // Helper methods
+    //
+
+    private @Nullable URL buildURL(String urlStr) {
+        try {
+            return new URL(urlStr);
+        } catch (MalformedURLException e) {
+            return null;
+        }
+    }
+
+    private boolean canRequestOverlayPermission() {
+        return
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                && getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.M;
+    }
 }

android/build.gradle

@@ -25,7 +25,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url "$rootDir/../node_modules/jsc-android/dist" }
         // React Native (JS, Obj-C sources, Android binaries) is installed from
         // npm.
         maven { url "$rootDir/../node_modules/react-native/android" }
@@ -42,12 +41,6 @@ allprojects {
                     def version = new JsonSlurper().parseText(file.text).version
                     details.useVersion version
                 }
-                if (details.requested.group == 'org.webkit'
-                        && details.requested.name == 'android-jsc') {
-                    def file = new File("$rootDir/../node_modules/jsc-android/package.json")
-                    def version = new JsonSlurper().parseText(file.text).version
-                    details.useVersion "r${version.tokenize('.')[0]}"
-                }
             }
         }
     }

android/fastlane/Appfile

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

android/fastlane/Fastfile

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

android/fastlane/README.md

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

android/gradle.properties

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

android/scripts/publish-android-jsc.sh

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

android/scripts/run-packager.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# This script is executed bt Gradle to start the React packager for Debug
+# targets.
+
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+
+export RCT_METRO_PORT="${RCT_METRO_PORT:=8081}"
+echo "export RCT_METRO_PORT=${RCT_METRO_PORT}" > "${THIS_DIR}/../../node_modules/react-native/scripts/.packager.env"
+
+if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then
+  if ! curl -s "http://localhost:${RCT_METRO_PORT}/status" | grep -q "packager-status:running" ; then
+    echo "Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly"
+    exit 2
+  fi
+else
+    CMD="${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.command"
+    if [[ `uname` == "Darwin"  ]]; then
+        open -g "${CMD}" || echo "Can't start packager automatically"
+    else
+        xdg-open "${CMD}" || echo "Can't start packager automatically"
+    fi
+fi
+

android/sdk/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
 
-    implementation 'org.webkit:android-jsc:+'
+    implementation 'com.amplitude:android-sdk:2.14.1'
     implementation 'com.dropbox.core:dropbox-core-sdk:3.0.8'
     api 'com.facebook.react:react-native:+'
 

android/sdk/src/main/AndroidManifest.xml

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

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

@@ -0,0 +1,90 @@
+/*
+ * Copyright @ 2019-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jitsi.meet.sdk;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+
+import com.amplitude.api.Amplitude;
+import com.facebook.react.module.annotations.ReactModule;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Implements the react-native module for the Amplitude integration.
+ */
+@ReactModule(name = AmplitudeModule.NAME)
+class AmplitudeModule
+        extends ReactContextBaseJavaModule {
+
+    public static final String NAME = "Amplitude";
+
+    public AmplitudeModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    /**
+     * Initializes the Amplitude SDK.
+     *
+     * @param instanceName The name of the Amplitude instance. Should
+     * be used only for multi-project logging.
+     * @param apiKey The API_KEY of the Amplitude project.
+     */
+    @ReactMethod
+    public void init(String instanceName, String apiKey) {
+        Amplitude.getInstance(instanceName).initialize(getCurrentActivity(), apiKey);
+    }
+
+    /**
+     * Sets the user properties for an Amplitude instance.
+     *
+     * @param instanceName The name of the Amplitude instance.
+     * @param userProps JSON string with user properties to be set.
+     */
+    @ReactMethod
+    public void setUserProperties(String instanceName, ReadableMap userProps) {
+        if (userProps != null) {
+            Amplitude.getInstance(instanceName).setUserProperties(
+                    new JSONObject(userProps.toHashMap()));
+        }
+    }
+
+    /**
+     * Log an analytics event.
+     *
+     * @param instanceName The name of the Amplitude instance.
+     * @param eventType The event type.
+     * @param eventPropsString JSON string with the event properties.
+     */
+    @ReactMethod
+    public void logEvent(String instanceName, String eventType, String eventPropsString) {
+        try {
+            JSONObject eventProps = new JSONObject(eventPropsString);
+            Amplitude.getInstance(instanceName).logEvent(eventType, eventProps);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+}

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

@@ -15,17 +15,21 @@ import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.module.annotations.ReactModule;
 
+@ReactModule(name = AndroidSettingsModule.NAME)
 class AndroidSettingsModule
     extends ReactContextBaseJavaModule {
 
+    public static final String NAME = "AndroidSettings";
+
     public AndroidSettingsModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
 
     @Override
     public String getName() {
-        return "AndroidSettings";
+        return NAME;
     }
 
     @ReactMethod

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

@@ -23,13 +23,17 @@ import android.content.pm.PackageManager;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.module.annotations.ReactModule;
 
 import java.util.HashMap;
 import java.util.Map;
 
+@ReactModule(name = AppInfoModule.NAME)
 class AppInfoModule
     extends ReactContextBaseJavaModule {
 
+    public static final String NAME = "AppInfo";
+
     public AppInfoModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
@@ -74,6 +78,6 @@ class AppInfoModule
 
     @Override
     public String getName() {
-        return "AppInfo";
+        return NAME;
     }
 }

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

@@ -35,6 +35,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.module.annotations.ReactModule;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -58,9 +59,12 @@ import java.util.concurrent.Executors;
  * Before a call has started and after it has ended the
  * {@code AudioModeModule.DEFAULT} mode should be used.
  */
+@ReactModule(name = AudioModeModule.NAME)
 class AudioModeModule extends ReactContextBaseJavaModule
     implements AudioManager.OnAudioFocusChangeListener {
 
+    public static final String NAME = "AudioMode";
+
     /**
      * Constants representing the audio mode.
      * - DEFAULT: Used before and after every call. It represents the default
@@ -89,16 +93,10 @@ class AudioModeModule extends ReactContextBaseJavaModule
      */
     private static final int TYPE_USB_HEADSET = 22;
 
-    /**
-     * The name of {@code AudioModeModule} to be used in the React Native
-     * bridge.
-     */
-    private static final String MODULE_NAME = "AudioMode";
-
     /**
      * The {@code Log} tag {@code AudioModeModule} is to log messages with.
      */
-    static final String TAG = MODULE_NAME;
+    static final String TAG = NAME;
 
     /**
      * Converts any of the "DEVICE_" constants into the corresponding
@@ -160,7 +158,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
     /**
      * Whether or not the ConnectionService is used for selecting audio devices.
      */
-    private static boolean useConnectionService() {
+    static boolean useConnectionService() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
     }
 
@@ -297,9 +295,9 @@ class AudioModeModule extends ReactContextBaseJavaModule
             = (AudioManager)
                 reactContext.getSystemService(Context.AUDIO_SERVICE);
 
-        // Starting Oreo the ConnectionImpl from ConnectionService us used to
+        // Starting Oreo the ConnectionImpl from ConnectionService is used to
         // detect the available devices.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+        if (!useConnectionService()) {
             // Setup runtime device change detection.
             setupAudioRouteChangeDetection();
 
@@ -373,7 +371,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
      */
     @Override
     public String getName() {
-        return MODULE_NAME;
+        return NAME;
     }
 
     /**
@@ -457,6 +455,10 @@ class AudioModeModule extends ReactContextBaseJavaModule
                     // Reset user selection
                     userSelectedDevice = null;
 
+                    // If the OS changes the Audio Route or Devices we could have lost
+                    // the selected audio device
+                    selectedDevice = null;
+
                     if (mode != -1) {
                         updateAudioRoute(mode);
                     }

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

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

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

@@ -81,6 +81,13 @@ public class ConnectionService extends android.telecom.ConnectionService {
         return new ArrayList<>(connections.values());
     }
 
+    /**
+     * @return {@code true} if running a Samsung device.
+     */
+    static boolean isSamsungDevice() {
+        return android.os.Build.MANUFACTURER.toLowerCase().contains("samsung");
+    }
+
     /**
      * Registers a start call promise.
      *
@@ -129,6 +136,14 @@ public class ConnectionService extends android.telecom.ConnectionService {
         ConnectionImpl connection = connections.get(callUUID);
 
         if (connection != null) {
+            if (isSamsungDevice()) {
+                // Required to release the audio focus correctly.
+                connection.setOnHold();
+                // Prevents from including in the native phone calls history
+                connection.setConnectionProperties(
+                    Connection.PROPERTY_SELF_MANAGED
+                        | Connection.PROPERTY_IS_EXTERNAL_CALL);
+            }
             // Note that the connection is not removed from the list here, but
             // in ConnectionImpl's state changed callback. It's a safer
             // approach, because in case the app would crash on the JavaScript
@@ -189,8 +204,11 @@ public class ConnectionService extends android.telecom.ConnectionService {
         connection.setConnectionProperties(Connection.PROPERTY_SELF_MANAGED);
         connection.setAddress(
             request.getAddress(),
-            TelecomManager.PRESENTATION_ALLOWED);
+            TelecomManager.PRESENTATION_UNKNOWN);
         connection.setExtras(request.getExtras());
+
+        connection.setAudioModeIsVoip(true);
+
         // NOTE there's a time gap between the placeCall and this callback when
         // things could get out of sync, but they are put back in sync once
         // the startCall Promise is resolved below. That's because on
@@ -332,8 +350,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
             Log.d(TAG, "onDisconnect " + getCallUUID());
             WritableNativeMap data = new WritableNativeMap();
             data.putString("callUUID", getCallUUID());
-            ReactContextUtils.emitEvent(
-                    null,
+            ReactInstanceManagerHolder.emitEvent(
                     "org.jitsi.meet:features/connection_service#disconnect",
                     data);
             // The JavaScript side will not go back to the native with
@@ -353,8 +370,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
             Log.d(TAG, "onAbort " + getCallUUID());
             WritableNativeMap data = new WritableNativeMap();
             data.putString("callUUID", getCallUUID());
-            ReactContextUtils.emitEvent(
-                    null,
+            ReactInstanceManagerHolder.emitEvent(
                     "org.jitsi.meet:features/connection_service#abort",
                     data);
             // The JavaScript side will not go back to the native with
@@ -428,7 +444,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
         @Override
         public String toString() {
             return String.format(
-                    "ConnectionImpl[adress=%s, uuid=%s]@%d",
+                    "ConnectionImpl[address=%s, uuid=%s]@%d",
                     getAddress(), getCallUUID(), hashCode());
         }
     }

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

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

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

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

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

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

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

@@ -0,0 +1,63 @@
+/*
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jitsi.meet.sdk;
+
+import android.os.Bundle;
+
+import com.facebook.react.ReactInstanceManager;
+
+public class JitsiMeet {
+    /**
+     * Default {@link JitsiMeetConferenceOptions} which will be used for all conferences. When
+     * joining a conference these options will be merged with the ones passed to
+     * {@link JitsiMeetView} join().
+     */
+    private static JitsiMeetConferenceOptions defaultConferenceOptions;
+
+    public static JitsiMeetConferenceOptions getDefaultConferenceOptions() {
+        return defaultConferenceOptions;
+    }
+
+    public static void setDefaultConferenceOptions(JitsiMeetConferenceOptions options) {
+        defaultConferenceOptions = options;
+    }
+
+    /**
+     * Helper to get the default conference options as a {@link Bundle}.
+     *
+     * @return a {@link Bundle} with the default conference options.
+     */
+    static Bundle getDefaultProps() {
+        if (defaultConferenceOptions != null) {
+            return defaultConferenceOptions.asProps();
+        }
+
+        return new Bundle();
+    }
+
+    /**
+     * Used in development mode. It displays the React Native development menu.
+     */
+    public static void showDevOptions() {
+        ReactInstanceManager reactInstanceManager
+            = ReactInstanceManagerHolder.getReactInstanceManager();
+
+        if (reactInstanceManager != null) {
+            reactInstanceManager.showDevOptionsDialog();
+        }
+    }
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,97 @@
+/*
+ * Copyright @ 2019-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jitsi.meet.sdk;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.net.URL;
+
+/**
+ * Base {@link Fragment} for applications integrating Jitsi Meet at a higher level. It
+ * contains all the required wiring between the {@code JitsiMeetView} and
+ * the Fragment lifecycle methods already implemented.
+ *
+ * In this fragment we use a single {@code JitsiMeetView} instance. This
+ * instance gives us access to a view which displays the welcome page and the
+ * conference itself. All lifecycle methods associated with this Fragment are
+ * hooked to the React Native subsystem via proxy calls through the
+ * {@code JitsiMeetActivityDelegate} static methods.
+ */
+public class JitsiMeetFragment extends Fragment {
+
+    /**
+     * Instance of the {@link JitsiMeetView} which this activity will display.
+     */
+    private JitsiMeetView view;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        return this.view = new JitsiMeetView(getActivity());
+    }
+
+    public JitsiMeetView getJitsiView() {
+        return view;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        JitsiMeetActivityDelegate.onActivityResult(
+                getActivity(), requestCode, resultCode, data);
+    }
+
+    @Override
+    public void onDestroyView() {
+        if (view != null) {
+            view.dispose();
+            view = null;
+        }
+
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        JitsiMeetActivityDelegate.onHostDestroy(getActivity());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        JitsiMeetActivityDelegate.onHostResume(getActivity());
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+
+        JitsiMeetActivityDelegate.onHostPause(getActivity());
+    }
+}

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

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

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

@@ -1,51 +0,0 @@
-/*
- * Copyright @ 2017-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import java.util.Map;
-
-/**
- * Implements {@link JitsiMeetViewListener} so apps don't have to add stubs for
- * all methods in the interface if they are only interested in some.
- */
-public abstract class JitsiMeetViewAdapter
-    implements JitsiMeetViewListener {
-
-    @Override
-    public void onConferenceFailed(Map<String, Object> data) {
-    }
-
-    @Override
-    public void onConferenceJoined(Map<String, Object> data) {
-    }
-
-    @Override
-    public void onConferenceLeft(Map<String, Object> data) {
-    }
-
-    @Override
-    public void onConferenceWillJoin(Map<String, Object> data) {
-    }
-
-    @Override
-    public void onConferenceWillLeave(Map<String, Object> data) {
-    }
-
-    @Override
-    public void onLoadConfigError(Map<String, Object> data) {
-    }
-}

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

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

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

@@ -27,11 +27,15 @@ import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.module.annotations.ReactModule;
 
+@ReactModule(name = PictureInPictureModule.NAME)
 class PictureInPictureModule
     extends ReactContextBaseJavaModule {
 
-    private final static String TAG = "PictureInPicture";
+    public static final String NAME = "PictureInPicture";
+
+    private static final String TAG = NAME;
 
     static boolean isPictureInPictureSupported() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
@@ -101,6 +105,6 @@ class PictureInPictureModule
 
     @Override
     public String getName() {
-        return TAG;
+        return NAME;
     }
 }

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

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

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

@@ -18,6 +18,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.module.annotations.ReactModule;
 
 /**
  * The react-native side of Jitsi Meet's {@link ConnectionService}. Exposes
@@ -26,10 +27,13 @@ import com.facebook.react.bridge.ReadableMap;
  * @author Pawel Domas
  */
 @RequiresApi(api = Build.VERSION_CODES.O)
+@ReactModule(name = RNConnectionService.NAME)
 class RNConnectionService
     extends ReactContextBaseJavaModule {
 
-    private final static String TAG = ConnectionService.TAG;
+    public static final String NAME = "ConnectionService";
+
+    private static final String TAG = ConnectionService.TAG;
 
     /**
      * Sets the audio route on all existing {@link android.telecom.Connection}s
@@ -146,7 +150,7 @@ class RNConnectionService
 
     @Override
     public String getName() {
-        return "ConnectionService";
+        return NAME;
     }
 
     /**

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

@@ -1,43 +0,0 @@
-/*
- * Copyright @ 2017-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import android.support.annotation.Nullable;
-
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-
-public class ReactContextUtils {
-    public static boolean emitEvent(
-            ReactContext reactContext,
-            String eventName,
-            @Nullable Object data) {
-        if (reactContext == null) {
-            // XXX If no ReactContext is specified, emit through the
-            // ReactContext of ReactInstanceManager. ReactInstanceManager
-            // cooperates with ReactContextUtils i.e. ReactInstanceManager will
-            // not invoke ReactContextUtils without a ReactContext.
-            return ReactInstanceManagerHolder.emitEvent(eventName, data);
-        }
-
-        reactContext
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-            .emit(eventName, data);
-
-        return true;
-    }
-}

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

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * Copyright @ 2019-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +25,8 @@ import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.common.LifecycleState;
+import com.facebook.react.devsupport.DevInternalSettings;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -45,19 +48,19 @@ class ReactInstanceManagerHolder {
             ReactApplicationContext reactContext) {
         List<NativeModule> nativeModules
             = new ArrayList<>(Arrays.<NativeModule>asList(
+                new AmplitudeModule(reactContext),
                 new AndroidSettingsModule(reactContext),
                 new AppInfoModule(reactContext),
                 new AudioModeModule(reactContext),
+                new DropboxModule(reactContext),
                 new ExternalAPIModule(reactContext),
                 new LocaleDetector(reactContext),
                 new PictureInPictureModule(reactContext),
                 new ProximityModule(reactContext),
                 new WiFiStatsModule(reactContext),
-                new org.jitsi.meet.sdk.dropbox.Dropbox(reactContext),
                 new org.jitsi.meet.sdk.net.NAT64AddrInfoModule(reactContext)));
 
-        if (android.os.Build.VERSION.SDK_INT
-                >= android.os.Build.VERSION_CODES.O) {
+        if (AudioModeModule.useConnectionService()) {
             nativeModules.add(new RNConnectionService(reactContext));
         }
 
@@ -70,7 +73,7 @@ class ReactInstanceManagerHolder {
      * @param eventName {@code String} containing the event name.
      * @param data {@code Object} optional ancillary data for the event.
      */
-    static boolean emitEvent(
+    static void emitEvent(
             String eventName,
             @Nullable Object data) {
         ReactInstanceManager reactInstanceManager
@@ -80,15 +83,12 @@ class ReactInstanceManagerHolder {
             ReactContext reactContext
                 = reactInstanceManager.getCurrentReactContext();
 
-            return
-                reactContext != null
-                    && ReactContextUtils.emitEvent(
-                        reactContext,
-                        eventName,
-                        data);
+            if (reactContext != null) {
+                reactContext
+                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                    .emit(eventName, data);
+            }
         }
-
-        return false;
     }
 
     /**
@@ -156,5 +156,12 @@ class ReactInstanceManagerHolder {
                 .setUseDeveloperSupport(BuildConfig.DEBUG)
                 .setInitialLifecycleState(LifecycleState.RESUMED)
                 .build();
+
+        // Disable delta updates on Android, they have caused trouble.
+        DevInternalSettings devSettings
+            = (DevInternalSettings)reactInstanceManager.getDevSupportManager().getDevSettings();
+        if (devSettings != null) {
+            devSettings.setBundleDeltasEnabled(false);
+        }
     }
 }

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

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

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

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

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

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

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

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

conference.js

@@ -38,6 +38,7 @@ import {
     conferenceFailed,
     conferenceJoined,
     conferenceLeft,
+    conferenceSubjectChanged,
     conferenceWillJoin,
     conferenceWillLeave,
     dataChannelOpened,
@@ -45,8 +46,7 @@ import {
     onStartMutedPolicyChanged,
     p2pStatusChanged,
     sendLocalParticipant,
-    setDesktopSharingEnabled,
-    setSubject
+    setDesktopSharingEnabled
 } from './react/features/base/conference';
 import {
     getAvailableDevices,
@@ -1834,7 +1834,7 @@ export default {
             APP.UI.showToolbar(6000);
         });
         room.on(JitsiConferenceEvents.SUBJECT_CHANGED,
-            subject => APP.API.notifySubjectChanged(subject));
+            subject => APP.store.dispatch(conferenceSubjectChanged(subject)));
 
         room.on(
             JitsiConferenceEvents.LAST_N_ENDPOINTS_CHANGED,
@@ -2699,6 +2699,13 @@ export default {
     onProxyConnectionEvent(event) {
         if (!this._proxyConnection) {
             this._proxyConnection = new JitsiMeetJS.ProxyConnectionService({
+
+                /**
+                 * Pass the {@code JitsiConnection} instance which will be used
+                 * to fetch TURN credentials.
+                 */
+                jitsiConnection: APP.connection,
+
                 /**
                  * The proxy connection feature is currently tailored towards
                  * taking a proxied video stream and showing it as a local
@@ -2767,16 +2774,6 @@ export default {
         APP.API.notifyAudioMutedStatusChanged(muted);
     },
 
-    /**
-     * Changes the subject of the conference.
-     * Note: available only for moderator.
-     *
-     * @param subject {string} the new subject for the conference.
-     */
-    setSubject(subject) {
-        APP.store.dispatch(setSubject(subject));
-    },
-
     /**
      * Dispatches the passed in feedback for submission. The submitted score
      * should be a number inclusively between 1 through 5, or -1 for no score.

css/_subject.scss

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

css/_variables.scss

@@ -156,3 +156,9 @@ $welcomePageDescriptionColor: #fff;
 $welcomePageFontFamily: inherit;
 $welcomePageHeaderBackground: linear-gradient(-90deg, #1251AE 0%, #0074FF 50%, #1251AE 100%);
 $welcomePageTitleColor: #fff;
+
+/**
+ * Deep-linking page variables.
+ */
+$deepLinkingMobileLogoHeight: 40px;
+$deepLinkingMobileHeaderBackground: #f1f2f5;

css/deep-linking/_mobile.scss

@@ -8,13 +8,13 @@
     .header {
         width: 100%;
         height: 70px;
-        background-color: #f1f2f5;
+        background-color: $deepLinkingMobileHeaderBackground;
         text-align: center;
         .logo {
             margin-top: 15px;
             margin-left: auto;
             margin-right: auto;
-            height: 40px;
+            height: $deepLinkingMobileLogoHeight;
         }
     }
 
@@ -133,6 +133,7 @@
 
         .dial-in-numbers-list {
             color: $unsupportedBrowserTextColor;
+            padding-left: 20px;
         }
 
         .dial-in-numbers-body {

css/main.scss

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

css/modals/invite/_info.scss

@@ -193,6 +193,7 @@
     .dial-in-conference-id {
         text-align: center;
         min-width: 200px;
+        margin-top: 40px;
     }
 
     .dial-in-conference-name,

doc/sipgw-config.md

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

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

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

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

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

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

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

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

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

interface_config.js

@@ -29,6 +29,7 @@ var interfaceConfig = {
     DISPLAY_WELCOME_PAGE_CONTENT: true,
     APP_NAME: 'Jitsi Meet',
     NATIVE_APP_NAME: 'Jitsi Meet',
+    PROVIDER_NAME: 'Jitsi',
     LANG_DETECTION: false, // Allow i18n to detect the system language
     INVITATION_POWERED_BY: true,
 
@@ -153,11 +154,6 @@ var interfaceConfig = {
      */
     CONNECTION_INDICATOR_DISABLED: false,
 
-    /**
-     * The name of the application connected to the "Add people" search service.
-     */
-    // ADD_PEOPLE_APP_NAME: "",
-
     /**
      * If true, hides the video quality label indicating the resolution status
      * of the current large video.
@@ -197,7 +193,14 @@ var interfaceConfig = {
     /**
      * Specify the Android app package name.
      */
-    // ANDROID_APP_PACKAGE: 'org.jitsi.meet'
+    // ANDROID_APP_PACKAGE: 'org.jitsi.meet',
+
+    /**
+     * Override the behavior of some notifications to remain displayed until
+     * explicitly dismissed through a user action. The value is how long, in
+     * milliseconds, those notifications should remain displayed.
+     */
+    // ENFORCE_NOTIFICATION_AUTO_DISMISS_TIMEOUT: 15000,
 };
 
 /* eslint-enable no-unused-vars, no-var, max-len */

ios/Podfile

@@ -5,10 +5,10 @@ workspace 'jitsi-meet'
 target 'jitsi-meet' do
   project 'app/app.xcodeproj'
 
-  pod 'Crashlytics'
-  pod 'Fabric'
-  pod 'Firebase/Core'
-  pod 'Firebase/DynamicLinks'
+  pod 'Crashlytics', '~> 3.12.0'
+  pod 'Fabric', '~> 1.9.0'
+  pod 'Firebase/Core', '~> 5.18.0'
+  pod 'Firebase/DynamicLinks', '~> 5.18.0'
 end
 
 target 'JitsiMeet' do
@@ -35,7 +35,8 @@ target 'JitsiMeet' do
   pod 'Folly',
     :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
-  pod 'ObjectiveDropboxOfficial'
+  pod 'Amplitude-iOS', '~> 4.0.4'
+  pod 'ObjectiveDropboxOfficial', '~> 3.9.4'
 
   pod 'react-native-background-timer',
     :path => '../node_modules/react-native-background-timer'

ios/Podfile.lock

@@ -1,4 +1,5 @@
 PODS:
+  - Amplitude-iOS (4.0.4)
   - boost-for-react-native (1.63.0)
   - BVLinearGradient (2.5.3):
     - React
@@ -6,41 +7,41 @@ PODS:
     - Fabric (~> 1.9.0)
   - DoubleConversion (1.1.6)
   - Fabric (1.9.0)
-  - Firebase/Core (5.15.0):
+  - Firebase/Core (5.18.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (= 5.4.0)
-  - Firebase/CoreOnly (5.15.0):
-    - FirebaseCore (= 5.1.10)
-  - Firebase/DynamicLinks (5.15.0):
+    - FirebaseAnalytics (= 5.7.0)
+  - Firebase/CoreOnly (5.18.0):
+    - FirebaseCore (= 5.3.1)
+  - Firebase/DynamicLinks (5.18.0):
     - Firebase/CoreOnly
-    - FirebaseDynamicLinks (= 3.3.0)
-  - FirebaseAnalytics (5.4.0):
-    - FirebaseCore (~> 5.1)
-    - FirebaseInstanceID (~> 3.3)
-    - GoogleAppMeasurement (= 5.4.0)
+    - FirebaseDynamicLinks (= 3.4.1)
+  - FirebaseAnalytics (5.7.0):
+    - FirebaseCore (~> 5.3)
+    - FirebaseInstanceID (~> 3.6)
+    - GoogleAppMeasurement (= 5.7.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
     - GoogleUtilities/MethodSwizzler (~> 5.2)
     - GoogleUtilities/Network (~> 5.2)
     - "GoogleUtilities/NSData+zlib (~> 5.2)"
     - nanopb (~> 0.3)
-  - FirebaseAnalyticsInterop (1.1.0)
-  - FirebaseCore (5.1.10):
+  - FirebaseAnalyticsInterop (1.2.0)
+  - FirebaseCore (5.3.1):
     - GoogleUtilities/Logger (~> 5.2)
-  - FirebaseDynamicLinks (3.3.0):
+  - FirebaseDynamicLinks (3.4.1):
     - FirebaseAnalytics (~> 5.1)
     - FirebaseAnalyticsInterop (~> 1.0)
-    - FirebaseCore (~> 5.1)
-  - FirebaseInstanceID (3.3.0):
-    - FirebaseCore (~> 5.1)
-    - GoogleUtilities/Environment (~> 5.3)
-    - GoogleUtilities/UserDefaults (~> 5.3)
+    - FirebaseCore (~> 5.2)
+  - FirebaseInstanceID (3.7.0):
+    - FirebaseCore (~> 5.2)
+    - GoogleUtilities/Environment (~> 5.2)
+    - GoogleUtilities/UserDefaults (~> 5.2)
   - FLAnimatedImage (1.0.12)
-  - Folly (2016.10.31.00):
+  - Folly (2018.10.22.00):
     - boost-for-react-native
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - GoogleAppMeasurement (5.4.0):
+  - GoogleAppMeasurement (5.7.0):
     - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
     - GoogleUtilities/MethodSwizzler (~> 5.2)
     - GoogleUtilities/Network (~> 5.2)
@@ -58,23 +59,23 @@ PODS:
     - GoogleToolboxForMac/Defines (= 2.2.0)
     - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.0)"
   - "GoogleToolboxForMac/NSString+URLArguments (2.2.0)"
-  - GoogleUtilities/AppDelegateSwizzler (5.3.7):
+  - GoogleUtilities/AppDelegateSwizzler (5.4.1):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (5.3.7)
-  - GoogleUtilities/Logger (5.3.7):
+  - GoogleUtilities/Environment (5.4.1)
+  - GoogleUtilities/Logger (5.4.1):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (5.3.7):
+  - GoogleUtilities/MethodSwizzler (5.4.1):
     - GoogleUtilities/Logger
-  - GoogleUtilities/Network (5.3.7):
+  - GoogleUtilities/Network (5.4.1):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (5.3.7)"
-  - GoogleUtilities/Reachability (5.3.7):
+  - "GoogleUtilities/NSData+zlib (5.4.1)"
+  - GoogleUtilities/Reachability (5.4.1):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (5.3.7):
+  - GoogleUtilities/UserDefaults (5.4.1):
     - GoogleUtilities/Logger
   - GTMSessionFetcher/Core (1.2.1)
   - nanopb (0.3.901):
@@ -83,8 +84,8 @@ PODS:
   - nanopb/decode (0.3.901)
   - nanopb/encode (0.3.901)
   - ObjectiveDropboxOfficial (3.9.4)
-  - React (0.57.8):
-    - React/Core (= 0.57.8)
+  - React (0.59.2):
+    - React/Core (= 0.59.2)
   - react-native-background-timer (2.1.1):
     - React
   - react-native-calendar-events (1.6.4):
@@ -96,44 +97,52 @@ PODS:
     - SDWebImage/GIF
   - react-native-keep-awake (4.0.0):
     - React
-  - react-native-webrtc (1.67.1):
+  - react-native-webrtc (1.69.0):
     - React
-  - React/Core (0.57.8):
-    - yoga (= 0.57.8.React)
-  - React/CxxBridge (0.57.8):
-    - Folly (= 2016.10.31.00)
+  - React/Core (0.59.2):
+    - yoga (= 0.59.2.React)
+  - React/CxxBridge (0.59.2):
+    - Folly (= 2018.10.22.00)
     - React/Core
     - React/cxxreact
-  - React/cxxreact (0.57.8):
+    - React/jsiexecutor
+  - React/cxxreact (0.59.2):
     - boost-for-react-native (= 1.63.0)
-    - Folly (= 2016.10.31.00)
-    - React/jschelpers
+    - DoubleConversion
+    - Folly (= 2018.10.22.00)
+    - glog
     - React/jsinspector
-  - React/DevSupport (0.57.8):
+  - React/DevSupport (0.59.2):
     - React/Core
     - React/RCTWebSocket
-  - React/fishhook (0.57.8)
-  - React/jschelpers (0.57.8):
-    - Folly (= 2016.10.31.00)
-    - React/PrivateDatabase
-  - React/jsinspector (0.57.8)
-  - React/PrivateDatabase (0.57.8)
-  - React/RCTActionSheet (0.57.8):
+  - React/fishhook (0.59.2)
+  - React/jsi (0.59.2):
+    - DoubleConversion
+    - Folly (= 2018.10.22.00)
+    - glog
+  - React/jsiexecutor (0.59.2):
+    - DoubleConversion
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React/cxxreact
+    - React/jsi
+  - React/jsinspector (0.59.2)
+  - React/RCTActionSheet (0.59.2):
     - React/Core
-  - React/RCTAnimation (0.57.8):
+  - React/RCTAnimation (0.59.2):
     - React/Core
-  - React/RCTBlob (0.57.8):
+  - React/RCTBlob (0.59.2):
     - React/Core
-  - React/RCTImage (0.57.8):
+  - React/RCTImage (0.59.2):
     - React/Core
     - React/RCTNetwork
-  - React/RCTLinkingIOS (0.57.8):
+  - React/RCTLinkingIOS (0.59.2):
     - React/Core
-  - React/RCTNetwork (0.57.8):
+  - React/RCTNetwork (0.59.2):
     - React/Core
-  - React/RCTText (0.57.8):
+  - React/RCTText (0.59.2):
     - React/Core
-  - React/RCTWebSocket (0.57.8):
+  - React/RCTWebSocket (0.59.2):
     - React/Core
     - React/fishhook
     - React/RCTBlob
@@ -147,22 +156,23 @@ PODS:
     - React/Core
   - RNVectorIcons (6.0.2):
     - React
-  - SDWebImage/Core (4.4.3)
-  - SDWebImage/GIF (4.4.3):
+  - SDWebImage/Core (4.4.6)
+  - SDWebImage/GIF (4.4.6):
     - FLAnimatedImage (~> 1.0)
     - SDWebImage/Core
-  - yoga (0.57.8.React)
+  - yoga (0.59.2.React)
 
 DEPENDENCIES:
+  - Amplitude-iOS (~> 4.0.4)
   - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
-  - Crashlytics
+  - Crashlytics (~> 3.12.0)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - Fabric
-  - Firebase/Core
-  - Firebase/DynamicLinks
+  - Fabric (~> 1.9.0)
+  - Firebase/Core (~> 5.18.0)
+  - Firebase/DynamicLinks (~> 5.18.0)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
-  - ObjectiveDropboxOfficial
+  - ObjectiveDropboxOfficial (~> 3.9.4)
   - react-native-background-timer (from `../node_modules/react-native-background-timer`)
   - react-native-calendar-events (from `../node_modules/react-native-calendar-events`)
   - react-native-fast-image (from `../node_modules/react-native-fast-image`)
@@ -185,6 +195,7 @@ DEPENDENCIES:
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
+    - Amplitude-iOS
     - boost-for-react-native
     - Crashlytics
     - Fabric
@@ -235,39 +246,40 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
+  Amplitude-iOS: 2ad4d7270c99186236c1272a3a9425463b1ae1a7
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: 0d985ec461359c82bc254f26d11008bdae50d17a
   Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933
   DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
   Fabric: f988e33c97f08930a413e08123064d2e5f68d655
-  Firebase: 8bb9268bff82374f2cbaaabb143e725743c316ae
-  FirebaseAnalytics: c06f9d70577d79074214700a71fd5d39de5550fb
-  FirebaseAnalyticsInterop: e5f21be9af6548372e2f0815834ff909bff395a2
-  FirebaseCore: 35747502d9e8c6ee217385ad04446c7c2aaf9c5c
-  FirebaseDynamicLinks: c713da5f75c324f38fb2d57164bbc1c461aa6739
-  FirebaseInstanceID: e2fa4cb35ef5558c200f7f0ad8a53e212215f93e
+  Firebase: 02f3281965c075426141a0ce1277e9de6649cab9
+  FirebaseAnalytics: 23851fe602c872130a2c5c55040b302120346cc2
+  FirebaseAnalyticsInterop: efbe45c8385ec626e29f9525e5ebd38520dfb6c1
+  FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3
+  FirebaseDynamicLinks: f209c3caccd82102caa0e91d393e3ccc593501fd
+  FirebaseInstanceID: bd6fc5a258884e206fd5c474ebe4f5b00e21770e
   FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
-  Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
-  glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
-  GoogleAppMeasurement: 98b71f5e04142793729a5ef23e5b96651ff4b70f
+  Folly: de497beb10f102453a1afa9edbf8cf8a251890de
+  glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
+  GoogleAppMeasurement: 6cf307834da065863f9faf4c0de0a936d81dd832
   GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39
   GoogleToolboxForMac: ff31605b7d66400dcec09bed5861689aebadda4d
-  GoogleUtilities: 111a012f4c3a29c9e7c954c082fafd6ee3c999c0
+  GoogleUtilities: 1e25823cbf46540b4284f6ef8e17b3a68ee12bbc
   GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
   nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
   ObjectiveDropboxOfficial: a5afefc83f6467c42c45f2253f583f2ad1ffc701
-  React: adbac0757ce35e92fbd447ab98c810209d27d9b0
+  React: 9d063e2f356c8cd2f54dd550d4507740037cbabe
   react-native-background-timer: 0d34748e53a972507c66963490c775321a88f6f2
   react-native-calendar-events: ee9573e355711ac679e071be70789542431f4ce3
   react-native-fast-image: 47487b71169aea34868e7b38bf870b6b3f2157c5
   react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae
-  react-native-webrtc: 7152e789c1efefb695fe1166bd9432eff2afd8ac
+  react-native-webrtc: a14197fefe96ab462dc098b79c428fc5a7f68216
   RNGoogleSignin: 361174d9a3090d295b06257162b560d8efc8a6ed
   RNSound: 53d2fc9c6589bd68daba530262b7560393def3ac
   RNVectorIcons: d819334932bcda3332deb3d2c8ea4d069e0b98f9
-  SDWebImage: c5594f1a19c48d526d321e548902b56b479cd508
-  yoga: 74cdf036c30820443b25ade59916236b1e95ee93
+  SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
+  yoga: 3768a3026ade0fb46a68f3a31a917cf86bc34fc4
 
-PODFILE CHECKSUM: 7d1909450626f31f9ea2de80122a66a50af2e1ea
+PODFILE CHECKSUM: 4a11c3d66127a9845d4a5b2c7fad49f58a9c7a89
 
-COCOAPODS: 1.6.0
+COCOAPODS: 1.6.1

ios/README.md

@@ -43,9 +43,15 @@ To get started:
   [super viewDidLoad];
 
   JitsiMeetView *jitsiMeetView = (JitsiMeetView *) self.view;
-
   jitsiMeetView.delegate = self;
-  [jitsiMeetView loadURL:nil];
+
+  JitsiMeetConferenceOptions *options = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
+      builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"];
+      builder.room = @"test123";
+      builder.audioOnly = YES;
+  }];
+
+  [jitsiMeetView join:options];
 }
 ```
 
@@ -58,69 +64,26 @@ The `JitsiMeetView` class is the entry point to the SDK. It a subclass of
 
 Property to get/set the `JitsiMeetViewDelegate` on `JitsiMeetView`.
 
-#### defaultURL
+#### join:JitsiMeetConferenceOptions
 
-Property to get/set the default base URL used to join a conference when a
-partial URL (e.g. a room name only) is specified to
-`loadURLString:`/`loadURLObject:`. If not set or if set to `nil`, the default
-built in JavaScript is used: https://meet.jit.si.
-
-NOTE: Must be set (if at all) before `loadURL:`/`loadURLString:` for it to take
-effect.
-
-#### pictureInPictureEnabled
-
-Property to get / set whether Picture-in-Picture is enabled. Defaults to `YES`
-if `delegate` implements `enterPictureInPicture:`; otherwise, `NO`.
-
-NOTE: Must be set (if at all) before `loadURL:`/`loadURLString:` for it to take
-effect.
-
-#### welcomePageEnabled
-
-Property to get/set whether the Welcome page is enabled. If `NO`, a black empty
-view will be rendered when not in a conference. Defaults to `NO`.
-
-NOTE: Must be set (if at all) before `loadURL:`/`loadURLString:` for it to take
-effect.
-
-#### loadURL:NSURL
+Joins the conference specified by the given options.
 
 ```objc
-[jitsiMeetView loadURL:[NSURL URLWithString:@"https://meet.jit.si/test123"]];
+  JitsiMeetConferenceOptions *options = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
+      builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"];
+      builder.room = @"test123";
+      builder.audioOnly = NO;
+      builder.audioMuted = NO;
+      builder.videoMuted = NO;
+      builder.welcomePageEnabled = NO;
+  }];
+
+  [jitsiMeetView join:options];
 ```
 
-Loads a specific URL which may identify a conference to join. If the specified
-URL is `nil` and the Welcome page is enabled, the Welcome page is displayed
-instead.
+#### leave
 
-#### loadURLObject:NSDictionary
-
-```objc
-[jitsiMeetView loadURLObject:@{
-    @"config": @{
-        @"startWithAudioMuted": @YES,
-        @"startWithVideoMuted": @NO
-    },
-    @"url": @"https://meet.jit.si/test123"
-}];
-```
-
-Loads a specific URL which may identify a conference to join. The URL is
-specified in the form of an `NSDictionary` of properties which (1) internally
-are sufficient to construct a URL (string) while (2) abstracting the specifics
-of constructing the URL away from API clients/consumers. If the specified URL is
-`nil` and the Welcome page is enabled, the Welcome page is displayed instead.
-
-#### loadURLString:NSString
-
-```objc
-[jitsiMeetView loadURLString:@"https://meet.jit.si/test123"];
-```
-
-Loads a specific URL which may identify a conference to join. If the specified
-URL is `nil` and the Welcome page is enabled, the Welcome page is displayed
-instead.
+Leaves the currently active conference.
 
 #### Universal / deep linking
 
@@ -128,6 +91,9 @@ In order to support Universal / deep linking, `JitsiMeetView` offers 2 class
 methods that you app's delegate should call in order for the app to follow those
 links.
 
+If these functions return NO it means the URL wasn't handled by the SDK. This
+is useful when the host application uses other SDKs which also use linking.
+
 ```objc
 -  (BOOL)application:(UIApplication *)application
 continueUserActivity:(NSUserActivity *)userActivity
@@ -151,22 +117,6 @@ And also one of the following:
                             options: options];
 }
 ```
-or
-```objc
-// See https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1623112-application?language=objc
-- (BOOL)application:(UIApplication *)application
-            openURL:(NSURL *)url
-  sourceApplication:(NSString *)sourceApplication
-         annotation:(id)annotation
-{
-  return [JitsiMeetView application:application
-                            openURL:url
-                  sourceApplication:sourceApplication
-                         annotation:annotation];
-}
-```
-
-NOTE: The latter is deprecated.
 
 ### JitsiMeetViewDelegate
 
@@ -178,25 +128,20 @@ fail?
 
 All methods in this delegate are optional.
 
-##### conferenceFailed
-
-Called when a joining a conference was unsuccessful or when there was an error
-while in a conference.
-
-The `data` dictionary contains an "error" key describing the error and a "url"
-key with the conference URL.
-
 #### conferenceJoined
 
 Called when a conference was joined.
 
 The `data` dictionary contains a "url" key with the conference URL.
 
-#### conferenceLeft
+#### conferenceTerminated
 
-Called when a conference was left.
+Called when a conference was terminated either by user choice or due to a
+failure.
 
-The `data` dictionary contains a "url" key with the conference URL.
+The `data` dictionary contains an "error" key with the error and a "url" key
+with the conference URL. If the conference finished gracefully no `error`
+key will be present.
 
 #### conferenceWillJoin
 
@@ -204,12 +149,6 @@ Called before a conference is joined.
 
 The `data` dictionary contains a "url" key with the conference URL.
 
-#### conferenceWillLeave
-
-Called before a conference is left.
-
-The `data` dictionary contains a "url" key with the conference URL.
-
 #### enterPictureInPicture
 
 Called when entering Picture-in-Picture is requested by the user. The app should
@@ -220,15 +159,6 @@ associated with Picture-in-Picture.)
 
 The `data` dictionary is empty.
 
-#### loadConfigError
-
-Called when loading the main configuration file from the Jitsi Meet deployment
-fails.
-
-The `data` dictionary contains an "error" key with the error and a "url" key
-with the conference URL which necessitated the loading of the configuration
-file.
-
 ### Picture-in-Picture
 
 `JitsiMeetView` will automatically adjust its UI when presented in a
@@ -239,9 +169,8 @@ Jitsi Meet SDK does not currently implement native Picture-in-Picture on iOS. If
 desired, apps need to implement non-native Picture-in-Picture themselves and
 resize `JitsiMeetView`.
 
-If `pictureInPictureEnabled` is set to `YES` or `delegate` implements
-`enterPictureInPicture:`, the in-call toolbar will render a button to afford the
-user to request entering Picture-in-Picture.
+If `delegate` implements `enterPictureInPicture:`, the in-call toolbar will
+render a button to afford the user to request entering Picture-in-Picture.
 
 ## Dropbox integration
 
@@ -268,13 +197,5 @@ Dropbox app key:
 </array>
 ```
 
-2. Add the following to the app's `AppDelegate`:
-```objc
-- (BOOL)application:(UIApplication *)app
-            openURL:(NSURL *)url
-            options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
-  return [JitsiMeetView application:app
-                            openURL:url
-                            options:options];
-}
-```
+2. Make sure your app calls the Jitsi Meet SDK universal / deep linking delegate
+   methods.

ios/app/GoogleService-Info.plist

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>API_KEY</key>
-	<string>correct_api_key</string>
-	<key>TRACKING_ID</key>
-	<string>correct_tracking_id</string>
-	<key>CLIENT_ID</key>
-	<string>correct_client_id</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.google.correct-reversed-client-id</string>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:123:ios:123abc</string>
-	<key>GCM_SENDER_ID</key>
-	<string>correct_gcm_sender_id</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.google.FirebaseSDKTests</string>
-	<key>PROJECT_ID</key>
-	<string>abc-xyz-123</string>
-	<key>DATABASE_URL</key>
-	<string>https://abc-xyz-123.firebaseio.com</string>
-	<key>STORAGE_BUCKET</key>
-	<string>project-id-123.storage.firebase.com</string>
-</dict>
-</plist>

ios/app/app.xcodeproj/project.pbxproj

@@ -18,7 +18,6 @@
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		695AF3ED6F686F9C5EE40F9A /* libPods-jitsi-meet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */; };
-		DE4C455E21DE1E4300EA0709 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DE4C455D21DE1E4300EA0709 /* GoogleService-Info.plist */; };
 		DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */; };
 /* End PBXBuildFile section */
 
@@ -55,7 +54,6 @@
 		4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-jitsi-meet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-jitsi-meet/Pods-jitsi-meet.debug.xcconfig"; sourceTree = "<group>"; };
 		489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-jitsi-meet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B3B083EB1D4955FF0069CEE7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = app.entitlements; sourceTree = "<group>"; };
-		DE4C455D21DE1E4300EA0709 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = SOURCE_ROOT; };
 		DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRUtilities.m; sourceTree = "<group>"; };
 		DE4C456021DE1E4E00EA0709 /* FIRUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRUtilities.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -91,7 +89,6 @@
 				13B07FB01A68108700A75B9A /* AppDelegate.m */,
 				DE4C456021DE1E4E00EA0709 /* FIRUtilities.h */,
 				DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */,
-				DE4C455D21DE1E4300EA0709 /* GoogleService-Info.plist */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
@@ -149,6 +146,7 @@
 				0B26BE701EC5BC3C00EEFB41 /* Embed Frameworks */,
 				B35383AD1DDA0083008F406A /* Adjust embedded framework architectures */,
 				0BB7DA181EC9E695007AAE98 /* Adjust ATS */,
+				DEF4813D224925A2002AD03A /* Copy Google Plist file */,
 				DEC2069321CBBD6900072F03 /* Setup Fabric */,
 				DE11877A21EE09640078D059 /* Setup Google reverse URL handler */,
 				DE4F6D6E22005C0400DE699E /* Setup Dropbox */,
@@ -173,6 +171,7 @@
 				TargetAttributes = {
 					13B07F861A680F5B00A75B9A = {
 						DevelopmentTeam = FC967L3QRG;
+						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.SafariKeychain = {
 								enabled = 1;
@@ -208,7 +207,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				0B412F211EDEE95300B1A0A6 /* Main.storyboard in Resources */,
-				DE4C455E21DE1E4300EA0709 /* GoogleService-Info.plist in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
 			);
@@ -297,7 +295,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "INFO_PLIST=\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"\nREVERSED_CLIENT_ID=$(/usr/libexec/PlistBuddy -c \"Print :REVERSED_CLIENT_ID:\" $PROJECT_DIR/GoogleService-Info.plist)\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleURLTypes:1:CFBundleURLSchemes:0 $REVERSED_CLIENT_ID\" $INFO_PLIST\n";
+			shellScript = "INFO_PLIST=\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"\nGOOGLE_PLIST=\"$PROJECT_DIR/GoogleService-Info.plist\"\n\nif [[ -f $GOOGLE_PLIST ]]; then\n    REVERSED_CLIENT_ID=$(/usr/libexec/PlistBuddy -c \"Print :REVERSED_CLIENT_ID:\" $GOOGLE_PLIST)\n    /usr/libexec/PlistBuddy -c \"Set :CFBundleURLTypes:1:CFBundleURLSchemes:0 $REVERSED_CLIENT_ID\" $INFO_PLIST\nfi\n";
 		};
 		DE4F6D6E22005C0400DE699E /* Setup Dropbox */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -335,6 +333,24 @@
 			shellPath = /bin/sh;
 			shellScript = "${PODS_ROOT}/Fabric/run\n";
 		};
+		DEF4813D224925A2002AD03A /* Copy Google Plist file */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Google Plist file";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "GOOGLE_PLIST_NAME=\"GoogleService-Info.plist\"\nGOOGLE_PLIST=\"$PROJECT_DIR/$GOOGLE_PLIST_NAME\"\nBUILD_APP_DIR=\"$BUILT_PRODUCTS_DIR/$PRODUCT_NAME.app\"\n\nif [[ -f $GOOGLE_PLIST ]]; then\n    cp $GOOGLE_PLIST \"$BUILD_APP_DIR/$GOOGLE_PLIST_NAME\"\nfi\n";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -370,6 +386,8 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = FC967L3QRG;
@@ -393,6 +411,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
 				PRODUCT_NAME = "jitsi-meet";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -404,6 +423,8 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = FC967L3QRG;
 				ENABLE_BITCODE = NO;
@@ -426,6 +447,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
 				PRODUCT_NAME = "jitsi-meet";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

ios/app/src/AppDelegate.m

@@ -19,11 +19,10 @@
 #import "FIRUtilities.h"
 #import "Types.h"
 
-#import <JitsiMeet/JitsiMeet.h>
-
 @import Crashlytics;
 @import Fabric;
 @import Firebase;
+@import JitsiMeet;
 
 
 @implementation AppDelegate
@@ -38,12 +37,20 @@
         [Fabric with:@[[Crashlytics class]]];
     }
 
-    // Set the conference activity type defined in this application.
-    // This cannot be defined by the SDK.
-    JitsiMeetView.conferenceActivityType = JitsiMeetConferenceActivityType;
+    JitsiMeet *jitsiMeet = [JitsiMeet sharedInstance];
 
-    return [JitsiMeetView application:application
-        didFinishLaunchingWithOptions:launchOptions];
+    jitsiMeet.conferenceActivityType = JitsiMeetConferenceActivityType;
+    jitsiMeet.customUrlScheme = @"org.jitsi.meet";
+    jitsiMeet.universalLinkDomains = @[@"meet.jit.si", @"beta.meet.jit.si"];
+
+    jitsiMeet.defaultConferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
+        builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"];
+        builder.welcomePageEnabled = YES;
+    }];
+
+    [jitsiMeet application:application didFinishLaunchingWithOptions:launchOptions];
+
+    return YES;
 }
 
 #pragma mark Linking delegate methods
@@ -63,9 +70,9 @@
            NSURL *dynamicLinkURL = dynamicLink.url;
            if (dynamicLinkURL) {
              userActivity.webpageURL = dynamicLinkURL;
-             [JitsiMeetView application:application
-                   continueUserActivity:userActivity
-                     restorationHandler:restorationHandler];
+             [[JitsiMeet sharedInstance] application:application
+                                continueUserActivity:userActivity
+                                  restorationHandler:restorationHandler];
            }
         }];
 
@@ -75,9 +82,9 @@
     }
 
     // 2. Default to plain old, non-Firebase-assisted Universal Links.
-    return [JitsiMeetView application:application
-                 continueUserActivity:userActivity
-                   restorationHandler:restorationHandler];
+    return [[JitsiMeet sharedInstance] application:application
+                              continueUserActivity:userActivity
+                                restorationHandler:restorationHandler];
 }
 
 - (BOOL)application:(UIApplication *)app
@@ -100,9 +107,9 @@
         }
     }
 
-    return [JitsiMeetView application:app
-                              openURL:openUrl
-                              options:options];
+    return [[JitsiMeet sharedInstance] application:app
+                                           openURL:openUrl
+                                           options:options];
 }
 
 @end

ios/app/src/FIRUtilities.m

@@ -21,8 +21,6 @@ NSString *const kGoogleServiceInfoFileName = @"GoogleService-Info";
 // Plist file type.
 NSString *const kGoogleServiceInfoFileType = @"plist";
 NSString *const kGoogleAppIDPlistKey = @"GOOGLE_APP_ID";
-// Dummy plist GOOGLE_APP_ID
-NSString *const kDummyGoogleAppID = @"1:123:ios:123abc";
 
 
 @implementation FIRUtilities
@@ -59,9 +57,6 @@ NSString *const kDummyGoogleAppID = @"1:123:ios:123abc";
   if (!googleAppID.length) {
     return NO;
   }
-  if ([googleAppID isEqualToString:kDummyGoogleAppID]) {
-    return NO;
-  }
 
   return YES;
 }

ios/app/src/ViewController.m

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,18 +16,16 @@
  */
 
 #import <Availability.h>
-#import <CoreSpotlight/CoreSpotlight.h>
-#import <MobileCoreServices/MobileCoreServices.h>
+
+@import CoreSpotlight;
+@import MobileCoreServices;
+@import Intents;  // Needed for NSUserActivity suggestedInvocationPhrase
+
+@import JitsiMeet;
 
 #import "Types.h"
 #import "ViewController.h"
 
-// Needed for NSUserActivity suggestedInvocationPhrase
-@import Intents;
-
-
-@interface ViewController ()
-@end
 
 @implementation ViewController
 
@@ -36,17 +35,9 @@
     JitsiMeetView *view = (JitsiMeetView *) self.view;
     view.delegate = self;
 
-    // As this is the Jitsi Meet app (i.e. not the Jitsi Meet SDK), we do want
-    // the Welcome page to be enabled. It defaults to disabled in the SDK at the
-    // time of this writing but it is clearer to be explicit about what we want
-    // anyway.
-    view.welcomePageEnabled = YES;
-
-    [view loadURL:nil];
+    [view join:[[JitsiMeet sharedInstance] getInitialConferenceOptions]];
 }
 
-
-
 // JitsiMeetViewDelegate
 
 - (void)_onJitsiMeetViewDelegateEvent:(NSString *)name
@@ -63,10 +54,6 @@
 #endif
 }
 
-- (void)conferenceFailed:(NSDictionary *)data {
-    [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_FAILED" withData:data];
-}
-
 - (void)conferenceJoined:(NSDictionary *)data {
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_JOINED" withData:data];
 
@@ -101,20 +88,12 @@
 
 }
 
-- (void)conferenceLeft:(NSDictionary *)data {
-    [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_LEFT" withData:data];
+- (void)conferenceTerminated:(NSDictionary *)data {
+    [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_TERMINATED" withData:data];
 }
 
 - (void)conferenceWillJoin:(NSDictionary *)data {
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_WILL_JOIN" withData:data];
 }
 
-- (void)conferenceWillLeave:(NSDictionary *)data {
-    [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_WILL_LEAVE" withData:data];
-}
-
-- (void)loadConfigError:(NSDictionary *)data {
-    [self _onJitsiMeetViewDelegateEvent:@"LOAD_CONFIG_ERROR" withData:data];
-}
-
 @end

ios/fastlane/Fastfile

@@ -1,8 +1,14 @@
+ENV["FASTLANE_SKIP_UPDATE_CHECK"] = "1"
+opt_out_usage
+
 default_platform(:ios)
 
 platform :ios do
   desc "Push a new beta build to TestFlight"
-  lane :beta do
+  lane :deploy do
+    # Make sure we are on a clean tree
+    ensure_git_status_clean
+
     # Set the app identifier
     update_app_identifier(
       xcodeproj: "app/app.xcodeproj",
@@ -24,5 +30,6 @@ platform :ios do
 
     # Cleanup
     clean_build_artifacts
+    reset_git_repo(skip_clean: true)
   end
 end

ios/fastlane/README.md

@@ -16,9 +16,9 @@ or alternatively using `brew cask install fastlane`
 
 # Available Actions
 ## iOS
-### ios beta
+### ios deploy
 ```
-fastlane ios beta
+fastlane ios deploy
 ```
 Push a new beta build to TestFlight
 

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -13,7 +13,6 @@
 		0B44A0191F902126009D1D64 /* MPVolumeViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B44A0181F902126009D1D64 /* MPVolumeViewManager.m */; };
 		0B49424520AD8DBD00BD2DE0 /* outgoingStart.wav in Resources */ = {isa = PBXBuildFile; fileRef = 0B49424320AD8DBD00BD2DE0 /* outgoingStart.wav */; };
 		0B49424620AD8DBD00BD2DE0 /* outgoingRinging.wav in Resources */ = {isa = PBXBuildFile; fileRef = 0B49424420AD8DBD00BD2DE0 /* outgoingRinging.wav */; };
-		0B7C2CFD200F51D60060D076 /* LaunchOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B7C2CFC200F51D60060D076 /* LaunchOptions.m */; };
 		0B93EF7E1EC9DDCD0030D24D /* RCTBridgeWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B93EF7C1EC9DDCD0030D24D /* RCTBridgeWrapper.h */; };
 		0B93EF7F1EC9DDCD0030D24D /* RCTBridgeWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B93EF7D1EC9DDCD0030D24D /* RCTBridgeWrapper.m */; };
 		0BA13D311EE83FF8007BEF7F /* ExternalAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */; };
@@ -34,6 +33,7 @@
 		75635B0B20751D6D00F29C9F /* left.wav in Resources */ = {isa = PBXBuildFile; fileRef = 75635B0920751D6D00F29C9F /* left.wav */; };
 		87FE6F3321E52437004A5DC7 /* incomingMessage.wav in Resources */ = {isa = PBXBuildFile; fileRef = 87FE6F3221E52437004A5DC7 /* incomingMessage.wav */; };
 		A4414AE020B37F1A003546E6 /* rejected.wav in Resources */ = {isa = PBXBuildFile; fileRef = A4414ADF20B37F1A003546E6 /* rejected.wav */; };
+		A480429C21EE335600289B73 /* AmplitudeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = A480429B21EE335600289B73 /* AmplitudeModule.m */; };
 		A4A934E9212F3ADB001E9388 /* Dropbox.m in Sources */ = {isa = PBXBuildFile; fileRef = A4A934E8212F3ADB001E9388 /* Dropbox.m */; };
 		C6245F5D2053091D0040BE68 /* image-resize@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6245F5B2053091D0040BE68 /* image-resize@2x.png */; };
 		C6245F5E2053091D0040BE68 /* image-resize@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6245F5C2053091D0040BE68 /* image-resize@3x.png */; };
@@ -42,8 +42,11 @@
 		C69EFA0E209A0F660027712B /* JMCallKitListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = C69EFA0B209A0F660027712B /* JMCallKitListener.swift */; };
 		C6A34261204EF76800E062DD /* DragGestureController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A3425E204EF76800E062DD /* DragGestureController.swift */; };
 		C6CC49AF207412CF000DFA42 /* PiPViewCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6CC49AE207412CF000DFA42 /* PiPViewCoordinator.swift */; };
-		C6F99C15204DB63E0001F710 /* JitsiMeetView+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = C6F99C13204DB63D0001F710 /* JitsiMeetView+Private.h */; };
+		DEAD3226220C497000E93636 /* JitsiMeetConferenceOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DEAD3227220C497000E93636 /* JitsiMeetConferenceOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */; };
 		DEFC743F21B178FA00E4DD96 /* LocaleDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFC743D21B178FA00E4DD96 /* LocaleDetector.m */; };
+		DEFE535421FB1BF800011A3A /* JitsiMeet.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFE535321FB1BF800011A3A /* JitsiMeet.m */; };
+		DEFE535621FB2E8300011A3A /* ReactUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFE535521FB2E8300011A3A /* ReactUtils.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -54,7 +57,6 @@
 		0B44A0181F902126009D1D64 /* MPVolumeViewManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPVolumeViewManager.m; sourceTree = "<group>"; };
 		0B49424320AD8DBD00BD2DE0 /* outgoingStart.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = outgoingStart.wav; path = ../../sounds/outgoingStart.wav; sourceTree = "<group>"; };
 		0B49424420AD8DBD00BD2DE0 /* outgoingRinging.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = outgoingRinging.wav; path = ../../sounds/outgoingRinging.wav; sourceTree = "<group>"; };
-		0B7C2CFC200F51D60060D076 /* LaunchOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LaunchOptions.m; sourceTree = "<group>"; };
 		0B93EF7A1EC608550030D24D /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
 		0B93EF7C1EC9DDCD0030D24D /* RCTBridgeWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBridgeWrapper.h; sourceTree = "<group>"; };
 		0B93EF7D1EC9DDCD0030D24D /* RCTBridgeWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBridgeWrapper.m; sourceTree = "<group>"; };
@@ -80,6 +82,7 @@
 		98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
 		9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
 		A4414ADF20B37F1A003546E6 /* rejected.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = rejected.wav; path = ../../sounds/rejected.wav; sourceTree = "<group>"; };
+		A480429B21EE335600289B73 /* AmplitudeModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AmplitudeModule.m; path = src/analytics/AmplitudeModule.m; sourceTree = SOURCE_ROOT; };
 		A4A934E8212F3ADB001E9388 /* Dropbox.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Dropbox.m; sourceTree = "<group>"; };
 		A4A934EB21349A06001E9388 /* Dropbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Dropbox.h; sourceTree = "<group>"; };
 		C6245F5B2053091D0040BE68 /* image-resize@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "image-resize@2x.png"; path = "src/picture-in-picture/image-resize@2x.png"; sourceTree = "<group>"; };
@@ -90,7 +93,14 @@
 		C6A3425E204EF76800E062DD /* DragGestureController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DragGestureController.swift; sourceTree = "<group>"; };
 		C6CC49AE207412CF000DFA42 /* PiPViewCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PiPViewCoordinator.swift; sourceTree = "<group>"; };
 		C6F99C13204DB63D0001F710 /* JitsiMeetView+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetView+Private.h"; sourceTree = "<group>"; };
+		DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetConferenceOptions.h; sourceTree = "<group>"; };
+		DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetConferenceOptions.m; sourceTree = "<group>"; };
+		DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetConferenceOptions+Private.h"; sourceTree = "<group>"; };
 		DEFC743D21B178FA00E4DD96 /* LocaleDetector.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LocaleDetector.m; sourceTree = "<group>"; };
+		DEFE535321FB1BF800011A3A /* JitsiMeet.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeet.m; sourceTree = "<group>"; };
+		DEFE535521FB2E8300011A3A /* ReactUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReactUtils.m; sourceTree = "<group>"; };
+		DEFE535721FB2E9E00011A3A /* ReactUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactUtils.h; sourceTree = "<group>"; };
+		DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeet+Private.h"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -148,6 +158,7 @@
 		0BD906E71EC0C00300C8C18E /* src */ = {
 			isa = PBXGroup;
 			children = (
+				A480429821ECE2D800289B73 /* analytics */,
 				0BB9AD7C1F60356D001C08DB /* AppInfo.m */,
 				0BCA495C1EC4B6C600B793EE /* AudioMode.m */,
 				C69EFA02209A0EFD0027712B /* callkit */,
@@ -155,16 +166,22 @@
 				0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */,
 				0BD906E91EC0C00300C8C18E /* Info.plist */,
 				0BD906E81EC0C00300C8C18E /* JitsiMeet.h */,
+				DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */,
+				DEFE535321FB1BF800011A3A /* JitsiMeet.m */,
+				DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */,
+				DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */,
+				DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */,
 				0B412F161EDEC65D00B1A0A6 /* JitsiMeetView.h */,
 				0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */,
 				C6F99C13204DB63D0001F710 /* JitsiMeetView+Private.h */,
 				0B412F1B1EDEC80100B1A0A6 /* JitsiMeetViewDelegate.h */,
-				0B7C2CFC200F51D60060D076 /* LaunchOptions.m */,
 				DEFC743D21B178FA00E4DD96 /* LocaleDetector.m */,
 				0B44A0181F902126009D1D64 /* MPVolumeViewManager.m */,
 				C6A3426B204F127900E062DD /* picture-in-picture */,
 				0BCA495D1EC4B6C600B793EE /* POSIX.m */,
 				0BCA495E1EC4B6C600B793EE /* Proximity.m */,
+				DEFE535721FB2E9E00011A3A /* ReactUtils.h */,
+				DEFE535521FB2E8300011A3A /* ReactUtils.m */,
 				0B93EF7C1EC9DDCD0030D24D /* RCTBridgeWrapper.h */,
 				0B93EF7D1EC9DDCD0030D24D /* RCTBridgeWrapper.m */,
 			);
@@ -183,6 +200,15 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		A480429821ECE2D800289B73 /* analytics */ = {
+			isa = PBXGroup;
+			children = (
+				A480429B21EE335600289B73 /* AmplitudeModule.m */,
+			);
+			name = analytics;
+			path = "New Group";
+			sourceTree = "<group>";
+		};
 		A4A934E7212F3AB8001E9388 /* dropbox */ = {
 			isa = PBXGroup;
 			children = (
@@ -228,11 +254,11 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C6F99C15204DB63E0001F710 /* JitsiMeetView+Private.h in Headers */,
 				0B412F181EDEC65D00B1A0A6 /* JitsiMeetView.h in Headers */,
 				0B93EF7E1EC9DDCD0030D24D /* RCTBridgeWrapper.h in Headers */,
 				0B412F221EDEF6EA00B1A0A6 /* JitsiMeetViewDelegate.h in Headers */,
 				0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */,
+				DEAD3226220C497000E93636 /* JitsiMeetConferenceOptions.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -272,7 +298,7 @@
 				TargetAttributes = {
 					0BD906E41EC0C00300C8C18E = {
 						CreatedOnToolsVersion = 8.3.2;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -347,7 +373,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [[ \"$CONFIGURATION\" == *Debug* && ! \"$PLATFORM_NAME\" == *simulator ]]; then\n    IP=$(ipconfig getifaddr en0)\n    if [ -z \"$IP\" ]; then\n        IP=$(ifconfig | grep 'inet ' | grep -v ' 127.' | cut -d\\   -f2  | awk 'NR==1{print $1}')\n    fi\n    DEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\n    echo \"$IP\" > \"$DEST/ip.txt\"\n    exit 0\nfi\nexport NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
+			shellScript = "export NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
 		26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -374,6 +400,10 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet-resources.sh",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/api.amplitude.com.der",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoCaLimitedRsaCertificationAuthority.der",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaCA.der",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaDomainValidationCA.der",
 				"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
@@ -393,6 +423,10 @@
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/api.amplitude.com.der",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoCaLimitedRsaCertificationAuthority.der",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaCA.der",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaDomainValidationCA.der",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
@@ -424,21 +458,24 @@
 			files = (
 				0BB9AD7B1F5EC8F4001C08DB /* CallKit.m in Sources */,
 				0BB9AD7D1F60356D001C08DB /* AppInfo.m in Sources */,
+				DEAD3227220C497000E93636 /* JitsiMeetConferenceOptions.m in Sources */,
 				0B93EF7F1EC9DDCD0030D24D /* RCTBridgeWrapper.m in Sources */,
 				0BA13D311EE83FF8007BEF7F /* ExternalAPI.m in Sources */,
 				0BCA49601EC4B6C600B793EE /* POSIX.m in Sources */,
-				0B7C2CFD200F51D60060D076 /* LaunchOptions.m in Sources */,
 				C6CC49AF207412CF000DFA42 /* PiPViewCoordinator.swift in Sources */,
 				DEFC743F21B178FA00E4DD96 /* LocaleDetector.m in Sources */,
 				0BCA495F1EC4B6C600B793EE /* AudioMode.m in Sources */,
 				0B44A0191F902126009D1D64 /* MPVolumeViewManager.m in Sources */,
 				0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */,
+				A480429C21EE335600289B73 /* AmplitudeModule.m in Sources */,
 				C69EFA0C209A0F660027712B /* JMCallKitEmitter.swift in Sources */,
+				DEFE535621FB2E8300011A3A /* ReactUtils.m in Sources */,
 				C6A34261204EF76800E062DD /* DragGestureController.swift in Sources */,
 				A4A934E9212F3ADB001E9388 /* Dropbox.m in Sources */,
 				C69EFA0D209A0F660027712B /* JMCallKitProxy.swift in Sources */,
 				C69EFA0E209A0F660027712B /* JMCallKitListener.swift in Sources */,
 				0B412F191EDEC65D00B1A0A6 /* JitsiMeetView.m in Sources */,
+				DEFE535421FB1BF800011A3A /* JitsiMeet.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -585,7 +622,8 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -611,7 +649,8 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

ios/sdk/src/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

ios/sdk/src/JitsiMeet+Private.h

@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+#import "JitsiMeet.h"
+
+@interface JitsiMeet ()
+
+- (NSDictionary *)getDefaultProps;
+- (RCTBridge *)getReactBridge;
+
+@end

ios/sdk/src/JitsiMeet.h

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +15,52 @@
  * limitations under the License.
  */
 
-// JitsiMeetView
 #import <JitsiMeet/JitsiMeetView.h>
 #import <JitsiMeet/JitsiMeetViewDelegate.h>
+#import <JitsiMeet/JitsiMeetConferenceOptions.h>
+
+
+@interface JitsiMeet : NSObject
+
+/**
+ * Name for the conference NSUserActivity type. This is used when integrating with
+ * SiriKit or Handoff, for example.
+ */
+@property (copy, nonatomic, nullable) NSString *conferenceActivityType;
+/**
+ * Custom URL scheme used for deep-linking.
+ */
+@property (copy, nonatomic, nullable) NSString *customUrlScheme;
+/**
+ * List of domains used for universal linking.
+ */
+@property (copy, nonatomic, nullable) NSArray<NSString *> *universalLinkDomains;
+
+/**
+ * Default conference options used for all conferences. These options will be merged
+ * with those passed to JitsiMeetView.join when joining a conference.
+ */
+@property (nonatomic, nullable) JitsiMeetConferenceOptions *defaultConferenceOptions;
+
+#pragma mak - This class is a singleton
+
++ (instancetype)sharedInstance;
+
+#pragma mark - Methods that the App delegate must call
+
+-             (BOOL)application:(UIApplication *_Nonnull)application
+  didFinishLaunchingWithOptions:(NSDictionary *_Nonnull)launchOptions;
+
+-    (BOOL)application:(UIApplication * _Nonnull)application
+  continueUserActivity:(NSUserActivity * _Nonnull)userActivity
+    restorationHandler:(void (^ _Nullable)(NSArray * _Nullable))restorationHandler;
+
+- (BOOL)application:(UIApplication *)app
+            openURL:(NSURL *)url
+            options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options;
+
+#pragma mark - Utility methods
+
+- (JitsiMeetConferenceOptions *)getInitialConferenceOptions;
+
+@end

ios/sdk/src/JitsiMeet.m

@@ -0,0 +1,189 @@
+/*
+ * 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.
+ */
+
+#import <Intents/Intents.h>
+
+#import "Dropbox.h"
+#import "JitsiMeet+Private.h"
+#import "JitsiMeetConferenceOptions+Private.h"
+#import "JitsiMeetView+Private.h"
+#import "RCTBridgeWrapper.h"
+#import "ReactUtils.h"
+
+#import <RNGoogleSignin/RNGoogleSignin.h>
+
+
+@implementation JitsiMeet {
+    RCTBridgeWrapper *_bridgeWrapper;
+    NSDictionary *_launchOptions;
+}
+
+#pragma mak - This class is a singleton
+
++ (instancetype)sharedInstance {
+    static JitsiMeet *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [[self alloc] init];
+    });
+
+    return sharedInstance;
+}
+
+- (instancetype)init {
+    if (self = [super init]) {
+        // Initialize the on and only bridge for interfacing with React Native.
+        _bridgeWrapper = [[RCTBridgeWrapper alloc] init];
+
+        // Register a fatal error handler for React.
+        registerReactFatalErrorHandler();
+    }
+
+    return self;
+}
+
+#pragma mark - Methods that the App delegate must call
+
+-             (BOOL)application:(UIApplication *)application
+  didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+
+    _launchOptions = [launchOptions copy];
+
+    [Dropbox setAppKey];
+
+    return YES;
+}
+
+-    (BOOL)application:(UIApplication *)application
+  continueUserActivity:(NSUserActivity *)userActivity
+    restorationHandler:(void (^)(NSArray *restorableObjects))restorationHandler {
+
+    JitsiMeetConferenceOptions *options = [self optionsFromUserActivity:userActivity];
+
+    return options && [JitsiMeetView setPropsInViews:[options asProps]];
+}
+
+- (BOOL)application:(UIApplication *)app
+            openURL:(NSURL *)url
+            options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
+
+    if ([Dropbox application:app openURL:url options:options]) {
+        return YES;
+    }
+
+    if ([RNGoogleSignin application:app
+                            openURL:url
+                  sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey]
+                         annotation:options[UIApplicationOpenURLOptionsAnnotationKey]]) {
+        return YES;
+    }
+
+    if (_customUrlScheme == nil || ![_customUrlScheme isEqualToString:url.scheme]) {
+        return NO;
+    }
+
+    JitsiMeetConferenceOptions *conferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
+        builder.room = [url absoluteString];
+    }];
+    
+    return [JitsiMeetView setPropsInViews:[conferenceOptions asProps]];
+}
+
+#pragma mark - Utility methods
+
+- (JitsiMeetConferenceOptions *)getInitialConferenceOptions {
+    if (_launchOptions[UIApplicationLaunchOptionsURLKey]) {
+        NSURL *url = _launchOptions[UIApplicationLaunchOptionsURLKey];
+        return [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
+            builder.room = [url absoluteString];
+        }];
+    } else {
+        NSDictionary *userActivityDictionary
+            = _launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey];
+        NSUserActivity *userActivity
+            = [userActivityDictionary objectForKey:@"UIApplicationLaunchOptionsUserActivityKey"];
+        if (userActivity != nil) {
+            return [self optionsFromUserActivity:userActivity];
+        }
+    }
+
+    return nil;
+}
+
+- (JitsiMeetConferenceOptions *)optionsFromUserActivity:(NSUserActivity *)userActivity {
+    NSString *activityType = userActivity.activityType;
+
+    if ([activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
+        // App was started by opening a URL in the browser
+        NSURL *url = userActivity.webpageURL;
+        if ([_universalLinkDomains containsObject:url.host]) {
+            return [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
+                builder.room = [url absoluteString];
+            }];
+        }
+    } else if ([activityType isEqualToString:@"INStartAudioCallIntent"]
+               || [activityType isEqualToString:@"INStartVideoCallIntent"]) {
+        // App was started by a CallKit Intent
+        INIntent *intent = userActivity.interaction.intent;
+        NSArray<INPerson *> *contacts;
+        NSString *url;
+        BOOL audioOnly = NO;
+
+        if ([intent isKindOfClass:[INStartAudioCallIntent class]]) {
+            contacts = ((INStartAudioCallIntent *) intent).contacts;
+            audioOnly = YES;
+        } else if ([intent isKindOfClass:[INStartVideoCallIntent class]]) {
+            contacts = ((INStartVideoCallIntent *) intent).contacts;
+        }
+
+        if (contacts && (url = contacts.firstObject.personHandle.value)) {
+            return [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
+                builder.audioOnly = audioOnly;
+                builder.room = url;
+            }];
+        }
+    } else if (self.conferenceActivityType && [activityType isEqualToString:self.conferenceActivityType]) {
+        // App was started by continuing a registered NSUserActivity (SiriKit, Handoff, ...)
+        NSString *url;
+
+        if ((url = userActivity.userInfo[@"url"])) {
+            return [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
+                builder.room = url;
+            }];
+        }
+    }
+
+    return nil;
+}
+
+#pragma mark - Property getter / setters
+
+- (NSArray<NSString *> *)universalLinkDomains {
+    return _universalLinkDomains ? _universalLinkDomains : @[];
+}
+
+#pragma mark - Private API methods
+
+- (NSDictionary *)getDefaultProps {
+    return _defaultConferenceOptions == nil ? @{} : [_defaultConferenceOptions asProps];
+}
+
+- (RCTBridge *)getReactBridge {
+    return _bridgeWrapper.bridge;
+}
+
+@end

ios/sdk/src/JitsiMeetConferenceOptions+Private.h

@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+#import "JitsiMeetConferenceOptions.h"
+
+@interface JitsiMeetConferenceOptions ()
+
+- (NSMutableDictionary *)asProps;
+
+@end

ios/sdk/src/JitsiMeetConferenceOptions.h

@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface JitsiMeetConferenceOptionsBuilder : NSObject
+
+/**
+ * Server where the conference should take place.
+ */
+@property (nonatomic, copy, nullable) NSURL *serverURL;
+/**
+ * Room name.
+ */
+@property (nonatomic, copy, nullable) NSString *room;
+/**
+ * JWT token used for authentication.
+ */
+@property (nonatomic, copy, nullable) NSString *token;
+
+/**
+ * Color scheme override, see:
+ * https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/color-scheme/defaultScheme.js
+ */
+@property (nonatomic, copy, nullable) NSDictionary *colorScheme;
+
+/**
+ * Set to YES to join the conference with audio / video muted or to start in audio
+ * only mode respectively.
+ */
+@property (nonatomic) BOOL audioOnly;
+@property (nonatomic) BOOL audioMuted;
+@property (nonatomic) BOOL videoMuted;
+
+/**
+ * Set to YES to enable the welcome page. Typically SDK users won't need this enabled
+ * since the host application decides which meeting to join.
+ */
+@property (nonatomic) BOOL welcomePageEnabled;
+
+@end
+
+@interface JitsiMeetConferenceOptions : NSObject
+
+@property (nonatomic, copy, nullable, readonly) NSURL *serverURL;
+@property (nonatomic, copy, nullable, readonly) NSString *room;
+@property (nonatomic, copy, nullable, readonly) NSString *token;
+
+@property (nonatomic, copy, nullable) NSDictionary *colorScheme;
+
+@property (nonatomic, readonly) BOOL audioOnly;
+@property (nonatomic, readonly) BOOL audioMuted;
+@property (nonatomic, readonly) BOOL videoMuted;
+
+@property (nonatomic, readonly) BOOL welcomePageEnabled;
+
++ (instancetype)fromBuilder:(void (^)(JitsiMeetConferenceOptionsBuilder *))initBlock;
+- (instancetype)init NS_UNAVAILABLE;
+
+@end

ios/sdk/src/JitsiMeetConferenceOptions.m

@@ -0,0 +1,212 @@
+/*
+ * 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.
+ */
+
+#import <React/RCTUtils.h>
+
+#import "JitsiMeetConferenceOptions+Private.h"
+
+@implementation JitsiMeetConferenceOptionsBuilder {
+    NSNumber *_audioOnly;
+    NSNumber *_audioMuted;
+    NSNumber *_videoMuted;
+    NSNumber *_welcomePageEnabled;
+}
+
+@dynamic audioOnly;
+@dynamic audioMuted;
+@dynamic videoMuted;
+@dynamic welcomePageEnabled;
+
+- (instancetype)init {
+    if (self = [super init]) {
+        _serverURL = nil;
+        _room = nil;
+        _token = nil;
+
+        _colorScheme = nil;
+
+        _audioOnly = nil;
+        _audioMuted = nil;
+        _videoMuted = nil;
+
+        _welcomePageEnabled = nil;
+    }
+    
+    return self;
+}
+
+#pragma mark - Dynamic properties
+
+- (void)setAudioOnly:(BOOL)audioOnly {
+    _audioOnly = [NSNumber numberWithBool:audioOnly];
+}
+
+- (BOOL)audioOnly {
+    return _audioOnly && [_audioOnly boolValue];
+}
+
+- (void)setAudioMuted:(BOOL)audioMuted {
+    _audioMuted = [NSNumber numberWithBool:audioMuted];
+}
+
+- (BOOL)audioMuted {
+    return _audioMuted && [_audioMuted boolValue];
+}
+
+- (void)setVideoMuted:(BOOL)videoMuted {
+    _videoMuted = [NSNumber numberWithBool:videoMuted];
+}
+
+- (BOOL)videoMuted {
+    return _videoMuted && [_videoMuted boolValue];
+}
+
+- (void)setWelcomePageEnabled:(BOOL)welcomePageEnabled {
+    _welcomePageEnabled = [NSNumber numberWithBool:welcomePageEnabled];
+}
+
+- (BOOL)welcomePageEnabled {
+    return _welcomePageEnabled && [_welcomePageEnabled boolValue];
+}
+
+#pragma mark - Private API
+
+- (NSNumber *)getAudioOnly {
+    return _audioOnly;
+}
+
+- (NSNumber *)getAudioMuted {
+    return _audioMuted;
+}
+
+- (NSNumber *)getVideoMuted {
+    return _videoMuted;
+}
+
+- (NSNumber *)getWelcomePageEnabled {
+    return _welcomePageEnabled;
+}
+
+@end
+
+@implementation JitsiMeetConferenceOptions {
+    NSNumber *_audioOnly;
+    NSNumber *_audioMuted;
+    NSNumber *_videoMuted;
+    NSNumber *_welcomePageEnabled;
+}
+
+@dynamic audioOnly;
+@dynamic audioMuted;
+@dynamic videoMuted;
+@dynamic welcomePageEnabled;
+
+#pragma mark - Dynamic properties
+
+- (BOOL)audioOnly {
+    return _audioOnly && [_audioOnly boolValue];
+}
+
+- (BOOL)audioMuted {
+    return _audioMuted && [_audioMuted boolValue];
+}
+
+- (BOOL)videoMuted {
+    return _videoMuted && [_videoMuted boolValue];
+}
+
+- (BOOL)welcomePageEnabled {
+    return _welcomePageEnabled && [_welcomePageEnabled boolValue];
+}
+
+#pragma mark - Internal initializer
+
+- (instancetype)initWithBuilder:(JitsiMeetConferenceOptionsBuilder *)builder {
+    if (self = [super init]) {
+        _serverURL = builder.serverURL;
+        _room = builder.room;
+        _token = builder.token;
+
+        _colorScheme = builder.colorScheme;
+
+        _audioOnly = [builder getAudioOnly];
+        _audioMuted = [builder getAudioMuted];
+        _videoMuted = [builder getVideoMuted];
+
+        _welcomePageEnabled = [builder getWelcomePageEnabled];
+    }
+
+    return self;
+}
+
+#pragma mark - API
+
++ (instancetype)fromBuilder:(void (^)(JitsiMeetConferenceOptionsBuilder *))initBlock {
+    JitsiMeetConferenceOptionsBuilder *builder = [[JitsiMeetConferenceOptionsBuilder alloc] init];
+    initBlock(builder);
+    return [[JitsiMeetConferenceOptions alloc] initWithBuilder:builder];
+}
+
+#pragma mark - Private API
+
+- (NSDictionary *)asProps {
+    NSMutableDictionary *props = [[NSMutableDictionary alloc] init];
+
+    if (_colorScheme != nil) {
+        props[@"colorScheme"] = self.colorScheme;
+    }
+
+    if (_welcomePageEnabled != nil) {
+        props[@"welcomePageEnabled"] = @(self.welcomePageEnabled);
+    }
+
+    NSMutableDictionary *config = [[NSMutableDictionary alloc] init];
+    if (_audioOnly != nil) {
+        config[@"startAudioOnly"] = @(self.audioOnly);
+    }
+    if (_audioMuted != nil) {
+        config[@"startWithAudioMuted"] = @(self.audioMuted);
+    }
+    if (_videoMuted != nil) {
+        config[@"startWithVideoMuted"] = @(self.videoMuted);
+    }
+
+    NSMutableDictionary *urlProps = [[NSMutableDictionary alloc] init];
+
+    // The room is fully qualified.
+    if (_room != nil && [_room containsString:@"://"]) {
+        urlProps[@"url"] = _room;
+    } else {
+        if (_serverURL != nil) {
+            urlProps[@"serverURL"] = [_serverURL absoluteString];
+        }
+
+        if (_room != nil) {
+            urlProps[@"room"] = _room;
+        }
+    }
+
+    if (_token != nil) {
+        urlProps[@"jwt"] = _token;
+    }
+
+    urlProps[@"config"] = config;
+    props[@"url"] = urlProps;
+
+    return props;
+}
+
+@end

ios/sdk/src/JitsiMeetView+Private.h

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +19,7 @@
 
 @interface JitsiMeetView ()
 
-+ (NSDictionary *)conferenceURLFromUserActivity:(NSUserActivity *)userActivity;
 + (instancetype)viewForExternalAPIScope:(NSString *)externalAPIScope;
++ (BOOL)setPropsInViews:(NSDictionary *_Nonnull)newProps;
 
 @end

ios/sdk/src/JitsiMeetView.h

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,42 +18,23 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+#import "JitsiMeetConferenceOptions.h"
 #import "JitsiMeetViewDelegate.h"
 
 @interface JitsiMeetView : UIView
 
-@property (class, copy, nonatomic, nullable) NSString *conferenceActivityType;
-
-@property (nonatomic) NSDictionary *colorScheme;
-
-@property (copy, nonatomic, nullable) NSURL *defaultURL;
-
 @property (nonatomic, nullable, weak) id<JitsiMeetViewDelegate> delegate;
 
-@property (nonatomic) BOOL pictureInPictureEnabled;
-
-@property (nonatomic) BOOL welcomePageEnabled;
-
-+             (BOOL)application:(UIApplication *_Nonnull)application
-  didFinishLaunchingWithOptions:(NSDictionary *_Nonnull)launchOptions;
-
-+    (BOOL)application:(UIApplication * _Nonnull)application
-  continueUserActivity:(NSUserActivity * _Nonnull)userActivity
-    restorationHandler:(void (^ _Nullable)(NSArray * _Nullable))restorationHandler;
-
-+ (BOOL)application:(UIApplication *)app
-            openURL:(NSURL *)url
-            options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options;
-
-+ (BOOL)application:(UIApplication * _Nonnull)application
-            openURL:(NSURL * _Nonnull)URL
-  sourceApplication:(NSString * _Nullable)sourceApplication
-         annotation:(id _Nullable)annotation __deprecated;
-
-- (void)loadURL:(NSURL * _Nullable)url;
-
-- (void)loadURLObject:(NSDictionary * _Nullable)urlObject;
-
-- (void)loadURLString:(NSString * _Nullable)urlString;
+/**
+ * Joins the conference specified by the given options. The gievn options will
+ * be merged with the defaultConferenceOptions (if set) in JitsiMeet. If there
+ * is an already active conference it will be automatically left prior to
+ * joining the new one.
+ */
+- (void)join:(JitsiMeetConferenceOptions *)options;
+/**
+ * Leaves the currently active conference.
+ */
+- (void)leave;
 
 @end

ios/sdk/src/JitsiMeetView.m

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,62 +15,17 @@
  * limitations under the License.
  */
 
-#import <Intents/Intents.h>
-
 #include <mach/mach_time.h>
 
-#import <React/RCTAssert.h>
-#import <React/RCTLinkingManager.h>
 #import <React/RCTRootView.h>
 
-#import <RNGoogleSignin/RNGoogleSignin.h>
-
-#import "Dropbox.h"
+#import "JitsiMeet+Private.h"
+#import "JitsiMeetConferenceOptions+Private.h"
 #import "JitsiMeetView+Private.h"
-#import "RCTBridgeWrapper.h"
+#import "ReactUtils.h"
 
-/**
- * A `RCTFatalHandler` implementation which swallows JavaScript errors. In the
- * Release configuration, React Native will (intentionally) raise an unhandled
- * `NSException` for an unhandled JavaScript error. This will effectively kill
- * the application. `_RCTFatal` is suitable to be in accord with the Web i.e.
- * not kill the application.
- */
-RCTFatalHandler _RCTFatal = ^(NSError *error) {
-    id jsStackTrace = error.userInfo[RCTJSStackTraceKey];
-    @try {
-        NSString *name
-            = [NSString stringWithFormat:@"%@: %@",
-                        RCTFatalExceptionName,
-                        error.localizedDescription];
-        NSString *message
-            = RCTFormatError(error.localizedDescription, jsStackTrace, 75);
-        [NSException raise:name format:@"%@", message];
-    } @catch (NSException *e) {
-        if (!jsStackTrace) {
-            @throw;
-        }
-    }
-};
 
-/**
- * Helper function to register a fatal error handler for React. Our handler
- * won't kill the process, it will swallow JS errors and print stack traces
- * instead.
- */
-void registerFatalErrorHandler() {
-#if !DEBUG
-    // In the Release configuration, React Native will (intentionally) raise an
-    // unhandled `NSException` for an unhandled JavaScript error. This will
-    // effectively kill the application. In accord with the Web, do not kill the
-    // application.
-    if (!RCTGetFatalHandler()) {
-        RCTSetFatalHandler(_RCTFatal);
-    }
-#endif
-}
-
-@interface JitsiMeetView() {
+@implementation JitsiMeetView {
     /**
      * The unique identifier of this `JitsiMeetView` within the process for the
      * purposes of `ExternalAPI`. The name scope was inspired by postis which we
@@ -77,99 +33,24 @@ void registerFatalErrorHandler() {
      */
     NSString *externalAPIScope;
 
+    /**
+     * React Native view where the entire content will be rendered.
+     */
     RCTRootView *rootView;
 }
 
-@end
-
-@implementation JitsiMeetView {
-    NSNumber *_pictureInPictureEnabled;
-}
-
-@dynamic pictureInPictureEnabled;
-
-static NSString *_conferenceActivityType;
-
-static RCTBridgeWrapper *bridgeWrapper;
-
-/**
- * Copy of the `launchOptions` dictionary that the application was started with.
- * It is required for the initial URL to be used if a (Universal) link was used
- * to launch a new instance of the application.
- */
-static NSDictionary *_launchOptions;
-
 /**
  * The `JitsiMeetView`s associated with their `ExternalAPI` scopes (i.e. unique
  * identifiers within the process).
  */
 static NSMapTable<NSString *, JitsiMeetView *> *views;
 
-+             (BOOL)application:(UIApplication *)application
-  didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    // Store launch options, will be used when we create the bridge.
-    _launchOptions = [launchOptions copy];
-
-    [Dropbox setAppKey];
-
-    return YES;
-}
-
-#pragma mark Linking delegate helpers
-// https://facebook.github.io/react-native/docs/linking.html
-
-+    (BOOL)application:(UIApplication *)application
-  continueUserActivity:(NSUserActivity *)userActivity
-    restorationHandler:(void (^)(NSArray *restorableObjects))restorationHandler
-{
-    // XXX At least twice we received bug reports about malfunctioning loadURL
-    // in the Jitsi Meet SDK while the Jitsi Meet app seemed to functioning as
-    // expected in our testing. But that was to be expected because the app does
-    // not exercise loadURL. In order to increase the test coverage of loadURL,
-    // channel Universal linking through loadURL.
-
-    id url = [self conferenceURLFromUserActivity:userActivity];
-
-    if (url && [self loadURLObjectInViews:url]) {
-        return YES;
-    }
-
-    return [RCTLinkingManager application:application
-                     continueUserActivity:userActivity
-                       restorationHandler:restorationHandler];
-}
-
-+ (BOOL)application:(UIApplication *)app
-            openURL:(NSURL *)url
-            options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
-    if ([Dropbox application:app openURL:url options:options]) {
-        return YES;
-    }
-
-    if ([RNGoogleSignin application:app
-                            openURL:url
-                  sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey]
-                         annotation:options[UIApplicationOpenURLOptionsAnnotationKey]]) {
-        return YES;
-    }
-
-    // XXX At least twice we received bug reports about malfunctioning loadURL
-    // in the Jitsi Meet SDK while the Jitsi Meet app seemed to functioning as
-    // expected in our testing. But that was to be expected because the app does
-    // not exercise loadURL. In order to increase the test coverage of loadURL,
-    // channel Universal linking through loadURL.
-    if ([self loadURLInViews:url]) {
-        return YES;
-    }
-
-    return [RCTLinkingManager application:app openURL:url options:options];
-}
-
-+ (BOOL)application:(UIApplication *)application
-            openURL:(NSURL *)url
-  sourceApplication:(NSString *)sourceApplication
-         annotation:(id)annotation {
-    return [self application:application openURL:url options:@{}];
+/**
+ * This gets called automagically when the program starts.
+ */
+__attribute__((constructor))
+static void initializeViewsMap() {
+    views = [NSMapTable strongToWeakObjectsMapTable];
 }
 
 #pragma mark Initializers
@@ -201,64 +82,70 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
     return self;
 }
 
-#pragma mark API
-
 /**
- * Loads a specific `NSURL` which may identify a conference to join. If the
- * specified `NSURL` is `nil` and the Welcome page is enabled, the Welcome page
- * is displayed instead.
+ * Internal initialization:
  *
- * @param url The `NSURL` to load which may identify a conference to join.
+ * - sets the background color
+ * - initializes the external API scope
  */
-- (void)loadURL:(NSURL *)url {
-    [self loadURLString:url ? url.absoluteString : nil];
+- (void)initWithXXX {
+    // Hook this JitsiMeetView into ExternalAPI.
+    externalAPIScope = [NSUUID UUID].UUIDString;
+    [views setObject:self forKey:externalAPIScope];
+
+    // Set a background color which is in accord with the JavaScript and Android
+    // parts of the application and causes less perceived visual flicker than
+    // the default background color.
+    self.backgroundColor
+        = [UIColor colorWithRed:.07f green:.07f blue:.07f alpha:1];
 }
 
+#pragma mark API
+
+- (void)join:(JitsiMeetConferenceOptions *)options {
+    [self setProps:options == nil ? @{} : [options asProps]];
+}
+
+- (void)leave {
+    [self setProps:@{}];
+}
+
+#pragma mark Private methods
+
 /**
- * Loads a specific URL which may identify a conference to join. The URL is
- * specified in the form of an `NSDictionary` of properties which (1)
- * internally are sufficient to construct a URL `NSString` while (2) abstracting
- * the specifics of constructing the URL away from API clients/consumers. If the
- * specified URL is `nil` and the Welcome page is enabled, the Welcome page is
- * displayed instead.
+ * Passes the given props to the React Native application. The props which we pass
+ * are a combination of 3 different sources:
  *
- * @param urlObject The URL to load which may identify a conference to join.
+ * - JitsiMeet.defaultConferenceOptions
+ * - This function's parameters
+ * - Some extras which are added by this function
  */
-- (void)loadURLObject:(NSDictionary *)urlObject {
-    NSMutableDictionary *props = [[NSMutableDictionary alloc] init];
+- (void)setProps:(NSDictionary *_Nonnull)newProps {
+    NSMutableDictionary *props = mergeProps([[JitsiMeet sharedInstance] getDefaultProps], newProps);
 
-    if (self.defaultURL) {
-        props[@"defaultURL"] = [self.defaultURL absoluteString];
-    }
-
-    props[@"colorScheme"] = self.colorScheme;
     props[@"externalAPIScope"] = externalAPIScope;
-    props[@"pictureInPictureEnabled"] = @(self.pictureInPictureEnabled);
-    props[@"welcomePageEnabled"] = @(self.welcomePageEnabled);
 
-    // XXX If urlObject is nil, then it must appear as undefined in the
-    // JavaScript source code so that we check the launchOptions there.
-    if (urlObject) {
-        props[@"url"] = urlObject;
-    }
+    // TODO: put this in some 'flags' field
+    props[@"pictureInPictureEnabled"]
+        = @(self.delegate && [self.delegate respondsToSelector:@selector(enterPictureInPicture:)]);
 
-    // XXX The method loadURLObject: is supposed to be imperative i.e. a second
+    // This method is supposed to be imperative i.e. a second
     // invocation with one and the same URL is expected to join the respective
     // conference again if the first invocation was followed by leaving the
     // conference. However, React and, respectively,
     // appProperties/initialProperties are declarative expressions i.e. one and
     // the same URL will not trigger an automatic re-render in the JavaScript
     // source code. The workaround implemented bellow introduces imperativeness
-    // in React Component props by defining a unique value per loadURLObject:
-    // invocation.
+    // in React Component props by defining a unique value per invocation.
     props[@"timestamp"] = @(mach_absolute_time());
 
     if (rootView) {
         // Update props with the new URL.
         rootView.appProperties = props;
     } else {
+        RCTBridge *bridge = [[JitsiMeet sharedInstance] getReactBridge];
         rootView
-            = [[RCTRootView alloc] initWithBridge:bridgeWrapper.bridge
+            = [[RCTRootView alloc] initWithBridge:bridge
                                        moduleName:@"App"
                                 initialProperties:props];
         rootView.backgroundColor = self.backgroundColor;
@@ -272,65 +159,7 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
     }
 }
 
-/**
- * Loads a specific URL `NSString` which may identify a conference to
- * join. If the specified URL `NSString` is `nil` and the Welcome page is
- * enabled, the Welcome page is displayed instead.
- *
- * @param urlString The URL `NSString` to load which may identify a conference
- * to join.
- */
-- (void)loadURLString:(NSString *)urlString {
-    [self loadURLObject:urlString ? @{ @"url": urlString } : nil];
-}
-
-#pragma conferenceActivityType getter / setter
-
-+ (NSString *)conferenceActivityType {
-    return _conferenceActivityType;
-}
-
-+ (void) setConferenceActivityType:(NSString *)conferenceActivityType {
-    _conferenceActivityType = conferenceActivityType;
-}
-
-#pragma pictureInPictureEnabled getter / setter
-
-- (void) setPictureInPictureEnabled:(BOOL)pictureInPictureEnabled {
-    _pictureInPictureEnabled
-        = [NSNumber numberWithBool:pictureInPictureEnabled];
-}
-
-- (BOOL) pictureInPictureEnabled {
-    if (_pictureInPictureEnabled) {
-        return [_pictureInPictureEnabled boolValue];
-    }
-
-    // The SDK/JitsiMeetView client/consumer did not explicitly enable/disable
-    // Picture-in-Picture. However, we may automatically deduce their
-    // intentions: we need the support of the client in order to implement
-    // Picture-in-Picture on iOS (in contrast to Android) so if the client
-    // appears to have provided the support then we can assume that they did it
-    // with the intention to have Picture-in-Picture enabled.
-    return self.delegate
-        && [self.delegate respondsToSelector:@selector(enterPictureInPicture:)];
-}
-
-#pragma mark Private methods
-
-/**
- * Loads a specific `NSURL` in all existing `JitsiMeetView`s.
- *
- * @param url The `NSURL` to load in all existing `JitsiMeetView`s.
- * @return `YES` if the specified `url` was submitted for loading in at least
- * one `JitsiMeetView`; otherwise, `NO`.
- */
-+ (BOOL)loadURLInViews:(NSURL *)url {
-    return
-        [self loadURLObjectInViews:url ? @{ @"url": url.absoluteString } : nil];
-}
-
-+ (BOOL)loadURLObjectInViews:(NSDictionary *)urlObject {
++ (BOOL)setPropsInViews:(NSDictionary *_Nonnull)newProps {
     BOOL handled = NO;
 
     if (views) {
@@ -339,7 +168,7 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
                 = [self viewForExternalAPIScope:externalAPIScope];
 
             if (view) {
-                [view loadURLObject:urlObject];
+                [view setProps:newProps];
                 handled = YES;
             }
         }
@@ -348,79 +177,8 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
     return handled;
 }
 
-+ (NSDictionary *)conferenceURLFromUserActivity:(NSUserActivity *)userActivity {
-    NSString *activityType = userActivity.activityType;
-
-    if ([activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
-        // App was started by opening a URL in the browser
-        return @{ @"url" : userActivity.webpageURL.absoluteString };
-    } else if ([activityType isEqualToString:@"INStartAudioCallIntent"]
-               || [activityType isEqualToString:@"INStartVideoCallIntent"]) {
-        // App was started by a CallKit Intent
-        INIntent *intent = userActivity.interaction.intent;
-        NSArray<INPerson *> *contacts;
-        NSString *url;
-        BOOL startAudioOnly = NO;
-
-        if ([intent isKindOfClass:[INStartAudioCallIntent class]]) {
-            contacts = ((INStartAudioCallIntent *) intent).contacts;
-            startAudioOnly = YES;
-        } else if ([intent isKindOfClass:[INStartVideoCallIntent class]]) {
-            contacts = ((INStartVideoCallIntent *) intent).contacts;
-        }
-
-        if (contacts && (url = contacts.firstObject.personHandle.value)) {
-            return @{
-                @"config": @{@"startAudioOnly":@(startAudioOnly)},
-                @"url": url
-                };
-        }
-    } else if (_conferenceActivityType && [activityType isEqualToString:_conferenceActivityType]) {
-        // App was started by continuing a registered NSUserActivity (SiriKit, Handoff, ...)
-        NSString *url;
-
-        if ((url = userActivity.userInfo[@"url"])) {
-            return @{ @"url" : url };
-        }
-    }
-
-    return nil;
-}
-
 + (instancetype)viewForExternalAPIScope:(NSString *)externalAPIScope {
     return [views objectForKey:externalAPIScope];
 }
 
-/**
- * Internal initialization:
- *
- * - sets the background color
- * - creates the React bridge
- * - loads the necessary custom fonts
- * - registers a custom fatal error error handler for React
- */
-- (void)initWithXXX {
-    static dispatch_once_t dispatchOncePredicate;
-
-    dispatch_once(&dispatchOncePredicate, ^{
-        // Initialize the static state of JitsiMeetView.
-        bridgeWrapper
-            = [[RCTBridgeWrapper alloc] initWithLaunchOptions:_launchOptions];
-        views = [NSMapTable strongToWeakObjectsMapTable];
-
-        // Register a fatal error handler for React.
-        registerFatalErrorHandler();
-    });
-
-    // Hook this JitsiMeetView into ExternalAPI.
-    externalAPIScope = [NSUUID UUID].UUIDString;
-    [views setObject:self forKey:externalAPIScope];
-
-    // Set a background color which is in accord with the JavaScript and Android
-    // parts of the application and causes less perceived visual flicker than
-    // the default background color.
-    self.backgroundColor
-        = [UIColor colorWithRed:.07f green:.07f blue:.07f alpha:1];
-}
-
 @end

ios/sdk/src/JitsiMeetViewDelegate.h

@@ -18,15 +18,6 @@
 
 @optional
 
-/**
- * Called when a joining a conference was unsuccessful or when there was an
- * error while in a conference.
- *
- * The `data` dictionary contains an `error` key describing the error and a
- * `url` key with the conference URL.
- */
-- (void)conferenceFailed:(NSDictionary *)data;
-
 /**
  * Called when a conference was joined.
  *
@@ -35,11 +26,16 @@
 - (void)conferenceJoined:(NSDictionary *)data;
 
 /**
- * Called when a conference was left.
+ * Called when the active conference ends, be it because of user choice or
+ * because of a failure.
  *
- * The `data` dictionary contains a `url` key with the conference URL.
+ * The `data` dictionary contains an `error` key with the error and a `url` key
+ * with the conference URL. If the conference finished gracefully no `error`
+ * key will be present. The possible values for "error" are described here:
+ * https://github.com/jitsi/lib-jitsi-meet/blob/master/JitsiConnectionErrors.js
+ * https://github.com/jitsi/lib-jitsi-meet/blob/master/JitsiConferenceErrors.js
  */
-- (void)conferenceLeft:(NSDictionary *)data;
+- (void)conferenceTerminated:(NSDictionary *)data;
 
 /**
  * Called before a conference is joined.
@@ -48,13 +44,6 @@
  */
 - (void)conferenceWillJoin:(NSDictionary *)data;
 
-/**
- * Called before a conference is left.
- *
- * The `data` dictionary contains a `url` key with the conference URL.
- */
-- (void)conferenceWillLeave:(NSDictionary *)data;
-
 /**
  * Called when entering Picture-in-Picture is requested by the user. The app
  * should now activate its Picture-in-Picture implementation (and resize the
@@ -66,14 +55,4 @@
  */
 - (void)enterPictureInPicture:(NSDictionary *)data;
 
-/**
- * Called when loading the main configuration file from the Jitsi Meet
- * deployment file.
- *
- * The `data` dictionary contains an `error` key with the error and a `url` key
- * with the conference URL which necessitated the loading of the configuration
- * file.
- */
-- (void)loadConfigError:(NSDictionary *)data;
-
 @end

ios/sdk/src/LaunchOptions.m

@@ -1,56 +0,0 @@
-/*
- * Copyright @ 2018-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.
- */
-
-#import "JitsiMeetView+Private.h"
-
-#import <React/RCTBridge.h>
-#import <React/RCTBridgeModule.h>
-
-@interface LaunchOptions : NSObject<RCTBridgeModule>
-
-@property (nonatomic, weak) RCTBridge *bridge;
-
-@end
-
-@implementation LaunchOptions
-
-RCT_EXPORT_MODULE();
-
-- (dispatch_queue_t)methodQueue {
-    return dispatch_get_main_queue();
-}
-
-RCT_EXPORT_METHOD(getInitialURL:(RCTPromiseResolveBlock)resolve
-                  reject:(__unused RCTPromiseRejectBlock)reject) {
-    id initialURL = nil;
-
-    if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) {
-        NSURL *url = self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey];
-        initialURL = url.absoluteString;
-    } else {
-        NSDictionary *userActivityDictionary
-            = self.bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey];
-        NSUserActivity *userActivity
-            = [userActivityDictionary objectForKey:@"UIApplicationLaunchOptionsUserActivityKey"];
-        if (userActivity != nil) {
-            initialURL = [JitsiMeetView conferenceURLFromUserActivity:userActivity];
-        }
-    }
-
-    resolve(initialURL != nil ? initialURL : (id)kCFNull);
-}
-
-@end

ios/sdk/src/RCTBridgeWrapper.h

@@ -34,6 +34,4 @@
 
 @property (nonatomic, readonly, strong)  RCTBridge *bridge;
 
-- (instancetype)initWithLaunchOptions:(NSDictionary *)launchOptions;
-
 @end

ios/sdk/src/RCTBridgeWrapper.m

@@ -22,12 +22,12 @@
  */
 @implementation RCTBridgeWrapper
 
-- (instancetype)initWithLaunchOptions:(NSDictionary *)launchOptions {
+- (instancetype)init {
     self = [super init];
     if (self) {
         _bridge
             = [[RCTBridge alloc] initWithDelegate:self
-                                    launchOptions:launchOptions];
+                                    launchOptions:nil];
     }
 
     return self;
@@ -43,16 +43,25 @@ static NSURL *serverRootWithHost(NSString *host) {
 }
 
 - (BOOL)isPackagerRunning:(NSString *)host {
-    NSURL *url
-        = [serverRootWithHost(host) URLByAppendingPathComponent:@"status"];
-    NSURLRequest *request = [NSURLRequest requestWithURL:url];
-    NSURLResponse *response;
-    NSData *data = [NSURLConnection sendSynchronousRequest:request
-                                         returningResponse:&response
-                                                     error:NULL];
-    NSString *status = [[NSString alloc] initWithData:data
-                                             encoding:NSUTF8StringEncoding];
+    NSURL *url = [serverRootWithHost(host) URLByAppendingPathComponent:@"status"];
 
+    NSURLSession *session = [NSURLSession sharedSession];
+    NSURLRequest *request = [NSURLRequest requestWithURL:url];
+    __block NSURLResponse *response;
+    __block NSData *data;
+
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    [[session dataTaskWithRequest:request
+                completionHandler:^(NSData *d,
+                                    NSURLResponse *res,
+                                    __unused NSError *err) {
+                    data = d;
+                    response = res;
+                    dispatch_semaphore_signal(semaphore);
+                }] resume];
+    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+
+    NSString *status = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
     return [status isEqualToString:@"packager-status:running"];
 }
 
@@ -97,7 +106,7 @@ static NSURL *serverRootWithHost(NSString *host) {
     NSString *host = [self guessPackagerHost];
 
     if (host != nil) {
-        NSString *path = @"/index.ios.bundle";
+        NSString *path = @"/index.bundle";
         NSString *query = @"platform=ios&dev=true&minify=false";
         NSURLComponents *components
             = [NSURLComponents componentsWithURL:serverRootWithHost(host)

ios/sdk/src/ReactUtils.h

@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+#ifndef JM_REACTUTILS_H
+#define JM_REACTUTILS_H
+
+NSMutableDictionary* mergeProps(NSDictionary *a, NSDictionary *b);
+void registerReactFatalErrorHandler(void);
+
+#endif /* JM_REACTUTILS_H */

ios/sdk/src/ReactUtils.m

@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+
+#import <React/RCTAssert.h>
+
+#import "ReactUtils.h"
+
+#pragma mark - Utility functions
+
+/**
+ * Merges 2 sets of props into a single one.
+ */
+NSMutableDictionary* mergeProps(NSDictionary *a, NSDictionary *b) {
+    if (a == nil) {
+        return [NSMutableDictionary dictionaryWithDictionary:b == nil ? @{} : b];
+    }
+
+    if (b == nil) {
+        return [NSMutableDictionary dictionaryWithDictionary:a];
+    }
+
+    // Both have values, let's merge them, the strategy is to take the value from a first,
+    // then override it with the one from b. If the value is a dictionary, merge them
+    // recursively. Same goes for arrays.
+    NSMutableDictionary *result = [NSMutableDictionary dictionaryWithDictionary:a];
+
+    for (NSString *key in b) {
+        id value = b[key];
+        id aValue = result[key];
+
+        if (aValue == nil) {
+            result[key] = value;
+            continue;
+        }
+
+        if ([value isKindOfClass:NSArray.class]) {
+            result[key] = [aValue arrayByAddingObjectsFromArray:value];
+        } else if ([value isKindOfClass:NSDictionary.class]) {
+            result[key] = mergeProps(aValue, value);
+        } else {
+            result[key] = value;
+        }
+    }
+
+    return result;
+}
+
+/**
+ * A `RCTFatalHandler` implementation which swallows JavaScript errors. In the
+ * Release configuration, React Native will (intentionally) raise an unhandled
+ * `NSException` for an unhandled JavaScript error. This will effectively kill
+ * the application. `_RCTFatal` is suitable to be in accord with the Web i.e.
+ * not kill the application.
+ */
+RCTFatalHandler _RCTFatal = ^(NSError *error) {
+    id jsStackTrace = error.userInfo[RCTJSStackTraceKey];
+    @try {
+        NSString *name
+        = [NSString stringWithFormat:@"%@: %@",
+           RCTFatalExceptionName,
+           error.localizedDescription];
+        NSString *message
+        = RCTFormatError(error.localizedDescription, jsStackTrace, 75);
+        [NSException raise:name format:@"%@", message];
+    } @catch (NSException *e) {
+        if (!jsStackTrace) {
+            @throw;
+        }
+    }
+};
+
+/**
+ * Helper function to register a fatal error handler for React. Our handler
+ * won't kill the process, it will swallow JS errors and print stack traces
+ * instead.
+ */
+void registerReactFatalErrorHandler() {
+#if !DEBUG
+    // In the Release configuration, React Native will (intentionally) raise an
+    // unhandled `NSException` for an unhandled JavaScript error. This will
+    // effectively kill the application. In accord with the Web, do not kill the
+    // application.
+    if (!RCTGetFatalHandler()) {
+        RCTSetFatalHandler(_RCTFatal);
+    }
+#endif
+}

ios/sdk/src/analytics/AmplitudeModule.m

@@ -0,0 +1,55 @@
+/*
+ * Copyright @ 2018-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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.
+ */
+
+#import <React/RCTBridgeModule.h>
+#import "Amplitude.h"
+
+@interface AmplitudeModule : NSObject<RCTBridgeModule>
+
+@end
+
+@implementation AmplitudeModule
+
+RCT_EXPORT_MODULE(Amplitude)
+
++ (BOOL)requiresMainQueueSetup {
+    return NO;
+}
+
+RCT_EXPORT_METHOD(init:(NSString*)instanceName API_KEY:(NSString*)apiKey) {
+    [[Amplitude instanceWithName:instanceName] initializeApiKey:apiKey];
+}
+
+RCT_EXPORT_METHOD(setUserProperties:(NSString*)instanceName userPropsString:(NSDictionary*)userProps) {
+    if (userProps != nil) {
+        [[Amplitude instanceWithName:instanceName] setUserProperties:userProps];
+    }
+}
+
+RCT_EXPORT_METHOD(logEvent:(NSString*)instanceName eventType:(NSString*)eventType eventPropsString:(NSString*)eventPropsString) {
+    NSError *error;
+    NSData *eventPropsData = [eventPropsString dataUsingEncoding:NSUTF8StringEncoding];
+    NSDictionary *eventProperties = [NSJSONSerialization JSONObjectWithData:eventPropsData
+                                                                   options:NSJSONReadingMutableContainers
+                                                                     error:&error];
+    if (eventProperties == nil) {
+        NSLog(@"[Amplitude handler] Error parsing event properties: %@", error);
+    } else {
+        [[Amplitude instanceWithName:instanceName] logEvent:eventType withEventProperties:eventProperties];
+    }
+}
+
+@end

ios/sdk/src/picture-in-picture/DragGestureController.swift

@@ -88,20 +88,20 @@ final class DragGestureController {
             else { return CGPoint.zero }
 
         let currentSize = view.frame.size
-        let adjustedBounds = UIEdgeInsetsInsetRect(bounds, insets)
+        let adjustedBounds = bounds.inset(by: insets)
         let threshold: CGFloat = 20.0
         let velocity = panGesture.velocity(in: view.superview)
         let location = panGesture.location(in: view.superview)
 
         let goLeft: Bool
-        if fabs(velocity.x) > threshold {
+        if abs(velocity.x) > threshold {
             goLeft = velocity.x < -threshold
         } else {
             goLeft = location.x < bounds.midX
         }
 
         let goUp: Bool
-        if fabs(velocity.y) > threshold {
+        if abs(velocity.y) > threshold {
             goUp = velocity.y < -threshold
         } else {
             goUp = location.y < bounds.midY

ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift

@@ -202,7 +202,7 @@ public class PiPViewCoordinator {
         }
 
         // resize to suggested ratio and position to the bottom right
-        let adjustedBounds = UIEdgeInsetsInsetRect(bounds, dragBoundInsets)
+        let adjustedBounds = bounds.inset(by: dragBoundInsets)
         let size = CGSize(width: bounds.size.width * pipSizeRatio,
                           height: bounds.size.height * pipSizeRatio)
         let x: CGFloat = adjustedBounds.maxX - size.width

lang/main.json

@@ -458,9 +458,9 @@
     },
     "me": "me",
     "notify": {
-        "connectedOneMember": "__name__ connected",
-        "connectedThreePlusMembers": "__name__ and __count__ others connected",
-        "connectedTwoMembers": "__first__ and __second__ connected",
+        "connectedOneMember": "__name__ joined the meeting",
+        "connectedThreePlusMembers": "__name__ and __count__ others joined the meeting",
+        "connectedTwoMembers": "__first__ and __second__ joined the meeting",
         "disconnected": "disconnected",
         "focus": "Conference focus",
         "focusFail": "__component__ not available - retry in __ms__ sec",
@@ -758,7 +758,7 @@
         },
         "calendar": "Calendar",
         "connectCalendarButton": "Connect your calendar",
-        "connectCalendarText": "Connect your calendar to view all your meetings in __app__. Plus, add __app__ meetings to your calendar and start them with one click.",
+        "connectCalendarText": "Connect your calendar to view all your meetings in __app__. Plus, add __provider__ meetings to your calendar and start them with one click.",
         "enterRoomTitle": "Start a new meeting",
         "go": "GO",
         "join": "JOIN",

metro.config.js

@@ -0,0 +1,19 @@
+/* eslint-disable */
+
+/**
+ * Metro configuration for React Native
+ * https://github.com/facebook/react-native
+ *
+ * @format
+ */
+
+module.exports = {
+  transformer: {
+    getTransformOptions: async () => ({
+      transform: {
+        experimentalImportSupport: false,
+        inlineRequires: false,
+      },
+    }),
+  },
+};

modules/API/API.js

@@ -5,6 +5,7 @@ import {
     createApiEvent,
     sendAnalytics
 } from '../../react/features/analytics';
+import { setSubject } from '../../react/features/base/conference';
 import { parseJWTFromURLParams } from '../../react/features/base/jwt';
 import { invite } from '../../react/features/invite';
 import { getJitsiMeetTransport } from '../transport';
@@ -65,7 +66,7 @@ function initCommands() {
         },
         'subject': subject => {
             sendAnalytics(createApiEvent('subject.changed'));
-            APP.conference.setSubject(subject);
+            APP.store.dispatch(setSubject(subject));
         },
         'submit-feedback': feedback => {
             sendAnalytics(createApiEvent('submit.feedback'));

modules/API/external/external_api.js

@@ -548,7 +548,7 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
      * {@code displayName} - Sets the display name of the local participant to
      * the value passed in the arguments array.
      * {@code subject} - Sets the subject of the conference, the value passed
-     * in the arguments array. Note: available only for moderator.
+     * in the arguments array. Note: Available only for moderator.
      *
      * {@code toggleAudio} - Mutes / unmutes audio with no arguments.
      * {@code toggleVideo} - Mutes / unmutes video with no arguments.

modules/UI/UI.js

@@ -14,10 +14,7 @@ import VideoLayout from './videolayout/VideoLayout';
 import Filmstrip from './videolayout/Filmstrip';
 
 import { JitsiTrackErrors } from '../../react/features/base/lib-jitsi-meet';
-import {
-    getLocalParticipant,
-    showParticipantJoinedNotification
-} from '../../react/features/base/participants';
+import { getLocalParticipant } from '../../react/features/base/participants';
 import { toggleChat } from '../../react/features/chat';
 import { openDisplayNamePrompt } from '../../react/features/display-name';
 import { setEtherpadHasInitialzied } from '../../react/features/etherpad';
@@ -380,8 +377,6 @@ UI.addUser = function(user) {
     if (status) {
         // FIXME: move updateUserStatus in participantPresenceChanged action
         UI.updateUserStatus(user, status);
-    } else {
-        APP.store.dispatch(showParticipantJoinedNotification(displayName));
     }
 
     // set initial display name

modules/UI/shared_video/SharedVideoThumb.js

@@ -19,7 +19,7 @@ export default function SharedVideoThumb(participant, videoType, VideoLayout) {
     this.bindHoverHandler();
     SmallVideo.call(this, VideoLayout);
     this.isVideoMuted = true;
-    this.setDisplayName(participant.name);
+    this.updateDisplayName();
 
     this.container.onclick = this._onContainerClick;
     this.container.ondblclick = this._onContainerDoubleClick;
@@ -65,9 +65,11 @@ SharedVideoThumb.prototype.createContainer = function(spanId) {
 };
 
 /**
- * Sets the display name for the thumb.
+ * Triggers re-rendering of the display name using current instance state.
+ *
+ * @returns {void}
  */
-SharedVideoThumb.prototype.setDisplayName = function(displayName) {
+SharedVideoThumb.prototype.updateDisplayName = function() {
     if (!this.container) {
         logger.warn(`Unable to set displayName - ${this.videoSpanId
         } does not exist`);
@@ -75,8 +77,7 @@ SharedVideoThumb.prototype.setDisplayName = function(displayName) {
         return;
     }
 
-    this.updateDisplayName({
-        displayName: displayName || '',
+    this._renderDisplayName({
         elementID: `${this.videoSpanId}_name`,
         participantID: this.id
     });

modules/UI/videolayout/LocalVideo.js

@@ -50,7 +50,7 @@ function LocalVideo(VideoLayout, emitter, streamEndedCallback) {
     SmallVideo.call(this, VideoLayout);
 
     // Set default display name.
-    this.setDisplayName();
+    this.updateDisplayName();
 
     // Initialize the avatar display with an avatar url selected from the redux
     // state. Redux stores the local user with a hardcoded participant id of
@@ -87,9 +87,11 @@ LocalVideo.prototype.createContainer = function() {
 };
 
 /**
- * Sets the display name for the given video span id.
+ * Triggers re-rendering of the display name using current instance state.
+ *
+ * @returns {void}
  */
-LocalVideo.prototype.setDisplayName = function(displayName) {
+LocalVideo.prototype.updateDisplayName = function() {
     if (!this.container) {
         logger.warn(
                 `Unable to set displayName - ${this.videoSpanId
@@ -98,9 +100,8 @@ LocalVideo.prototype.setDisplayName = function(displayName) {
         return;
     }
 
-    this.updateDisplayName({
+    this._renderDisplayName({
         allowEditing: APP.store.getState()['features/base/jwt'].isGuest,
-        displayName,
         displayNameSuffix: interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME,
         elementID: 'localDisplayName',
         participantID: this.id

modules/UI/videolayout/RemoteVideo.js

@@ -53,7 +53,7 @@ function RemoteVideo(user, VideoLayout, emitter) {
         ? 'left bottom' : 'top center';
     this.addRemoteVideoContainer();
     this.updateIndicators();
-    this.setDisplayName();
+    this.updateDisplayName();
     this.bindHoverHandler();
     this.flipX = false;
     this.isLocal = false;
@@ -519,11 +519,11 @@ RemoteVideo.prototype.addRemoteStreamElement = function(stream) {
 };
 
 /**
- * Sets the display name for the given video span id.
+ * Triggers re-rendering of the display name using current instance state.
  *
- * @param displayName the display name to set
+ * @returns {void}
  */
-RemoteVideo.prototype.setDisplayName = function(displayName) {
+RemoteVideo.prototype.updateDisplayName = function() {
     if (!this.container) {
         logger.warn(`Unable to set displayName - ${this.videoSpanId
         } does not exist`);
@@ -531,8 +531,7 @@ RemoteVideo.prototype.setDisplayName = function(displayName) {
         return;
     }
 
-    this.updateDisplayName({
-        displayName: displayName || interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME,
+    this._renderDisplayName({
         elementID: `${this.videoSpanId}_name`,
         participantID: this.id
     });

modules/UI/videolayout/SmallVideo.js

@@ -439,9 +439,11 @@ SmallVideo.prototype.$displayName = function() {
  * Creates or updates the participant's display name that is shown over the
  * video preview.
  *
+ * @param {Object} props - The React {@code Component} props to pass into the
+ * {@code DisplayName} component.
  * @returns {void}
  */
-SmallVideo.prototype.updateDisplayName = function(props) {
+SmallVideo.prototype._renderDisplayName = function(props) {
     const displayNameContainer
         = this.container.querySelector('.displayNameContainer');
 

modules/UI/videolayout/VideoLayout.js

@@ -659,15 +659,15 @@ const VideoLayout = {
     /**
      * Display name changed.
      */
-    onDisplayNameChanged(id, displayName, status) {
+    onDisplayNameChanged(id) {
         if (id === 'localVideoContainer'
             || APP.conference.isLocalId(id)) {
-            localVideoThumbnail.setDisplayName(displayName);
+            localVideoThumbnail.updateDisplayName();
         } else {
             const remoteVideo = remoteVideos[id];
 
             if (remoteVideo) {
-                remoteVideo.setDisplayName(displayName, status);
+                remoteVideo.updateDisplayName();
             }
         }
     },

package.json

@@ -48,25 +48,24 @@
     "jquery-contextmenu": "2.4.5",
     "jquery-i18next": "1.2.0",
     "js-md5": "0.6.1",
-    "js-utils": "github:jitsi/js-utils#446497893023aa8dec403e0e4e35a22cae6bc87d",
-    "jsc-android": "224109.1.0",
+    "js-utils": "github:jitsi/js-utils#73a67a7a60d52f8e895f50939c8fcbd1f20fe7b5",
     "jsrsasign": "8.0.12",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#e39858418724c59bfef8b4e1ba16bb11f36abdc0",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#83af6e78a82466153e93d4a467e1459c9c97d5ee",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.11",
     "moment": "2.19.4",
     "moment-duration-format": "2.2.2",
     "postis": "2.2.0",
-    "react": "16.6.3",
-    "react-dom": "16.6.3",
+    "react": "16.8.3",
+    "react-dom": "16.8.3",
     "react-emoji-render": "0.4.6",
     "react-i18next": "7.13.0",
     "react-linkify": "0.2.2",
-    "react-native": "0.57.8",
+    "react-native": "0.59.2",
     "react-native-background-timer": "2.1.1",
     "react-native-calendar-events": "1.6.4",
-    "react-native-callstats": "3.57.1",
+    "react-native-callstats": "3.58.2",
     "react-native-fast-image": "5.1.1",
     "react-native-gifted-chat": "0.6.0",
     "react-native-google-signin": "1.0.2",
@@ -76,7 +75,7 @@
     "react-native-sound": "github:jitsi/react-native-sound#e4260ed7f641eeb0377d76eac7987aba72e1cf08",
     "react-native-swipeout": "2.3.6",
     "react-native-vector-icons": "6.0.2",
-    "react-native-webrtc": "github:jitsi/react-native-webrtc#c1be0cb1c6e8a83dfd406e478082a5ff205a97ec",
+    "react-native-webrtc": "github:jitsi/react-native-webrtc#032ee5c90e2c5ff27ab2f952217104772fcbd155",
     "react-redux": "5.0.7",
     "react-transition-group": "2.4.0",
     "redux": "4.0.0",
@@ -100,14 +99,14 @@
     "clean-css": "3.4.25",
     "css-loader": "0.28.7",
     "eslint": "5.6.1",
-    "eslint-config-jitsi": "github:jitsi/eslint-config-jitsi#7474f6668515eb5852f1273dc5a50b940a550d3f",
+    "eslint-config-jitsi": "github:jitsi/eslint-config-jitsi#1.0.0",
     "eslint-plugin-flowtype": "2.50.3",
     "eslint-plugin-import": "2.14.0",
     "eslint-plugin-jsdoc": "3.8.0",
     "eslint-plugin-react": "7.11.1",
     "eslint-plugin-react-native": "3.3.0",
     "expose-loader": "0.7.5",
-    "flow-bin": "0.78.0",
+    "flow-bin": "0.92.0",
     "imports-loader": "0.7.1",
     "metro-react-native-babel-preset": "0.49.2",
     "node-sass": "4.10.0",

react/features/analytics/functions.js

@@ -6,6 +6,8 @@ import JitsiMeetJS, {
 } from '../base/lib-jitsi-meet';
 import { getJitsiMeetGlobalNS, loadScript } from '../base/util';
 
+import { AmplitudeHandler } from './handlers';
+
 const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
@@ -23,6 +25,16 @@ export function sendAnalytics(event: Object) {
     }
 }
 
+/**
+ * Resets the analytics adapter to its initial state - removes handlers, cache,
+ * disabled state, etc.
+ *
+ * @returns {void}
+ */
+export function resetAnalytics() {
+    analytics.reset();
+}
+
 /**
  * Loads the analytics scripts and inits JitsiMeetJS.analytics by setting
  * permanent properties and setting the handlers from the loaded scripts.
@@ -43,6 +55,9 @@ export function initAnalytics({ getState }: { getState: Function }) {
 
     const state = getState();
     const config = state['features/base/config'];
+    const { locationURL } = state['features/base/connection'];
+    const host = locationURL ? locationURL.host : '';
+
     const {
         analytics: analyticsConfig = {},
         deploymentInfo
@@ -58,6 +73,7 @@ export function initAnalytics({ getState }: { getState: Function }) {
         envType: (deploymentInfo && deploymentInfo.envType) || 'dev',
         googleAnalyticsTrackingId,
         group,
+        host,
         product: deploymentInfo && deploymentInfo.product,
         subproduct: deploymentInfo && deploymentInfo.environment,
         user: user && user.id,
@@ -109,7 +125,7 @@ export function initAnalytics({ getState }: { getState: Function }) {
  * successfully loaded and rejects if there are no handlers loaded or the
  * analytics is disabled.
  */
-function _loadHandlers(scriptURLs, handlerConstructorOptions) {
+function _loadHandlers(scriptURLs = [], handlerConstructorOptions) {
     const promises = [];
 
     for (const url of scriptURLs) {
@@ -139,12 +155,12 @@ function _loadHandlers(scriptURLs, handlerConstructorOptions) {
         // check the old location to provide legacy support
         const analyticsHandlers = [
             ...getJitsiMeetGlobalNS().analyticsHandlers,
-            ...window.analyticsHandlers
-        ];
+            ...window.analyticsHandlers,
 
-        if (analyticsHandlers.length === 0) {
-            throw new Error('No analytics handlers available');
-        }
+            // NOTE: when we add second handler it will be good to put all
+            // build-in handlers in an array and destruct it here.
+            AmplitudeHandler
+        ];
 
         const handlers = [];