rn: drop {AddPeople,Invite}Controller

We are going to implement the invite dialog *inside* the SDK, so there is no
need to have all this machinery anymore.

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

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

.github/ISSUE_TEMPLATE/2-help.md

@@ -0,0 +1,10 @@
+---
+name: Need help with Jitsi Meet?
+about: Please ask it in our community at https://community.jitsi.org
+
+---
+
+If you have a question about Jitsi Meet that is not a bug report or feature
+request, please post it in https://community.jitsi.org
+
+Questions posted to this repository will be closed.

.github/ISSUE_TEMPLATE/3-feature-request.md

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

.gitignore

@@ -35,6 +35,7 @@ xcuserdata
 DerivedData
 *.hmap
 *.ipa
+*.dSYM.zip
 *.xcuserstate
 project.xcworkspace
 
@@ -76,3 +77,6 @@ buck-out/
 .jshintignore
 .jshintrc
 
+# VSCode files
+android/.project
+android/.settings/org.eclipse.buildship.core.prefs

android/README.md

@@ -87,6 +87,10 @@ Change this value (which represents the Maven repository location used internall
 
 Make sure to do this in both files! Each file should require one line to be changed.
 
+To prevent artifacts from previous builds affecting you're outcome, it's good to start with cleaning your work directories:
+
+    $ ./gradlew clean
+
 To create the release assembly for any _specific_ third-party React Native module that you need, you can execture the following commands, replace the module name in the examples below.
 
     $ ./gradlew :react-native-webrtc:assembleRelease
@@ -99,7 +103,7 @@ You build and publish the SDK itself in the same way:
 
 Alternatively, you can assemble and publish _all_ subprojects, which include the react-native modules, but also the SDK itself, with a single command:
 
-    $ ./gradlew assembleRelease publish
+    $ ./gradlew clean assembleRelease publish
 
 You're now ready to use the artifacts. In _your_ project, add the Maven repository that you used above (`/tmp/repo`) into your top-level `build.gradle` file:
 

android/app/build.gradle

@@ -91,18 +91,10 @@ gradle.projectsEvaluated {
     // Dropbox integration
     //
 
-    def plistParser = new XmlSlurper(
-            /* validating */ false,
-            /* namespaceAware */ false,
-            /* allowDocTypeDeclaration */ true)
-    plistParser.setFeature(
-            'http://apache.org/xml/features/nonvalidating/load-external-dtd',
-            false)
-    def plist = plistParser.parse('../ios/app/src/Info.plist')
-    def dropboxScheme = plist.dict.array.dict.array.string.find { string ->
-        string.text().startsWith('db-')
+    def dropboxAppKey
+    if (project.file('dropbox.key').exists()) {
+        dropboxAppKey = project.file('dropbox.key').text.trim() - 'db-'
     }
-    def dropboxAppKey = dropboxScheme?.text() - 'db-'
 
     if (dropboxAppKey) {
         android.defaultConfig.resValue('string', 'dropbox_app_key', "${dropboxAppKey}")
@@ -118,7 +110,7 @@ gradle.projectsEvaluated {
               <category android:name="android.intent.category.DEFAULT" />
               <data android:scheme="db-${dropboxAppKey}" />
             </intent-filter>
-          </activity>""";
+          </activity>"""
 
         android.applicationVariants.all { variant ->
             variant.outputs.each { output ->

android/app/proguard-rules.pro

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

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

@@ -24,10 +24,6 @@ import android.util.Log;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
 import org.jitsi.meet.sdk.JitsiMeetView;
 import org.jitsi.meet.sdk.JitsiMeetViewListener;
-import org.jitsi.meet.sdk.invite.AddPeopleController;
-import org.jitsi.meet.sdk.invite.AddPeopleControllerListener;
-import org.jitsi.meet.sdk.invite.InviteController;
-import org.jitsi.meet.sdk.invite.InviteControllerListener;
 
 import com.crashlytics.android.Crashlytics;
 import com.facebook.react.bridge.UiThreadUtil;
@@ -36,8 +32,6 @@ import io.fabric.sdk.android.Fabric;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -53,13 +47,6 @@ import java.util.Map;
  * {@code react-native run-android}.
  */
 public class MainActivity extends JitsiMeetActivity {
-    /**
-     * The query to perform through {@link AddPeopleController} when the
-     * {@code InviteButton} is tapped in order to exercise the public API of the
-     * feature invite. If {@code null}, the {@code InviteButton} will not be
-     * rendered.
-     */
-    private static final String ADD_PEOPLE_CONTROLLER_QUERY = null;
 
     @Override
     protected JitsiMeetView initializeView() {
@@ -113,72 +100,11 @@ public class MainActivity extends JitsiMeetActivity {
                 }
             });
 
-            // inviteController
-            final InviteController inviteController
-                = view.getInviteController();
-
-            inviteController.setListener(new InviteControllerListener() {
-                public void beginAddPeople(
-                        AddPeopleController addPeopleController) {
-                    onInviteControllerBeginAddPeople(
-                        inviteController,
-                        addPeopleController);
-                }
-            });
-            inviteController.setAddPeopleEnabled(
-                ADD_PEOPLE_CONTROLLER_QUERY != null);
-            inviteController.setDialOutEnabled(
-                inviteController.isAddPeopleEnabled());
         }
 
         return view;
     }
 
-    private void onAddPeopleControllerInviteSettled(
-            AddPeopleController addPeopleController,
-            List<Map<String, Object>> failedInvitees) {
-        UiThreadUtil.assertOnUiThread();
-
-        // XXX Explicitly invoke endAddPeople on addPeopleController; otherwise,
-        // it is going to be memory-leaked in the associated InviteController
-        // and no subsequent InviteButton clicks/taps will be delivered.
-        // Technically, endAddPeople will automatically be invoked if there are
-        // no failedInviteees i.e. the invite succeeeded for all specified
-        // invitees.
-        addPeopleController.endAddPeople();
-    }
-
-    private void onAddPeopleControllerReceivedResults(
-            AddPeopleController addPeopleController,
-            List<Map<String, Object>> results,
-            String query) {
-        UiThreadUtil.assertOnUiThread();
-
-        int size = results.size();
-
-        if (size > 0) {
-            // Exercise AddPeopleController's inviteById implementation.
-            List<String> ids = new ArrayList<>(size);
-
-            for (Map<String, Object> result : results) {
-                Object id = result.get("id");
-
-                if (id != null) {
-                    ids.add(id.toString());
-                }
-            }
-
-            addPeopleController.inviteById(ids);
-
-            return;
-        }
-
-        // XXX Explicitly invoke endAddPeople on addPeopleController; otherwise,
-        // it is going to be memory-leaked in the associated InviteController
-        // and no subsequent InviteButton clicks/taps will be delivered.
-        addPeopleController.endAddPeople();
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // As this is the Jitsi Meet app (i.e. not the Jitsi Meet SDK), we do
@@ -213,47 +139,4 @@ public class MainActivity extends JitsiMeetActivity {
         }
     }
 
-    private void onInviteControllerBeginAddPeople(
-            InviteController inviteController,
-            AddPeopleController addPeopleController) {
-        UiThreadUtil.assertOnUiThread();
-
-        // Log with the tag "ReactNative" in order to have the log visible in
-        // react-native log-android as well.
-        Log.d(
-            "ReactNative",
-            InviteControllerListener.class.getSimpleName() + ".beginAddPeople");
-
-        String query = ADD_PEOPLE_CONTROLLER_QUERY;
-    
-        if (query != null
-                && (inviteController.isAddPeopleEnabled()
-                    || inviteController.isDialOutEnabled())) {
-            addPeopleController.setListener(new AddPeopleControllerListener() {
-                public void onInviteSettled(
-                        AddPeopleController addPeopleController,
-                        List<Map<String, Object>> failedInvitees) {
-                    onAddPeopleControllerInviteSettled(
-                        addPeopleController,
-                        failedInvitees);
-                }
-
-                public void onReceivedResults(
-                        AddPeopleController addPeopleController,
-                        List<Map<String, Object>> results,
-                        String query) {
-                    onAddPeopleControllerReceivedResults(
-                        addPeopleController,
-                        results, query);
-                }
-            });
-            addPeopleController.performQuery(query);
-        } else {
-            // XXX Explicitly invoke endAddPeople on addPeopleController;
-            // otherwise, it is going to be memory-leaked in the associated
-            // InviteController and no subsequent InviteButton clicks/taps will
-            // be delivered.
-            addPeopleController.endAddPeople();
-        }
-    }
 }

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

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

android/gradle.properties

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

android/sdk/proguard-rules.pro

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

android/sdk/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
   <uses-permission android:name="android.permission.BLUETOOTH" />
   <uses-permission android:name="android.permission.CAMERA" />
   <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.MANAGE_OWN_CALLS"/>
   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
   <uses-permission android:name="android.permission.RECORD_AUDIO" />
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@@ -26,5 +27,11 @@
       android:supportsRtl="true">
     <activity
         android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    <service android:name="org.jitsi.meet.sdk.ConnectionService"
+        android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE">
+      <intent-filter>
+        <action android:name="android.telecom.ConnectionService" />
+      </intent-filter>
+    </service>
   </application>
 </manifest>

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

@@ -25,6 +25,8 @@ import android.content.pm.PackageManager;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.os.Build;
+import android.support.annotation.RequiresApi;
+import android.telecom.CallAudioState;
 import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
@@ -100,6 +102,69 @@ class AudioModeModule
      */
     static final String TAG = MODULE_NAME;
 
+    /**
+     * Converts any of the "DEVICE_" constants into the corresponding
+     * {@link CallAudioState} "ROUTE_" number.
+     *
+     * @param audioDevice one of the "DEVICE_" constants.
+     * @return a route number {@link CallAudioState#ROUTE_EARPIECE} if no match
+     * is found.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private static int audioDeviceToRouteInt(String audioDevice) {
+        if (audioDevice == null) {
+            return CallAudioState.ROUTE_EARPIECE;
+        }
+        switch (audioDevice) {
+            case DEVICE_BLUETOOTH:
+                return CallAudioState.ROUTE_BLUETOOTH;
+            case DEVICE_EARPIECE:
+                return CallAudioState.ROUTE_EARPIECE;
+            case DEVICE_HEADPHONES:
+                return CallAudioState.ROUTE_WIRED_HEADSET;
+            case DEVICE_SPEAKER:
+                return CallAudioState.ROUTE_SPEAKER;
+            default:
+                Log.e(TAG, "Unsupported device name: " + audioDevice);
+                return CallAudioState.ROUTE_EARPIECE;
+        }
+    }
+
+    /**
+     * Populates given route mask into the "DEVICE_" list.
+     *
+     * @param supportedRouteMask an integer coming from
+     * {@link CallAudioState#getSupportedRouteMask()}.
+     * @return a list of device names.
+     */
+    private static Set<String> routesToDeviceNames(int supportedRouteMask) {
+        Set<String> devices = new HashSet<>();
+        if ((supportedRouteMask & CallAudioState.ROUTE_EARPIECE)
+                == CallAudioState.ROUTE_EARPIECE) {
+            devices.add(DEVICE_EARPIECE);
+        }
+        if ((supportedRouteMask & CallAudioState.ROUTE_BLUETOOTH)
+                == CallAudioState.ROUTE_BLUETOOTH) {
+            devices.add(DEVICE_BLUETOOTH);
+        }
+        if ((supportedRouteMask & CallAudioState.ROUTE_SPEAKER)
+                == CallAudioState.ROUTE_SPEAKER) {
+            devices.add(DEVICE_SPEAKER);
+        }
+        if ((supportedRouteMask & CallAudioState.ROUTE_WIRED_HEADSET)
+                == CallAudioState.ROUTE_WIRED_HEADSET) {
+            devices.add(DEVICE_HEADPHONES);
+        }
+        return devices;
+    }
+
+    /**
+     * Whether or not the ConnectionService is used for selecting audio devices.
+     */
+    private static boolean useConnectionService() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+    }
+
     /**
      * Indicator that we have lost audio focus.
      */
@@ -204,6 +269,15 @@ class AudioModeModule
      */
     private String selectedDevice;
 
+    /**
+     * Used on API >= 26 to store the most recently reported audio devices.
+     * Makes it easier to compare for a change, because the devices are stored
+     * as a mask in the {@link CallAudioState}. The mask is populated into
+     * the {@link #availableDevices} on each update.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private int supportedRouteMask;
+
     /**
      * User selected device. When null the default is used depending on the
      * mode.
@@ -224,21 +298,25 @@ class AudioModeModule
             = (AudioManager)
                 reactContext.getSystemService(Context.AUDIO_SERVICE);
 
-        // Setup runtime device change detection.
-        setupAudioRouteChangeDetection();
+        // Starting Oreo the ConnectionImpl from ConnectionService us used to
+        // detect the available devices.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            // Setup runtime device change detection.
+            setupAudioRouteChangeDetection();
 
-        // Do an initial detection on Android >= M.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            runInAudioThread(onAudioDeviceChangeRunner);
-        } else {
-            // On Android < M, detect if we have an earpiece.
-            PackageManager pm = reactContext.getPackageManager();
-            if (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-                availableDevices.add(DEVICE_EARPIECE);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                // Do an initial detection on Android >= M.
+                runInAudioThread(onAudioDeviceChangeRunner);
+            } else {
+                // On Android < M, detect if we have an earpiece.
+                PackageManager pm = reactContext.getPackageManager();
+                if (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+                    availableDevices.add(DEVICE_EARPIECE);
+                }
+
+                // Always assume there is a speaker.
+                availableDevices.add(DEVICE_SPEAKER);
             }
-
-            // Always assume there is a speaker.
-            availableDevices.add(DEVICE_SPEAKER);
         }
     }
 
@@ -354,6 +432,38 @@ class AudioModeModule
         });
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    void onCallAudioStateChange(final CallAudioState callAudioState) {
+        runInAudioThread(new Runnable() {
+            @Override
+            public void run() {
+                int newSupportedRoutes = callAudioState.getSupportedRouteMask();
+                boolean audioDevicesChanged
+                        = supportedRouteMask != newSupportedRoutes;
+                if (audioDevicesChanged) {
+                    supportedRouteMask = newSupportedRoutes;
+                    availableDevices = routesToDeviceNames(supportedRouteMask);
+                    Log.d(TAG,
+                          "Available audio devices: "
+                                  + availableDevices.toString());
+                }
+
+                boolean audioRouteChanged
+                    = audioDeviceToRouteInt(selectedDevice)
+                            != callAudioState.getRoute();
+
+                if (audioRouteChanged || audioDevicesChanged) {
+                    // Reset user selection
+                    userSelectedDevice = null;
+
+                    if (mode != -1) {
+                        updateAudioRoute(mode);
+                    }
+                }
+            }
+        });
+    }
+
     /**
      * {@link AudioManager.OnAudioFocusChangeListener} interface method. Called
      * when the audio focus of the system is updated.
@@ -417,6 +527,31 @@ class AudioModeModule
         });
     }
 
+    /**
+     * The API >= 26 way of adjusting the audio route.
+     *
+     * @param audioDevice one of the "DEVICE_" names to set as the audio route.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private void setAudioRoute(String audioDevice) {
+        int newAudioRoute = audioDeviceToRouteInt(audioDevice);
+
+        RNConnectionService.setAudioRoute(newAudioRoute);
+    }
+
+    /**
+     * The API < 26 way of adjusting the audio route.
+     *
+     * @param audioDevice one of the "DEVICE_" names to set as the audio route.
+     */
+    private void setAudioRoutePreO(String audioDevice) {
+        // Turn bluetooth on / off
+        setBluetoothAudioRoute(audioDevice.equals(DEVICE_BLUETOOTH));
+
+        // Turn speaker on / off
+        audioManager.setSpeakerphoneOn(audioDevice.equals(DEVICE_SPEAKER));
+    }
+
     /**
      * Helper method to set the output route to a Bluetooth device.
      *
@@ -475,7 +610,7 @@ class AudioModeModule
 
     /**
      * Setup the audio route change detection mechanism. We use the
-     * {@link android.media.AudioDeviceCallback} API on Android >= 23 only.
+     * {@link android.media.AudioDeviceCallback} on 23 >= Android API < 26.
      */
     private void setupAudioRouteChangeDetection() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -486,7 +621,7 @@ class AudioModeModule
     }
 
     /**
-     * Audio route change detection mechanism for Android API >= 23.
+     * Audio route change detection mechanism for 23 >= Android API < 26.
      */
     @TargetApi(Build.VERSION_CODES.M)
     private void setupAudioRouteChangeDetectionM() {
@@ -542,27 +677,31 @@ class AudioModeModule
         Log.d(TAG, "Update audio route for mode: " + mode);
 
         if (mode == DEFAULT) {
-            audioFocusLost = false;
-            audioManager.setMode(AudioManager.MODE_NORMAL);
-            audioManager.abandonAudioFocus(this);
-            audioManager.setSpeakerphoneOn(false);
-            setBluetoothAudioRoute(false);
+            if (!useConnectionService()) {
+                audioFocusLost = false;
+                audioManager.setMode(AudioManager.MODE_NORMAL);
+                audioManager.abandonAudioFocus(this);
+                audioManager.setSpeakerphoneOn(false);
+                setBluetoothAudioRoute(false);
+            }
             selectedDevice = null;
             userSelectedDevice = null;
 
             return true;
         }
 
-        audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-        audioManager.setMicrophoneMute(false);
+        if (!useConnectionService()) {
+            audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+            audioManager.setMicrophoneMute(false);
 
-        if (audioManager.requestAudioFocus(
+            if (audioManager.requestAudioFocus(
                     this,
                     AudioManager.STREAM_VOICE_CALL,
                     AudioManager.AUDIOFOCUS_GAIN)
-                == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
-            Log.d(TAG, "Audio focus request failed");
-            return false;
+                    == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
+                Log.d(TAG, "Audio focus request failed");
+                return false;
+            }
         }
 
         boolean bluetoothAvailable = availableDevices.contains(DEVICE_BLUETOOTH);
@@ -596,11 +735,11 @@ class AudioModeModule
         selectedDevice = audioDevice;
         Log.d(TAG, "Selected audio device: " + audioDevice);
 
-        // Turn bluetooth on / off
-        setBluetoothAudioRoute(audioDevice.equals(DEVICE_BLUETOOTH));
-
-        // Turn speaker on / off
-        audioManager.setSpeakerphoneOn(audioDevice.equals(DEVICE_SPEAKER));
+        if (useConnectionService()) {
+            setAudioRoute(audioDevice);
+        } else {
+            setAudioRoutePreO(audioDevice);
+        }
 
         return true;
     }

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

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

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

@@ -24,8 +24,6 @@ import android.util.Log;
 
 import com.facebook.react.bridge.ReadableMap;
 
-import org.jitsi.meet.sdk.invite.InviteController;
-
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.Map;
@@ -78,12 +76,6 @@ public class JitsiMeetView
      */
     private URL defaultURL;
 
-    /**
-     * The entry point into the invite feature of Jitsi Meet. The Java
-     * counterpart of the JavaScript {@code InviteButton}.
-     */
-    private final InviteController inviteController;
-
     /**
      * Whether Picture-in-Picture is enabled. If {@code null}, defaults to
      * {@code true} iff the Android platform supports Picture-in-Picture
@@ -106,10 +98,6 @@ public class JitsiMeetView
     public JitsiMeetView(@NonNull Context context) {
         super(context);
 
-        // The entry point into the invite feature of Jitsi Meet. The Java
-        // counterpart of the JavaScript InviteButton.
-        inviteController = new InviteController(externalAPIScope);
-
         // Check if the parent Activity implements JitsiMeetActivityInterface,
         // otherwise things may go wrong.
         if (!(context instanceof JitsiMeetActivityInterface)) {
@@ -155,19 +143,6 @@ public class JitsiMeetView
         return defaultURL;
     }
 
-    /**
-     * Gets the {@link InviteController} which represents the entry point into
-     * the invite feature of Jitsi Meet and is the Java counterpart of the
-     * JavaScript {@code InviteButton}.
-     *
-     * @return the {@link InviteController} which represents the entry point
-     * into the invite feature of Jitsi Meet and is the Java counterpart of the
-     * JavaScript {@code InviteButton}
-     */
-    public InviteController getInviteController() {
-        return inviteController;
-    }
-
     /**
      * Gets the URL of the current conference.
      *
@@ -238,18 +213,6 @@ public class JitsiMeetView
             props.putString("defaultURL", defaultURL.toString());
         }
 
-        // inviteController
-        InviteController inviteController = getInviteController();
-
-        if (inviteController != null) {
-            props.putBoolean(
-                "addPeopleEnabled",
-                inviteController.isAddPeopleEnabled());
-            props.putBoolean(
-                "dialOutEnabled",
-                inviteController.isDialOutEnabled());
-        }
-
         // pictureInPictureEnabled
         props.putBoolean(
             "pictureInPictureEnabled",

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

@@ -16,6 +16,7 @@
 
 package org.jitsi.meet.sdk;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.PictureInPictureParams;
 import android.os.Build;
@@ -53,6 +54,7 @@ class PictureInPictureModule
      * including when the activity is not visible (paused or stopped), if the
      * screen is locked or if the user has an activity pinned.
      */
+    @TargetApi(Build.VERSION_CODES.O)
     public void enterPictureInPicture() {
         if (!isPictureInPictureSupported()) {
             throw new IllegalStateException("Picture-in-Picture not supported");

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

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

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

@@ -25,11 +25,17 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.common.LifecycleState;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 class ReactInstanceManagerHolder {
     /**
+     * FIXME (from linter): Do not place Android context classes in static
+     * fields (static reference to ReactInstanceManager which has field
+     * mApplicationContext pointing to Context); this is a memory leak (and
+     * also breaks Instant Run).
+     *
      * React Native bridge. The instance manager allows embedding applications
      * to create multiple root views off the same JavaScript bundle.
      */
@@ -37,19 +43,25 @@ class ReactInstanceManagerHolder {
 
     private static List<NativeModule> createNativeModules(
             ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(
-            new AndroidSettingsModule(reactContext),
-            new AppInfoModule(reactContext),
-            new AudioModeModule(reactContext),
-            new ExternalAPIModule(reactContext),
-            new LocaleDetector(reactContext),
-            new PictureInPictureModule(reactContext),
-            new ProximityModule(reactContext),
-            new WiFiStatsModule(reactContext),
-            new org.jitsi.meet.sdk.dropbox.Dropbox(reactContext),
-            new org.jitsi.meet.sdk.invite.InviteModule(reactContext),
-            new org.jitsi.meet.sdk.net.NAT64AddrInfoModule(reactContext)
-        );
+        List<NativeModule> nativeModules
+            = new ArrayList<>(Arrays.<NativeModule>asList(
+                new AndroidSettingsModule(reactContext),
+                new AppInfoModule(reactContext),
+                new AudioModeModule(reactContext),
+                new ExternalAPIModule(reactContext),
+                new LocaleDetector(reactContext),
+                new PictureInPictureModule(reactContext),
+                new ProximityModule(reactContext),
+                new WiFiStatsModule(reactContext),
+                new org.jitsi.meet.sdk.dropbox.Dropbox(reactContext),
+                new org.jitsi.meet.sdk.net.NAT64AddrInfoModule(reactContext)));
+
+        if (android.os.Build.VERSION.SDK_INT
+                >= android.os.Build.VERSION_CODES.O) {
+            nativeModules.add(new RNConnectionService(reactContext));
+        }
+
+        return nativeModules;
     }
 
     /**
@@ -58,7 +70,7 @@ class ReactInstanceManagerHolder {
      * @param eventName {@code String} containing the event name.
      * @param data {@code Object} optional ancillary data for the event.
      */
-    public static boolean emitEvent(
+    static boolean emitEvent(
             String eventName,
             @Nullable Object data) {
         ReactInstanceManager reactInstanceManager

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

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

android/sdk/src/main/java/org/jitsi/meet/sdk/dropbox/Dropbox.java

@@ -41,9 +41,11 @@ public class Dropbox
     public Dropbox(ReactApplicationContext reactContext) {
         super(reactContext);
 
+        String pkg = reactContext.getApplicationContext().getPackageName();
+        int resId = reactContext.getResources()
+            .getIdentifier("dropbox_app_key", "string", pkg);
         appKey
-            = reactContext.getString(
-                org.jitsi.meet.sdk.R.string.dropbox_app_key);
+            = reactContext.getString(resId);
         isEnabled = !TextUtils.isEmpty(appKey);
 
         clientId = generateClientId();

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

@@ -1,211 +0,0 @@
-/*
- * Copyright @ 2017-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk.invite;
-
-import android.util.Log;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableNativeArray;
-import com.facebook.react.bridge.WritableNativeMap;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * Controller object used by native code to query and submit user selections for
- * the user invitation flow.
- */
-public class AddPeopleController {
-
-    /**
-     * The AddPeopleControllerListener for this controller, used to pass query
-     * results back to the native code that initiated the query.
-     */
-    private AddPeopleControllerListener listener;
-
-    /**
-     * Local cache of search query results. Used to re-hydrate the list of
-     * selected items based on their ids passed to inviteById in order to pass
-     * the full item maps back to the JitsiMeetView during submission.
-     */
-    private final Map<String, ReadableMap> items = new HashMap<>();
-
-    private final WeakReference<InviteController> owner;
-
-    private final WeakReference<ReactApplicationContext> reactContext;
-
-    /**
-     * Randomly generated UUID, used for identification in the InviteModule.
-     */
-    private final String uuid = UUID.randomUUID().toString();
-
-    public AddPeopleController(
-            InviteController owner,
-            ReactApplicationContext reactContext) {
-        this.owner = new WeakReference<>(owner);
-        this.reactContext = new WeakReference<>(reactContext);
-    }
-
-    /**
-     * Cancel the invitation flow and free memory allocated to the
-     * AddPeopleController. After calling this method, this object is invalid -
-     * a new AddPeopleController will be passed to the caller through
-     * beginAddPeople.
-     */
-    public void endAddPeople() {
-        InviteController owner = this.owner.get();
-
-        if (owner != null) {
-            owner.endAddPeople(this);
-        }
-    }
-
-    /**
-     *
-     * @return the AddPeopleControllerListener for this controller, used to pass
-     * query results back to the native code that initiated the query.
-     */
-    public AddPeopleControllerListener getListener() {
-        return listener;
-    }
-
-    final ReactApplicationContext getReactApplicationContext() {
-        return reactContext.get();
-    }
-
-    /**
-     *
-     * @return the unique identifier for this AddPeopleController
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Send invites to selected users based on their item ids
-     *
-     * @param ids
-     */
-    public void inviteById(List<String> ids) {
-        InviteController owner = this.owner.get();
-
-        if (owner != null) {
-            WritableArray invitees = new WritableNativeArray();
-
-            for(int i = 0, size = ids.size(); i < size; i++) {
-                String id = ids.get(i);
-
-                if(items.containsKey(id)) {
-                    WritableNativeMap map = new WritableNativeMap();
-                    map.merge(items.get(id));
-                    invitees.pushMap(map);
-                } else {
-                    // If the id doesn't exist in the map, we can't do anything,
-                    // so just skip it.
-                }
-            }
-
-            owner.invite(this, invitees);
-        }
-    }
-
-    void inviteSettled(ReadableArray failedInvitees) {
-        AddPeopleControllerListener listener = getListener();
-
-        if (listener != null) {
-            ArrayList<Map<String, Object>> jFailedInvitees = new ArrayList<>();
-
-            for (int i = 0, size = failedInvitees.size(); i < size; ++i) {
-                jFailedInvitees.add(failedInvitees.getMap(i).toHashMap());
-            }
-
-            listener.onInviteSettled(this, jFailedInvitees);
-        }
-    }
-
-    /**
-     * Start a search for entities to invite with the given query. Results will
-     * be returned through the associated AddPeopleControllerListener's
-     * onReceivedResults method.
-     *
-     * @param query
-     */
-    public void performQuery(String query) {
-        InviteController owner = this.owner.get();
-
-        if (owner != null) {
-            owner.performQuery(this, query);
-        }
-    }
-
-    /**
-     * Caches results received by the search into a local map for use later when
-     * the items are submitted.  Submission requires the full map of
-     * information, but only the IDs are returned back to the delegate. Using
-     * this map means we don't have to send the whole map back to the delegate.
-     *
-     * @param results
-     * @param query
-     */
-    void receivedResultsForQuery(ReadableArray results, String query) {
-        AddPeopleControllerListener listener = getListener();
-
-        if (listener != null) {
-            List<Map<String, Object>> jvmResults = new ArrayList<>();
-
-            // cache results for use in submission later
-            // convert to jvm array
-            for(int i = 0; i < results.size(); i++) {
-                ReadableMap map = results.getMap(i);
-
-                if(map.hasKey("id")) {
-                    items.put(map.getString("id"), map);
-                } else if(map.hasKey("type")
-                        && map.getString("type").equals("phone")
-                        && map.hasKey("number")) {
-                    items.put(map.getString("number"), map);
-                } else {
-                    Log.w(
-                        "AddPeopleController",
-                        "Received result without id and that was not a phone number, so not adding it to suggestions: "
-                            + map);
-                }
-
-                jvmResults.add(map.toHashMap());
-            }
-
-            listener.onReceivedResults(this, jvmResults, query);
-        }
-    }
-
-    /**
-     * Sets the AddPeopleControllerListener for this controller, used to pass
-     * query results back to the native code that initiated the query.
-     *
-     * @param listener
-     */
-    public void setListener(AddPeopleControllerListener listener) {
-        this.listener = listener;
-    }
-}

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

@@ -1,56 +0,0 @@
-/*
- * Copyright @ 2017-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk.invite;
-
-import java.util.List;
-import java.util.Map;
-
-public interface AddPeopleControllerListener {
-    /**
-     * Called when the call to {@link AddPeopleController#inviteById(List)}
-     * completes.
-     *
-     * @param addPeopleController the active {@link AddPeopleController} for
-     * this invite flow.  This object should be cleaned up by calling
-     * {@link AddPeopleController#endAddPeople()} if the user exits the invite
-     * flow. Otherwise, it can stay active if the user will attempt to invite
-     * @param failedInvitees a {@code List} of {@code Map<String, Object>}
-     * dictionaries that represent the invitations that failed. The data type of
-     * the objects is identical to the results returned in onReceivedResuls.
-     */
-    void onInviteSettled(
-        AddPeopleController addPeopleController,
-        List<Map<String, Object>> failedInvitees);
-
-    /**
-     * Called when results are received for a query called through
-     * AddPeopleController.query().
-     *
-     * @param addPeopleController
-     * @param results a List of Map<String, Object> objects that represent items
-     * returned by the query. The object at key "type" describes the type of
-     * item: "user", "videosipgw" (conference room), or "phone". "user" types
-     * have properties at "id", "name", and "avatar". "videosipgw" types have
-     * properties at "id" and "name". "phone" types have properties at "number",
-     * "title", "and "subtitle"
-     * @param query the query that generated the given results
-     */
-    void onReceivedResults(
-        AddPeopleController addPeopleController,
-        List<Map<String, Object>> results,
-        String query);
-}

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

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

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

@@ -1,29 +0,0 @@
-/*
- * Copyright @ 2017-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk.invite;
-
-public interface InviteControllerListener {
-    /**
-     * Called when the add user button is tapped.
-     *
-     * @param addPeopleController {@code AddPeopleController} scoped for this
-     * user invite flow. The {@code AddPeopleController} is used to start user
-     * queries and accepts an {@code AddPeopleControllerListener} for receiving
-     * user query responses.
-     */
-    void beginAddPeople(AddPeopleController addPeopleController);
-}

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

@@ -1,171 +0,0 @@
-/*
- * Copyright @ 2017-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk.invite;
-
-import android.util.Log;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.UiThreadUtil;
-
-import org.jitsi.meet.sdk.BaseReactView;
-import org.jitsi.meet.sdk.JitsiMeetView;
-
-/**
- * Implements the react-native module of the feature invite.
- */
-public class InviteModule
-    extends ReactContextBaseJavaModule {
-
-    public InviteModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    /**
-     * Signals that a click/tap has been performed on {@code InviteButton} and
-     * that the execution flow for adding/inviting people to the current
-     * conference/meeting is to begin
-     *
-     * @param externalAPIScope the unique identifier of the
-     * {@code JitsiMeetView} whose {@code InviteButton} was clicked/tapped.
-     */
-    @ReactMethod
-    public void beginAddPeople(final String externalAPIScope) {
-        // Make sure InviteControllerListener (like all other listeners of the
-        // SDK) is invoked on the UI thread. It was requested by SDK consumers.
-        if (!UiThreadUtil.isOnUiThread()) {
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    beginAddPeople(externalAPIScope);
-                }
-            });
-            return;
-        }
-
-        InviteController inviteController
-            = findInviteControllerByExternalAPIScope(externalAPIScope);
-
-        if (inviteController != null) {
-            inviteController.beginAddPeople(getReactApplicationContext());
-        }
-    }
-
-    private InviteController findInviteControllerByExternalAPIScope(
-            String externalAPIScope) {
-        JitsiMeetView view
-            = (JitsiMeetView)
-                BaseReactView.findViewByExternalAPIScope(externalAPIScope);
-
-        return view == null ? null : view.getInviteController();
-    }
-
-    @Override
-    public String getName() {
-        return "Invite";
-    }
-
-    /**
-     * Callback for invitation failures
-     *
-     * @param failedInvitees the items for which the invitation failed
-     * @param addPeopleControllerScope a string that represents a connection to
-     * a specific AddPeopleController
-     */
-    @ReactMethod
-    public void inviteSettled(
-            final String externalAPIScope,
-            final String addPeopleControllerScope,
-            final ReadableArray failedInvitees) {
-        // Make sure AddPeopleControllerListener (like all other listeners of
-        // the SDK) is invoked on the UI thread. It was requested by SDK
-        // consumers.
-        if (!UiThreadUtil.isOnUiThread()) {
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    inviteSettled(
-                        externalAPIScope, 
-                        addPeopleControllerScope,
-                        failedInvitees);
-                }
-            });
-            return;
-        }
-
-        InviteController inviteController
-            = findInviteControllerByExternalAPIScope(externalAPIScope);
-
-        if (inviteController == null) {
-            Log.w(
-                "InviteModule",
-                "Invite settled, but failed to find active controller to notify");
-        } else {
-            inviteController.inviteSettled(
-                addPeopleControllerScope,
-                failedInvitees);
-        }
-    }
-
-    /**
-     * Callback for results received from the JavaScript invite search call
-     *
-     * @param results the results in a ReadableArray of ReadableMap objects
-     * @param query the query associated with the search
-     * @param addPeopleControllerScope a string that represents a connection to
-     * a specific AddPeopleController
-     */
-    @ReactMethod
-    public void receivedResults(
-            final String externalAPIScope,
-            final String addPeopleControllerScope,
-            final String query,
-            final ReadableArray results) {
-        // Make sure AddPeopleControllerListener (like all other listeners of
-        // the SDK) is invoked on the UI thread. It was requested by SDK
-        // consumers.
-        if (!UiThreadUtil.isOnUiThread()) {
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    receivedResults(
-                        externalAPIScope,
-                        addPeopleControllerScope,
-                        query,
-                        results);
-                }
-            });
-            return;
-        }
-
-        InviteController inviteController
-            = findInviteControllerByExternalAPIScope(externalAPIScope);
-
-        if (inviteController == null) {
-            Log.w(
-                "InviteModule",
-                "Received results, but failed to find active controller to send results back");
-        } else {
-            inviteController.receivedResultsForQuery(
-                addPeopleControllerScope,
-                query,
-                results);
-        }
-    }
-}

conference.js

@@ -76,10 +76,10 @@ import {
     dominantSpeakerChanged,
     getAvatarURLByParticipantId,
     getLocalParticipant,
+    getNormalizedDisplayName,
     getParticipantById,
     localParticipantConnectionStatusChanged,
     localParticipantRoleChanged,
-    MAX_DISPLAY_NAME_LENGTH,
     participantConnectionStatusChanged,
     participantPresenceChanged,
     participantRoleChanged,
@@ -347,7 +347,10 @@ class ConferenceConnector {
         // not enough rights to create conference
         case JitsiConferenceErrors.AUTHENTICATION_REQUIRED: {
             // Schedule reconnect to check if someone else created the room.
-            this.reconnectTimeout = setTimeout(() => room.join(), 5000);
+            this.reconnectTimeout = setTimeout(() => {
+                APP.store.dispatch(conferenceWillJoin(room));
+                room.join();
+            }, 5000);
 
             const { password }
                 = APP.store.getState()['features/base/conference'];
@@ -1234,6 +1237,7 @@ export default {
             = connection.initJitsiConference(
                 APP.conference.roomName,
                 this._getConferenceOptions());
+
         APP.store.dispatch(conferenceWillJoin(room));
         this._setLocalAudioVideoStreams(localTracks);
         this._room = room; // FIXME do not use this
@@ -1397,6 +1401,8 @@ export default {
             receiver.stop();
         }
 
+        this._stopProxyConnection();
+
         let promise = null;
 
         if (didHaveVideo) {
@@ -1472,9 +1478,12 @@ export default {
 
     /**
      * Creates desktop (screensharing) {@link JitsiLocalTrack}
+     *
      * @param {Object} [options] - Screen sharing options that will be passed to
      * createLocalTracks.
-     *
+     * @param {Object} [options.desktopSharing]
+     * @param {Object} [options.desktopStream] - An existing desktop stream to
+     * use instead of creating a new desktop stream.
      * @return {Promise.<JitsiLocalTrack>} - A Promise resolved with
      * {@link JitsiLocalTrack} for the screensharing or rejected with
      * {@link JitsiTrackError}.
@@ -1487,47 +1496,52 @@ export default {
         const didHaveVideo = Boolean(this.localVideo);
         const wasVideoMuted = this.isLocalVideoMuted();
 
-        return createLocalTracksF({
-            desktopSharingSources: options.desktopSharingSources,
-            devices: [ 'desktop' ],
-            desktopSharingExtensionExternalInstallation: {
-                interval: 500,
-                checkAgain: () => DSExternalInstallationInProgress,
-                listener: (status, url) => {
-                    switch (status) {
-                    case 'waitingForExtension': {
-                        DSExternalInstallationInProgress = true;
-                        externalInstallation = true;
-                        const listener = () => {
-                            // Wait a little bit more just to be sure that we
-                            // won't miss the extension installation
-                            setTimeout(
-                                () => {
+        const getDesktopStreamPromise = options.desktopStream
+            ? Promise.resolve([ options.desktopStream ])
+            : createLocalTracksF({
+                desktopSharingSourceDevice: options.desktopSharingSources
+                    ? null : config._desktopSharingSourceDevice,
+                desktopSharingSources: options.desktopSharingSources,
+                devices: [ 'desktop' ],
+                desktopSharingExtensionExternalInstallation: {
+                    interval: 500,
+                    checkAgain: () => DSExternalInstallationInProgress,
+                    listener: (status, url) => {
+                        switch (status) {
+                        case 'waitingForExtension': {
+                            DSExternalInstallationInProgress = true;
+                            externalInstallation = true;
+                            const listener = () => {
+                                // Wait a little bit more just to be sure that
+                                // we won't miss the extension installation
+                                setTimeout(() => {
                                     DSExternalInstallationInProgress = false;
                                 },
                                 500);
-                            APP.UI.removeListener(
+                                APP.UI.removeListener(
+                                    UIEvents.EXTERNAL_INSTALLATION_CANCELED,
+                                    listener);
+                            };
+
+                            APP.UI.addListener(
                                 UIEvents.EXTERNAL_INSTALLATION_CANCELED,
                                 listener);
-                        };
+                            APP.UI.showExtensionExternalInstallationDialog(url);
+                            break;
+                        }
+                        case 'extensionFound':
+                            // Close the dialog.
+                            externalInstallation && $.prompt.close();
+                            break;
+                        default:
 
-                        APP.UI.addListener(
-                            UIEvents.EXTERNAL_INSTALLATION_CANCELED,
-                            listener);
-                        APP.UI.showExtensionExternalInstallationDialog(url);
-                        break;
-                    }
-                    case 'extensionFound':
-                        // Close the dialog.
-                        externalInstallation && $.prompt.close();
-                        break;
-                    default:
-
-                        // Unknown status
+                            // Unknown status
+                        }
                     }
                 }
-            }
-        }).then(([ desktopStream ]) => {
+            });
+
+        return getDesktopStreamPromise.then(([ desktopStream ]) => {
             // Stores the "untoggle" handler which remembers whether was
             // there any video before and whether was it muted.
             this._untoggleScreenSharing
@@ -1645,6 +1659,7 @@ export default {
         // Handling:
         // JitsiTrackErrors.PERMISSION_DENIED
         // JitsiTrackErrors.CHROME_EXTENSION_INSTALLATION_ERROR
+        // JitsiTrackErrors.CONSTRAINT_FAILED
         // JitsiTrackErrors.GENERAL
         // and any other
         let descriptionKey;
@@ -1668,6 +1683,9 @@ export default {
                 descriptionKey = 'dialog.screenSharingPermissionDeniedError';
                 titleKey = 'dialog.screenSharingFailedToInstallTitle';
             }
+        } else if (error.name === JitsiTrackErrors.CONSTRAINT_FAILED) {
+            descriptionKey = 'dialog.cameraConstraintFailedError';
+            titleKey = 'deviceError.cameraError';
         } else {
             descriptionKey = 'dialog.screenSharingFailedToInstall';
             titleKey = 'dialog.screenSharingFailedToInstallTitle';
@@ -1841,7 +1859,7 @@ export default {
             JitsiConferenceEvents.DISPLAY_NAME_CHANGED,
             (id, displayName) => {
                 const formattedDisplayName
-                    = displayName.substr(0, MAX_DISPLAY_NAME_LENGTH);
+                    = getNormalizedDisplayName(displayName);
 
                 APP.store.dispatch(participantUpdated({
                     conference: room,
@@ -2217,34 +2235,6 @@ export default {
      * @returns {void}
      */
     _onConferenceJoined() {
-        if (APP.logCollector) {
-            // Start the LogCollector's periodic "store logs" task
-            APP.logCollector.start();
-            APP.logCollectorStarted = true;
-
-            // Make an attempt to flush in case a lot of logs have been
-            // cached, before the collector was started.
-            APP.logCollector.flush();
-
-            // This event listener will flush the logs, before
-            // the statistics module (CallStats) is stopped.
-            //
-            // NOTE The LogCollector is not stopped, because this event can
-            // be triggered multiple times during single conference
-            // (whenever statistics module is stopped). That includes
-            // the case when Jicofo terminates the single person left in the
-            // room. It will then restart the media session when someone
-            // eventually join the room which will start the stats again.
-            APP.conference.addConferenceListener(
-                JitsiConferenceEvents.BEFORE_STATISTICS_DISPOSED,
-                () => {
-                    if (APP.logCollector) {
-                        APP.logCollector.flush();
-                    }
-                }
-            );
-        }
-
         APP.UI.initConference();
 
         APP.keyboardshortcut.init();
@@ -2468,6 +2458,8 @@ export default {
     hangup(requestFeedback = false) {
         eventEmitter.emit(JitsiMeetConferenceEvents.BEFORE_HANGUP);
 
+        this._stopProxyConnection();
+
         APP.store.dispatch(destroyLocalTracks());
         this._localTracksInitialized = false;
         this.localVideo = null;
@@ -2503,6 +2495,9 @@ export default {
             requestFeedbackPromise,
             this.leaveRoomAndDisconnect()
         ]).then(values => {
+            this._room = undefined;
+            room = undefined;
+
             APP.API.notifyReadyToClose();
             maybeRedirectToWelcomePage(values[0]);
         });
@@ -2517,11 +2512,7 @@ export default {
         APP.store.dispatch(conferenceWillLeave(room));
 
         return room.leave()
-            .then(disconnect, disconnect)
-            .then(() => {
-                this._room = undefined;
-                room = undefined;
-            });
+            .then(disconnect, disconnect);
     },
 
     /**
@@ -2627,8 +2618,7 @@ export default {
      * @param nickname {string} the new display name
      */
     changeLocalDisplayName(nickname = '') {
-        const formattedNickname
-            = nickname.trim().substr(0, MAX_DISPLAY_NAME_LENGTH);
+        const formattedNickname = getNormalizedDisplayName(nickname);
         const { id, name } = getLocalParticipant(APP.store.getState());
 
         if (formattedNickname === name) {
@@ -2687,6 +2677,65 @@ export default {
         return this.localVideo.sourceType;
     },
 
+    /**
+     * Callback invoked by the external api create or update a direct connection
+     * from the local client to an external client.
+     *
+     * @param {Object} event - The object containing information that should be
+     * passed to the {@code ProxyConnectionService}.
+     * @returns {void}
+     */
+    onProxyConnectionEvent(event) {
+        if (!this._proxyConnection) {
+            this._proxyConnection = new JitsiMeetJS.ProxyConnectionService({
+                /**
+                 * The proxy connection feature is currently tailored towards
+                 * taking a proxied video stream and showing it as a local
+                 * desktop screen.
+                 */
+                convertVideoToDesktop: true,
+
+                /**
+                 * Callback invoked to pass messages from the local client back
+                 * out to the external client.
+                 *
+                 * @param {string} peerJid - The jid of the intended recipient
+                 * of the message.
+                 * @param {Object} data - The message that should be sent. For
+                 * screensharing this is an iq.
+                 * @returns {void}
+                 */
+                onSendMessage: (peerJid, data) =>
+                    APP.API.sendProxyConnectionEvent({
+                        data,
+                        to: peerJid
+                    }),
+
+                /**
+                 * Callback invoked when the remote peer of the proxy connection
+                 * has provided a video stream, intended to be used as a local
+                 * desktop stream.
+                 *
+                 * @param {JitsiLocalTrack} remoteProxyStream - The media
+                 * stream to use as a local desktop stream.
+                 * @returns {void}
+                 */
+                onRemoteStream: desktopStream => {
+                    if (desktopStream.videoType !== 'desktop') {
+                        logger.warn('Received a non-desktop stream to proxy.');
+                        desktopStream.dispose();
+
+                        return;
+                    }
+
+                    this.toggleScreenSharing(undefined, { desktopStream });
+                }
+            });
+        }
+
+        this._proxyConnection.processMessage(event);
+    },
+
     /**
      * Sets the video muted status.
      *
@@ -2721,5 +2770,19 @@ export default {
         if (score === -1 || (score >= 1 && score <= 5)) {
             APP.store.dispatch(submitFeedback(score, message, room));
         }
+    },
+
+    /**
+     * Terminates any proxy screensharing connection that is active.
+     *
+     * @private
+     * @returns {void}
+     */
+    _stopProxyConnection() {
+        if (this._proxyConnection) {
+            this._proxyConnection.stop();
+        }
+
+        this._proxyConnection = null;
     }
 };

config.js

@@ -386,6 +386,13 @@ var config = {
     //   analyticsInterval: 60000,
     //   }
 
+    // If set, will attempt to use the provided video input device label when
+    // triggering a screenshare, instead of proceeding through the normal flow
+    // for obtaining a desktop stream.
+    // NOTE: This option is experimental and is currently intended for internal
+    // use only.
+    // _desktopSharingSourceDevice: 'sample-id-or-label'
+
     // List of undocumented settings used in jitsi-meet
     /**
      _immediateReloadThreshold

css/_meetings_list.scss

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

css/_videolayout_default.scss

@@ -496,18 +496,22 @@
     display:none !important;
 }
 
+#dominantSpeakerAvatarContainer,
 #dominantSpeakerAvatar,
 .dynamic-shadow {
     width: 200px;
     height: 200px;
 }
 
-#dominantSpeakerAvatar {
+#dominantSpeakerAvatarContainer {
     top: 50px;
     margin: auto;
     position: relative;
     border-radius: 100px;
+    overflow: hidden;
     visibility: inherit;
+}
+#dominantSpeakerAvatar {
     background-color: #000000;
 }
 

index.html

@@ -8,6 +8,12 @@
     <link rel="stylesheet" href="css/all.css">
 
     <script>
+        // IE11 and earlier can be identified via their user agent and be
+        // redirected to a page that is known to have no newer js syntax.
+        if (window.navigator.userAgent.match(/(MSIE|Trident)/)) {
+            window.location.href = "static/recommendedBrowsers.html";
+        }
+
         window.indexLoadedTime = window.performance.now();
         console.log("(TIME) index.html loaded:\t", indexLoadedTime);
         // XXX the code below listeners for errors and displays an error message

interface_config.js

@@ -192,7 +192,12 @@ var interfaceConfig = {
     /**
      * Specify mobile app scheme for opening the app from the mobile browser.
      */
-    // APP_SCHEME: 'org.jitsi.meet'
+    // APP_SCHEME: 'org.jitsi.meet',
+
+    /**
+     * Specify the Android app package name.
+     */
+    // ANDROID_APP_PACKAGE: 'org.jitsi.meet'
 };
 
 /* eslint-enable no-unused-vars, no-var, max-len */

ios/Podfile

@@ -43,6 +43,8 @@ target 'JitsiMeet' do
     :path => '../node_modules/react-native-fast-image'
   pod 'react-native-keep-awake',
     :path => '../node_modules/react-native-keep-awake'
+  pod 'BVLinearGradient',
+    :path => '../node_modules/react-native-linear-gradient'
   pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
   pod 'RNGoogleSignin',
     :path => '../node_modules/react-native-google-signin'

ios/Podfile.lock

@@ -1,5 +1,7 @@
 PODS:
   - boost-for-react-native (1.63.0)
+  - BVLinearGradient (2.5.3):
+    - React
   - Crashlytics (3.12.0):
     - Fabric (~> 1.9.0)
   - DoubleConversion (1.1.6)
@@ -56,23 +58,23 @@ PODS:
     - GoogleToolboxForMac/Defines (= 2.2.0)
     - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.0)"
   - "GoogleToolboxForMac/NSString+URLArguments (2.2.0)"
-  - GoogleUtilities/AppDelegateSwizzler (5.3.6):
+  - GoogleUtilities/AppDelegateSwizzler (5.3.7):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (5.3.6)
-  - GoogleUtilities/Logger (5.3.6):
+  - GoogleUtilities/Environment (5.3.7)
+  - GoogleUtilities/Logger (5.3.7):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (5.3.6):
+  - GoogleUtilities/MethodSwizzler (5.3.7):
     - GoogleUtilities/Logger
-  - GoogleUtilities/Network (5.3.6):
+  - GoogleUtilities/Network (5.3.7):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (5.3.6)"
-  - GoogleUtilities/Reachability (5.3.6):
+  - "GoogleUtilities/NSData+zlib (5.3.7)"
+  - GoogleUtilities/Reachability (5.3.7):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (5.3.6):
+  - GoogleUtilities/UserDefaults (5.3.7):
     - GoogleUtilities/Logger
   - GTMSessionFetcher/Core (1.2.1)
   - nanopb (0.3.901):
@@ -80,7 +82,7 @@ PODS:
     - nanopb/encode (= 0.3.901)
   - nanopb/decode (0.3.901)
   - nanopb/encode (0.3.901)
-  - ObjectiveDropboxOfficial (3.9.2)
+  - ObjectiveDropboxOfficial (3.9.4)
   - React (0.57.8):
     - React/Core (= 0.57.8)
   - react-native-background-timer (2.1.1):
@@ -152,6 +154,7 @@ PODS:
   - yoga (0.57.8.React)
 
 DEPENDENCIES:
+  - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - Crashlytics
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - Fabric
@@ -202,6 +205,8 @@ SPEC REPOS:
     - SDWebImage
 
 EXTERNAL SOURCES:
+  BVLinearGradient:
+    :path: "../node_modules/react-native-linear-gradient"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   Folly:
@@ -231,6 +236,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
+  BVLinearGradient: b0b70acf63ee888829b7c2ebbf6b50e227396e55
   Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933
   DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
   Fabric: f988e33c97f08930a413e08123064d2e5f68d655
@@ -246,10 +252,10 @@ SPEC CHECKSUMS:
   GoogleAppMeasurement: 98b71f5e04142793729a5ef23e5b96651ff4b70f
   GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39
   GoogleToolboxForMac: ff31605b7d66400dcec09bed5861689aebadda4d
-  GoogleUtilities: 95996bea7c7d9b8fb811b7507669a4a8762f80c7
+  GoogleUtilities: 111a012f4c3a29c9e7c954c082fafd6ee3c999c0
   GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
   nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
-  ObjectiveDropboxOfficial: aa792e0556ceb7b72955fa29a2709072f6e35fd9
+  ObjectiveDropboxOfficial: a5afefc83f6467c42c45f2253f583f2ad1ffc701
   React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
   react-native-background-timer: bb7a98c8e97fc7c290de2d423dd09ddb73dcbcbb
   react-native-calendar-events: fe6fbc8ed337a7423c98f2c9012b25f20444de09
@@ -262,6 +268,6 @@ SPEC CHECKSUMS:
   SDWebImage: c5594f1a19c48d526d321e548902b56b479cd508
   yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
 
-PODFILE CHECKSUM: b5218184626a027e8b1ca12361d46100e2fa2f1f
+PODFILE CHECKSUM: 7d1909450626f31f9ea2de80122a66a50af2e1ea
 
 COCOAPODS: 1.5.3

ios/app/GoogleService-Info.plist

@@ -9,7 +9,7 @@
 	<key>CLIENT_ID</key>
 	<string>correct_client_id</string>
 	<key>REVERSED_CLIENT_ID</key>
-	<string>correct_reversed_client_id</string>
+	<string>com.google.correct-reversed-client-id</string>
 	<key>GOOGLE_APP_ID</key>
 	<string>1:123:ios:123abc</string>
 	<key>GCM_SENDER_ID</key>

ios/app/app.xcodeproj/project.pbxproj

@@ -150,6 +150,8 @@
 				B35383AD1DDA0083008F406A /* Adjust embedded framework architectures */,
 				0BB7DA181EC9E695007AAE98 /* Adjust ATS */,
 				DEC2069321CBBD6900072F03 /* Setup Fabric */,
+				DE11877A21EE09640078D059 /* Setup Google reverse URL handler */,
+				DE4F6D6E22005C0400DE699E /* Setup Dropbox */,
 			);
 			buildRules = (
 			);
@@ -279,6 +281,42 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		DE11877A21EE09640078D059 /* Setup Google reverse URL handler */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Setup Google reverse URL handler";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "INFO_PLIST=\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"\nREVERSED_CLIENT_ID=$(/usr/libexec/PlistBuddy -c \"Print :REVERSED_CLIENT_ID:\" $PROJECT_DIR/GoogleService-Info.plist)\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleURLTypes:1:CFBundleURLSchemes:0 $REVERSED_CLIENT_ID\" $INFO_PLIST\n";
+		};
+		DE4F6D6E22005C0400DE699E /* Setup Dropbox */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Setup Dropbox";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "INFO_PLIST=\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"\nDROPBOX_KEY_FILE=\"$PROJECT_DIR/dropbox.key\"\n\nif [[ -f $DROPBOX_KEY_FILE ]]; then\n    /usr/libexec/PlistBuddy -c \"Delete :LSApplicationQueriesSchemes\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes array\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes:0 string 'dbapi-2'\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes:1 string 'dbapi-8-emm'\" $INFO_PLIST\n\n    DROPBOX_KEY=$(head -n 1 $DROPBOX_KEY_FILE)\n    /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLName string dropbox\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLSchemes array\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLSchemes:0 string $DROPBOX_KEY\" $INFO_PLIST\nfi\n";
+		};
 		DEC2069321CBBD6900072F03 /* Setup Fabric */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

ios/app/src/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.21</string>
+	<string>19.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -39,12 +39,14 @@
 			<string>com.googleusercontent.apps</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>com.googleusercontent.apps.YOUR_ID_HERE</string>
+				<string>com.googleusercontent.apps.your-id-here</string>
 			</array>
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>FirebaseScreenReportingEnabled</key>
+	<false/>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
@@ -68,6 +70,10 @@
 	<string></string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Participate in meetings with voice.</string>
+	<key>NSUserActivityTypes</key>
+	<array>
+		<string>org.jitsi.JitsiMeet.ios.conference</string>
+	</array>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>
@@ -93,13 +99,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>FirebaseScreenReportingEnabled</key>
-	<false/>
 	<key>firebase_crashlytics_collection_enabled</key>
 	<string>false</string>
-	<key>NSUserActivityTypes</key>
-	<array>
-		<string>org.jitsi.JitsiMeet.ios.conference</string>
-	</array>
 </dict>
 </plist>

ios/app/src/ViewController.h

@@ -18,10 +18,6 @@
 
 #import <JitsiMeet/JitsiMeet.h>
 
-@interface ViewController
-    : UIViewController<
-        JitsiMeetViewDelegate,
-        JMAddPeopleControllerDelegate,
-        JMInviteControllerDelegate>
+@interface ViewController : UIViewController<JitsiMeetViewDelegate>
 
 @end

ios/app/src/ViewController.m

@@ -24,15 +24,8 @@
 // Needed for NSUserActivity suggestedInvocationPhrase
 @import Intents;
 
-/**
- * The query to perform through JMAddPeopleController when the InviteButton is
- * tapped in order to exercise the public API of the feature invite. If nil, the
- * InviteButton will not be rendered.
- */
-static NSString * const ADD_PEOPLE_CONTROLLER_QUERY = nil;
 
 @interface ViewController ()
-
 @end
 
 @implementation ViewController
@@ -43,17 +36,6 @@ static NSString * const ADD_PEOPLE_CONTROLLER_QUERY = nil;
     JitsiMeetView *view = (JitsiMeetView *) self.view;
     view.delegate = self;
 
-#ifdef DEBUG
-
-    // inviteController
-    JMInviteController *inviteController = view.inviteController;
-    inviteController.delegate = self;
-    inviteController.addPeopleEnabled
-        = inviteController.dialOutEnabled
-        = ADD_PEOPLE_CONTROLLER_QUERY != nil;
-
-#endif // #ifdef DEBUG
-
     // As this is the Jitsi Meet app (i.e. not the Jitsi Meet SDK), we do want
     // the Welcome page to be enabled. It defaults to disabled in the SDK at the
     // time of this writing but it is clearer to be explicit about what we want
@@ -135,89 +117,4 @@ static NSString * const ADD_PEOPLE_CONTROLLER_QUERY = nil;
     [self _onJitsiMeetViewDelegateEvent:@"LOAD_CONFIG_ERROR" withData:data];
 }
 
-#if DEBUG
-
-// JMInviteControllerDelegate
-
-- (void)beginAddPeople:(JMAddPeopleController *)addPeopleController {
-    NSLog(
-        @"[%s:%d] JMInviteControllerDelegate %s",
-        __FILE__, __LINE__, __FUNCTION__);
-
-    NSAssert(
-        [NSThread isMainThread],
-        @"JMInviteControllerDelegate beginAddPeople: invoked on a non-main thread");
-
-    NSString *query = ADD_PEOPLE_CONTROLLER_QUERY;
-    JitsiMeetView *view = (JitsiMeetView *) self.view;
-    JMInviteController *inviteController = view.inviteController;
-
-    if (query
-            && (inviteController.addPeopleEnabled
-                || inviteController.dialOutEnabled)) {
-        addPeopleController.delegate = self;
-        [addPeopleController performQuery:query];
-    } else {
-        // XXX Explicitly invoke endAddPeople on addPeopleController; otherwise,
-        // it is going to be memory-leaked in the associated JMInviteController
-        // and no subsequent InviteButton clicks/taps will be delivered.
-        [addPeopleController endAddPeople];
-    }
-}
-
-// JMAddPeopleControllerDelegate
-
-- (void)addPeopleController:(JMAddPeopleController * _Nonnull)controller
-          didReceiveResults:(NSArray<NSDictionary *> * _Nonnull)results
-                   forQuery:(NSString * _Nonnull)query {
-    NSAssert(
-        [NSThread isMainThread],
-        @"JMAddPeopleControllerDelegate addPeopleController:didReceiveResults:forQuery: invoked on a non-main thread");
-
-    NSUInteger count = results.count;
-
-    if (count) {
-        // Exercise JMAddPeopleController's inviteById: implementation.
-        NSMutableArray *ids = [NSMutableArray arrayWithCapacity:count];
-
-        for (NSUInteger i = 0; i < count; ++i) {
-            ids[i] = results[i][@"id"];
-        }
-
-        [controller inviteById:ids];
-
-        // Exercise JMInviteController's invite:withCompletion: implementation.
-        //
-        // XXX Technically, only at most one of the two exercises will result in
-        // an actual invitation eventually.
-        JitsiMeetView *view = (JitsiMeetView *) self.view;
-        JMInviteController *inviteController = view.inviteController;
-
-        [inviteController invite:results withCompletion:nil];
-
-        return;
-    }
-
-    // XXX Explicitly invoke endAddPeople on addPeopleController; otherwise, it
-    // is going to be memory-leaked in the associated JMInviteController and no
-    // subsequent InviteButton clicks/taps will be delivered.
-    [controller endAddPeople];
-}
-
-- (void) inviteSettled:(NSArray<NSDictionary *> * _Nonnull)failedInvitees
-  fromSearchController:(JMAddPeopleController * _Nonnull)addPeopleController {
-    NSAssert(
-        [NSThread isMainThread],
-        @"JMAddPeopleControllerDelegate inviteSettled:fromSearchController: invoked on a non-main thread");
-
-    // XXX Explicitly invoke endAddPeople on addPeopleController; otherwise, it
-    // is going to be memory-leaked in the associated JMInviteController and no
-    // subsequent InviteButton clicks/taps will be delivered. Technically,
-    // endAddPeople will automatically be invoked if there are no
-    // failedInviteees i.e. the invite succeeeded for all specified invitees.
-    [addPeopleController endAddPeople];
-}
-
-#endif // #ifdef DEBUG
-
 @end

ios/fastlane/Appfile

@@ -0,0 +1,4 @@
+app_identifier("com.atlassian.JitsiMeet.ios") # The bundle identifier of your app
+itc_team_id("304592") # App Store Connect Team ID
+team_id("FC967L3QRG") # Developer Portal Team ID
+

ios/fastlane/Fastfile

@@ -0,0 +1,28 @@
+default_platform(:ios)
+
+platform :ios do
+  desc "Push a new beta build to TestFlight"
+  lane :beta do
+    # Set the app identifier
+    update_app_identifier(
+      xcodeproj: "app/app.xcodeproj",
+      plist_path: "src/Info.plist",
+      app_identifier: "com.atlassian.JitsiMeet.ios"
+    )
+
+    # Inrement the build number by 1
+    increment_build_number(
+      build_number: latest_testflight_build_number + 1,
+      xcodeproj: "app/app.xcodeproj"
+    )
+
+    # Actually build the app
+    build_app(scheme: "jitsi-meet", include_bitcode: false)
+
+    # Upload the build to TestFlight (but don't distribute it)
+    upload_to_testflight(skip_submission: true, skip_waiting_for_build_processing: true)
+
+    # Cleanup
+    clean_build_artifacts
+  end
+end

ios/fastlane/README.md

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

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -35,13 +35,6 @@
 		87FE6F3321E52437004A5DC7 /* incomingMessage.wav in Resources */ = {isa = PBXBuildFile; fileRef = 87FE6F3221E52437004A5DC7 /* incomingMessage.wav */; };
 		A4414AE020B37F1A003546E6 /* rejected.wav in Resources */ = {isa = PBXBuildFile; fileRef = A4414ADF20B37F1A003546E6 /* rejected.wav */; };
 		A4A934E9212F3ADB001E9388 /* Dropbox.m in Sources */ = {isa = PBXBuildFile; fileRef = A4A934E8212F3ADB001E9388 /* Dropbox.m */; };
-		B386B85720981A75000DEF7A /* InviteController.m in Sources */ = {isa = PBXBuildFile; fileRef = B386B85020981A74000DEF7A /* InviteController.m */; };
-		B386B85820981A75000DEF7A /* AddPeopleController.m in Sources */ = {isa = PBXBuildFile; fileRef = B386B85120981A74000DEF7A /* AddPeopleController.m */; };
-		B386B85920981A75000DEF7A /* AddPeopleControllerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = B386B85220981A74000DEF7A /* AddPeopleControllerDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B386B85A20981A75000DEF7A /* AddPeopleController.h in Headers */ = {isa = PBXBuildFile; fileRef = B386B85320981A74000DEF7A /* AddPeopleController.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B386B85B20981A75000DEF7A /* InviteControllerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = B386B85420981A74000DEF7A /* InviteControllerDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B386B85C20981A75000DEF7A /* InviteController.h in Headers */ = {isa = PBXBuildFile; fileRef = B386B85520981A75000DEF7A /* InviteController.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B386B85D20981A75000DEF7A /* Invite.m in Sources */ = {isa = PBXBuildFile; fileRef = B386B85620981A75000DEF7A /* Invite.m */; };
 		C6245F5D2053091D0040BE68 /* image-resize@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6245F5B2053091D0040BE68 /* image-resize@2x.png */; };
 		C6245F5E2053091D0040BE68 /* image-resize@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6245F5C2053091D0040BE68 /* image-resize@3x.png */; };
 		C69EFA0C209A0F660027712B /* JMCallKitEmitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C69EFA09209A0F650027712B /* JMCallKitEmitter.swift */; };
@@ -61,9 +54,6 @@
 		0B44A0181F902126009D1D64 /* MPVolumeViewManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPVolumeViewManager.m; sourceTree = "<group>"; };
 		0B49424320AD8DBD00BD2DE0 /* outgoingStart.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = outgoingStart.wav; path = ../../sounds/outgoingStart.wav; sourceTree = "<group>"; };
 		0B49424420AD8DBD00BD2DE0 /* outgoingRinging.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = outgoingRinging.wav; path = ../../sounds/outgoingRinging.wav; sourceTree = "<group>"; };
-		0B6F414F20987DE600FF6789 /* Invite+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Invite+Private.h"; sourceTree = "<group>"; };
-		0B6F41502098840600FF6789 /* InviteController+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "InviteController+Private.h"; sourceTree = "<group>"; };
-		0B6F4151209884E500FF6789 /* AddPeopleController+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AddPeopleController+Private.h"; sourceTree = "<group>"; };
 		0B7C2CFC200F51D60060D076 /* LaunchOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LaunchOptions.m; sourceTree = "<group>"; };
 		0B93EF7A1EC608550030D24D /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
 		0B93EF7C1EC9DDCD0030D24D /* RCTBridgeWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBridgeWrapper.h; sourceTree = "<group>"; };
@@ -73,7 +63,7 @@
 		0BB9AD781F5EC6D7001C08DB /* Intents.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Intents.framework; path = System/Library/Frameworks/Intents.framework; sourceTree = SDKROOT; };
 		0BB9AD7A1F5EC8F4001C08DB /* CallKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallKit.m; sourceTree = "<group>"; };
 		0BB9AD7C1F60356D001C08DB /* AppInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppInfo.m; sourceTree = "<group>"; };
-		0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CallKitIcon.png; path = ../../react/features/mobile/callkit/CallKitIcon.png; sourceTree = "<group>"; };
+		0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CallKitIcon.png; path = ../../react/features/mobile/call-integration/CallKitIcon.png; sourceTree = "<group>"; };
 		0BCA495C1EC4B6C600B793EE /* AudioMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioMode.m; sourceTree = "<group>"; };
 		0BCA495D1EC4B6C600B793EE /* POSIX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = POSIX.m; sourceTree = "<group>"; };
 		0BCA495E1EC4B6C600B793EE /* Proximity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Proximity.m; sourceTree = "<group>"; };
@@ -92,13 +82,6 @@
 		A4414ADF20B37F1A003546E6 /* rejected.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = rejected.wav; path = ../../sounds/rejected.wav; sourceTree = "<group>"; };
 		A4A934E8212F3ADB001E9388 /* Dropbox.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Dropbox.m; sourceTree = "<group>"; };
 		A4A934EB21349A06001E9388 /* Dropbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Dropbox.h; sourceTree = "<group>"; };
-		B386B85020981A74000DEF7A /* InviteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InviteController.m; sourceTree = "<group>"; };
-		B386B85120981A74000DEF7A /* AddPeopleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddPeopleController.m; sourceTree = "<group>"; };
-		B386B85220981A74000DEF7A /* AddPeopleControllerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddPeopleControllerDelegate.h; sourceTree = "<group>"; };
-		B386B85320981A74000DEF7A /* AddPeopleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddPeopleController.h; sourceTree = "<group>"; };
-		B386B85420981A74000DEF7A /* InviteControllerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InviteControllerDelegate.h; sourceTree = "<group>"; };
-		B386B85520981A75000DEF7A /* InviteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InviteController.h; sourceTree = "<group>"; };
-		B386B85620981A75000DEF7A /* Invite.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Invite.m; sourceTree = "<group>"; };
 		C6245F5B2053091D0040BE68 /* image-resize@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "image-resize@2x.png"; path = "src/picture-in-picture/image-resize@2x.png"; sourceTree = "<group>"; };
 		C6245F5C2053091D0040BE68 /* image-resize@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "image-resize@3x.png"; path = "src/picture-in-picture/image-resize@3x.png"; sourceTree = "<group>"; };
 		C69EFA09209A0F650027712B /* JMCallKitEmitter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JMCallKitEmitter.swift; sourceTree = "<group>"; };
@@ -171,7 +154,6 @@
 				A4A934E7212F3AB8001E9388 /* dropbox */,
 				0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */,
 				0BD906E91EC0C00300C8C18E /* Info.plist */,
-				B386B84F20981A11000DEF7A /* invite */,
 				0BD906E81EC0C00300C8C18E /* JitsiMeet.h */,
 				0B412F161EDEC65D00B1A0A6 /* JitsiMeetView.h */,
 				0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */,
@@ -210,23 +192,6 @@
 			path = dropbox;
 			sourceTree = "<group>";
 		};
-		B386B84F20981A11000DEF7A /* invite */ = {
-			isa = PBXGroup;
-			children = (
-				B386B85320981A74000DEF7A /* AddPeopleController.h */,
-				B386B85120981A74000DEF7A /* AddPeopleController.m */,
-				0B6F4151209884E500FF6789 /* AddPeopleController+Private.h */,
-				B386B85220981A74000DEF7A /* AddPeopleControllerDelegate.h */,
-				B386B85620981A75000DEF7A /* Invite.m */,
-				0B6F414F20987DE600FF6789 /* Invite+Private.h */,
-				B386B85520981A75000DEF7A /* InviteController.h */,
-				B386B85020981A74000DEF7A /* InviteController.m */,
-				0B6F41502098840600FF6789 /* InviteController+Private.h */,
-				B386B85420981A74000DEF7A /* InviteControllerDelegate.h */,
-			);
-			path = invite;
-			sourceTree = "<group>";
-		};
 		C5E72ADFC30ED96F9B35F076 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -263,14 +228,10 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B386B85C20981A75000DEF7A /* InviteController.h in Headers */,
-				B386B85B20981A75000DEF7A /* InviteControllerDelegate.h in Headers */,
 				C6F99C15204DB63E0001F710 /* JitsiMeetView+Private.h in Headers */,
 				0B412F181EDEC65D00B1A0A6 /* JitsiMeetView.h in Headers */,
-				B386B85920981A75000DEF7A /* AddPeopleControllerDelegate.h in Headers */,
 				0B93EF7E1EC9DDCD0030D24D /* RCTBridgeWrapper.h in Headers */,
 				0B412F221EDEF6EA00B1A0A6 /* JitsiMeetViewDelegate.h in Headers */,
-				B386B85A20981A75000DEF7A /* AddPeopleController.h in Headers */,
 				0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -466,12 +427,9 @@
 				0B93EF7F1EC9DDCD0030D24D /* RCTBridgeWrapper.m in Sources */,
 				0BA13D311EE83FF8007BEF7F /* ExternalAPI.m in Sources */,
 				0BCA49601EC4B6C600B793EE /* POSIX.m in Sources */,
-				B386B85D20981A75000DEF7A /* Invite.m in Sources */,
 				0B7C2CFD200F51D60060D076 /* LaunchOptions.m in Sources */,
 				C6CC49AF207412CF000DFA42 /* PiPViewCoordinator.swift in Sources */,
-				B386B85720981A75000DEF7A /* InviteController.m in Sources */,
 				DEFC743F21B178FA00E4DD96 /* LocaleDetector.m in Sources */,
-				B386B85820981A75000DEF7A /* AddPeopleController.m in Sources */,
 				0BCA495F1EC4B6C600B793EE /* AudioMode.m in Sources */,
 				0B44A0191F902126009D1D64 /* MPVolumeViewManager.m in Sources */,
 				0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */,

ios/sdk/src/AudioMode.m

@@ -20,6 +20,12 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTLog.h>
 
+typedef enum {
+    kAudioModeDefault,
+    kAudioModeAudioCall,
+    kAudioModeVideoCall
+} JitsiMeetAudioMode;
+
 @interface AudioMode : NSObject<RCTBridgeModule>
 
 @property(nonatomic, strong) dispatch_queue_t workerQueue;
@@ -27,18 +33,13 @@
 @end
 
 @implementation AudioMode {
-    NSString *_category;
-    NSString *_mode;
+    NSString *_avCategory;
+    NSString *_avMode;
+    JitsiMeetAudioMode _mode;
 }
 
 RCT_EXPORT_MODULE();
 
-typedef enum {
-    kAudioModeDefault,
-    kAudioModeAudioCall,
-    kAudioModeVideoCall
-} JitsiMeetAudioMode;
-
 + (BOOL)requiresMainQueueSetup {
     return NO;
 }
@@ -54,13 +55,23 @@ typedef enum {
 - (instancetype)init {
     self = [super init];
     if (self) {
-        _category = nil;
-        _mode = nil;
+        _avCategory = nil;
+        _avMode = nil;
+        _mode = kAudioModeDefault;
 
         dispatch_queue_attr_t attributes =
         dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL,
                                                 QOS_CLASS_USER_INITIATED, -1);
         _workerQueue = dispatch_queue_create("AudioMode.queue", attributes);
+
+        // AVAudioSession is a singleton and other parts of the application such as
+        // WebRTC may undo the settings. Make sure that the settings are reapplied
+        // upon undoes.
+        [[NSNotificationCenter defaultCenter]
+             addObserver:self
+                selector:@selector(routeChanged:)
+                    name:AVAudioSessionRouteChangeNotification
+                  object:nil];
     }
     return self;
 }
@@ -82,7 +93,7 @@ typedef enum {
         // needed. This notification is posted on a secondary thread, so make
         // sure we switch to our worker thread.
         dispatch_async(_workerQueue, ^{
-            [self setCategory:self->_category mode:self->_mode error:nil];
+            [self setCategory:self->_avCategory mode:self->_avMode error:nil];
         });
         break;
     }
@@ -97,6 +108,18 @@ typedef enum {
               error:(NSError * _Nullable *)outError {
     AVAudioSession *session = [AVAudioSession sharedInstance];
 
+    // We don't want to touch the category when setting the default mode.
+    // This is to play well with other components which could be integrated
+    // into the final application.
+    if (_mode == kAudioModeDefault) {
+        return YES;
+    }
+
+    // Nothing to do.
+    if (category == nil && mode == nil) {
+        return YES;
+    }
+
     if (session.category != category
             && ![session setCategory:category error:outError]) {
         RCTLogError(@"Failed to (re)apply specified AVAudioSession category!");
@@ -114,8 +137,8 @@ typedef enum {
 RCT_EXPORT_METHOD(setMode:(int)mode
                   resolve:(RCTPromiseResolveBlock)resolve
                    reject:(RCTPromiseRejectBlock)reject) {
-    NSString *avCategory;
-    NSString *avMode;
+    NSString *avCategory = nil;
+    NSString *avMode = nil;
     NSError *error;
 
     switch (mode) {
@@ -124,8 +147,6 @@ RCT_EXPORT_METHOD(setMode:(int)mode
         avMode = AVAudioSessionModeVoiceChat;
         break;
     case kAudioModeDefault:
-        avCategory = AVAudioSessionCategorySoloAmbient;
-        avMode = AVAudioSessionModeDefault;
         break;
     case kAudioModeVideoCall:
         avCategory = AVAudioSessionCategoryPlayAndRecord;
@@ -136,29 +157,17 @@ RCT_EXPORT_METHOD(setMode:(int)mode
         return;
     }
 
+    // Save the desired/specified category and mode so that they may be
+    // reapplied.
+    _avCategory = avCategory;
+    _avMode = avMode;
+    _mode = mode;
+
     if (![self setCategory:avCategory mode:avMode error:&error] || error) {
         reject(@"setMode", error.localizedDescription, error);
-        return;
+    } else {
+        resolve(nil);
     }
-
-    // Even though the specified category and mode were successfully set, the
-    // AVAudioSession is a singleton and other parts of the application such as
-    // WebRTC may undo the settings. Make sure that the settings are reapplied
-    // upon undoes.
-    if (!_category || !_mode) {
-        [[NSNotificationCenter defaultCenter]
-            addObserver:self
-               selector:@selector(routeChanged:)
-                   name:AVAudioSessionRouteChangeNotification
-                 object:nil];
-    }
-
-    // Save the desired/specified category and mode so that they may be
-    // reapplied (upon undoes as described above).
-    _category = avCategory;
-    _mode = avMode;
-
-    resolve(nil);
 }
 
 @end

ios/sdk/src/Info.plist

@@ -18,11 +18,6 @@
 	<string>1.9.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>dbapi-2</string>
-		<string>dbapi-8-emm</string>
-	</array>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

ios/sdk/src/JitsiMeet.h

@@ -17,9 +17,3 @@
 // JitsiMeetView
 #import <JitsiMeet/JitsiMeetView.h>
 #import <JitsiMeet/JitsiMeetViewDelegate.h>
-
-// invite/
-#import <JitsiMeet/AddPeopleController.h>
-#import <JitsiMeet/AddPeopleControllerDelegate.h>
-#import <JitsiMeet/InviteController.h>
-#import <JitsiMeet/InviteControllerDelegate.h>

ios/sdk/src/JitsiMeetView.h

@@ -17,7 +17,6 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#import "InviteController.h"
 #import "JitsiMeetViewDelegate.h"
 
 @interface JitsiMeetView : UIView
@@ -28,8 +27,6 @@
 
 @property (nonatomic, nullable, weak) id<JitsiMeetViewDelegate> delegate;
 
-@property (nonatomic, readonly, nonnull) JMInviteController *inviteController;
-
 @property (nonatomic) BOOL pictureInPictureEnabled;
 
 @property (nonatomic) BOOL welcomePageEnabled;

ios/sdk/src/JitsiMeetView.m

@@ -22,9 +22,9 @@
 #import <React/RCTLinkingManager.h>
 #import <React/RCTRootView.h>
 
+#import <RNGoogleSignin/RNGoogleSignin.h>
+
 #import "Dropbox.h"
-#import "Invite+Private.h"
-#import "InviteController+Private.h"
 #import "JitsiMeetView+Private.h"
 #import "RCTBridgeWrapper.h"
 
@@ -146,6 +146,13 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
         return YES;
     }
 
+    if ([RNGoogleSignin application:app
+                            openURL:url
+                  sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey]
+                         annotation:options[UIApplicationOpenURLOptionsAnnotationKey]]) {
+        return YES;
+    }
+
     // XXX At least twice we received bug reports about malfunctioning loadURL
     // in the Jitsi Meet SDK while the Jitsi Meet app seemed to functioning as
     // expected in our testing. But that was to be expected because the app does
@@ -228,9 +235,6 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
     props[@"pictureInPictureEnabled"] = @(self.pictureInPictureEnabled);
     props[@"welcomePageEnabled"] = @(self.welcomePageEnabled);
 
-    props[@"addPeopleEnabled"] = @(_inviteController.addPeopleEnabled);
-    props[@"dialOutEnabled"] = @(_inviteController.dialOutEnabled);
-
     // XXX If urlObject is nil, then it must appear as undefined in the
     // JavaScript source code so that we check the launchOptions there.
     if (urlObject) {
@@ -411,10 +415,6 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
     externalAPIScope = [NSUUID UUID].UUIDString;
     [views setObject:self forKey:externalAPIScope];
 
-    _inviteController
-        = [[JMInviteController alloc] initWithExternalAPIScope:externalAPIScope
-                                                 bridgeWrapper:bridgeWrapper];
-
     // Set a background color which is in accord with the JavaScript and Android
     // parts of the application and causes less perceived visual flicker than
     // the default background color.

ios/sdk/src/dropbox/Dropbox.m

@@ -66,7 +66,7 @@ RCT_EXPORT_METHOD(authorize:(RCTPromiseResolveBlock)resolve
         [DBClientsManager authorizeFromController:[UIApplication sharedApplication]
                                        controller:[[self class] topMostController]
                                           openURL:^(NSURL *url) {
-                                              [[UIApplication sharedApplication] openURL:url];
+                                              [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
                                           }];
     });
 }
@@ -132,26 +132,24 @@ RCT_EXPORT_METHOD(getSpaceUsage: (NSString *)token
     if (authResult) {
         if ([authResult isSuccess]) {
             currentResolve(authResult.accessToken.accessToken);
-            currentResolve = nil;
-            currentReject = nil;
         } else {
             NSString *msg;
             if ([authResult isError]) {
-                msg = [NSString stringWithFormat:@"%@, error type: %ld",[authResult errorDescription], [authResult errorType]];
+                msg = [NSString stringWithFormat:@"%@, error type: %zd",[authResult errorDescription], [authResult errorType]];
             } else {
                 msg = @"OAuth canceled!";
             }
             currentReject(@"authorize", msg, nil);
-            currentResolve = nil;
-            currentReject = nil;
         }
+        currentResolve = nil;
+        currentReject = nil;
+
         return YES;
     }
     return NO;
 }
 
-+ (UIViewController *)topMostController
-{
++ (UIViewController *)topMostController {
     UIViewController *topController
         = [UIApplication sharedApplication].keyWindow.rootViewController;
     

ios/sdk/src/invite/AddPeopleController+Private.h

@@ -1,33 +0,0 @@
-/*
- * Copyright @ 2018-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import "AddPeopleController.h"
-#import "InviteController.h"
-
-@interface JMAddPeopleController ()
-
-@property (nonatomic, strong) NSMutableDictionary* _Nonnull items;
-@property (nonatomic, weak, nullable) JMInviteController *owner;
-@property (nonatomic, readonly) NSString* _Nonnull uuid;
-
-- (instancetype _Nonnull)initWithOwner:(JMInviteController * _Nonnull)owner;
-
-- (void)inviteSettled:(NSArray<NSDictionary *> * _Nonnull)failedInvitees;
-
-- (void)receivedResults:(NSArray<NSDictionary*> * _Nonnull)results
-               forQuery:(NSString * _Nonnull)query;
-
-@end

ios/sdk/src/invite/AddPeopleController.h

@@ -1,31 +0,0 @@
-/*
- * Copyright @ 2018-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "AddPeopleControllerDelegate.h"
-
-@interface JMAddPeopleController: NSObject
-
-@property (nonatomic, nullable, weak) id<JMAddPeopleControllerDelegate> delegate;
-
-- (void)endAddPeople;
-
-- (void)inviteById:(NSArray<NSString *> * _Nonnull)ids;
-
-- (void)performQuery:(NSString * _Nonnull)query;
-
-@end

ios/sdk/src/invite/AddPeopleController.m

@@ -1,82 +0,0 @@
-/*
- * Copyright @ 2018-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import "AddPeopleController+Private.h"
-#import "InviteController+Private.h"
-
-@implementation JMAddPeopleController
-
-- (instancetype)initWithOwner:(JMInviteController *)owner {
-    self = [super init];
-    if (self) {
-        _uuid = [[NSUUID UUID] UUIDString];
-        _items = [[NSMutableDictionary alloc] init];
-        _owner = owner;
-    }
-    return self;
-}
-
-#pragma mark API
-
-- (void)endAddPeople {
-    [self.owner endAddPeopleForController:self];
-}
-
-- (void)inviteById:(NSArray<NSString *> * _Nonnull)ids {
-    NSMutableArray* invitees = [[NSMutableArray alloc] init];
-
-    for (NSString* itemId in ids) {
-        id invitee = [self.items objectForKey:itemId];
-
-        if (invitee) {
-            [invitees addObject:invitee];
-        }
-    }
-
-    [self.owner invite:invitees forController:self];
-}
-
-- (void)performQuery:(NSString *)query {
-    [self.owner performQuery:query forController:self];
-}
-
-#pragma mark Internal API, used to call the delegate and report to the user
-
-- (void)receivedResults:(NSArray<NSDictionary *> *)results
-               forQuery:(NSString *)query {
-    for (NSDictionary* item in results) {
-        NSString* itemId = item[@"id"];
-        NSString* itemType = item[@"type"];
-        if (itemId) {
-            [self.items setObject:item forKey:itemId];
-        } else if (itemType != nil && [itemType isEqualToString: @"phone"]) {
-            NSString* number = item[@"number"];
-            if (number) {
-                [self.items setObject:item forKey:number];
-            }
-        }
-    }
-
-    [self.delegate addPeopleController:self
-                     didReceiveResults:results
-                              forQuery:query];
-}
-
-- (void)inviteSettled:(NSArray<NSDictionary *> *)failedInvitees {
-    [self.delegate inviteSettled:failedInvitees fromSearchController:self];
-}
-
-@end

ios/sdk/src/invite/AddPeopleControllerDelegate.h

@@ -1,41 +0,0 @@
-/*
- * Copyright @ 2018-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "AddPeopleController.h"
-
-@class JMAddPeopleController;
-
-@protocol JMAddPeopleControllerDelegate
-
-/**
- * Called when a JMAddPeopleController has results for a query that was
- * previously provided.
- */
-- (void)addPeopleController:(JMAddPeopleController * _Nonnull)controller
-          didReceiveResults:(NSArray<NSDictionary *> * _Nonnull)results
-                   forQuery:(NSString * _Nonnull)query;
-
-/**
- * Called when a JMAddPeopleController has finished the inviting process, either
- * succesfully or not. In case of failure the failedInvitees array will contain
- * the items for which invitations failed.
- */
-- (void) inviteSettled:(NSArray<NSDictionary *> * _Nonnull)failedInvitees
-  fromSearchController:(JMAddPeopleController * _Nonnull)addPeopleController;
-
-@end

ios/sdk/src/invite/Invite+Private.h

@@ -1,30 +0,0 @@
-/*
- * Copyright @ 2018-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <React/RCTBridge.h>
-#import <React/RCTEventEmitter.h>
-
-@interface Invite : RCTEventEmitter <RCTBridgeModule>
-
-- (void)            invite:(NSArray<NSDictionary *> * _Nonnull)invitees
-          externalAPIScope:(NSString * _Nonnull)externalAPIScope
-  addPeopleControllerScope:(NSString * _Nonnull)addPeopleControllerScope;
-
-- (void)      performQuery:(NSString * _Nonnull)query
-          externalAPIScope:(NSString * _Nonnull)externalAPIScope
-  addPeopleControllerScope:(NSString * _Nonnull)addPeopleControllerScope;
-
-@end

ios/sdk/src/invite/Invite.m

@@ -1,127 +0,0 @@
-/*
- * Copyright @ 2018-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import "Invite+Private.h"
-#import "InviteController+Private.h"
-#import "JitsiMeetView+Private.h"
-
-// The events emitted/supported by the Invite react-native module:
-//
-// XXX The event names are ridiculous on purpose. Even though iOS makes it look
-// like it emits within the bounderies of a react-native module ony, it actually
-// also emits through DeviceEventEmitter. (Of course, Android emits only through
-// DeviceEventEmitter.)
-static NSString * const InviteEmitterEvent
-    = @"org.jitsi.meet:features/invite#invite";
-static NSString * const PerformQueryEmitterEvent
-    = @"org.jitsi.meet:features/invite#performQuery";
-
-@implementation Invite
-
-RCT_EXPORT_MODULE();
-
-/**
- * Make sure all methods in this module are invoked on the main/UI thread.
- */
-- (dispatch_queue_t)methodQueue {
-    return dispatch_get_main_queue();
-}
-
-- (NSArray<NSString *> *)supportedEvents {
-    return @[
-        InviteEmitterEvent,
-        PerformQueryEmitterEvent
-    ];
-}
-
-/**
- * Initiates the process to add people. This involves calling a delegate method
- * in the JMInviteControllerDelegate so the native host application can start
- * the query process.
- *
- * @param externalAPIScope - Scope identifying the JitsiMeetView where the
- * calling JS code is being executed.
- */
-RCT_EXPORT_METHOD(beginAddPeople:(NSString *)externalAPIScope) {
-    JitsiMeetView *view
-        = [JitsiMeetView viewForExternalAPIScope:externalAPIScope];
-    JMInviteController *inviteController = view.inviteController;
-    [inviteController beginAddPeople];
-}
-
-/**
- * Indicates the the invite process has settled / finished.
- *
- * @param externalAPIScope - Scope identifying the JitsiMeetView where the
- * calling JS code is being executed.
- * @param addPeopleControllerScope - Scope identifying the JMAddPeopleController
- * wich was settled.
- * @param failedInvitees - Array with the invitees which were not invited due
- * to a failure.
- */
-RCT_EXPORT_METHOD(inviteSettled:(NSString *)externalAPIScope
-       addPeopleControllerScope:(NSString *)addPeopleControllerScope
-                 failedInvitees:(NSArray *)failedInvitees) {
-    JitsiMeetView *view
-        = [JitsiMeetView viewForExternalAPIScope:externalAPIScope];
-    JMInviteController *inviteController = view.inviteController;
-    [inviteController inviteSettled:addPeopleControllerScope
-                     failedInvitees:failedInvitees];
-}
-
-/**
- * Process results received for the given query. This involves calling a
- * delegate method in JMAddPeopleControllerDelegate so the native host
- * application is made aware of the query results.
- *
- * @param externalAPIScope - Scope identifying the JitsiMeetView where the
- * calling JS code is being executed.
- * @param addPeopleControllerScope - Scope identifying the JMAddPeopleController
- * for which the results were received.
- * @param query - The actual query for which the results were received.
- * @param results - The query results.
- */
-RCT_EXPORT_METHOD(receivedResults:(NSString *)externalAPIScope
-         addPeopleControllerScope:(NSString *)addPeopleControllerScope
-                            query:(NSString *)query
-                          results:(NSArray *)results) {
-    JitsiMeetView *view
-        = [JitsiMeetView viewForExternalAPIScope:externalAPIScope];
-    JMInviteController *inviteController = view.inviteController;
-    [inviteController receivedResults:addPeopleControllerScope
-                                query:query
-                              results:results];
-}
-
-- (void)            invite:(NSArray<NSDictionary *> * _Nonnull)invitees
-          externalAPIScope:(NSString * _Nonnull)externalAPIScope
-  addPeopleControllerScope:(NSString * _Nonnull) addPeopleControllerScope {
-    [self sendEventWithName:InviteEmitterEvent
-                       body:@{ @"addPeopleControllerScope": addPeopleControllerScope,
-                               @"externalAPIScope": externalAPIScope,
-                               @"invitees": invitees }];
-}
-
-- (void)      performQuery:(NSString * _Nonnull)query
-          externalAPIScope:(NSString * _Nonnull)externalAPIScope
-  addPeopleControllerScope:(NSString * _Nonnull) addPeopleControllerScope {
-    [self sendEventWithName:PerformQueryEmitterEvent
-                       body:@{ @"addPeopleControllerScope": addPeopleControllerScope,
-                               @"externalAPIScope": externalAPIScope,
-                               @"query": query }];
-}
-
-@end

ios/sdk/src/invite/InviteController+Private.h

@@ -1,53 +0,0 @@
-/*
- * Copyright @ 2018-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import "InviteController.h"
-
-#import "AddPeopleController.h"
-#import "Invite+Private.h"
-#import "RCTBridgeWrapper.h"
-
-@interface JMInviteController ()
-
-@property (nonatomic, nullable) JMAddPeopleController *addPeopleController;
-
-@property (nonatomic) NSString * _Nonnull externalAPIScope;
-
-@property (nonatomic, nullable, weak) RCTBridgeWrapper *bridgeWrapper;
-
-@property (nonatomic, readonly) Invite * _Nullable inviteModule;
-
-- (instancetype _Nonnull)initWithExternalAPIScope:(NSString * _Nonnull)externalAPIScope
-                                    bridgeWrapper:(RCTBridgeWrapper * _Nullable)bridgeWrapper;
-
-- (void)beginAddPeople;
-
-- (void)endAddPeopleForController:(JMAddPeopleController * _Nonnull)controller;
-
-- (void) invite:(NSArray * _Nonnull)invitees
-  forController:(JMAddPeopleController * _Nonnull)controller;
-
-- (void)inviteSettled:(NSString * _Nonnull)addPeopleControllerScope
-       failedInvitees:(NSArray * _Nonnull)failedInvitees;
-
-- (void)performQuery:(NSString * _Nonnull)query
-       forController:(JMAddPeopleController * _Nonnull)controller;
-
-- (void)receivedResults:(NSString * _Nonnull)addPeopleControllerScope
-                  query:(NSString * _Nonnull)query
-                results:(NSArray * _Nonnull)results;
-
-@end

ios/sdk/src/invite/InviteController.h

@@ -1,32 +0,0 @@
-/*
- * Copyright @ 2017-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "InviteControllerDelegate.h"
-
-@interface JMInviteController : NSObject
-
-@property (nonatomic) BOOL addPeopleEnabled;
-
-@property (nonatomic) BOOL dialOutEnabled;
-
-@property (nonatomic, nullable, weak) id<JMInviteControllerDelegate> delegate;
-
-- (void)  invite:(NSArray * _Nonnull)invitees
-  withCompletion:(void (^ _Nullable)(NSArray<NSDictionary *> * _Nonnull failedInvitees))completion;
-
-@end

ios/sdk/src/invite/InviteController.m

@@ -1,160 +0,0 @@
-/*
- * Copyright @ 2017-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import "InviteController+Private.h"
-#import "AddPeopleController+Private.h"
-
-@implementation JMInviteController {
-    NSNumber *_addPeopleEnabled;
-    NSNumber *_dialOutEnabled;
-}
-
-@dynamic addPeopleEnabled;
-@dynamic dialOutEnabled;
-
-#pragma mark Constructor
-
--(instancetype)initWithExternalAPIScope:(NSString * _Nonnull)externalAPIScope
-                          bridgeWrapper:(RCTBridgeWrapper * _Nullable)bridgeWrapper {
-    self = [super init];
-    if (self) {
-        self.externalAPIScope = externalAPIScope;
-        self.bridgeWrapper = bridgeWrapper;
-    }
-
-    return self;
-}
-
-#pragma mark Public API
-
--(Invite * _Nullable)inviteModule {
-    return [self.bridgeWrapper.bridge moduleForName:@"Invite"];
-}
-
--(void)beginAddPeople {
-    if (_delegate == nil) {
-        return;
-    }
-
-    if (_addPeopleController != nil) {
-        return;
-    }
-
-    _addPeopleController = [[JMAddPeopleController alloc] initWithOwner:self];
-
-    @try {
-        if (self.delegate
-                && [self.delegate respondsToSelector:@selector(beginAddPeople:)]) {
-            [self.delegate beginAddPeople:_addPeopleController];
-        }
-    } @catch (NSException *e) {
-        [self endAddPeopleForController:_addPeopleController];
-    }
-}
-
--(void)endAddPeopleForController:(JMAddPeopleController *)controller {
-    if (self.addPeopleController == controller) {
-        self.addPeopleController = nil;
-    }
-}
-
-#pragma mark Property getters / setters
-
-- (void) setAddPeopleEnabled:(BOOL)addPeopleEnabled {
-    _addPeopleEnabled = [NSNumber numberWithBool:addPeopleEnabled];
-}
-
-- (BOOL) addPeopleEnabled {
-    if (_addPeopleEnabled == nil || [_addPeopleEnabled boolValue]) {
-        return self.delegate
-            && [self.delegate respondsToSelector:@selector(beginAddPeople:)];
-    }
-
-    return NO;
-}
-
-- (void) setDialOutEnabled:(BOOL)dialOutEnabled {
-    _dialOutEnabled = [NSNumber numberWithBool:dialOutEnabled];
-}
-
-- (BOOL) dialOutEnabled {
-    if (_dialOutEnabled == nil || [_dialOutEnabled boolValue]) {
-        return self.delegate
-            && [self.delegate respondsToSelector:@selector(beginAddPeople:)];
-    }
-
-    return NO;
-}
-
-#pragma mark Result handling
-
-- (void)inviteSettled:(NSString *)addPeopleControllerScope
-       failedInvitees:(NSArray *)failedInvitees {
-    JMAddPeopleController *controller = self.addPeopleController;
-
-    if (controller != nil
-            && [controller.uuid isEqualToString:addPeopleControllerScope]) {
-        @try {
-            [controller inviteSettled:failedInvitees];
-        } @finally {
-            if ([failedInvitees count] == 0) {
-                [self endAddPeopleForController:controller];
-            }
-        }
-    }
-}
-
-- (void)receivedResults:(NSString *)addPeopleControllerScope
-                  query:(NSString *)query
-                results:(NSArray *)results {
-    JMAddPeopleController *controller = self.addPeopleController;
-
-    if (controller != nil
-            && [controller.uuid isEqualToString:addPeopleControllerScope]) {
-        [controller receivedResults:results forQuery:query];
-    }
-}
-
-#pragma mark Use the Invite react-native module to emit the search / submission events
-
-- (void) invite:(NSArray *)invitees
-  forController:(JMAddPeopleController * _Nonnull)controller {
-    [self        invite:invitees
-     forControllerScope:controller.uuid];
-}
-
-- (void)      invite:(NSArray *)invitees
-  forControllerScope:(NSString * _Nonnull)controllerScope {
-    [self.inviteModule invite:invitees
-             externalAPIScope:self.externalAPIScope
-     addPeopleControllerScope:controllerScope];
-}
-
-- (void)  invite:(NSArray *)invitees
-  withCompletion:(void (^)(NSArray<NSDictionary *> *failedInvitees))completion {
-    // TODO Execute the specified completion block when the invite settles.
-    [self        invite:invitees
-     forControllerScope:[[NSUUID UUID] UUIDString]];
-}
-
-- (void)performQuery:(NSString * _Nonnull)query
-       forController:(JMAddPeopleController * _Nonnull)controller {
-    [self.inviteModule performQuery:query
-                   externalAPIScope:self.externalAPIScope
-           addPeopleControllerScope:controller.uuid];
-}
-
-@end

ios/sdk/src/invite/InviteControllerDelegate.h

@@ -1,29 +0,0 @@
-/*
- * Copyright @ 2017-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import "AddPeopleController.h"
-
-@protocol JMInviteControllerDelegate <NSObject>
-
-/**
- * Called when the invite button in the conference is tapped.
- *
- * The search controller provided can be used to query user search within the
- * conference.
- */
-- (void)beginAddPeople:(JMAddPeopleController *)addPeopleController;
-
-@end

lang/languages-af.json

@@ -0,0 +1,26 @@
+{
+    "en": "Engels",
+    "az": "Azerbeidjans",
+    "bg": "Bulgaars",
+    "cs": "Tsjeggies",
+    "de": "Duits",
+    "el": "Grieks",
+    "eo": "Esperanto",
+    "es": "Spaans",
+    "fr": "Frans",
+    "hy": "Armeens",
+    "it": "Italiaans",
+    "ja": "Japannees",
+    "ko": "Koreaans",
+    "nb": "Bokmal-Noorweegs",
+    "oc": "Oksitaans",
+    "pl": "Pools",
+    "ptBR": "Portugees (Brasilië)",
+    "ru": "Russies",
+    "sk": "Slowaaks",
+    "sl": "Sloweens",
+    "sv": "Sweeds",
+    "tr": "Turks",
+    "vi": "Viëtnamees",
+    "zhCN": "Sjinees (Sjina)"
+}

lang/main-af.json

@@ -0,0 +1,740 @@
+{
+    "contactlist_plural": "__count__ lede",
+    "passwordSetRemotely": "ingestel deur ’n ander lid",
+    "poweredby": "aangedryf deur",
+    "inviteUrlDefaultMsg": "U konferensie word tans geskep...",
+    "me": "ek",
+    "speaker": "",
+    "raisedHand": "Wil praat",
+    "defaultNickname": "bv. Piet Pompies",
+    "defaultLink": "bv. __url__",
+    "audioDevices": {
+        "bluetooth": "Bluetooth",
+        "headphones": "Oorfone",
+        "phone": "Foon",
+        "speaker": "Luidspreker"
+    },
+    "audioOnly": {
+        "audioOnly": "Net klank",
+        "featureToggleDisabled": "Wisseling van __feature__ is gedeaktiveer tydens Net klank-modus"
+    },
+    "userMedia": {
+        "react-nativeGrantPermissions": "",
+        "chromeGrantPermissions": "",
+        "androidGrantPermissions": "",
+        "electronGrantPermissions": "",
+        "firefoxGrantPermissions": "Kies <b><i>Deel gekose toestel</i></b> wanneer die blaaier vir toestemming vra.",
+        "operaGrantPermissions": "Kies <b><i>Allow</i></b> wanneer die blaaier vir toestemming vra.",
+        "iexplorerGrantPermissions": "",
+        "safariGrantPermissions": "Kies <b><i>OK</i></b> wanneer die blaaier vir toestemming vra.",
+        "nwjsGrantPermissions": "Gee asb. toestemming vir die gebruik van u kamera en mikrofoon",
+        "edgeGrantPermissions": "Kies <b><i>Yes</i></b> wanneer die blaaier vir toestemming vra."
+    },
+    "keyboardShortcuts": {
+        "keyboardShortcuts": "Sleutelbordkortpaaie",
+        "raiseHand": "Steek hand op of laat sak hom",
+        "pushToTalk": "Druk om te praat",
+        "toggleScreensharing": "Wissel tussen kamera- en skermdeling",
+        "toggleFilmstrip": "Wys of versteek duimnaels vir video’s",
+        "toggleShortcuts": "Wys of versteek sleutelbordkortpaaie",
+        "focusLocal": "Fokus op u video",
+        "focusRemote": "Fokus op ’n ander persoon se video",
+        "toggleChat": "Maak gesels oop of toe",
+        "mute": "Demp of ontdemp jou mikrofoon",
+        "fullScreen": "Bekyk of verlaat volskerm",
+        "videoMute": "Begin of stop u kamera",
+        "showSpeakerStats": "Wys sprekerstatistiek",
+        "localRecording": "Wys of versteek kontroles vir plaaslike opname"
+    },
+    "welcomepage": {
+        "accessibilityLabel": {
+            "join": "Raak om aan te sluit",
+            "roomname": ""
+        },
+        "appDescription": "Hou gerus ’n videogesprek met die hele span. Om die waarheid te sê, nooi sommer almal. __app__ is ’n 100% oopbronoplossing vir geënkripteerde videokonferensies wat mens heeldag, elke dag gratis kan geniet — geen rekening nodig nie.",
+        "audioVideoSwitch": {
+            "audio": "Stem",
+            "video": "Video"
+        },
+        "calendar": "",
+        "connectCalendarText": "Koppel u kalender om alle vergaderings in __app__ te sien. Plus, voeg __app__-vergaderings by u kalender en begin hulle met een klik.",
+        "connectCalendarButton": "Koppel u kalender",
+        "enterRoomTitle": "Begin ’n nuwe vergadering",
+        "go": "GAAN",
+        "join": "SLUIT AAN",
+        "privacy": "Privaatheid",
+        "recentList": "Onlangs",
+        "recentListDelete": "Skrap",
+        "recentListEmpty": "Die lys van onlangse gesprekke is leeg. Gesels met u span al u onlangse gesprekke sal hier wees.",
+        "roomname": "Gee kamernaam",
+        "roomnameHint": "Gee die naam of URL van die kamer waar u wil aansluit. Dink gerus enige naam uit. Laat weet net die mense wat u ontmoet wat dit is sodat hulle die selfde naam gee.",
+        "sendFeedback": "Stuur terugvoer",
+        "terms": "Voorwaardes",
+        "title": "Veilige en volledig gratis videokonferensies propvol funksionaliteit"
+    },
+    "startupoverlay": {
+        "policyText": "",
+        "title": "__app__ benodig u mikrofoon en kamera."
+    },
+    "suspendedoverlay": {
+        "title": "U video-oproep is onderbreek omdat die rekenaar gaan slaap het.",
+        "text": "Druk die <i>Sluit weer aan</i>-knoppie om te herkoppel.",
+        "rejoinKeyTitle": "Sluit weer aan"
+    },
+    "toolbar": {
+        "accessibilityLabel": {
+            "audioOnly": "Wissel Net klank",
+            "audioRoute": "",
+            "callQuality": "",
+            "chat": "Wissel geselsvenster",
+            "cc": "Wissel onderskrifte",
+            "document": "Wissel gedeelde dokument",
+            "feedback": "",
+            "fullScreen": "Wissel volskerm",
+            "hangup": "Verlaat die oproep",
+            "invite": "",
+            "localRecording": "Wissel kontroles vir plaaslike opname",
+            "lockRoom": "Wissel kamerslot",
+            "moreActions": "Wissel kieslys vir meer aksies",
+            "moreActionsMenu": "Kieslys vir meer aksies",
+            "mute": "",
+            "pip": "Wissel Prent-in-Prent-modus",
+            "profile": "",
+            "raiseHand": "Wissel handopsteek",
+            "recording": "Wissel opname",
+            "Settings": "Wissel instellings",
+            "sharedvideo": "Wissel Youtube-videodeling",
+            "shareRoom": "Nooi iemand",
+            "shareYourScreen": "Wissel skermdeling",
+            "shortcuts": "Wissel kortpaaie",
+            "speakerStats": "Wissel sprekerstatistiek",
+            "toggleCamera": "",
+            "tileView": "",
+            "videomute": ""
+        },
+        "addPeople": "Voeg mense by die oproep",
+        "audioonly": "Aktiveer / deaktiveer Net klank-modus (spaar bandwydte)",
+        "audioOnlyOn": "Aktiveer Net klank-modus (spaar bandwydte)",
+        "audioOnlyOff": "Deaktiveer Net klank-modus",
+        "audioRoute": "Kies die klanktoestel",
+        "callQuality": "Bestuur oproepkwaliteit",
+        "enterFullScreen": "Volskermaansig",
+        "exitFullScreen": "Verlaat volskerm",
+        "feedback": "Laat terugvoer",
+        "moreActions": "Meer aksies",
+        "mute": "Demp / ontdemp",
+        "videomute": "Begin / stop kamera",
+        "authenticate": "Verifieer",
+        "lock": "Sluit / ontsluit kamer",
+        "chat": "Open / sluit gesels",
+        "etherpad": "Open / sluit gedeelde dokument",
+        "documentOpen": "Open gedeelde dokument",
+        "documentClose": "Sluit gedeelde dokument",
+        "shareRoom": "Deel kamer",
+        "sharedvideo": "Deel ’n YouTube-video",
+        "stopSharedVideo": "Stop YouTube-video",
+        "fullscreen": "",
+        "sip": "Bel SIP-nommer",
+        "Settings": "",
+        "hangup": "Verlaat",
+        "login": "Meld aan",
+        "logout": "",
+        "sharedVideoMutedPopup": "Die gedeelde video is gedemp sodat u met ander lede kan praat.",
+        "toggleCamera": "Wissel kamera",
+        "micMutedPopup": "Die mikrofoon is gedemp vir beste ervaring van die gedeelde video.",
+        "talkWhileMutedPopup": "Besig om te praat? U is gedemp.",
+        "unableToUnmutePopup": "",
+        "cameraDisabled": "Kamera is nie beskikbaar nie",
+        "micDisabled": "Mikrofoon is nie beskikbaar nie",
+        "filmstrip": "Wys / versteek video’s",
+        "pip": "Betree Prent-in-Prent-modus",
+        "profile": "Redigeer u profiel",
+        "raiseHand": "Lig / laat sak u hand",
+        "shortcuts": "Sien kortpaaie",
+        "speakerStats": "Sprekerstatistiek",
+        "tileViewToggle": "Wissel teëlaansig",
+        "invite": "Nooi mense"
+    },
+    "chat": {
+        "nickname": {
+            "title": "Gee ’n bynaam in die boksie hieronder",
+            "popover": "Kies ’n bynaam"
+        },
+        "error": "",
+        "messagebox": "Tik teks..."
+    },
+    "settings": {
+        "calendar": {
+            "about": "",
+            "disconnect": "Ontkoppel",
+            "microsoftSignIn": "Meld aan met Microsoft",
+            "signedIn": "",
+            "title": ""
+        },
+        "title": "",
+        "update": "Werk by",
+        "name": "",
+        "startAudioMuted": "Almal begin gedemp",
+        "startVideoMuted": "Almal begin versteek",
+        "selectCamera": "Kamera",
+        "selectMic": "Mikrofoon",
+        "selectAudioOutput": "Klankafvoer",
+        "followMe": "Almal volg my",
+        "language": "Taal",
+        "loggedIn": "Aangemeld as __name__",
+        "noDevice": "",
+        "cameraAndMic": "Kamera en mikrofoon",
+        "moderator": "",
+        "more": "Meer",
+        "password": "STEL WAGWOORD",
+        "audioVideo": "KLANK EN VIDEO",
+        "devices": "Toestelle"
+    },
+    "profile": {
+        "title": "",
+        "setDisplayNameLabel": "Stel u vertoonnaam",
+        "setEmailLabel": "Stel u gravatar-e-posadres",
+        "setEmailInput": "Gee e-posadres"
+    },
+    "videothumbnail": {
+        "moderator": "",
+        "videomute": "Lid het die kamera gestop",
+        "mute": "Lid is gedemp",
+        "kick": "Skop uit",
+        "muted": "Gedemp",
+        "domute": "",
+        "flip": "Swaai om",
+        "remoteControl": ""
+    },
+    "connectionindicator": {
+        "header": "",
+        "connectedTo": "Gekoppel aan:",
+        "bitrate": "Bistempo:",
+        "bridgeCount": "Aantal bedieners: ",
+        "packetloss": "Pakkies verloor:",
+        "resolution": "Resolusie:",
+        "framerate": "Raampietempo:",
+        "less": "Wys minder",
+        "more": "Wys meer",
+        "address": "Adres:",
+        "remoteport": "Afgeleë poort:",
+        "remoteport_plural": "Afgeleë poorte:",
+        "localport": "Plaaslike poort:",
+        "localport_plural": "Plaaslike poorte:",
+        "localaddress": "Plaaslike adres:",
+        "localaddress_plural": "Plaaslike adresse:",
+        "remoteaddress": "Afgeleë adres:",
+        "remoteaddress_plural": "Afgeleë adresse:",
+        "transport": "",
+        "transport_plural": "",
+        "bandwidth": "Geraamde bandwydte:",
+        "na": "",
+        "turn": "",
+        "quality": {
+            "good": "",
+            "inactive": "Onaktief",
+            "lost": "",
+            "nonoptimal": "",
+            "poor": "Swak"
+        },
+        "status": "Verbinding:"
+    },
+    "notify": {
+        "disconnected": "ontkoppel",
+        "moderator": "",
+        "connectedOneMember": "__name__ het gekoppel",
+        "connectedTwoMembers": "__first__ en __second__ het gekoppel",
+        "connectedThreePlusMembers": "__name__ en __count__ ander het gekoppel",
+        "somebody": "Iemand",
+        "me": "",
+        "focus": "",
+        "focusFail": "",
+        "grantedTo": "__to__ is nou moderator!",
+        "muted": "U het die gesprek gedemp begin.",
+        "mutedTitle": "U is gedemp!",
+        "raisedHand": "",
+        "suboptimalExperienceTitle": "Blaaierwaarskuwing",
+        "suboptimalExperienceDescription": "Gits... ons is bevrees u ervaring met __appName__ gaan nie so goed wees hier nie. Ons soek maniere om dit die hoof te bied, maar probeer intussen een van die <a href='static/recommendedBrowsers.html' target='_blank'>volledig ondersteunde blaaiers</a>."
+    },
+    "dialog": {
+        "accessibilityLabel": {
+            "liveStreaming": "Regstreekse stroom"
+        },
+        "allow": "Laat toe",
+        "confirm": "Bevestig",
+        "kickMessage": "Eina! U is uit die gesprek geskop!",
+        "kickTitle": "Uit vergadering geskop",
+        "popupErrorTitle": "Opspringer geblok",
+        "popupError": "U blaaier blokkeer opspringers vanaf hierdie werf. Aktiveer opspringers in die blaaier se sekuriteitopsies en probeer weer.",
+        "passwordErrorTitle": "Wagwoordfout",
+        "passwordError": "Hierdie gesprek word tans met ’n wagwoord beskerm. Slegs die eienaar van die konferensie kan ’n wagwoord instel.",
+        "passwordError2": "Hierdie gesprek word nie tans met ’n wagwoord beskerm nie. Slegs die eienaar van die konferensie kan ’n wagwoord instel.",
+        "connectError": "Oeps! Iets het skeefgeloop en ons kon nie aan die konferensie koppel nie.",
+        "connectErrorWithMsg": "Oeps! Iets het skeefgeloop en ons kon nie aan die konferensie koppel nie: __msg__",
+        "incorrectPassword": "Verkeerde gebruikernaam of wagwoord",
+        "connecting": "",
+        "copy": "Kopieer",
+        "contactSupport": "Kontak ondersteuning",
+        "error": "",
+        "detectext": "",
+        "failedpermissions": "Kon nie toestemming kry om die plaaslike mikrofoon en/of kamera te gebruik nie.",
+        "conferenceReloadTitle": "Iets het ongelukkig skeefgeloop.",
+        "conferenceReloadMsg": "Ons probeer om dit reg te stel. Gaan herkoppel oor __seconds__ sekondes...",
+        "conferenceDisconnectTitle": "Die verbinding is verbreek.",
+        "conferenceDisconnectMsg": "Kontroleer dalk die netwerkverbinding. Gaan oor __seconds__ sekondes weer koppel...",
+        "dismiss": "",
+        "rejoinNow": "Sluit nou weer aan",
+        "maxUsersLimitReachedTitle": "Maksimumlede-limiet bereik",
+        "maxUsersLimitReached": "Die limiet vir maksimum getal lede is bereik. Die konferensie is vol. Kontak asb. die eienaar van die vergadering of probeer weer later!",
+        "lockRoom": "Sluit kamer",
+        "lockTitle": "Sluit het misluk",
+        "lockMessage": "Kon nie die konferensie sluit nie.",
+        "warning": "",
+        "passwordNotSupportedTitle": "Wagwoord nie ondersteun nie",
+        "passwordNotSupported": "Die instel van ’n vergaderingwagwoord word nie ondersteun nie.",
+        "internalErrorTitle": "Interne fout",
+        "internalError": "Oeps! Iets het skeefgeloop. Die volgende fout het voorgekom: __error__",
+        "unableToSwitch": "Kan nie videostroom wissel nie.",
+        "SLDFailure": "",
+        "SRDFailure": "",
+        "oops": "Oeps!",
+        "currentPassword": "Die huidige wagwoord is",
+        "passwordLabel": "Wagwoord",
+        "defaultError": "Daar was een of ander soort fout",
+        "passwordRequired": "Wagwoord vereis",
+        "Ok": "Regso",
+        "done": "Klaar",
+        "Remove": "Verwyder",
+        "removePassword": "Verwyder wagwoord",
+        "shareVideoTitle": "Deel ’n video",
+        "shareVideoLinkError": "Gee asb. ’n korrekte YouTube-skakel.",
+        "removeSharedVideoTitle": "Verwyder gedeelde video",
+        "removeSharedVideoMsg": "Wil u definitief u gedeelde video verwyder?",
+        "alreadySharedVideoMsg": "’n Ander lid deel reeds ’n video. Dié konferensie laat slegs een gedeelde video op ’n slag toe.",
+        "alreadySharedVideoTitle": "Slegs een gedeelde video op ’n slag word toegelaat",
+        "WaitingForHost": "Wag tans vir die gasheer ...",
+        "WaitForHostMsg": "Die konferensie <b>__room </b> het nog nie begin nie. As u die gasheer is, verifieer u identiteit. Wag andersins asb. vir die gasheer om op te daag.",
+        "IamHost": "Ek is die gasheer",
+        "Cancel": "Kanselleer",
+        "Submit": "Dien in",
+        "retry": "Herprobeer",
+        "logoutTitle": "Meld af",
+        "logoutQuestion": "Wil u definitief afmeld en die konferensie stop?",
+        "sessTerminated": "Oproep gestaak",
+        "hungUp": "U het neergesit",
+        "joinAgain": "Sluit weer aan",
+        "Share": "",
+        "Save": "Stoor",
+        "recording": "",
+        "recordingToken": "",
+        "Back": "Terug",
+        "serviceUnavailable": "Diens nie beskikbaar nie",
+        "gracefulShutdown": "Ons diens is tans buite werking t.w.v. onderhoud. Probeer gerus weer later.",
+        "Yes": "",
+        "reservationError": "",
+        "reservationErrorMsg": "Foutkode: __code__, boodskap: __msg__",
+        "password": "Tik wagwoord in",
+        "unlockRoom": "Ontsluit kamer",
+        "userPassword": "gebruikerwagwoord",
+        "token": "",
+        "tokenAuthFailedTitle": "",
+        "tokenAuthFailed": "Jammer! U mag nie by dié oproep aansluit nie.",
+        "displayNameRequired": "Vertoonnaam is nodig",
+        "enterDisplayName": "Gee asb. u vertoonnaam",
+        "feedbackHelp": "Terugvoer sal ons help om ons video-ervaring te verbeter.",
+        "feedbackQuestion": "Vertel ons oor die oproep!",
+        "thankYou": "Dankie dat u __appName__ gebruik!",
+        "sorryFeedback": "Dis jammer om te hoor. Wil u meer vertel?",
+        "liveStreaming": "",
+        "streamKey": "Sleutel vir regstreekse stroom",
+        "startLiveStreaming": "Begin regstreekse stroom",
+        "startRecording": "Begin opname",
+        "stopStreamingWarning": "Wil u definitief die regstreekse stroom stop?",
+        "stopRecordingWarning": "Wil u definitief die opname stop?",
+        "stopLiveStreaming": "Stop regstreekse stroom",
+        "stopRecording": "Stop opname",
+        "doNotShowMessageAgain": "Moenie weer dié boodskap wys nie",
+        "permissionDenied": "Toestemming gewyer",
+        "screenSharingFailedToInstall": "Oeps! Die uitbreiding vir skermdeling kon nie installeer nie.",
+        "screenSharingFailedToInstallTitle": "Uitbreiding vir skermdeling kon nie installeer nie",
+        "screenSharingFirefoxPermissionDeniedError": "",
+        "screenSharingFirefoxPermissionDeniedTitle": "Oeps! Ons kon nie skermdeling begin nie!",
+        "screenSharingPermissionDeniedError": "",
+        "cameraUnsupportedResolutionError": "Die kamera ondersteun nie die nodige videoresolusie nie.",
+        "cameraUnknownError": "Kan weens onbekende rede nie die kamera gebruik nie.",
+        "cameraPermissionDeniedError": "U het nie toestemming gegee om u kamera te gebruik nie. U kan steeds by die konferensie aansluit, maar ander sal u nie kan sien nie. Gebruik die kameraknoppie in die adresbalk om dit reg te stel.",
+        "cameraNotFoundError": "Kamera is nie gevind nie.",
+        "cameraConstraintFailedError": "Die kamera voldoen nie aan sekere van die vereistes nie.",
+        "micUnknownError": "Kan weens onbekende rede nie die mikrofoon gebruik nie.",
+        "micPermissionDeniedError": "U het nie toestemming gegee om u mikrofoon te gebruik nie. U kan steeds by die konferensie aansluit, maar ander sal u nie kan hoor nie. Gebruik die kameraknoppie in die adresbalk om dit reg te stel.",
+        "micNotFoundError": "Mikrofoon is nie gevind nie.",
+        "micConstraintFailedError": "Die mikrofoon voldoen nie aan sekere van die vereistes nie.",
+        "micNotSendingDataTitle": "Kan nie toegang tot mikrofoon kry nie",
+        "micNotSendingData": "Ons kry nie toegang tot u mikrofoon nie. Kies asb. ’n ander toestel by die instellingskieslys of probeer om die toepassing op nuut te laai.",
+        "cameraNotSendingDataTitle": "Kan nie toegang tot kamera kry nie",
+        "cameraNotSendingData": "Ons kry nie toegang tot u kamera nie. Kontroleer of ’n ander toepassing dié toestel gebruik, kies asb. ’n ander toestel by die instellingskieslys of probeer om die toepassing op nuut te laai.",
+        "goToStore": "Gaan na die webwinkel",
+        "externalInstallationTitle": "Uitbreiding is nodig",
+        "externalInstallationMsg": "",
+        "inlineInstallationMsg": "U moet ons uitbreiding vir werkskermdeling installeer.",
+        "inlineInstallExtension": "Installeer nou",
+        "muteParticipantTitle": "Demp dié lid?",
+        "muteParticipantBody": "U sal hulle nie kan ontdemp nie, maar hulle sal hulself enige tyd kan ontdemp.",
+        "muteParticipantButton": "Demp",
+        "liveStreamingDisabledTooltip": "Begin van regstreekse stroom gedeaktiveer.",
+        "liveStreamingDisabledForGuestTooltip": "Gaste kan nie regstreekse strome begin nie.",
+        "recordingDisabledTooltip": "Begin van opname gedeaktiveer.",
+        "recordingDisabledForGuestTooltip": "Gaste kan nie opnames begin nie.",
+        "remoteControlTitle": "",
+        "remoteControlRequestMessage": "",
+        "remoteControlShareScreenWarning": "",
+        "remoteControlDeniedMessage": "",
+        "remoteControlAllowedMessage": "",
+        "remoteControlErrorMessage": "",
+        "startRemoteControlErrorMessage": "",
+        "remoteControlStopMessage": "",
+        "close": "Sluit",
+        "shareYourScreen": "Deel u skerm",
+        "shareYourScreenDisabled": "Skermdeling gedeaktiveer.",
+        "shareYourScreenDisabledForGuest": "Gaste kan nie skerms deel nie.",
+        "yourEntireScreen": "U hele skerm",
+        "applicationWindow": "Toepassingsvenster",
+        "transcribing": "Transkribering"
+    },
+    "email": {
+        "sharedKey": [
+            "Dié konferensie word met ’n wagwoord beskerm. Gebruik asb. die volgende PIN om aan te sluit:",
+            "",
+            "",
+            "__sharedKey__",
+            "",
+            ""
+        ],
+        "subject": "Uitnodiging na ’n __appName__ (__conferenceName__)",
+        "body": [
+            "Hallo! Hierdie is ’n uitnodiging na ’n __appName__-konferensie wat ek pas opgestel het.",
+            "",
+            "",
+            "Klik gerus op die volgende skakel om by die konferensie aan te sluit.",
+            "",
+            "",
+            "__roomUrl__",
+            "",
+            "",
+            "__sharedKeyText__",
+            " Let op dat __appName__ tans net deur die blaaiers __supportedBrowsers__ ondersteun word. Dus moet mens een van hulle gebruik.",
+            "",
+            "",
+            "Hopelik praat ons gou!"
+        ],
+        "and": "en"
+    },
+    "share": {
+        "mainText": [
+            "Klik die volgende skakel om by die vergadering aan te sluit:",
+            "__roomUrl__"
+        ],
+        "dialInfoText": [
+            "",
+            "",
+            "=====",
+            "",
+            "Wil u bloot met u foon inbel?",
+            "",
+            "__defaultDialInNumber__Klik dié skakel om die inbelfoonnommers vir dié vergadering te sien",
+            "__dialInfoPageUrl__"
+        ]
+    },
+    "connection": {
+        "ERROR": "Fout",
+        "CONNECTING": "Koppel tans",
+        "RECONNECTING": "’n Netwerkprobleem het voorgekom. Herkoppel tans...",
+        "CONNFAIL": "Koppeling het misluk",
+        "AUTHENTICATING": "",
+        "AUTHFAIL": "",
+        "CONNECTED": "",
+        "DISCONNECTED": "",
+        "DISCONNECTING": "Ontkoppel tans",
+        "ATTACHED": ""
+    },
+    "recording": {
+        "beta": "",
+        "busy": "",
+        "busyTitle": "Alle opnemers is tans besig",
+        "buttonTooltip": "Begin / stop opname",
+        "error": "Opname het misluk. Probeer gerus weer.",
+        "expandedOff": "Opname het gestop",
+        "expandedOn": "Die vergadering word tans opgeneem.",
+        "expandedPending": "Opname word begin...",
+        "failedToStart": "Kon nie begin opneem nie",
+        "live": "",
+        "off": "Opname gestop",
+        "on": "Neem tans op",
+        "pending": "Berei voor om vergadering op te neem...",
+        "rec": "",
+        "authDropboxText": "Laai op na Dropbox",
+        "serviceName": "Opneemdiens",
+        "signOut": "Meld af",
+        "signIn": "meld aan",
+        "loggedIn": "Aangemeld as __name__",
+        "availableSpace": "Beskikbare spasie: __spaceLeft__ MB (ongeveer __duration__ minute se opname)",
+        "startRecordingBody": "Wil u definitief die opname begin?",
+        "unavailable": "",
+        "unavailableTitle": ""
+    },
+    "transcribing": {
+        "pending": "",
+        "off": "",
+        "error": "",
+        "expandedLabel": "",
+        "failedToStart": "",
+        "tr": "",
+        "labelToolTip": "",
+        "ccButtonTooltip": "",
+        "start": "",
+        "stop": ""
+    },
+    "liveStreaming": {
+        "busy": "",
+        "busyTitle": "",
+        "buttonTooltip": "Begin /stop regstreekse stroom",
+        "changeSignIn": "Wissel rekeninge.",
+        "choose": "Kies ’n regstreekse stroom",
+        "chooseCTA": "Kies ’n stroomopsie. U is tans aangemeld as __email__.",
+        "enterStreamKey": "Gee u sleutel vir regstreekse stroom by YouTube hier.",
+        "error": "Kon nie regstreeks stroom nie. Probeer gerus weer.",
+        "errorAPI": "’n Fout het voorgekom tydens toegang tot u YouTube-uitsendings. Probeer om weer aan te meld.",
+        "errorLiveStreamNotEnabled": "Regstreekse stroom is nie geaktiveer op __email__ nie. Aktiveer asb. regstreekse strome of meld aan met ’n rekening met regstreekse strome geaktiveer.",
+        "expandedOff": "Die regstreekse stroom het gestop",
+        "expandedOn": "Die vergadering word tans gestroom na YouTube.",
+        "expandedPending": "Die regstreekse stroom begin tans...",
+        "failedToStart": "Regstreekse stroom kon nie begin nie",
+        "off": "Regstreekse stroom het gestop",
+        "on": "Regstreekse stroom",
+        "pending": "Begin tans regstreekse stroom...",
+        "serviceName": "Regstreekse stroomdiens",
+        "signedInAs": "U is tans aangemeld as:",
+        "signIn": "Meld aan met Google",
+        "signOut": "Meld af",
+        "signInCTA": "Meld aan of gee u sleutel vir regstreekse stroom vanaf YouTube.",
+        "start": "Begin ’n regstreekse stroom",
+        "streamIdHelp": "Wat’s dié?",
+        "unavailableTitle": "Regstreekse strome nie beskikbaar nie"
+    },
+    "videoSIPGW": {
+        "busy": "Ons probeer tans hulpbronne vry te stel. Probeer gerus weer oor ’n paar minute.",
+        "busyTitle": "Die Kamerdiens is tans besig",
+        "errorInvite": "Konferensie is nog nie gestig nie. Probeer gerus weer later.",
+        "errorInviteTitle": "",
+        "errorAlreadyInvited": "__displayName__ is reeds genooi",
+        "errorInviteFailedTitle": "Kon nie __displayName__ nooi nie",
+        "errorInviteFailed": "Ons werk aan ’n oplossing vir die probleem. Probeer gerus weer later.",
+        "pending": "__displayName__ is genooi",
+        "serviceName": "Kamerdiens",
+        "unavailableTitle": "Kamerdiens nie beskikbaar nie"
+    },
+    "speakerStats": {
+        "hours": "__count__h",
+        "minutes": "__count__m",
+        "name": "Naam",
+        "seconds": "__count__s",
+        "speakerStats": "Sprekerstatistiek",
+        "speakerTime": "Sprekertyd"
+    },
+    "deviceSelection": {
+        "deviceSettings": "Toestelinstellings",
+        "noPermission": "Toestemming nie gegee nie",
+        "previewUnavailable": "Voorskou nie beskikbaar nie",
+        "selectADevice": "Kies 'n toestel",
+        "testAudio": "Speel ’n toetsklank"
+    },
+    "videoStatus": {
+        "audioOnly": "",
+        "audioOnlyExpanded": "U is in Net klank-modus. Dié modus spaar bandwydte maar u sal nie video’s van ander sien nie.",
+        "callQuality": "Oproepkwaliteit",
+        "hd": "HD",
+        "hdTooltip": "Sien tans hoëdefinisievideo",
+        "highDefinition": "Hoëdefinisie",
+        "labelTooltipAudioOnly": "Net klank-modus geaktiveer",
+        "labelTooiltipNoVideo": "Geen video",
+        "labelTooltipVideo": "Huidige videokwaliteit",
+        "ld": "LD",
+        "ldTooltip": "Sien tans laedefinisievideo",
+        "lowDefinition": "Laedefinisie",
+        "onlyAudioAvailable": "Net klank is beskikbaar",
+        "onlyAudioSupported": "Op dié blaaier ondersteun ons slegs klank.",
+        "p2pEnabled": "",
+        "p2pVideoQualityDescription": "",
+        "recHighDefinitionOnly": "",
+        "sd": "SD",
+        "sdTooltip": "Sien tans standaarddefinisievideo",
+        "standardDefinition": "Standaarddefinisie",
+        "qualityButtonTip": ""
+    },
+    "dialOut": {
+        "statusMessage": "is nou __status__"
+    },
+    "addPeople": {
+        "add": "",
+        "countryNotSupported": "Ons ondersteun nog nie dié bestemming nie.",
+        "countryReminder": "",
+        "disabled": "",
+        "footerText": "",
+        "invite": "Nooi uit",
+        "loading": "",
+        "loadingNumber": "Valideer tans foonnommer",
+        "loadingPeople": "",
+        "noResults": "Geen soekresultate wat pas nie",
+        "noValidNumbers": "Gee asseblief ’n foonnommer",
+        "notAvailable": "U kan nie mense nooi nie.",
+        "searchNumbers": "Voeg foonnommers by",
+        "searchPeople": "Soek mense",
+        "searchPeopleAndNumbers": "Soek mense of voeg hulle foonnommers by",
+        "telephone": "Telefoon: __number__",
+        "title": "Nooi mense na dié vergadering",
+        "failedToAdd": "Kon nie lede byvoeg nie"
+    },
+    "inlineDialogFailure": {
+        "msg": "Ons het gestruikel.",
+        "retry": "Probeer weer",
+        "support": "Ondersteuning",
+        "supportMsg": "Indien dit aanhou, maak kontak met"
+    },
+    "deviceError": {
+        "cameraError": "Toegang na u kamera het misluk",
+        "microphoneError": "Toegang na u mikrofoon het misluk",
+        "cameraPermission": "Fout met verkryging van kameratoestemming",
+        "microphonePermission": "Fout met verkryging van mikrofoontoestemming"
+    },
+    "feedback": {
+        "average": "Gemiddeld",
+        "bad": "Sleg",
+        "good": "Goed",
+        "detailsLabel": "Vertel ons meer.",
+        "rateExperience": "",
+        "veryBad": "Baie sleg",
+        "veryGood": "Baie goed"
+    },
+    "info": {
+        "accessibilityLabel": "Wys inligting",
+        "addPassword": "Voeg wagwoord by",
+        "cancelPassword": "Kanselleer wagwoord",
+        "conferenceURL": "Skakel:",
+        "country": "Land",
+        "dialANumber": "Om by u vergadering aan te sluit, skakel een van dié nommers en gee dan dié PIN: __conferenceID__#",
+        "dialInNumber": "Inbel:",
+        "dialInConferenceID": "PIN:",
+        "dialInNotSupported": "Jammer. Inbel word nie tans ondersteun nie.",
+        "genericError": "Oeps! Iets het skeefgeloop.",
+        "inviteLiveStream": "Om die regstreekse stroom van dié vergadering te sien, klik dié skakel: __url__",
+        "invitePhone": "Om per telefoon aan te sluit, skakel __number__ en gee dié PIN: __conferenceID__#",
+        "invitePhoneAlternatives": "Om meer foonnommers te sien, klik dié skakel: __url__",
+        "inviteURL": "Om by die videovergadering aan te sluit, klik dié skakel: __url__",
+        "liveStreamURL": "Regstreekse stroom:",
+        "moreNumbers": "Meer nommers",
+        "noNumbers": "Geen inbelnommers.",
+        "noPassword": "Geen",
+        "noRoom": "Geen kamer is gegee om na in te bel nie.",
+        "numbers": "Inbelnommers",
+        "password": "Wagwoord:",
+        "title": "Deel",
+        "tooltip": "Deelskakel en inbelinligting vir dié vergadering"
+    },
+    "settingsView": {
+        "alertOk": "Regso",
+        "alertTitle": "Waarskuwing",
+        "alertURLText": "Die gegewe bediener-URL is ongeldig",
+        "conferenceSection": "Konferensie",
+        "displayName": "Vertoonnaam",
+        "email": "E-pos",
+        "header": "Instellings",
+        "profileSection": "Profiel",
+        "serverURL": "Bediener-URL",
+        "startWithAudioMuted": "Begin met klank gedemp",
+        "startWithVideoMuted": "Begin met video gedemp"
+    },
+    "calendarSync": {
+        "addMeetingURL": "Voeg ’n vergaderingskakel by",
+        "confirmAddLink": "Wil u ’n Jitsi-skakel by dié geleentheid voeg?",
+        "confirmAddLinkTitle": "Kalender",
+        "join": "Sluit aan",
+        "joinTooltip": "Sluit aan by die vergadering",
+        "nextMeeting": "volgende vergadering",
+        "noEvents": "Geen komende geleenthede is geskeduleer nie.",
+        "ongoingMeeting": "vergadering onderweg",
+        "permissionButton": "Open instellings",
+        "permissionMessage": "",
+        "refresh": "Verfris kalender",
+        "today": ""
+    },
+    "recentList": {
+        "joinPastMeeting": "Sluit by ’n vorige vergadering aan"
+    },
+    "sectionList": {
+        "pullToRefresh": ""
+    },
+    "deepLinking": {
+        "title": "",
+        "description": "",
+        "tryAgainButton": "",
+        "launchWebButton": "",
+        "appNotInstalled": "",
+        "downloadApp": "",
+        "openApp": ""
+    },
+    "presenceStatus": {
+        "invited": "Uitgenooi",
+        "ringing": "Lui tans...",
+        "calling": "Bel tans...",
+        "initializingCall": "Inisialiseer tans oproep...",
+        "connected": "Gekoppel",
+        "connecting": "Koppel tans...",
+        "connecting2": "Koppel tans*...",
+        "disconnected": "Ontkoppeld",
+        "busy": "Besig",
+        "rejected": "Geweier",
+        "ignored": "Geïgnoreer",
+        "expired": "Verval"
+    },
+    "dateUtils": {
+        "today": "Vandag",
+        "yesterday": "Gister",
+        "earlier": "Vroeër"
+    },
+    "incomingCall": {
+        "answer": "Antwoord",
+        "audioCallTitle": "Inkomende oproep",
+        "decline": "Weier",
+        "productLabel": "vanaf Jitsi Meet",
+        "videoCallTitle": "Inkomende video-oproep"
+    },
+    "localRecording": {
+        "localRecording": "Plaaslike opname",
+        "dialogTitle": "Kontroles vir plaaslike opname",
+        "start": "Begin opname",
+        "stop": "Stop opname",
+        "moderator": "Moderator",
+        "me": "Ek",
+        "duration": "Duur",
+        "durationNA": "",
+        "encoding": "Enkodering",
+        "participantStats": "Deelnemerstatistiek",
+        "participant": "Deelnemer",
+        "sessionToken": "",
+        "clientState": {
+            "on": "Aan",
+            "off": "Af",
+            "unknown": "Onbekend"
+        },
+        "messages": {
+            "engaged": "",
+            "finished": "",
+            "finishedModerator": "",
+            "notModerator": "U is nie die moderator nie. U kan nie ’n plaaslike opname begin of stop nie."
+        },
+        "yes": "Ja",
+        "no": "Nee",
+        "label": "",
+        "labelToolTip": ""
+    }
+}

modules/API/API.js

@@ -60,6 +60,9 @@ function initCommands() {
             sendAnalytics(createApiEvent('display.name.changed'));
             APP.conference.changeLocalDisplayName(displayName);
         },
+        'proxy-connection-event': event => {
+            APP.conference.onProxyConnectionEvent(event);
+        },
         'submit-feedback': feedback => {
             sendAnalytics(createApiEvent('submit.feedback'));
             APP.conference.submitFeedback(feedback.score, feedback.message);
@@ -260,6 +263,20 @@ class API {
         });
     }
 
+    /**
+     * Notifies the external application (spot) that the local jitsi-participant
+     * has a status update.
+     *
+     * @param {Object} event - The message to pass onto spot.
+     * @returns {void}
+     */
+    sendProxyConnectionEvent(event: Object) {
+        this._sendEvent({
+            name: 'proxy-connection-event',
+            ...event
+        });
+    }
+
     /**
      * Sends event to the external application.
      *

modules/API/external/external_api.js

@@ -46,6 +46,7 @@ const events = {
     'outgoing-message': 'outgoingMessage',
     'participant-joined': 'participantJoined',
     'participant-left': 'participantLeft',
+    'proxy-connection-event': 'proxyConnectionEvent',
     'video-ready-to-close': 'readyToClose',
     'video-conference-joined': 'videoConferenceJoined',
     'video-conference-left': 'videoConferenceLeft',
@@ -743,6 +744,25 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         eventList.forEach(event => this.removeEventListener(event));
     }
 
+    /**
+     * Passes an event along to the local conference participant to establish
+     * or update a direct peer connection. This is currently used for developing
+     * wireless screensharing with room integration and it is advised against to
+     * use as its api may change.
+     *
+     * @param {Object} event - An object with information to pass along.
+     * @param {Object} event.data - The payload of the event.
+     * @param {string} event.from - The jid of the sender of the event. Needed
+     * when a reply is to be sent regarding the event.
+     * @returns {void}
+     */
+    sendProxyConnectionEvent(event) {
+        this._transport.sendEvent({
+            data: [ event ],
+            name: 'proxy-connection-event'
+        });
+    }
+
     /**
      * Returns the configuration for electron for the windows that are open
      * from Jitsi Meet.

modules/UI/UI.js

@@ -670,7 +670,7 @@ UI.handleLastNEndpoints = function(leavingIds, enteringIds) {
  * Prompt user for nickname.
  */
 UI.promptDisplayName = () => {
-    APP.store.dispatch(openDisplayNamePrompt());
+    APP.store.dispatch(openDisplayNamePrompt(undefined));
 };
 
 /**

modules/UI/audio_levels/AudioLevels.js

@@ -87,7 +87,8 @@ const AudioLevels = {
 
         // External circle audio level.
         const ext = {
-            level: ((int.level * scale * level) + int.level).toFixed(0),
+            level: parseFloat(
+                ((int.level * scale * level) + int.level).toFixed(0)),
             color: interfaceConfig.AUDIO_LEVEL_SECONDARY_COLOR
         };
 

modules/UI/shared_video/SharedVideo.js

@@ -301,8 +301,7 @@ export default class SharedVideoManager {
 
                 // FIXME The cat is out of the bag already or rather _room is
                 // not private because it is used in multiple other places
-                // already such as AbstractPageReloadOverlay and
-                // JitsiMeetLogStorage.
+                // already such as AbstractPageReloadOverlay.
                 conference: APP.conference._room,
                 id: self.url,
                 isFakeParticipant: true,

modules/UI/videolayout/LargeVideoManager.js

@@ -6,6 +6,10 @@ import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
 
 import { i18next } from '../../../react/features/base/i18n';
+import {
+    Avatar,
+    getAvatarURLByParticipantId
+} from '../../../react/features/base/participants';
 import { PresenceLabel } from '../../../react/features/presence-status';
 /* eslint-enable no-unused-vars */
 
@@ -14,9 +18,6 @@ const logger = require('jitsi-meet-logger').getLogger(__filename);
 import {
     JitsiParticipantConnectionStatus
 } from '../../../react/features/base/lib-jitsi-meet';
-import {
-    getAvatarURLByParticipantId
-} from '../../../react/features/base/participants';
 import {
     updateKnownLargeVideoResolution
 } from '../../../react/features/large-video';
@@ -95,6 +96,9 @@ export default class LargeVideoManager {
             = this._onVideoResolutionUpdate.bind(this);
 
         this.videoContainer.addResizeListener(this._onVideoResolutionUpdate);
+
+        this._dominantSpeakerAvatarContainer
+            = document.getElementById('dominantSpeakerAvatarContainer');
     }
 
     /**
@@ -109,6 +113,8 @@ export default class LargeVideoManager {
 
         this.removePresenceLabel();
 
+        ReactDOM.unmountComponentAtNode(this._dominantSpeakerAvatarContainer);
+
         this.$container.css({ display: 'none' });
     }
 
@@ -394,7 +400,17 @@ export default class LargeVideoManager {
      * Updates the src of the dominant speaker avatar
      */
     updateAvatar(avatarUrl) {
-        $('#dominantSpeakerAvatar').attr('src', avatarUrl);
+        if (avatarUrl) {
+            ReactDOM.render(
+                <Avatar
+                    id = "dominantSpeakerAvatar"
+                    uri = { avatarUrl } />,
+                this._dominantSpeakerAvatarContainer
+            );
+        } else {
+            ReactDOM.unmountComponentAtNode(
+                this._dominantSpeakerAvatarContainer);
+        }
     }
 
     /**

modules/UI/videolayout/VideoContainer.js

@@ -265,7 +265,7 @@ export class VideoContainer extends LargeContainer {
          */
         this.$wrapperParent = this.$wrapper.parent();
 
-        this.avatarHeight = $('#dominantSpeakerAvatar').height();
+        this.avatarHeight = $('#dominantSpeakerAvatarContainer').height();
 
         const onPlayingCallback = function(event) {
             if (typeof resizeContainer === 'function') {
@@ -408,7 +408,7 @@ export class VideoContainer extends LargeContainer {
      */
     _positionParticipantStatus($element) {
         if (this.avatarDisplayed) {
-            const $avatarImage = $('#dominantSpeakerAvatar');
+            const $avatarImage = $('#dominantSpeakerAvatarContainer');
 
             $element.css(
                 'top',

modules/UI/videolayout/VideoLayout.js

@@ -10,6 +10,7 @@ import {
 } from '../../../react/features/base/lib-jitsi-meet';
 import { VIDEO_TYPE } from '../../../react/features/base/media';
 import {
+    getLocalParticipant as getLocalParticipantFromStore,
     getPinnedParticipant,
     pinParticipant
 } from '../../../react/features/base/participants';
@@ -75,6 +76,16 @@ function getAllThumbnails() {
     ];
 }
 
+/**
+ * Private helper to get the redux representation of the local participant.
+ *
+ * @private
+ * @returns {Object}
+ */
+function getLocalParticipant() {
+    return getLocalParticipantFromStore(APP.store.getState());
+}
+
 /**
  * Returns the user ID of the remote participant that is current the dominant
  * speaker.
@@ -181,7 +192,7 @@ const VideoLayout = {
     },
 
     changeLocalVideo(stream) {
-        const localId = APP.conference.getMyUserId();
+        const localId = getLocalParticipant().id;
 
         this.onVideoTypeChanged(localId, stream.videoType);
 
@@ -198,7 +209,7 @@ const VideoLayout = {
      */
     mucJoined() {
         if (largeVideo && !largeVideo.id) {
-            this.updateLargeVideo(APP.conference.getMyUserId(), true);
+            this.updateLargeVideo(getLocalParticipant().id, true);
         }
 
         // FIXME: replace this call with a generic update call once SmallVideo
@@ -302,7 +313,7 @@ const VideoLayout = {
         // Go with local video
         logger.info('Fallback to local video...');
 
-        const id = APP.conference.getMyUserId();
+        const { id } = getLocalParticipant();
 
         logger.info(`electLastVisibleVideo: ${id}`);
 

package-lock.json

@@ -8431,8 +8431,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "github:jitsi/lib-jitsi-meet#2080e812a9e565a7151df367b31b12429ce5b50e",
-      "from": "github:jitsi/lib-jitsi-meet#2080e812a9e565a7151df367b31b12429ce5b50e",
+      "version": "github:jitsi/lib-jitsi-meet#2e1436e20d4d8fb6020497a87b2714dff38a6c86",
+      "from": "github:jitsi/lib-jitsi-meet#2e1436e20d4d8fb6020497a87b2714dff38a6c86",
       "requires": {
         "@jitsi/sdp-interop": "0.1.13",
         "@jitsi/sdp-simulcast": "0.2.1",
@@ -8441,7 +8441,6 @@
         "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e",
         "js-utils": "github:jitsi/js-utils#446497893023aa8dec403e0e4e35a22cae6bc87d",
         "lodash.isequal": "4.5.0",
-        "react-native-callstats": "3.53.4",
         "sdp-transform": "2.3.0",
         "strophe.js": "1.2.15",
         "strophejs-plugin-disco": "0.0.2",
@@ -11458,9 +11457,9 @@
       "integrity": "sha512-By4lgWQG9eewS9WzhzxVHAewxX40v1CzLnNYXFMOqF06fYVCNykiiTMGlLzz3UXHVwwN1Drxw9uWroQfGRFMsw=="
     },
     "react-native-callstats": {
-      "version": "3.53.4",
-      "resolved": "https://registry.npmjs.org/react-native-callstats/-/react-native-callstats-3.53.4.tgz",
-      "integrity": "sha512-LN6CVKHSVTz+CJ6hGuGaxC2bbknoIACEMYLKZ/dcTMEepibaac3bZ+Evilgq0ot+E1BBBFkOo9hiOUU1cgqLXQ==",
+      "version": "3.57.1",
+      "resolved": "https://registry.npmjs.org/react-native-callstats/-/react-native-callstats-3.57.1.tgz",
+      "integrity": "sha512-IrPYu/Q4AgC2lMDVgORHNM5OpgIxwqPmYw6Rhqbr1RXgMIN91Ve/NG6hjM6logk+gxbacxeyXpl3XCmtaM6RPg==",
       "requires": {
         "base-64": "0.1.0",
         "jssha": "^2.2.0"

package.json

@@ -50,7 +50,7 @@
     "jsc-android": "224109.1.0",
     "jsrsasign": "8.0.12",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#2080e812a9e565a7151df367b31b12429ce5b50e",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#2e1436e20d4d8fb6020497a87b2714dff38a6c86",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.11",
     "moment": "2.19.4",
@@ -64,7 +64,7 @@
     "react-native": "0.57.8",
     "react-native-background-timer": "2.1.1",
     "react-native-calendar-events": "1.6.4",
-    "react-native-callstats": "3.53.4",
+    "react-native-callstats": "3.57.1",
     "react-native-fast-image": "5.1.1",
     "react-native-gifted-chat": "0.6.0",
     "react-native-google-signin": "1.0.2",

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

@@ -15,7 +15,7 @@ import {
 import '../../google-api';
 import '../../mobile/audio-mode';
 import '../../mobile/background';
-import '../../mobile/callkit';
+import '../../mobile/call-integration';
 import '../../mobile/external-api';
 import '../../mobile/full-screen';
 import '../../mobile/permissions';
@@ -35,16 +35,6 @@ const logger = require('jitsi-meet-logger').getLogger(__filename);
  */
 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

react/features/base/conference/actions.js

@@ -10,8 +10,8 @@ import { getName } from '../../app';
 import { JitsiConferenceEvents } from '../lib-jitsi-meet';
 import { setAudioMuted, setVideoMuted } from '../media';
 import {
-    MAX_DISPLAY_NAME_LENGTH,
     dominantSpeakerChanged,
+    getNormalizedDisplayName,
     participantConnectionStatusChanged,
     participantPresenceChanged,
     participantRoleChanged,
@@ -131,7 +131,7 @@ function _addConferenceListeners(conference, dispatch) {
         (id, displayName) => dispatch(participantUpdated({
             conference,
             id,
-            name: displayName.substr(0, MAX_DISPLAY_NAME_LENGTH)
+            name: getNormalizedDisplayName(displayName)
         })));
 
     conference.on(
@@ -382,10 +382,11 @@ export function createConference() {
  * @returns {Function}
  */
 export function checkIfCanJoin() {
-    return (dispatch: Dispatch<*>, getState: Function) => {
+    return (dispatch: Function, getState: Function) => {
         const { authRequired, password }
             = getState()['features/base/conference'];
 
+        authRequired && dispatch(_conferenceWillJoin(authRequired));
         authRequired && authRequired.join(password);
     };
 }

react/features/base/conference/functions.js

@@ -145,6 +145,22 @@ export function forEachConference(
     return true;
 }
 
+/**
+ * Returns the display name of the conference.
+ *
+ * @param {Function | Object} stateful - Reference that can be resolved to Redux
+ * state with the {@code toState} function.
+ * @returns {string}
+ */
+export function getConferenceName(stateful: Function | Object): string {
+    const state = toState(stateful);
+    const { callee } = state['features/base/jwt'];
+
+    return state['features/base/config'].callDisplayName
+                || (callee && callee.name)
+                || state['features/base/conference'].room;
+}
+
 /**
  * Returns the current {@code JitsiConference} which is joining or joined and is
  * not leaving. Please note the contrast with merely reading the

react/features/base/conference/middleware.js

@@ -673,7 +673,7 @@ function _updateLocalParticipantInConference({ getState }, next, action) {
     const { participant } = action;
     const result = next(action);
 
-    if (conference && participant.local) {
+    if (conference && participant.local && 'name' in participant) {
         conference.setDisplayName(participant.name);
     }
 

react/features/base/config/functions.js

@@ -17,6 +17,7 @@ declare var $: Object;
  * @type Array
  */
 const WHITELISTED_KEYS = [
+    '_desktopSharingSourceDevice',
     '_peerConnStatusOutOfLastNTimeout',
     '_peerConnStatusRtcMuteTimeout',
     'abTesting',
@@ -119,6 +120,7 @@ const WHITELISTED_KEYS = [
     'iceTransportPolicy',
     'ignoreStartMuted',
     'liveStreamingEnabled',
+    'localRecording',
     'minParticipants',
     'nick',
     'openBridgeChannel',

react/features/base/lib-jitsi-meet/native/polyfills-browser.js

@@ -381,7 +381,13 @@ function _visitNode(node, callback) {
 
     // WebRTC
     require('./polyfills-webrtc');
+
+    // CallStats
+    //
+    // Required by:
+    // - lib-jitsi-meet
     require('react-native-callstats/csio-polyfill');
+    global.callstats = require('react-native-callstats/callstats');
 
     // XMLHttpRequest
     if (global.XMLHttpRequest) {

react/features/base/logging/JitsiMeetInMemoryLogStorage.js

@@ -1,10 +1,11 @@
 /**
  * Implements in memory logs storage, used for testing/debugging.
+ *
  */
 export default class JitsiMeetInMemoryLogStorage {
 
     /**
-     * Creates new <tt>JitsiMeetInMemoryLogStorage</tt>
+     * Creates new <tt>JitsiMeetInMemoryLogStorage</tt>.
      */
     constructor() {
         /**
@@ -15,6 +16,8 @@ export default class JitsiMeetInMemoryLogStorage {
     }
 
     /**
+     * Checks if this storage instance is ready.
+     *
      * @returns {boolean} <tt>true</tt> when this storage is ready or
      * <tt>false</tt> otherwise.
      */
@@ -25,8 +28,10 @@ export default class JitsiMeetInMemoryLogStorage {
     /**
      * Called by the <tt>LogCollector</tt> to store a series of log lines into
      * batch.
-     * @param {string|object[]} logEntries an array containing strings
+     *
+     * @param {string|Object[]} logEntries - An array containing strings
      * representing log lines or aggregated lines objects.
+     * @returns {void}
      */
     storeLogs(logEntries) {
         for (let i = 0, len = logEntries.length; i < len; i++) {
@@ -42,7 +47,9 @@ export default class JitsiMeetInMemoryLogStorage {
     }
 
     /**
-     * @returns {array} the collected log entries.
+     * Returns the logs stored in the memory.
+     *
+     * @returns {Array<string>} The collected log entries.
      */
     getLogs() {
         return this.logs;

react/features/base/logging/JitsiMeetLogStorage.js

@@ -1,38 +1,59 @@
-/* global APP */
+
+import { getCurrentConference } from '../conference';
 
 /**
- * Implements logs storage through the CallStats.
+ * Implements log storage interface from the jitsi-meet-logger lib. Captured
+ * logs are sent to CallStats.
  */
 export default class JitsiMeetLogStorage {
 
     /**
-     * Creates new <tt>JitsiMeetLogStorage</tt>
+     * Creates new <tt>JitsiMeetLogStorage</tt>.
+     *
+     * @param {Function} getState - The Redux store's {@code getState} method.
      */
-    constructor() {
+    constructor(getState) {
         /**
          * Counts each log entry, increases on every batch log entry stored.
          * @type {number}
          */
         this.counter = 1;
+
+        /**
+         * The Redux store's {@code getState} method.
+         *
+         * @type {Function}
+         */
+        this.getState = getState;
     }
 
     /**
-     * @return {boolean} <tt>true</tt> when this storage is ready or
+     * The JitsiMeetLogStorage is ready when the CallStats are started and
+     * before refactoring the code it was after the conference has been joined.
+     * A conference is considered joined when the 'conference' field is defined
+     * in the base/conference state.
+     *
+     * @returns {boolean} <tt>true</tt> when this storage is ready or
      * <tt>false</tt> otherwise.
      */
     isReady() {
-        return Boolean(APP.logCollectorStarted && APP.conference);
+        const { conference } = this.getState()['features/base/conference'];
+
+        return Boolean(conference);
     }
 
     /**
      * Called by the <tt>LogCollector</tt> to store a series of log lines into
      * batch.
-     * @param {string|object[]}logEntries an array containing strings
+     *
+     * @param {Array<string|Object>} logEntries - An array containing strings
      * representing log lines or aggregated lines objects.
+     * @returns {void}
      */
     storeLogs(logEntries) {
+        const conference = getCurrentConference(this.getState());
 
-        if (!APP.conference.isCallstatsEnabled()) {
+        if (!conference || !conference.isCallstatsEnabled()) {
             // Discard the logs if CallStats is not enabled.
             return;
         }
@@ -58,11 +79,12 @@ export default class JitsiMeetLogStorage {
         // on the way that could be uninitialized if the storeLogs
         // attempt would be made very early (which is unlikely)
         try {
-            APP.conference._room.sendApplicationLog(logMessage);
+            conference.sendApplicationLog(logMessage);
         } catch (error) {
             // NOTE console is intentional here
             console.error(
-                'Failed to store the logs: ', logMessage, error);
+                `Failed to store the logs, msg length: ${logMessage.length}`
+                    + `error: ${JSON.stringify(error)}`);
         }
     }
 }

react/features/base/logging/actionTypes.js

@@ -1,3 +1,14 @@
+/**
+ * The type of redux action which stores the log collector that will be
+ * submitting the logs to CallStats.
+ *
+ * {
+ *     type: SET_LOG_COLLECTOR,
+ *     logCollector: Logger.LogCollector
+ * }
+ */
+export const SET_LOG_COLLECTOR = Symbol('SET_LOG_COLLECTOR');
+
 /**
  * The type of redux action which sets the configuration of the feature
  * base/logging.

react/features/base/logging/actions.js

@@ -1,6 +1,24 @@
 /* @flow */
 
-import { SET_LOGGING_CONFIG } from './actionTypes';
+import { SET_LOG_COLLECTOR, SET_LOGGING_CONFIG } from './actionTypes';
+
+/**
+ * Stores a {@code Logger.LogCollector} instance which will be uploading logs
+ * to CallStats.
+ *
+ * @param {Logger.LogCollector} logCollector - The log collector instance to be
+ * stored in the Redux state of base/logging feature.
+ * @returns {{
+ *     type,
+ *     logCollector: Object
+ * }}
+ */
+export function setLogCollector(logCollector: ?Object) {
+    return {
+        type: SET_LOG_COLLECTOR,
+        logCollector
+    };
+}
 
 /**
  * Sets the configuration of the feature base/logging.

react/features/base/logging/middleware.js

@@ -3,16 +3,19 @@
 import Logger from 'jitsi-meet-logger';
 
 import { APP_WILL_MOUNT } from '../app';
-import JitsiMeetJS, { LIB_WILL_INIT } from '../lib-jitsi-meet';
+import { CONFERENCE_JOINED, getCurrentConference } from '../conference';
+import JitsiMeetJS, {
+    LIB_WILL_INIT,
+    JitsiConferenceEvents
+} from '../lib-jitsi-meet';
 import { MiddlewareRegistry } from '../redux';
 
-import JitsiMeetInMemoryLogStorage
-    from '../../../../modules/util/JitsiMeetInMemoryLogStorage';
-import JitsiMeetLogStorage from '../../../../modules/util/JitsiMeetLogStorage';
-
 import { isTestModeEnabled } from '../testing';
 
+import { setLogCollector } from './actions';
 import { SET_LOGGING_CONFIG } from './actionTypes';
+import JitsiMeetLogStorage from './JitsiMeetLogStorage';
+import JitsiMeetInMemoryLogStorage from './JitsiMeetInMemoryLogStorage';
 
 declare var APP: Object;
 
@@ -28,6 +31,9 @@ MiddlewareRegistry.register(store => next => action => {
     case APP_WILL_MOUNT:
         return _appWillMount(store, next, action);
 
+    case CONFERENCE_JOINED:
+        return _conferenceJoined(store, next, action);
+
     case LIB_WILL_INIT:
         return _libWillInit(store, next, action);
 
@@ -66,28 +72,83 @@ function _appWillMount({ getState }, next, action) {
     return next(action);
 }
 
+/**
+ * Starts the log collector, after {@link CONFERENCE_JOINED} action is reduced.
+ *
+ * @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 CONFERENCE_JOINED} which is
+ * being dispatched in the specified {@code store}.
+ * @private
+ * @returns {*}
+ */
+function _conferenceJoined({ getState }, next, action) {
+
+    // Wait until the joined event is processed, so that the JitsiMeetLogStorage
+    // will be ready.
+    const result = next(action);
+
+    const { conference } = action;
+    const { logCollector } = getState()['features/base/logging'];
+
+    if (logCollector && conference === getCurrentConference(getState())) {
+        // Start the LogCollector's periodic "store logs" task
+        logCollector.start();
+
+        // Make an attempt to flush in case a lot of logs have been cached,
+        // before the collector was started.
+        logCollector.flush();
+
+        // This event listener will flush the logs, before the statistics module
+        // (CallStats) is stopped.
+        //
+        // NOTE The LogCollector is not stopped, because this event can be
+        // triggered multiple times during single conference (whenever
+        // statistics module is stopped). That includes the case when Jicofo
+        // terminates a single person conference (one person left in the room
+        // waiting for someone to join). It will then restart the media session
+        // when someone eventually joins the room which will start the stats
+        // again.
+        conference.on(
+            JitsiConferenceEvents.BEFORE_STATISTICS_DISPOSED,
+            () => logCollector.flush()
+        );
+    }
+
+    return result;
+}
+
 /**
  * Initializes logging in the app.
  *
+ * @param {Store} store - The Redux store in which context the logging is to be
+ * initialized.
  * @param {Object} loggingConfig - The configuration with which logging is to be
  * initialized.
  * @param {boolean} isTestingEnabled - Is debug logging enabled.
  * @private
  * @returns {void}
  */
-function _initLogging(loggingConfig, isTestingEnabled) {
+function _initLogging({ dispatch, getState }, loggingConfig, isTestingEnabled) {
+    const { logCollector } = getState()['features/base/logging'];
+
     // Create the LogCollector and register it as the global log transport. It
     // is done early to capture as much logs as possible. Captured logs will be
     // cached, before the JitsiMeetLogStorage gets ready (statistics module is
     // initialized).
-    if (typeof APP === 'object'
-            && !APP.logCollector
-            && !loggingConfig.disableLogCollector) {
-        APP.logCollector = new Logger.LogCollector(new JitsiMeetLogStorage());
-        Logger.addGlobalTransport(APP.logCollector);
-        JitsiMeetJS.addGlobalLogTransport(APP.logCollector);
+    if (!logCollector && !loggingConfig.disableLogCollector) {
+        const _logCollector
+            = new Logger.LogCollector(new JitsiMeetLogStorage(getState));
 
-        if (isTestingEnabled) {
+        Logger.addGlobalTransport(_logCollector);
+        JitsiMeetJS.addGlobalLogTransport(_logCollector);
+        dispatch(setLogCollector(_logCollector));
+
+        // The JitsiMeetInMemoryLogStorage can not be accessed on mobile through
+        // the 'executeScript' method like it's done in torture tests for WEB.
+        if (isTestingEnabled && typeof APP === 'object') {
             APP.debugLogs = new JitsiMeetInMemoryLogStorage();
             const debugLogCollector = new Logger.LogCollector(
                 APP.debugLogs, { storeInterval: 1000 });
@@ -96,6 +157,11 @@ function _initLogging(loggingConfig, isTestingEnabled) {
             JitsiMeetJS.addGlobalLogTransport(debugLogCollector);
             debugLogCollector.start();
         }
+    } else if (logCollector && loggingConfig.disableLogCollector) {
+        Logger.removeGlobalTransport(logCollector);
+        JitsiMeetJS.removeGlobalLogTransport(logCollector);
+        logCollector.stop();
+        dispatch(setLogCollector(undefined));
     }
 }
 
@@ -137,7 +203,7 @@ function _libWillInit({ getState }, next, action) {
  * @returns {Object} The new state that is the result of the reduction of the
  * specified {@code action}.
  */
-function _setLoggingConfig({ getState }, next, action) {
+function _setLoggingConfig({ dispatch, getState }, next, action) {
     const result = next(action);
     const newValue = getState()['features/base/logging'].config;
     const isTestingEnabled = isTestModeEnabled(getState());
@@ -151,7 +217,10 @@ function _setLoggingConfig({ getState }, next, action) {
     _setLogLevels(Logger, newValue);
     _setLogLevels(JitsiMeetJS, newValue);
 
-    _initLogging(newValue, isTestingEnabled);
+    _initLogging({
+        dispatch,
+        getState
+    }, newValue, isTestingEnabled);
 
     return result;
 }

react/features/base/logging/reducer.js

@@ -1,8 +1,8 @@
 // @flow
 
-import { equals, ReducerRegistry } from '../redux';
+import { equals, ReducerRegistry, set } from '../redux';
 
-import { SET_LOGGING_CONFIG } from './actionTypes';
+import { SET_LOG_COLLECTOR, SET_LOGGING_CONFIG } from './actionTypes';
 
 /**
  * The default/initial redux state of the feature base/logging.
@@ -12,7 +12,12 @@ import { SET_LOGGING_CONFIG } from './actionTypes';
  * }}
  */
 const DEFAULT_STATE = {
-    config: require('../../../../logging_config.js')
+    config: require('../../../../logging_config.js'),
+
+    /**
+     * The log collector.
+     */
+    logCollector: undefined
 };
 
 ReducerRegistry.register(
@@ -21,6 +26,9 @@ ReducerRegistry.register(
         switch (action.type) {
         case SET_LOGGING_CONFIG:
             return _setLoggingConfig(state, action);
+        case SET_LOG_COLLECTOR: {
+            return _setLogCollector(state, action);
+        }
 
         default:
             return state;
@@ -54,3 +62,17 @@ function _setLoggingConfig(state, action) {
         config
     };
 }
+
+/**
+ * Reduces a specific Redux action SET_LOG_COLLECTOR of the feature
+ * base/logging.
+ *
+ * @param {Object} state - The Redux state of the feature base/logging.
+ * @param {Action} action - The Redux action SET_LOG_COLLECTOR to reduce.
+ * @private
+ * @returns {Object} The new state of the feature base/logging after the
+ * reduction of the specified action.
+ */
+function _setLogCollector(state, action) {
+    return set(state, 'logCollector', action.logCollector);
+}

react/features/base/participants/actions.js

@@ -17,8 +17,7 @@ import {
     PARTICIPANT_UPDATED,
     PIN_PARTICIPANT
 } from './actionTypes';
-import { MAX_DISPLAY_NAME_LENGTH } from './constants';
-import { getLocalParticipant } from './functions';
+import { getLocalParticipant, getNormalizedDisplayName } from './functions';
 
 /**
  * Create an action for when dominant speaker changes.
@@ -369,13 +368,17 @@ export function participantRoleChanged(id, role) {
  * }}
  */
 export function participantUpdated(participant = {}) {
+    const participantToUpdate = {
+        ...participant
+    };
+
     if (participant.name) {
-        participant.name = participant.name.substr(0, MAX_DISPLAY_NAME_LENGTH);
+        participantToUpdate.name = getNormalizedDisplayName(participant.name);
     }
 
     return {
         type: PARTICIPANT_UPDATED,
-        participant
+        participant: participantToUpdate
     };
 }
 

react/features/base/participants/components/ParticipantView.native.js

@@ -9,7 +9,6 @@ import { translate } from '../../i18n';
 import { JitsiParticipantConnectionStatus } from '../../lib-jitsi-meet';
 import {
     MEDIA_TYPE,
-    shouldRenderVideoTrack,
     VideoTrack
 } from '../../media';
 import { Container, TintedView } from '../../react';
@@ -20,7 +19,8 @@ import Avatar from './Avatar';
 import {
     getAvatarURL,
     getParticipantById,
-    getParticipantDisplayName
+    getParticipantDisplayName,
+    shouldRenderParticipantVideo
 } from '../functions';
 import styles from './styles';
 
@@ -29,14 +29,6 @@ import styles from './styles';
  */
 type Props = {
 
-    /**
-     * The indicator which determines whether conferencing is in audio-only
-     * mode.
-     *
-     * @private
-     */
-    _audioOnly: boolean,
-
     /**
      * The source (e.g. URI, URL) of the avatar image of the participant with
      * {@link #participantId}.
@@ -61,6 +53,11 @@ type Props = {
      */
     _participantName: string,
 
+    /**
+     * True if the video should be rendered, false otherwise.
+     */
+    _renderVideo: boolean,
+
     /**
      * The video Track of the participant with {@link #participantId}.
      */
@@ -192,23 +189,11 @@ class ParticipantView extends Component<Props> {
             onPress,
             _avatar: avatar,
             _connectionStatus: connectionStatus,
+            _renderVideo: renderVideo,
             _videoTrack: videoTrack
         } = this.props;
 
-        // Is the video to be rendered?
-        // FIXME It's currently impossible to have true as the value of
-        // waitForVideoStarted because videoTrack's state videoStarted will be
-        // updated only after videoTrack is rendered.
-        // XXX Note that, unlike on web, we don't render video when the
-        // connection status is interrupted, this is because the renderer
-        // doesn't retain the last frame forever, so we would end up with a
-        // black screen.
         const waitForVideoStarted = false;
-        const renderVideo
-            = !this.props._audioOnly
-                && (connectionStatus
-                    === JitsiParticipantConnectionStatus.ACTIVE)
-                && shouldRenderVideoTrack(videoTrack, waitForVideoStarted);
 
         // Is the avatar to be rendered?
         const renderAvatar = Boolean(!renderVideo && avatar);
@@ -271,10 +256,10 @@ class ParticipantView extends Component<Props> {
  * associated (instance of) {@code ParticipantView}.
  * @private
  * @returns {{
- *     _audioOnly: boolean,
  *     _avatar: string,
  *     _connectionStatus: string,
  *     _participantName: string,
+ *     _renderVideo: boolean,
  *     _videoTrack: Track
  * }}
  */
@@ -308,12 +293,12 @@ function _mapStateToProps(state, ownProps) {
     }
 
     return {
-        _audioOnly: state['features/base/conference'].audioOnly,
         _avatar: avatar,
         _connectionStatus:
             connectionStatus
                 || JitsiParticipantConnectionStatus.ACTIVE,
         _participantName: participantName,
+        _renderVideo: shouldRenderParticipantVideo(state, participantId),
         _videoTrack:
             getTrackByMediaTypeAndParticipant(
                 state['features/base/tracks'],

react/features/base/participants/functions.js

@@ -3,9 +3,14 @@ import { getAvatarURL as _getAvatarURL } from 'js-utils/avatar';
 
 import { toState } from '../redux';
 
+import { JitsiParticipantConnectionStatus } from '../lib-jitsi-meet';
+import { MEDIA_TYPE, shouldRenderVideoTrack } from '../media';
+import { getTrackByMediaTypeAndParticipant } from '../tracks';
+
 import {
     DEFAULT_AVATAR_RELATIVE_PATH,
     LOCAL_PARTICIPANT_DEFAULT_ID,
+    MAX_DISPLAY_NAME_LENGTH,
     PARTICIPANT_ROLE
 } from './constants';
 
@@ -94,6 +99,21 @@ export function getLocalParticipant(stateful: Object | Function) {
     return participants.find(p => p.local);
 }
 
+/**
+ * Normalizes a display name so then no invalid values (padding, length...etc)
+ * can be set.
+ *
+ * @param {string} name - The display name to set.
+ * @returns {string}
+ */
+export function getNormalizedDisplayName(name: string) {
+    if (!name || !name.trim()) {
+        return undefined;
+    }
+
+    return name.trim().substring(0, MAX_DISPLAY_NAME_LENGTH);
+}
+
 /**
  * Returns participant by ID from Redux state.
  *
@@ -105,7 +125,8 @@ export function getLocalParticipant(stateful: Object | Function) {
  * @private
  * @returns {(Participant|undefined)}
  */
-export function getParticipantById(stateful: Object | Function, id: string) {
+export function getParticipantById(
+        stateful: Object | Function, id: string): ?Object {
     const participants = _getAllParticipants(stateful);
 
     return participants.find(p => p.id === id);
@@ -260,3 +281,45 @@ export function isLocalParticipantModerator(stateful: Object | Function) {
             && (!state['features/base/config'].enableUserRolesBasedOnToken
                 || !state['features/base/jwt'].isGuest));
 }
+
+/**
+ * Returns true if the video of the participant should be rendered.
+ *
+ * @param {Object|Function} stateful - Object or function that can be resolved
+ * to the Redux state.
+ * @param {string} id - The ID of the participant.
+ * @returns {boolean}
+ */
+export function shouldRenderParticipantVideo(
+        stateful: Object | Function, id: string) {
+    const state = toState(stateful);
+    const participant = getParticipantById(state, id);
+
+    if (!participant) {
+        return false;
+    }
+
+    const audioOnly = state['features/base/conference'].audioOnly;
+    const connectionStatus = participant.connectionStatus
+        || JitsiParticipantConnectionStatus.ACTIVE;
+    const videoTrack = getTrackByMediaTypeAndParticipant(
+        state['features/base/tracks'],
+        MEDIA_TYPE.VIDEO,
+        id);
+
+    // Is the video to be rendered?
+    // FIXME It's currently impossible to have true as the value of
+    // waitForVideoStarted because videoTrack's state videoStarted will be
+    // updated only after videoTrack is rendered.
+    // XXX Note that, unlike on web, we don't render video when the
+    // connection status is interrupted, this is because the renderer
+    // doesn't retain the last frame forever, so we would end up with a
+    // black screen.
+    const waitForVideoStarted = false;
+
+    return !audioOnly
+        && (connectionStatus
+            === JitsiParticipantConnectionStatus.ACTIVE)
+        && shouldRenderVideoTrack(videoTrack, waitForVideoStarted);
+
+}

react/features/base/tracks/functions.js

@@ -62,6 +62,8 @@ export function createLocalTracksF(
                 desktopSharingExtensionExternalInstallation:
                     options.desktopSharingExtensionExternalInstallation,
                 desktopSharingFrameRate,
+                desktopSharingSourceDevice:
+                    options.desktopSharingSourceDevice,
                 desktopSharingSources: options.desktopSharingSources,
 
                 // Copy array to avoid mutations inside library.

react/features/base/util/uri.js

@@ -41,7 +41,7 @@ const _URI_PATH_PATTERN = '([^?#]*)';
  *
  * @type {string}
  */
-export const URI_PROTOCOL_PATTERN = '([a-z][a-z0-9\\.\\+-]*:)';
+export const URI_PROTOCOL_PATTERN = '^([a-z][a-z0-9\\.\\+-]*:)';
 
 /**
  * Excludes/removes certain characters from a specific room (name) which are
@@ -71,7 +71,7 @@ function _fixRoom(room: ?string) {
  * @returns {string}
  */
 function _fixURIStringScheme(uri: string) {
-    const regex = new RegExp(`^${URI_PROTOCOL_PATTERN}+`, 'gi');
+    const regex = new RegExp(`${URI_PROTOCOL_PATTERN}+`, 'gi');
     const match: Array<string> | null = regex.exec(uri);
 
     if (match) {
@@ -175,7 +175,7 @@ export function parseStandardURIString(str: string) {
     str = str.replace(/\s/g, '');
 
     // protocol
-    regex = new RegExp(`^${URI_PROTOCOL_PATTERN}`, 'gi');
+    regex = new RegExp(URI_PROTOCOL_PATTERN, 'gi');
     match = regex.exec(str);
     if (match) {
         obj.protocol = match[1].toLowerCase();

react/features/conference/components/index.native.js

@@ -0,0 +1,3 @@
+// @flow
+
+export * from './native';

react/features/conference/components/index.web.js

@@ -0,0 +1,3 @@
+// @flow
+
+export * from './web';

react/features/conference/components/native/Conference.js

@@ -5,28 +5,31 @@ import React, { Component } from 'react';
 import { BackHandler, StatusBar, View } from 'react-native';
 import { connect as reactReduxConnect } from 'react-redux';
 
-import { appNavigate } from '../../app';
-import { connect, disconnect } from '../../base/connection';
-import { getParticipantCount } from '../../base/participants';
-import { Container, LoadingIndicator, TintedView } from '../../base/react';
+import { appNavigate } from '../../../app';
+import { connect, disconnect } from '../../../base/connection';
+import { getParticipantCount } from '../../../base/participants';
+import { Container, LoadingIndicator, TintedView } from '../../../base/react';
 import {
     makeAspectRatioAware
-} from '../../base/responsive-ui';
-import { TestConnectionInfo } from '../../base/testing';
-import { createDesiredLocalTracks } from '../../base/tracks';
-import { ConferenceNotification } from '../../calendar-sync';
-import { Chat } from '../../chat';
+} from '../../../base/responsive-ui';
+import { TestConnectionInfo } from '../../../base/testing';
+import { createDesiredLocalTracks } from '../../../base/tracks';
+import { ConferenceNotification } from '../../../calendar-sync';
+import { Chat } from '../../../chat';
 import {
     Filmstrip,
     isFilmstripVisible,
     TileView
-} from '../../filmstrip';
-import { LargeVideo } from '../../large-video';
-import { CalleeInfoContainer } from '../../invite';
-import { Captions } from '../../subtitles';
-import { setToolboxVisible, Toolbox } from '../../toolbox';
-import { shouldDisplayTileView } from '../../video-layout';
+} from '../../../filmstrip';
+import { LargeVideo } from '../../../large-video';
+import { CalleeInfoContainer } from '../../../invite';
+import { Captions } from '../../../subtitles';
+import { setToolboxVisible, Toolbox } from '../../../toolbox';
+import { shouldDisplayTileView } from '../../../video-layout';
 
+import DisplayNameLabel from './DisplayNameLabel';
+import Labels from './Labels';
+import NavigationBar from './NavigationBar';
 import styles from './styles';
 
 /**
@@ -281,8 +284,12 @@ class Conference extends Component<Props> {
                     pointerEvents = 'box-none'
                     style = { styles.toolboxAndFilmstripContainer }>
 
+                    <Labels />
+
                     <Captions onPress = { this._onClick } />
 
+                    <DisplayNameLabel />
+
                     {/*
                       * The Toolbox is in a stacking layer bellow the Filmstrip.
                       */}
@@ -300,6 +307,8 @@ class Conference extends Component<Props> {
                     }
                 </View>
 
+                <NavigationBar />
+
                 <TestConnectionInfo />
 
                 {

react/features/conference/components/native/DisplayNameLabel.js

@@ -0,0 +1,79 @@
+// @flow
+
+import React, { Component } from 'react';
+import { Text, View } from 'react-native';
+import { connect } from 'react-redux';
+
+import {
+    getLocalParticipant,
+    getParticipantDisplayName,
+    shouldRenderParticipantVideo
+} from '../../../base/participants';
+
+import { shouldDisplayTileView } from '../../../video-layout';
+
+import styles from './styles';
+
+type Props = {
+
+    /**
+     * The name of the participant to render.
+     */
+    _participantName: string,
+
+    /**
+     * True of the label needs to be rendered. False otherwise.
+     */
+    _render: boolean
+}
+
+/**
+ * Renders a label with the display name of the on-stage participant.
+ */
+class DisplayNameLabel extends Component<Props> {
+    /**
+     * Implements {@code Component#render}.
+     *
+     * @inheritdoc
+     */
+    render() {
+        if (!this.props._render) {
+            return null;
+        }
+
+        return (
+            <View style = { styles.displayNameBackdrop }>
+                <Text style = { styles.displayNameText }>
+                    { this.props._participantName }
+                </Text>
+            </View>
+        );
+    }
+}
+
+/**
+ * Maps part of the Redux state to the props of this component.
+ *
+ * @param {Object} state - The Redux state.
+ * @returns {{
+ * }}
+ */
+function _mapStateToProps(state: Object) {
+    const largeVideoParticipantId = state['features/large-video'].participantId;
+    const localParticipant = getLocalParticipant(state);
+
+    // Currently we only render the display name if it's not the local
+    // participant, we're not in tile view and there is no video rendered for
+    // the on-stage participant.
+    const _render = localParticipant.id !== largeVideoParticipantId
+        && !shouldDisplayTileView(state)
+        && !shouldRenderParticipantVideo(state, largeVideoParticipantId);
+
+    return {
+        _participantName:
+            getParticipantDisplayName(state, largeVideoParticipantId),
+        _render
+    };
+}
+
+export default connect(_mapStateToProps)(DisplayNameLabel);

react/features/conference/components/native/Labels.js

@@ -4,21 +4,23 @@ import React from 'react';
 import { TouchableOpacity, View } from 'react-native';
 import { connect } from 'react-redux';
 
-import { JitsiRecordingConstants } from '../../base/lib-jitsi-meet';
-import {
-    RecordingExpandedLabel
-} from '../../recording';
+import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet';
 import {
     isNarrowAspectRatio,
     makeAspectRatioAware
-} from '../../base/responsive-ui';
-import { TranscribingExpandedLabel } from '../../transcribing';
-import { VideoQualityExpandedLabel } from '../../video-quality';
+} from '../../../base/responsive-ui';
+import {
+    RecordingExpandedLabel
+} from '../../../recording';
+import { isToolboxVisible } from '../../../toolbox';
+import { TranscribingExpandedLabel } from '../../../transcribing';
+import { shouldDisplayTileView } from '../../../video-layout';
+import { VideoQualityExpandedLabel } from '../../../video-quality';
 
 import AbstractLabels, {
     _abstractMapStateToProps,
     type Props as AbstractLabelsProps
-} from './AbstractLabels';
+} from '../AbstractLabels';
 import styles from './styles';
 
 /**
@@ -37,7 +39,12 @@ type Props = AbstractLabelsProps & {
      *
      * @private
      */
-    _reducedUI: boolean
+    _reducedUI: boolean,
+
+    /**
+     * True if the labels should be visible, false otherwise.
+     */
+    _visible: boolean
 };
 
 type State = {
@@ -148,6 +155,10 @@ class Labels extends AbstractLabels<Props, State> {
      * @inheritdoc
      */
     render() {
+        if (!this.props._visible) {
+            return null;
+        }
+
         const wide = !isNarrowAspectRatio(this);
         const { _filmstripVisible, _reducedUI } = this.props;
 
@@ -344,13 +355,15 @@ class Labels extends AbstractLabels<Props, State> {
  * @private
  * @returns {{
  *     _filmstripVisible: boolean,
- *     _reducedUI: boolean
+ *     _reducedUI: boolean,
+ *     _visible: boolean
  * }}
  */
 function _mapStateToProps(state) {
     return {
         ..._abstractMapStateToProps(state),
-        _reducedUI: state['features/base/responsive-ui'].reducedUI
+        _reducedUI: state['features/base/responsive-ui'].reducedUI,
+        _visible: !isToolboxVisible(state) && !shouldDisplayTileView(state)
     };
 }
 

react/features/conference/components/native/NavigationBar.js

@@ -0,0 +1,96 @@
+// @flow
+
+import _ from 'lodash';
+import React, { Component } from 'react';
+import { SafeAreaView, Text, View } from 'react-native';
+import LinearGradient from 'react-native-linear-gradient';
+import { connect } from 'react-redux';
+
+import { getConferenceName } from '../../../base/conference';
+import { PictureInPictureButton } from '../../../mobile/picture-in-picture';
+import { isToolboxVisible } from '../../../toolbox';
+
+import styles, { NAVBAR_GRADIENT_COLORS } from './styles';
+
+type Props = {
+
+    /**
+     * Name of the meeting we're currently in.
+     */
+    _meetingName: string,
+
+    /**
+     * True if the navigation bar should be visible.
+     */
+    _visible: boolean
+};
+
+/**
+ * Implements a navigation bar component that is rendered on top of the
+ * conference screen.
+ */
+class NavigationBar extends Component<Props> {
+    /**
+     * Implements {@Component#render}.
+     *
+     * @inheritdoc
+     */
+    render() {
+        if (!this.props._visible) {
+            return null;
+        }
+
+        return (
+            <View
+                pointerEvents = 'box-none'
+                style = { styles.navBarContainer }>
+                <LinearGradient
+                    colors = { NAVBAR_GRADIENT_COLORS }
+                    pointerEvents = 'none'
+                    style = { styles.gradient }>
+                    <SafeAreaView>
+                        <View style = { styles.gradientStretch } />
+                    </SafeAreaView>
+                </LinearGradient>
+                <SafeAreaView
+                    pointerEvents = 'box-none'
+                    style = { styles.navBarSafeView }>
+                    <View
+                        pointerEvents = 'box-none'
+                        style = { styles.navBarWrapper }>
+                        <PictureInPictureButton
+                            styles = { styles.navBarButton } />
+                        <View
+                            pointerEvents = 'box-none'
+                            style = { styles.roomNameWrapper }>
+                            <Text
+                                numberOfLines = { 1 }
+                                style = { styles.roomName }>
+                                { this.props._meetingName }
+                            </Text>
+                        </View>
+                    </View>
+                </SafeAreaView>
+            </View>
+        );
+    }
+
+}
+
+/**
+ * Maps part of the Redux store to the props of this component.
+ *
+ * @param {Object} state - The Redux state.
+ * @returns {{
+ *     _meetingName: string,
+ *     _visible: boolean
+ * }}
+ */
+function _mapStateToProps(state) {
+    return {
+        _meetingName: _.startCase(getConferenceName(state)),
+        _visible: isToolboxVisible(state)
+    };
+}
+
+export default connect(_mapStateToProps)(NavigationBar);

react/features/conference/components/native/styles.js

@@ -0,0 +1,137 @@
+import {
+    BoxModel,
+    ColorPalette,
+    createStyleSheet,
+    fixAndroidViewClipping
+} from '../../../base/styles';
+
+import { FILMSTRIP_SIZE } from '../../../filmstrip';
+
+export const NAVBAR_GRADIENT_COLORS = [ 'black', '#00000000' ];
+
+/**
+ * The styles of the feature conference.
+ */
+export default createStyleSheet({
+    /**
+     * {@code Conference} style.
+     */
+    conference: fixAndroidViewClipping({
+        alignSelf: 'stretch',
+        backgroundColor: ColorPalette.appBackground,
+        flex: 1
+    }),
+
+    displayNameBackdrop: {
+        alignSelf: 'center',
+        backgroundColor: 'rgba(28, 32, 37, 0.6)',
+        borderRadius: 4,
+        margin: 16,
+        paddingHorizontal: 16,
+        paddingVertical: 4
+    },
+
+    displayNameText: {
+        color: ColorPalette.white,
+        fontSize: 14
+    },
+
+    gradient: {
+        flex: 1
+    },
+
+    gradientStretch: {
+        height: 116
+    },
+
+    /**
+     * View that contains the indicators.
+     */
+    indicatorContainer: {
+        flex: 1,
+        flexDirection: 'row',
+        justifyContent: 'flex-end',
+        margin: BoxModel.margin
+    },
+
+    /**
+     * Indicator container for wide aspect ratio.
+     */
+    indicatorContainerWide: {
+        marginRight: FILMSTRIP_SIZE + BoxModel.margin
+    },
+
+    labelWrapper: {
+        flexDirection: 'column',
+        position: 'absolute',
+        right: 0,
+        top: 0
+    },
+
+    navBarButton: {
+        iconStyle: {
+            color: ColorPalette.white,
+            fontSize: 24
+        },
+
+        underlayColor: 'transparent'
+    },
+
+    navBarContainer: {
+        flexDirection: 'column',
+        left: 0,
+        position: 'absolute',
+        right: 0,
+        top: 0
+    },
+
+    navBarSafeView: {
+        left: 0,
+        position: 'absolute',
+        right: 0,
+        top: 0
+    },
+
+    navBarWrapper: {
+        alignItems: 'center',
+        flex: 1,
+        flexDirection: 'row',
+        height: 44,
+        justifyContent: 'space-between',
+        paddingHorizontal: 14
+    },
+
+    roomName: {
+        color: ColorPalette.white,
+        fontSize: 17,
+        fontWeight: '400'
+    },
+
+    roomNameWrapper: {
+        flexDirection: 'row',
+        justifyContent: 'center',
+        left: 0,
+        paddingHorizontal: 48,
+        position: 'absolute',
+        right: 0
+    },
+
+    /**
+     * The style of the {@link View} which expands over the whole
+     * {@link Conference} area and splits it between the {@link Filmstrip} and
+     * the {@link Toolbox}.
+     */
+    toolboxAndFilmstripContainer: {
+        bottom: BoxModel.margin,
+        flexDirection: 'column',
+        justifyContent: 'flex-end',
+        left: 0,
+        position: 'absolute',
+        right: 0,
+
+        // Both on Android and iOS there is the status bar which may be visible.
+        // On iPhone X there is the notch. In the two cases BoxModel.margin is
+        // not enough.
+        top: BoxModel.margin * 3
+    }
+});

react/features/conference/components/styles.js

@@ -1,39 +0,0 @@
-import {
-    BoxModel,
-    ColorPalette,
-    createStyleSheet,
-    fixAndroidViewClipping
-} from '../../base/styles';
-
-/**
- * The styles of the feature conference.
- */
-export default createStyleSheet({
-    /**
-     * {@code Conference} style.
-     */
-    conference: fixAndroidViewClipping({
-        alignSelf: 'stretch',
-        backgroundColor: ColorPalette.appBackground,
-        flex: 1
-    }),
-
-    /**
-     * The style of the {@link View} which expands over the whole
-     * {@link Conference} area and splits it between the {@link Filmstrip} and
-     * the {@link Toolbox}.
-     */
-    toolboxAndFilmstripContainer: {
-        bottom: BoxModel.margin,
-        flexDirection: 'column',
-        justifyContent: 'flex-end',
-        left: 0,
-        position: 'absolute',
-        right: 0,
-
-        // Both on Android and iOS there is the status bar which may be visible.
-        // On iPhone X there is the notch. In the two cases BoxModel.margin is
-        // not enough.
-        top: BoxModel.margin * 3
-    }
-});

react/features/conference/components/web/Conference.js

@@ -4,31 +4,33 @@ import _ from 'lodash';
 import React, { Component } from 'react';
 import { connect as reactReduxConnect } from 'react-redux';
 
-import VideoLayout from '../../../../modules/UI/videolayout/VideoLayout';
+import VideoLayout from '../../../../../modules/UI/videolayout/VideoLayout';
 
-import { obtainConfig } from '../../base/config';
-import { connect, disconnect } from '../../base/connection';
-import { translate } from '../../base/i18n';
-import { Chat } from '../../chat';
-import { Filmstrip } from '../../filmstrip';
-import { CalleeInfoContainer } from '../../invite';
-import { LargeVideo } from '../../large-video';
-import { NotificationsContainer } from '../../notifications';
+import { obtainConfig } from '../../../base/config';
+import { connect, disconnect } from '../../../base/connection';
+import { translate } from '../../../base/i18n';
+import { Chat } from '../../../chat';
+import { Filmstrip } from '../../../filmstrip';
+import { CalleeInfoContainer } from '../../../invite';
+import { LargeVideo } from '../../../large-video';
+import { NotificationsContainer } from '../../../notifications';
 import {
     LAYOUTS,
     getCurrentLayout,
     shouldDisplayTileView
-} from '../../video-layout';
+} from '../../../video-layout';
 
-import { default as Notice } from './Notice';
 import {
     Toolbox,
     fullScreenChanged,
     setToolboxAlwaysVisible,
     showToolbox
-} from '../../toolbox';
+} from '../../../toolbox';
 
-import { maybeShowSuboptimalExperienceNotification } from '../functions';
+import { maybeShowSuboptimalExperienceNotification } from '../../functions';
+
+import Labels from './Labels';
+import { default as Notice } from './Notice';
 
 declare var APP: Object;
 declare var config: Object;
@@ -216,8 +218,9 @@ class Conference extends Component<Props> {
                 onMouseMove = { this._onShowToolbar }>
                 <Notice />
                 <div id = 'videospace'>
-                    <LargeVideo
-                        hideVideoQualityLabel = { hideVideoQualityLabel } />
+                    <LargeVideo />
+                    { hideVideoQualityLabel
+                        || <Labels /> }
                     <Filmstrip filmstripOnly = { filmstripOnly } />
                 </div>
 

react/features/conference/components/web/Labels.js

@@ -3,12 +3,12 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { JitsiRecordingConstants } from '../../base/lib-jitsi-meet';
+import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet';
 
 import AbstractLabels, {
     _abstractMapStateToProps as _mapStateToProps,
     type Props
-} from './AbstractLabels';
+} from '../AbstractLabels';
 
 /**
  * The type of the React {@code Component} state of {@link Labels}.

react/features/conference/components/web/Notice.js

@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../base/i18n';
+import { translate } from '../../../base/i18n';
 
 declare var config: Object;