callkit with base/session

Stores name of the conference room in the session when it's being
created.

.flowconfig

@@ -23,6 +23,7 @@
 ; seen to cause errors and we have chosen not to fix.
 .*/node_modules/@atlaskit/.*/*.js.flow
 .*/node_modules/react-native-keep-awake/.*
+.*/node_modules/react-native-permissions/.*
 .*/node_modules/styled-components/.*
 
 .*/\.git/.*

.travis.yml

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

android/README.md

@@ -205,13 +205,13 @@ which displays a single `JitsiMeetView`.
 
 See JitsiMeetView.getDefaultURL.
 
-#### getPictureInPictureEnabled()
+#### isPictureInPictureEnabled()
 
-See JitsiMeetView.getPictureInPictureEnabled.
+See JitsiMeetView.isPictureInPictureEnabled.
 
-#### getWelcomePageEnabled()
+#### isWelcomePageEnabled()
 
-See JitsiMeetView.getWelcomePageEnabled.
+See JitsiMeetView.isWelcomePageEnabled.
 
 #### loadURL(URL)
 
@@ -250,13 +250,13 @@ if set to `null`, the default built in JavaScript is used: https://meet.jit.si.
 
 Returns the `JitsiMeetViewListener` instance attached to the view.
 
-#### getPictureInPictureEnabled()
+#### 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.
 
-#### getWelcomePageEnabled()
+#### 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.
@@ -316,7 +316,7 @@ effect.
 
 #### setWelcomePageEnabled(boolean)
 
-Sets whether the Welcome page is enabled. See `getWelcomePageEnabled` for more
+Sets whether the Welcome page is enabled. See `isWelcomePageEnabled` for more
 information.
 
 NOTE: Must be called (if at all) before `loadURL`/`loadURLString` for it to take

android/app/proguard-rules.pro

@@ -68,3 +68,9 @@
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 -dontwarn okio.**
+
+# FastImage
+
+-keep public class com.dylanvann.fastimage.* {*;}
+-keep public class com.dylanvann.fastimage.** {*;}
+

android/build.gradle

@@ -18,6 +18,7 @@ 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" }
@@ -34,6 +35,12 @@ allprojects {
                     def version = new groovy.json.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 groovy.json.JsonSlurper().parseText(file.text).version
+                    details.useVersion "r${version.tokenize('.')[0]}"
+                }
             }
         }
     }
@@ -146,7 +153,7 @@ allprojects {
 ext {
     buildToolsVersion = "26.0.2"
     compileSdkVersion = 26
-    minSdkVersion    = 16
+    minSdkVersion    = 21
     targetSdkVersion = 26
 
     // The Maven artifact groupdId of the third-party react-native modules which

android/sdk/build.gradle

@@ -25,9 +25,10 @@ dependencies {
     compile 'com.facebook.react:react-native:+'
 
     compile project(':react-native-background-timer')
-    compile project(':react-native-fetch-blob')
+    compile project(':react-native-fast-image')
     compile project(':react-native-immersive')
     compile project(':react-native-keep-awake')
+    compile project(':react-native-linear-gradient')
     compile project(':react-native-locale-detector')
     compile project(':react-native-sound')
     compile project(':react-native-vector-icons')

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

@@ -16,7 +16,9 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 
-class AndroidSettingsModule extends ReactContextBaseJavaModule {
+class AndroidSettingsModule
+    extends ReactContextBaseJavaModule {
+
     public AndroidSettingsModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }

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

@@ -1,3 +1,19 @@
+/*
+ * 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.content.Context;
@@ -11,7 +27,9 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import java.util.HashMap;
 import java.util.Map;
 
-class AppInfoModule extends ReactContextBaseJavaModule {
+class AppInfoModule
+    extends ReactContextBaseJavaModule {
+
     public AppInfoModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }

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

@@ -25,8 +25,6 @@ import android.content.pm.PackageManager;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
@@ -41,6 +39,8 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * Module implementing a simple API to select the appropriate audio device for a
@@ -57,7 +57,10 @@ import java.util.Set;
  * Before a call has started and after it has ended the
  * {@code AudioModeModule.DEFAULT} mode should be used.
  */
-class AudioModeModule extends ReactContextBaseJavaModule implements AudioManager.OnAudioFocusChangeListener {
+class AudioModeModule
+    extends ReactContextBaseJavaModule
+    implements AudioManager.OnAudioFocusChangeListener {
+
     /**
      * Constants representing the audio mode.
      * - DEFAULT: Used before and after every call. It represents the default
@@ -115,10 +118,11 @@ class AudioModeModule extends ReactContextBaseJavaModule implements AudioManager
     private BluetoothHeadsetMonitor bluetoothHeadsetMonitor;
 
     /**
-     * {@link Handler} for running all operations on the main thread.
+     * {@link ExecutorService} for running all audio operations on a dedicated
+     * thread.
      */
-    private final Handler mainThreadHandler
-        = new Handler(Looper.getMainLooper());
+    private static final ExecutorService executor
+        = Executors.newSingleThreadExecutor();
 
     /**
      * {@link Runnable} for running audio device detection the main thread.
@@ -225,7 +229,7 @@ class AudioModeModule extends ReactContextBaseJavaModule implements AudioManager
 
         // Do an initial detection on Android >= M.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            mainThreadHandler.post(onAudioDeviceChangeRunner);
+            runInAudioThread(onAudioDeviceChangeRunner);
         } else {
             // On Android < M, detect if we have an earpiece.
             PackageManager pm = reactContext.getPackageManager();
@@ -265,7 +269,7 @@ class AudioModeModule extends ReactContextBaseJavaModule implements AudioManager
      */
     @ReactMethod
     public void getAudioDevices(final Promise promise) {
-        mainThreadHandler.post(new Runnable() {
+        runInAudioThread(new Runnable() {
             @Override
             public void run() {
                 WritableMap map = Arguments.createMap();
@@ -302,7 +306,7 @@ class AudioModeModule extends ReactContextBaseJavaModule implements AudioManager
      * Only used on Android >= M.
      */
     void onAudioDeviceChange() {
-        mainThreadHandler.post(onAudioDeviceChangeRunner);
+        runInAudioThread(onAudioDeviceChangeRunner);
     }
 
     /**
@@ -330,7 +334,7 @@ class AudioModeModule extends ReactContextBaseJavaModule implements AudioManager
      * Only used on Android < M.
      */
     void onHeadsetDeviceChange() {
-        mainThreadHandler.post(new Runnable() {
+        runInAudioThread(new Runnable() {
             @Override
             public void run() {
                 // XXX: isWiredHeadsetOn is not deprecated when used just for
@@ -380,6 +384,14 @@ class AudioModeModule extends ReactContextBaseJavaModule implements AudioManager
         }
     }
 
+    /**
+     * Helper function to run operations on a dedicated thread.
+     * @param runnable
+     */
+    public void runInAudioThread(Runnable runnable) {
+        executor.execute(runnable);
+    }
+
     /**
      * Sets the user selected audio device as the active audio device.
      *
@@ -387,7 +399,7 @@ class AudioModeModule extends ReactContextBaseJavaModule implements AudioManager
      */
     @ReactMethod
     public void setAudioDevice(final String device) {
-        mainThreadHandler.post(new Runnable() {
+        runInAudioThread(new Runnable() {
             @Override
             public void run() {
                 if (!availableDevices.contains(device)) {
@@ -458,7 +470,7 @@ class AudioModeModule extends ReactContextBaseJavaModule implements AudioManager
                 }
             }
         };
-        mainThreadHandler.post(r);
+        runInAudioThread(r);
     }
 
     /**

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

@@ -0,0 +1,231 @@
+/*
+ * 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.
+ */
+
+package org.jitsi.meet.sdk;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Log;
+import android.widget.FrameLayout;
+
+import com.facebook.react.ReactRootView;
+import com.facebook.react.bridge.ReadableMap;
+import com.rnimmersive.RNImmersiveModule;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.WeakHashMap;
+
+/**
+ * Base class for all views which are backed by a React Native view.
+ */
+public abstract class BaseReactView<ListenerT>
+    extends FrameLayout {
+
+    /**
+     * Background color used by {@code BaseReactView} and the React Native root
+     * view.
+     */
+    protected static int BACKGROUND_COLOR = 0xFF111111;
+
+    /**
+     * The collection of all existing {@code BaseReactView}s. Used to find the
+     * {@code BaseReactView} when delivering events coming from
+     * {@link ExternalAPIModule}.
+     */
+    static final Set<BaseReactView> views
+        = Collections.newSetFromMap(new WeakHashMap<BaseReactView, Boolean>());
+
+    /**
+     * Finds a {@code BaseReactView} which matches a specific external API
+     * scope.
+     *
+     * @param externalAPIScope - The external API scope associated with the
+     * {@code BaseReactView} to find.
+     * @return The {@code BaseReactView}, if any, associated with the specified
+     * {@code externalAPIScope}; otherwise, {@code null}.
+     */
+    public static BaseReactView findViewByExternalAPIScope(
+            String externalAPIScope) {
+        synchronized (views) {
+            for (BaseReactView view : views) {
+                if (view.externalAPIScope.equals(externalAPIScope)) {
+                    return view;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * The unique identifier of this {@code BaseReactView} within the process
+     * for the purposes of {@link ExternalAPIModule}. The name scope was
+     * inspired by postis which we use on Web for the similar purposes of the
+     * iframe-based external API.
+     */
+    protected final String externalAPIScope;
+
+    /**
+     * The listener (e.g. {@link JitsiMeetViewListener}) instance for reporting
+     * events occurring in Jitsi Meet.
+     */
+    private ListenerT listener;
+
+    /**
+     * React Native root view.
+     */
+    private ReactRootView reactRootView;
+
+    public BaseReactView(@NonNull Context context) {
+        super(context);
+
+        setBackgroundColor(BACKGROUND_COLOR);
+
+        ReactInstanceManagerHolder.initReactInstanceManager(
+            ((Activity) context).getApplication());
+
+        // Hook this BaseReactView into ExternalAPI.
+        externalAPIScope = UUID.randomUUID().toString();
+        synchronized (views) {
+            views.add(this);
+        }
+    }
+
+    /**
+     * Creates the {@code ReactRootView} for the given app name with the given
+     * props. Once created it's set as the view of this {@code FrameLayout}.
+     *
+     * @param appName - The name of the "app" (in React Native terms) to load.
+     * @param props - The React Component props to pass to the app.
+     */
+    public void createReactRootView(String appName, @Nullable Bundle props) {
+        if (props == null) {
+            props = new Bundle();
+        }
+
+        props.putString("externalAPIScope", externalAPIScope);
+
+        if (reactRootView == null) {
+            reactRootView = new ReactRootView(getContext());
+            reactRootView.startReactApplication(
+                ReactInstanceManagerHolder.getReactInstanceManager(),
+                appName,
+                props);
+            reactRootView.setBackgroundColor(BACKGROUND_COLOR);
+            addView(reactRootView);
+        } else {
+            reactRootView.setAppProperties(props);
+        }
+    }
+
+    /**
+     * Releases the React resources (specifically the {@link ReactRootView})
+     * associated with this view.
+     *
+     * MUST be called when the {@link Activity} holding this view is destroyed,
+     * typically in the {@code onDestroy} method.
+     */
+    public void dispose() {
+        if (reactRootView != null) {
+            removeView(reactRootView);
+            reactRootView.unmountReactApplication();
+            reactRootView = null;
+        }
+    }
+
+    /**
+     * Gets the listener set on this {@code BaseReactView}.
+     *
+     * @return The listener set on this {@code BaseReactView}.
+     */
+    public ListenerT getListener() {
+        return listener;
+    }
+
+    /**
+     * Abstract method called by {@link ExternalAPIModule} when an event is
+     * received for this view.
+     *
+     * @param name - The name of the event.
+     * @param data - The details of the event associated with/specific to the
+     * specified {@code name}.
+     */
+    public abstract void onExternalAPIEvent(String name, ReadableMap data);
+
+    protected void onExternalAPIEvent(
+            Map<String, Method> listenerMethods,
+            String name, ReadableMap data) {
+        ListenerT listener = getListener();
+
+        if (listener != null) {
+            ListenerUtils.runListenerMethod(
+                listener, listenerMethods, name, data);
+        }
+    }
+
+    /**
+     * Called when the window containing this view gains or loses focus.
+     *
+     * @param hasFocus If the window of this view now has focus, {@code true};
+     * otherwise, {@code false}.
+     */
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+
+        // https://github.com/mockingbot/react-native-immersive#restore-immersive-state
+
+        // FIXME The singleton pattern employed by RNImmersiveModule is not
+        // advisable because a react-native mobule is consumable only after its
+        // BaseJavaModule#initialize() has completed and here we have no
+        // knowledge of whether the precondition is really met.
+        RNImmersiveModule immersive = RNImmersiveModule.getInstance();
+
+        if (hasFocus && immersive != null) {
+            try {
+                immersive.emitImmersiveStateChangeEvent();
+            } catch (RuntimeException re) {
+                // FIXME I don't know how to check myself whether
+                // BaseJavaModule#initialize() has been invoked and thus
+                // RNImmersiveModule is consumable. A safe workaround is to
+                // swallow the failure because the whole full-screen/immersive
+                // functionality is brittle anyway, akin to the icing on the
+                // cake, and has been working without onWindowFocusChanged for a
+                // very long time.
+                Log.e(
+                    "RNImmersiveModule",
+                    "emitImmersiveStateChangeEvent() failed!",
+                    re);
+            }
+        }
+    }
+
+    /**
+     * Sets a specific listener on this {@code BaseReactView}.
+     *
+     * @param listener The listener to set on this {@code BaseReactView}.
+     */
+    public void setListener(ListenerT listener) {
+        this.listener = listener;
+    }
+}

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

@@ -24,8 +24,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioManager;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 
 /**
@@ -55,12 +53,6 @@ class BluetoothHeadsetMonitor {
      */
     private boolean headsetAvailable = false;
 
-    /**
-     * {@link Handler} for running all operations on the main thread.
-     */
-    private final Handler mainThreadHandler
-        = new Handler(Looper.getMainLooper());
-
     /**
      * Helper for running Bluetooth operations on the main thread.
      */
@@ -200,6 +192,6 @@ class BluetoothHeadsetMonitor {
      * {@link AudioModeModule#onAudioDeviceChange()} callback.
      */
     private void updateDevices() {
-        mainThreadHandler.post(updateDevicesRunnable);
+        audioModeModule.runInAudioThread(updateDevicesRunnable);
     }
 }

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

@@ -16,81 +16,24 @@
 
 package org.jitsi.meet.sdk;
 
+import android.util.Log;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.bridge.UiThreadUtil;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Pattern;
 
 /**
- * Module implementing a simple API to enable a proximity sensor-controlled
- * wake lock. When the lock is held, if the proximity sensor detects a nearby
- * object it will dim the screen and disable touch controls. The functionality
- * is used with the conference audio-only mode.
+ * Module implementing an API for sending events from JavaScript to native code.
  */
-class ExternalAPIModule extends ReactContextBaseJavaModule {
-    /**
-     * The {@code Method}s of {@code JitsiMeetViewListener} by event name i.e.
-     * redux action types.
-     */
-    private static final Map<String, Method> JITSI_MEET_VIEW_LISTENER_METHODS
-        = new HashMap<>();
+class ExternalAPIModule
+    extends ReactContextBaseJavaModule {
 
-    static {
-        // Figure out the mapping between the JitsiMeetViewListener methods
-        // and the events i.e. redux action types.
-        Pattern onPattern = Pattern.compile("^on[A-Z]+");
-        Pattern camelcasePattern = Pattern.compile("([a-z0-9]+)([A-Z0-9]+)");
-
-        for (Method method : JitsiMeetViewListener.class.getDeclaredMethods()) {
-            // * The method must be public (because it is declared by an
-            //   interface).
-            // * The method must be/return void.
-            if (!Modifier.isPublic(method.getModifiers())
-                    || !Void.TYPE.equals(method.getReturnType())) {
-                continue;
-            }
-
-            // * The method name must start with "on" followed by a
-            //   capital/uppercase letter (in agreement with the camelcase
-            //   coding style customary to Java in general and the projects of
-            //   the Jitsi community in particular).
-            String name = method.getName();
-
-            if (!onPattern.matcher(name).find()) {
-                continue;
-            }
-
-            // * The method must accept/have exactly 1 parameter of a type
-            //   assignable from HashMap.
-            Class<?>[] parameterTypes = method.getParameterTypes();
-
-            if (parameterTypes.length != 1
-                    || !parameterTypes[0].isAssignableFrom(HashMap.class)) {
-                continue;
-            }
-
-            // Convert the method name to an event name.
-            name
-                = camelcasePattern.matcher(name.substring(2))
-                    .replaceAll("$1_$2")
-                    .toUpperCase(Locale.ROOT);
-            JITSI_MEET_VIEW_LISTENER_METHODS.put(name, method);
-        }
-    }
+    private static final String TAG = ExternalAPIModule.class.getSimpleName();
 
     /**
      * Initializes a new module instance. There shall be a single instance of
-     * this module throughout the lifetime of the application.
+     * this module throughout the lifetime of the app.
      *
      * @param reactContext the {@link ReactApplicationContext} where this module
      * is created.
@@ -109,39 +52,9 @@ class ExternalAPIModule extends ReactContextBaseJavaModule {
         return "ExternalAPI";
     }
 
-    /**
-     * The internal processing for the URL of the current conference set on the
-     * associated {@link JitsiMeetView}.
-     *
-     * @param eventName the name of the external API event to be processed
-     * @param eventData the details/specifics of the event to process determined
-     * by/associated with the specified {@code eventName}.
-     * @param view the {@link JitsiMeetView} instance.
-     */
-    private void maybeSetViewURL(
-            String eventName,
-            ReadableMap eventData,
-            JitsiMeetView view) {
-        switch(eventName) {
-        case "CONFERENCE_WILL_JOIN":
-            view.setURL(eventData.getString("url"));
-            break;
-
-        case "CONFERENCE_FAILED":
-        case "CONFERENCE_WILL_LEAVE":
-        case "LOAD_CONFIG_ERROR":
-            String url = eventData.getString("url");
-
-            if (url != null && url.equals(view.getURL())) {
-                view.setURL(null);
-            }
-            break;
-        }
-    }
-
     /**
      * Dispatches an event that occurred on the JavaScript side of the SDK to
-     * the specified {@link JitsiMeetView}'s listener.
+     * the specified {@link BaseReactView}'s listener.
      *
      * @param name The name of the event.
      * @param data The details/specifics of the event to send determined
@@ -149,106 +62,18 @@ class ExternalAPIModule extends ReactContextBaseJavaModule {
      * @param scope
      */
     @ReactMethod
-    public void sendEvent(final String name,
-                          final ReadableMap data,
-                          final String scope) {
+    public void sendEvent(String name, ReadableMap data, String scope) {
         // The JavaScript App needs to provide uniquely identifying information
         // to the native ExternalAPI module so that the latter may match the
-        // former to the native JitsiMeetView which hosts it.
-        JitsiMeetView view = JitsiMeetView.findViewByExternalAPIScope(scope);
+        // former to the native BaseReactView which hosts it.
+        BaseReactView view = BaseReactView.findViewByExternalAPIScope(scope);
 
-        if (view == null) {
-            return;
-        }
-
-        // XXX The JitsiMeetView property URL was introduced in order to address
-        // an exception in the Picture-in-Picture functionality which arose
-        // because of delays related to bridging between JavaScript and Java. To
-        // reduce these delays do not wait for the call to be transfered to the
-        // UI thread.
-        maybeSetViewURL(name, data, view);
-
-        // Make sure JitsiMeetView's listener is invoked on the UI thread. It
-        // was requested by SDK consumers.
-        if (UiThreadUtil.isOnUiThread()) {
-            sendEventOnUiThread(name, data, scope);
-        } else {
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    sendEventOnUiThread(name, data, scope);
-                }
-            });
-        }
-    }
-
-    /**
-     * Dispatches an event that occurred on the JavaScript side of the SDK to
-     * the specified {@link JitsiMeetView}'s listener on the UI thread.
-     *
-     * @param name The name of the event.
-     * @param data The details/specifics of the event to send determined
-     * by/associated with the specified {@code name}.
-     * @param scope
-     */
-    private void sendEventOnUiThread(final String name,
-                          final ReadableMap data,
-                          final String scope) {
-        // The JavaScript App needs to provide uniquely identifying information
-        // to the native ExternalAPI module so that the latter may match the
-        // former to the native JitsiMeetView which hosts it.
-        JitsiMeetView view = JitsiMeetView.findViewByExternalAPIScope(scope);
-
-        if (view == null) {
-            return;
-        }
-
-        JitsiMeetViewListener listener = view.getListener();
-
-        if (listener == null) {
-            return;
-        }
-
-        Method method = JITSI_MEET_VIEW_LISTENER_METHODS.get(name);
-
-        if (method != null) {
+        if (view != null) {
             try {
-                method.invoke(listener, toHashMap(data));
-            } catch (IllegalAccessException e) {
-                // FIXME There was a multicatch for IllegalAccessException and
-                // InvocationTargetException, but Android Studio complained
-                // with: "Multi-catch with these reflection exceptions requires
-                // API level 19 (current min is 16) because they get compiled to
-                // the common but new super type ReflectiveOperationException.
-                // As a workaround either create individual catch statements, or
-                // catch Exception."
-                throw new RuntimeException(e);
-            } catch (InvocationTargetException e) {
-                throw new RuntimeException(e);
+                view.onExternalAPIEvent(name, data);
+            } catch(Exception e) {
+                Log.e(TAG, "onExternalAPIEvent: error sending event", e);
             }
         }
     }
-
-    /**
-     * Initializes a new {@code HashMap} instance with the key-value
-     * associations of a specific {@code ReadableMap}.
-     *
-     * @param readableMap the {@code ReadableMap} specifying the key-value
-     * associations with which the new {@code HashMap} instance is to be
-     * initialized.
-     * @return a new {@code HashMap} instance initialized with the key-value
-     * associations of the specified {@code readableMap}.
-     */
-    private HashMap<String, Object> toHashMap(ReadableMap readableMap) {
-        HashMap<String, Object> hashMap = new HashMap<>();
-
-        for (ReadableMapKeySetIterator i = readableMap.keySetIterator();
-                i.hasNextKey();) {
-            String key = i.nextKey();
-
-            hashMap.put(key, readableMap.getString(key));
-        }
-
-        return hashMap;
-    }
 }

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

@@ -41,7 +41,9 @@ import java.net.URL;
  * hooked to the React Native subsystem via proxy calls through the
  * {@code JitsiMeetView} static methods.
  */
-public class JitsiMeetActivity extends AppCompatActivity {
+public class JitsiMeetActivity
+    extends AppCompatActivity {
+
     /**
      * 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.
@@ -95,25 +97,6 @@ public class JitsiMeetActivity extends AppCompatActivity {
         return view == null ? defaultURL : view.getDefaultURL();
     }
 
-    /**
-     *
-     * @see JitsiMeetView#getPictureInPictureEnabled()
-     */
-    public boolean getPictureInPictureEnabled() {
-        return
-            view == null
-                ? pictureInPictureEnabled
-                : view.getPictureInPictureEnabled();
-    }
-
-    /**
-     *
-     * @see JitsiMeetView#getWelcomePageEnabled()
-     */
-    public boolean getWelcomePageEnabled() {
-        return view == null ? welcomePageEnabled : view.getWelcomePageEnabled();
-    }
-
     /**
      * Initializes the {@link #view} of this {@code JitsiMeetActivity} with a
      * new {@link JitsiMeetView} instance.
@@ -152,6 +135,25 @@ public class JitsiMeetActivity extends AppCompatActivity {
         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.
@@ -177,7 +179,7 @@ public class JitsiMeetActivity extends AppCompatActivity {
 
     @Override
     public void onBackPressed() {
-        if (!JitsiMeetView.onBackPressed()) {
+        if (!ReactActivityLifecycleCallbacks.onBackPressed()) {
             // JitsiMeetView didn't handle the invocation of the back button.
             // Generally, an Activity extender would very likely want to invoke
             // Activity#onBackPressed(). For the sake of consistency with
@@ -220,7 +222,7 @@ public class JitsiMeetActivity extends AppCompatActivity {
             view = null;
         }
 
-        JitsiMeetView.onHostDestroy(this);
+        ReactActivityLifecycleCallbacks.onHostDestroy(this);
     }
 
     // ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
@@ -242,7 +244,20 @@ public class JitsiMeetActivity extends AppCompatActivity {
 
     @Override
     public void onNewIntent(Intent intent) {
-        JitsiMeetView.onNewIntent(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;
+
+        if (Intent.ACTION_VIEW.equals(intent.getAction())
+                && (uri = intent.getData()) != null
+                && JitsiMeetView.loadURLStringInViews(uri.toString())) {
+            return;
+        }
+
+        ReactActivityLifecycleCallbacks.onNewIntent(intent);
     }
 
     @Override
@@ -250,21 +265,21 @@ public class JitsiMeetActivity extends AppCompatActivity {
         super.onResume();
 
         defaultBackButtonImpl = new DefaultHardwareBackBtnHandlerImpl(this);
-        JitsiMeetView.onHostResume(this, defaultBackButtonImpl);
+        ReactActivityLifecycleCallbacks.onHostResume(this, defaultBackButtonImpl);
     }
 
     @Override
     public void onStop() {
         super.onStop();
 
-        JitsiMeetView.onHostPause(this);
+        ReactActivityLifecycleCallbacks.onHostPause(this);
         defaultBackButtonImpl = null;
     }
 
     @Override
     protected void onUserLeaveHint() {
         if (view != null) {
-            view.onUserLeaveHint();
+            view.enterPictureInPicture();
         }
     }
 

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

@@ -16,57 +16,35 @@
 
 package org.jitsi.meet.sdk;
 
-import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
-import android.widget.FrameLayout;
 
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactRootView;
-import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.rnimmersive.RNImmersiveModule;
+import com.facebook.react.bridge.ReadableMap;
 
 import org.jitsi.meet.sdk.invite.InviteController;
 
+import java.lang.reflect.Method;
 import java.net.URL;
-import java.util.Collections;
-import java.util.Set;
-import java.util.UUID;
-import java.util.WeakHashMap;
+import java.util.Map;
+
+public class JitsiMeetView
+    extends BaseReactView<JitsiMeetViewListener> {
 
-public class JitsiMeetView extends FrameLayout {
     /**
-     * Background color used by {@code JitsiMeetView} and the React Native root
-     * view.
+     * The {@code Method}s of {@code JitsiMeetViewListener} by event name i.e.
+     * redux action types.
      */
-    private static final int BACKGROUND_COLOR = 0xFF111111;
+    private static final Map<String, Method> LISTENER_METHODS
+        = ListenerUtils.mapListenerMethods(JitsiMeetViewListener.class);
 
     /**
      * The {@link Log} tag which identifies the source of the log messages of
      * {@code JitsiMeetView}.
      */
-    private final static String TAG = JitsiMeetView.class.getSimpleName();
-
-    private static final Set<JitsiMeetView> views
-        = Collections.newSetFromMap(new WeakHashMap<JitsiMeetView, Boolean>());
-
-    public static JitsiMeetView findViewByExternalAPIScope(
-            String externalAPIScope) {
-        synchronized (views) {
-            for (JitsiMeetView view : views) {
-                if (view.externalAPIScope.equals(externalAPIScope)) {
-                    return view;
-                }
-            }
-        }
-
-        return null;
-    }
+    private static final String TAG = JitsiMeetView.class.getSimpleName();
 
     /**
      * Loads a specific URL {@code String} in all existing
@@ -78,130 +56,19 @@ public class JitsiMeetView extends FrameLayout {
      * at least one {@code JitsiMeetView}, then {@code true}; otherwise,
      * {@code false}.
      */
-    private static boolean loadURLStringInViews(String urlString) {
-        synchronized (views) {
-            if (!views.isEmpty()) {
-                for (JitsiMeetView view : views) {
-                    view.loadURLString(urlString);
-                }
+    public static boolean loadURLStringInViews(String urlString) {
+        boolean loaded = false;
 
-                return true;
+        synchronized (views) {
+            for (BaseReactView view : views) {
+                if (view instanceof JitsiMeetView) {
+                    ((JitsiMeetView)view).loadURLString(urlString);
+                    loaded = true;
+                }
             }
         }
 
-        return false;
-    }
-
-    /**
-     * Activity lifecycle method which should be called from
-     * {@code Activity.onBackPressed} so we can do the required internal
-     * processing.
-     *
-     * @return {@code true} if the back-press was processed; {@code false},
-     * otherwise. If {@code false}, the application should call the parent's
-     * implementation.
-     */
-    public static boolean onBackPressed() {
-        ReactInstanceManager reactInstanceManager
-            = ReactInstanceManagerHolder.getReactInstanceManager();
-
-        if (reactInstanceManager == null) {
-            return false;
-        } else {
-            reactInstanceManager.onBackPressed();
-            return true;
-        }
-    }
-
-    /**
-     * Activity lifecycle method which should be called from
-     * {@code Activity.onDestroy} so we can do the required internal
-     * processing.
-     *
-     * @param activity {@code Activity} being destroyed.
-     */
-    public static void onHostDestroy(Activity activity) {
-        ReactInstanceManager reactInstanceManager
-            = ReactInstanceManagerHolder.getReactInstanceManager();
-
-        if (reactInstanceManager != null) {
-            reactInstanceManager.onHostDestroy(activity);
-        }
-    }
-
-    /**
-     * Activity lifecycle method which should be called from
-     * {@code Activity.onPause} so we can do the required internal processing.
-     *
-     * @param activity {@code Activity} being paused.
-     */
-    public static void onHostPause(Activity activity) {
-        ReactInstanceManager reactInstanceManager
-            = ReactInstanceManagerHolder.getReactInstanceManager();
-
-        if (reactInstanceManager != null) {
-            reactInstanceManager.onHostPause(activity);
-        }
-    }
-
-    /**
-     * Activity lifecycle method which should be called from
-     * {@code Activity.onResume} so we can do the required internal processing.
-     *
-     * @param activity {@code Activity} being resumed.
-     */
-    public static void onHostResume(Activity activity) {
-        onHostResume(activity, new DefaultHardwareBackBtnHandlerImpl(activity));
-    }
-
-    /**
-     * Activity lifecycle method which should be called from
-     * {@code Activity.onResume} so we can do the required internal processing.
-     *
-     * @param activity {@code Activity} being resumed.
-     * @param defaultBackButtonImpl a {@code DefaultHardwareBackBtnHandler} to
-     * handle invoking the back button if no {@code JitsiMeetView} handles it.
-     */
-    public static void onHostResume(
-            Activity activity,
-            DefaultHardwareBackBtnHandler defaultBackButtonImpl) {
-        ReactInstanceManager reactInstanceManager
-            = ReactInstanceManagerHolder.getReactInstanceManager();
-
-        if (reactInstanceManager != null) {
-            reactInstanceManager.onHostResume(activity, defaultBackButtonImpl);
-        }
-    }
-
-    /**
-     * Activity lifecycle method which should be called from
-     * {@code Activity.onNewIntent} so we can do the required internal
-     * processing. Note that this is only needed if the activity's "launchMode"
-     * was set to "singleTask". This is required for deep linking to work once
-     * the application is already running.
-     *
-     * @param intent {@code Intent} instance which was received.
-     */
-    public static 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;
-
-        if (Intent.ACTION_VIEW.equals(intent.getAction())
-                && (uri = intent.getData()) != null
-                && loadURLStringInViews(uri.toString())) {
-            return;
-        }
-
-        ReactInstanceManager reactInstanceManager
-            = ReactInstanceManagerHolder.getReactInstanceManager();
-
-        if (reactInstanceManager != null) {
-            reactInstanceManager.onNewIntent(intent);
-        }
+        return loaded;
     }
 
     /**
@@ -211,26 +78,12 @@ public class JitsiMeetView extends FrameLayout {
      */
     private URL defaultURL;
 
-    /**
-     * The unique identifier of this {@code JitsiMeetView} within the process
-     * for the purposes of {@link ExternalAPI}. The name scope was inspired by
-     * postis which we use on Web for the similar purposes of the iframe-based
-     * external API.
-     */
-    private final String externalAPIScope;
-
     /**
      * The entry point into the invite feature of Jitsi Meet. The Java
      * counterpart of the JavaScript {@code InviteButton}.
      */
     private final InviteController inviteController;
 
-    /**
-     * {@link JitsiMeetViewListener} instance for reporting events occurring in
-     * Jitsi Meet.
-     */
-    private JitsiMeetViewListener listener;
-
     /**
      * Whether Picture-in-Picture is enabled. If {@code null}, defaults to
      * {@code true} iff the Android platform supports Picture-in-Picture
@@ -238,11 +91,6 @@ public class JitsiMeetView extends FrameLayout {
      */
     private Boolean pictureInPictureEnabled;
 
-    /**
-     * React Native root view.
-     */
-    private ReactRootView reactRootView;
-
     /**
      * The URL of the current conference.
      */
@@ -258,34 +106,33 @@ public class JitsiMeetView extends FrameLayout {
     public JitsiMeetView(@NonNull Context context) {
         super(context);
 
-        setBackgroundColor(BACKGROUND_COLOR);
-
-        ReactInstanceManagerHolder.initReactInstanceManager(
-            ((Activity) context).getApplication());
-
-        // Hook this JitsiMeetView into ExternalAPI.
-        externalAPIScope = UUID.randomUUID().toString();
-        synchronized (views) {
-            views.add(this);
-        }
-
         // The entry point into the invite feature of Jitsi Meet. The Java
         // counterpart of the JavaScript InviteButton.
         inviteController = new InviteController(externalAPIScope);
     }
 
     /**
-     * Releases the React resources (specifically the {@link ReactRootView})
-     * associated with this view.
+     * Enters Picture-In-Picture mode, if possible. This method is designed to
+     * be called from the {@code Activity.onUserLeaveHint} method.
      *
-     * This method MUST be called when the Activity holding this view is
-     * destroyed, typically in the {@code onDestroy} method.
+     * This is currently not mandatory, but if used will provide automatic
+     * handling of the picture in picture mode when user minimizes the app. It
+     * will be probably the most useful in case the app is using the welcome
+     * page.
      */
-    public void dispose() {
-        if (reactRootView != null) {
-            removeView(reactRootView);
-            reactRootView.unmountReactApplication();
-            reactRootView = null;
+    public void enterPictureInPicture() {
+        if (isPictureInPictureEnabled() && getURL() != null) {
+            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);
+                }
+            }
         }
     }
 
@@ -294,7 +141,7 @@ public class JitsiMeetView extends FrameLayout {
      * 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:
-     * {@link https://meet.jit.si}
+     * https://meet.jit.si
      *
      * @return The default base {@code URL} or {@code null}.
      */
@@ -315,31 +162,6 @@ public class JitsiMeetView extends FrameLayout {
         return inviteController;
     }
 
-    /**
-     * Gets the {@link JitsiMeetViewListener} set on this {@code JitsiMeetView}.
-     *
-     * @return The {@code JitsiMeetViewListener} set on this
-     * {@code JitsiMeetView}.
-     */
-    public JitsiMeetViewListener getListener() {
-        return listener;
-    }
-
-    /**
-     * 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 getPictureInPictureEnabled() {
-        return
-            PictureInPictureModule.isPictureInPictureSupported()
-                && (pictureInPictureEnabled == null
-                    || pictureInPictureEnabled.booleanValue());
-    }
-
     /**
      * Gets the URL of the current conference.
      *
@@ -353,6 +175,21 @@ public class JitsiMeetView extends FrameLayout {
         return url;
     }
 
+    /**
+     * 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
@@ -361,7 +198,7 @@ public class JitsiMeetView extends FrameLayout {
      * @return {@code true} if the Welcome page is enabled; otherwise,
      * {@code false}.
      */
-    public boolean getWelcomePageEnabled() {
+    public boolean isWelcomePageEnabled() {
         return welcomePageEnabled;
     }
 
@@ -395,9 +232,6 @@ public class JitsiMeetView extends FrameLayout {
             props.putString("defaultURL", defaultURL.toString());
         }
 
-        // externalAPIScope
-        props.putString("externalAPIScope", externalAPIScope);
-
         // inviteController
         InviteController inviteController = getInviteController();
 
@@ -413,7 +247,7 @@ public class JitsiMeetView extends FrameLayout {
         // pictureInPictureEnabled
         props.putBoolean(
             "pictureInPictureEnabled",
-            getPictureInPictureEnabled());
+            isPictureInPictureEnabled());
 
         // url
         if (urlObject != null) {
@@ -434,17 +268,7 @@ public class JitsiMeetView extends FrameLayout {
         // per loadURLObject: invocation.
         props.putLong("timestamp", System.currentTimeMillis());
 
-        if (reactRootView == null) {
-            reactRootView = new ReactRootView(getContext());
-            reactRootView.startReactApplication(
-                ReactInstanceManagerHolder.getReactInstanceManager(),
-                "App",
-                props);
-            reactRootView.setBackgroundColor(BACKGROUND_COLOR);
-            addView(reactRootView);
-        } else {
-            reactRootView.setAppProperties(props);
-        }
+        createReactRootView("App", props);
     }
 
     /**
@@ -468,66 +292,48 @@ public class JitsiMeetView extends FrameLayout {
     }
 
     /**
-     * Activity lifecycle method which should be called from
-     * {@code Activity.onUserLeaveHint} so we can do the required internal
-     * processing.
+     * The internal processing for the URL of the current conference set on the
+     * associated {@link JitsiMeetView}.
      *
-     * This is currently not mandatory, but if used will provide automatic
-     * handling of the picture in picture mode when user minimizes the app. It
-     * will be probably the most useful in case the app is using the welcome
-     * page.
+     * @param eventName the name of the external API event to be processed
+     * @param eventData the details/specifics of the event to process determined
+     * by/associated with the specified {@code eventName}.
      */
-    public void onUserLeaveHint() {
-        if (getPictureInPictureEnabled() && getURL() != null) {
-            PictureInPictureModule pipModule
-                = ReactInstanceManagerHolder.getNativeModule(
-                        PictureInPictureModule.class);
+    private void maybeSetViewURL(String eventName, ReadableMap eventData) {
+        switch(eventName) {
+        case "CONFERENCE_WILL_JOIN":
+            setURL(eventData.getString("url"));
+            break;
 
-            if (pipModule != null) {
-                try {
-                    pipModule.enterPictureInPicture();
-                } catch (RuntimeException re) {
-                    Log.e(TAG, "onUserLeaveHint: failed to enter PiP mode", re);
-                }
+        case "CONFERENCE_FAILED":
+        case "CONFERENCE_WILL_LEAVE":
+        case "LOAD_CONFIG_ERROR":
+            String url = eventData.getString("url");
+
+            if (url != null && url.equals(getURL())) {
+                setURL(null);
             }
+            break;
         }
     }
 
     /**
-     * Called when the window containing this view gains or loses focus.
+     * Handler for {@link ExternalAPIModule} events.
      *
-     * @param hasFocus If the window of this view now has focus, {@code true};
-     * otherwise, {@code false}.
+     * @param name The name of the event.
+     * @param data The details/specifics of the event to send determined
+     * by/associated with the specified {@code name}.
      */
     @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        super.onWindowFocusChanged(hasFocus);
+    public void onExternalAPIEvent(String name, ReadableMap data) {
+        // XXX The JitsiMeetView property URL was introduced in order to address
+        // an exception in the Picture-in-Picture functionality which arose
+        // because of delays related to bridging between JavaScript and Java. To
+        // reduce these delays do not wait for the call to be transferred to the
+        // UI thread.
+        maybeSetViewURL(name, data);
 
-        // https://github.com/mockingbot/react-native-immersive#restore-immersive-state
-
-        // FIXME The singleton pattern employed by RNImmersiveModule is not
-        // advisable because a react-native mobule is consumable only after its
-        // BaseJavaModule#initialize() has completed and here we have no
-        // knowledge of whether the precondition is really met.
-        RNImmersiveModule immersive = RNImmersiveModule.getInstance();
-
-        if (hasFocus && immersive != null) {
-            try {
-                immersive.emitImmersiveStateChangeEvent();
-            } catch (RuntimeException re) {
-                // FIXME I don't know how to check myself whether
-                // BaseJavaModule#initialize() has been invoked and thus
-                // RNImmersiveModule is consumable. A safe workaround is to
-                // swallow the failure because the whole full-screen/immersive
-                // functionality is brittle anyway, akin to the icing on the
-                // cake, and has been working without onWindowFocusChanged for a
-                // very long time.
-                Log.e(
-                    TAG,
-                    "RNImmersiveModule#emitImmersiveStateChangeEvent() failed!",
-                    re);
-            }
-        }
+        onExternalAPIEvent(LISTENER_METHODS, name, data);
     }
 
     /**
@@ -543,17 +349,6 @@ public class JitsiMeetView extends FrameLayout {
         this.defaultURL = defaultURL;
     }
 
-    /**
-     * Sets a specific {@link JitsiMeetViewListener} on this
-     * {@code JitsiMeetView}.
-     *
-     * @param listener The {@code JitsiMeetViewListener} to set on this
-     * {@code JitsiMeetView}.
-     */
-    public void setListener(JitsiMeetViewListener listener) {
-        this.listener = listener;
-    }
-
     /**
      * Sets whether Picture-in-Picture is enabled. Because Picture-in-Picture is
      * natively supported only since certain platform versions, specifying
@@ -563,7 +358,7 @@ public class JitsiMeetView extends FrameLayout {
      * {@code true}; otherwise, {@code false}.
      */
     public void setPictureInPictureEnabled(boolean pictureInPictureEnabled) {
-        this.pictureInPictureEnabled = Boolean.valueOf(pictureInPictureEnabled);
+        this.pictureInPictureEnabled = pictureInPictureEnabled;
     }
 
     /**

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

@@ -22,7 +22,9 @@ 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 {
+public abstract class JitsiMeetViewAdapter
+    implements JitsiMeetViewListener {
+
     @Override
     public void onConferenceFailed(Map<String, Object> data) {
     }

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

@@ -0,0 +1,166 @@
+/*
+ * 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.
+ */
+
+package org.jitsi.meet.sdk;
+
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.UiThreadUtil;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+/**
+ * Utility methods for helping with transforming {@link ExternalAPIModule}
+ * events into listener methods. Used with descendants of {@link BaseReactView}.
+ */
+public final class ListenerUtils {
+    /**
+     * Extracts the methods defined in a listener and creates a mapping of this
+     * form: event name -> method.
+     *
+     * @param listener - The listener whose methods we want to slurp.
+     * @return A mapping with event names - methods.
+     */
+    public static Map<String, Method> mapListenerMethods(Class listener) {
+        Map<String, Method> methods = new HashMap<>();
+
+        // Figure out the mapping between the listener methods
+        // and the events i.e. redux action types.
+        Pattern onPattern = Pattern.compile("^on[A-Z]+");
+        Pattern camelcasePattern = Pattern.compile("([a-z0-9]+)([A-Z0-9]+)");
+
+        for (Method method : listener.getDeclaredMethods()) {
+            // * The method must be public (because it is declared by an
+            //   interface).
+            // * The method must be/return void.
+            if (!Modifier.isPublic(method.getModifiers())
+                    || !Void.TYPE.equals(method.getReturnType())) {
+                continue;
+            }
+
+            // * The method name must start with "on" followed by a
+            //   capital/uppercase letter (in agreement with the camelcase
+            //   coding style customary to Java in general and the projects of
+            //   the Jitsi community in particular).
+            String name = method.getName();
+
+            if (!onPattern.matcher(name).find()) {
+                continue;
+            }
+
+            // * The method must accept/have exactly 1 parameter of a type
+            //   assignable from HashMap.
+            Class<?>[] parameterTypes = method.getParameterTypes();
+
+            if (parameterTypes.length != 1
+                    || !parameterTypes[0].isAssignableFrom(HashMap.class)) {
+                continue;
+            }
+
+            // Convert the method name to an event name.
+            name
+                = camelcasePattern.matcher(name.substring(2))
+                    .replaceAll("$1_$2")
+                    .toUpperCase(Locale.ROOT);
+            methods.put(name, method);
+        }
+
+        return methods;
+    }
+
+    /**
+     * Executes the right listener method for the given event.
+     * NOTE: This function will run asynchronously on the UI thread.
+     *
+     * @param listener - The listener on which the method will be called.
+     * @param listenerMethods - Mapping with event names and the matching
+     *                        methods.
+     * @param eventName - Name of the event.
+     * @param eventData - Data associated with the event.
+     */
+    public static void runListenerMethod(
+            final Object listener,
+            final Map<String, Method> listenerMethods,
+            final String eventName,
+            final ReadableMap eventData) {
+        // Make sure listener methods are invoked on the UI thread. It
+        // was requested by SDK consumers.
+        if (UiThreadUtil.isOnUiThread()) {
+            runListenerMethodOnUiThread(
+                listener, listenerMethods, eventName, eventData);
+        } else {
+            UiThreadUtil.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    runListenerMethodOnUiThread(
+                        listener, listenerMethods, eventName, eventData);
+                }
+            });
+        }
+    }
+
+    /**
+     * Helper companion for {@link ListenerUtils#runListenerMethod} which runs
+     * in the UI thread.
+     */
+    private static void runListenerMethodOnUiThread(
+            Object listener,
+            Map<String, Method> listenerMethods,
+            String eventName,
+            ReadableMap eventData) {
+        UiThreadUtil.assertOnUiThread();
+
+        Method method = listenerMethods.get(eventName);
+        if (method != null) {
+            try {
+                method.invoke(listener, toHashMap(eventData));
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            } catch (InvocationTargetException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    /**
+     * Initializes a new {@code HashMap} instance with the key-value
+     * associations of a specific {@code ReadableMap}.
+     *
+     * @param readableMap the {@code ReadableMap} specifying the key-value
+     * associations with which the new {@code HashMap} instance is to be
+     * initialized.
+     * @return a new {@code HashMap} instance initialized with the key-value
+     * associations of the specified {@code readableMap}.
+     */
+    private static HashMap<String, Object> toHashMap(ReadableMap readableMap) {
+        HashMap<String, Object> hashMap = new HashMap<>();
+
+        for (ReadableMapKeySetIterator i = readableMap.keySetIterator();
+                i.hasNextKey();) {
+            String key = i.nextKey();
+
+            hashMap.put(key, readableMap.getString(key));
+        }
+
+        return hashMap;
+    }
+}

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

@@ -1,3 +1,19 @@
+/*
+ * 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.app.Activity;
@@ -11,7 +27,9 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 
-public class PictureInPictureModule extends ReactContextBaseJavaModule {
+class PictureInPictureModule
+    extends ReactContextBaseJavaModule {
+
     private final static String TAG = "PictureInPicture";
 
     static boolean isPictureInPictureSupported() {

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

@@ -31,7 +31,9 @@ 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.
  */
-class ProximityModule extends ReactContextBaseJavaModule {
+class ProximityModule
+    extends ReactContextBaseJavaModule {
+
     /**
      * The name of {@code ProximityModule} to be used in the React Native
      * bridge.

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

@@ -0,0 +1,129 @@
+/*
+ * 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.
+ */
+
+package org.jitsi.meet.sdk;
+
+import android.app.Activity;
+import android.content.Intent;
+
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
+
+/**
+ * Helper class to encapsulate the work which needs to be done on
+ * {@link Activity} lifecycle methods in order for the React side to be aware of
+ * it.
+ */
+public class ReactActivityLifecycleCallbacks {
+    /**
+     * {@link Activity} lifecycle method which should be called from
+     * {@link Activity#onBackPressed} so we can do the required internal
+     * processing.
+     *
+     * @return {@code true} if the back-press was processed; {@code false},
+     * otherwise. If {@code false}, the application should call the
+     * {@code super}'s implementation.
+     */
+    public static boolean onBackPressed() {
+        ReactInstanceManager reactInstanceManager
+            = ReactInstanceManagerHolder.getReactInstanceManager();
+
+        if (reactInstanceManager == null) {
+            return false;
+        } else {
+            reactInstanceManager.onBackPressed();
+            return true;
+        }
+    }
+
+    /**
+     * {@link Activity} lifecycle method which should be called from
+     * {@code Activity#onDestroy} so we can do the required internal
+     * processing.
+     *
+     * @param activity {@code Activity} being destroyed.
+     */
+    public static void onHostDestroy(Activity activity) {
+        ReactInstanceManager reactInstanceManager
+            = ReactInstanceManagerHolder.getReactInstanceManager();
+
+        if (reactInstanceManager != null) {
+            reactInstanceManager.onHostDestroy(activity);
+        }
+    }
+
+    /**
+     * {@link Activity} lifecycle method which should be called from
+     * {@code Activity#onPause} so we can do the required internal processing.
+     *
+     * @param activity {@code Activity} being paused.
+     */
+    public static void onHostPause(Activity activity) {
+        ReactInstanceManager reactInstanceManager
+            = ReactInstanceManagerHolder.getReactInstanceManager();
+
+        if (reactInstanceManager != null) {
+            reactInstanceManager.onHostPause(activity);
+        }
+    }
+
+    /**
+     * {@link Activity} lifecycle method which should be called from
+     * {@code Activity#onResume} so we can do the required internal processing.
+     *
+     * @param activity {@code Activity} being resumed.
+     */
+    public static void onHostResume(Activity activity) {
+        onHostResume(activity, new DefaultHardwareBackBtnHandlerImpl(activity));
+    }
+
+    /**
+     * {@link Activity} lifecycle method which should be called from
+     * {@code Activity#onResume} so we can do the required internal processing.
+     *
+     * @param activity {@code Activity} being resumed.
+     * @param defaultBackButtonImpl a {@link DefaultHardwareBackBtnHandler} to
+     * handle invoking the back button if no {@link BaseReactView} handles it.
+     */
+    public static void onHostResume(
+            Activity activity,
+            DefaultHardwareBackBtnHandler defaultBackButtonImpl) {
+        ReactInstanceManager reactInstanceManager
+            = ReactInstanceManagerHolder.getReactInstanceManager();
+
+        if (reactInstanceManager != null) {
+            reactInstanceManager.onHostResume(activity, defaultBackButtonImpl);
+        }
+    }
+
+    /**
+     * {@link Activity} lifecycle method which should be called from
+     * {@code Activity#onNewIntent} so we can do the required internal
+     * processing. Note that this is only needed if the activity's "launchMode"
+     * was set to "singleTask". This is required for deep linking to work once
+     * the application is already running.
+     *
+     * @param intent {@code Intent} instance which was received.
+     */
+    public static void onNewIntent(Intent intent) {
+        ReactInstanceManager reactInstanceManager
+            = ReactInstanceManagerHolder.getReactInstanceManager();
+
+        if (reactInstanceManager != null) {
+            reactInstanceManager.onNewIntent(intent);
+        }
+    }
+}

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

@@ -28,7 +28,7 @@ import com.facebook.react.common.LifecycleState;
 import java.util.Arrays;
 import java.util.List;
 
-public class ReactInstanceManagerHolder {
+class ReactInstanceManagerHolder {
     /**
      * React Native bridge. The instance manager allows embedding applications
      * to create multiple root views off the same JavaScript bundle.
@@ -119,14 +119,15 @@ public class ReactInstanceManagerHolder {
                 .setApplication(application)
                 .setBundleAssetName("index.android.bundle")
                 .setJSMainModulePath("index.android")
+                .addPackage(new com.BV.LinearGradient.LinearGradientPackage())
                 .addPackage(new com.calendarevents.CalendarEventsPackage())
                 .addPackage(new com.corbt.keepawake.KCKeepAwakePackage())
+                .addPackage(new com.dylanvann.fastimage.FastImageViewPackage())
                 .addPackage(new com.facebook.react.shell.MainReactPackage())
                 .addPackage(new com.i18n.reactnativei18n.ReactNativeI18n())
                 .addPackage(new com.oblador.vectoricons.VectorIconsPackage())
                 .addPackage(new com.ocetnik.timer.BackgroundTimerPackage())
                 .addPackage(new com.oney.WebRTCModule.WebRTCModulePackage())
-                .addPackage(new com.RNFetchBlob.RNFetchBlobPackage())
                 .addPackage(new com.rnimmersive.RNImmersivePackage())
                 .addPackage(new com.zmxv.RNSound.RNSoundPackage())
                 .addPackage(new ReactPackageAdapter() {

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

@@ -25,7 +25,9 @@ import com.facebook.react.uimanager.ViewManager;
 import java.util.Collections;
 import java.util.List;
 
-public class ReactPackageAdapter implements ReactPackage {
+class ReactPackageAdapter
+    implements ReactPackage {
+
     @Override
     public List<NativeModule> createNativeModules(
             ReactApplicationContext reactContext) {

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

@@ -19,8 +19,6 @@ package org.jitsi.meet.sdk;
 import android.content.Context;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 
 import com.facebook.react.bridge.Promise;
@@ -36,14 +34,18 @@ import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.Enumeration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * Module exposing WiFi statistics.
  *
- * Gathers rssi, signal in percentage, timestamp and the addresses
- * of the wifi device.
+ * Gathers rssi, signal in percentage, timestamp and the addresses of the wifi
+ * device.
  */
-class WiFiStatsModule extends ReactContextBaseJavaModule {
+class WiFiStatsModule
+    extends ReactContextBaseJavaModule {
+
     /**
      * The name of {@code WiFiStatsModule} to be used in the React Native
      * bridge.
@@ -56,17 +58,16 @@ class WiFiStatsModule extends ReactContextBaseJavaModule {
     static final String TAG = MODULE_NAME;
 
     /**
-     * The scale used for the signal value.
-     * A level of the signal, given in the range
-     * of 0 to SIGNAL_LEVEL_SCALE-1 (both inclusive).
+     * The scale used for the signal value. A level of the signal, given in the
+     * range of 0 to SIGNAL_LEVEL_SCALE-1 (both inclusive).
      */
     public final static int SIGNAL_LEVEL_SCALE = 101;
 
     /**
-     * {@link Handler} for running all operations on the main thread.
+     * {@link ExecutorService} for running all operations on a dedicated thread.
      */
-    private final Handler mainThreadHandler
-            = new Handler(Looper.getMainLooper());
+    private static final ExecutorService executor
+        = Executors.newSingleThreadExecutor();
 
     /**
      * Initializes a new module instance. There shall be a single instance of
@@ -119,7 +120,6 @@ class WiFiStatsModule extends ReactContextBaseJavaModule {
             @Override
             public void run() {
                 try {
-
                     Context context
                         = getReactApplicationContext().getApplicationContext();
                     WifiManager wifiManager
@@ -203,6 +203,6 @@ class WiFiStatsModule extends ReactContextBaseJavaModule {
                 }
             }
         };
-        mainThreadHandler.post(r);
+        executor.execute(r);
     }
 }

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

@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+package org.jitsi.meet.sdk.incoming_call;
+
+import android.support.annotation.NonNull;
+
+public class IncomingCallInfo {
+    /**
+     * URL for the caller avatar.
+     */
+    private final String callerAvatarURL;
+
+    /**
+     * Caller's name.
+     */
+    private final String callerName;
+
+    /**
+     * Whether this is a regular call or a video call.
+     */
+    private final boolean hasVideo;
+
+    public IncomingCallInfo(
+            @NonNull String callerName,
+            @NonNull String callerAvatarURL,
+            boolean hasVideo) {
+        this.callerName = callerName;
+        this.callerAvatarURL = callerAvatarURL;
+        this.hasVideo = hasVideo;
+    }
+
+    /**
+     * Gets the caller's avatar URL.
+     * 
+     * @return - The URL as a string.
+     */
+    public String getCallerAvatarURL() {
+        return callerAvatarURL;
+    }
+
+    /**
+     * Gets the caller's name.
+     *
+     * @return - The caller's name.
+     */
+    public String getCallerName() {
+        return callerName;
+    }
+
+    /**
+     * Gets whether the call is a video call or not.
+     *
+     * @return - {@code true} if this call has video; {@code false}, otherwise.
+     */
+    public boolean hasVideo() {
+        return hasVideo;
+    }
+}

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

@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+package org.jitsi.meet.sdk.incoming_call;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+
+import com.facebook.react.bridge.ReadableMap;
+
+import org.jitsi.meet.sdk.BaseReactView;
+import org.jitsi.meet.sdk.ListenerUtils;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+public class IncomingCallView
+    extends BaseReactView<IncomingCallViewListener> {
+
+    /**
+     * The {@code Method}s of {@code JitsiMeetViewListener} by event name i.e.
+     * redux action types.
+     */
+    private static final Map<String, Method> LISTENER_METHODS
+        = ListenerUtils.mapListenerMethods(IncomingCallViewListener.class);
+
+    public IncomingCallView(@NonNull Context context) {
+        super(context);
+    }
+
+    /**
+     * Handler for {@link ExternalAPIModule} events.
+     *
+     * @param name The name of the event.
+     * @param data The details/specifics of the event to send determined
+     * by/associated with the specified {@code name}.
+     */
+    @Override
+    public void onExternalAPIEvent(String name, ReadableMap data) {
+        onExternalAPIEvent(LISTENER_METHODS, name, data);
+    }
+
+    /**
+     * Sets the information for the incoming call this {@code IncomingCallView}
+     * represents.
+     *
+     * @param callInfo - {@link IncomingCallInfo} object representing the caller
+     * information.
+     */
+    public void setIncomingCallInfo(IncomingCallInfo callInfo) {
+        Bundle props = new Bundle();
+
+        props.putString("callerAvatarURL", callInfo.getCallerAvatarURL());
+        props.putString("callerName", callInfo.getCallerName());
+        props.putBoolean("hasVideo", callInfo.hasVideo());
+
+        createReactRootView("IncomingCallApp", props);
+    }
+}

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

@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+package org.jitsi.meet.sdk.incoming_call;
+
+import java.util.Map;
+
+/**
+ * Interface for listening to events coming from Jitsi Meet, related to
+ * {@link IncomingCallView}.
+ */
+public interface IncomingCallViewListener {
+    /**
+     * Called when the user presses the "Answer" button on the
+     * {@link IncomingCallView}.
+     *
+     * @param data - Unused at the moment.
+     */
+    void onIncomingCallAnswered(Map<String, Object> data);
+
+    /**
+     * Called when the user presses the "Decline" button on the
+     * {@link IncomingCallView}.
+     *
+     * @param data - Unused at the moment.
+     */
+    void onIncomingCallDeclined(Map<String, Object> data);
+}

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

@@ -33,7 +33,8 @@ import java.util.Map;
 import java.util.UUID;
 
 /**
- * Controller object used by native code to query and submit user selections for the user invitation flow.
+ * Controller object used by native code to query and submit user selections for
+ * the user invitation flow.
  */
 public class AddPeopleController {
 
@@ -44,17 +45,18 @@ public class AddPeopleController {
     private AddPeopleControllerListener listener;
 
     /**
-     * Local cache of search query results.  Used to re-hydrate the list
-     * of selected items based on their ids passed to inviteById
-     * in order to pass the full item maps back to the JitsiMeetView during submission.
+     * Local cache of search query results. Used to re-hydrate the list of
+     * selected items based on their ids passed to inviteById in order to pass
+     * the full item maps back to the JitsiMeetView during submission.
      */
     private final Map<String, ReadableMap> items = new HashMap<>();
 
     private final WeakReference<InviteController> owner;
 
     private final WeakReference<ReactApplicationContext> reactContext;
+
     /**
-     * Randomly generated UUID, used for identification in the InviteModule
+     * Randomly generated UUID, used for identification in the InviteModule.
      */
     private final String uuid = UUID.randomUUID().toString();
 
@@ -158,10 +160,10 @@ public class AddPeopleController {
     }
 
     /**
-     * Caches results received by the search into a local map for use
-     * later when the items are submitted.  Submission requires the full
-     * map of information, but only the IDs are returned back to the delegate.
-     * Using this map means we don't have to send the whole map back to the delegate.
+     * Caches results received by the search into a local map for use later when
+     * the items are submitted.  Submission requires the full map of
+     * information, but only the IDs are returned back to the delegate. Using
+     * this map means we don't have to send the whole map back to the delegate.
      *
      * @param results
      * @param query
@@ -179,10 +181,15 @@ public class AddPeopleController {
 
                 if(map.hasKey("id")) {
                     items.put(map.getString("id"), map);
-                } else if(map.hasKey("type") && map.getString("type").equals("phone") && map.hasKey("number")) {
+                } else if(map.hasKey("type")
+                        && map.getString("type").equals("phone")
+                        && map.hasKey("number")) {
                     items.put(map.getString("number"), map);
                 } else {
-                    Log.w("AddPeopleController", "Received result without id and that was not a phone number, so not adding it to suggestions: " + map);
+                    Log.w(
+                        "AddPeopleController",
+                        "Received result without id and that was not a phone number, so not adding it to suggestions: "
+                            + map);
                 }
 
                 jvmResults.add(map.toHashMap());

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

@@ -202,9 +202,9 @@ public class InviteController {
     }
 
     /**
-     * Starts a query for users to invite to the conference.  Results will be
-     * returned through the {@link AddPeopleControllerListener#onReceivedResults(AddPeopleController, List, String)}
-     * method.
+     * Starts a query for users to invite to the conference. Results will be
+     * returned through
+     * {@link AddPeopleControllerListener#onReceivedResults(AddPeopleController, List, String)}.
      *
      * @param query {@code String} to use for the query
      */

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

@@ -20,10 +20,10 @@ public interface InviteControllerListener {
     /**
      * Called when the add user button is tapped.
      *
-     * @param addPeopleController {@code AddPeopleController} scoped
-     * for this user invite flow. The {@code AddPeopleController} is used
-     * to start user queries and accepts an {@code AddPeopleControllerListener}
-     * for receiving user query responses.
+     * @param addPeopleController {@code AddPeopleController} scoped for this
+     * user invite flow. The {@code AddPeopleController} is used to start user
+     * queries and accepts an {@code AddPeopleControllerListener} for receiving
+     * user query responses.
      */
     void beginAddPeople(AddPeopleController addPeopleController);
 }

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

@@ -24,12 +24,15 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.UiThreadUtil;
 
+import org.jitsi.meet.sdk.BaseReactView;
 import org.jitsi.meet.sdk.JitsiMeetView;
 
 /**
  * Implements the react-native module of the feature invite.
  */
-public class InviteModule extends ReactContextBaseJavaModule {
+public class InviteModule
+    extends ReactContextBaseJavaModule {
+
     public InviteModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
@@ -67,7 +70,8 @@ public class InviteModule extends ReactContextBaseJavaModule {
     private InviteController findInviteControllerByExternalAPIScope(
             String externalAPIScope) {
         JitsiMeetView view
-            = JitsiMeetView.findViewByExternalAPIScope(externalAPIScope);
+            = (JitsiMeetView)
+                BaseReactView.findViewByExternalAPIScope(externalAPIScope);
 
         return view == null ? null : view.getInviteController();
     }
@@ -81,7 +85,8 @@ public class InviteModule extends ReactContextBaseJavaModule {
      * Callback for invitation failures
      *
      * @param failedInvitees the items for which the invitation failed
-     * @param addPeopleControllerScope a string that represents a connection to a specific AddPeopleController
+     * @param addPeopleControllerScope a string that represents a connection to
+     * a specific AddPeopleController
      */
     @ReactMethod
     public void inviteSettled(
@@ -123,7 +128,8 @@ public class InviteModule extends ReactContextBaseJavaModule {
      *
      * @param results the results in a ReadableArray of ReadableMap objects
      * @param query the query associated with the search
-     * @param addPeopleControllerScope a string that represents a connection to a specific AddPeopleController
+     * @param addPeopleControllerScope a string that represents a connection to
+     * a specific AddPeopleController
      */
     @ReactMethod
     public void receivedResults(

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

@@ -32,7 +32,9 @@ import java.net.UnknownHostException;
  * [1]: https://tools.ietf.org/html/rfc6146
  * [2]: https://tools.ietf.org/html/rfc6052
  */
-public class NAT64AddrInfoModule extends ReactContextBaseJavaModule {
+public class NAT64AddrInfoModule
+    extends ReactContextBaseJavaModule {
+
     /**
      * The host for which the module wil try to resolve both IPv4 and IPv6
      * addresses in order to figure out the NAT64 prefix.

android/settings.gradle

@@ -3,12 +3,14 @@ rootProject.name = 'jitsi-meet'
 include ':app', ':sdk'
 include ':react-native-background-timer'
 project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android')
-include ':react-native-fetch-blob'
-project(':react-native-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fetch-blob/android')
+include ':react-native-fast-image'
+project(':react-native-fast-image').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fast-image/android')
 include ':react-native-immersive'
 project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
 include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
+include ':react-native-linear-gradient'
+project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
 include ':react-native-locale-detector'
 project(':react-native-locale-detector').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-locale-detector/android')
 include ':react-native-sound'

conference.js

@@ -7,8 +7,6 @@ import Recorder from './modules/recorder/Recorder';
 
 import mediaDeviceHelper from './modules/devices/mediaDeviceHelper';
 
-import { reportError } from './modules/util/helpers';
-
 import * as RemoteControlEvents
     from './service/remotecontrol/RemoteControlEvents';
 import UIEvents from './service/UI/UIEvents';
@@ -18,7 +16,6 @@ import * as JitsiMeetConferenceEvents from './ConferenceEvents';
 import {
     createDeviceChangedEvent,
     createScreenSharingEvent,
-    createSelectParticipantFailedEvent,
     createStreamSwitchDelayEvent,
     createTrackMutedEvent,
     sendAnalytics
@@ -38,6 +35,7 @@ import {
     conferenceJoined,
     conferenceLeft,
     conferenceWillJoin,
+    conferenceWillLeave,
     dataChannelOpened,
     EMAIL_COMMAND,
     lockStateChanged,
@@ -47,6 +45,7 @@ import {
     setDesktopSharingEnabled
 } from './react/features/base/conference';
 import {
+    getAvailableDevices,
     setAudioOutputDeviceId,
     updateDeviceList
 } from './react/features/base/devices';
@@ -75,6 +74,8 @@ import {
     getAvatarURLByParticipantId,
     getLocalParticipant,
     getParticipantById,
+    hiddenParticipantJoined,
+    hiddenParticipantLeft,
     localParticipantConnectionStatusChanged,
     localParticipantRoleChanged,
     MAX_DISPLAY_NAME_LENGTH,
@@ -109,6 +110,7 @@ import {
 } from './react/features/overlay';
 import { setSharedVideoStatus } from './react/features/shared-video';
 import { isButtonEnabled } from './react/features/toolbox';
+import { endpointMessageReceived } from './react/features/subtitles';
 
 const logger = require('jitsi-meet-logger').getLogger(__filename);
 
@@ -372,6 +374,8 @@ class ConferenceConnector {
 
         case JitsiConferenceErrors.FOCUS_LEFT:
         case JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE:
+            APP.store.dispatch(conferenceWillLeave(room));
+
             // FIXME the conference should be stopped by the library and not by
             // the app. Both the errors above are unrecoverable from the library
             // perspective.
@@ -468,6 +472,7 @@ function _connectionFailedHandler(error) {
             JitsiConnectionEvents.CONNECTION_FAILED,
             _connectionFailedHandler);
         if (room) {
+            APP.store.dispatch(conferenceWillLeave(room));
             room.leave();
         }
     }
@@ -1656,10 +1661,13 @@ export default {
         room.on(JitsiConferenceEvents.PARTCIPANT_FEATURES_CHANGED,
             user => APP.UI.onUserFeaturesChanged(user));
         room.on(JitsiConferenceEvents.USER_JOINED, (id, user) => {
+            const displayName = user.getDisplayName();
+
             if (user.isHidden()) {
+                APP.store.dispatch(hiddenParticipantJoined(id, displayName));
+
                 return;
             }
-            const displayName = user.getDisplayName();
 
             APP.store.dispatch(participantJoined({
                 botType: user.getBotType(),
@@ -1684,8 +1692,11 @@ export default {
 
         room.on(JitsiConferenceEvents.USER_LEFT, (id, user) => {
             if (user.isHidden()) {
+                APP.store.dispatch(hiddenParticipantLeft(id));
+
                 return;
             }
+
             APP.store.dispatch(participantLeft(id, room));
             logger.log('USER %s LEFT', id, user);
             APP.API.notifyUserLeft(id);
@@ -1812,24 +1823,6 @@ export default {
                     room.sendTextMessage(message);
                 });
             }
-
-            APP.UI.addListener(UIEvents.SELECTED_ENDPOINT, id => {
-                APP.API.notifyOnStageParticipantChanged(id);
-                try {
-                    // do not try to select participant if there is none (we
-                    // are alone in the room), otherwise an error will be
-                    // thrown cause reporting mechanism is not available
-                    // (datachannels currently)
-                    if (room.getParticipants().length === 0) {
-                        return;
-                    }
-
-                    room.selectParticipant(id);
-                } catch (e) {
-                    sendAnalytics(createSelectParticipantFailedEvent(e));
-                    reportError(e);
-                }
-            });
         }
 
         room.on(JitsiConferenceEvents.CONNECTION_INTERRUPTED, () => {
@@ -1875,6 +1868,10 @@ export default {
             }
         );
 
+        room.on(
+            JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED,
+            (...args) => APP.store.dispatch(endpointMessageReceived(...args)));
+
         room.on(
             JitsiConferenceEvents.LOCK_STATE_CHANGED,
             (...args) => APP.store.dispatch(lockStateChanged(room, ...args)));
@@ -2133,20 +2130,6 @@ export default {
             }
         );
 
-        APP.UI.addListener(
-            UIEvents.AUDIO_OUTPUT_DEVICE_CHANGED,
-            audioOutputDeviceId => {
-                sendAnalytics(createDeviceChangedEvent('audio', 'output'));
-                setAudioOutputDeviceId(audioOutputDeviceId)
-                    .then(() => logger.log('changed audio output device'))
-                    .catch(err => {
-                        logger.warn('Failed to change audio output device. '
-                            + 'Default or previously set audio output device '
-                            + 'will be used instead.', err);
-                    });
-            }
-        );
-
         APP.UI.addListener(UIEvents.TOGGLE_AUDIO_ONLY, audioOnly => {
 
             // FIXME On web video track is stored both in redux and in
@@ -2318,40 +2301,43 @@ export default {
     /**
      * Inits list of current devices and event listener for device change.
      * @private
+     * @returns {Promise}
      */
     _initDeviceList() {
         const { mediaDevices } = JitsiMeetJS;
 
         if (mediaDevices.isDeviceListAvailable()
                 && mediaDevices.isDeviceChangeAvailable()) {
-            mediaDevices.enumerateDevices(devices => {
-                // Ugly way to synchronize real device IDs with local storage
-                // and settings menu. This is a workaround until
-                // getConstraints() method will be implemented in browsers.
-                const { dispatch } = APP.store;
-
-                if (this.localAudio) {
-                    dispatch(updateSettings({
-                        micDeviceId: this.localAudio.getDeviceId()
-                    }));
-                }
-                if (this.localVideo) {
-                    dispatch(updateSettings({
-                        cameraDeviceId: this.localVideo.getDeviceId()
-                    }));
-                }
-
-                mediaDeviceHelper.setCurrentMediaDevices(devices);
-                APP.UI.onAvailableDevicesChanged(devices);
-                APP.store.dispatch(updateDeviceList(devices));
-            });
-
             this.deviceChangeListener = devices =>
                 window.setTimeout(() => this._onDeviceListChanged(devices), 0);
             mediaDevices.addEventListener(
                 JitsiMediaDevicesEvents.DEVICE_LIST_CHANGED,
                 this.deviceChangeListener);
+
+            const { dispatch } = APP.store;
+
+            return dispatch(getAvailableDevices())
+                .then(devices => {
+                    // Ugly way to synchronize real device IDs with local
+                    // storage and settings menu. This is a workaround until
+                    // getConstraints() method will be implemented in browsers.
+                    if (this.localAudio) {
+                        dispatch(updateSettings({
+                            micDeviceId: this.localAudio.getDeviceId()
+                        }));
+                    }
+
+                    if (this.localVideo) {
+                        dispatch(updateSettings({
+                            cameraDeviceId: this.localVideo.getDeviceId()
+                        }));
+                    }
+
+                    APP.UI.onAvailableDevicesChanged(devices);
+                });
         }
+
+        return Promise.resolve();
     },
 
     /**
@@ -2362,16 +2348,7 @@ export default {
      * @returns {Promise}
      */
     _onDeviceListChanged(devices) {
-        let currentDevices = mediaDeviceHelper.getCurrentMediaDevices();
-
-        // Event handler can be fired before direct
-        // enumerateDevices() call, so handle this situation here.
-        if (!currentDevices.audioinput
-            && !currentDevices.videoinput
-            && !currentDevices.audiooutput) {
-            mediaDeviceHelper.setCurrentMediaDevices(devices);
-            currentDevices = mediaDeviceHelper.getCurrentMediaDevices();
-        }
+        APP.store.dispatch(updateDeviceList(devices));
 
         const newDevices
             = mediaDeviceHelper.getNewMediaDevicesAfterDeviceListChanged(
@@ -2384,9 +2361,13 @@ export default {
         const videoWasMuted = this.isLocalVideoMuted();
 
         if (typeof newDevices.audiooutput !== 'undefined') {
-            // Just ignore any errors in catch block.
-            promises.push(setAudioOutputDeviceId(newDevices.audiooutput)
-                .catch());
+            const { dispatch } = APP.store;
+            const setAudioOutputPromise
+                = setAudioOutputDeviceId(newDevices.audiooutput, dispatch)
+                    .catch(); // Just ignore any errors in catch block.
+
+
+            promises.push(setAudioOutputPromise);
         }
 
         promises.push(
@@ -2420,7 +2401,6 @@ export default {
 
         return Promise.all(promises)
             .then(() => {
-                mediaDeviceHelper.setCurrentMediaDevices(devices);
                 APP.UI.onAvailableDevicesChanged(devices);
             });
     },
@@ -2430,7 +2410,7 @@ export default {
      */
     updateAudioIconEnabled() {
         const audioMediaDevices
-            = mediaDeviceHelper.getCurrentMediaDevices().audioinput;
+            = APP.store.getState()['features/base/devices'].audioInput;
         const audioDeviceCount
             = audioMediaDevices ? audioMediaDevices.length : 0;
 
@@ -2453,7 +2433,7 @@ export default {
      */
     updateVideoIconEnabled() {
         const videoMediaDevices
-            = mediaDeviceHelper.getCurrentMediaDevices().videoinput;
+            = APP.store.getState()['features/base/devices'].videoInput;
         const videoDeviceCount
             = videoMediaDevices ? videoMediaDevices.length : 0;
 
@@ -2508,13 +2488,24 @@ export default {
         // before all operations are done.
         Promise.all([
             requestFeedbackPromise,
-            room.leave().then(disconnect, disconnect)
+            this.leaveRoomAndDisconnect()
         ]).then(values => {
             APP.API.notifyReadyToClose();
             maybeRedirectToWelcomePage(values[0]);
         });
     },
 
+    /**
+     * Leaves the room and calls JitsiConnection.disconnect.
+     *
+     * @returns {Promise}
+     */
+    leaveRoomAndDisconnect() {
+        APP.store.dispatch(conferenceWillLeave(room));
+
+        return room.leave().then(disconnect, disconnect);
+    },
+
     /**
      * Changes the email for the local user
      * @param email {string} the new email

config.js

@@ -99,13 +99,13 @@ var config = {
     // used by browsers that return true from lib-jitsi-meet's
     // util#browser#usesNewGumFlow. The constraints are independency from
     // this config's resolution value. Defaults to requesting an ideal aspect
-    // ratio of 16:9 with an ideal resolution of 1080p.
+    // ratio of 16:9 with an ideal resolution of 720.
     // constraints: {
     //     video: {
     //         aspectRatio: 16 / 9,
     //         height: {
-    //             ideal: 1080,
-    //             max: 1080,
+    //             ideal: 720,
+    //             max: 720,
     //             min: 240
     //         }
     //     }
@@ -175,6 +175,10 @@ var config = {
     // Whether to enable live streaming or not.
     // liveStreamingEnabled: false,
 
+    // Transcription (in interface_config,
+    // subtitles and buttons can be configured)
+    // transcribingEnabled: false,
+
     // Misc
 
     // Default value for the channel "last N" attribute. -1 for unlimited.
@@ -252,7 +256,6 @@ var config = {
     // maintenance at 01:00 AM GMT,
     // noticeMessage: '',
 
-
     // Stats
     //
 

css/_base.scss

@@ -108,14 +108,15 @@ form {
 }
 
 .leftwatermark {
-    left: $defaultToolbarSize;
-    margin-left: 10px;
+    left: 32px;
+    top: 32px;
     background-image: url($defaultWatermarkLink);
     background-position: center left;
 }
 
 .rightwatermark {
-    right: 15;
+    right: 32px;
+    top: 32px;
     background-position: center right;
 }
 

css/_font.scss

@@ -24,6 +24,7 @@
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
 }
+
 .icon-arrow_back:before {
   content: "\e5c4";
 }
@@ -210,3 +211,12 @@
 .icon-speaker:before {
     content: "\e92d";
 }
+.icon-tiles-many:before {
+  content: "\e92e";
+}
+.icon-tiles-one:before {
+  content: "\e92f";
+}
+.icon-closed_caption:before {
+    content: "\e930";
+}

css/_navigate_section_list.scss

@@ -0,0 +1,43 @@
+%navigate-section-list-text {
+    width: 100%;
+    font-size: 14px;
+    line-height: 20px;
+    color: $welcomePageTitleColor;
+    text-align: left;
+    font-family: 'open_sanslight', Helvetica, sans-serif;
+}
+%navigate-section-list-tile-text {
+    @extend %navigate-section-list-text;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    float: left;
+}
+.navigate-section-list-tile {
+    height: 90px;
+    width: 260px;
+    border-radius: 4px;
+    background-color: #1754A9;
+    margin-right: 8px;
+    padding: 16px;
+    display: inline-block;
+    box-sizing: border-box;
+    cursor: pointer;
+}
+.navigate-section-tile-body {
+    @extend %navigate-section-list-tile-text;
+    font-weight: normal;
+}
+.navigate-section-tile-title {
+    @extend %navigate-section-list-tile-text;
+    font-weight: bold;
+}
+.navigate-section-section-header {
+    @extend %navigate-section-list-text;
+    font-weight: bold;
+    margin-bottom: 16px;
+}
+.navigate-section-list {
+    position: relative;
+    margin-top: 36px;
+    margin-bottom: 36px;
+}

css/_popover.scss

@@ -10,14 +10,24 @@
     right: 0;
     width: 100%;
 }
-.popover-mousemove-padding-right {
+
+%vertical-popover-padding {
     height: 100%;
     position: absolute;
-    right: -20;
     top: 0;
     width: 40px;
 }
 
+.popover-mousemove-padding-left {
+    @extend %vertical-popover-padding;
+    left: -20px;
+}
+
+.popover-mousemove-padding-right {
+    @extend %vertical-popover-padding;
+    right: -20px;
+}
+
 /**
  * An invisible element is added to the top of the popover to ensure the mouse
  * stays over the popover when the popover's height is shrunk, which would then

css/_toolbars.scss

@@ -146,7 +146,6 @@
             background: #B8C7E0;
             border-radius: 2px;
             color: $newToolbarBackgroundColor;
-            font-family: -apple-system, BlinkMacSystemFont, $baseFontFamily;
             font-size: 11px;
             font-weight: bold;
             margin-left: 8px;

css/_transcription-subtitles.scss

@@ -0,0 +1,13 @@
+.transcription-subtitles{
+    bottom: 10%;
+    font-size: 16px;
+    font-weight: 1000;
+    opacity: 0.80;
+    position: absolute;
+    text-shadow: 0px 0px 1px rgba(0,0,0,0.3),
+    0px 1px 1px rgba(0,0,0,0.3),
+    1px 0px 1px rgba(0,0,0,0.3),
+    0px 0px 1px rgba(0,0,0,0.3);
+    width: 100%;
+    z-index: $zindex2;
+}

css/_variables.scss

@@ -3,7 +3,7 @@
 /**
  * Style variables
  */
-$baseFontFamily: 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+$baseFontFamily: -apple-system, BlinkMacSystemFont, 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;
 $hangupColor: #bf2117;
 $hangupFontSize: 2em;
 
@@ -144,7 +144,7 @@ $watermarkHeight: 74px;
 /**
  * Welcome page variables.
  */
-$welcomePageDescriptionColor: #fff;
+$welcomePageDescriptionColor: #E6EDFA;
 $welcomePageFontFamily: inherit;
-$welcomePageHeaderBackground: linear-gradient(#165ecc, #44A5FF);
+$welcomePageHeaderBackground: #1D69D4;
 $welcomePageTitleColor: #fff;

css/_videolayout_default.scss

@@ -748,12 +748,10 @@
     margin: 0 auto;
     overflow: hidden;
     pointer-events: none;
-    position: absolute;
     right: 0;
     text-align: center;
     text-overflow: ellipsis;
     top: calc(50% + 30px);
     white-space: nowrap;
     width: 100%;
-    z-index: $zindex3;
 }

css/_welcome_page.scss

@@ -4,15 +4,19 @@ body.welcome-page {
 }
 
 .welcome {
+    background-color: $welcomePageHeaderBackground;
+    display: flex;
+    flex-direction: column;
     font-family: $welcomePageFontFamily;
-    height: 100%;
+    justify-content: space-between;
+    min-height: 100vh;
     position: relative;
 
     .header {
         align-items: center;
-        background: $welcomePageHeaderBackground;
         display: flex;
         flex-direction: column;
+        min-height: fit-content;
         overflow: hidden;
         position: relative;
         text-align: center;
@@ -20,49 +24,42 @@ body.welcome-page {
         .header-text {
             display: flex;
             flex-direction: column;
-            justify-content: space-around;
-            margin-top: 120px;
-            margin-bottom: 20px;
+            margin-top: $watermarkHeight + 80;
+            margin-bottom: 36px;
             max-width: calc(100% - 40px);
-            min-height: 286px;
-            width: 645px;
+            width: 650px;
+            z-index: $zindex2;
         }
 
         .header-text-title {
             color: $welcomePageTitleColor;
-            font-size: 48px;
-            letter-spacing: -1px;
-            line-height: 58px;
-            margin-bottom: 20px;
+            font-size: 2.5rem;
+            font-weight: 500;
+            letter-spacing: 0;
+            line-height: 1.18;
+            margin-bottom: 16px;
         }
 
         .header-text-description {
             color: $welcomePageDescriptionColor;
-            font-size: 20px;
-            line-height: 28px;
-            opacity: 0.8;
+            font-size: 1rem;
+            font-weight: 400;
+            line-height: 24px;
         }
 
-        .header-image {
-            background-image: url(../images/welcome_page/curves.png);
-            background-size: contain;
-            height: 209px;
-            position: absolute;
-            width: 1070px;
-        }
-
-        #new_enter_room {
+        #enter_room {
             align-items: center;
             display: flex;
-            margin-bottom: 20px;
             max-width: calc(100% - 40px);
+            margin-bottom: 20px;
             position: relative;
-            z-index: 2;
+            width: 650px;
+            z-index: $zindex2;
 
             .enter-room-input {
                 display: inline-block;
-                margin-right: 15px;
-                width: 350px;
+                margin-right: 8px;
+                width: 100%;
             }
         }
     }
@@ -70,24 +67,10 @@ body.welcome-page {
     .welcome-page-button {
         font-size: 16px;
     }
-}
 
-.welcome.with-content {
-    .header {
-        min-height: 552px;
-    }
-    .header-image {
-        left: -61px;
-        top: 401px;
-    }
-}
-
-.welcome.without-content {
-    .header {
+    .welcome-watermark {
+        position: absolute;
+        width: 100%;
         height: 100%;
     }
-    .header-image {
-        bottom: -20px;
-        left: 0;
-    }
 }

css/filmstrip/_small_video.scss

@@ -48,4 +48,9 @@
         object-fit: cover;
         overflow: hidden;
     }
+
+    .presence-label {
+        position: absolute;
+        z-index: $zindex3;
+    }
 }

css/filmstrip/_vertical_filmstrip.scss

@@ -127,7 +127,7 @@
 /**
  * Override other styles to support vertical filmstrip mode.
  */
-.vertical-filmstrip.filmstrip-only {
+.filmstrip-only .vertical-filmstrip {
     .filmstrip {
         flex-direction: row-reverse;
     }

css/main.scss

@@ -77,5 +77,6 @@
 @import 'unsupported-browser/main';
 @import 'modals/invite/add-people';
 @import 'deep-linking/main';
-
+@import 'transcription-subtitles';
+@import 'navigate_section_list';
 /* Modules END */

css/modals/device-selection/_device-selection.scss

@@ -103,10 +103,14 @@
         font-size: 14px;
 
         a {
-            color: 4C9AFF;
+            color: #2684FF;
             cursor: pointer;
             text-decoration: none;
         }
+
+        a:hover {
+            color: #B3D4FF;
+        }
     }
 
     .audio-input-preview {

css/modals/invite/_info.scss

@@ -126,11 +126,16 @@
 
 .dial-in-page {
     align-items: center;
+    box-sizing: border-box;
     display: flex;
     flex-direction: column;
     font-size: 24px;
-    height: 100%;
-    justify-content: center;
+    max-height: 100%;
+    overflow: auto;
+    padding: 25px;
+    position: absolute;
+    transform: translateY(-50%);
+    top: 50%;
     width: 100%;
 
     .dial-in-numbers-list {
@@ -140,6 +145,7 @@
 
     .dial-in-conference-id {
         text-align: center;
+        min-width: 200px;
         width: 30%;
     }
 }

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

@@ -155,7 +155,6 @@
 
     .circular-label {
         color: white;
-        font-family: -apple-system, BlinkMacSystemFont, $baseFontFamily;
         font-weight: bold;
         margin-left: 8px;
         opacity: 0.8;

doc/quick-install.md

@@ -4,7 +4,11 @@ This document describes the required steps for a quick Jitsi Meet installation o
 
 Debian Wheezy and other older systems may require additional things to be done. Specifically for Wheezy, [libc needs to be updated](http://lists.jitsi.org/pipermail/users/2015-September/010064.html).
 
-N.B.: All commands are supposed to be run by root. If you are logged in as a regular user with sudo rights, please prepend ___sudo___ to each of the commands.
+N.B.: 
+
+a.) All commands are supposed to be run by root. If you are logged in as a regular user with sudo rights, please prepend ___sudo___ to each of the commands.
+
+b.) You only need to do this if you want to ___host your own Jitsi server___. If you just want to have a video conference with someone, use https://meet.jit.si instead.
 
 ## Basic Jitsi Meet install
 
@@ -59,6 +63,8 @@ org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=<Public.IP.Address>
 See [the documenation of ice4j](https://github.com/jitsi/ice4j/blob/master/doc/configuration.md)
 for details.
 
+By default, anyone who has access to your jitsi instance will be able to start a conferencee: if your server is open to the world, anyone can have a chat with anyone else. If you want to limit the ability to start a conference to registered users, set up a "secure domain". Follow the instructions at https://github.com/jitsi/jicofo#secure-domain.
+
 ### Open a conference
 
 Launch a web browser (Chrome, Chromium or latest Opera) and enter in the URL bar the hostname (or IP address) you used in the previous step.

fonts/jitsi.svg

@@ -72,4 +72,7 @@
 <glyph unicode="&#xe92b;" glyph-name="rec" d="M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512zM581.333 433.782h-110.595v59.233h104.338v40.332h-104.338v56.87h110.595v43.539h-161.665v-243.512h161.665v43.539zM738.771 384c58.849 0 101.802 36.282 106.029 88.933h-49.717c-4.904-26.832-26.888-44.045-56.143-44.045-38.556 0-62.4 31.895-62.4 83.196s23.844 83.027 62.231 83.027c29.086 0 51.239-18.394 56.143-46.407h49.717c-3.72 52.989-48.026 91.296-105.86 91.296-70.855 0-114.485-48.77-114.485-127.916 0-79.314 43.798-128.084 114.485-128.084zM230.27 478.502h41.769l45.489-88.258h57.834l-51.408 96.19c28.072 11.138 44.306 38.138 44.306 69.189 0 48.432-32.976 78.133-86.582 78.133h-102.478v-243.512h51.070v88.258zM230.27 592.58v-74.927h44.813c25.704 0 40.754 13.838 40.754 37.295 0 23.119-15.896 37.632-41.262 37.632h-44.306z" />
 <glyph unicode="&#xe92c;" glyph-name="live" d="M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512zM298.225 430.025h-112.35v206.5h-52.85v-252.525h165.2v46.025zM399.025 384v252.525h-52.85v-252.525h52.85zM591.525 384l84.175 252.525h-56.875l-56.35-193.025h-3.15l-57.4 193.025h-59.675l85.4-252.525h63.875zM886.050 429.15h-114.45v61.425h107.975v41.825h-107.975v58.975h114.45v45.15h-167.3v-252.525h167.3v45.15z" />
 <glyph unicode="&#xe92d;" glyph-name="speaker" d="M0 512c0-282.795 229.205-512 512-512s512 229.205 512 512c0 282.795-229.205 512-512 512s-512-229.205-512-512zM525.005 759.362c-20.475 24.944-16.326 61.342 9.268 81.297s62.94 15.911 83.416-9.033c16.036-19.536 38.593-52.97 60.894-97.797 81.621-164.065 89.461-340.992-26.857-506.352-8.384-11.919-17.386-23.69-27.012-35.307-20.593-24.851-57.959-28.727-83.458-8.657s-29.476 56.487-8.882 81.338c7.686 9.275 14.833 18.621 21.455 28.035 88.66 126.041 82.71 260.306 17.953 390.475-10.599 21.305-21.94 40.51-33.198 57.196-6.515 9.657-11.322 16.057-13.578 18.805zM353.479 647.46c-19.353 24.679-15.129 60.448 9.434 79.893s60.164 15.2 79.517-9.479c9.635-12.287 22.577-32.644 35.209-60.034 50.35-109.176 50.35-231.689-33.639-349.612-18.198-25.551-53.566-31.441-78.997-13.157s-31.294 53.819-13.096 79.37c57.564 80.822 57.564 160.581 22.983 235.565-8.601 18.65-16.892 31.691-21.412 37.455z" />
+<glyph unicode="&#xe92e;" glyph-name="tiles-many" d="M113.778 1024h227.556c62.838 0 113.778-50.94 113.778-113.778v-227.556c0-62.838-50.94-113.778-113.778-113.778h-227.556c-62.838 0-113.778 50.94-113.778 113.778v227.556c0 62.838 50.94 113.778 113.778 113.778zM170.667 910.222c-31.419 0-56.889-25.47-56.889-56.889v-113.778c0-31.419 25.47-56.889 56.889-56.889h113.778c31.419 0 56.889 25.47 56.889 56.889v113.778c0 31.419-25.47 56.889-56.889 56.889h-113.778zM113.778 455.111h227.556c62.838 0 113.778-50.94 113.778-113.778v-227.556c0-62.838-50.94-113.778-113.778-113.778h-227.556c-62.838 0-113.778 50.94-113.778 113.778v227.556c0 62.838 50.94 113.778 113.778 113.778zM170.667 341.333c-31.419 0-56.889-25.47-56.889-56.889v-113.778c0-31.419 25.47-56.889 56.889-56.889h113.778c31.419 0 56.889 25.47 56.889 56.889v113.778c0 31.419-25.47 56.889-56.889 56.889h-113.778zM682.667 1024h227.556c62.838 0 113.778-50.94 113.778-113.778v-227.556c0-62.838-50.94-113.778-113.778-113.778h-227.556c-62.838 0-113.778 50.94-113.778 113.778v227.556c0 62.838 50.94 113.778 113.778 113.778zM739.556 910.222c-31.419 0-56.889-25.47-56.889-56.889v-113.778c0-31.419 25.47-56.889 56.889-56.889h113.778c31.419 0 56.889 25.47 56.889 56.889v113.778c0 31.419-25.47 56.889-56.889 56.889h-113.778zM682.667 455.111h227.556c62.838 0 113.778-50.94 113.778-113.778v-227.556c0-62.838-50.94-113.778-113.778-113.778h-227.556c-62.838 0-113.778 50.94-113.778 113.778v227.556c0 62.838 50.94 113.778 113.778 113.778zM739.556 341.333c-31.419 0-56.889-25.47-56.889-56.889v-113.778c0-31.419 25.47-56.889 56.889-56.889h113.778c31.419 0 56.889 25.47 56.889 56.889v113.778c0 31.419-25.47 56.889-56.889 56.889h-113.778z" />
+<glyph unicode="&#xe92f;" glyph-name="tiles-one" d="M170.667 810.667h682.667c47.128 0 85.333-38.205 85.333-85.333v-426.667c0-47.128-38.205-85.333-85.333-85.333h-682.667c-47.128 0-85.333 38.205-85.333 85.333v426.667c0 47.128 38.205 85.333 85.333 85.333zM213.333 725.333c-23.564 0-42.667-19.103-42.667-42.667v-341.333c0-23.564 19.103-42.667 42.667-42.667h597.333c23.564 0 42.667 19.103 42.667 42.667v341.333c0 23.564-19.103 42.667-42.667 42.667h-597.333z" />
+<glyph unicode="&#xe930;" glyph-name="closed_caption" d="M768 554v44c0 24-18 42-42 42h-128c-24 0-44-18-44-42v-172c0-24 20-42 44-42h128c24 0 42 18 42 42v44h-64v-22h-86v128h86v-22h64zM470 554v44c0 24-20 42-44 42h-128c-24 0-42-18-42-42v-172c0-24 18-42 42-42h128c24 0 44 18 44 42v44h-64v-22h-86v128h86v-22h64zM810 854c46 0 86-40 86-86v-512c0-46-40-86-86-86h-596c-48 0-86 40-86 86v512c0 46 38 86 86 86h596z" />
 </font></defs></svg>

index.android.js

@@ -1,26 +1,2 @@
-// The type field of react-native application loader's React Element is created
-// as number and not Symbol, because it's not been defined by the polyfill yet.
-// We import the application renderer, before Symbol is defined, in order to use
-// number types as well. Otherwise this will result in the invariant exception,
-// because fiber thingy will not recognise root react-native component as React
-// Element, but as an Object.
-//
-// See node_modules/react-native/Libraries/polyfills/babelHelpers.js
-// :babelHelpers.createRawReactElement - that's where first react-native element
-// is created (super early - it's the app loader).
-//
-// See node_modules/react-native/Libraries/Renderer/ReactNativeFiber-dev.js
-// and look for REACT_ELEMENT_TYPE definition - it's defined later when Symbol
-// has been defined and type will not match.
-//
-// As an alternative solution we could stop using/polyfilling Symbols and
-// replace with classpath string constants or some kind of a wrapper around
-// that.
-
-import 'react-native/Libraries/ReactNative/renderApplication';
-
-// Android doesn't provide Symbol
-import 'es6-symbol/implement';
-
 import './react/index.native';
 

interface_config.js

@@ -45,10 +45,10 @@ var interfaceConfig = {
      * jwt.
      */
     TOOLBAR_BUTTONS: [
-        'microphone', 'camera', 'desktop', 'fullscreen', 'fodeviceselection', 'hangup',
-        'profile', 'info', 'chat', 'recording', 'livestreaming', 'etherpad',
-        'sharedvideo', 'settings', 'raisehand', 'videoquality', 'filmstrip',
-        'invite', 'feedback', 'stats', 'shortcuts'
+        'microphone', 'camera', 'closedcaptions', 'desktop', 'fullscreen',
+        'fodeviceselection', 'hangup', 'profile', 'info', 'chat', 'recording',
+        'livestreaming', 'etherpad', 'sharedvideo', 'settings', 'raisehand',
+        'videoquality', 'filmstrip', 'invite', 'feedback', 'stats', 'shortcuts'
     ],
 
     SETTINGS_SECTIONS: [ 'devices', 'language', 'moderator', 'profile' ],
@@ -80,6 +80,14 @@ var interfaceConfig = {
     DISABLE_FOCUS_INDICATOR: false,
     DISABLE_DOMINANT_SPEAKER_INDICATOR: false,
 
+    /**
+     * Whether the speech to text transcription subtitles panel is disabled.
+     * If {@code undefined}, defaults to {@code false}.
+     *
+     * @type {boolean}
+     */
+    DISABLE_TRANSCRIPTION_SUBTITLES: false,
+
     /**
      * Whether the ringing sound in the call/ring overlay is disabled. If
      * {@code undefined}, defaults to {@code false}.
@@ -155,7 +163,14 @@ var interfaceConfig = {
      *
      * @type {boolean}
      */
-    VIDEO_QUALITY_LABEL_DISABLED: false
+    VIDEO_QUALITY_LABEL_DISABLED: false,
+
+    /**
+     * If true, will display recent list
+     *
+     * @type {boolean}
+     */
+    RECENT_LIST_ENABLED: true
 
     /**
      * Specify custom URL for downloading android mobile app.

ios/Podfile

@@ -28,13 +28,15 @@ target 'JitsiMeet' do
 
   pod 'react-native-background-timer',
     :path => '../node_modules/react-native-background-timer'
-  pod 'react-native-fetch-blob',
-    :path => '../node_modules/react-native-fetch-blob'
+  pod 'react-native-fast-image',
+    :path => '../node_modules/react-native-fast-image'
   pod 'react-native-keep-awake',
     :path => '../node_modules/react-native-keep-awake'
   pod 'react-native-locale-detector',
     :path => '../node_modules/react-native-locale-detector'
   pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
+  pod 'ReactNativePermissions',
+    :path => '../node_modules/react-native-permissions'
   pod 'RNSound', :path => '../node_modules/react-native-sound'
   pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
   pod 'react-native-calendar-events',

ios/Podfile.lock

@@ -1,6 +1,7 @@
 PODS:
   - boost-for-react-native (1.63.0)
   - DoubleConversion (1.1.5)
+  - FLAnimatedImage (1.0.12)
   - Folly (2016.09.26.00):
     - boost-for-react-native
     - DoubleConversion
@@ -12,8 +13,11 @@ PODS:
     - React
   - react-native-calendar-events (1.6.0):
     - React
-  - react-native-fetch-blob (0.10.6):
-    - React/Core
+  - react-native-fast-image (4.0.14):
+    - FLAnimatedImage
+    - React
+    - SDWebImage/Core
+    - SDWebImage/GIF
   - react-native-keep-awake (2.0.6):
     - React
   - react-native-locale-detector (1.0.0):
@@ -59,6 +63,8 @@ PODS:
     - React/Core
     - React/fishhook
     - React/RCTBlob
+  - ReactNativePermissions (1.1.1):
+    - React
   - RNSound (0.10.9):
     - React/Core
     - RNSound/Core (= 0.10.9)
@@ -66,6 +72,10 @@ PODS:
     - React/Core
   - RNVectorIcons (4.4.2):
     - React
+  - SDWebImage/Core (4.4.2)
+  - SDWebImage/GIF (4.4.2):
+    - FLAnimatedImage (~> 1.0)
+    - SDWebImage/Core
   - yoga (0.55.4.React)
 
 DEPENDENCIES:
@@ -74,7 +84,7 @@ DEPENDENCIES:
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - react-native-background-timer (from `../node_modules/react-native-background-timer`)
   - react-native-calendar-events (from `../node_modules/react-native-calendar-events`)
-  - react-native-fetch-blob (from `../node_modules/react-native-fetch-blob`)
+  - react-native-fast-image (from `../node_modules/react-native-fast-image`)
   - react-native-keep-awake (from `../node_modules/react-native-keep-awake`)
   - react-native-locale-detector (from `../node_modules/react-native-locale-detector`)
   - react-native-webrtc (from `../node_modules/react-native-webrtc`)
@@ -88,6 +98,7 @@ DEPENDENCIES:
   - React/RCTNetwork (from `../node_modules/react-native`)
   - React/RCTText (from `../node_modules/react-native`)
   - React/RCTWebSocket (from `../node_modules/react-native`)
+  - ReactNativePermissions (from `../node_modules/react-native-permissions`)
   - RNSound (from `../node_modules/react-native-sound`)
   - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
   - yoga (from `../node_modules/react-native/ReactCommon/yoga`)
@@ -95,6 +106,8 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - boost-for-react-native
+    - FLAnimatedImage
+    - SDWebImage
 
 EXTERNAL SOURCES:
   DoubleConversion:
@@ -109,14 +122,16 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-background-timer"
   react-native-calendar-events:
     :path: "../node_modules/react-native-calendar-events"
-  react-native-fetch-blob:
-    :path: "../node_modules/react-native-fetch-blob"
+  react-native-fast-image:
+    :path: "../node_modules/react-native-fast-image"
   react-native-keep-awake:
     :path: "../node_modules/react-native-keep-awake"
   react-native-locale-detector:
     :path: "../node_modules/react-native-locale-detector"
   react-native-webrtc:
     :path: "../node_modules/react-native-webrtc"
+  ReactNativePermissions:
+    :path: "../node_modules/react-native-permissions"
   RNSound:
     :path: "../node_modules/react-native-sound"
   RNVectorIcons:
@@ -127,19 +142,22 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
+  FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
   Folly: 211775e49d8da0ca658aebc8eab89d642935755c
   glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
   React: aa2040dbb6f317b95314968021bd2888816e03d5
   react-native-background-timer: 63dcbf37dbcf294b5c6c071afcdc661fa06a7594
   react-native-calendar-events: fe6fbc8ed337a7423c98f2c9012b25f20444de09
-  react-native-fetch-blob: 63394b1d7b0781547b3e4463b3195790177b1222
+  react-native-fast-image: cba3d9bf9c2cf8ddb643d887a686c53a5dd90a2c
   react-native-keep-awake: 0de4bd66de0c23178107dce0c2fcc3354b2a8e94
   react-native-locale-detector: d1b2c6fe5abb56e3a1efb6c2d6f308c05c4251f1
   react-native-webrtc: 31b6d3f1e3e2ce373aa43fd682b04367250f807d
+  ReactNativePermissions: 9f2d9c45c98800795e6c2ed330e25d11a66a8169
   RNSound: b360b3862d3118ed1c74bb9825696b5957686ac4
   RNVectorIcons: c0dbfbf6068fefa240c37b0f71bd03b45dddac44
+  SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681
   yoga: a23273df0088bf7f2bb7e5d7b00044ea57a2a54a
 
-PODFILE CHECKSUM: fb12a5ae406b901e95aeb1ab5ebbb02773c46ede
+PODFILE CHECKSUM: 1d5c8382f73d9540fac68d93b32e1d3b58d069ee
 
 COCOAPODS: 1.5.3

ios/sdk/src/AudioMode.m

@@ -20,6 +20,9 @@
 #import <React/RCTLog.h>
 
 @interface AudioMode : NSObject<RCTBridgeModule>
+
+@property(nonatomic, strong) dispatch_queue_t workerQueue;
+
 @end
 
 @implementation AudioMode {
@@ -52,15 +55,18 @@ typedef enum {
     if (self) {
         _category = nil;
         _mode = nil;
+
+        dispatch_queue_attr_t attributes =
+        dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL,
+                                                QOS_CLASS_USER_INITIATED, -1);
+        _workerQueue = dispatch_queue_create("WebRTCModule.queue", attributes);
     }
     return self;
 }
 
 - (dispatch_queue_t)methodQueue {
-    // Make sure all our methods run in the main thread.  The route change
-    // notification runs there so this will make sure it will only be fired
-    // after our changes have been applied (when we cause them, that is).
-    return dispatch_get_main_queue();
+    // Use a dedicated queue for audio mode operations.
+    return _workerQueue;
 }
 
 - (void)routeChanged:(NSNotification*)notification {
@@ -70,12 +76,15 @@ typedef enum {
             integerValue];
 
     switch (reason) {
-    case AVAudioSessionRouteChangeReasonCategoryChange:
+    case AVAudioSessionRouteChangeReasonCategoryChange: {
         // The category has changed. Check if it's the one we want and adjust as
-        // needed.
-        [self setCategory:_category mode:_mode error:nil];
+        // needed. This notification is posted on a secondary thread, so make
+        // sure we switch to our worker thread.
+        dispatch_async(_workerQueue, ^{
+            [self setCategory:_category mode:_mode error:nil];
+        });
         break;
-
+    }
     default:
         // Do nothing.
         break;

ios/travis-ci/build-ipa.sh

@@ -130,6 +130,7 @@ cp "${CERT_DIR}/dev-profile.mobileprovision"  ~/Library/MobileDevice/Provisionin
 npm install
 
 cd ios
+pod update
 pod install
 cd ..
 

lang/main-de.json

@@ -1,6 +1,5 @@
 {
-    "contactlist": "__count__ Teilnehmer",
-    "contactlist_plural": "",
+    "contactlist_plural": "__count__ Teilnehmer",
     "passwordSetRemotely": "von einem anderen Teilnehmer gesetzt",
     "poweredby": "Betrieben von",
     "inviteUrlDefaultMsg": "Die Konferenz wird erstellt...",
@@ -23,6 +22,7 @@
         "react-nativeGrantPermissions": "Wählen Sie <b><i>Erlauben</i></b> wenn der Browser um Berechtigungen bittet.",
         "chromeGrantPermissions": "Wählen Sie <b><i>Erlauben</i></b> wenn der Browser um Berechtigungen bittet.",
         "androidGrantPermissions": "Wählen Sie <b><i>Erlauben</i></b> wenn der Browser um Berechtigungen bittet.",
+        "electronGrantPermissions": "Bitte Berechtigungen zur Verwendung der Kamera und des Mikrofons erteilen",
         "firefoxGrantPermissions": "Wählen Sie <b><i>Markiertes Gerät teilen</i></b> wenn der Browser um Berechtigungen bittet.",
         "operaGrantPermissions": "Wählen Sie <b><i>Erlauben</i></b> wenn der Browser um Berechtigungen bittet.",
         "iexplorerGrantPermissions": "Wählen Sie <b><i>OK</i></b> wenn der Browser um Berechtigungen bittet.",
@@ -46,46 +46,20 @@
         "showSpeakerStats": "Statistiken für Sprecher anzeigen"
     },
     "welcomepage": {
-        "disable": "Diesen Hinweis nicht mehr anzeigen",
-        "feature1": {
-            "content": "Kein Download nötig. __app__ läuft direkt im Browser. Einfach die Konferenzadresse teilen und los geht's.",
-            "title": "Einfach zu benutzen"
-        },
-        "feature2": {
-            "content": "Videokonferenzen mit mehreren Teilnehmen mit weniger als 128Kpbs. Bildschirmfreigaben und Telefonkonferenzen kommen sogar mit noch weniger Bandbreite aus.",
-            "title": "Niedrige Bandbreite"
-        },
-        "feature3": {
-            "content": "__app__ steht unter der Apache Lizenz. Es steht ihnen frei __app__ gemäss dieser Lizenz herunterzuladen, zu verändern oder zu verbreiten.",
-            "title": "Open Source"
-        },
-        "feature4": {
-            "content": "Es gibt keine künstlichen Begrenzungen der Anzahl der Konferenz-Teilnehmer. Die Bandbreite und Rechenleistung des Server sind die einzigen Limitierungen.",
-            "title": "Unbegrenzte Anzahl Benutzer"
-        },
-        "feature5": {
-            "content": "Es ist ganz einfach den Bildschirm zu teilen. __app__ ist ideal für Online-Präsentationen, Vorlesungen und Fernwartungsanfragen.",
-            "title": "Bildschirmfreigabe"
-        },
-        "feature6": {
-            "content": "Privatsphäre gewünscht? __app__ Konferenzen können mit einem Passwort geschützt werden um ungebetene Gäste fernzuhalten und Unterbrechungen zu vermeiden.",
-            "title": "Sichere Konferenzen"
-        },
-        "feature7": {
-            "content": "__app__ verwendet Etherpad, ein Editor zur kollaborativen Bearbeitung von Texten.",
-            "title": "Freigegebene Notizen"
-        },
-        "feature8": {
-            "content": "Die Verwendung kann durch die Integration mit Piwik, Google Analytics und anderen Überwachungs- und Statistikprogrammen protokolliert werden.",
-            "title": "Benutzungsstatistiken"
+        "appDescription": "Auf geht's! Beginne eine Videokonferenz mit dem ganzen Team. Oder eigentlich, lade alle ein die du kennst. __app__ ist eine vollständig verschlüsselte, aus 100% Open-Source-Software bestehende Videokonferenzlösung die du den ganzen Tag kostenlos verwenden kannst — ohne Registrierung.",
+        "audioVideoSwitch": {
+            "audio": "Sprache",
+            "video": "Video"
         },
+        "calendar": "Kalender",
         "go": "Los",
         "join": "Beitreten",
         "privacy": "Privatsphäre",
         "roomname": "Konferenzname eingeben",
-        "roomnamePlaceHolder": "Konferenzname",
+        "roomnameHint": "Name oder URL der Konferenz der Sie beitreten möchten. Sie können einen Namen erfinden, er muss nur den anderen Teilnehmern übermittelt werden damit sie der gleichen Konferenz beitreten.",
         "sendFeedback": "Senden Sie uns Ihr Feedback",
-        "terms": "Bedingungen"
+        "terms": "Bedingungen",
+        "title": "Sichere, flexible und vollständig freie Videokonferenzen"
     },
     "startupoverlay": {
         "policyText": "",
@@ -99,22 +73,28 @@
     "toolbar": {
         "addPeople": "Teilnehmer zur Konferenz hinzufügen",
         "audioonly": "Nur-Audio-Modus aktivieren/deaktivieren (spart Bandbreite)",
+        "callQuality": "Qualitätseinstellungen",
+        "enterFullScreen": "Vollbildmodus",
+        "exitFullScreen": "Vollbildmodus verlassen",
+        "feedback": "Feedback hinterlasen",
+        "moreActions": "Weitere Einstellungen",
         "mute": "Stummschaltung aktivieren / deaktivieren",
         "videomute": "Kamera starten / stoppen",
         "authenticate": "Anmelden",
         "lock": "Konferenz schützen / Schutz aufheben",
-        "invite": "Link teilen",
         "chat": "Chat öffnen / schliessen",
         "etherpad": "Geteiltes Dokument öffnen / schliessen",
+        "documentOpen": "Geteiltes Dokument öffnen",
+        "documentClose": "Geteiltes Dokument schliessen",
         "sharedvideo": "YouTube-Video teilen",
-        "sharescreen": "Bildschirmfreigabe starten / stoppen",
+        "sharescreen": "Bildschirmfreigabe",
+        "stopSharedVideo": "YouTube Video stoppen",
         "fullscreen": "Vollbildmodus aktivieren / deaktivieren",
         "sip": "SIP Nummer anrufen",
         "Settings": "Einstellungen",
         "hangup": "Verlassen",
         "login": "Anmelden",
         "logout": "Abmelden",
-        "dialpad": "Wähltastatur öffnen / schliessen",
         "sharedVideoMutedPopup": "Das freigegebene Video wurde stumm geschaltet um mit den anderen Teilnehmern zu sprechen.",
         "micMutedPopup": "Das Mikrofon wurde stumm geschaltet um das freigegebene Video geniessen zu können.",
         "talkWhileMutedPopup": "Versuchen sie zu sprechen? Ihr Mikrofon ist stummgeschaltet.",
@@ -123,17 +103,9 @@
         "micDisabled": "Kein Mikrofon verfügbar",
         "filmstrip": "Videos anzeigen / verbergen",
         "profile": "Profil bearbeiten",
-        "raiseHand": "Hand erheben"
-    },
-    "unsupportedBrowser": {
-        "appNotInstalled": "Mit __app__ auf dem Mobiltelefon teilnehmen.",
-        "downloadApp": "App herunterladen",
-        "openApp": "In __app__ fortfahren"
-    },
-    "bottomtoolbar": {
-        "chat": "Chat öffnen / schliessen",
-        "filmstrip": "Videos anzeigen / verbergen",
-        "contactlist": "Teilnehmerliste und neue Teilnehmer einladen"
+        "raiseHand": "Hand erheben",
+        "shortcuts": "Tastenkürzel anzeigen",
+        "speakerStats": "Sprecher-Statistiken"
     },
     "chat": {
         "nickname": {
@@ -218,10 +190,11 @@
         "grantedToUnknown": "Moderatorenrechte an $t(notify.somebody) vergeben.",
         "muted": "Der Konferenz wurde stumm beigetreten.",
         "mutedTitle": "Stummschaltung aktiv!",
-        "raisedHand": "Möchte sprechen."
+        "raisedHand": "Möchte sprechen.",
+        "suboptimalExperienceTitle": "Browserwarnung",
+        "suboptimalExperienceDescription": "Tut uns leid, aber die Konferenz wird mit __appName__ kein grossartiges Erlebnis. Wir versuchen immer die Situation zu verbessern, bis dahin empfehlen wir aber die Verwendung einer der <a href=\"static/recommendedBrowsers.html\" target=\"_blank\">vollständig unterstützen Browser</a>."
     },
     "dialog": {
-        "add": "Hinzufügen",
         "allow": "Erlauben",
         "kickMessage": "Oh! Sie wurden aus der Konferenz ausgeschlossen.",
         "popupErrorTitle": "Popup blockiert",
@@ -236,7 +209,6 @@
         "copy": "Kopieren",
         "contactSupport": "Support kontaktieren",
         "error": "Fehler",
-        "createPassword": "Passwort erstellen",
         "detectext": "Fehler bei der Erkennung der Bildschirmfreigabeerweiterung.",
         "failedpermissions": "Die Zugriffsberechtigungen auf das Mikrofon und/oder die Kamera konnten nicht eingeholt werden.",
         "conferenceReloadTitle": "Leider ist etwas schiefgegangen.",
@@ -287,10 +259,6 @@
         "Save": "Speichern",
         "recording": "Aufnahme",
         "recordingToken": "Aufnahme-Token eingeben",
-        "passwordCheck": "Sind Sie sicher, dass Sie das Passwort entfernen möchten?",
-        "passwordMsg": "Passwort setzen um die Konferenz zu schützen",
-        "shareLink": "Link zu dieser Konferenz teilen",
-        "yourPassword": "Neues Passwort eingeben",
         "Back": "Zurück",
         "serviceUnavailable": "Dienst nicht verfügbar",
         "gracefulShutdown": "Der Dienst steht momentan wegen Wartungsarbeiten nicht zur Verfügung. Bitte versuchen Sie es später noch einmal.",
@@ -304,15 +272,14 @@
         "tokenAuthFailed": "Sie sind nicht berechtigt dieser Konferenz beizutreten.",
         "displayNameRequired": "Anzeigename ist erforderlich",
         "enterDisplayName": "Geben Sie Ihren Anzeigenamen ein",
-        "extensionRequired": "Erweiterung erforderlich:",
-        "firefoxExtensionPrompt": "Um die Bildschirmfreigabe nutzen zu können, muss eine Firefox-Erweiterung installiert werden. Bitte versuchen Sie es erneut nachdem die <a href='__url__'>Erweiterung installiert</a> wurde.",
         "feedbackHelp": "Ihr Feedback hilft uns die Qualität der Konferenzen zu verbessern.",
         "feedbackQuestion": "Anmerkungen zur Konferenz.",
         "thankYou": "Danke für die Verwendung von __appName__!",
         "sorryFeedback": "Tut uns leid. Möchten Sie uns mehr mitteilen?",
         "liveStreaming": "Live-Streaming",
-        "streamKey": "Streamname/-schlüssel",
+        "streamKey": "Name/Schlüssel für den Stream",
         "startLiveStreaming": "Live-Streaming starten",
+        "startRecording": "Aufnahme starten",
         "stopStreamingWarning": "Sind Sie sicher dass Sie das Live-Streaming stoppen möchten?",
         "stopRecordingWarning": "Sind Sie sicher dass Sie die Aufnahme stoppen möchten?",
         "stopLiveStreaming": "Live-Streaming stoppen",
@@ -321,6 +288,8 @@
         "permissionDenied": "Zugriff verweigert",
         "screenSharingFailedToInstall": "Oh! Die Erweiterung für die Bildschirmfreigabe konnte nicht installiert werden.",
         "screenSharingFailedToInstallTitle": "Bildschirmfreigabe-Erweiterung konnte nicht installiert werden",
+        "screenSharingFirefoxPermissionDeniedError": "Die Bildschirmfreigabe ist leider fehlgeschlagen. Bitte stellen Sie sicher, dass die Berechtigung für die Bildschirmfreigabe im Browser erteilt wurde.",
+        "screenSharingFirefoxPermissionDeniedTitle": "Die Bildschirmfreigabe konnte nicht gestartet werden.",
         "screenSharingPermissionDeniedError": "Oh! Beim Anfordern der Bildschirmfreigabe-Berechtigungen hat etwas nicht funktioniert. Bitte aktualisieren und erneut versuchen.",
         "cameraUnsupportedResolutionError": "Die Kamera unterstützt die erforderliche Auflösung nicht.",
         "cameraUnknownError": "Die Kamera kann aus einem unbekannten Grund nicht verwendet werden.",
@@ -417,14 +386,21 @@
         "busy": "Es werden Resourcen zum Streamen bereitgestellt. Bitte in ein paar Minuten erneut versuchen.",
         "busyTitle": "Alle Streaming-Instanzen sind in Gebrauch",
         "buttonTooltip": "Live-Stream starten / stoppen",
+        "changeSignIn": "Konten wechseln.",
+        "choose": "Live stream auswählen",
+        "chooseCTA": "Streaming-Option auswählen. Sie sind aktuell als __email__ angemeldet.",
+        "enterStreamKey": "Name/Schlüssel für den YouTube Livestream hier eingeben.",
         "error": "Das Live-Streaming ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
+        "errorAPI": "Beim abrufen der YouTube Livestreams ist ein Fehler aufgetreten. Bitte versuchen Sie sich erneut anzumelden.",
         "failedToStart": "Live-Streaming konnte nicht gestartet werden",
         "off": "Live-Streaming gestoppt",
         "on": "Live-Streaming",
         "pending": "Live-Stream wird gestartet...",
         "serviceName": "Live Streaming-Dienst",
-        "streamIdRequired": "Bitte Stream-ID eingeben um das Live-Streaming zu starten.",
-        "streamIdHelp": "Wo ist die Stream-ID zu finden?",
+        "signIn": "Mit Google anmelden",
+        "signInCTA": "Anmelden oder den Name/Schlüssel des YouTube Livestreams eingeben.",
+        "start": "Einen Livestream starten",
+        "streamIdHelp": "Was ist das?",
         "unavailableTitle": "Live-Streaming nicht verfügbar"
     },
     "videoSIPGW": {
@@ -454,26 +430,16 @@
         "selectADevice": "Ein Gerät wählen",
         "testAudio": "Audio testen"
     },
-    "invite": {
-        "addPassword": "Passwort hinzufügen",
-        "callNumber": "__number__ anrufen",
-        "enterID": "Um mit einem Telefon teilzunehmen, geben Sie die Konferenz ID (__conferenceID__) gefolgt von # ein",
-        "howToDialIn": "Wählen Sie eine der folgenden Nummern um via Telefon teilzunehmen und die Konferenz ID",
-        "hidePassword": "Passwort verstecken",
-        "inviteTo": "Teilnehmer zu __conferenceName__ einladen",
-        "invitedYouTo": "Sie wurden von __userName__ zur Konferenz __inviteURL__ eingeladen",
-        "invitePeople": "Einladen",
-        "locked": "Diese Konferenz ist gesperrt. Neue Teilnehmer müssen das Passwort eingeben um beizutreten.",
-        "showPassword": "Passwort anzeigen",
-        "unlocked": "Die Konferenz ist nicht geschützt. Jeder mit dem Link kann der Konferenz beitreten."
-    },
     "videoStatus": {
         "callQuality": "Konferenzqualität",
         "hd": "HD",
+        "hdTooltip": "Video wird in HD angezeigt",
         "highDefinition": "Hohe Auflösung",
-        "labelTooltipVideo": "Aktuelle Videoqualität",
         "labelTooltipAudioOnly": "Nur-Audio Modus aktiv",
+        "labelTooiltipNoVideo": "Kein Video",
+        "labelTooltipVideo": "Aktuelle Videoqualität",
         "ld": "LD",
+        "ldTooltip": "Video wird in niedriger Auflösung angezeigt",
         "lowDefinition": "Niedrige Auflösung",
         "onlyAudioAvailable": "Nur Ton",
         "onlyAudioSupported": "In diesem Browser wird nur Audio unterstützt.",
@@ -481,21 +447,30 @@
         "p2pVideoQualityDescription": "Im Ende-zu-Ende Modus kann die Konferenzqualität nur zwischen hoch und nur-Audio gewählt werden. Andere Einstellungen werden nicht beachtet.",
         "recHighDefinitionOnly": "Hohe Qualität wird bevorzugt.",
         "sd": "SD",
+        "sdTooltip": "Video wird in Standardauflösung angezeigt",
         "standardDefinition": "Standardauflösung",
         "qualityButtonTip": "Empfangene Videoqualität ändern"
     },
     "dialOut": {
-        "dial": "Wählen",
-        "dialOut": "Nummer anrufen",
-        "statusMessage": "ist jetzt __status__",
-        "enterPhone": "Telefonnummer eingeben",
-        "phoneNotAllowed": "Diese Telefonnummer wird leider noch nicht unterstützt!"
+        "statusMessage": "ist jetzt __status__"
     },
     "addPeople": {
-        "add": "Hinzufügen",
+        "add": "Einladen",
+        "countryNotSupported": "Wir unterstützen dieses Land noch nicht.",
+        "countryReminder": "Telefonnummer nicht in den USA? Bitte sicherstellen, dass die Telefonnummer mit dem Ländercode beginnt.",
+        "disabled": "",
+        "invite": "Einladen",
+        "loading": "Suche nach Teilnehmern und Telefonnummern",
+        "loadingNumber": "Telefonnummer wird überprüft",
+        "loadingPeople": "Suche nach einzuladenden Teilnehmern",
         "noResults": "Keine passenden Ergebnisse",
-        "searchPlaceholder": "Nach Teilnehmern und Konferenzen suchen",
-        "title": "Teilnehmer zur Konferenz hinzufügen",
+        "noValidNumbers": "Telefonnummer eingeben",
+        "notAvailable": "Sie können keine Teilnehmer einladen.",
+        "searchNumbers": "Telefonnummern hinzufügen",
+        "searchPeople": "Nach Teilnehmern suchen",
+        "searchPeopleAndNumbers": "Nach Teilnehmen suchen oder deren Telefonnummern hinzufügen",
+        "telephone": "Telefon: __number__",
+        "title": "Teilnehmer zu dieser Konferenz einladen",
         "failedToAdd": "Teilnehmer konnte nicht hinzugefügt werden"
     },
     "inlineDialogFailure": {
@@ -514,14 +489,71 @@
         "average": "Durschnittlich",
         "bad": "Schlecht",
         "good": "Gut",
-        "rateExperience": "Bitte bewerten Sie diese Konferenz.",
+        "detailsLabel": "Sagen Sie uns mehr dazu.",
+        "rateExperience": "Bitte bewerten Sie diese Konferenz",
         "veryBad": "Sehr schlecht",
         "veryGood": "Sehr gut"
     },
     "info": {
-        "copy": "Link kopieren",
-        "invite": "In __app__ einladen",
-        "title": "Konferenz-Zugriffsinformationen",
+        "addPassword": "Passwort hinzufügen",
+        "cancelPassword": "Password abbrechen",
+        "conferenceURL": "Link:",
+        "country": "Land",
+        "dialANumber": "Um dieser Konferenz beizutreten, rufen Sie eine dieser Telefonnummern an und geben die PIN __conferenceID__# ein.",
+        "dialInNumber": "Einwählen:",
+        "dialInConferenceID": "PIN:",
+        "dialInNotSupported": "Tut uns leid, einwählen ist momentan nicht unterstützt.",
+        "genericError": "Es ist leider etwas schiefgegangen.",
+        "inviteLiveStream": "Klicken Sie auf __url__ um den Livestream dieser Konferenz zu öffnen",
+        "invitePhone": "Um der Konferenz telefonisch beizutreten, rufen Sie __number__ and und geben die PIN __conferenceID__# ein",
+        "invitePhoneAlternatives": "Klicken sie auf __url__ um mehr Telefonnummern anzuzeigen",
+        "inviteURL": "Klicken Sie auf __url__ um der Konferenz beizutreten",
+        "liveStreamURL": "Livestream:",
+        "moreNumbers": "Weitere Telefonnummern",
+        "noNumbers": "Keine Telefonnummern verfügbar.",
+        "noPassword": "Kein",
+        "noRoom": "Keine Konferenz für die Einwähl-Informationen angegeben.",
+        "numbers": "Einwählnummern",
+        "password": "Passwort:",
+        "title": "Teilen",
         "tooltip": "Zugriffsinformationen über die Konferenz abrufen"
+    },
+    "settingsView": {
+        "alertOk": "OK",
+        "alertTitle": "Warnung",
+        "alertURLText": "Die angegebene Server URL ist ungültig",
+        "conferenceSection": "Konferenz",
+        "displayName": "Anzeigename",
+        "email": "E-Mail",
+        "header": "Einstellungen",
+        "profileSection": "Profil",
+        "serverURL": "Server URL",
+        "startWithAudioMuted": "Stumm beitreten",
+        "startWithVideoMuted": "Ohne Video beitreten"
+    },
+    "calendarSync": {
+        "later": "Später",
+        "next": "Folgend",
+        "nextMeeting": "Nächste Konferenz",
+        "now": "Jetzt",
+        "permissionButton": "Einstellungen öffnen",
+        "permissionMessage": "Die App benötigt Zugriff auf den Kalender um die Termine und Konferenzen anzuzeigen."
+    },
+    "recentList": {
+        "today": "Heute",
+        "yesterday": "Gestern",
+        "earlier": "Früher"
+    },
+    "sectionList": {
+        "pullToRefresh": "Ziehen um zu aktualisieren"
+    },
+    "deepLinking": {
+        "title": "Die Konferenz wird in __app__ geöffnet...",
+        "description": "Nichts passiert? Wir haben versucht die Konferenz in __app__ zu öffnen. Versuchen Sie es erneut oder treten Sie der Konferenz in __app__ im Web bei.",
+        "tryAgainButton": "Erneut mit der nativen Applikation versuchen",
+        "launchWebButton": "Im Web öffnen",
+        "appNotInstalled": "Sie benötigen die __app__ App um der Konferenz auf dem Smartphone beizutreten.",
+        "downloadApp": "App herunterladen",
+        "openApp": "In der App fortfahren"
     }
 }

lang/main-ptBR.json

@@ -1,24 +1,19 @@
 {
-    "contactlist": "",
-    "contactlist_plural": "",
-    "passwordSetRemotely": "Configurado por outro membro",
-    "connectionsettings": "Configurações de conexão",
+    "contactlist_plural": "__count__ Membros",
+    "passwordSetRemotely": "configurado por outro membro",
     "poweredby": "distribuído por",
-    "feedback": {
-        "average": "Média",
-        "bad": "Ruim",
-        "good": "Boa",
-        "rateExperience": "Por favor, avalie sua experiência na reunião.",
-        "veryBad": "Muito ruim",
-        "veryGood": "Muito boa"
-    },
     "inviteUrlDefaultMsg": "Sua conferência está sendo criada...",
     "me": "eu",
     "speaker": "Orador",
     "raisedHand": "Gostaria de falar",
     "defaultNickname": "ex. João Pedro",
     "defaultLink": "ex.: __url__",
-    "callingName": "__name__",
+    "audioDevices": {
+        "bluetooth": "Bluetooth",
+        "headphones": "Fones de ouvido",
+        "phone": "Celular",
+        "speaker": "Orador"
+    },
     "audioOnly": {
         "audioOnly": "Somente áudio",
         "featureToggleDisabled": "A alternância de __feature__ é desativada enquanto estiver no modo somente de áudio"
@@ -27,6 +22,7 @@
         "react-nativeGrantPermissions": "Selecione <b><i>Permitir</i></b> quando seu navegador perguntar pelas permissões.",
         "chromeGrantPermissions": "Selecione <b><i>Permitir</i></b> quando seu navegador perguntar pelas permissões.",
         "androidGrantPermissions": "Selecione <b><i>Permitir</i></b> quando seu navegador perguntar pelas permissões.",
+        "electronGrantPermissions": "Dê as permissões para usar sua câmera e microfone",
         "firefoxGrantPermissions": "Selecione <b><i>Compartilhar Dispositivos Selecionados</i></b> quando seu navegador perguntar pelas permissões.",
         "operaGrantPermissions": "Selecione <b><i>Permitir</i></b> quando seu navegador perguntar pelas permissões.",
         "iexplorerGrantPermissions": "Selecione <b><i>OK</i></b> quando seu navegador perguntar pelas permissões.",
@@ -50,46 +46,20 @@
         "showSpeakerStats": "Exibir estatísticas do alto falante"
     },
     "welcomepage": {
-        "disable": "Não exibir esta página novamente",
-        "feature1": {
-            "content": "Não precisa baixar nada. __app__ funciona diretamente no seu navegador. Basta compartilhar a URL da sua conferência com outros para começar.",
-            "title": "Simples de usar"
-        },
-        "feature2": {
-            "content": "Conferências de vídeo de multipartes funcionam a partir de 128 kbps. Compartilhamento de tela e conferências apenas com áudio são possíveis com muito menos.",
-            "title": "Largura de banda baixa"
-        },
-        "feature3": {
-            "content": "__app__ é licenciado sob a Licença Apache. Você é livre para baixar, usar, modificar e compartilhar ela com a mesma licença.",
-            "title": "Código aberto"
-        },
-        "feature4": {
-            "content": "Não há restrições artificiais sobre o número de usuários ou membros da conferência. O poder do servidor e a largura de banda são os únicos fatores limitantes.",
-            "title": "Usuários ilimitados"
-        },
-        "feature5": {
-            "content": "É fácil compartilhar sua tela com outros. __app__ é ideal para apresentações online, leituras, e sessões de suporte técnico.",
-            "title": "Compartilhamento de tela"
-        },
-        "feature6": {
-            "content": "Precisa alguma privacidade? Salas de conferência do __app__ podem ser seguras com uma senha para excluir visitantes indesejados e prevenir interrupções.",
-            "title": "Salas seguras"
-        },
-        "feature7": {
-            "content": "__app_ disponibiliza o Etherpad, um editor de texto colaborativo em tempo real, que é ótimo para reuniões rápidas, escrevendo artigos, e mais.",
-            "title": "Notas compartilhadas"
-        },
-        "feature8": {
-            "content": "Aprenda sobre seus usuários através de integração fácil com o Piwik, Google Analytics, e outros sistemas de monitoramento e estatísticas.",
-            "title": "Estatísticas de uso"
+        "appDescription": "Vá em frente, converse por vídeo com toda a equipe. De fato, convide todos que você conhece. __app__ é uma solução de videoconferência totalmente criptografada e 100% de código aberto que você pode usar todos os dias, a cada dia, gratuitamente  — sem necessidade de conta.",
+        "audioVideoSwitch": {
+            "audio": "Voz",
+            "video": "Vídeo"
         },
+        "calendar": "Calendário",
         "go": "IR",
         "join": "Entrar",
         "privacy": "Política de Privacidade",
         "roomname": "Digite o nome da sala",
-        "roomnamePlaceHolder": "Nome da sala",
+        "roomnameHint": "Digite o nome ou a URL da sala que você deseja entrar. Você pode digitar um nome, e apenas deixe para as pessoas que você quer se reunir digitem o mesmo nome.",
         "sendFeedback": "Enviar comentários",
-        "terms": "Termos"
+        "terms": "Termos",
+        "title": "Vídeo conferência mais segura, mais flexível e completamente livre "
     },
     "startupoverlay": {
         "policyText": " ",
@@ -103,22 +73,28 @@
     "toolbar": {
         "addPeople": "Adicionar pessoas à sua chamada",
         "audioonly": "Ativar / desativar modo somente áudio (economiza banda)",
+        "callQuality": "Gerenciar qualidade da chamada",
+        "enterFullScreen": "Ver em tela cheia",
+        "exitFullScreen": "Sair da tela cheia",
+        "feedback": "Deixar feedback",
+        "moreActions": "Mais ações",
         "mute": "Mudo / Não mudo",
         "videomute": "Iniciar ou parar a câmera",
         "authenticate": "Autenticar",
         "lock": "Travar ou destravar a sala",
-        "invite": "Compartilhar o link",
         "chat": "Abrir ou fechar o bate-papo",
         "etherpad": "Abrir ou fechar o documento compartilhado",
+        "documentOpen": "Abrir documento compartilhado",
+        "documentClose": "Fechar documento compartilhado",
         "sharedvideo": "Compartilhar um vídeo do YouTube",
-        "sharescreen": "Iniciar ou parar o compartilhamento de tela",
+        "sharescreen": "Compartilhamento de tela",
+        "stopSharedVideo": "Parar vídeo do YouTube",
         "fullscreen": "Entrar ou sair da tela cheia",
         "sip": "Chamar número SIP",
         "Settings": "Configurações",
         "hangup": "Sair",
         "login": "Iniciar sessão",
         "logout": "Encerrar sessão",
-        "dialpad": "Abrir ou fechar teclado de discagem",
         "sharedVideoMutedPopup": "Seu vídeo compartilhado foi silenciado para que você possa conversar com os outros membros.",
         "micMutedPopup": "Seu microfone foi silenciado para que você aproveite plenamente seu vídeo compartilhado.",
         "talkWhileMutedPopup": "Tentando falar? Você está em mudo.",
@@ -127,19 +103,9 @@
         "micDisabled": "O microfone não está disponível",
         "filmstrip": "Mostrar / ocultar vídeos",
         "profile": "Editar seu perfil",
-        "raiseHand": "Erguer o baixar sua mão"
-    },
-    "unsupportedBrowser": {
-        "appInstalled": "ou se você já tenha isso<br /> <strong>então</strong>",
-        "appNotInstalled": "Você precisa do <strong>__app__</strong> para começar uma conversa no seu celular",
-        "downloadApp": "Baixe o Aplicativo",
-        "joinConversation": "Entrar na conversa",
-        "startConference": "Comece uma conferência"
-    },
-    "bottomtoolbar": {
-        "chat": "Abrir / fechar bate-papo",
-        "filmstrip": "Mostrar / ocultar vídeos",
-        "contactlist": "Veja e convide membros"
+        "raiseHand": "Erguer o baixar sua mão",
+        "shortcuts": "Ver atalhos",
+        "speakerStats": "Estatísticas do Apresentador"
     },
     "chat": {
         "nickname": {
@@ -174,7 +140,7 @@
         "moderator": "Moderador",
         "videomute": "O membro parou a câmera",
         "mute": "O membro está em silêncio",
-        "kick": "Chutar fora",
+        "kick": "Expulsar",
         "muted": "Mudo",
         "domute": "Mudo",
         "flip": "Inverter",
@@ -199,7 +165,7 @@
         "remoteaddress_plural": "Endereços remotos:",
         "transport": "Transporte:",
         "bandwidth": "Largura de banda estimada:",
-        "na": "Volte aqui para informações de conexão uma vez que a conferência inicie",
+        "na": "Volte aqui para informações de conexão após iniciar a conferência",
         "turn": " (virar)",
         "quality": {
             "good": "Boa",
@@ -213,7 +179,9 @@
     "notify": {
         "disconnected": "desconectado",
         "moderator": "Direitos de moderador concedidos!",
-        "connected": "conectado",
+        "connectedOneMember": "__name__ conectado",
+        "connectedTwoMembers": "__first__ e __second__ conectados",
+        "connectedThreePlusMembers": "__name__ e __count__ outros conectados",
         "somebody": "Alguém",
         "me": "Eu",
         "focus": "Foco da conferência",
@@ -222,42 +190,42 @@
         "grantedToUnknown": "Direitos de moderador concedido para $t(notify.somebody)!",
         "muted": "Você iniciou uma conversa em mudo.",
         "mutedTitle": "Você está mudo!",
-        "raisedHand": "Gostaria de falar."
+        "raisedHand": "Gostaria de falar.",
+        "suboptimalExperienceTitle": "Alerta do navegador",
+        "suboptimalExperienceDescription": "Eer ... temos medo de que sua experiência com o __appName__ não seja tão boa aqui. Estamos procurando maneiras de melhorar isso, mas até lá tente usar um dos <a href='static/recommendedBrowsers.html' target='_blank'> navegadores totalmente compatíveis</a>."
     },
     "dialog": {
-        "add": "Adicionar",
         "allow": "Permitir",
-        "kickMessage": "Ouch! Você o chutou para fora da reunião!",
-        "popupErrorTitle": "",
-        "popupError": "",
+        "kickMessage": "Ouch! Você foi expulso da reunião!",
+        "popupErrorTitle": "Popup bloqueado",
+        "popupError": "Seu navegador está bloqueando janelas popup deste site. Habilite os popups nas configurações de segurança no seu navegador e tente novamente.",
         "passwordErrorTitle": "Erro na senha",
         "passwordError": "Esta conversa está protegida atualmente por uma senha. Somente o dono da conferência pode definir a senha.",
         "passwordError2": "Esta conversa não está protegida por senha atualmente. Somente o dono da conferência pode definir a senha.",
         "connectError": "Oops! Alguma coisa está errada e nós não pudemos conectar à conferência.",
         "connectErrorWithMsg": "Oops! Alguma coisa está errada e não podemos conectar à conferência: __msg__",
-        "incorrectPassword": "",
+        "incorrectPassword": "Usuário ou senha incorretos",
         "connecting": "Conectando",
         "copy": "Copiar",
-        "contactSupport": "",
+        "contactSupport": "Contate o suporte",
         "error": "Erro",
-        "createPassword": "Criar uma senha",
-        "detectext": "Erro enquanto tenta detectar a extensão de compartilhamento de tela.",
+        "detectext": "Erro ao detectar a extensão de compartilhamento de tela.",
         "failedpermissions": "Falha ao obter permissões para usar o microfone e/ou câmera local.",
         "conferenceReloadTitle": "Infelizmente, algo deu errado.",
         "conferenceReloadMsg": "Estamos tentando consertar isto. Reconectando em __seconds__ segundos...",
         "conferenceDisconnectTitle": "Você foi desconectado.",
         "conferenceDisconnectMsg": "Você pode querer verificar sua conexão de rede. Reconectando em __seconds__ segundos ...",
-        "dismiss": "",
-        "rejoinNow": "Voltar agora",
-        "maxUsersLimitReachedTitle": "",
-        "maxUsersLimitReached": "",
+        "dismiss": "Dispensar",
+        "rejoinNow": "Reconectar agora",
+        "maxUsersLimitReachedTitle": "Limite máximo de membros alcançado",
+        "maxUsersLimitReached": "O limite para o máximo do número de membros  foi alcançado. A conferência está cheia. Contate o dono da reunião ou tente de novo depois!",
         "lockTitle": "Bloqueio falhou",
         "lockMessage": "Falha ao travar a conferência.",
         "warning": "Atenção",
-        "passwordNotSupportedTitle": "",
-        "passwordNotSupported": "",
+        "passwordNotSupportedTitle": "Senha não suportada",
+        "passwordNotSupported": "Configuração de senha para a reunião não é suportada.",
         "internalErrorTitle": "Erro interno",
-        "internalError": "",
+        "internalError": "Oops! Alguma coisa está errada. O seguinte erro ocorreu: __error__",
         "unableToSwitch": "Impossível trocar o fluxo de vídeo.",
         "SLDFailure": "Oops! Alguma coisa está errada e nós falhamos em silenciar! (Falha do SLD)",
         "SRDFailure": "Oops! Alguma coisa está errada e nós falhamos em parar o vídeo! (Falha do SRD)",
@@ -274,8 +242,8 @@
         "shareVideoLinkError": "Por favor, forneça um link do youtube correto.",
         "removeSharedVideoTitle": "Remover vídeo compartilhado",
         "removeSharedVideoMsg": "Deseja remover seu vídeo compartilhado?",
-        "alreadySharedVideoMsg": "",
-        "alreadySharedVideoTitle": "",
+        "alreadySharedVideoMsg": "Outro membro já está compartilhando um vídeo. Esta conferência permite apenas um vídeo compartilhado por vez.",
+        "alreadySharedVideoTitle": "Somente um vídeo compartilhado é permitido por vez",
         "WaitingForHost": "Esperando o hospedeiro...",
         "WaitForHostMsg": "A conferência <b>__room__</b> não foi iniciada. Se você é o hospedeiro, então autentique-se. Caso contrário, aguarde o hospedeiro chegar.",
         "IamHost": "Eu sou o hospedeiro",
@@ -284,20 +252,16 @@
         "retry": "Tentar novamente",
         "logoutTitle": "Encerrar sessão",
         "logoutQuestion": "Deseja encerrar a sessão e finalizar a conferência?",
-        "sessTerminated": "",
+        "sessTerminated": "Chamada terminada",
         "hungUp": "Você desconectou",
         "joinAgain": "Entrar novamente",
         "Share": "Compartilhar",
         "Save": "Salvar",
         "recording": "Gravando",
         "recordingToken": "Digite o token de gravação",
-        "passwordCheck": "Deseja remover a senha?",
-        "passwordMsg": "Definir uma senha para trancar sua sala",
-        "shareLink": "Compartilhar o link para a chamada",
-        "yourPassword": "Digite a nova senha",
         "Back": "Voltar",
         "serviceUnavailable": "Serviço indisponível",
-        "gracefulShutdown": "Nosso serviço está desligado para manutenção. Por favor, tente mais tarde.",
+        "gracefulShutdown": "O sistema está em manutenção. Por favor tente novamente mais tarde.",
         "Yes": "Sim",
         "reservationError": "Erro de sistema de reserva",
         "reservationErrorMsg": "Código do erro: __code__, mensagem: __msg__",
@@ -306,42 +270,40 @@
         "token": "token",
         "tokenAuthFailedTitle": "Falha de autenticação",
         "tokenAuthFailed": "Desculpe, você não está autorizado a entrar nesta chamada.",
-        "displayNameRequired": "Mostrar o nome é requerido",
+        "displayNameRequired": "Nome de exibição requerido",
         "enterDisplayName": "Digite seu nome de exibição",
-        "extensionRequired": "Extensão requerida:",
-        "firefoxExtensionPrompt": "Você precisa instalar uma extensão do Firefox para compartilhar a tela. Tente novamente depois que você <a href='__url__'>pegá-lo aqui</a>!",
         "feedbackHelp": "Seu retorno nos ajudará a melhorar nossa experiência de vídeo.",
         "feedbackQuestion": "Nos conte sobre sua chamada!",
         "thankYou": "Obrigado por usar o __appName__!",
-        "sorryFeedback": "Lamentamos escutar isso. Gostaria de nos contar mais?",
+        "sorryFeedback": "Sentimos muito pelos transtornos. Poderia nos das mais detalhes?",
         "liveStreaming": "Transmissão ao Vivo",
-        "streamKey": "Nome/chave do fluxo",
-        "startLiveStreaming": "Iniciar transmissão ao vivo",
+        "streamKey": "Chave para transmissão ao vivo",
+        "startLiveStreaming": "Ir ao vivo agora",
+        "startRecording": "Parar gravação",
         "stopStreamingWarning": "Tem certeza que deseja parar a transmissão ao vivo?",
         "stopRecordingWarning": "Tem certeza que deseja parar a gravação?",
         "stopLiveStreaming": "Parar a transmissão ao vivo",
         "stopRecording": "Parar a gravação",
-        "doNotShowWarningAgain": "Não exibir este aviso novamente",
         "doNotShowMessageAgain": "Não mostre esta mensagem novamente",
         "permissionDenied": "Permissão Negada",
-        "screenSharingFailedToInstall": "",
-        "screenSharingFailedToInstallTitle": "",
-        "screenSharingPermissionDeniedError": "",
-        "micErrorPresent": "Ocorreu um erro conectando seu microfone.",
-        "cameraErrorPresent": "Ocorreu um erro conectando sua câmera.",
+        "screenSharingFailedToInstall": "Oops! Falhou a instalação da extensão de compartilhamento de tela.",
+        "screenSharingFailedToInstallTitle": "A extensão de compartilhamento de tela falhou ao instalar",
+        "screenSharingFirefoxPermissionDeniedError": "Algo deu errado enquanto estávamos tentando compartilhar sua tela. Por favor, certifique-se de que você nos deu permissão para fazê-lo. ",
+        "screenSharingFirefoxPermissionDeniedTitle": "Opa! Não foi possível iniciar o compartilhamento de tela.",
+        "screenSharingPermissionDeniedError": "Oops! Alguma coisa está errada com suas permissões de compartilhamento de tela. Recarregue e tente de novo.",
         "cameraUnsupportedResolutionError": "Sua câmera não suporta a resolução de vídeo requerida.",
         "cameraUnknownError": "Não pode usar a câmera por uma razão desconhecida.",
-        "cameraPermissionDeniedError": "Você não tem permissão para usar sua câmera. Você ainda pode entrar na conferência, mas os outros não verão você. Use o botão da câmera na barra de endereço para fixar isto.",
+        "cameraPermissionDeniedError": "Não foi permitido acessar a sua câmera. Você ainda pode entrar na conferência, mas sem exibir o seu vídeo. Clique no botão da câmera para tentar reparar.",
         "cameraNotFoundError": "A câmera não foi encontrada.",
         "cameraConstraintFailedError": "Sua câmera não satisfaz algumas condições necessárias.",
         "micUnknownError": "Não pode usar o microfone por uma razão desconhecida.",
-        "micPermissionDeniedError": "Você não tem permissão para usar seu microfone. Você ainda pode entrar na conferência, mas os outros não ouvirão você. Use o botão da câmera na barra de endereço para fixar isto.",
+        "micPermissionDeniedError": "Não foi permitido acessar o seu microfone. Você ainda pode entrar na conferência, mas sem enviar áudio. Clique no botão do microfone para tentar reparar.",
         "micNotFoundError": "O microfone não foi encontrado.",
         "micConstraintFailedError": "Seu microfone não satisfaz algumas condições necessárias.",
-        "micNotSendingDataTitle": "",
-        "micNotSendingData": "",
-        "cameraNotSendingDataTitle": "",
-        "cameraNotSendingData": "",
+        "micNotSendingDataTitle": "Incapaz de acessar o microfone",
+        "micNotSendingData": "Estamos incapazes de acessar seu microfone. Selecione outro dispositivo do menu de configurações ou tente recarregar a aplicação.",
+        "cameraNotSendingDataTitle": "Incapaz de acessar a câmera",
+        "cameraNotSendingData": "Estamos incapazes de acessar sua câmera. Verifique se outra aplicação está usando este dispositivo, selecione outro dispositivo do menu de configurações ou recarregue a aplicação.",
         "goToStore": "Vá para a loja virtual",
         "externalInstallationTitle": "Extensão requerida",
         "externalInstallationMsg": "Você precisa instalar nossa extensão de compartilhamento de tela.",
@@ -351,7 +313,7 @@
         "muteParticipantBody": "Você não está habilitado para tirar o mudo deles, mas eles podem tirar o mudo deles mesmos a qualquer tempo.",
         "muteParticipantButton": "Mudo",
         "remoteControlTitle": "Conexão de área de trabalho remota",
-        "remoteControlRequestMessage": "Permitirá __user__ controlar remotamente sua área de trabalho?",
+        "remoteControlRequestMessage": "Deseja permitir que __user__ controle remotamente sua área de trabalho?",
         "remoteControlShareScreenWarning": "Note que se você pressionar \"Permitir\" você vai compartilhar sua tela!",
         "remoteControlDeniedMessage": "__user__ rejeitou sua requisição de controle remoto!",
         "remoteControlAllowedMessage": "__user__ aceitou sua requisição de controle remoto!",
@@ -404,30 +366,50 @@
         "ATTACHED": "Anexado"
     },
     "recording": {
-        "busy": "",
-        "busyTitle": "",
+        "busy": "Estamos trabalhando para liberar recursos de gravação. Tente novamente em alguns minutos.",
+        "busyTitle": "Todas as gravações estão atualmente ocupadas",
         "buttonTooltip": "Iniciar / parar gravação",
         "error": "A gravação falhou. Tente novamente.",
         "failedToStart": "Falha ao iniciar a gravação",
         "off": "Gravação parada",
         "on": "Gravando",
         "pending": "Aguardando um participante para iniciar a gravação...",
-        "unavailable": "",
-        "unavailableTitle": ""
+        "serviceName": "Serviço de gravação",
+        "unavailable": "Oops! O __serviceName__ está indisponível. Estamos trabalhando para resolver o problema. Por favor, tente mais tarde.",
+        "unavailableTitle": "Gravação indisponível"
     },
     "liveStreaming": {
-        "busy": "",
-        "busyTitle": "",
-        "buttonTooltip": "",
-        "error": "",
-        "failedToStart": "",
-        "off": "",
+        "busy": "Estamos trabalhando para liberar os recursos de transmissão. Tente novamente em alguns minutos.",
+        "busyTitle": "Todas as transmissões estão atualmente ocupadas",
+        "buttonTooltip": "Iniciar / Parar transmissão ao vivo",
+        "changeSignIn": "Alternar contas.",
+        "choose": "Escolha uma transmissão ao vivo",
+        "chooseCTA": "Escolha uma opção de transmissão. Você está conectado atualmente como __email__.",
+        "enterStreamKey": "Insira sua chave de transmissão ao vivo do YouTube aqui.",
+        "error": "Falha na transmissão ao vivo. Tente de novo.",
+        "errorAPI": "Ocorreu um erro ao acessar suas transmissões do YouTube. Por favor tente logar novamente.",
+        "failedToStart": "Falha ao iniciar a transmissão ao vivo",
+        "off": "Transmissão ao vivo encerrada",
         "on": "Transmissão ao Vivo",
         "pending": "Iniciando Transmissão ao Vivo...",
-        "streamIdRequired": "",
-        "streamIdHelp": "Aonde eu encontro isto?",
-        "unavailable": "",
-        "unavailableTitle": ""
+        "serviceName": "Serviço de Transmissão ao Vivo",
+        "signIn": "Faça login no Google",
+        "signInCTA": "Faça login ou insira sua chave de transmissão ao vivo do YouTube.",
+        "start": "Iniciar uma transmissão ao vivo",
+        "streamIdHelp": "O que é isso?",
+        "unavailableTitle": "Transmissão ao vivo indisponível"
+    },
+    "videoSIPGW": {
+        "busy": "Estamos trabalhando para liberar recursos. Por favor, tente novamente em alguns minutos.",
+        "busyTitle": "O serviço da sala está ocupado",
+        "errorInvite": "A conferência ainda não foi estabelecida. Por favor, tente mais tarde.",
+        "errorInviteTitle": "Erro no convite da sala",
+        "errorAlreadyInvited": "__displayName__ já convidado",
+        "errorInviteFailedTitle": "Convite para __displayName__ falhou",
+        "errorInviteFailed": "Estamos trabalhando para resolver o problema. Por favor, tente mais tarde.",
+        "pending": "__displayName__ foi convidado",
+        "serviceName": "Serviço da sala",
+        "unavailableTitle": "Serviço da sala indisponível"
     },
     "speakerStats": {
         "hours": "__count__h",
@@ -444,46 +426,47 @@
         "selectADevice": "Selecione um dispositivo",
         "testAudio": "Testar o som"
     },
-    "invite": {
-        "addPassword": "Adicionar uma senha",
-        "callNumber": "Ligar para __number__",
-        "enterID": "Digite o ID da Conferência: __conferenceID__ seguido de # em um telefone para participar",
-        "howToDialIn": "Para participar, use um dos números a seguir e o ID da conferência",
-        "hidePassword": "Esconder a senha",
-        "inviteTo": "Convidar pessoas para __conferenceName__",
-        "invitedYouTo": "__userName__ o convidou para a conferência __inviteURL__",
-        "invitePeople": "",
-        "locked": "Esta chamada está travada. Novos participantes precisam ter o link e digitar a senha para entrar.",
-        "showPassword": "Mostrar senha",
-        "unlocked": "Esta chamada está destravada. Qualquer novo participante com o link pode participar."
-    },
     "videoStatus": {
         "callQuality": "Qualidade da Chamada",
         "hd": "HD",
+        "hdTooltip": "Ver vídeo em alta definição",
         "highDefinition": "Alta definição (HD)",
-        "labelTooltipVideo": "Qualidade do vídeo atual",
         "labelTooltipAudioOnly": "Modo somente de áudio habilitado",
+        "labelTooiltipNoVideo": "Sem vídeo",
+        "labelTooltipVideo": "Qualidade do vídeo atual",
         "ld": "LD",
+        "ldTooltip": "Ver vídeo em baixa definição",
         "lowDefinition": "Baixa definição (LD)",
+        "onlyAudioAvailable": "Somente áudio disponível",
+        "onlyAudioSupported": "Suportamos somente áudio neste navegador.",
         "p2pEnabled": "Ponto-a-ponto habilitada",
         "p2pVideoQualityDescription": "Em modo ponto-a-ponto, qualidade de chamadas recebidas podem somente ser modificada entre alta definição e áudio somente. Outras configurações não serão honradas até sair do ponto-a-ponto.",
         "recHighDefinitionOnly": "Preferência para alta definição",
         "sd": "SD",
+        "sdTooltip": "Ver vídeo em definição padrão",
         "standardDefinition": "Definição padrão",
         "qualityButtonTip": "Trocar a qualidade de vídeo recebido"
     },
     "dialOut": {
-        "dial": "Discar",
-        "dialOut": "",
-        "statusMessage": "está agora __status__",
-        "enterPhone": "Digite o número do telefone",
-        "phoneNotAllowed": "Oh, ainda não temos suporte para esse destino! Desculpe!"
+        "statusMessage": "está agora __status__"
     },
     "addPeople": {
-        "add": "Adicionar",
+        "add": "Convidar",
+        "countryNotSupported": "Ainda não suportamos este destino.",
+        "countryReminder": "Ligando fora dos EUA? Por favor, certifique-se de começar com o código do país!",
+        "disabled": "Você não pode convidar pessoas.",
+        "invite": "Convidar",
+        "loading": "Procurando por pessoas e números de telefone",
+        "loadingNumber": "Validando o número de telefone",
+        "loadingPeople": "Procurando por pessoas para convidar",
         "noResults": "Nenhum resultado de busca correspondente",
-        "searchPlaceholder": "Encontrar por pessoas e salas para adicionar",
-        "title": "Adicionar pessoas à sua chamada",
+        "noValidNumbers": "Por favor, digite um número de telefone",
+        "notAvailable": "Você não pode convidar pessoas.",
+        "searchNumbers": "Adicionar números de telefones",
+        "searchPeople": "Pesquisar pessoas",
+        "searchPeopleAndNumbers": "Pesquisar por pessoas ou adicionar seus números de telefone",
+        "telephone": "Telefone: __number__",
+        "title": "Convide pessoas para sua reunião",
         "failedToAdd": "Falha ao adicionar membros."
     },
     "inlineDialogFailure": {
@@ -493,15 +476,80 @@
         "supportMsg": "Se isso continuar acontecendo, chegar a"
     },
     "deviceError": {
-        "cameraError": "",
-        "microphoneError": "",
+        "cameraError": "Falha ao acessar sua câmera",
+        "microphoneError": "Falha ao acessar seu microfone",
         "cameraPermission": "Erro ao obter permissão para a câmera",
         "microphonePermission": "Erro ao obter permissão para o microfone"
     },
+    "feedback": {
+        "average": "Média",
+        "bad": "Ruim",
+        "good": "Boa",
+        "detailsLabel": "Nos conte mais sobre isso.",
+        "rateExperience": "Avalie sua experiência na reunião",
+        "veryBad": "Muito ruim",
+        "veryGood": "Muito boa"
+    },
     "info": {
-        "copy": "Copiar link",
-        "invite": "Convidar em __app__",
-        "title": "Informações de acesso à chamada",
+        "addPassword": "Adicionar uma senha",
+        "cancelPassword": "Cancelar senha",
+        "conferenceURL": "Link:",
+        "country": "País",
+        "dialANumber": "Para participar da sua reunião, disque um desses números e insira o PIN: __conferenceID__#",
+        "dialInNumber": "Discar:",
+        "dialInConferenceID": "PIN:",
+        "dialInNotSupported": "Desculpe, a discagem não é atualmente suportada.",
+        "genericError": "Oops, alguma coisa deu errado.",
+        "inviteLiveStream": "Para ver a transmissão ao vivo da reunião, clique no link: __url__",
+        "invitePhone": "Para participar por telefone, disque __number__ e insira este PIN: __conferenceID__#",
+        "invitePhoneAlternatives": "Para ver mais números de telefone, clique neste link: __url__",
+        "inviteURL": "Para se juntar à reunião, clique neste link: __url__",
+        "liveStreamURL": "Transmissão ao vivo:",
+        "moreNumbers": "Mais números",
+        "noNumbers": "Sem números de discagem.",
+        "noPassword": "Nenhum",
+        "noRoom": "Nenhuma sala foi especificada para entrar.",
+        "numbers": "Números de discagem",
+        "password": "Senha:",
+        "title": "Compartilhar",
         "tooltip": "Obtenha informações de acesso sobre a reunião"
+    },
+    "settingsView": {
+        "alertOk": "OK",
+        "alertTitle": "Atenção",
+        "alertURLText": "A URL digitada do servidor é inválida",
+        "conferenceSection": "Conferência",
+        "displayName": "Nome de exibição",
+        "email": "E-mail",
+        "header": "Configurações",
+        "profileSection": "Perfil",
+        "serverURL": "URL do servidor",
+        "startWithAudioMuted": "Iniciar sem áudio",
+        "startWithVideoMuted": "Iniciar sem vídeo"
+    },
+    "calendarSync": {
+        "later": "Depois",
+        "next": "Recebendo",
+        "nextMeeting": "próxima reunião",
+        "now": "Agora",
+        "permissionButton": "Abrir configurações",
+        "permissionMessage": "Permissão do calendário é requerida para listar suas reuniões na aplicação."
+    },
+    "recentList": {
+        "today": "Hoje",
+        "yesterday": "Ontem",
+        "earlier": "Mais cedo"
+    },
+    "sectionList": {
+        "pullToRefresh": "Puxe para atualizar"
+    },
+    "deepLinking": {
+        "title": "Iniciando sua reunião no __app__...",
+        "description": "Nada acontece? Estamos tentando iniciar sua reunião no aplicativo desktop __app__. Tente novamente ou inicie ele na aplicação web __app__.",
+        "tryAgainButton": "Tente novamente no desktop",
+        "launchWebButton": "Iniciar na web",
+        "appNotInstalled": "Você precisa do aplicativo móvel __app__ para participar da reunião no seu telefone.",
+        "downloadApp": "Baixe o Aplicativo",
+        "openApp": "Continue na aplicação"
     }
 }

lang/main.json

@@ -64,7 +64,7 @@
         "roomnameHint": "Enter the name or URL of the room you want to join. You may make a name up, just let the people you are meeting know it so that they enter the same name.",
         "sendFeedback": "Send feedback",
         "terms": "Terms",
-        "title": "More secure, more flexible, and completely free video conferencing"
+        "title": "More secure, more flexible, and completely free video conferencing."
     },
     "startupoverlay": {
         "policyText": " ",
@@ -81,6 +81,7 @@
             "audioRoute": "Select the sound device",
             "callQuality": "Manage call quality",
             "chat": "Toggle chat window",
+            "cc": "Toggle subtitles",
             "document": "Toggle shared document",
             "feedback": "Leave feedback",
             "fullScreen": "Toggle full screen",
@@ -381,7 +382,8 @@
         "shareYourScreenDisabled": "Screen sharing disabled.",
         "shareYourScreenDisabledForGuest": "Guests can't screen share.",
         "yourEntireScreen": "Your entire screen",
-        "applicationWindow": "Application window"
+        "applicationWindow": "Application window",
+        "transcribing": "Transcribing"
     },
     "email":
     {
@@ -448,6 +450,16 @@
         "unavailable": "Oops! The __serviceName__ is currently unavailable. We're working on resolving the issue. Please try again later.",
         "unavailableTitle": "Recording unavailable"
     },
+    "transcribing":
+    {
+        "pending" : "Preparing to transcribe the meeting...",
+        "off" : "Transcribing stopped",
+        "error": "Transcribing failed. Please try again.",
+        "failedToStart": "Transcribing failed to start",
+        "tr": "TR",
+        "labelToolTip": "The meeting is being transcribed",
+        "ccButtonTooltip": "Start / Stop showing subtitles"
+    },
     "liveStreaming":
     {
         "busy": "We're working on freeing streaming resources. Please try again in a few minutes.",
@@ -614,9 +626,7 @@
         "permissionMessage": "The Calendar permission is required to see your meetings in the app."
     },
     "recentList": {
-        "today": "Today",
-        "yesterday": "Yesterday",
-        "earlier": "Earlier"
+        "joinPastMeeting": "Join A Past Meeting"
     },
     "sectionList": {
         "pullToRefresh": "Pull to refresh"
@@ -643,5 +653,17 @@
         "rejected": "Rejected",
         "ignored": "Ignored",
         "expired": "Expired"
+    },
+    "dateUtils": {
+        "today": "Today",
+        "yesterday": "Yesterday",
+        "earlier": "Earlier"
+    },
+    "incomingCall": {
+        "answer": "Answer",
+        "audioCallTitle": "Incoming call",
+        "decline": "Dismiss",
+        "productLabel": "from Jitsi Meet",
+        "videoCallTitle": "Incoming video call"
     }
 }

logging_config.js

@@ -1,7 +1,6 @@
 /* eslint-disable no-unused-vars, no-var */
+
 // Logging configuration
-// XXX When making any changes to this file make sure to also update it's React
-// version at ./react/features/base/logging/reducer.js !!!
 var loggingConfig = {
     // default log level for the app and lib-jitsi-meet
     defaultLogLevel: 'trace',
@@ -11,9 +10,17 @@ var loggingConfig = {
 
     // The following are too verbose in their logging with the
     // {@link #defaultLogLevel}:
+    'modules/RTC/TraceablePeerConnection.js': 'info',
     'modules/statistics/CallStats.js': 'info',
-    'modules/xmpp/strophe.util.js': 'log',
-    'modules/RTC/TraceablePeerConnection.js': 'info'
+    'modules/xmpp/strophe.util.js': 'log'
 };
 
 /* eslint-enable no-unused-vars, no-var */
+
+// XXX Web/React server-includes logging_config.js into index.html.
+// Mobile/react-native requires it in react/features/base/logging. For the
+// purposes of the latter, (try to) export loggingConfig. The following
+// detection of a module system is inspired by webpack.
+typeof module === 'object'
+    && typeof exports === 'object'
+    && (module.exports = loggingConfig);

modules/API/API.js

@@ -112,11 +112,21 @@ function initCommands() {
         const { name } = request;
 
         switch (name) {
-        case 'invite':
+        case 'invite': // eslint-disable-line no-case-declarations
+            const { invitees } = request;
+
+            if (!Array.isArray(invitees) || invitees.length === 0) {
+                callback({
+                    error: new Error('Unexpected format of invitees')
+                });
+
+                break;
+            }
+
             // The store should be already available because API.init is called
             // on appWillMount action.
             APP.store.dispatch(
-                invite(request.invitees, true))
+                invite(invitees, true))
                 .then(failedInvitees => {
                     let error;
                     let result;

modules/API/external/external_api.js

@@ -238,7 +238,9 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
                 }
             })
         });
-        this.invite(invitees);
+        if (Array.isArray(invitees) && invitees.length > 0) {
+            this.invite(invitees);
+        }
         this._isLargeVideoVisible = true;
         this._numberOfParticipants = 0;
         this._participants = {};
@@ -597,6 +599,10 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
      * @returns {Promise} - Resolves on success and rejects on failure.
      */
     invite(invitees) {
+        if (!Array.isArray(invitees) || invitees.length === 0) {
+            return Promise.reject(new TypeError('Invalid Argument'));
+        }
+
         return this._transport.sendRequest({
             name: 'invite',
             invitees

modules/UI/UI.js

@@ -16,7 +16,6 @@ import SharedVideoManager from './shared_video/SharedVideo';
 import VideoLayout from './videolayout/VideoLayout';
 import Filmstrip from './videolayout/Filmstrip';
 
-import { updateDeviceList } from '../../react/features/base/devices';
 import { JitsiTrackErrors } from '../../react/features/base/lib-jitsi-meet';
 import {
     getLocalParticipant,
@@ -321,11 +320,6 @@ UI.start = function() {
         SidePanels.init(eventEmitter);
     }
 
-    const filmstripTypeClassname = interfaceConfig.VERTICAL_FILMSTRIP
-        ? 'vertical-filmstrip' : 'horizontal-filmstrip';
-
-    $('body').addClass(filmstripTypeClassname);
-
     document.title = interfaceConfig.APP_NAME;
 };
 
@@ -803,10 +797,8 @@ UI.onLocalRaiseHandChanged = function(isRaisedHand) {
 
 /**
  * Update list of available physical devices.
- * @param {object[]} devices new list of available devices
  */
-UI.onAvailableDevicesChanged = function(devices) {
-    APP.store.dispatch(updateDeviceList(devices));
+UI.onAvailableDevicesChanged = function() {
     APP.conference.updateAudioIconEnabled();
     APP.conference.updateVideoIconEnabled();
 };

modules/UI/shared_video/SharedVideoThumb.js

@@ -50,10 +50,14 @@ SharedVideoThumb.prototype.createContainer = function(spanId) {
     displayNameContainer.className = 'displayNameContainer';
     container.appendChild(displayNameContainer);
 
-    const remotes = document.getElementById('filmstripRemoteVideosContainer');
+    const remoteVideosContainer
+        = document.getElementById('filmstripRemoteVideosContainer');
+    const localVideoContainer
+        = document.getElementById('localVideoTileViewContainer');
 
+    remoteVideosContainer.insertBefore(container, localVideoContainer);
 
-    return remotes.appendChild(container);
+    return container;
 };
 
 /**

modules/UI/videolayout/RemoteVideo.js

@@ -163,6 +163,8 @@ RemoteVideo.prototype._generatePopupContent = function() {
     const onVolumeChange = this._setAudioVolume;
     const { isModerator } = APP.conference;
     const participantID = this.id;
+    const menuPosition = interfaceConfig.VERTICAL_FILMSTRIP
+        ? 'left bottom' : 'top center';
 
     ReactDOM.render(
         <Provider store = { APP.store }>
@@ -172,6 +174,7 @@ RemoteVideo.prototype._generatePopupContent = function() {
                         initialVolumeValue = { initialVolumeValue }
                         isAudioMuted = { this.isAudioMuted }
                         isModerator = { isModerator }
+                        menuPosition = { menuPosition }
                         onMenuDisplay
                             = {this._onRemoteVideoMenuDisplay.bind(this)}
                         onRemoteControlToggle = { onRemoteControlToggle }
@@ -642,10 +645,14 @@ RemoteVideo.createContainer = function(spanId) {
         <div class ='presence-label-container'></div>
         <span class = 'remotevideomenu'></span>`;
 
-    const remotes = document.getElementById('filmstripRemoteVideosContainer');
+    const remoteVideosContainer
+        = document.getElementById('filmstripRemoteVideosContainer');
+    const localVideoContainer
+        = document.getElementById('localVideoTileViewContainer');
 
+    remoteVideosContainer.insertBefore(container, localVideoContainer);
 
-    return remotes.appendChild(container);
+    return container;
 };
 
 export default RemoteVideo;

modules/UI/videolayout/VideoLayout.js

@@ -854,6 +854,9 @@ const VideoLayout = {
     resizeVideoArea(
             forceUpdate = false,
             animate = false) {
+        // Resize the thumbnails first.
+        this.resizeThumbnails(forceUpdate);
+
         if (largeVideo) {
             largeVideo.updateContainerSize();
             largeVideo.resize(animate);
@@ -866,9 +869,6 @@ const VideoLayout = {
         if (availableWidth < 0 || availableHeight < 0) {
             return;
         }
-
-        // Resize the thumbnails first.
-        this.resizeThumbnails(forceUpdate);
     },
 
     getSmallVideo(id) {
@@ -960,7 +960,7 @@ const VideoLayout = {
             // FIXME video type is not the same thing as container type
 
             if (id !== currentId && videoType === VIDEO_CONTAINER_TYPE) {
-                eventEmitter.emit(UIEvents.SELECTED_ENDPOINT, id);
+                APP.API.notifyOnStageParticipantChanged(id);
             }
 
             let oldSmallVideo;

modules/devices/mediaDeviceHelper.js

@@ -2,10 +2,6 @@
 
 import { getAudioOutputDeviceId } from '../../react/features/base/devices';
 
-let currentAudioInputDevices,
-    currentAudioOutputDevices,
-    currentVideoInputDevices;
-
 /**
  * Determines if currently selected audio output device should be changed after
  * list of available devices has been changed.
@@ -105,47 +101,6 @@ function getNewVideoInputDevice(newDevices, localVideo) {
 }
 
 export default {
-    /**
-     * Returns list of devices of single kind.
-     * @param {MediaDeviceInfo[]} devices
-     * @param {'audioinput'|'audiooutput'|'videoinput'} kind
-     * @returns {MediaDeviceInfo[]}
-     */
-    getDevicesFromListByKind(devices, kind) {
-        return devices.filter(d => d.kind === kind);
-    },
-
-    /**
-     * Stores lists of current 'audioinput', 'videoinput' and 'audiooutput'
-     * devices.
-     * @param {MediaDeviceInfo[]} devices
-     */
-    setCurrentMediaDevices(devices) {
-        currentAudioInputDevices
-            = this.getDevicesFromListByKind(devices, 'audioinput');
-        currentVideoInputDevices
-            = this.getDevicesFromListByKind(devices, 'videoinput');
-        currentAudioOutputDevices
-            = this.getDevicesFromListByKind(devices, 'audiooutput');
-    },
-
-    /**
-     * Returns lists of current 'audioinput', 'videoinput' and 'audiooutput'
-     * devices.
-     * @returns {{
-     *  audioinput: (MediaDeviceInfo[]|undefined),
-     *  videoinput: (MediaDeviceInfo[]|undefined),
-     *  audiooutput: (MediaDeviceInfo[]|undefined),
-     *  }}
-     */
-    getCurrentMediaDevices() {
-        return {
-            audioinput: currentAudioInputDevices,
-            videoinput: currentVideoInputDevices,
-            audiooutput: currentAudioOutputDevices
-        };
-    },
-
     /**
      * Determines if currently selected media devices should be changed after
      * list of available devices has been changed.

modules/util/helpers.js

@@ -1,5 +1,3 @@
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 /**
  * Create deferred object.
  *
@@ -15,14 +13,3 @@ export function createDeferred() {
 
     return deferred;
 }
-
-/**
- * Prints the error and reports it to the global error handler.
- *
- * @param e {Error} the error
- * @param msg {string} [optional] the message printed in addition to the error
- */
-export function reportError(e, msg = '') {
-    logger.error(msg, e);
-    window.onerror && window.onerror(msg, null, null, null, e);
-}

package-lock.json

@@ -3003,6 +3003,11 @@
         "sdp-transform": "2.3.0"
       }
     },
+    "@webcomponents/url": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@webcomponents/url/-/url-0.7.1.tgz",
+      "integrity": "sha512-9oFDpuZ+tAogjPYQPhNEX86Npzb73A4kv9DOPsSO9aWoWgoevoP6eKx+TKMwO8BJxtTpSM9nKenHQTJ56SP2Cw=="
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -5568,11 +5573,6 @@
         "randomfill": "^1.0.3"
       }
     },
-    "crypto-js": {
-      "version": "3.1.9-1",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
-      "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg="
-    },
     "css-color-list": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/css-color-list/-/css-color-list-0.0.1.tgz",
@@ -5727,6 +5727,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+      "dev": true,
       "requires": {
         "es5-ext": "^0.10.9"
       }
@@ -6231,6 +6232,7 @@
       "version": "0.10.39",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz",
       "integrity": "sha512-AlaXZhPHl0po/uxMx1tyrlt1O86M6D5iVaDH8UgLfgek4kXTX6vzsRfJQWC2Ku+aG8pkw1XWzh9eTkwfVrsD5g==",
+      "dev": true,
       "requires": {
         "es6-iterator": "~2.0.3",
         "es6-symbol": "~3.1.1"
@@ -6240,6 +6242,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
       "requires": {
         "d": "1",
         "es5-ext": "^0.10.35",
@@ -6277,6 +6280,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "dev": true,
       "requires": {
         "d": "1",
         "es5-ext": "~0.10.14"
@@ -9455,7 +9459,7 @@
     },
     "jitsi-meet-logger": {
       "version": "github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e",
-      "from": "jitsi-meet-logger@github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e"
+      "from": "github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e"
     },
     "jquery": {
       "version": "3.3.1",
@@ -9519,6 +9523,11 @@
       "dev": true,
       "optional": true
     },
+    "jsc-android": {
+      "version": "224109.1.0",
+      "resolved": "https://registry.npmjs.org/jsc-android/-/jsc-android-224109.1.0.tgz",
+      "integrity": "sha512-mhALFynePc/wJsUt9BJuH13mSK/dGWtBO/pcYwVV1I0A7iduyqy3fSoAt1b0yI+/B3TzlGyue/gqjPxsqG1HRQ=="
+    },
     "jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -9710,8 +9719,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "github:jitsi/lib-jitsi-meet#05b7ae60dc669a69b293fb0e93688fc0a78adb80",
-      "from": "github:jitsi/lib-jitsi-meet#05b7ae60dc669a69b293fb0e93688fc0a78adb80",
+      "version": "github:jitsi/lib-jitsi-meet#2be752fc88ff71e454c6b9178b21a33b59c53f41",
+      "from": "github:jitsi/lib-jitsi-meet#2be752fc88ff71e454c6b9178b21a33b59c53f41",
       "requires": {
         "@jitsi/sdp-interop": "0.1.13",
         "@jitsi/sdp-simulcast": "0.2.1",
@@ -10502,6 +10511,11 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.4.tgz",
       "integrity": "sha512-1xFTAknSLfc47DIxHDUbnJWC+UwgWxATmymaxIPQpmMh7LBm7ZbwVEsuushqwL2GYZU0jie4xO+TK44hJPjNSQ=="
     },
+    "moment-duration-format": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.2.2.tgz",
+      "integrity": "sha1-uVdhLeJgFsmtnrYIfAVFc+USd3k="
+    },
     "morgan": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz",
@@ -12699,7 +12713,7 @@
     },
     "react-native-calendar-events": {
       "version": "github:jitsi/react-native-calendar-events#cad37355f36d17587d84af72b0095e8cc5fd3df9",
-      "from": "react-native-calendar-events@github:jitsi/react-native-calendar-events#cad37355f36d17587d84af72b0095e8cc5fd3df9"
+      "from": "github:jitsi/react-native-calendar-events#cad37355f36d17587d84af72b0095e8cc5fd3df9"
     },
     "react-native-callstats": {
       "version": "3.52.0",
@@ -12710,35 +12724,12 @@
         "jssha": "^2.2.0"
       }
     },
-    "react-native-fetch-blob": {
-      "version": "github:joltup/react-native-fetch-blob#1f9a1761aea4e37bd672bd0d233f3adf0e113a11",
-      "from": "react-native-fetch-blob@github:joltup/react-native-fetch-blob#1f9a1761aea4e37bd672bd0d233f3adf0e113a11",
+    "react-native-fast-image": {
+      "version": "4.0.14",
+      "resolved": "https://registry.npmjs.org/react-native-fast-image/-/react-native-fast-image-4.0.14.tgz",
+      "integrity": "sha512-MeRgL70JxoY/hn8ZRGBsDED9SGvTEeznneL//fWZyLaG0CM+w2CH4QXAMvADnIvu2RFd8WQWNii6c6VOpVe4Tg==",
       "requires": {
-        "base-64": "0.1.0",
-        "glob": "7.0.6"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.0.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.2",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "react-native-img-cache": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/react-native-img-cache/-/react-native-img-cache-1.5.2.tgz",
-      "integrity": "sha1-6HG4MJk3t/mSbgmwFuTk5nWKOfo=",
-      "requires": {
-        "crypto-js": "^3.1.9-1"
+        "prop-types": "^15.5.10"
       }
     },
     "react-native-immersive": {
@@ -12751,9 +12742,22 @@
       "resolved": "https://registry.npmjs.org/react-native-keep-awake/-/react-native-keep-awake-2.0.6.tgz",
       "integrity": "sha512-ketZKC6G49W4iblKYCnIA5Tcx78Yu48n/K5XzZUnMm69wAnZxs1054Re2V5xpSwX5VZasOBjW1iI1cTjtB/H5g=="
     },
+    "react-native-linear-gradient": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.4.0.tgz",
+      "integrity": "sha512-h4nwmcjfeedSiHGBmQkMmCSIqm3196YtT1AtbAqE93jgAcpib0btvoCx8nBUemmhfm+CA5mFEh8p5biA4wFw/A==",
+      "requires": {
+        "prop-types": "^15.5.10"
+      }
+    },
     "react-native-locale-detector": {
       "version": "github:jitsi/react-native-locale-detector#845281e9fd4af756f6d0f64afe5cce08c63e5ee9",
-      "from": "react-native-locale-detector@github:jitsi/react-native-locale-detector#845281e9fd4af756f6d0f64afe5cce08c63e5ee9"
+      "from": "github:jitsi/react-native-locale-detector#845281e9fd4af756f6d0f64afe5cce08c63e5ee9"
+    },
+    "react-native-permissions": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-1.1.1.tgz",
+      "integrity": "sha512-t0Ujm177bagjUOSzhpmkSz+LqFW04HnY9TeZFavDCmV521fQvFz82aD+POXqWsAdsJVOK3umJYBNNqCjC3g0hQ=="
     },
     "react-native-prompt": {
       "version": "1.0.0",
@@ -12798,8 +12802,8 @@
       }
     },
     "react-native-webrtc": {
-      "version": "github:jitsi/react-native-webrtc#b43081ec8357335ab82a2e236c0f6a6ed0b17f9f",
-      "from": "github:jitsi/react-native-webrtc#b43081ec8357335ab82a2e236c0f6a6ed0b17f9f",
+      "version": "github:jitsi/react-native-webrtc#6b0ea124414f6f5b7f234a7d5cec75d30f5f6312",
+      "from": "github:jitsi/react-native-webrtc#6b0ea124414f6f5b7f234a7d5cec75d30f5f6312",
       "requires": {
         "base64-js": "^1.1.2",
         "event-target-shim": "^1.0.5",
@@ -13299,9 +13303,9 @@
       "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="
     },
     "rtcpeerconnection-shim": {
-      "version": "1.2.12",
-      "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.12.tgz",
-      "integrity": "sha512-7v/mpRyCRjVrTr3pqI9ouXzKGtbSg+iJ54fERZCGYc6AwvkTe6WWeKWG4OmG0H3dWkr1NNASyGieE0Q0hMJviQ==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.13.tgz",
+      "integrity": "sha512-Xz4zQLZNs9lFBvqbaHGIjLWtyZ1V82ec5r+WNEo7NlIx3zF5M3ytn9mkkfYeZmpE032cNg3Vvf0rP8kNXUNd9w==",
       "requires": {
         "sdp": "^2.6.0"
       }
@@ -15825,10 +15829,6 @@
         }
       }
     },
-    "url-polyfill": {
-      "version": "github:github/url-polyfill#39734186de44612bc5a16eb25f5407adcc5b2e7c",
-      "from": "url-polyfill@github:github/url-polyfill#39734186de44612bc5a16eb25f5407adcc5b2e7c"
-    },
     "use": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz",

package.json

@@ -34,9 +34,8 @@
     "@atlaskit/tabs": "4.0.1",
     "@atlaskit/theme": "2.4.0",
     "@atlaskit/tooltip": "9.1.1",
+    "@webcomponents/url": "0.7.1",
     "autosize": "1.18.13",
-    "es6-iterator": "2.0.3",
-    "es6-symbol": "3.1.1",
     "i18next": "8.4.3",
     "i18next-browser-languagedetector": "2.0.0",
     "i18next-xhr-backend": "1.4.2",
@@ -46,10 +45,12 @@
     "jquery-contextmenu": "2.4.5",
     "jquery-i18next": "1.2.0",
     "js-md5": "0.6.1",
+    "jsc-android": "224109.1.0",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#05b7ae60dc669a69b293fb0e93688fc0a78adb80",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#2be752fc88ff71e454c6b9178b21a33b59c53f41",
     "lodash": "4.17.4",
     "moment": "2.19.4",
+    "moment-duration-format": "2.2.2",
     "postis": "2.2.0",
     "prop-types": "15.6.0",
     "react": "16.3.1",
@@ -59,20 +60,20 @@
     "react-native-background-timer": "2.0.0",
     "react-native-calendar-events": "github:jitsi/react-native-calendar-events#cad37355f36d17587d84af72b0095e8cc5fd3df9",
     "react-native-callstats": "3.52.0",
-    "react-native-fetch-blob": "github:joltup/react-native-fetch-blob#1f9a1761aea4e37bd672bd0d233f3adf0e113a11",
-    "react-native-img-cache": "1.5.2",
+    "react-native-fast-image": "4.0.14",
     "react-native-immersive": "1.1.0",
     "react-native-keep-awake": "2.0.6",
+    "react-native-linear-gradient": "2.4.0",
     "react-native-locale-detector": "github:jitsi/react-native-locale-detector#845281e9fd4af756f6d0f64afe5cce08c63e5ee9",
+    "react-native-permissions": "1.1.1",
     "react-native-prompt": "1.0.0",
     "react-native-sound": "0.10.9",
     "react-native-vector-icons": "4.4.2",
-    "react-native-webrtc": "github:jitsi/react-native-webrtc#b43081ec8357335ab82a2e236c0f6a6ed0b17f9f",
+    "react-native-webrtc": "github:jitsi/react-native-webrtc#6b0ea124414f6f5b7f234a7d5cec75d30f5f6312",
     "react-redux": "5.0.7",
     "redux": "4.0.0",
     "redux-thunk": "2.2.0",
     "styled-components": "1.4.6",
-    "url-polyfill": "github:github/url-polyfill#39734186de44612bc5a16eb25f5407adcc5b2e7c",
     "uuid": "3.1.0",
     "xmldom": "0.1.27"
   },

react/features/always-on-top/AudioMuteButton.js

@@ -4,6 +4,7 @@ import { AbstractAudioMuteButton } from '../base/toolbox';
 import type { AbstractButtonProps as Props } from '../base/toolbox';
 
 const { api } = window.alwaysOnTop;
+const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * The type of the React {@code Component} state of {@link AudioMuteButton}.
@@ -68,7 +69,7 @@ export default class AudioMuteButton
                     audioAvailable,
                     audioMuted
                 }))
-            .catch(console.error);
+            .catch(logger.error);
     }
 
     /**

react/features/always-on-top/VideoMuteButton.js

@@ -4,6 +4,7 @@ import { AbstractVideoMuteButton } from '../base/toolbox';
 import type { AbstractButtonProps as Props } from '../base/toolbox';
 
 const { api } = window.alwaysOnTop;
+const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * The type of the React {@code Component} state of {@link VideoMuteButton}.
@@ -68,7 +69,7 @@ export default class VideoMuteButton
                     videoAvailable,
                     videoMuted
                 }))
-            .catch(console.error);
+            .catch(logger.error);
     }
 
     /**

react/features/app/actions.js

@@ -15,7 +15,7 @@ import { loadConfig } from '../base/lib-jitsi-meet';
 import { parseURIString, toURLString } from '../base/util';
 import { setFatalError } from '../overlay';
 
-import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from './actionTypes';
+import { getDefaultURL } from './functions';
 
 const logger = require('jitsi-meet-logger').getLogger(__filename);
 
@@ -116,8 +116,7 @@ function _appNavigateToOptionalLocation(
     // If the specified location (URI) does not identify a host, use the app's
     // default.
     if (!location || !location.host) {
-        const defaultLocation
-            = parseURIString(getState()['features/app'].app._getDefaultURL());
+        const defaultLocation = parseURIString(getDefaultURL(getState));
 
         if (location) {
             location.host = defaultLocation.host;
@@ -138,49 +137,6 @@ function _appNavigateToOptionalLocation(
     return _appNavigateToMandatoryLocation(dispatch, getState, location);
 }
 
-/**
- * Signals that a specific App will mount (in the terms of React).
- *
- * @param {App} app - The App which will mount.
- * @returns {{
- *     type: APP_WILL_MOUNT,
- *     app: App
- * }}
- */
-export function appWillMount(app: Object) {
-    return (dispatch: Dispatch<*>) => {
-        dispatch({
-            type: APP_WILL_MOUNT,
-            app
-        });
-
-        // TODO There was a redux action creator appInit which I did not like
-        // because we already had the redux action creator appWillMount and,
-        // respectively, the redux action APP_WILL_MOUNT. So I set out to remove
-        // appInit and managed to move everything it was doing but the
-        // following. Which is not extremely bad because we haven't moved the
-        // API module into its own feature yet so we're bound to work on that in
-        // the future.
-        typeof APP === 'object' && APP.API.init();
-    };
-}
-
-/**
- * Signals that a specific App will unmount (in the terms of React).
- *
- * @param {App} app - The App which will unmount.
- * @returns {{
- *     type: APP_WILL_UNMOUNT,
- *     app: App
- * }}
- */
-export function appWillUnmount(app: Object) {
-    return {
-        type: APP_WILL_UNMOUNT,
-        app
-    };
-}
-
 /**
  * Loads config.js from a specific host.
  *

react/features/app/components/AbstractApp.js

@@ -1,143 +1,56 @@
-/* global APP */
+// @flow
 
-import _ from 'lodash';
-import PropTypes from 'prop-types';
-import React, { Component, Fragment } from 'react';
-import { I18nextProvider } from 'react-i18next';
-import { Provider } from 'react-redux';
-import { compose, createStore } from 'redux';
-import Thunk from 'redux-thunk';
+import React, { Fragment } from 'react';
 
-import { i18next } from '../../base/i18n';
-import { localParticipantLeft } from '../../base/participants';
-import {
-    MiddlewareRegistry,
-    ReducerRegistry,
-    StateListenerRegistry
-} from '../../base/redux';
-import { SoundCollection } from '../../base/sounds';
-import { PersistenceRegistry } from '../../base/storage';
+import { BaseApp } from '../../base/app';
 import { toURLString } from '../../base/util';
 import { OverlayContainer } from '../../overlay';
 
-import { appNavigate, appWillMount, appWillUnmount } from '../actions';
+import { appNavigate } from '../actions';
+import { getDefaultURL } from '../functions';
 
 /**
- * The default URL to open if no other was specified to {@code AbstractApp} via
- * props.
- *
- * FIXME: This is not at the best place here. This should be either in the
- * base/settings feature or a default in base/config.
+ * The type of React {@code Component} props of {@link AbstractApp}.
  */
-const DEFAULT_URL = 'https://meet.jit.si';
+export type Props = {
+
+    /**
+     * The default URL {@code AbstractApp} is to open when not in any
+     * conference/room.
+     */
+    defaultURL: string,
+
+    /**
+     * XXX Refer to the implementation of loadURLObject: in
+     * ios/sdk/src/JitsiMeetView.m for further information.
+     */
+    timestamp: any,
+
+    /**
+     * The URL, if any, with which the app was launched.
+     */
+    url: Object | string
+};
 
 /**
  * Base (abstract) class for main App component.
  *
  * @abstract
  */
-export class AbstractApp extends Component {
-    /**
-     * {@code AbstractApp} component's property types.
-     *
-     * @static
-     */
-    static propTypes = {
-        /**
-         * The default URL {@code AbstractApp} is to open when not in any
-         * conference/room.
-         */
-        defaultURL: PropTypes.string,
-
-        /**
-         * (Optional) redux store for this app.
-         */
-        store: PropTypes.object,
-
-        // XXX Refer to the implementation of loadURLObject: in
-        // ios/sdk/src/JitsiMeetView.m for further information.
-        timestamp: PropTypes.any,
-
-        /**
-         * The URL, if any, with which the app was launched.
-         */
-        url: PropTypes.oneOfType([
-            PropTypes.object,
-            PropTypes.string
-        ])
-    };
+export class AbstractApp extends BaseApp<Props, *> {
+    _init: Promise<*>;
 
     /**
-     * Initializes a new {@code AbstractApp} instance.
-     *
-     * @param {Object} props - The read-only React {@code Component} props with
-     * which the new instance is to be initialized.
-     */
-    constructor(props) {
-        super(props);
-
-        this.state = {
-
-            /**
-             * The state of the »possible« async initialization of
-             * the {@code AbstractApp}.
-             */
-            appAsyncInitialized: false,
-
-            /**
-             * The Route rendered by this {@code AbstractApp}.
-             *
-             * @type {Route}
-             */
-            route: {},
-
-            /**
-             * The redux store used by this {@code AbstractApp}.
-             *
-             * @type {Store}
-             */
-            store: undefined
-        };
-
-        /**
-         * Make the mobile {@code AbstractApp} wait until the
-         * {@code AsyncStorage} implementation of {@code Storage} initializes
-         * fully.
-         *
-         * @private
-         * @see {@link #_initStorage}
-         * @type {Promise}
-         */
-        this._init
-            = this._initStorage()
-                .catch(() => { /* AbstractApp should always initialize! */ })
-                .then(() =>
-                    this.setState({
-                        store: this._maybeCreateStore(props)
-                    }));
-    }
-
-    /**
-     * Init lib-jitsi-meet and create local participant when component is going
-     * to be mounted.
+     * Initializes the app.
      *
      * @inheritdoc
      */
     componentWillMount() {
+        super.componentWillMount();
+
         this._init.then(() => {
-            const { dispatch } = this._getStore();
-
-            dispatch(appWillMount(this));
-
-            // We set the initialized state here and not in the constructor to
-            // make sure that {@code componentWillMount} gets invoked before
-            // the app tries to render the actual app content.
-            this.setState({
-                appAsyncInitialized: true
-            });
-
-            // If a URL was explicitly specified to this React Component,
-            // then open it; otherwise, use a default.
+            // If a URL was explicitly specified to this React Component, then
+            // open it; otherwise, use a default.
             this._openURL(toURLString(this.props.url) || this._getDefaultURL());
         });
     }
@@ -151,25 +64,10 @@ export class AbstractApp extends Component {
      * that this instance will receive.
      * @returns {void}
      */
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: Props) {
         const { props } = this;
 
         this._init.then(() => {
-            // The consumer of this AbstractApp did not provide a redux store.
-            if (typeof nextProps.store === 'undefined'
-
-                    // The consumer of this AbstractApp did provide a redux
-                    // store before. Which means that the consumer changed
-                    // their mind. In such a case this instance should create
-                    // its own internal redux store. If the consumer did not
-                    // provide a redux store before, then this instance is
-                    // using its own internal redux store already.
-                    && typeof props.store !== 'undefined') {
-                this.setState({
-                    store: this._maybeCreateStore(nextProps)
-                });
-            }
-
             // Deal with URL changes.
             let { url } = nextProps;
 
@@ -184,20 +82,6 @@ export class AbstractApp extends Component {
         });
     }
 
-    /**
-     * Dispose lib-jitsi-meet and remove local participant when component is
-     * going to be unmounted.
-     *
-     * @inheritdoc
-     */
-    componentWillUnmount() {
-        const { dispatch } = this._getStore();
-
-        dispatch(localParticipantLeft());
-
-        dispatch(appWillUnmount(this));
-    }
-
     /**
      * Gets a {@code Location} object from the window with information about the
      * current location of the document. Explicitly defined to allow extenders
@@ -215,123 +99,23 @@ export class AbstractApp extends Component {
     }
 
     /**
-     * Delays this {@code AbstractApp}'s startup until the {@code Storage}
-     * implementation of {@code localStorage} initializes. While the
-     * initialization is instantaneous on Web (with Web Storage API), it is
-     * asynchronous on mobile/react-native.
+     * Creates an extra {@link ReactElement}s to be added (unconditionaly)
+     * alongside the main element.
      *
-     * @private
-     * @returns {Promise}
-     */
-    _initStorage() {
-        const localStorageInitializing = window.localStorage._initializing;
-
-        return (
-            typeof localStorageInitializing === 'undefined'
-                ? Promise.resolve()
-                : localStorageInitializing);
-    }
-
-    /**
-     * Implements React's {@link Component#render()}.
-     *
-     * @inheritdoc
-     * @returns {ReactElement}
-     */
-    render() {
-        const { appAsyncInitialized, route: { component } } = this.state;
-
-        if (appAsyncInitialized && component) {
-            return (
-                <I18nextProvider i18n = { i18next }>
-                    <Provider store = { this._getStore() }>
-                        <Fragment>
-                            { this._createElement(component) }
-                            <SoundCollection />
-                            <OverlayContainer />
-                        </Fragment>
-                    </Provider>
-                </I18nextProvider>
-            );
-        }
-
-        return null;
-    }
-
-    /**
-     * Creates a {@link ReactElement} from the specified component, the
-     * specified props and the props of this {@code AbstractApp} which are
-     * suitable for propagation to the children of this {@code Component}.
-     *
-     * @param {Component} component - The component from which the
-     * {@code ReactElement} is to be created.
-     * @param {Object} props - The read-only React {@code Component} props with
-     * which the {@code ReactElement} is to be initialized.
-     * @returns {ReactElement}
+     * @abstract
      * @protected
+     * @returns {ReactElement}
      */
-    _createElement(component, props) {
-        /* eslint-disable no-unused-vars */
-
-        const {
-            // Don't propagate the dispatch and store props because they usually
-            // come from react-redux and programmers don't really expect them to
-            // be inherited but rather explicitly connected.
-            dispatch, // eslint-disable-line react/prop-types
-            store,
-
-            // The following props were introduced to be consumed entirely by
-            // AbstractApp:
-            defaultURL,
-            url,
-
-            // The remaining props, if any, are considered suitable for
-            // propagation to the children of this Component.
-            ...thisProps
-        } = this.props;
-
-        /* eslint-enable no-unused-vars */
-
-        return React.createElement(component, {
-            ...thisProps,
-            ...props
-        });
-    }
-
-    /**
-     * Initializes a new redux store instance suitable for use by this
-     * {@code AbstractApp}.
-     *
-     * @private
-     * @returns {Store} - A new redux store instance suitable for use by
-     * this {@code AbstractApp}.
-     */
-    _createStore() {
-        // Create combined reducer from all reducers in ReducerRegistry.
-        const reducer = ReducerRegistry.combineReducers();
-
-        // Apply all registered middleware from the MiddlewareRegistry and
-        // additional 3rd party middleware:
-        // - Thunk - allows us to dispatch async actions easily. For more info
-        // @see https://github.com/gaearon/redux-thunk.
-        let middleware = MiddlewareRegistry.applyMiddleware(Thunk);
-
-        // Try to enable Redux DevTools Chrome extension in order to make it
-        // available for the purposes of facilitating development.
-        let devToolsExtension;
-
-        if (typeof window === 'object'
-                && (devToolsExtension = window.devToolsExtension)) {
-            middleware = compose(middleware, devToolsExtension());
-        }
-
+    _createExtraElement() {
         return (
-            createStore(
-                reducer,
-                PersistenceRegistry.getPersistedState(),
-                middleware));
+            <Fragment>
+                <OverlayContainer />
+            </Fragment>
+        );
     }
 
+    _createMainElement: (React$Element<*>, Object) => ?React$Element<*>;
+
     /**
      * Gets the default URL to be opened when this {@code App} mounts.
      *
@@ -340,101 +124,7 @@ export class AbstractApp extends Component {
      * mounts.
      */
     _getDefaultURL() {
-        // If the execution environment provides a Location abstraction, then
-        // this App at already at that location but it must be made aware of the
-        // fact.
-        const windowLocation = this.getWindowLocation();
-
-        if (windowLocation) {
-            const href = windowLocation.toString();
-
-            if (href) {
-                return href;
-            }
-        }
-
-        return (
-            this.props.defaultURL
-                || this._getStore().getState()['features/base/settings']
-                    .serverURL
-                || DEFAULT_URL);
-    }
-
-    /**
-     * Gets the redux store used by this {@code AbstractApp}.
-     *
-     * @protected
-     * @returns {Store} - The redux store used by this {@code AbstractApp}.
-     */
-    _getStore() {
-        let store = this.state.store;
-
-        if (typeof store === 'undefined') {
-            store = this.props.store;
-        }
-
-        return store;
-    }
-
-    /**
-     * Creates a redux store to be used by this {@code AbstractApp} if such as a
-     * store is not defined by the consumer of this {@code AbstractApp} through
-     * its read-only React {@code Component} props.
-     *
-     * @param {Object} props - The read-only React {@code Component} props that
-     * will eventually be received by this {@code AbstractApp}.
-     * @private
-     * @returns {Store} - The redux store to be used by this
-     * {@code AbstractApp}.
-     */
-    _maybeCreateStore({ store }) {
-        // The application Jitsi Meet is architected with redux. However, I do
-        // not want consumers of the App React Component to be forced into
-        // dealing with redux. If the consumer did not provide an external redux
-        // store, utilize an internal redux store.
-        if (typeof store === 'undefined') {
-            // eslint-disable-next-line no-param-reassign
-            store = this._createStore();
-
-            // This is temporary workaround to be able to dispatch actions from
-            // non-reactified parts of the code (conference.js for example).
-            // Don't use in the react code!!!
-            // FIXME: remove when the reactification is finished!
-            if (typeof APP !== 'undefined') {
-                APP.store = store;
-            }
-        }
-
-        // StateListenerRegistry
-        store && StateListenerRegistry.subscribe(store);
-
-        return store;
-    }
-
-    /**
-     * Navigates to a specific Route.
-     *
-     * @param {Route} route - The Route to which to navigate.
-     * @returns {Promise}
-     */
-    _navigate(route) {
-        if (_.isEqual(route, this.state.route)) {
-            return Promise.resolve();
-        }
-
-        if (route.href) {
-            // This navigation requires loading a new URL in the browser.
-            window.location.href = route.href;
-
-            return Promise.resolve();
-        }
-
-        // XXX React's setState is asynchronous which means that the value of
-        // this.state.route above may not even be correct. If the check is
-        // performed before setState completes, the app may not navigate to the
-        // expected route. In order to mitigate the problem, _navigate was
-        // changed to return a Promise.
-        return new Promise(resolve => this.setState({ route }, resolve));
+        return getDefaultURL(this.state.store);
     }
 
     /**
@@ -446,6 +136,6 @@ export class AbstractApp extends Component {
      * @returns {void}
      */
     _openURL(url) {
-        this._getStore().dispatch(appNavigate(toURLString(url)));
+        this.state.store.dispatch(appNavigate(toURLString(url)));
     }
 }

react/features/app/components/App.native.js

@@ -1,6 +1,5 @@
-/* global __DEV__ */
+// @flow
 
-import PropTypes from 'prop-types';
 import React from 'react';
 import { Linking } from 'react-native';
 
@@ -12,6 +11,7 @@ import {
     AspectRatioDetector,
     ReducedUIDetector
 } from '../../base/responsive-ui';
+import '../../google-api';
 import '../../mobile/audio-mode';
 import '../../mobile/background';
 import '../../mobile/callkit';
@@ -23,47 +23,55 @@ import '../../mobile/proximity';
 import '../../mobile/wake-lock';
 
 import { AbstractApp } from './AbstractApp';
+import type { Props as AbstractAppProps } from './AbstractApp';
+
+declare var __DEV__;
+
+const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
- * Root application component.
+ * The type of React {@code Component} props of {@link App}.
+ */
+type Props = AbstractAppProps & {
+
+    /**
+     * Whether the add people feature is enabled.
+     */
+    addPeopleEnabled: boolean,
+
+    /**
+     * Whether the dial-out feature is enabled.
+     */
+    dialOutEnabled: boolean,
+
+    /**
+     * Whether Picture-in-Picture is enabled. If {@code true}, a toolbar button
+     * is rendered in the {@link Conference} view to afford entering
+     * Picture-in-Picture.
+     */
+    pictureInPictureEnabled: boolean,
+
+    /**
+     * Whether the Welcome page is enabled. If {@code true}, the Welcome page is
+     * rendered when the {@link App} is not at a location (URL) identifying
+     * a Jitsi Meet conference/room.
+     */
+    welcomePageEnabled: boolean
+};
+
+/**
+ * Root app {@code Component} on mobile/React Native.
  *
  * @extends AbstractApp
  */
 export class App extends AbstractApp {
     /**
-     * App component's property types.
+     * Initializes a new {@code App} instance.
      *
-     * @static
+     * @param {Props} props - The read-only React {@code Component} props with
+     * which the new instance is to be initialized.
      */
-    static propTypes = {
-        ...AbstractApp.propTypes,
-
-        addPeopleEnabled: PropTypes.bool,
-
-        dialOutEnabled: PropTypes.bool,
-
-        /**
-         * Whether Picture-in-Picture is enabled. If {@code true}, a toolbar
-         * button is rendered in the {@link Conference} view to afford entering
-         * Picture-in-Picture.
-         */
-        pictureInPictureEnabled: PropTypes.bool,
-
-        /**
-         * Whether the Welcome page is enabled. If {@code true}, the Welcome
-         * page is rendered when the {@link App} is not at a location (URL)
-         * identifying a Jitsi Meet conference/room.
-         */
-        welcomePageEnabled: PropTypes.bool
-    };
-
-    /**
-     * Initializes a new App instance.
-     *
-     * @param {Object} props - The read-only React Component props with which
-     * the new instance is to be initialized.
-     */
-    constructor(props) {
+    constructor(props: Props) {
         super(props);
 
         // Bind event handlers so they are only bound once for every instance.
@@ -71,8 +79,8 @@ export class App extends AbstractApp {
 
         // In the Release configuration, React Native will (intentionally) throw
         // an unhandled JavascriptException for an unhandled JavaScript error.
-        // This will effectively kill the application. In accord with the Web,
-        // do not kill the application.
+        // This will effectively kill the app. In accord with the Web, do not
+        // kill the app.
         this._maybeDisableExceptionsManager();
     }
 
@@ -110,11 +118,11 @@ export class App extends AbstractApp {
      *
      * @override
      */
-    _createElement(component, props) {
+    _createMainElement(component, props) {
         return (
             <AspectRatioDetector>
                 <ReducedUIDetector>
-                    { super._createElement(component, props) }
+                    { super._createMainElement(component, props) }
                 </ReducedUIDetector>
             </AspectRatioDetector>
         );
@@ -125,10 +133,9 @@ export class App extends AbstractApp {
      * {@link ExceptionsManager#handleException} on platforms and in
      * configurations on/in which the use of the method in questions has been
      * determined to be undesirable. For example, React Native will
-     * (intentionally) throw an unhandled JavascriptException for an
+     * (intentionally) throw an unhandled {@code JavascriptException} for an
      * unhandled JavaScript error in the Release configuration. This will
-     * effectively kill the application. In accord with the Web, do not kill the
-     * application.
+     * effectively kill the app. In accord with the Web, do not kill the app.
      *
      * @private
      * @returns {void}
@@ -143,9 +150,9 @@ export class App extends AbstractApp {
             // A solution based on RTCSetFatalHandler was implemented on iOS and
             // it is preferred because it is at a later step of the
             // error/exception handling and it is specific to fatal
-            // errors/exceptions which were observed to kill the application.
-            // The solution implemented bellow was tested on Android only so it
-            // is considered safest to use it there only.
+            // errors/exceptions which were observed to kill the app. The
+            // solution implemented bellow was tested on Android only so it is
+            // considered safest to use it there only.
             return;
         }
 
@@ -158,29 +165,31 @@ export class App extends AbstractApp {
         }
     }
 
+    _onLinkingURL: (*) => void;
+
     /**
      * Notified by React's Linking API that a specific URL registered to be
-     * handled by this App was activated.
+     * handled by this app was activated.
      *
      * @param {Object} event - The details of the notification/event.
-     * @param {string} event.url - The URL registered to be handled by this App
+     * @param {string} event.url - The URL registered to be handled by this app
      * which was activated.
      * @private
      * @returns {void}
      */
     _onLinkingURL({ url }) {
-        this._openURL(url);
+        super._openURL(url);
     }
 }
 
 /**
  * Handles a (possibly unhandled) JavaScript error by preventing React Native
  * from converting a fatal error into an unhandled native exception which will
- * kill the application.
+ * kill the app.
  *
  * @param {Error} error - The (possibly unhandled) JavaScript error to handle.
- * @param {boolean} fatal - True if the specified error is fatal; otherwise,
- * false.
+ * @param {boolean} fatal - If the specified error is fatal, {@code true};
+ * otherwise, {@code false}.
  * @private
  * @returns {void}
  */
@@ -188,12 +197,12 @@ function _handleException(error, fatal) {
     if (fatal) {
         // In the Release configuration, React Native will (intentionally) throw
         // an unhandled JavascriptException for an unhandled JavaScript error.
-        // This will effectively kill the application. In accord with the Web,
-        // do not kill the application.
-        console.error(error);
+        // This will effectively kill the app. In accord with the Web, do not
+        // kill the app.
+        logger.error(error);
     } else {
         // Forward to the next globalHandler of ErrorUtils.
-        const next = _handleException.next;
+        const { next } = _handleException;
 
         typeof next === 'function' && next(error, fatal);
     }

react/features/app/components/App.web.js

@@ -1,3 +1,5 @@
+// @flow
+
 import { AtlasKitThemeProvider } from '@atlaskit/theme';
 import React from 'react';
 
@@ -9,32 +11,11 @@ import '../../video-layout';
 import { AbstractApp } from './AbstractApp';
 
 /**
- * Root application component.
+ * Root app {@code Component} on Web/React.
  *
  * @extends AbstractApp
  */
 export class App extends AbstractApp {
-    /**
-     * App component's property types.
-     *
-     * @static
-     */
-    static propTypes = AbstractApp.propTypes;
-
-    /**
-     * Overrides the parent method to inject {@link AtlasKitThemeProvider} as
-     * the top most component.
-     *
-     * @override
-     */
-    _createElement(component, props) {
-        return (
-            <AtlasKitThemeProvider mode = 'dark'>
-                { super._createElement(component, props) }
-            </AtlasKitThemeProvider>
-        );
-    }
-
     /**
      * Gets a Location object from the window with information about the current
      * location of the document.
@@ -44,4 +25,18 @@ export class App extends AbstractApp {
     getWindowLocation() {
         return window.location;
     }
+
+    /**
+     * Overrides the parent method to inject {@link AtlasKitThemeProvider} as
+     * the top most component.
+     *
+     * @override
+     */
+    _createMainElement(component, props) {
+        return (
+            <AtlasKitThemeProvider mode = 'dark'>
+                { super._createMainElement(component, props) }
+            </AtlasKitThemeProvider>
+        );
+    }
 }

react/features/app/functions.any.js

@@ -1,28 +1,32 @@
 // @flow
 
+import { getAppProp } from '../base/app';
 import { toState } from '../base/redux';
+import { getServerURL } from '../base/settings';
 
 /**
- * Gets the value of a specific React {@code Component} prop of the currently
- * mounted {@link App}.
+ * Retrieves the default URL for the app. This can either come from a prop to
+ * the root App component or be configured in the settings.
  *
  * @param {Function|Object} stateful - The redux store or {@code getState}
  * function.
- * @param {string} propName - The name of the React {@code Component} prop of
- * the currently mounted {@code App} to get.
- * @returns {*} The value of the specified React {@code Compoennt} prop of the
- * currently mounted {@code App}.
+ * @returns {string} - Default URL for the app.
  */
-export function getAppProp(stateful: Function | Object, propName: string) {
-    const state = toState(stateful)['features/app'];
+export function getDefaultURL(stateful: Function | Object) {
+    const state = toState(stateful);
+    const { app } = state['features/base/app'];
 
-    if (state) {
-        const { app } = state;
+    // If the execution environment provides a Location abstraction (e.g. a Web
+    // browser), then we'll presume it's the one and only base URL it can be on.
+    const windowLocation = app.getWindowLocation();
 
-        if (app) {
-            return app.props[propName];
+    if (windowLocation) {
+        const href = windowLocation.toString();
+
+        if (href) {
+            return href;
         }
     }
 
-    return undefined;
+    return getAppProp(state, 'defaultURL') || getServerURL(state);
 }

react/features/app/index.js

@@ -1,7 +1,5 @@
 export * from './actions';
-export * from './actionTypes';
 export * from './components';
 export * from './functions';
 
 import './middleware';
-import './reducer';

react/features/app/middleware.js

@@ -72,7 +72,7 @@ function _connectionEstablished(store, next, action) {
  */
 function _navigate({ getState }) {
     const state = getState();
-    const { app } = state['features/app'];
+    const { app } = state['features/base/app'];
 
     _getRouteToRender(state).then(route => app._navigate(route));
 }

react/features/base/app/actions.js

@@ -0,0 +1,48 @@
+// @flow
+
+import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from './actionTypes';
+
+declare var APP;
+
+/**
+ * Signals that a specific App will mount (in the terms of React).
+ *
+ * @param {App} app - The App which will mount.
+ * @returns {{
+ *     type: APP_WILL_MOUNT,
+ *     app: App
+ * }}
+ */
+export function appWillMount(app: Object) {
+    return (dispatch: Dispatch<*>) => {
+        dispatch({
+            type: APP_WILL_MOUNT,
+            app
+        });
+
+        // TODO There was a redux action creator appInit which I did not like
+        // because we already had the redux action creator appWillMount and,
+        // respectively, the redux action APP_WILL_MOUNT. So I set out to remove
+        // appInit and managed to move everything it was doing but the
+        // following. Which is not extremely bad because we haven't moved the
+        // API module into its own feature yet so we're bound to work on that in
+        // the future.
+        typeof APP === 'object' && APP.API.init();
+    };
+}
+
+/**
+ * Signals that a specific App will unmount (in the terms of React).
+ *
+ * @param {App} app - The App which will unmount.
+ * @returns {{
+ *     type: APP_WILL_UNMOUNT,
+ *     app: App
+ * }}
+ */
+export function appWillUnmount(app: Object) {
+    return {
+        type: APP_WILL_UNMOUNT,
+        app
+    };
+}

react/features/base/app/components/BaseApp.js

@@ -0,0 +1,238 @@
+// @flow
+
+import _ from 'lodash';
+import React, { Component, Fragment } from 'react';
+import { I18nextProvider } from 'react-i18next';
+import { Provider } from 'react-redux';
+import { compose, createStore } from 'redux';
+import Thunk from 'redux-thunk';
+
+import { i18next } from '../../i18n';
+import {
+    MiddlewareRegistry,
+    ReducerRegistry,
+    StateListenerRegistry
+} from '../../redux';
+import { SoundCollection } from '../../sounds';
+import { PersistenceRegistry } from '../../storage';
+
+import { appWillMount, appWillUnmount } from '../actions';
+
+declare var APP: Object;
+
+/**
+ * The type of the React {@code Component} state of {@link BaseApp}.
+ */
+type State = {
+
+    /**
+     * The {@code Route} rendered by the {@code BaseApp}.
+     */
+    route: Object,
+
+    /**
+     * The redux store used by the {@code BaseApp}.
+     */
+    store: Object
+};
+
+/**
+ * Base (abstract) class for main App component.
+ *
+ * @abstract
+ */
+export default class BaseApp extends Component<*, State> {
+    _init: Promise<*>;
+
+    /**
+     * Initializes a new {@code BaseApp} instance.
+     *
+     * @param {Object} props - The read-only React {@code Component} props with
+     * which the new instance is to be initialized.
+     */
+    constructor(props: Object) {
+        super(props);
+
+        this.state = {
+            route: {},
+
+            // $FlowFixMe
+            store: undefined
+        };
+
+        /**
+         * Make the mobile {@code BaseApp} wait until the {@code AsyncStorage}
+         * implementation of {@code Storage} initializes fully.
+         *
+         * @private
+         * @see {@link #_initStorage}
+         * @type {Promise}
+         */
+        this._init
+            = this._initStorage()
+                .catch(() => { /* AbstractApp should always initialize! */ })
+                .then(() =>
+                    this.setState({
+                        store: this._createStore()
+                    }));
+    }
+
+    /**
+     * Initializes the app.
+     *
+     * @inheritdoc
+     */
+    componentWillMount() {
+        this._init.then(() => this.state.store.dispatch(appWillMount(this)));
+    }
+
+    /**
+     * De-initializes the app.
+     *
+     * @inheritdoc
+     */
+    componentWillUnmount() {
+        this.state.store.dispatch(appWillUnmount(this));
+    }
+
+    /**
+     * Delays this {@code BaseApp}'s startup until the {@code Storage}
+     * implementation of {@code localStorage} initializes. While the
+     * initialization is instantaneous on Web (with Web Storage API), it is
+     * asynchronous on mobile/react-native.
+     *
+     * @private
+     * @returns {Promise}
+     */
+    _initStorage(): Promise<*> {
+        const { _initializing } = window.localStorage;
+
+        return _initializing || Promise.resolve();
+    }
+
+    /**
+     * Implements React's {@link Component#render()}.
+     *
+     * @inheritdoc
+     * @returns {ReactElement}
+     */
+    render() {
+        const { route: { component }, store } = this.state;
+
+        if (store && component) {
+            return (
+                <I18nextProvider i18n = { i18next }>
+                    <Provider store = { store }>
+                        <Fragment>
+                            { this._createMainElement(component) }
+                            <SoundCollection />
+                            { this._createExtraElement() }
+                        </Fragment>
+                    </Provider>
+                </I18nextProvider>
+            );
+        }
+
+        return null;
+    }
+
+    /**
+     * Creates an extra {@link ReactElement}s to be added (unconditionaly)
+     * alongside the main element.
+     *
+     * @returns {ReactElement}
+     * @abstract
+     * @protected
+     */
+    _createExtraElement() {
+        return null;
+    }
+
+    /**
+     * Creates a {@link ReactElement} from the specified component, the
+     * specified props and the props of this {@code AbstractApp} which are
+     * suitable for propagation to the children of this {@code Component}.
+     *
+     * @param {Component} component - The component from which the
+     * {@code ReactElement} is to be created.
+     * @param {Object} props - The read-only React {@code Component} props with
+     * which the {@code ReactElement} is to be initialized.
+     * @returns {ReactElement}
+     * @protected
+     */
+    _createMainElement(component, props) {
+        return React.createElement(component, props || {});
+    }
+
+    /**
+     * Initializes a new redux store instance suitable for use by this
+     * {@code AbstractApp}.
+     *
+     * @private
+     * @returns {Store} - A new redux store instance suitable for use by
+     * this {@code AbstractApp}.
+     */
+    _createStore() {
+        // Create combined reducer from all reducers in ReducerRegistry.
+        const reducer = ReducerRegistry.combineReducers();
+
+        // Apply all registered middleware from the MiddlewareRegistry and
+        // additional 3rd party middleware:
+        // - Thunk - allows us to dispatch async actions easily. For more info
+        // @see https://github.com/gaearon/redux-thunk.
+        let middleware = MiddlewareRegistry.applyMiddleware(Thunk);
+
+        // Try to enable Redux DevTools Chrome extension in order to make it
+        // available for the purposes of facilitating development.
+        let devToolsExtension;
+
+        if (typeof window === 'object'
+                && (devToolsExtension = window.devToolsExtension)) {
+            middleware = compose(middleware, devToolsExtension());
+        }
+
+        const store = createStore(
+            reducer, PersistenceRegistry.getPersistedState(), middleware);
+
+        // StateListenerRegistry
+        StateListenerRegistry.subscribe(store);
+
+        // This is temporary workaround to be able to dispatch actions from
+        // non-reactified parts of the code (conference.js for example).
+        // Don't use in the react code!!!
+        // FIXME: remove when the reactification is finished!
+        if (typeof APP !== 'undefined') {
+            APP.store = store;
+        }
+
+        return store;
+    }
+
+    /**
+     * Navigates to a specific Route.
+     *
+     * @param {Route} route - The Route to which to navigate.
+     * @returns {Promise}
+     */
+    _navigate(route): Promise<*> {
+        if (_.isEqual(route, this.state.route)) {
+            return Promise.resolve();
+        }
+
+        if (route.href) {
+            // This navigation requires loading a new URL in the browser.
+            window.location.href = route.href;
+
+            return Promise.resolve();
+        }
+
+        // XXX React's setState is asynchronous which means that the value of
+        // this.state.route above may not even be correct. If the check is
+        // performed before setState completes, the app may not navigate to the
+        // expected route. In order to mitigate the problem, _navigate was
+        // changed to return a Promise.
+        return new Promise(resolve => {
+            this.setState({ route }, resolve);
+        });
+    }
+}

react/features/base/app/components/index.js

@@ -0,0 +1 @@
+export { default as BaseApp } from './BaseApp';

react/features/base/app/functions.js

@@ -0,0 +1,28 @@
+// @flow
+
+import { toState } from '../redux';
+
+/**
+ * Gets the value of a specific React {@code Component} prop of the currently
+ * mounted {@link App}.
+ *
+ * @param {Function|Object} stateful - The redux store or {@code getState}
+ * function.
+ * @param {string} propName - The name of the React {@code Component} prop of
+ * the currently mounted {@code App} to get.
+ * @returns {*} The value of the specified React {@code Compoennt} prop of the
+ * currently mounted {@code App}.
+ */
+export function getAppProp(stateful: Function | Object, propName: string) {
+    const state = toState(stateful)['features/base/app'];
+
+    if (state) {
+        const { app } = state;
+
+        if (app) {
+            return app.props[propName];
+        }
+    }
+
+    return undefined;
+}

react/features/base/app/index.js

@@ -0,0 +1,6 @@
+export * from './actions';
+export * from './actionTypes';
+export * from './components';
+export * from './functions';
+
+import './reducer';

react/features/base/app/reducer.js

@@ -1,10 +1,10 @@
 // @flow
 
-import { ReducerRegistry } from '../base/redux';
+import { ReducerRegistry } from '../redux';
 
 import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from './actionTypes';
 
-ReducerRegistry.register('features/app', (state = {}, action) => {
+ReducerRegistry.register('features/base/app', (state = {}, action) => {
     switch (action.type) {
     case APP_WILL_MOUNT: {
         const { app } = action;
@@ -14,10 +14,10 @@ ReducerRegistry.register('features/app', (state = {}, action) => {
                 ...state,
 
                 /**
-                 * The one and only (i.e. singleton) {@link App} instance which
-                 * is currently mounted.
+                 * The one and only (i.e. singleton) {@link BaseApp} instance
+                 * which is currently mounted.
                  *
-                 * @type {App}
+                 * @type {BaseApp}
                  */
                 app
             };

react/features/base/conference/actionTypes.js

@@ -152,6 +152,19 @@ export const SET_FOLLOW_ME = Symbol('SET_FOLLOW_ME');
  */
 export const SET_LASTN = Symbol('SET_LASTN');
 
+/**
+ * The type of (redux) action which sets the maximum video height that should be
+ * received from remote participants, even if the user prefers a larger video
+ * height.
+ *
+ * {
+ *     type: SET_MAX_RECEIVER_VIDEO_QUALITY,
+ *     maxReceiverVideoQuality: number
+ * }
+ */
+export const SET_MAX_RECEIVER_VIDEO_QUALITY
+    = Symbol('SET_MAX_RECEIVER_VIDEO_QUALITY');
+
 /**
  * The type of (redux) action which sets the password to join or lock a specific
  * {@code JitsiConference}.
@@ -177,15 +190,16 @@ export const SET_PASSWORD = Symbol('SET_PASSWORD');
 export const SET_PASSWORD_FAILED = Symbol('SET_PASSWORD_FAILED');
 
 /**
- * The type of (redux) action which sets the maximum video size should be
- * received from remote participants.
+ * The type of (redux) action which sets the preferred maximum video height that
+ * should be received from remote participants.
  *
  * {
- *     type: SET_RECEIVE_VIDEO_QUALITY,
- *     receiveVideoQuality: number
+ *     type: SET_PREFERRED_RECEIVER_VIDEO_QUALITY,
+ *     preferredReceiverVideoQuality: number
  * }
  */
-export const SET_RECEIVE_VIDEO_QUALITY = Symbol('SET_RECEIVE_VIDEO_QUALITY');
+export const SET_PREFERRED_RECEIVER_VIDEO_QUALITY
+    = Symbol('SET_PREFERRED_RECEIVER_VIDEO_QUALITY');
 
 /**
  * The type of (redux) action which sets the name of the room of the

react/features/base/conference/actions.js

@@ -37,9 +37,10 @@ import {
     SET_DESKTOP_SHARING_ENABLED,
     SET_FOLLOW_ME,
     SET_LASTN,
+    SET_MAX_RECEIVER_VIDEO_QUALITY,
     SET_PASSWORD,
     SET_PASSWORD_FAILED,
-    SET_RECEIVE_VIDEO_QUALITY,
+    SET_PREFERRED_RECEIVER_VIDEO_QUALITY,
     SET_ROOM,
     SET_START_MUTED_POLICY
 } from './actionTypes';
@@ -54,7 +55,6 @@ import {
     getCurrentConference,
     sendLocalParticipant
 } from './functions';
-
 import type { Dispatch } from 'redux';
 
 const logger = require('jitsi-meet-logger').getLogger(__filename);
@@ -570,6 +570,23 @@ export function setLastN(lastN: ?number) {
     };
 }
 
+/**
+ * Sets the max frame height that should be received from remote videos.
+ *
+ * @param {number} maxReceiverVideoQuality - The max video frame height to
+ * receive.
+ * @returns {{
+ *     type: SET_MAX_RECEIVER_VIDEO_QUALITY,
+ *     maxReceiverVideoQuality: number
+ * }}
+ */
+export function setMaxReceiverVideoQuality(maxReceiverVideoQuality: number) {
+    return {
+        type: SET_MAX_RECEIVER_VIDEO_QUALITY,
+        maxReceiverVideoQuality
+    };
+}
+
 /**
  * Sets the password to join or lock a specific JitsiConference.
  *
@@ -642,18 +659,21 @@ export function setPassword(
 }
 
 /**
- * Sets the max frame height to receive from remote participant videos.
+ * Sets the max frame height the user prefers to receive from remote participant
+ * videos.
  *
- * @param {number} receiveVideoQuality - The max video resolution to receive.
+ * @param {number} preferredReceiverVideoQuality - The max video resolution to
+ * receive.
  * @returns {{
- *     type: SET_RECEIVE_VIDEO_QUALITY,
- *     receiveVideoQuality: number
+ *     type: SET_PREFERRED_RECEIVER_VIDEO_QUALITY,
+ *     preferredReceiverVideoQuality: number
  * }}
  */
-export function setReceiveVideoQuality(receiveVideoQuality: number) {
+export function setPreferredReceiverVideoQuality(
+        preferredReceiverVideoQuality: number) {
     return {
-        type: SET_RECEIVE_VIDEO_QUALITY,
-        receiveVideoQuality
+        type: SET_PREFERRED_RECEIVER_VIDEO_QUALITY,
+        preferredReceiverVideoQuality
     };
 }
 

react/features/base/conference/functions.js

@@ -11,6 +11,8 @@ import {
     JITSI_CONFERENCE_URL_KEY
 } from './constants';
 
+const logger = require('jitsi-meet-logger').getLogger(__filename);
+
 /**
  * Attach a set of local tracks to a conference.
  *
@@ -172,7 +174,7 @@ export function _removeLocalTracksFromConference(
 function _reportError(msg, err) {
     // TODO This is a good point to call some global error handler when we have
     // one.
-    console.error(msg, err);
+    logger.error(msg, err);
 }
 
 /**

react/features/base/conference/middleware.js

@@ -17,24 +17,24 @@ import {
     getPinnedParticipant,
     PIN_PARTICIPANT
 } from '../participants';
-import { MiddlewareRegistry } from '../redux';
+import { MiddlewareRegistry, StateListenerRegistry } from '../redux';
 import UIEvents from '../../../../service/UI/UIEvents';
 import { TRACK_ADDED, TRACK_REMOVED } from '../tracks';
 
 import {
     conferenceFailed,
     conferenceLeft,
+    conferenceWillLeave,
     createConference,
-    setLastN,
-    toggleAudioOnly
+    setLastN
 } from './actions';
 import {
     CONFERENCE_FAILED,
     CONFERENCE_JOINED,
+    CONFERENCE_WILL_LEAVE,
     DATA_CHANNEL_OPENED,
     SET_AUDIO_ONLY,
     SET_LASTN,
-    SET_RECEIVE_VIDEO_QUALITY,
     SET_ROOM
 } from './actionTypes';
 import {
@@ -48,6 +48,11 @@ const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 declare var APP: Object;
 
+/**
+ * Handler for before unload event.
+ */
+let beforeUnloadHandler;
+
 /**
  * Implements the middleware of the feature base/conference.
  *
@@ -68,6 +73,10 @@ MiddlewareRegistry.register(store => next => action => {
     case CONNECTION_FAILED:
         return _connectionFailed(store, next, action);
 
+    case CONFERENCE_WILL_LEAVE:
+        _conferenceWillLeave();
+        break;
+
     case DATA_CHANNEL_OPENED:
         return _syncReceiveVideoQuality(store, next, action);
 
@@ -80,9 +89,6 @@ MiddlewareRegistry.register(store => next => action => {
     case SET_LASTN:
         return _setLastN(store, next, action);
 
-    case SET_RECEIVE_VIDEO_QUALITY:
-        return _setReceiveVideoQuality(store, next, action);
-
     case SET_ROOM:
         return _setRoom(store, next, action);
 
@@ -94,6 +100,32 @@ MiddlewareRegistry.register(store => next => action => {
     return next(action);
 });
 
+/**
+ * Registers a change handler for state['features/base/conference'] to update
+ * the preferred video quality levels based on user preferred and internal
+ * settings.
+ */
+StateListenerRegistry.register(
+    /* selector */ state => state['features/base/conference'],
+    /* listener */ (currentState, store, previousState = {}) => {
+        const {
+            conference,
+            maxReceiverVideoQuality,
+            preferredReceiverVideoQuality
+        } = currentState;
+        const changedPreferredVideoQuality = preferredReceiverVideoQuality
+            !== previousState.preferredReceiverVideoQuality;
+        const changedMaxVideoQuality = maxReceiverVideoQuality
+            !== previousState.maxReceiverVideoQuality;
+
+        if (changedPreferredVideoQuality || changedMaxVideoQuality) {
+            _setReceiverVideoConstraint(
+                conference,
+                preferredReceiverVideoQuality,
+                maxReceiverVideoQuality);
+        }
+    });
+
 /**
  * Makes sure to leave a failed conference in order to release any allocated
  * resources like peer connections, emit participant left events, etc.
@@ -114,6 +146,11 @@ function _conferenceFailed(store, next, action) {
     // conference is handled by /conference.js and appropriate failure handlers
     // are set there.
     if (typeof APP !== 'undefined') {
+        if (typeof beforeUnloadHandler !== 'undefined') {
+            window.removeEventListener('beforeunload', beforeUnloadHandler);
+            beforeUnloadHandler = undefined;
+        }
+
         return result;
     }
 
@@ -154,6 +191,16 @@ function _conferenceJoined({ dispatch, getState }, next, action) {
     // and the LastN value needs to be synchronized here.
     audioOnly && conference.getLastN() !== 0 && dispatch(setLastN(0));
 
+    // FIXME: Very dirty solution. This will work on web only.
+    // When the user closes the window or quits the browser, lib-jitsi-meet
+    // handles the process of leaving the conference. This is temporary solution
+    // that should cover the described use case as part of the effort to
+    // implement the conferenceWillLeave action for web.
+    beforeUnloadHandler = () => {
+        dispatch(conferenceWillLeave(conference));
+    };
+    window.addEventListener('beforeunload', beforeUnloadHandler);
+
     return result;
 }
 
@@ -206,6 +253,11 @@ function _connectionFailed({ dispatch, getState }, next, action) {
 
     const result = next(action);
 
+    if (typeof beforeUnloadHandler !== 'undefined') {
+        window.removeEventListener('beforeunload', beforeUnloadHandler);
+        beforeUnloadHandler = undefined;
+    }
+
     // FIXME: Workaround for the web version. Currently, the creation of the
     // conference is handled by /conference.js and appropriate failure handlers
     // are set there.
@@ -245,6 +297,21 @@ function _connectionFailed({ dispatch, getState }, next, action) {
     return result;
 }
 
+/**
+ * Notifies the feature base/conference that the action
+ * {@code CONFERENCE_WILL_LEAVE} is being dispatched within a specific redux
+ * store.
+ *
+ * @private
+ * @returns {void}
+ */
+function _conferenceWillLeave() {
+    if (typeof beforeUnloadHandler !== 'undefined') {
+        window.removeEventListener('beforeunload', beforeUnloadHandler);
+        beforeUnloadHandler = undefined;
+    }
+}
+
 /**
  * Returns whether or not a CONNECTION_FAILED action is for a possible split
  * brain error. A split brain error occurs when at least two users join a
@@ -426,7 +493,7 @@ function _setLastN({ getState }, next, action) {
         try {
             conference.setLastN(action.lastN);
         } catch (err) {
-            console.error(`Failed to set lastN: ${err}`);
+            logger.error(`Failed to set lastN: ${err}`);
         }
     }
 
@@ -434,27 +501,20 @@ function _setLastN({ getState }, next, action) {
 }
 
 /**
- * Sets the maximum receive video quality and will turn off audio only mode if
- * enabled.
+ * Helper function for updating the preferred receiver video constraint, based
+ * on the user preference and the internal maximum.
  *
- * @param {Store} store - The redux store in which the specified {@code action}
- * is being dispatched.
- * @param {Dispatch} next - The redux {@code dispatch} function to dispatch the
- * specified {@code action} to the specified {@code store}.
- * @param {Action} action - The redux action {@code SET_RECEIVE_VIDEO_QUALITY}
- * which is being dispatched in the specified {@code store}.
- * @private
- * @returns {Object} The value returned by {@code next(action)}.
+ * @param {JitsiConference} conference - The JitsiConference instance for the
+ * current call.
+ * @param {number} preferred - The user preferred max frame height.
+ * @param {number} max - The maximum frame height the application should
+ * receive.
+ * @returns {void}
  */
-function _setReceiveVideoQuality({ dispatch, getState }, next, action) {
-    const { audioOnly, conference } = getState()['features/base/conference'];
-
+function _setReceiverVideoConstraint(conference, preferred, max) {
     if (conference) {
-        conference.setReceiverVideoConstraint(action.receiveVideoQuality);
-        audioOnly && dispatch(toggleAudioOnly());
+        conference.setReceiverVideoConstraint(Math.min(preferred, max));
     }
-
-    return next(action);
 }
 
 /**
@@ -544,9 +604,16 @@ function _syncConferenceLocalTracksWithState({ getState }, action) {
  * @returns {Object} The value returned by {@code next(action)}.
  */
 function _syncReceiveVideoQuality({ getState }, next, action) {
-    const state = getState()['features/base/conference'];
+    const {
+        conference,
+        maxReceiverVideoQuality,
+        preferredReceiverVideoQuality
+    } = getState()['features/base/conference'];
 
-    state.conference.setReceiverVideoConstraint(state.receiveVideoQuality);
+    _setReceiverVideoConstraint(
+        conference,
+        preferredReceiverVideoQuality,
+        maxReceiverVideoQuality);
 
     return next(action);
 }

react/features/base/conference/reducer.js

@@ -17,8 +17,9 @@ import {
     SET_AUDIO_ONLY,
     SET_DESKTOP_SHARING_ENABLED,
     SET_FOLLOW_ME,
+    SET_MAX_RECEIVER_VIDEO_QUALITY,
     SET_PASSWORD,
-    SET_RECEIVE_VIDEO_QUALITY,
+    SET_PREFERRED_RECEIVER_VIDEO_QUALITY,
     SET_ROOM,
     SET_SIP_GATEWAY_ENABLED,
     SET_START_MUTED_POLICY
@@ -26,71 +27,88 @@ import {
 import { VIDEO_QUALITY_LEVELS } from './constants';
 import { isRoomValid } from './functions';
 
+const DEFAULT_STATE = {
+    joining: undefined,
+    maxReceiverVideoQuality: VIDEO_QUALITY_LEVELS.HIGH,
+    preferredReceiverVideoQuality: VIDEO_QUALITY_LEVELS.HIGH
+};
+
 /**
  * Listen for actions that contain the conference object, so that it can be
  * stored for use by other action creators.
  */
-ReducerRegistry.register('features/base/conference', (state = {}, action) => {
-    switch (action.type) {
-    case AUTH_STATUS_CHANGED:
-        return _authStatusChanged(state, action);
+ReducerRegistry.register(
+    'features/base/conference',
+    (state = DEFAULT_STATE, action) => {
+        switch (action.type) {
+        case AUTH_STATUS_CHANGED:
+            return _authStatusChanged(state, action);
 
-    case CONFERENCE_FAILED:
-        return _conferenceFailed(state, action);
+        case CONFERENCE_FAILED:
+            return _conferenceFailed(state, action);
 
-    case CONFERENCE_JOINED:
-        return _conferenceJoined(state, action);
+        case CONFERENCE_JOINED:
+            return _conferenceJoined(state, action);
 
-    case CONFERENCE_LEFT:
-    case CONFERENCE_WILL_LEAVE:
-        return _conferenceLeftOrWillLeave(state, action);
+        case CONFERENCE_LEFT:
+        case CONFERENCE_WILL_LEAVE:
+            return _conferenceLeftOrWillLeave(state, action);
 
-    case CONFERENCE_WILL_JOIN:
-        return _conferenceWillJoin(state, action);
+        case CONFERENCE_WILL_JOIN:
+            return _conferenceWillJoin(state, action);
 
-    case CONNECTION_WILL_CONNECT:
-        return set(state, 'authRequired', undefined);
+        case CONNECTION_WILL_CONNECT:
+            return set(state, 'authRequired', undefined);
 
-    case LOCK_STATE_CHANGED:
-        return _lockStateChanged(state, action);
+        case LOCK_STATE_CHANGED:
+            return _lockStateChanged(state, action);
 
-    case P2P_STATUS_CHANGED:
-        return _p2pStatusChanged(state, action);
+        case P2P_STATUS_CHANGED:
+            return _p2pStatusChanged(state, action);
 
-    case SET_AUDIO_ONLY:
-        return _setAudioOnly(state, action);
+        case SET_AUDIO_ONLY:
+            return _setAudioOnly(state, action);
 
-    case SET_DESKTOP_SHARING_ENABLED:
-        return _setDesktopSharingEnabled(state, action);
+        case SET_DESKTOP_SHARING_ENABLED:
+            return _setDesktopSharingEnabled(state, action);
 
-    case SET_FOLLOW_ME:
-        return set(state, 'followMeEnabled', action.enabled);
+        case SET_FOLLOW_ME:
+            return set(state, 'followMeEnabled', action.enabled);
 
-    case SET_LOCATION_URL:
-        return set(state, 'room', undefined);
+        case SET_LOCATION_URL:
+            return set(state, 'room', undefined);
 
-    case SET_PASSWORD:
-        return _setPassword(state, action);
+        case SET_MAX_RECEIVER_VIDEO_QUALITY:
+            return set(
+                state,
+                'maxReceiverVideoQuality',
+                action.maxReceiverVideoQuality);
 
-    case SET_RECEIVE_VIDEO_QUALITY:
-        return _setReceiveVideoQuality(state, action);
+        case SET_PASSWORD:
+            return _setPassword(state, action);
 
-    case SET_ROOM:
-        return _setRoom(state, action);
+        case SET_PREFERRED_RECEIVER_VIDEO_QUALITY:
+            return set(
+                state,
+                'preferredReceiverVideoQuality',
+                action.preferredReceiverVideoQuality);
 
-    case SET_SIP_GATEWAY_ENABLED:
-        return _setSIPGatewayEnabled(state, action);
+        case SET_ROOM:
+            return _setRoom(state, action);
 
-    case SET_START_MUTED_POLICY:
-        return {
-            ...state,
-            startAudioMutedPolicy: action.startAudioMutedPolicy,
-            startVideoMutedPolicy: action.startVideoMutedPolicy
-        };
-    }
+        case SET_SIP_GATEWAY_ENABLED:
+            return _setSIPGatewayEnabled(state, action);
 
-    return state;
-});
+        case SET_START_MUTED_POLICY:
+            return {
+                ...state,
+                startAudioMutedPolicy: action.startAudioMutedPolicy,
+                startVideoMutedPolicy: action.startVideoMutedPolicy
+            };
+        }
+
+        return state;
+    });
 
 /**
  * Reduces a specific Redux action AUTH_STATUS_CHANGED of the feature
@@ -203,15 +221,7 @@ function _conferenceJoined(state, { conference }) {
          * @type {boolean}
          */
         locked,
-        passwordRequired: undefined,
-
-        /**
-         * The current resolution restraint on receiving remote video. By
-         * default the conference will send the highest level possible.
-         *
-         * @type number
-         */
-        receiveVideoQuality: VIDEO_QUALITY_LEVELS.HIGH
+        passwordRequired: undefined
     });
 }
 
@@ -402,21 +412,6 @@ function _setPassword(state, { conference, method, password }) {
     return state;
 }
 
-/**
- * Reduces a specific Redux action SET_RECEIVE_VIDEO_QUALITY of the feature
- * base/conference.
- *
- * @param {Object} state - The Redux state of the feature base/conference.
- * @param {Action} action - The Redux action SET_RECEIVE_VIDEO_QUALITY to
- * reduce.
- * @private
- * @returns {Object} The new state of the feature base/conference after the
- * reduction of the specified action.
- */
-function _setReceiveVideoQuality(state, action) {
-    return set(state, 'receiveVideoQuality', action.receiveVideoQuality);
-}
-
 /**
  * Reduces a specific Redux action SET_ROOM of the feature base/conference.
  *

react/features/base/config/middleware.js

@@ -1,6 +1,6 @@
 // @flow
 
-import { APP_WILL_MOUNT } from '../../app';
+import { APP_WILL_MOUNT } from '../app';
 import { addKnownDomains } from '../known-domains';
 import { MiddlewareRegistry } from '../redux';
 import { parseURIString } from '../util';

react/features/base/config/parseURLParams.js

@@ -1,5 +1,7 @@
 /* @flow */
 
+import { reportError } from '../util';
+
 /**
  * Parses the query/search or fragment/hash parameters out of a specific URL and
  * returns them as a JS object.
@@ -36,10 +38,8 @@ export default function parseURLParams(
                     = JSON.parse(decodeURIComponent(value).replace(/\\&/, '&'));
             }
         } catch (e) {
-            const msg = `Failed to parse URL parameter value: ${String(value)}`;
-
-            console.warn(msg, e);
-            window.onerror && window.onerror(msg, null, null, null, e);
+            reportError(
+                e, `Failed to parse URL parameter value: ${String(value)}`);
 
             return;
         }

react/features/base/config/reducer.js

@@ -37,6 +37,9 @@ const INITIAL_RN_STATE = {
     // fastest to merely disable them.
     disableAudioLevels: true,
 
+    // FIXME flow complains about missing 'locationURL' missing in _setConfig
+    locationURL: undefined,
+
     p2p: {
         disableH264: false,
         preferH264: true
@@ -126,8 +129,10 @@ function _setConfig(state, { config }) {
 
     const newState = _.merge(
         {},
-        config,
-        { error: undefined },
+        config, {
+            error: undefined,
+            locationURL: state.locationURL
+        },
 
         // The config of _getInitialState() is meant to override the config
         // downloaded from the Jitsi Meet deployment because the former contains

react/features/base/devices/actionTypes.js

@@ -9,17 +9,6 @@
  */
 export const SET_AUDIO_INPUT_DEVICE = Symbol('SET_AUDIO_INPUT_DEVICE');
 
-/**
- * The type of Redux action which signals that the currently used audio
- * output device should be changed.
- *
- * {
- *     type: SET_AUDIO_OUTPUT_DEVICE,
- *     deviceId: string,
- * }
- */
-export const SET_AUDIO_OUTPUT_DEVICE = Symbol('SET_AUDIO_OUTPUT_DEVICE');
-
 /**
  * The type of Redux action which signals that the currently used video
  * input device should be changed.