Adds back talk while muted notification. (#4392)

* Adds back talk while muted notification.

* Adds unmute button to the notification.

.gitignore

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

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

@@ -28,6 +28,7 @@ import android.view.KeyEvent;
 import org.jitsi.meet.sdk.JitsiMeet;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
 import org.jitsi.meet.sdk.JitsiMeetConferenceOptions;
+import org.jitsi.meet.sdk.JitsiMeetUserInfo;
 
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
@@ -106,7 +107,7 @@ public class MainActivity extends JitsiMeetActivity {
     //
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE
                 && canRequestOverlayPermission()) {
             if (Settings.canDrawOverlays(this)) {

android/build.gradle

@@ -169,7 +169,7 @@ ext {
     glideVersion = "4.7.1"  // keep in sync with react-native-fast-image
 
     // Libre build
-    libreBuild = (System.env.LIBRE_BUILD ?: "true").toBoolean()
+    libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
 }
 
 // If Android SDK is not installed, accept its license so that it

android/gradle.properties

@@ -18,4 +18,4 @@
 # org.gradle.parallel=true
 
 appVersion=19.2.0
-sdkVersion=2.1.0
+sdkVersion=2.2.0

android/scripts/run-packager.sh

@@ -14,6 +14,7 @@ if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then
     exit 2
   fi
 else
+    adb reverse tcp:8081 tcp:8081
     CMD="${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.command"
     if [[ `uname` == "Darwin"  ]]; then
         open -g "${CMD}" || echo "Can't start packager automatically"

android/sdk/src/main/AndroidManifest.xml

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

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

@@ -29,6 +29,7 @@ import com.facebook.react.bridge.ReadableMap;
 import com.rnimmersive.RNImmersiveModule;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
@@ -77,6 +78,15 @@ public abstract class BaseReactView<ListenerT>
         return null;
     }
 
+    /**
+     * Gets all registered React views.
+     *
+     * @return An {@link ArrayList} containing all views currently held by React.
+     */
+    static ArrayList<BaseReactView> getViews() {
+        return new ArrayList<>(views);
+    }
+
     /**
      * The unique identifier of this {@code BaseReactView} within the process
      * for the purposes of {@link ExternalAPIModule}. The name scope was

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

@@ -63,6 +63,16 @@ public class ConnectionService extends android.telecom.ConnectionService {
     static private final HashMap<String, Promise> startCallPromises
             = new HashMap<>();
 
+    /**
+     * Aborts all ongoing connections. This is a last resort mechanism which forces all resources to
+     * be freed on the system in case of fatal error.
+     */
+    static void abortConnections() {
+        for (ConnectionImpl connection: getConnections()) {
+            connection.onAbort();
+        }
+    }
+
     /**
      * Adds {@link ConnectionImpl} to the list.
      *

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

@@ -67,12 +67,16 @@ class ExternalAPIModule
      */
     @ReactMethod
     public void sendEvent(String name, ReadableMap data, String scope) {
+        // Keep track of the current ongoing conference.
+        OngoingConferenceTracker.getInstance().onExternalAPIEvent(name, data);
+
         // The JavaScript App needs to provide uniquely identifying information
         // to the native ExternalAPI module so that the latter may match the
         // former to the native BaseReactView which hosts it.
         BaseReactView view = BaseReactView.findViewByExternalAPIScope(scope);
 
         if (view != null) {
+            Log.d(TAG, "Sending event: " + name + " with data: " + data);
             try {
                 view.onExternalAPIEvent(name, data);
             } catch(Exception e) {

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

@@ -36,6 +36,15 @@ public class JitsiMeet {
         defaultConferenceOptions = options;
     }
 
+    /**
+     * Returns the current conference URL as a string.
+     *
+     * @return the current conference URL.
+     */
+    public static String getCurrentConference() {
+        return OngoingConferenceTracker.getInstance().getCurrentConference();
+    }
+
     /**
      * Helper to get the default conference options as a {@link Bundle}.
      *

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

@@ -38,8 +38,8 @@ public class JitsiMeetActivity extends FragmentActivity
 
     protected static final String TAG = JitsiMeetActivity.class.getSimpleName();
 
-    public static final String ACTION_JITSI_MEET_CONFERENCE = "org.jitsi.meet.CONFERENCE";
-    public static final String JITSI_MEET_CONFERENCE_OPTIONS = "JitsiMeetConferenceOptions";
+    private static final String ACTION_JITSI_MEET_CONFERENCE = "org.jitsi.meet.CONFERENCE";
+    private static final String JITSI_MEET_CONFERENCE_OPTIONS = "JitsiMeetConferenceOptions";
 
     // Helpers for starting the activity
     //
@@ -71,6 +71,24 @@ public class JitsiMeetActivity extends FragmentActivity
         }
     }
 
+    @Override
+    public void onDestroy() {
+        // Here we are trying to handle the following corner case: an application using the SDK
+        // is using this Activity for displaying meetings, but there is another "main" Activity
+        // with other content. If this Activity is "swiped out" from the recent list we will get
+        // Activity#onDestroy() called without warning. At this point we can try to leave the
+        // current meeting, but when our view is detached from React the JS <-> Native bridge won't
+        // be operational so the external API won't be able to notify the native side that the
+        // conference terminated. Thus, try our best to clean up.
+        leave();
+        if (AudioModeModule.useConnectionService()) {
+            ConnectionService.abortConnections();
+        }
+        JitsiMeetOngoingConferenceService.abort(this);
+
+        super.onDestroy();
+    }
+
     @Override
     public void finish() {
         leave();
@@ -143,6 +161,11 @@ public class JitsiMeetActivity extends FragmentActivity
     // Activity lifecycle methods
     //
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        JitsiMeetActivityDelegate.onActivityResult(this, requestCode, resultCode, data);
+    }
+
     @Override
     public void onBackPressed() {
         JitsiMeetActivityDelegate.onBackPressed();
@@ -150,6 +173,8 @@ public class JitsiMeetActivity extends FragmentActivity
 
     @Override
     public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+
         JitsiMeetConferenceOptions options;
 
         if ((options = getConferenceOptions(intent)) != null) {
@@ -184,6 +209,8 @@ public class JitsiMeetActivity extends FragmentActivity
     @Override
     public void onConferenceJoined(Map<String, Object> data) {
         Log.d(TAG, "Conference joined: " + data);
+        // Launch the service for the ongoing notification.
+        JitsiMeetOngoingConferenceService.launch(this);
     }
 
     @Override

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

@@ -54,6 +54,11 @@ public class JitsiMeetConferenceOptions implements Parcelable {
      */
     private Bundle colorScheme;
 
+    /**
+     * Feature flags. See: https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/flags/constants.js
+     */
+    private Bundle featureFlags;
+
     /**
      * Set to {@code true} to join the conference with audio / video muted or to start in audio
      * only mode respectively.
@@ -63,10 +68,9 @@ public class JitsiMeetConferenceOptions implements Parcelable {
     private Boolean videoMuted;
 
     /**
-     * Set to {@code true} to enable the welcome page. Typically SDK users won't need this enabled
-     * since the host application decides which meeting to join.
+     * USer information, to be used when no token is specified.
      */
-    private Boolean welcomePageEnabled;
+    private JitsiMeetUserInfo userInfo;
 
     /**
      * Class used to build the immutable {@link JitsiMeetConferenceOptions} object.
@@ -78,14 +82,16 @@ public class JitsiMeetConferenceOptions implements Parcelable {
         private String token;
 
         private Bundle colorScheme;
+        private Bundle featureFlags;
 
         private Boolean audioMuted;
         private Boolean audioOnly;
         private Boolean videoMuted;
 
-        private Boolean welcomePageEnabled;
+        private JitsiMeetUserInfo userInfo;
 
         public Builder() {
+            featureFlags = new Bundle();
         }
 
         /**\
@@ -186,7 +192,31 @@ public class JitsiMeetConferenceOptions implements Parcelable {
          * @return - The {@link Builder} object itself so the method calls can be chained.
          */
         public Builder setWelcomePageEnabled(boolean enabled) {
-            this.welcomePageEnabled = enabled;
+            this.featureFlags.putBoolean("welcomepage.enabled", enabled);
+
+            return this;
+        }
+
+        public Builder setFeatureFlag(String flag, boolean value) {
+            this.featureFlags.putBoolean(flag, value);
+
+            return this;
+        }
+
+        public Builder setFeatureFlag(String flag, String value) {
+            this.featureFlags.putString(flag, value);
+
+            return this;
+        }
+
+        public Builder setFeatureFlag(String flag, int value) {
+            this.featureFlags.putInt(flag, value);
+
+            return this;
+        }
+
+        public Builder setUserInfo(JitsiMeetUserInfo userInfo) {
+            this.userInfo = userInfo;
 
             return this;
         }
@@ -204,10 +234,11 @@ public class JitsiMeetConferenceOptions implements Parcelable {
             options.subject = this.subject;
             options.token = this.token;
             options.colorScheme = this.colorScheme;
+            options.featureFlags = this.featureFlags;
             options.audioMuted = this.audioMuted;
             options.audioOnly = this.audioOnly;
             options.videoMuted = this.videoMuted;
-            options.welcomePageEnabled = this.welcomePageEnabled;
+            options.userInfo = this.userInfo;
 
             return options;
         }
@@ -221,30 +252,30 @@ public class JitsiMeetConferenceOptions implements Parcelable {
         subject = in.readString();
         token = in.readString();
         colorScheme = in.readBundle();
+        featureFlags = in.readBundle();
+        userInfo = new JitsiMeetUserInfo(in.readBundle());
         byte tmpAudioMuted = in.readByte();
         audioMuted = tmpAudioMuted == 0 ? null : tmpAudioMuted == 1;
         byte tmpAudioOnly = in.readByte();
         audioOnly = tmpAudioOnly == 0 ? null : tmpAudioOnly == 1;
         byte tmpVideoMuted = in.readByte();
         videoMuted = tmpVideoMuted == 0 ? null : tmpVideoMuted == 1;
-        byte tmpWelcomePageEnabled = in.readByte();
-        welcomePageEnabled = tmpWelcomePageEnabled == 0 ? null : tmpWelcomePageEnabled == 1;
     }
 
     Bundle asProps() {
         Bundle props = new Bundle();
 
+        // Android always has the PiP flag set by default.
+        if (!featureFlags.containsKey("pip.enabled")) {
+            featureFlags.putBoolean("pip.enabled", true);
+        }
+
+        props.putBundle("flags", featureFlags);
+
         if (colorScheme != null) {
             props.putBundle("colorScheme", colorScheme);
         }
 
-        if (welcomePageEnabled != null) {
-            props.putBoolean("welcomePageEnabled", welcomePageEnabled);
-        }
-
-        // TODO: get rid of this.
-        props.putBoolean("pictureInPictureEnabled", true);
-
         Bundle config = new Bundle();
 
         if (audioMuted != null) {
@@ -278,6 +309,10 @@ public class JitsiMeetConferenceOptions implements Parcelable {
             urlProps.putString("jwt", token);
         }
 
+        if (token == null && userInfo != null) {
+            props.putBundle("userInfo", userInfo.asBundle());
+        }
+
         urlProps.putBundle("config", config);
         props.putBundle("url", urlProps);
 
@@ -305,10 +340,11 @@ public class JitsiMeetConferenceOptions implements Parcelable {
         dest.writeString(subject);
         dest.writeString(token);
         dest.writeBundle(colorScheme);
+        dest.writeBundle(featureFlags);
+        dest.writeBundle(userInfo.asBundle());
         dest.writeByte((byte) (audioMuted == null ? 0 : audioMuted ? 1 : 2));
         dest.writeByte((byte) (audioOnly == null ? 0 : audioOnly ? 1 : 2));
         dest.writeByte((byte) (videoMuted == null ? 0 : videoMuted ? 1 : 2));
-        dest.writeByte((byte) (welcomePageEnabled == null ? 0 : welcomePageEnabled ? 1 : 2));
     }
 
     @Override

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

@@ -26,8 +26,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import java.net.URL;
-
 /**
  * Base {@link Fragment} for applications integrating Jitsi Meet at a higher level. It
  * contains all the required wiring between the {@code JitsiMeetView} and

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

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

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

@@ -0,0 +1,58 @@
+/*
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jitsi.meet.sdk;
+
+import android.util.Log;
+
+class JitsiMeetUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
+    private final Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler;
+
+    public static void register() {
+        Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
+
+        JitsiMeetUncaughtExceptionHandler uncaughtExceptionHandler
+            = new JitsiMeetUncaughtExceptionHandler(defaultUncaughtExceptionHandler);
+
+        Thread.setDefaultUncaughtExceptionHandler(uncaughtExceptionHandler);
+    }
+
+    private JitsiMeetUncaughtExceptionHandler(Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler) {
+        this.defaultUncaughtExceptionHandler = defaultUncaughtExceptionHandler;
+    }
+
+    @Override
+    public void uncaughtException(Thread t, Throwable e) {
+        Log.e(this.getClass().getSimpleName(), "FATAL ERROR", e);
+
+        // Terminate all conferences
+        for (BaseReactView view: BaseReactView.getViews()) {
+            if (view instanceof JitsiMeetView) {
+                ((JitsiMeetView) view).leave();
+            }
+        }
+
+        // Abort all ConnectionService ongoing calls
+        if (AudioModeModule.useConnectionService()) {
+            ConnectionService.abortConnections();
+        }
+
+        if (defaultUncaughtExceptionHandler != null) {
+            defaultUncaughtExceptionHandler.uncaughtException(t, e);
+        }
+    }
+}

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

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

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

@@ -29,7 +29,8 @@ import java.lang.reflect.Method;
 import java.util.Map;
 
 
-public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener> {
+public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
+        implements OngoingConferenceTracker.OngoingConferenceListener {
 
     /**
      * The {@code Method}s of {@code JitsiMeetViewListener} by event name i.e.
@@ -106,6 +107,14 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener> {
         if (!(context instanceof JitsiMeetActivityInterface)) {
             throw new RuntimeException("Enclosing Activity must implement JitsiMeetActivityInterface");
         }
+
+        OngoingConferenceTracker.getInstance().addListener(this);
+    }
+
+    @Override
+    public void dispose() {
+        OngoingConferenceTracker.getInstance().removeListener(this);
+        super.dispose();
     }
 
     /**
@@ -173,27 +182,17 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener> {
     }
 
     /**
-     * The internal processing for the URL of the current conference set on the
-     * associated {@link JitsiMeetView}.
-     *
-     * @param eventName the name of the external API event to be processed
-     * @param eventData the details/specifics of the event to process determined
-     * by/associated with the specified {@code eventName}.
+     * Handler for {@link OngoingConferenceTracker} events.
+     * @param conferenceUrl
      */
-    private void maybeSetViewURL(String eventName, ReadableMap eventData) {
-        String url = eventData.getString("url");
-
-        switch(eventName) {
-        case "CONFERENCE_WILL_JOIN":
-            this.url = url;
-            break;
-
-        case "CONFERENCE_TERMINATED":
-            if (url != null && url.equals(this.url)) {
-                this.url = null;
-            }
-            break;
-        }
+    @Override
+    public void onCurrentConferenceChanged(String conferenceUrl) {
+        // This property was introduced in order to address
+        // an exception in the Picture-in-Picture functionality which arose
+        // because of delays related to bridging between JavaScript and Java. To
+        // reduce these delays do not wait for the call to be transferred to the
+        // UI thread.
+        this.url = conferenceUrl;
     }
 
     /**
@@ -205,13 +204,6 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener> {
      */
     @Override
     protected void onExternalAPIEvent(String name, ReadableMap data) {
-        // XXX The JitsiMeetView property URL was introduced in order to address
-        // an exception in the Picture-in-Picture functionality which arose
-        // because of delays related to bridging between JavaScript and Java. To
-        // reduce these delays do not wait for the call to be transferred to the
-        // UI thread.
-        maybeSetViewURL(name, data);
-
         onExternalAPIEvent(LISTENER_METHODS, name, data);
     }
 }

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

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

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

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

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

@@ -17,6 +17,7 @@
 
 package org.jitsi.meet.sdk;
 
+import android.app.Activity;
 import android.app.Application;
 import android.support.annotation.Nullable;
 
@@ -120,6 +121,18 @@ class ReactInstanceManagerHolder {
                 ? reactContext.getNativeModule(nativeModuleClass) : null;
     }
 
+    /**
+     * Gets the current {@link Activity} linked to React Native.
+     *
+     * @return An activity attached to React Native.
+     */
+    static Activity getCurrentActivity() {
+        ReactContext reactContext
+            = reactInstanceManager != null
+            ? reactInstanceManager.getCurrentReactContext() : null;
+        return reactContext != null ? reactContext.getCurrentActivity() : null;
+    }
+
     static ReactInstanceManager getReactInstanceManager() {
         return reactInstanceManager;
     }
@@ -182,5 +195,8 @@ class ReactInstanceManagerHolder {
         if (devSettings != null) {
             devSettings.setBundleDeltasEnabled(false);
         }
+
+        // Register our uncaught exception handler.
+        JitsiMeetUncaughtExceptionHandler.register();
     }
 }

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

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

conference.js

@@ -16,13 +16,15 @@ import * as JitsiMeetConferenceEvents from './ConferenceEvents';
 
 import {
     createDeviceChangedEvent,
+    createStartSilentEvent,
     createScreenSharingEvent,
     createStreamSwitchDelayEvent,
     createTrackMutedEvent,
     sendAnalytics
 } from './react/features/analytics';
 import {
-    redirectWithStoredParams,
+    maybeRedirectToWelcomePage,
+    redirectToStaticPage,
     reloadWithStoredParams
 } from './react/features/app';
 
@@ -42,6 +44,7 @@ import {
     conferenceWillJoin,
     conferenceWillLeave,
     dataChannelOpened,
+    kickedOut,
     lockStateChanged,
     onStartMutedPolicyChanged,
     p2pStatusChanged,
@@ -75,16 +78,20 @@ import {
     setVideoAvailable,
     setVideoMuted
 } from './react/features/base/media';
-import { showNotification } from './react/features/notifications';
+import {
+    hideNotification,
+    showNotification
+} from './react/features/notifications';
 import {
     dominantSpeakerChanged,
-    getAvatarURLByParticipantId,
     getLocalParticipant,
     getNormalizedDisplayName,
     getParticipantById,
     localParticipantConnectionStatusChanged,
     localParticipantRoleChanged,
     participantConnectionStatusChanged,
+    participantKicked,
+    participantMutedUs,
     participantPresenceChanged,
     participantRoleChanged,
     participantUpdated
@@ -98,10 +105,7 @@ import {
     trackAdded,
     trackRemoved
 } from './react/features/base/tracks';
-import {
-    getLocationContextRoot,
-    getJitsiMeetGlobalNS
-} from './react/features/base/util';
+import { getJitsiMeetGlobalNS } from './react/features/base/util';
 import { addMessage } from './react/features/chat';
 import { showDesktopPicker } from './react/features/desktop-picker';
 import { appendSuffix } from './react/features/display-name';
@@ -208,77 +212,6 @@ function muteLocalVideo(muted) {
     APP.store.dispatch(setVideoMuted(muted));
 }
 
-/**
- * Check if the welcome page is enabled and redirects to it.
- * If requested show a thank you dialog before that.
- * If we have a close page enabled, redirect to it without
- * showing any other dialog.
- *
- * @param {object} options used to decide which particular close page to show
- * or if close page is disabled, whether we should show the thankyou dialog
- * @param {boolean} options.showThankYou - whether we should
- * show thank you dialog
- * @param {boolean} options.feedbackSubmitted - whether feedback was submitted
- */
-function maybeRedirectToWelcomePage(options) {
-    // if close page is enabled redirect to it, without further action
-    if (config.enableClosePage) {
-        const { isGuest } = APP.store.getState()['features/base/jwt'];
-
-        // save whether current user is guest or not, before navigating
-        // to close page
-        window.sessionStorage.setItem('guest', isGuest);
-        redirectToStaticPage(`static/${
-            options.feedbackSubmitted ? 'close.html' : 'close2.html'}`);
-
-        return;
-    }
-
-    // else: show thankYou dialog only if there is no feedback
-    if (options.showThankYou) {
-        APP.store.dispatch(showNotification({
-            titleArguments: { appName: interfaceConfig.APP_NAME },
-            titleKey: 'dialog.thankYou'
-        }));
-    }
-
-    // if Welcome page is enabled redirect to welcome page after 3 sec, if
-    // there is a thank you message to be shown, 0.5s otherwise.
-    if (config.enableWelcomePage) {
-        setTimeout(
-            () => {
-                APP.store.dispatch(redirectWithStoredParams('/'));
-            },
-            options.showThankYou ? 3000 : 500);
-    }
-}
-
-/**
- * Assigns a specific pathname to window.location.pathname taking into account
- * the context root of the Web app.
- *
- * @param {string} pathname - The pathname to assign to
- * window.location.pathname. If the specified pathname is relative, the context
- * root of the Web app will be prepended to the specified pathname before
- * assigning it to window.location.pathname.
- * @return {void}
- */
-function redirectToStaticPage(pathname) {
-    const windowLocation = window.location;
-    let newPathname = pathname;
-
-    if (!newPathname.startsWith('/')) {
-        // A pathname equal to ./ specifies the current directory. It will be
-        // fine but pointless to include it because contextRoot is the current
-        // directory.
-        newPathname.startsWith('./')
-            && (newPathname = newPathname.substring(2));
-        newPathname = getLocationContextRoot(windowLocation) + newPathname;
-    }
-
-    windowLocation.pathname = newPathname;
-}
-
 /**
  * A queue for the async replaceLocalTrack action so that multiple audio
  * replacements cannot happen simultaneously. This solves the issue where
@@ -344,7 +277,7 @@ class ConferenceConnector {
 
         case JitsiConferenceErrors.NOT_ALLOWED_ERROR: {
             // let's show some auth not allowed page
-            redirectToStaticPage('static/authError.html');
+            APP.store.dispatch(redirectToStaticPage('static/authError.html'));
             break;
         }
 
@@ -375,13 +308,6 @@ class ConferenceConnector {
             APP.UI.notifyGracefulShutdown();
             break;
 
-        case JitsiConferenceErrors.JINGLE_FATAL_ERROR: {
-            const [ error ] = params;
-
-            APP.UI.notifyInternalError(error);
-            break;
-        }
-
         case JitsiConferenceErrors.CONFERENCE_DESTROYED: {
             const [ reason ] = params;
 
@@ -403,6 +329,7 @@ class ConferenceConnector {
 
         case JitsiConferenceErrors.FOCUS_LEFT:
         case JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE:
+        case JitsiConferenceErrors.OFFER_ANSWER_FAILED:
             APP.store.dispatch(conferenceWillLeave(room));
 
             // FIXME the conference should be stopped by the library and not by
@@ -729,6 +656,7 @@ export default {
             // based on preferred devices, loose label matching can be done in
             // cases where the exact ID match is no longer available, such as
             // when the camera device has switched USB ports.
+            // when in startSilent mode we want to start with audio muted
             this._initDeviceList()
                 .catch(error => logger.warn(
                     'initial device list initialization failed', error))
@@ -736,7 +664,7 @@ export default {
                 options.roomName, {
                     startAudioOnly: config.startAudioOnly,
                     startScreenSharing: config.startScreenSharing,
-                    startWithAudioMuted: config.startWithAudioMuted,
+                    startWithAudioMuted: config.startWithAudioMuted || config.startSilent,
                     startWithVideoMuted: config.startWithVideoMuted
                 }))
             .then(([ tracks, con ]) => {
@@ -793,6 +721,7 @@ export default {
                 }
 
                 if (config.startSilent) {
+                    sendAnalytics(createStartSilentEvent());
                     APP.store.dispatch(showNotification({
                         descriptionKey: 'notify.startSilentDescription',
                         titleKey: 'notify.startSilentTitle'
@@ -1782,11 +1711,6 @@ export default {
 
             logger.log(`USER ${id} LEFT:`, user);
             APP.API.notifyUserLeft(id);
-            APP.UI.messageHandler.participantNotification(
-                user.getDisplayName(),
-                'notify.somebody',
-                'disconnected',
-                'notify.disconnected');
             APP.UI.onSharedVideoStop(id);
         });
 
@@ -1855,8 +1779,29 @@ export default {
             APP.UI.setAudioLevel(id, newLvl);
         });
 
+        // we store the last start muted notification id that we showed,
+        // so we can hide it when unmuted mic is detected
+        let lastNotificationId;
+
+        room.on(JitsiConferenceEvents.TRACK_MUTE_CHANGED, (track, participantThatMutedUs) => {
+            if (participantThatMutedUs) {
+                APP.store.dispatch(participantMutedUs(participantThatMutedUs));
+            }
+
+            if (lastNotificationId && track.isAudioTrack() && track.isLocal() && !track.isMuted()) {
+                APP.store.dispatch(hideNotification(lastNotificationId));
+                lastNotificationId = undefined;
+            }
+        });
+
         room.on(JitsiConferenceEvents.TALK_WHILE_MUTED, () => {
-            APP.UI.showToolbar(6000);
+            const action = APP.store.dispatch(showNotification({
+                titleKey: 'toolbar.talkWhileMutedPopup',
+                customActionNameKey: 'notify.unmute',
+                customActionHandler: muteLocalAudio.bind(this, false)
+            }));
+
+            lastNotificationId = action.uid;
         });
         room.on(JitsiConferenceEvents.SUBJECT_CHANGED,
             subject => APP.store.dispatch(conferenceSubjectChanged(subject)));
@@ -1955,13 +1900,17 @@ export default {
                 }
             });
 
-        room.on(JitsiConferenceEvents.KICKED, () => {
+        room.on(JitsiConferenceEvents.KICKED, participant => {
             APP.UI.hideStats();
-            APP.UI.notifyKicked();
+            APP.store.dispatch(kickedOut(room, participant));
 
             // FIXME close
         });
 
+        room.on(JitsiConferenceEvents.PARTICIPANT_KICKED, (kicker, kicked) => {
+            APP.store.dispatch(participantKicked(kicker, kicked));
+        });
+
         room.on(JitsiConferenceEvents.SUSPEND_DETECTED, () => {
             APP.store.dispatch(suspendDetected());
 
@@ -1989,6 +1938,8 @@ export default {
                 this.localAudio.dispose();
                 this.localAudio = null;
             }
+
+            APP.API.notifySuspendDetected();
         });
 
         APP.UI.addListener(UIEvents.AUDIO_MUTED, muted => {
@@ -2257,7 +2208,8 @@ export default {
         APP.keyboardshortcut.init();
 
         if (config.requireDisplayName
-                && !APP.conference.getLocalDisplayName()) {
+                && !APP.conference.getLocalDisplayName()
+                && !this._room.isHidden()) {
             APP.UI.promptDisplayName();
         }
 
@@ -2267,18 +2219,6 @@ export default {
             = APP.store.getState()['features/base/settings'].displayName;
 
         APP.UI.changeDisplayName('localVideoContainer', displayName);
-        APP.API.notifyConferenceJoined(
-            this.roomName,
-            this._room.myUserId(),
-            {
-                displayName,
-                formattedDisplayName: appendSuffix(
-                    displayName,
-                    interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME),
-                avatarURL: getAvatarURLByParticipantId(
-                    APP.store.getState(), this._room.myUserId())
-            }
-        );
     },
 
     /**
@@ -2601,7 +2541,7 @@ export default {
             room = undefined;
 
             APP.API.notifyReadyToClose();
-            maybeRedirectToWelcomePage(values[0]);
+            APP.store.dispatch(maybeRedirectToWelcomePage(values[0]));
         });
     },
 
@@ -2742,14 +2682,6 @@ export default {
             displayName: formattedNickname
         }));
 
-        APP.API.notifyDisplayNameChanged(id, {
-            displayName: formattedNickname,
-            formattedDisplayName:
-                appendSuffix(
-                    formattedNickname,
-                    interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME)
-        });
-
         if (room) {
             APP.UI.changeDisplayName(id, formattedNickname);
         }

css/_avatar.scss

@@ -0,0 +1,14 @@
+.avatar {
+    align-items: center;
+    background-color: #AAA;
+    display: flex;
+    border-radius: 50%;
+    color: rgba(255, 255, 255, 0.6);
+    font-weight: 100;
+    justify-content: center;
+    object-fit: cover;
+}
+
+.defaultAvatar {
+    opacity: 0.6
+}

css/_font.scss

@@ -25,6 +25,9 @@
     -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-enlarge:before {
+  content: "\e90a";
+}
 .icon-signal_cellular_0:before {
   content: "\e901";
 }

css/_toolbars.scss

@@ -116,9 +116,9 @@
             }
         }
         i.disabled, .disabled i {
-            cursor: initial;
-            color: #fff;
-            background-color: #a4b8d1;
+            cursor: initial !important;
+            color: #fff !important;
+            background-color: #a4b8d1 !important;
         }
 
         .icon-mic-disabled, .icon-microphone, .icon-camera-disabled, .icon-camera {

css/_videolayout_default.scss

@@ -23,14 +23,9 @@
     top: 0;
     width: 100%;
 
-    &.fit-full-height #largeVideoBackground {
-        height: 100%;
-        width: auto;
-    }
-
-    .fit-full-width #largeVideoBackground {
-        height: auto;
-        width: 100%;
+    #largeVideoBackground {
+        min-height: 100%;
+        min-width: 100%;
     }
 }
 #largeVideoBackgroundContainer {
@@ -498,7 +493,6 @@
 }
 
 #dominantSpeakerAvatarContainer,
-#dominantSpeakerAvatar,
 .dynamic-shadow {
     width: 200px;
     height: 200px;
@@ -508,14 +502,9 @@
     top: 50px;
     margin: auto;
     position: relative;
-    border-radius: 100px;
     overflow: hidden;
     visibility: inherit;
 }
-#dominantSpeakerAvatar {
-    background-color: #000000;
-    object-fit: cover;
-}
 
 .dynamic-shadow {
     border-radius: 50%;
@@ -529,7 +518,6 @@
 .avatar-container {
     @include maxSize(60px);
     @include absoluteAligning();
-    border-radius: 50%;
     display: flex;
     justify-content: center;
     height: 50%;
@@ -546,13 +534,17 @@
 #videoNotAvailableScreen {
     text-align: center;
     #avatarContainer {
+        border-radius: 50%;
+        display: inline-block;
         height: 50vh;
-        display:inline-block;
         margin-top: 25vh;
+        overflow: hidden;
+        width: 50vh;
 
         #avatar {
-            border-radius: 50%;
             height: 100%;
+            object-fit: cover;
+            width: 100%;
         }
     }
 }

css/main.scss

@@ -86,5 +86,6 @@ $flagsImagePath: "../images/";
 @import 'navigate_section_list';
 @import 'third-party-branding/google';
 @import 'third-party-branding/microsoft';
+@import 'avatar';
 
 /* Modules END */

doc/api.md

@@ -192,6 +192,11 @@ The `command` parameter is String object with the name of the command. The follo
 api.executeCommand('displayName', 'New Nickname');
 ```
 
+* **password** - Sets the password for the room. This command requires one argument - the password name to be set.
+```javascript
+api.executeCommand('password', 'The Password');
+```
+
 * **subject** - Sets the subject of the conference. This command requires one argument - the new subject to be set.
 ```javascript
 api.executeCommand('subject', 'New Conference Subject');
@@ -382,6 +387,19 @@ changes. The listener will receive an object with the following structure:
 }
 ```
 
+* **participantKickedOut** - event notifications about a participants being removed from the room. The listener will receive an object with the following structure:
+```javascript
+{
+    kicked: {
+        id: string, // the id of the participant removed from the room
+        local: boolean // whether or not the participant is the local particiapnt
+    },
+    kicker: {
+        id: string // the id of the participant who kicked out the other participant
+    }
+}
+```
+
 * **participantLeft** - event notifications about participants that leave the room. The listener will receive an object with the following structure:
 ```javascript
 {
@@ -389,6 +407,8 @@ changes. The listener will receive an object with the following structure:
 }
 ```
 
+* **passwordRequired** - event notifications fired when failing to join a room because it has a password.
+
 * **videoConferenceJoined** - event notifications fired when the local user has joined the video conference. The listener will receive an object with the following structure:
 ```javascript
 {
@@ -430,6 +450,8 @@ The listener will receive an object with the following structure:
 }
 ```
 
+* **suspendDetected** - event notifications about detecting suspend event in host computer.
+
 You can also add multiple event listeners by using `addEventListeners`.
 This method requires one argument of type Object. The object argument must
 have the names of the events as keys and the listeners of the events as values.

fonts/jitsi.svg

@@ -37,6 +37,7 @@
 <glyph unicode="&#xe907;" glyph-name="signal_cellular_2" d="M86 86l852 852v-852h-852z" />
 <glyph unicode="&#xe908;" glyph-name="share-doc" d="M554 640h236l-236 234v-234zM682 426v86h-340v-86h340zM682 256v86h-340v-86h340zM598 938l256-256v-512c0-46-40-84-86-84h-512c-46 0-86 38-86 84l2 684c0 46 38 84 84 84h342z" />
 <glyph unicode="&#xe909;" glyph-name="ninja" d="M330.667 469.333c-0.427 14.933 6.4 29.44 17.92 39.253 32-6.827 61.867-20.053 88.747-39.253 0-29.013-23.893-52.907-53.333-52.907s-52.907 23.467-53.333 52.907zM586.667 469.333c26.88 18.773 56.747 32 88.747 38.827 11.52-9.813 18.347-24.32 17.92-38.827 0-29.867-23.893-53.76-53.333-53.76s-53.333 23.893-53.333 53.76v0zM512 640c-118.187 1.707-234.667-27.733-338.347-85.333l-2.987-42.667c0-52.48 12.373-104.107 35.84-151.040 101.12 15.36 203.093 23.040 305.493 23.040s204.373-7.68 305.493-23.040c23.467 46.933 35.84 98.56 35.84 151.040l-2.987 42.667c-103.68 57.6-220.16 87.040-338.347 85.333zM512 938.667c235.641 0 426.667-191.025 426.667-426.667s-191.025-426.667-426.667-426.667c-235.641 0-426.667 191.025-426.667 426.667s191.025 426.667 426.667 426.667z" />
+<glyph unicode="&#xe90a;" glyph-name="enlarge" d="M896 212v600h-768v-600h768zM896 896q34 0 60-26t26-60v-596q0-34-26-60t-60-26h-768q-34 0-60 26t-26 60v596q0 34 26 60t60 26h768zM598 342l-86-108-86 108h172zM256 598v-172l-106 86zM768 598l106-86-106-86v172zM512 790l86-108h-172z" />
 <glyph unicode="&#xe90b;" glyph-name="full-screen" d="M598 810h212v-212h-84v128h-128v84zM726 298v128h84v-212h-212v84h128zM214 598v212h212v-84h-128v-128h-84zM298 426v-128h128v-84h-212v212h84z" />
 <glyph unicode="&#xe90c;" glyph-name="exit-full-screen" d="M682 682h128v-84h-212v212h84v-128zM598 214v212h212v-84h-128v-128h-84zM342 682v128h84v-212h-212v84h128zM214 342v84h212v-212h-84v128h-128z" />
 <glyph unicode="&#xe90d;" glyph-name="security" d="M768 170v428h-512v-428h512zM768 682c46 0 86-38 86-84v-428c0-46-40-84-86-84h-512c-46 0-86 38-86 84v428c0 46 40 84 86 84h388v86c0 72-60 132-132 132s-132-60-132-132h-82c0 118 96 214 214 214s214-96 214-214v-86h42zM512 298c-46 0-86 40-86 86s40 86 86 86 86-40 86-86-40-86-86-86z" />

index.html

@@ -93,12 +93,15 @@
                         + "font-size:small;"
                         + "cursor: pointer'>" + showMoreText + "</a>"
                         + "&nbsp;&nbsp;&nbsp;"
-                        + "<a href='" + href + "' style='"
+                        + "<a id ='reloadLink' style='"
                         + "text-decoration: underline;"
                         + "font-size:small;"
                         + "'>reload now</a>"
                         + "</div>";
 
+                    var reloadLink = document.getElementById('reloadLink');
+                    reloadLink.setAttribute('href', href);
+
                     var showMoreElem = document.getElementById("showMore");
                     showMoreElem.addEventListener('click', function () {
                             var moreInfoElem

interface_config.js

@@ -167,7 +167,27 @@ var interfaceConfig = {
      *
      * @type {boolean}
      */
-    RECENT_LIST_ENABLED: true
+    RECENT_LIST_ENABLED: true,
+
+    // Names of browsers which should show a warning stating the current browser
+    // has a suboptimal experience. Browsers which are not listed as optimal or
+    // unsupported are considered suboptimal. Valid values are:
+    // chrome, chromium, edge, electron, firefox, nwjs, opera, safari
+    OPTIMAL_BROWSERS: [ 'chrome', 'chromium', 'firefox', 'nwjs', 'electron' ],
+
+    // Browsers, in addition to those which do not fully support WebRTC, that
+    // are not supported and should show the unsupported browser page.
+    UNSUPPORTED_BROWSERS: [],
+
+    /**
+     * A UX mode where the last screen share participant is automatically
+     * pinned. Valid values are the string "remote-only" so remote participants
+     * get pinned but not local, otherwise any truthy value for all participants,
+     * and any falsy value to disable the feature.
+     *
+     * Note: this mode is experimental and subject to breakage.
+     */
+    AUTO_PIN_LATEST_SCREEN_SHARE: 'remote-only'
 
     /**
      * How many columns the tile view can expand to. The respected range is
@@ -195,12 +215,6 @@ var interfaceConfig = {
      */
     // ANDROID_APP_PACKAGE: 'org.jitsi.meet',
 
-    /**
-     * A UX mode where the last screen share participant is automatically
-     * pinned. Note: this mode is experimental and subject to breakage.
-     */
-    // AUTO_PIN_LATEST_SCREEN_SHARE: false,
-
     /**
      * Override the behavior of some notifications to remain displayed until
      * explicitly dismissed through a user action. The value is how long, in

ios/Podfile.lock

@@ -150,8 +150,8 @@ PODS:
     - React/RCTBlob
   - RNCAsyncStorage (1.3.4):
     - React
-  - RNGoogleSignin (1.0.2):
-    - GoogleSignIn
+  - RNGoogleSignin (2.0.0):
+    - GoogleSignIn (~> 4.4.0)
     - React
   - RNSound (0.10.12):
     - React/Core
@@ -291,7 +291,7 @@ SPEC CHECKSUMS:
   react-native-webrtc: 90a847d19deb2d7323fef8cc89ca12b8995fbc90
   react-native-webview: a95842e3f351a6d2c8bc8bcc9eab689c7e7e5ad4
   RNCAsyncStorage: 8e31405a9f12fbf42c2bb330e4560bfd79c18323
-  RNGoogleSignin: 361174d9a3090d295b06257162b560d8efc8a6ed
+  RNGoogleSignin: d030c6c6591db24c3cee649f64c7babf0a1699a0
   RNSound: e157320f503bdd4f4ee6d8542e948d54f90c3c3a
   RNVectorIcons: d819334932bcda3332deb3d2c8ea4d069e0b98f9
   RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42
@@ -300,4 +300,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: b55338cc43312051ed83f8d9c6aadbd8c9402e6a
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.2

ios/app/src/AppDelegate.m

@@ -46,6 +46,12 @@
     jitsiMeet.defaultConferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
         builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"];
         builder.welcomePageEnabled = YES;
+
+        // Apple rejected our app because they claim requiring a
+        // Dropbox account for recording is not acceptable.
+#if DEBUG
+        [builder setFeatureFlag:@"ios.recording.enabled" withBoolean:YES];
+#endif
     }];
 
     [jitsiMeet application:application didFinishLaunchingWithOptions:launchOptions];

ios/app/src/ViewController.m

@@ -96,4 +96,10 @@
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_WILL_JOIN" withData:data];
 }
 
+#if 0
+- (void)enterPictureInPicture:(NSDictionary *)data {
+    [self _onJitsiMeetViewDelegateEvent:@"ENTER_PICTURE_IN_PICTURE" withData:data];
+}
+#endif
+
 @end

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -42,6 +42,8 @@
 		C69EFA0E209A0F660027712B /* JMCallKitListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = C69EFA0B209A0F660027712B /* JMCallKitListener.swift */; };
 		C6A34261204EF76800E062DD /* DragGestureController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A3425E204EF76800E062DD /* DragGestureController.swift */; };
 		C6CC49AF207412CF000DFA42 /* PiPViewCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6CC49AE207412CF000DFA42 /* PiPViewCoordinator.swift */; };
+		DE762DB422AFDE76000DEBD6 /* JitsiMeetUserInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DE762DB322AFDE76000DEBD6 /* JitsiMeetUserInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DE762DB622AFDE8D000DEBD6 /* JitsiMeetUserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = DE762DB522AFDE8D000DEBD6 /* JitsiMeetUserInfo.m */; };
 		DEAD3226220C497000E93636 /* JitsiMeetConferenceOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DEAD3227220C497000E93636 /* JitsiMeetConferenceOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */; };
 		DEAFA779229EAD520033A7FA /* RNRootView.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAFA778229EAD520033A7FA /* RNRootView.m */; };
@@ -94,6 +96,9 @@
 		C6A3425E204EF76800E062DD /* DragGestureController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DragGestureController.swift; sourceTree = "<group>"; };
 		C6CC49AE207412CF000DFA42 /* PiPViewCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PiPViewCoordinator.swift; sourceTree = "<group>"; };
 		C6F99C13204DB63D0001F710 /* JitsiMeetView+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetView+Private.h"; sourceTree = "<group>"; };
+		DE762DB322AFDE76000DEBD6 /* JitsiMeetUserInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetUserInfo.h; sourceTree = "<group>"; };
+		DE762DB522AFDE8D000DEBD6 /* JitsiMeetUserInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetUserInfo.m; sourceTree = "<group>"; };
+		DE762DB722AFE166000DEBD6 /* JitsiMeetUserInfo+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetUserInfo+Private.h"; sourceTree = "<group>"; };
 		DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetConferenceOptions.h; sourceTree = "<group>"; };
 		DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetConferenceOptions.m; sourceTree = "<group>"; };
 		DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetConferenceOptions+Private.h"; sourceTree = "<group>"; };
@@ -174,6 +179,9 @@
 				DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */,
 				DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */,
 				DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */,
+				DE762DB322AFDE76000DEBD6 /* JitsiMeetUserInfo.h */,
+				DE762DB722AFE166000DEBD6 /* JitsiMeetUserInfo+Private.h */,
+				DE762DB522AFDE8D000DEBD6 /* JitsiMeetUserInfo.m */,
 				0B412F161EDEC65D00B1A0A6 /* JitsiMeetView.h */,
 				0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */,
 				DEAFA777229EAD3B0033A7FA /* RNRootView.h */,
@@ -259,6 +267,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DE762DB422AFDE76000DEBD6 /* JitsiMeetUserInfo.h in Headers */,
 				0B412F181EDEC65D00B1A0A6 /* JitsiMeetView.h in Headers */,
 				0B93EF7E1EC9DDCD0030D24D /* RCTBridgeWrapper.h in Headers */,
 				0B412F221EDEF6EA00B1A0A6 /* JitsiMeetViewDelegate.h in Headers */,
@@ -484,6 +493,7 @@
 				0BB9AD7B1F5EC8F4001C08DB /* CallKit.m in Sources */,
 				0BB9AD7D1F60356D001C08DB /* AppInfo.m in Sources */,
 				DEAFA779229EAD520033A7FA /* RNRootView.m in Sources */,
+				DE762DB622AFDE8D000DEBD6 /* JitsiMeetUserInfo.m in Sources */,
 				DEAD3227220C497000E93636 /* JitsiMeetConferenceOptions.m in Sources */,
 				0B93EF7F1EC9DDCD0030D24D /* RCTBridgeWrapper.m in Sources */,
 				0BA13D311EE83FF8007BEF7F /* ExternalAPI.m in Sources */,

ios/sdk/src/Info.plist

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

ios/sdk/src/JitsiMeetConferenceOptions.h

@@ -16,6 +16,9 @@
 
 #import <Foundation/Foundation.h>
 
+#import "JitsiMeetUserInfo.h"
+
+
 @interface JitsiMeetConferenceOptionsBuilder : NSObject
 
 /**
@@ -41,6 +44,11 @@
  */
 @property (nonatomic, copy, nullable) NSDictionary *colorScheme;
 
+/**
+ * Feature flags. See: https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/flags/constants.js
+ */
+@property (nonatomic, readonly, nonnull) NSDictionary *featureFlags;
+
 /**
  * Set to YES to join the conference with audio / video muted or to start in audio
  * only mode respectively.
@@ -55,6 +63,14 @@
  */
 @property (nonatomic) BOOL welcomePageEnabled;
 
+/**
+ * Information about the local user. It will be used in absence of a token.
+ */
+@property (nonatomic, nullable) JitsiMeetUserInfo *userInfo;
+
+- (void)setFeatureFlag:(NSString *_Nonnull)flag withBoolean:(BOOL)value;
+- (void)setFeatureFlag:(NSString *_Nonnull)flag withValue:(id _Nonnull)value;
+
 @end
 
 @interface JitsiMeetConferenceOptions : NSObject
@@ -66,6 +82,7 @@
 @property (nonatomic, copy, nullable, readonly) NSString *token;
 
 @property (nonatomic, copy, nullable) NSDictionary *colorScheme;
+@property (nonatomic, readonly, nonnull) NSDictionary *featureFlags;
 
 @property (nonatomic, readonly) BOOL audioOnly;
 @property (nonatomic, readonly) BOOL audioMuted;
@@ -73,6 +90,8 @@
 
 @property (nonatomic, readonly) BOOL welcomePageEnabled;
 
+@property (nonatomic, nullable) JitsiMeetUserInfo *userInfo;
+
 + (instancetype _Nonnull)fromBuilder:(void (^_Nonnull)(JitsiMeetConferenceOptionsBuilder *_Nonnull))initBlock;
 - (instancetype _Nonnull)init NS_UNAVAILABLE;
 

ios/sdk/src/JitsiMeetConferenceOptions.m

@@ -17,12 +17,19 @@
 #import <React/RCTUtils.h>
 
 #import "JitsiMeetConferenceOptions+Private.h"
+#import "JitsiMeetUserInfo+Private.h"
+
+/**
+ * Backwards compatibility: turn the boolean property into a feature flag.
+ */
+static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
+
 
 @implementation JitsiMeetConferenceOptionsBuilder {
     NSNumber *_audioOnly;
     NSNumber *_audioMuted;
     NSNumber *_videoMuted;
-    NSNumber *_welcomePageEnabled;
+    NSMutableDictionary *_featureFlags;
 }
 
 @dynamic audioOnly;
@@ -38,17 +45,26 @@
         _token = nil;
 
         _colorScheme = nil;
+        _featureFlags = [[NSMutableDictionary alloc] init];
 
         _audioOnly = nil;
         _audioMuted = nil;
         _videoMuted = nil;
 
-        _welcomePageEnabled = nil;
+        _userInfo = nil;
     }
     
     return self;
 }
 
+- (void)setFeatureFlag:(NSString *)flag withBoolean:(BOOL)value {
+    [self setFeatureFlag:flag withValue:[NSNumber numberWithBool:value]];
+}
+
+- (void)setFeatureFlag:(NSString *)flag withValue:(id)value {
+    _featureFlags[flag] = value;
+}
+
 #pragma mark - Dynamic properties
 
 - (void)setAudioOnly:(BOOL)audioOnly {
@@ -76,11 +92,14 @@
 }
 
 - (void)setWelcomePageEnabled:(BOOL)welcomePageEnabled {
-    _welcomePageEnabled = [NSNumber numberWithBool:welcomePageEnabled];
+    [self setFeatureFlag:WelcomePageEnabledFeatureFlag
+               withBoolean:welcomePageEnabled];
 }
 
 - (BOOL)welcomePageEnabled {
-    return _welcomePageEnabled && [_welcomePageEnabled boolValue];
+    NSNumber *n = _featureFlags[WelcomePageEnabledFeatureFlag];
+
+    return n != nil ? [n boolValue] : NO;
 }
 
 #pragma mark - Private API
@@ -97,17 +116,13 @@
     return _videoMuted;
 }
 
-- (NSNumber *)getWelcomePageEnabled {
-    return _welcomePageEnabled;
-}
-
 @end
 
 @implementation JitsiMeetConferenceOptions {
     NSNumber *_audioOnly;
     NSNumber *_audioMuted;
     NSNumber *_videoMuted;
-    NSNumber *_welcomePageEnabled;
+    NSDictionary *_featureFlags;
 }
 
 @dynamic audioOnly;
@@ -130,7 +145,9 @@
 }
 
 - (BOOL)welcomePageEnabled {
-    return _welcomePageEnabled && [_welcomePageEnabled boolValue];
+    NSNumber *n = _featureFlags[WelcomePageEnabledFeatureFlag];
+
+    return n != nil ? [n boolValue] : NO;
 }
 
 #pragma mark - Internal initializer
@@ -148,7 +165,9 @@
         _audioMuted = [builder getAudioMuted];
         _videoMuted = [builder getVideoMuted];
 
-        _welcomePageEnabled = [builder getWelcomePageEnabled];
+        _featureFlags = [NSDictionary dictionaryWithDictionary:builder.featureFlags];
+
+        _userInfo = builder.userInfo;
     }
 
     return self;
@@ -167,14 +186,12 @@
 - (NSDictionary *)asProps {
     NSMutableDictionary *props = [[NSMutableDictionary alloc] init];
 
+    props[@"flags"] = [NSMutableDictionary dictionaryWithDictionary:_featureFlags];
+
     if (_colorScheme != nil) {
         props[@"colorScheme"] = self.colorScheme;
     }
 
-    if (_welcomePageEnabled != nil) {
-        props[@"welcomePageEnabled"] = @(self.welcomePageEnabled);
-    }
-
     NSMutableDictionary *config = [[NSMutableDictionary alloc] init];
     if (_audioOnly != nil) {
         config[@"startAudioOnly"] = @(self.audioOnly);
@@ -208,6 +225,10 @@
         urlProps[@"jwt"] = _token;
     }
 
+    if (_token == nil && _userInfo != nil) {
+        props[@"userInfo"] = [self.userInfo asDict];
+    }
+
     urlProps[@"config"] = config;
     props[@"url"] = urlProps;
 

ios/sdk/src/JitsiMeetUserInfo+Private.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright @ 2019-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import "JitsiMeetUserInfo.h"
+
+@interface JitsiMeetUserInfo ()
+
+- (NSMutableDictionary *)asDict;
+
+@end

ios/sdk/src/JitsiMeetUserInfo.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright @ 2019-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface JitsiMeetUserInfo : NSObject
+
+/**
+ * User display name.
+ */
+@property (nonatomic, copy, nullable) NSString *displayName;
+/**
+ * User e-mail.
+ */
+@property (nonatomic, copy, nullable) NSString *email;
+/**
+ * URL for the user avatar.
+ */
+@property (nonatomic, copy, nullable) NSURL *avatar;
+
+- (instancetype _Nullable)initWithDisplayName:(NSString *_Nullable)displayName
+                                     andEmail:(NSString *_Nullable)email
+                                    andAvatar:(NSURL *_Nullable) avatar;
+
+@end

ios/sdk/src/JitsiMeetUserInfo.m

@@ -0,0 +1,55 @@
+/*
+ * Copyright @ 2019-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import "JitsiMeetUserInfo+Private.h"
+
+@implementation JitsiMeetUserInfo
+
+- (instancetype)initWithDisplayName:(NSString *)displayName
+                           andEmail:(NSString *)email
+                          andAvatar:(NSURL *_Nullable) avatar {
+    self = [super init];
+    if (self) {
+        self.displayName = displayName;
+        self.email = email;
+        self.avatar = avatar;
+    }
+
+    return self;
+}
+
+- (NSDictionary *)asDict {
+    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
+
+    if (self.displayName != nil) {
+        dict[@"displayName"] = self.displayName;
+    }
+
+    if (self.email != nil) {
+        dict[@"email"] = self.email;
+    }
+
+    if (self.avatar != nil) {
+        NSString *avatarURL = [self.avatar absoluteString];
+        if (avatarURL != nil) {
+            dict[@"avatarURL"] = avatarURL;
+        }
+    }
+
+    return dict;
+}
+
+@end

ios/sdk/src/JitsiMeetView.m

@@ -24,6 +24,12 @@
 #import "RNRootView.h"
 
 
+/**
+ * Backwards compatibility: turn the boolean prop into a feature flag.
+ */
+static NSString *const PiPEnabledFeatureFlag = @"pip.enabled";
+
+
 @implementation JitsiMeetView {
     /**
      * The unique identifier of this `JitsiMeetView` within the process for the
@@ -122,11 +128,15 @@ static void initializeViewsMap() {
 - (void)setProps:(NSDictionary *_Nonnull)newProps {
     NSMutableDictionary *props = mergeProps([[JitsiMeet sharedInstance] getDefaultProps], newProps);
 
-    props[@"externalAPIScope"] = externalAPIScope;
+    // Set the PiP flag if it wasn't manually set.
+    NSMutableDictionary *featureFlags = props[@"flags"];
+    if (featureFlags[PiPEnabledFeatureFlag] == nil) {
+        featureFlags[PiPEnabledFeatureFlag]
+            = [NSNumber numberWithBool:
+               self.delegate && [self.delegate respondsToSelector:@selector(enterPictureInPicture:)]];
+    }
 
-    // TODO: put this in some 'flags' field
-    props[@"pictureInPictureEnabled"]
-        = @(self.delegate && [self.delegate respondsToSelector:@selector(enterPictureInPicture:)]);
+    props[@"externalAPIScope"] = externalAPIScope;
 
     // This method is supposed to be imperative i.e. a second
     // invocation with one and the same URL is expected to join the respective

ios/sdk/src/callkit/CallKit.m

@@ -74,6 +74,12 @@ RCT_EXPORT_METHOD(endCall:(NSString *)callUUID
 #endif
 
     NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
+
+    if (!callUUID_) {
+        reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
+        return;
+    }
+
     CXEndCallAction *action
         = [[CXEndCallAction alloc] initWithCallUUID:callUUID_];
     [self requestTransaction:[[CXTransaction alloc] initWithAction:action]
@@ -91,6 +97,12 @@ RCT_EXPORT_METHOD(setMuted:(NSString *)callUUID
 #endif
 
     NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
+
+    if (!callUUID_) {
+        reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
+        return;
+    }
+
     CXSetMutedCallAction *action
         = [[CXSetMutedCallAction alloc] initWithCallUUID:callUUID_ muted:muted];
     [self requestTransaction:[[CXTransaction alloc] initWithAction:action]
@@ -123,6 +135,13 @@ RCT_EXPORT_METHOD(startCall:(NSString *)callUUID
     NSLog(@"[RNCallKit][startCall] callUUID = %@", callUUID);
 #endif
 
+    NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
+
+    if (!callUUID_) {
+        reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
+        return;
+    }
+
     // Don't start a new call if there's an active call for the specified
     // callUUID. JitsiMeetView was configured for an incoming call.
     if ([JMCallKitProxy hasActiveCallForUUID:callUUID]) {
@@ -132,7 +151,6 @@ RCT_EXPORT_METHOD(startCall:(NSString *)callUUID
 
     CXHandle *handle_
         = [[CXHandle alloc] initWithType:CXHandleTypeGeneric value:handle];
-    NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
     CXStartCallAction *action
         = [[CXStartCallAction alloc] initWithCallUUID:callUUID_
                                                handle:handle_];
@@ -146,6 +164,12 @@ RCT_EXPORT_METHOD(reportCallFailed:(NSString *)callUUID
                            resolve:(RCTPromiseResolveBlock)resolve
                             reject:(RCTPromiseRejectBlock)reject) {
     NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
+
+    if (!callUUID_) {
+        reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
+        return;
+    }
+
     [JMCallKitProxy reportCallWith:callUUID_
                            endedAt:nil
                             reason:CXCallEndedReasonFailed];
@@ -157,6 +181,12 @@ RCT_EXPORT_METHOD(reportConnectedOutgoingCall:(NSString *)callUUID
                                       resolve:(RCTPromiseResolveBlock)resolve
                                        reject:(RCTPromiseRejectBlock)reject) {
     NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
+
+    if (!callUUID_) {
+        reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
+        return;
+    }
+
     [JMCallKitProxy reportOutgoingCallWith:callUUID_
                                connectedAt:nil];
     resolve(nil);
@@ -175,6 +205,12 @@ RCT_EXPORT_METHOD(updateCall:(NSString *)callUUID
 #endif
 
     NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
+
+    if (!callUUID_) {
+        reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
+        return;
+    }
+
     NSString *displayName = options[@"displayName"];
     BOOL hasVideo = [(NSNumber*)options[@"hasVideo"] boolValue];
 

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

@@ -37,6 +37,15 @@ public class PiPViewCoordinator {
         }
     }
 
+    public enum Position {
+        case lowerRightCorner
+        case upperRightCorner
+        case lowerLeftCorner
+        case upperLeftCorner
+    }
+    
+    public var initialPositionInSuperview = Position.lowerRightCorner
+    
     /// The size ratio of the view when in PiP mode
     public var pipSizeRatio: CGFloat = {
         let deviceIdiom = UIScreen.main.traitCollection.userInterfaceIdiom
@@ -205,9 +214,21 @@ public class PiPViewCoordinator {
         let adjustedBounds = bounds.inset(by: dragBoundInsets)
         let size = CGSize(width: bounds.size.width * pipSizeRatio,
                           height: bounds.size.height * pipSizeRatio)
-        let x: CGFloat = adjustedBounds.maxX - size.width
-        let y: CGFloat = adjustedBounds.maxY - size.height
-        return CGRect(x: x, y: y, width: size.width, height: size.height)
+        let origin = initialPositionFor(pipSize: size, bounds: adjustedBounds)
+        return CGRect(x: origin.x, y: origin.y, width: size.width, height: size.height)
+    }
+    
+    private func initialPositionFor(pipSize size: CGSize, bounds: CGRect) -> CGPoint {
+        switch initialPositionInSuperview {
+        case .lowerLeftCorner:
+            return CGPoint(x: bounds.minX, y: bounds.maxY - size.height)
+        case .lowerRightCorner:
+            return CGPoint(x: bounds.maxX - size.width, y: bounds.maxY - size.height)
+        case .upperLeftCorner:
+            return CGPoint(x: bounds.minX, y: bounds.minY)
+        case .upperRightCorner:
+            return CGPoint(x: bounds.maxX - size.width, y: bounds.minY)
+        }
     }
 
     // MARK: - Animation helpers

lang/main.json

@@ -121,6 +121,7 @@
     "deepLinking": {
         "appNotInstalled": "You need the __app__ mobile app to join this meeting on your phone.",
         "description": "Nothing happened? We tried launching your meeting in the __app__ desktop app. Try again or launch it in the __app__ web app.",
+        "descriptionWithoutWeb": "Nothing happened? We tried launching your meeting in the __app__ desktop app.",
         "downloadApp": "Download the app",
         "launchWebButton": "Launch in web",
         "openApp": "Continue to the app",
@@ -176,10 +177,10 @@
         "defaultError": "There was some kind of error",
         "detectext": "Error when trying to detect desktopsharing extension.",
         "dismiss": "Dismiss",
-        "displayNameRequired": "Display name is required",
+        "displayNameRequired": "Hi! What’s your name?",
         "done": "Done",
         "doNotShowMessageAgain": "Don't show this message again",
-        "enterDisplayName": "Please enter your display name",
+        "enterDisplayName": "Please enter your name here",
         "error": "Error",
         "externalInstallationMsg": "You need to install our desktop sharing extension.",
         "externalInstallationTitle": "Extension required",
@@ -196,11 +197,11 @@
         "internalError": "Oops! Something went wrong. The following error occurred: __error__",
         "internalErrorTitle": "Internal error",
         "joinAgain": "Join again",
-        "kickMessage": "Ouch! You have been kicked out of the meet!",
+        "kickMessage": "You can contact __participantDisplayName__ for more details.",
         "kickParticipantButton": "Kick",
         "kickParticipantDialog": "Are you sure you want to kick this participant?",
         "kickParticipantTitle": "Kick this member?",
-        "kickTitle": "Kicked from meeting",
+        "kickTitle": "Ouch! __participantDisplayName__ kicked you out of the meeting",
         "liveStreaming": "Live Streaming",
         "liveStreamingDisabledForGuestTooltip": "Guests can't start live streaming.",
         "liveStreamingDisabledTooltip": "Start live stream disabled.",
@@ -213,8 +214,8 @@
         "maxUsersLimitReachedTitle": "Maximum members limit reached",
         "micConstraintFailedError": "Your microphone does not satisfy some of the required constraints.",
         "micNotFoundError": "Microphone was not found.",
-        "micNotSendingData": "We are unable to access your microphone. Please select another device from the settings menu or try to reload the application.",
-        "micNotSendingDataTitle": "Unable to access microphone",
+        "micNotSendingData": "Go to your computer's settings to unmute your mic and adjust its level",
+        "micNotSendingDataTitle": "Your mic is muted by your system settings",
         "micPermissionDeniedError": "You have not granted permission to use your microphone. You can still join the conference but others won't hear you. Use the camera button in the address bar to fix this.",
         "micUnknownError": "Cannot use microphone for an unknown reason.",
         "muteParticipantBody": "You won't be able to unmute them, but they can unmute themselves at any time.",
@@ -355,12 +356,11 @@
         "dialInTollFree": "Toll Free",
         "genericError": "Whoops, something went wrong.",
         "inviteLiveStream": "To view the live stream of this meeting, click this link: __url__",
-        "invitePhone": "One tap audio Dial In: __number__,,__conferenceID__#",
-        "invitePhoneAlternatives": "Looking for a different dial in number? Please see: __url__",
+        "invitePhone": "To join by phone instead, tap this: __number__,,__conferenceID__#\n",
+        "invitePhoneAlternatives": "Looking for a different dial-in number?\nSee meeting dial-in numbers: __url__\n\n\nIf also dialing-in through a room phone, join without connecting to audio: __silentUrl__",
         "inviteURLFirstPartGeneral": "You are invited to join a meeting.",
-        "inviteURLFirstPartPersonal": "__name__ is inviting you to a meeting.",
-        "inviteURLSecondPart": "\n__moreInfo__\nJoin meeting: __url__\n",
-        "inviteURLMoreInfo": "Meeting ID: __conferenceID__#\n",
+        "inviteURLFirstPartPersonal": "__name__ is inviting you to a meeting.\n",
+        "inviteURLSecondPart": "\nJoin the meeting:\n__url__\n",
         "liveStreamURL": "Live stream:",
         "moreNumbers": "More numbers",
         "noNumbers": "No dial-in numbers.",
@@ -472,16 +472,23 @@
         "focus": "Conference focus",
         "focusFail": "__component__ not available - retry in __ms__ sec",
         "grantedTo": "Moderator rights granted to __to__!",
+        "invitedOneMember": "__name__ has been invited",
+        "invitedThreePlusMembers": "__name__ and __count__ others have been invited",
+        "invitedTwoMembers": "__first__ and __second__ have been invited",
+        "kickParticipant": "__kicked__ was kicked by __kicker__",
         "me": "Me",
         "moderator": "Moderator rights granted!",
         "muted": "You have started the conversation muted.",
         "mutedTitle": "You're muted!",
+        "mutedRemotelyTitle": "You have been muted by __participantDisplayName__!",
+        "mutedRemotelyDescription": "You can always unmute when you're ready to speak. Mute back when you're done to keep noise away from the meeting.",
         "raisedHand": "__name__ would like to speak.",
         "somebody": "Somebody",
         "startSilentTitle": "You joined with no audio output!",
         "startSilentDescription": "Rejoin the meeting to enable audio",
         "suboptimalExperienceDescription": "Eer... we are afraid your experience with __appName__ isn't going to be that great here. We are looking for ways to improve this but, until then, please try using one of the <a href='static/recommendedBrowsers.html' target='_blank'>fully supported browsers</a>.",
         "suboptimalExperienceTitle": "Browser Warning",
+        "unmute": "Unmute",
         "newDeviceCameraTitle": "New camera detected",
         "newDeviceAudioTitle": "New audio device detected",
         "newDeviceAction": "Use"
@@ -611,7 +618,7 @@
         "accessibilityLabel": {
             "audioOnly": "Toggle audio only",
             "audioRoute": "Select the sound device",
-            "callQuality": "Manage call quality",
+            "callQuality": "Manage video quality",
             "cc": "Toggle subtitles",
             "chat": "Toggle chat window",
             "document": "Toggle shared document",
@@ -635,6 +642,7 @@
             "shareRoom": "Invite someone",
             "shareYourScreen": "Toggle screenshare",
             "shortcuts": "Toggle shortcuts",
+            "show": "Show on stage",
             "speakerStats": "Toggle speaker statistics",
             "tileView": "Toggle tile view",
             "toggleCamera": "Toggle camera",
@@ -646,7 +654,7 @@
         "audioOnlyOn": "Enable audio only mode",
         "audioRoute": "Select the sound device",
         "authenticate": "Authenticate",
-        "callQuality": "Manage call quality",
+        "callQuality": "Manage video quality",
         "cameraDisabled": "Camera is not available",
         "chat": "Open / Close chat",
         "closeChat": "Close chat",
@@ -732,7 +740,7 @@
     "videoStatus": {
         "audioOnly": "AUD",
         "audioOnlyExpanded": "You are in audio only mode. This mode saves bandwidth but you won't see videos of others.",
-        "callQuality": "Call Quality",
+        "callQuality": "Video Quality",
         "hd": "HD",
         "hdTooltip": "Viewing high definition video",
         "highDefinition": "High definition",
@@ -745,7 +753,7 @@
         "onlyAudioAvailable": "Only audio is available",
         "onlyAudioSupported": "We only support audio in this browser.",
         "p2pEnabled": "Peer to Peer Enabled",
-        "p2pVideoQualityDescription": "In peer to peer mode, received call quality can only be toggled between high and audio only. Other settings will not be honored until peer to peer is exited.",
+        "p2pVideoQualityDescription": "In peer to peer mode, received video quality can only be toggled between high and audio only. Other settings will not be honored until peer to peer is exited.",
         "qualityButtonTip": "Change received video quality",
         "recHighDefinitionOnly": "Will prefer high definition.",
         "sd": "SD",
@@ -760,6 +768,7 @@
         "mute": "Member is muted",
         "muted": "Muted",
         "remoteControl": "Remote control",
+        "show": "Show on stage",
         "videomute": "Member has stopped the camera"
     },
     "welcomepage": {
@@ -783,6 +792,7 @@
         "recentList": "Recent",
         "recentListDelete": "Delete",
         "recentListEmpty": "Your recent list is currently empty. Chat with your team and you will find all your recent meetings here.",
+        "reducedUIText": "Welcome to __app__!",
         "roomname": "Enter room name",
         "roomnameHint": "Enter the name or URL of the room you want to join. You may make a name up, just let the people you are meeting know it so that they enter the same name.",
         "sendFeedback": "Send feedback",

modules/API/API.js

@@ -5,7 +5,7 @@ import {
     createApiEvent,
     sendAnalytics
 } from '../../react/features/analytics';
-import { setSubject } from '../../react/features/base/conference';
+import { setPassword, setSubject } from '../../react/features/base/conference';
 import { parseJWTFromURLParams } from '../../react/features/base/jwt';
 import { invite } from '../../react/features/invite';
 import { toggleTileView } from '../../react/features/video-layout';
@@ -65,6 +65,28 @@ function initCommands() {
             sendAnalytics(createApiEvent('display.name.changed'));
             APP.conference.changeLocalDisplayName(displayName);
         },
+        'password': password => {
+            const { conference, passwordRequired }
+                = APP.store.getState()['features/base/conference'];
+
+            if (passwordRequired) {
+                sendAnalytics(createApiEvent('submit.password'));
+
+                APP.store.dispatch(setPassword(
+                    passwordRequired,
+                    passwordRequired.join,
+                    password
+                ));
+            } else {
+                sendAnalytics(createApiEvent('password.changed'));
+
+                APP.store.dispatch(setPassword(
+                    conference,
+                    conference.lock,
+                    password
+                ));
+            }
+        },
         'proxy-connection-event': event => {
             APP.conference.onProxyConnectionEvent(event);
         },
@@ -487,6 +509,15 @@ class API {
         this._sendEvent({ name: 'video-ready-to-close' });
     }
 
+    /**
+     * Notify external application (if API is enabled) that a suspend event in host computer.
+     *
+     * @returns {void}
+     */
+    notifySuspendDetected() {
+        this._sendEvent({ name: 'suspend-detected' });
+    }
+
     /**
      * Notify external application (if API is enabled) for audio muted status
      * changed.
@@ -627,6 +658,34 @@ class API {
         });
     }
 
+    /**
+     * Notify external application of a participant, remote or local, being
+     * removed from the conference by another participant.
+     *
+     * @param {string} kicked - The ID of the participant removed from the
+     * conference.
+     * @param {string} kicker - The ID of the participant that removed the
+     * other participant.
+     * @returns {void}
+     */
+    notifyKickedOut(kicked: Object, kicker: Object) {
+        this._sendEvent({
+            name: 'participant-kicked-out',
+            kicked,
+            kicker
+        });
+    }
+
+    /**
+     * Notify external application of the current meeting requiring a password
+     * to join.
+     *
+     * @returns {void}
+     */
+    notifyOnPasswordRequired() {
+        this._sendEvent({ name: 'password-required' });
+    }
+
     /**
      * Notify external application (if API is enabled) that the screen sharing
      * has been turned on/off.

modules/API/external/external_api.js

@@ -33,6 +33,7 @@ const commands = {
     displayName: 'display-name',
     email: 'email',
     hangup: 'video-hangup',
+    password: 'password',
     subject: 'subject',
     submitFeedback: 'submit-feedback',
     toggleAudio: 'toggle-audio',
@@ -62,7 +63,9 @@ const events = {
     'mic-error': 'micError',
     'outgoing-message': 'outgoingMessage',
     'participant-joined': 'participantJoined',
+    'participant-kicked-out': 'participantKickedOut',
     'participant-left': 'participantLeft',
+    'password-required': 'passwordRequired',
     'proxy-connection-event': 'proxyConnectionEvent',
     'video-ready-to-close': 'readyToClose',
     'video-conference-joined': 'videoConferenceJoined',
@@ -71,6 +74,7 @@ const events = {
     'video-mute-status-changed': 'videoMuteStatusChanged',
     'screen-sharing-status-changed': 'screenSharingStatusChanged',
     'subject-change': 'subjectChange',
+    'suspend-detected': 'suspendDetected',
     'tile-view-changed': 'tileViewChanged'
 };
 
@@ -535,6 +539,7 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
      * {{
      * on: on //whether screen sharing is on
      * }}
+     * {@code suspendDetected} - receives event notifications about detecting suspend event in host computer.
      * {@code readyToClose} - all hangup operations are completed and Jitsi Meet
      * is ready to be disposed.
      * @returns {void}
@@ -557,7 +562,7 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         this.emit('_willDispose');
         this._transport.dispose();
         this.removeAllListeners();
-        if (this._frame) {
+        if (this._frame && this._frame.parentNode) {
             this._frame.parentNode.removeChild(this._frame);
         }
     }

modules/UI/UI.js

@@ -99,17 +99,6 @@ UI.notifyReservationError = function(code, msg) {
     });
 };
 
-/**
- * Notify user that he has been kicked from the server.
- */
-UI.notifyKicked = function() {
-    messageHandler.showError({
-        hideErrorSupportLink: true,
-        descriptionKey: 'dialog.kickMessage',
-        titleKey: 'dialog.kickTitle'
-    });
-};
-
 /**
  * Notify user that conference was destroyed.
  * @param reason {string} the reason text
@@ -521,8 +510,8 @@ UI.dockToolbar = dock => APP.store.dispatch(dockToolbox(dock));
  * @param {string} avatarURL - The URL to avatar image to display.
  * @returns {void}
  */
-UI.refreshAvatarDisplay = function(id, avatarURL) {
-    VideoLayout.changeUserAvatar(id, avatarURL);
+UI.refreshAvatarDisplay = function(id) {
+    VideoLayout.changeUserAvatar(id);
 };
 
 /**
@@ -731,24 +720,6 @@ UI.showExtensionInlineInstallationDialog = function(callback) {
     });
 };
 
-/**
- * Shows error dialog that informs the user that no data is received from the
- * device.
- *
- * @param {boolean} isAudioTrack - Whether or not the dialog is for an audio
- * track error.
- * @returns {void}
- */
-UI.showTrackNotWorkingDialog = function(isAudioTrack) {
-    messageHandler.showError({
-        descriptionKey: isAudioTrack
-            ? 'dialog.micNotSendingData' : 'dialog.cameraNotSendingData',
-        titleKey: isAudioTrack
-            ? 'dialog.micNotSendingDataTitle'
-            : 'dialog.cameraNotSendingDataTitle'
-    });
-};
-
 UI.updateDevicesAvailability = function(id, devices) {
     VideoLayout.setDeviceAvailabilityIcons(id, devices);
 };

modules/UI/shared_video/SharedVideoThumb.js

@@ -22,7 +22,6 @@ export default function SharedVideoThumb(participant, videoType, VideoLayout) {
     this.updateDisplayName();
 
     this.container.onclick = this._onContainerClick;
-    this.container.ondblclick = this._onContainerDoubleClick;
 }
 SharedVideoThumb.prototype = Object.create(SmallVideo.prototype);
 SharedVideoThumb.prototype.constructor = SharedVideoThumb;
@@ -34,7 +33,7 @@ SharedVideoThumb.prototype.constructor = SharedVideoThumb;
 SharedVideoThumb.prototype.setDeviceAvailabilityIcons = function() {};
 
 // eslint-disable-next-line no-empty-function
-SharedVideoThumb.prototype.avatarChanged = function() {};
+SharedVideoThumb.prototype.initializeAvatar = function() {};
 
 SharedVideoThumb.prototype.createContainer = function(spanId) {
     const container = document.createElement('span');

modules/UI/videolayout/LargeVideoManager.js

@@ -5,11 +5,8 @@ import ReactDOM from 'react-dom';
 import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
 
+import { Avatar } from '../../../react/features/base/avatar';
 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 */
 
@@ -214,8 +211,7 @@ export default class LargeVideoManager {
             container.setStream(id, stream, videoType);
 
             // change the avatar url on large
-            this.updateAvatar(
-                getAvatarURLByParticipantId(APP.store.getState(), id));
+            this.updateAvatar();
 
             // If the user's connection is disrupted then the avatar will be
             // displayed in case we have no video image cached. That is if
@@ -406,18 +402,16 @@ export default class LargeVideoManager {
     /**
      * Updates the src of the dominant speaker avatar
      */
-    updateAvatar(avatarUrl) {
-        if (avatarUrl) {
-            ReactDOM.render(
+    updateAvatar() {
+        ReactDOM.render(
+            <Provider store = { APP.store }>
                 <Avatar
                     id = "dominantSpeakerAvatar"
-                    uri = { avatarUrl } />,
-                this._dominantSpeakerAvatarContainer
-            );
-        } else {
-            ReactDOM.unmountComponentAtNode(
-                this._dominantSpeakerAvatarContainer);
-        }
+                    participantId = { this.id }
+                    size = { 200 } />
+            </Provider>,
+            this._dominantSpeakerAvatarContainer
+        );
     }
 
     /**

modules/UI/videolayout/LocalVideo.js

@@ -7,9 +7,6 @@ import { Provider } from 'react-redux';
 
 import { JitsiTrackEvents } from '../../../react/features/base/lib-jitsi-meet';
 import { VideoTrack } from '../../../react/features/base/media';
-import {
-    getAvatarURLByParticipantId
-} from '../../../react/features/base/participants';
 import { updateSettings } from '../../../react/features/base/settings';
 import { getLocalVideoTrack } from '../../../react/features/base/tracks';
 import { shouldDisplayTileView } from '../../../react/features/video-layout';
@@ -55,14 +52,12 @@ function LocalVideo(VideoLayout, emitter, streamEndedCallback) {
     // Initialize the avatar display with an avatar url selected from the redux
     // state. Redux stores the local user with a hardcoded participant id of
     // 'local' if no id has been assigned yet.
-    this.avatarChanged(
-        getAvatarURLByParticipantId(APP.store.getState(), this.id));
+    this.initializeAvatar();
 
     this.addAudioLevelIndicator();
     this.updateIndicators();
 
     this.container.onclick = this._onContainerClick;
-    this.container.ondblclick = this._onContainerDoubleClick;
 }
 
 LocalVideo.prototype = Object.create(SmallVideo.prototype);

modules/UI/videolayout/RemoteVideo.js

@@ -89,7 +89,6 @@ function RemoteVideo(user, VideoLayout, emitter) {
     this._stopRemoteControl = this._stopRemoteControl.bind(this);
 
     this.container.onclick = this._onContainerClick;
-    this.container.ondblclick = this._onContainerDoubleClick;
 }
 
 RemoteVideo.prototype = Object.create(SmallVideo.prototype);
@@ -165,7 +164,10 @@ RemoteVideo.prototype._generatePopupContent = function() {
 
     const initialVolumeValue
         = this._audioStreamElement && this._audioStreamElement.volume;
-    const onVolumeChange = this._setAudioVolume;
+
+    // hide volume when in silent mode
+    const onVolumeChange = APP.store.getState()['features/base/config'].startSilent
+        ? undefined : this._setAudioVolume;
     const { isModerator } = APP.conference;
     const participantID = this.id;
 

modules/UI/videolayout/SmallVideo.js

@@ -10,9 +10,8 @@ import { Provider } from 'react-redux';
 import { i18next } from '../../../react/features/base/i18n';
 import { AudioLevelIndicator }
     from '../../../react/features/audio-level-indicator';
+import { Avatar as AvatarDisplay } from '../../../react/features/base/avatar';
 import {
-    Avatar as AvatarDisplay,
-    getAvatarURLByParticipantId,
     getPinnedParticipant,
     pinParticipant
 } from '../../../react/features/base/participants';
@@ -144,7 +143,6 @@ function SmallVideo(VideoLayout) {
     this.updateView = this.updateView.bind(this);
 
     this._onContainerClick = this._onContainerClick.bind(this);
-    this._onContainerDoubleClick = this._onContainerDoubleClick.bind(this);
 }
 
 /**
@@ -571,8 +569,7 @@ SmallVideo.prototype.updateView = function() {
     if (!this.hasAvatar) {
         if (this.id) {
             // Init avatar
-            this.avatarChanged(
-                getAvatarURLByParticipantId(APP.store.getState(), this.id));
+            this.initializeAvatar();
         } else {
             logger.error('Unable to init avatar - no id', this);
 
@@ -610,19 +607,22 @@ SmallVideo.prototype.updateView = function() {
  * Updates the react component displaying the avatar with the passed in avatar
  * url.
  *
- * @param {string} avatarUrl - The uri to the avatar image.
  * @returns {void}
  */
-SmallVideo.prototype.avatarChanged = function(avatarUrl) {
+SmallVideo.prototype.initializeAvatar = function() {
     const thumbnail = this.$avatar().get(0);
 
     this.hasAvatar = true;
 
     if (thumbnail) {
+        // Maybe add a special case for local participant, as on init of
+        // LocalVideo.js the id is set to "local" but will get updated later.
         ReactDOM.render(
-            <AvatarDisplay
-                className = 'userAvatar'
-                uri = { avatarUrl } />,
+            <Provider store = { APP.store }>
+                <AvatarDisplay
+                    className = 'userAvatar'
+                    participantId = { this.id } />
+            </Provider>,
             thumbnail
         );
     }
@@ -859,20 +859,6 @@ SmallVideo.prototype.updateIndicators = function() {
     );
 };
 
-/**
- * Callback invoked when the thumbnail is double clicked. Will pin the
- * participant if in tile view.
- *
- * @param {MouseEvent} event - The click event to intercept.
- * @private
- * @returns {void}
- */
-SmallVideo.prototype._onContainerDoubleClick = function(event) {
-    if (this._pinningRequiresDoubleClick() && this._shouldTriggerPin(event)) {
-        APP.store.dispatch(pinParticipant(this.id));
-    }
-};
-
 /**
  * Callback invoked when the thumbnail is clicked and potentially trigger
  * pinning of the participant.
@@ -882,8 +868,7 @@ SmallVideo.prototype._onContainerDoubleClick = function(event) {
  * @returns {void}
  */
 SmallVideo.prototype._onContainerClick = function(event) {
-    const triggerPin = this._shouldTriggerPin(event)
-        && !this._pinningRequiresDoubleClick();
+    const triggerPin = this._shouldTriggerPin(event);
 
     if (event.stopPropagation && triggerPin) {
         event.stopPropagation();
@@ -934,17 +919,6 @@ SmallVideo.prototype.togglePin = function() {
     APP.store.dispatch(pinParticipant(participantIdToPin));
 };
 
-/**
- * Returns whether or not clicking to pin the participant needs to be a double
- * click instead of a single click.
- *
- * @private
- * @returns {boolean}
- */
-SmallVideo.prototype._pinningRequiresDoubleClick = function() {
-    return shouldDisplayTileView(APP.store.getState());
-};
-
 /**
  * Removes the React element responsible for showing connection status, dominant
  * speaker, and raised hand icons.

modules/UI/videolayout/VideoLayout.js

@@ -637,7 +637,7 @@ const VideoLayout = {
      */
     onVideoMute(id, value) {
         if (APP.conference.isLocalId(id)) {
-            localVideoThumbnail.setVideoMutedView(value);
+            localVideoThumbnail && localVideoThumbnail.setVideoMutedView(value);
         } else {
             const remoteVideo = remoteVideos[id];
 
@@ -880,7 +880,7 @@ const VideoLayout = {
         const smallVideo = VideoLayout.getSmallVideo(id);
 
         if (smallVideo) {
-            smallVideo.avatarChanged(avatarUrl);
+            smallVideo.initializeAvatar();
         } else {
             logger.warn(
                 `Missed avatar update - no small video yet for ${id}`
@@ -985,7 +985,7 @@ const VideoLayout = {
         } else if (currentId) {
             const currentSmallVideo = this.getSmallVideo(currentId);
 
-            currentSmallVideo.updateView();
+            currentSmallVideo && currentSmallVideo.updateView();
         }
     },
 

package-lock.json

@@ -2840,7 +2840,7 @@
         "blueimp-md5": "^2.10.0",
         "json3": "^3.3.2",
         "lodash": "^4.17.4",
-        "ua-parser-js": "github:amplitude/ua-parser-js#ed538f16f5c6ecd8357da989b617d4f156dcf35d"
+        "ua-parser-js": "github:amplitude/ua-parser-js#ed538f1"
       },
       "dependencies": {
         "ua-parser-js": {
@@ -6750,7 +6750,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6768,11 +6769,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6785,15 +6788,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6896,7 +6902,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6906,6 +6913,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6918,17 +6926,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -6945,6 +6956,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -7017,7 +7029,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7027,6 +7040,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -7102,7 +7116,8 @@
         },
         "safe-buffer": {
           "version": "5.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -7132,6 +7147,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7149,6 +7165,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7187,11 +7204,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -8719,8 +8738,8 @@
       "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
     },
     "js-utils": {
-      "version": "github:jitsi/js-utils#73a67a7a60d52f8e895f50939c8fcbd1f20fe7b5",
-      "from": "github:jitsi/js-utils#73a67a7a60d52f8e895f50939c8fcbd1f20fe7b5",
+      "version": "github:jitsi/js-utils#192b1c996e8c05530eb1f19e82a31069c3021e31",
+      "from": "github:jitsi/js-utils#192b1c996e8c05530eb1f19e82a31069c3021e31",
       "requires": {
         "bowser": "1.9.1",
         "js-md5": "0.7.3"
@@ -8927,8 +8946,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "github:jitsi/lib-jitsi-meet#0ee30bf12a549d10bb5d559e19bd557c3ed179eb",
-      "from": "github:jitsi/lib-jitsi-meet#0ee30bf12a549d10bb5d559e19bd557c3ed179eb",
+      "version": "github:jitsi/lib-jitsi-meet#9bcc2a26cc94683b8ed302418695a331b450df97",
+      "from": "github:jitsi/lib-jitsi-meet#9bcc2a26cc94683b8ed302418695a331b450df97",
       "requires": {
         "@jitsi/sdp-interop": "0.1.14",
         "@jitsi/sdp-simulcast": "0.2.1",
@@ -12200,9 +12219,9 @@
       "integrity": "sha512-kEzgZxbbXYhy27u5GnhrKitn+XDBFAHSDUJdYC6llMi5cDPjgcqhOAQABj0K+ga5pn+/xPZLmD882rrUGiwVVA=="
     },
     "react-native-google-signin": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/react-native-google-signin/-/react-native-google-signin-1.0.2.tgz",
-      "integrity": "sha512-4HPPSecI29gX0Pu7h2E7ZYXnKO4r+6eh5f+Unm67liE1RfvCQfOqoDliPbK96Mb/91VgHwqyxi0sUEC4j54/AQ=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/react-native-google-signin/-/react-native-google-signin-2.0.0.tgz",
+      "integrity": "sha512-9loM4lcCIdbco5BnmNio7yGaXQKCpCaY1VRmYiTSvC5NjuSf6Ui6jZRee46p/YdaU4yRnS3u5Vct6Psrvr0HNg=="
     },
     "react-native-immersive": {
       "version": "2.0.0",

package.json

@@ -49,10 +49,10 @@
     "jquery-contextmenu": "2.4.5",
     "jquery-i18next": "1.2.0",
     "js-md5": "0.6.1",
-    "js-utils": "github:jitsi/js-utils#73a67a7a60d52f8e895f50939c8fcbd1f20fe7b5",
+    "js-utils": "github:jitsi/js-utils#192b1c996e8c05530eb1f19e82a31069c3021e31",
     "jsrsasign": "8.0.12",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#0ee30bf12a549d10bb5d559e19bd557c3ed179eb",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#9bcc2a26cc94683b8ed302418695a331b450df97",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.11",
     "moment": "2.19.4",
@@ -68,7 +68,7 @@
     "react-native-calendar-events": "1.6.4",
     "react-native-callstats": "3.58.2",
     "react-native-fast-image": "5.1.1",
-    "react-native-google-signin": "1.0.2",
+    "react-native-google-signin": "2.0.0",
     "react-native-immersive": "2.0.0",
     "react-native-keep-awake": "4.0.0",
     "react-native-linear-gradient": "2.5.3",

react/features/analytics/AnalyticsEvents.js

@@ -271,6 +271,18 @@ export function createInviteDialogEvent(
     };
 }
 
+/**
+ * Creates an "offer/answer failure" event.
+ *
+ * @returns {Object} The event in a format suitable for sending via
+ * sendAnalytics.
+ */
+export function createOfferAnswerFailedEvent() {
+    return {
+        action: 'offer.answer.failure'
+    };
+}
+
 /**
  * Creates a "page reload" event.
  *
@@ -551,6 +563,18 @@ export function createStartAudioOnlyEvent(audioOnly) {
     };
 }
 
+/**
+ * Creates an event which indicates the "start silent" configuration.
+ *
+ * @returns {Object} The event in a format suitable for sending via
+ * sendAnalytics.
+ */
+export function createStartSilentEvent() {
+    return {
+        action: 'start.silent'
+    };
+}
+
 /**
  * Creates an event which indicates the "start muted" configuration.
  *

react/features/app/actions.js

@@ -13,10 +13,18 @@ import {
 import { connect, disconnect, setLocationURL } from '../base/connection';
 import { loadConfig } from '../base/lib-jitsi-meet';
 import { createDesiredLocalTracks } from '../base/tracks';
-import { parseURIString, toURLString } from '../base/util';
+import {
+    getLocationContextRoot,
+    parseURIString,
+    toURLString
+} from '../base/util';
+import { showNotification } from '../notifications';
 import { setFatalError } from '../overlay';
 
-import { getDefaultURL } from './functions';
+import {
+    getDefaultURL,
+    getName
+} from './functions';
 
 const logger = require('jitsi-meet-logger').getLogger(__filename);
 
@@ -136,6 +144,34 @@ export function redirectWithStoredParams(pathname: string) {
     };
 }
 
+/**
+ * Assigns a specific pathname to window.location.pathname taking into account
+ * the context root of the Web app.
+ *
+ * @param {string} pathname - The pathname to assign to
+ * window.location.pathname. If the specified pathname is relative, the context
+ * root of the Web app will be prepended to the specified pathname before
+ * assigning it to window.location.pathname.
+ * @returns {Function}
+ */
+export function redirectToStaticPage(pathname: string) {
+    return () => {
+        const windowLocation = window.location;
+        let newPathname = pathname;
+
+        if (!newPathname.startsWith('/')) {
+            // A pathname equal to ./ specifies the current directory. It will be
+            // fine but pointless to include it because contextRoot is the current
+            // directory.
+            newPathname.startsWith('./')
+            && (newPathname = newPathname.substring(2));
+            newPathname = getLocationContextRoot(windowLocation) + newPathname;
+        }
+
+        windowLocation.pathname = newPathname;
+    };
+}
+
 /**
  * Reloads the page.
  *
@@ -182,3 +218,58 @@ export function reloadWithStoredParams() {
         }
     };
 }
+
+/**
+ * Check if the welcome page is enabled and redirects to it.
+ * If requested show a thank you dialog before that.
+ * If we have a close page enabled, redirect to it without
+ * showing any other dialog.
+ *
+ * @param {Object} options - Used to decide which particular close page to show
+ * or if close page is disabled, whether we should show the thankyou dialog.
+ * @param {boolean} options.showThankYou - Whether we should
+ * show thank you dialog.
+ * @param {boolean} options.feedbackSubmitted - Whether feedback was submitted.
+ * @returns {Function}
+ */
+export function maybeRedirectToWelcomePage(options: Object = {}) {
+    return (dispatch: Dispatch<any>, getState: Function) => {
+
+        const {
+            enableClosePage
+        } = getState()['features/base/config'];
+
+        // if close page is enabled redirect to it, without further action
+        if (enableClosePage) {
+            const { isGuest } = getState()['features/base/jwt'];
+
+            // save whether current user is guest or not, before navigating
+            // to close page
+            window.sessionStorage.setItem('guest', isGuest);
+
+            dispatch(redirectToStaticPage(`static/${
+                options.feedbackSubmitted ? 'close.html' : 'close2.html'}`));
+
+            return;
+        }
+
+        // else: show thankYou dialog only if there is no feedback
+        if (options.showThankYou) {
+            dispatch(showNotification({
+                titleArguments: { appName: getName() },
+                titleKey: 'dialog.thankYou'
+            }));
+        }
+
+        // if Welcome page is enabled redirect to welcome page after 3 sec, if
+        // there is a thank you message to be shown, 0.5s otherwise.
+        if (getState()['features/base/config'].enableWelcomePage) {
+            setTimeout(
+                () => {
+                    dispatch(redirectWithStoredParams('/'));
+                },
+                options.showThankYou ? 3000 : 500);
+        }
+    };
+}
+

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

@@ -6,12 +6,14 @@ import '../../analytics';
 import '../../authentication';
 import { setColorScheme } from '../../base/color-scheme';
 import { DialogContainer } from '../../base/dialog';
+import { updateFlags } from '../../base/flags';
 import '../../base/jwt';
 import { Platform } from '../../base/react';
 import {
     AspectRatioDetector,
     ReducedUIDetector
 } from '../../base/responsive-ui';
+import { updateSettings } from '../../base/settings';
 import '../../google-api';
 import '../../mobile/audio-mode';
 import '../../mobile/background';
@@ -47,18 +49,14 @@ type Props = AbstractAppProps & {
     externalAPIScope: string,
 
     /**
-     * Whether Picture-in-Picture is enabled. If {@code true}, a toolbar button
-     * is rendered in the {@link Conference} view to afford entering
-     * Picture-in-Picture.
+     * An object with the feature flags.
      */
-    pictureInPictureEnabled: boolean,
+    flags: Object,
 
     /**
-     * Whether the Welcome page is enabled. If {@code true}, the Welcome page is
-     * rendered when the {@link App} is not at a location (URL) identifying
-     * a Jitsi Meet conference/room.
+     * An object with user information (display name, email, avatar URL).
      */
-    welcomePageEnabled: boolean
+    userInfo: ?Object
 };
 
 /**
@@ -96,9 +94,12 @@ export class App extends AbstractApp {
         super.componentDidMount();
 
         this._init.then(() => {
-            // We set the color scheme early enough so then we avoid any
-            // unnecessary re-renders.
-            this.state.store.dispatch(setColorScheme(this.props.colorScheme));
+            // We set these early enough so then we avoid any unnecessary re-renders.
+            const { dispatch } = this.state.store;
+
+            dispatch(setColorScheme(this.props.colorScheme));
+            dispatch(updateFlags(this.props.flags));
+            dispatch(updateSettings(this.props.userInfo || {}));
         });
     }
 

react/features/app/getRouteToRender.js

@@ -4,9 +4,8 @@ import { generateRoomWithoutSeparator } from 'js-utils/random';
 import type { Component } from 'react';
 
 import { isRoomValid } from '../base/conference';
-import JitsiMeetJS from '../base/lib-jitsi-meet';
-import { Platform } from '../base/react';
 import { toState } from '../base/redux';
+import { isSupportedBrowser } from '../base/environment';
 import { Conference } from '../conference';
 import { getDeepLinkingPage } from '../deep-linking';
 import { UnsupportedDesktopBrowser } from '../unsupported-browser';
@@ -40,69 +39,109 @@ export type Route = {
  */
 export function _getRouteToRender(stateful: Function | Object): Promise<Route> {
     const state = toState(stateful);
-    const { room } = state['features/base/conference'];
-    const isMobileApp = navigator.product === 'ReactNative';
-    const isMobileBrowser
-        = !isMobileApp && (Platform.OS === 'android' || Platform.OS === 'ios');
-    const route: Route = {
+
+    if (navigator.product === 'ReactNative') {
+        return _getMobileRoute(state);
+    }
+
+    return _getWebConferenceRoute(state) || _getWebWelcomePageRoute(state);
+}
+
+/**
+ * Returns the {@code Route} to display on the React Native app.
+ *
+ * @param {Object} state - The redux state.
+ * @returns {Promise<Route>}
+ */
+function _getMobileRoute(state): Promise<Route> {
+    const route = _getEmptyRoute();
+
+    if (isRoomValid(state['features/base/conference'].room)) {
+        route.component = Conference;
+    } else if (isWelcomePageAppEnabled(state)) {
+        route.component = WelcomePage;
+    } else {
+        route.component = BlankPage;
+    }
+
+    return Promise.resolve(route);
+}
+
+/**
+ * Returns the {@code Route} to display when trying to access a conference if
+ * a valid conference is being joined.
+ *
+ * @param {Object} state - The redux state.
+ * @returns {Promise<Route>|undefined}
+ */
+function _getWebConferenceRoute(state): ?Promise<Route> {
+    if (!isRoomValid(state['features/base/conference'].room)) {
+        return;
+    }
+
+    const route = _getEmptyRoute();
+
+    // Update the location if it doesn't match. This happens when a room is
+    // joined from the welcome page. The reason for doing this instead of using
+    // the history API is that we want to load the config.js which takes the
+    // room into account.
+    const { locationURL } = state['features/base/connection'];
+
+    if (window.location.href !== locationURL.href) {
+        route.href = locationURL.href;
+
+        return Promise.resolve(route);
+    }
+
+    return getDeepLinkingPage(state)
+        .then(deepLinkComponent => {
+            if (deepLinkComponent) {
+                route.component = deepLinkComponent;
+            } else if (isSupportedBrowser()) {
+                route.component = Conference;
+            } else {
+                route.component = UnsupportedDesktopBrowser;
+            }
+
+            return route;
+        });
+}
+
+/**
+ * Returns the {@code Route} to display when trying to access the welcome page.
+ *
+ * @param {Object} state - The redux state.
+ * @returns {Promise<Route>}
+ */
+function _getWebWelcomePageRoute(state): Promise<Route> {
+    const route = _getEmptyRoute();
+
+    if (isWelcomePageUserEnabled(state)) {
+        if (isSupportedBrowser()) {
+            route.component = WelcomePage;
+        } else {
+            route.component = UnsupportedDesktopBrowser;
+        }
+    } else {
+        // Web: if the welcome page is disabled, go directly to a random room.
+
+        let href = window.location.href;
+
+        href.endsWith('/') || (href += '/');
+        route.href = href + generateRoomWithoutSeparator();
+    }
+
+    return Promise.resolve(route);
+}
+
+/**
+ * Returns the default {@code Route}.
+ *
+ * @returns {Route}
+ */
+function _getEmptyRoute(): Route {
+    return {
         component: BlankPage,
         href: undefined
     };
-
-    return new Promise(resolve => {
-        // First, check if the current endpoint supports WebRTC. We are
-        // intentionally not performing the check for mobile browsers because:
-        // - the WelcomePage is mobile ready;
-        // - if the URL points to a conference, getDeepLinkingPage will take
-        //   care of it.
-        if (!isMobileBrowser && !JitsiMeetJS.isWebRtcSupported()) {
-            route.component = UnsupportedDesktopBrowser;
-            resolve(route);
-
-            return;
-        }
-
-        if (isRoomValid(room)) {
-            if (isMobileApp) {
-                route.component = Conference;
-                resolve(route);
-            } else {
-                // Update the location if it doesn't match. This happens when a
-                // room is joined from the welcome page. The reason for doing
-                // this instead of using the history API is that we want to load
-                // the config.js which takes the room into account.
-                const { locationURL } = state['features/base/connection'];
-
-                // eslint-disable-next-line no-negated-condition
-                if (window.location.href !== locationURL.href) {
-                    route.href = locationURL.href;
-                    resolve(route);
-                } else {
-                    // Maybe show deep-linking, otherwise go to Conference.
-                    getDeepLinkingPage(state).then(component => {
-                        route.component = component || Conference;
-                        resolve(route);
-                    });
-                }
-            }
-
-            return;
-        }
-
-        if (!isWelcomePageUserEnabled(state)) {
-            // Web: if the welcome page is disabled, go directly to a random
-            // room.
-
-            let href = window.location.href;
-
-            href.endsWith('/') || (href += '/');
-            route.href = href + generateRoomWithoutSeparator();
-        } else if (isWelcomePageAppEnabled(state)) {
-            // Mobile: only go to the welcome page if enabled.
-
-            route.component = WelcomePage;
-        }
-
-        resolve(route);
-    });
 }

react/features/base/avatar/components/AbstractAvatar.js

@@ -0,0 +1,177 @@
+// @flow
+
+import { PureComponent } from 'react';
+
+import { getParticipantById } from '../../participants';
+
+import { getAvatarColor, getInitials } from '../functions';
+
+export type Props = {
+
+    /**
+     * The string we base the initials on (this is generated from a list of precendences).
+     */
+    _initialsBase: ?string,
+
+    /**
+     * An URL that we validated that it can be loaded.
+     */
+    _loadableAvatarUrl: ?string,
+
+    /**
+     * A string to override the initials to generate a color of. This is handy if you don't want to make
+     * the background color match the string that the initials are generated from.
+     */
+    colorBase?: string,
+
+    /**
+     * Display name of the entity to render an avatar for (if any). This is handy when we need
+     * an avatar for a non-participasnt entity (e.g. a recent list item).
+     */
+    displayName?: string,
+
+    /**
+     * The ID of the participant to render an avatar for (if it's a participant avatar).
+     */
+    participantId?: string,
+
+    /**
+     * The size of the avatar.
+     */
+    size: number,
+
+    /**
+     * URI of the avatar, if any.
+     */
+    uri: ?string,
+}
+
+type State = {
+    avatarFailed: boolean
+}
+
+export const DEFAULT_SIZE = 65;
+
+/**
+ * Implements an abstract class to render avatars in the app.
+ */
+export default class AbstractAvatar<P: Props> extends PureComponent<P, State> {
+    /**
+     * Instantiates a new {@code Component}.
+     *
+     * @inheritdoc
+     */
+    constructor(props: P) {
+        super(props);
+
+        this.state = {
+            avatarFailed: false
+        };
+
+        this._onAvatarLoadError = this._onAvatarLoadError.bind(this);
+    }
+
+    /**
+     * Implements {@code Component#componentDidUpdate}.
+     *
+     * @inheritdoc
+     */
+    componentDidUpdate(prevProps: P) {
+        if (prevProps.uri !== this.props.uri) {
+
+            // URI changed, so we need to try to fetch it again.
+            // Eslint doesn't like this statement, but based on the React doc, it's safe if it's
+            // wrapped in a condition: https://reactjs.org/docs/react-component.html#componentdidupdate
+
+            // eslint-disable-next-line react/no-did-update-set-state
+            this.setState({
+                avatarFailed: false
+            });
+        }
+    }
+
+    /**
+     * Implements {@code Componenr#render}.
+     *
+     * @inheritdoc
+     */
+    render() {
+        const {
+            _initialsBase,
+            _loadableAvatarUrl,
+            colorBase,
+            uri
+        } = this.props;
+        const { avatarFailed } = this.state;
+
+        // _loadableAvatarUrl is validated that it can be loaded, but uri (if present) is not, so
+        // we still need to do a check for that. And an explicitly provided URI is higher priority than
+        // an avatar URL anyhow.
+        if ((uri && !avatarFailed) || _loadableAvatarUrl) {
+            return this._renderURLAvatar((!avatarFailed && uri) || _loadableAvatarUrl);
+        }
+
+        const _initials = getInitials(_initialsBase);
+
+        if (_initials) {
+            return this._renderInitialsAvatar(_initials, getAvatarColor(colorBase || _initialsBase));
+        }
+
+        return this._renderDefaultAvatar();
+    }
+
+    _onAvatarLoadError: () => void;
+
+    /**
+     * Callback to handle the error while loading of the avatar URI.
+     *
+     * @returns {void}
+     */
+    _onAvatarLoadError() {
+        this.setState({
+            avatarFailed: true
+        });
+    }
+
+    /**
+     * Function to render the actual, platform specific default avatar component.
+     *
+     * @returns {React$Element<*>}
+     */
+    _renderDefaultAvatar: () => React$Element<*>
+
+    /**
+     * Function to render the actual, platform specific initials-based avatar component.
+     *
+     * @param {string} initials - The initials to use.
+     * @param {string} color - The color to use.
+     * @returns {React$Element<*>}
+     */
+    _renderInitialsAvatar: (string, string) => React$Element<*>
+
+    /**
+     * Function to render the actual, platform specific URL-based avatar component.
+     *
+     * @param {string} uri - The URI of the avatar.
+     * @returns {React$Element<*>}
+     */
+    _renderURLAvatar: ?string => React$Element<*>
+}
+
+/**
+ * Maps part of the Redux state to the props of this component.
+ *
+ * @param {Object} state - The Redux state.
+ * @param {Props} ownProps - The own props of the component.
+ * @returns {Props}
+ */
+export function _mapStateToProps(state: Object, ownProps: Props) {
+    const { displayName, participantId } = ownProps;
+    const _participant = participantId && getParticipantById(state, participantId);
+    const _initialsBase = (_participant && (_participant.name || _participant.email)) || displayName;
+
+    return {
+        _initialsBase,
+        _loadableAvatarUrl: _participant && _participant.loadableAvatarUrl
+    };
+}

react/features/base/avatar/components/index.native.js

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

react/features/base/avatar/components/index.web.js

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

react/features/base/avatar/components/native/Avatar.js

@@ -0,0 +1,106 @@
+// @flow
+
+import React from 'react';
+import { Image, Text, View } from 'react-native';
+
+import { connect } from '../../../redux';
+import { type StyleType } from '../../../styles';
+
+import AbstractAvatar, {
+    _mapStateToProps,
+    type Props as AbstractProps,
+    DEFAULT_SIZE
+} from '../AbstractAvatar';
+
+import RemoteAvatar, { DEFAULT_AVATAR } from './RemoteAvatar';
+import styles from './styles';
+
+type Props = AbstractProps & {
+
+    /**
+     * External style of the component.
+     */
+    style?: StyleType
+}
+
+/**
+ * Implements an avatar component that has 4 ways to render an avatar:
+ *
+ * - Based on an explicit avatar URI, if provided
+ * - Gravatar, if there is any
+ * - Based on initials generated from name or email
+ * - Default avatar icon, if any of the above fails
+ */
+class Avatar extends AbstractAvatar<Props> {
+
+    _onAvatarLoadError: () => void;
+
+    /**
+     * Implements {@code AbstractAvatar#_renderDefaultAvatar}.
+     *
+     * @inheritdoc
+     */
+    _renderDefaultAvatar() {
+        return this._wrapAvatar(
+            <Image
+                source = { DEFAULT_AVATAR }
+                style = { [
+                    styles.avatarContent(this.props.size || DEFAULT_SIZE),
+                    styles.staticAvatar
+                ] } />
+        );
+    }
+
+    /**
+     * Implements {@code AbstractAvatar#_renderGravatar}.
+     *
+     * @inheritdoc
+     */
+    _renderInitialsAvatar(initials, color) {
+        return this._wrapAvatar(
+            <View
+                style = { [
+                    styles.initialsContainer,
+                    {
+                        backgroundColor: color
+                    }
+                ] }>
+                <Text style = { styles.initialsText(this.props.size || DEFAULT_SIZE) }> { initials } </Text>
+            </View>
+        );
+    }
+
+    /**
+     * Implements {@code AbstractAvatar#_renderGravatar}.
+     *
+     * @inheritdoc
+     */
+    _renderURLAvatar(uri) {
+        return this._wrapAvatar(
+            <RemoteAvatar
+                onError = { this._onAvatarLoadError }
+                size = { this.props.size || DEFAULT_SIZE }
+                uri = { uri } />
+        );
+    }
+
+    /**
+     * Wraps an avatar into a common wrapper.
+     *
+     * @param {React#Component} avatar - The avatar component.
+     * @returns {React#Component}
+     */
+    _wrapAvatar(avatar) {
+        return (
+            <View
+                style = { [
+                    styles.avatarContainer(this.props.size || DEFAULT_SIZE),
+                    this.props.style
+                ] }>
+                { avatar }
+            </View>
+        );
+    }
+}
+
+export default connect(_mapStateToProps)(Avatar);

react/features/base/avatar/components/native/RemoteAvatar.js

@@ -0,0 +1,50 @@
+// @flow
+
+import React, { PureComponent } from 'react';
+import { Image } from 'react-native';
+
+import styles from './styles';
+
+export const DEFAULT_AVATAR = require('../../../../../../images/avatar.png');
+
+type Props = {
+
+    /**
+     * Callback for load errors.
+     */
+    onError: Function,
+
+    /**
+     * Size of the avatar.
+     */
+    size: number,
+
+    /**
+     * URI of the avatar to load.
+     */
+    uri: string
+};
+
+/**
+ * Implements a private class that is used to fetch and render remote avatars based on an URI.
+ */
+export default class RemoteAvatar extends PureComponent<Props> {
+
+    /**
+     * Implements {@code Component#render}.
+     *
+     * @inheritdoc
+     */
+    render() {
+        const { onError, size, uri } = this.props;
+
+        return (
+            <Image
+                defaultSource = { DEFAULT_AVATAR }
+                onError = { onError }
+                resizeMode = 'cover'
+                source = {{ uri }}
+                style = { styles.avatarContent(size) } />
+        );
+    }
+}

react/features/base/avatar/components/native/index.js

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

react/features/base/avatar/components/native/styles.js

@@ -0,0 +1,47 @@
+// @flow
+
+import { ColorPalette } from '../../../styles';
+
+/**
+ * The styles of the feature base/participants.
+ */
+export default {
+
+    avatarContainer: (size: number) => {
+        return {
+            alignItems: 'center',
+            borderRadius: size / 2,
+            height: size,
+            justifyContent: 'center',
+            overflow: 'hidden',
+            width: size
+        };
+    },
+
+    avatarContent: (size: number) => {
+        return {
+            height: size,
+            width: size
+        };
+    },
+
+    initialsContainer: {
+        alignItems: 'center',
+        alignSelf: 'stretch',
+        flex: 1,
+        justifyContent: 'center'
+    },
+
+    initialsText: (size: number) => {
+        return {
+            color: 'rgba(255, 255, 255, 0.6)',
+            fontSize: size * 0.5,
+            fontWeight: '100'
+        };
+    },
+
+    staticAvatar: {
+        backgroundColor: ColorPalette.lightGrey,
+        opacity: 0.4
+    }
+};

react/features/base/avatar/components/web/Avatar.js

@@ -0,0 +1,98 @@
+// @flow
+
+import React from 'react';
+
+import { connect } from '../../../redux';
+
+import AbstractAvatar, {
+    _mapStateToProps,
+    type Props as AbstractProps
+} from '../AbstractAvatar';
+
+type Props = AbstractProps & {
+    className?: string,
+    id: string
+};
+
+/**
+ * Implements an avatar as a React/Web {@link Component}.
+ */
+class Avatar extends AbstractAvatar<Props> {
+    /**
+     * Constructs a style object to be used on the avatars.
+     *
+     * @param {string?} color - The desired background color.
+     * @returns {Object}
+     */
+    _getAvatarStyle(color) {
+        const { size } = this.props;
+
+        return {
+            backgroundColor: color || undefined,
+            fontSize: size ? size * 0.5 : '180%',
+            height: size || '100%',
+            width: size || '100%'
+        };
+    }
+
+    /**
+     * Constructs a list of class names required for the avatar component.
+     *
+     * @param {string} additional - Any additional class to add.
+     * @returns {string}
+     */
+    _getAvatarClassName(additional) {
+        return `avatar ${additional || ''} ${this.props.className || ''}`;
+    }
+
+    _onAvatarLoadError: () => void;
+
+    /**
+     * Implements {@code AbstractAvatar#_renderDefaultAvatar}.
+     *
+     * @inheritdoc
+     */
+    _renderDefaultAvatar() {
+        return (
+            <img
+                className = { this._getAvatarClassName('defaultAvatar') }
+                id = { this.props.id }
+                src = '/images/avatar.png'
+                style = { this._getAvatarStyle() } />
+        );
+    }
+
+    /**
+     * Implements {@code AbstractAvatar#_renderGravatar}.
+     *
+     * @inheritdoc
+     */
+    _renderInitialsAvatar(initials, color) {
+        return (
+            <div
+                className = { this._getAvatarClassName() }
+                id = { this.props.id }
+                style = { this._getAvatarStyle(color) }>
+                { initials }
+            </div>
+        );
+    }
+
+    /**
+     * Implements {@code AbstractAvatar#_renderGravatar}.
+     *
+     * @inheritdoc
+     */
+    _renderURLAvatar(uri) {
+        return (
+            <img
+                className = { this._getAvatarClassName() }
+                id = { this.props.id }
+                onError = { this._onAvatarLoadError }
+                src = { uri }
+                style = { this._getAvatarStyle() } />
+        );
+    }
+}
+
+export default connect(_mapStateToProps)(Avatar);

react/features/base/avatar/components/web/index.js

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

react/features/base/avatar/functions.js

@@ -0,0 +1,54 @@
+// @flow
+
+import _ from 'lodash';
+
+const AVATAR_COLORS = [
+    '232, 105, 156',
+    '255, 198, 115',
+    '128, 128, 255',
+    '105, 232, 194',
+    '234, 255, 128'
+];
+
+const AVATAR_OPACITY = 0.4;
+
+/**
+ * Generates the background color of an initials based avatar.
+ *
+ * @param {string?} initials - The initials of the avatar.
+ * @returns {string}
+ */
+export function getAvatarColor(initials: ?string) {
+    let colorIndex = 0;
+
+    if (initials) {
+        let nameHash = 0;
+
+        for (const s of initials) {
+            nameHash += s.codePointAt(0);
+        }
+
+        colorIndex = nameHash % AVATAR_COLORS.length;
+    }
+
+    return `rgba(${AVATAR_COLORS[colorIndex]}, ${AVATAR_OPACITY})`;
+}
+
+/**
+ * Generates initials for a simple string.
+ *
+ * @param {string?} s - The string to generate initials for.
+ * @returns {string?}
+ */
+export function getInitials(s: ?string) {
+    // We don't want to use the domain part of an email address, if it is one
+    const initialsBasis = _.split(s, '@')[0];
+    const words = _.words(initialsBasis);
+    let initials = '';
+
+    for (const w of words) {
+        (initials.length < 2) && (initials += w.substr(0, 1).toUpperCase());
+    }
+
+    return initials;
+}

react/features/base/avatar/index.js

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

react/features/base/conference/actions.js

@@ -14,6 +14,8 @@ import {
     dominantSpeakerChanged,
     getNormalizedDisplayName,
     participantConnectionStatusChanged,
+    participantKicked,
+    participantMutedUs,
     participantPresenceChanged,
     participantRoleChanged,
     participantUpdated
@@ -89,7 +91,11 @@ function _addConferenceListeners(conference, dispatch) {
 
     conference.on(
         JitsiConferenceEvents.KICKED,
-        () => dispatch(kickedOut(conference)));
+        (...args) => dispatch(kickedOut(conference, ...args)));
+
+    conference.on(
+        JitsiConferenceEvents.PARTICIPANT_KICKED,
+        (kicker, kicked) => dispatch(participantKicked(kicker, kicked)));
 
     conference.on(
         JitsiConferenceEvents.LOCK_STATE_CHANGED,
@@ -129,6 +135,14 @@ function _addConferenceListeners(conference, dispatch) {
         JitsiConferenceEvents.TRACK_REMOVED,
         t => t && !t.isLocal() && dispatch(trackRemoved(t)));
 
+    conference.on(
+        JitsiConferenceEvents.TRACK_MUTE_CHANGED,
+        (_, participantThatMutedUs) => {
+            if (participantThatMutedUs) {
+                dispatch(participantMutedUs(participantThatMutedUs));
+            }
+        });
+
     // Dispatches into features/base/participants follow:
     conference.on(
         JitsiConferenceEvents.DISPLAY_NAME_CHANGED,
@@ -432,15 +446,19 @@ export function dataChannelOpened() {
  *
  * @param {JitsiConference} conference - The {@link JitsiConference} instance
  * for which the event is being signaled.
+ * @param {JitsiParticipant} participant - The {@link JitsiParticipant}
+ * instance which initiated the kick event.
  * @returns {{
  *     type: KICKED_OUT,
- *     conference: JitsiConference
+ *     conference: JitsiConference,
+ *     participant: JitsiParticipant
  * }}
  */
-export function kickedOut(conference: Object) {
+export function kickedOut(conference: Object, participant: Object) {
     return {
         type: KICKED_OUT,
-        conference
+        conference,
+        participant
     };
 }
 

react/features/base/conference/middleware.js

@@ -6,10 +6,12 @@ import {
     ACTION_UNPINNED,
     createAudioOnlyChangedEvent,
     createConnectionEvent,
+    createOfferAnswerFailedEvent,
     createPinnedEvent,
     sendAnalytics
 } from '../../analytics';
 import { CONNECTION_ESTABLISHED, CONNECTION_FAILED } from '../connection';
+import { JitsiConferenceErrors } from '../lib-jitsi-meet';
 import { setVideoMuted, VIDEO_MUTISM_AUTHORITY } from '../media';
 import {
     getLocalParticipant,
@@ -152,6 +154,12 @@ StateListenerRegistry.register(
 function _conferenceFailed(store, next, action) {
     const result = next(action);
 
+    const { conference, error } = action;
+
+    if (error.name === JitsiConferenceErrors.OFFER_ANSWER_FAILED) {
+        sendAnalytics(createOfferAnswerFailedEvent());
+    }
+
     // FIXME: Workaround for the web version. Currently, the creation of the
     // conference is handled by /conference.js and appropriate failure handlers
     // are set there.
@@ -165,8 +173,6 @@ function _conferenceFailed(store, next, action) {
     }
 
     // XXX After next(action), it is clear whether the error is recoverable.
-    const { conference, error } = action;
-
     !error.recoverable
         && conference
         && conference.leave().catch(reason => {

react/features/base/conference/reducer.js

@@ -213,7 +213,8 @@ function _conferenceJoined(state, { conference }) {
     // i.e. password-protected is private to lib-jitsi-meet. However, the
     // library does not fire LOCK_STATE_CHANGED upon joining a JitsiConference
     // with a password.
-    const locked = conference.room.locked ? LOCKED_REMOTELY : undefined;
+    // FIXME Technically JitsiConference.room is a private field.
+    const locked = conference.room && conference.room.locked ? LOCKED_REMOTELY : undefined;
 
     return assign(state, {
         authRequired: undefined,

react/features/base/devices/middleware.js

@@ -28,14 +28,12 @@ const JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP = {
     microphone: {
         [JitsiTrackErrors.CONSTRAINT_FAILED]: 'dialog.micConstraintFailedError',
         [JitsiTrackErrors.GENERAL]: 'dialog.micUnknownError',
-        [JitsiTrackErrors.NO_DATA_FROM_SOURCE]: 'dialog.micNotSendingData',
         [JitsiTrackErrors.NOT_FOUND]: 'dialog.micNotFoundError',
         [JitsiTrackErrors.PERMISSION_DENIED]: 'dialog.micPermissionDeniedError'
     },
     camera: {
         [JitsiTrackErrors.CONSTRAINT_FAILED]: 'dialog.cameraConstraintFailedError',
         [JitsiTrackErrors.GENERAL]: 'dialog.cameraUnknownError',
-        [JitsiTrackErrors.NO_DATA_FROM_SOURCE]: 'dialog.cameraNotSendingData',
         [JitsiTrackErrors.NOT_FOUND]: 'dialog.cameraNotFoundError',
         [JitsiTrackErrors.PERMISSION_DENIED]: 'dialog.cameraPermissionDeniedError',
         [JitsiTrackErrors.UNSUPPORTED_RESOLUTION]: 'dialog.cameraUnsupportedResolutionError'

react/features/base/dialog/components/native/BottomSheet.js

@@ -61,7 +61,9 @@ class BottomSheet extends PureComponent<Props> {
                             styles.sheetItemContainer,
                             _styles.sheet
                         ] }>
-                        <ScrollView bounces = { false }>
+                        <ScrollView
+                            bounces = { false }
+                            showsVerticalScrollIndicator = { false }>
                             { this._getWrappedContent() }
                         </ScrollView>
                     </View>

react/features/base/environment/environment.js

@@ -0,0 +1,109 @@
+// @flow
+
+import JitsiMeetJS from '../lib-jitsi-meet';
+import { Platform } from '../react';
+
+const { browser } = JitsiMeetJS.util;
+
+const DEFAULT_OPTIMAL_BROWSERS = [
+    'chrome',
+    'electron',
+    'firefox',
+    'nwjs'
+];
+
+const DEFAULT_UNSUPPORTED_BROWSERS = [];
+
+const browserNameToCheck = {
+    chrome: browser.isChrome.bind(browser),
+    chromium: browser.isChromiumBased.bind(browser),
+    edge: browser.isEdge.bind(browser),
+    electron: browser.isElectron.bind(browser),
+    firefox: browser.isFirefox.bind(browser),
+    nwjs: browser.isNWJS.bind(browser),
+    opera: browser.isOpera.bind(browser),
+    safari: browser.isSafari.bind(browser)
+};
+
+declare var interfaceConfig: Object;
+
+/**
+ * Returns whether or not jitsi is optimized and targeted for the  provided
+ * browser name.
+ *
+ * @param {string} browserName - The name of the browser to check.
+ * @returns {boolean}
+ */
+export function isBrowsersOptimal(browserName: string) {
+    return (interfaceConfig.OPTIMAL_BROWSERS || DEFAULT_OPTIMAL_BROWSERS)
+        .includes(browserName);
+}
+
+/**
+ * Returns whether or not the current browser or the list of passed in browsers
+ * is considered suboptimal. Suboptimal means it is a supported browser but has
+ * not been explicitly listed as being optimal, possibly due to functionality
+ * issues.
+ *
+ * @param {Array<string>} [browsers] - A list of browser names to check. Will
+ * default to a whitelist.
+ * @returns {boolean}
+ */
+export function isSuboptimalBrowser() {
+    const optimalBrowsers
+        = interfaceConfig.OPTIMAL_BROWSERS || DEFAULT_OPTIMAL_BROWSERS;
+
+    return !_isCurrentBrowserInList(optimalBrowsers) && isSupportedBrowser();
+}
+
+/**
+ * Returns whether or not the current browser should allow the app to display.
+ * A supported browser is assumed to be able to support WebRtc.
+ *
+ * @returns {boolean}
+ */
+export function isSupportedBrowser() {
+    if (navigator.product === 'ReactNative') {
+        return false;
+    }
+
+    // Blacklists apply to desktop browsers only right now.
+    if (!_isMobileBrowser() && _isCurrentBrowserInList(
+        interfaceConfig.UNSUPPORTED_BROWSERS || DEFAULT_UNSUPPORTED_BROWSERS
+    )) {
+        return false;
+    }
+
+    // We are intentionally allow mobile browsers because:
+    // - the WelcomePage is mobile ready;
+    // - if the URL points to a conference then deep-linking will take
+    //   care of it.
+    return _isMobileBrowser() || JitsiMeetJS.isWebRtcSupported();
+}
+
+/**
+ * Runs various browser checks to know if the current browser is found within
+ * the list.
+ *
+ * @param {Array<string>} list - Browser names to check. The names should be
+ * keys in {@link browserNameToCheck}.
+ * @private
+ * @returns {boolean}
+ */
+function _isCurrentBrowserInList(list) {
+    return Boolean(list.find(browserName => {
+        const checkFunction = browserNameToCheck[browserName];
+
+        return checkFunction ? checkFunction.call(browser) : false;
+    }));
+}
+
+/**
+ * Returns whether or not the current environment is a mobile device.
+ *
+ * @private
+ * @returns {boolean}
+ */
+function _isMobileBrowser() {
+    return Platform.OS === 'android' || Platform.OS === 'ios';
+}

react/features/base/environment/index.js

@@ -0,0 +1 @@
+export * from './environment';

react/features/base/flags/actionTypes.js

@@ -0,0 +1,10 @@
+/**
+ * The type of Redux action which updates the feature flags.
+ *
+ * {
+ *     type: UPDATE_FLAGS,
+ *     flags: Object
+ * }
+ *
+ */
+export const UPDATE_FLAGS = 'UPDATE_FLAGS';

react/features/base/flags/actions.js

@@ -0,0 +1,19 @@
+// @flow
+
+import { UPDATE_FLAGS } from './actionTypes';
+
+/**
+ * Updates the current features flags with the given ones. They will be merged.
+ *
+ * @param {Object} flags - The new flags object.
+ * @returns {{
+ *     type: UPDATE_FLAGS,
+ *     flags: Object
+ * }}
+ */
+export function updateFlags(flags: Object) {
+    return {
+        type: UPDATE_FLAGS,
+        flags
+    };
+}

react/features/base/flags/constants.js

@@ -0,0 +1,31 @@
+// @flow
+
+/**
+ * Flag indicating if calendar integration should be enabled.
+ * Default: enabled (true) on Android, auto-detected on iOS.
+ */
+export const CALENDAR_ENABLED = 'calendar.enabled';
+
+/**
+ * Flag indicating if chat should be enabled.
+ * Default: enabled (true).
+ */
+export const CHAT_ENABLED = 'chat.enabled';
+
+/**
+ * Flag indicating if recording should be enabled in iOS.
+ * Default: disabled (false).
+ */
+export const IOS_RECORDING_ENABLED = 'ios.recording.enabled';
+
+/**
+ * Flag indicating if Picture-in-Picture should be enabled.
+ * Default: auto-detected.
+ */
+export const PIP_ENABLED = 'pip.enabled';
+
+/**
+ * Flag indicating if the welcome page should be enabled.
+ * Default: disabled (false).
+ */
+export const WELCOME_PAGE_ENABLED = 'welcomepage.enabled';

react/features/base/flags/functions.js

@@ -0,0 +1,32 @@
+// @flow
+
+import { getAppProp } from '../app';
+import { toState } from '../redux';
+
+/**
+ * Gets the value of a specific feature flag.
+ *
+ * @param {Function|Object} stateful - The redux store or {@code getState}
+ * function.
+ * @param {string} flag - The name of the React {@code Component} prop of
+ * the currently mounted {@code App} to get.
+ * @param {*} defaultValue - A default value for the flag, in case it's not defined.
+ * @returns {*} The value of the specified React {@code Compoennt} prop of the
+ * currently mounted {@code App}.
+ */
+export function getFeatureFlag(stateful: Function | Object, flag: string, defaultValue: any) {
+    const state = toState(stateful)['features/base/flags'];
+
+    if (state) {
+        const value = state[flag];
+
+        if (typeof value !== 'undefined') {
+            return value;
+        }
+    }
+
+    // Maybe the value hasn't made it to the redux store yet, check the app props.
+    const flags = getAppProp(stateful, 'flags') || {};
+
+    return flags[flag] || defaultValue;
+}

react/features/base/flags/index.js

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

react/features/base/flags/reducer.js

@@ -0,0 +1,33 @@
+// @flow
+
+import _ from 'lodash';
+
+import { ReducerRegistry } from '../redux';
+
+import { UPDATE_FLAGS } from './actionTypes';
+
+/**
+ * Default state value for the feature flags.
+ */
+const DEFAULT_STATE = {};
+
+/**
+ * Reduces redux actions which handle feature flags.
+ *
+ * @param {State} state - The current redux state.
+ * @param {Action} action - The redux action to reduce.
+ * @param {string} action.type - The type of the redux action to reduce.
+ * @returns {State} The next redux state that is the result of reducing the
+ * specified action.
+ */
+ReducerRegistry.register('features/base/flags', (state = DEFAULT_STATE, action) => {
+    switch (action.type) {
+    case UPDATE_FLAGS: {
+        const newState = _.merge({}, state, action.flags);
+
+        return _.isEqual(state, newState) ? state : newState;
+    }
+    }
+
+    return state;
+});

react/features/base/lib-jitsi-meet/functions.js

@@ -70,6 +70,7 @@ export function isFatalJitsiConferenceError(error: Object | string) {
     return (
         error === JitsiConferenceErrors.FOCUS_DISCONNECTED
             || error === JitsiConferenceErrors.FOCUS_LEFT
+            || error === JitsiConferenceErrors.OFFER_ANSWER_FAILED
             || error === JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE);
 }
 

react/features/base/participants/actionTypes.js

@@ -1,3 +1,5 @@
+// @flow
+
 /**
  * Create an action for when dominant speaker changes.
  *
@@ -65,6 +67,18 @@ export const PARTICIPANT_ID_CHANGED = 'PARTICIPANT_ID_CHANGED';
  */
 export const PARTICIPANT_JOINED = 'PARTICIPANT_JOINED';
 
+/**
+ * Action to signal that a participant has been removed from a conference by
+ * another participant.
+ *
+ * {
+ *     type: PARTICIPANT_KICKED,
+ *     kicked: Object,
+ *     kicker: Object
+ * }
+ */
+export const PARTICIPANT_KICKED = 'PARTICIPANT_KICKED';
+
 /**
  * Action to handle case when participant lefts.
  *
@@ -120,3 +134,17 @@ export const HIDDEN_PARTICIPANT_JOINED = 'HIDDEN_PARTICIPANT_JOINED';
  * }
  */
 export const HIDDEN_PARTICIPANT_LEFT = 'HIDDEN_PARTICIPANT_LEFT';
+
+/**
+ * The type of Redux action which notifies the app that the loadable avatar URL has changed.
+ *
+ * {
+ *     type: SET_LOADABLE_AVATAR_URL,
+ *     participant: {
+ *         id: string,
+           loadableAvatarUrl: string
+ *     }
+ * }
+ */
+export const SET_LOADABLE_AVATAR_URL = 'SET_LOADABLE_AVATAR_URL';
+

react/features/base/participants/actions.js

@@ -1,7 +1,3 @@
-/* global interfaceConfig */
-
-import throttle from 'lodash/throttle';
-
 import { set } from '../redux';
 import { NOTIFICATION_TIMEOUT, showNotification } from '../../notifications';
 
@@ -13,11 +9,17 @@ import {
     MUTE_REMOTE_PARTICIPANT,
     PARTICIPANT_ID_CHANGED,
     PARTICIPANT_JOINED,
+    PARTICIPANT_KICKED,
     PARTICIPANT_LEFT,
     PARTICIPANT_UPDATED,
-    PIN_PARTICIPANT
+    PIN_PARTICIPANT,
+    SET_LOADABLE_AVATAR_URL
 } from './actionTypes';
-import { getLocalParticipant, getNormalizedDisplayName } from './functions';
+import {
+    getLocalParticipant,
+    getNormalizedDisplayName,
+    getParticipantDisplayName
+} from './functions';
 
 /**
  * Create an action for when dominant speaker changes.
@@ -382,6 +384,57 @@ export function participantUpdated(participant = {}) {
     };
 }
 
+/**
+ * Action to signal that a participant has muted us.
+ *
+ * @param {JitsiParticipant} participant - Information about participant.
+ * @returns {Promise}
+ */
+export function participantMutedUs(participant) {
+    return (dispatch, getState) => {
+        if (!participant) {
+            return;
+        }
+
+        dispatch(showNotification({
+            descriptionKey: 'notify.mutedRemotelyDescription',
+            titleKey: 'notify.mutedRemotelyTitle',
+            titleArguments: {
+                participantDisplayName:
+                    getParticipantDisplayName(getState, participant.getId())
+            }
+        }));
+    };
+}
+
+/**
+ * Action to signal that a participant had been kicked.
+ *
+ * @param {JitsiParticipant} kicker - Information about participant performing the kick.
+ * @param {JitsiParticipant} kicked - Information about participant that was kicked.
+ * @returns {Promise}
+ */
+export function participantKicked(kicker, kicked) {
+    return (dispatch, getState) => {
+
+        dispatch({
+            type: PARTICIPANT_KICKED,
+            kicked: kicked.getId(),
+            kicker: kicker.getId()
+        });
+
+        dispatch(showNotification({
+            titleArguments: {
+                kicked:
+                    getParticipantDisplayName(getState, kicked.getId()),
+                kicker:
+                    getParticipantDisplayName(getState, kicker.getId())
+            },
+            titleKey: 'notify.kickParticipant'
+        }, NOTIFICATION_TIMEOUT * 2)); // leave more time for this
+    };
+}
+
 /**
  * Create an action which pins a conference participant.
  *
@@ -404,72 +457,24 @@ export function pinParticipant(id) {
 }
 
 /**
- * An array of names of participants that have joined the conference. The array
- * is replaced with an empty array as notifications are displayed.
+ * Creates an action which notifies the app that the loadable URL of the avatar of a participant got updated.
  *
- * @private
- * @type {string[]}
- */
-let joinedParticipantsNames = [];
-
-/**
- * A throttled internal function that takes the internal list of participant
- * names, {@code joinedParticipantsNames}, and triggers the display of a
- * notification informing of their joining.
- *
- * @private
- * @type {Function}
- */
-const _throttledNotifyParticipantConnected = throttle(dispatch => {
-    const joinedParticipantsCount = joinedParticipantsNames.length;
-
-    let notificationProps;
-
-    if (joinedParticipantsCount >= 3) {
-        notificationProps = {
-            titleArguments: {
-                name: joinedParticipantsNames[0],
-                count: joinedParticipantsCount - 1
-            },
-            titleKey: 'notify.connectedThreePlusMembers'
-        };
-    } else if (joinedParticipantsCount === 2) {
-        notificationProps = {
-            titleArguments: {
-                first: joinedParticipantsNames[0],
-                second: joinedParticipantsNames[1]
-            },
-            titleKey: 'notify.connectedTwoMembers'
-        };
-    } else if (joinedParticipantsCount) {
-        notificationProps = {
-            titleArguments: {
-                name: joinedParticipantsNames[0]
-            },
-            titleKey: 'notify.connectedOneMember'
-        };
-    }
-
-    if (notificationProps) {
-        dispatch(
-            showNotification(notificationProps, NOTIFICATION_TIMEOUT));
-    }
-
-    joinedParticipantsNames = [];
-
-}, 500, { leading: false });
-
-/**
- * Queues the display of a notification of a participant having connected to
- * the meeting. The notifications are batched so that quick consecutive
- * connection events are shown in one notification.
- *
- * @param {string} displayName - The name of the participant that connected.
- * @returns {Function}
- */
-export function showParticipantJoinedNotification(displayName) {
-    joinedParticipantsNames.push(
-        displayName || interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME);
-
-    return dispatch => _throttledNotifyParticipantConnected(dispatch);
+ * @param {string} participantId - The ID of the participant.
+ * @param {string} url - The new URL.
+ * @returns {{
+ *     type: SET_LOADABLE_AVATAR_URL,
+ *     participant: {
+ *         id: string,
+ *         loadableAvatarUrl: string
+ *     }
+ * }}
+*/
+export function setLoadableAvatarUrl(participantId, url) {
+    return {
+        type: SET_LOADABLE_AVATAR_URL,
+        participant: {
+            id: participantId,
+            loadableAvatarUrl: url
+        }
+    };
 }

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

@@ -1,320 +0,0 @@
-// @flow
-
-import React, { Component, Fragment, PureComponent } from 'react';
-import { Dimensions, Image, Platform, View } from 'react-native';
-import FastImage, {
-    type CacheControls,
-    type Priorities
-} from 'react-native-fast-image';
-
-import { ColorPalette } from '../../styles';
-
-import styles from './styles';
-
-/**
- * The default image/source to be used in case none is specified or the
- * specified one fails to load.
- *
- * XXX The relative path to the default/stock (image) file is defined by the
- * {@code const} {@code DEFAULT_AVATAR_RELATIVE_PATH}. Unfortunately, the
- * packager of React Native cannot deal with it early enough for the following
- * {@code require} to succeed at runtime. Anyway, be sure to synchronize the
- * relative path on Web and mobile for the purposes of consistency.
- *
- * @private
- * @type {string}
- */
-const _DEFAULT_SOURCE = require('../../../../../images/avatar.png');
-
-/**
- * The type of the React {@link Component} props of {@link Avatar}.
- */
-type Props = {
-
-    /**
-     * The size for the {@link Avatar}.
-     */
-    size: number,
-
-
-    /**
-     * The URI of the {@link Avatar}.
-     */
-    uri: string
-};
-
-/**
- * The type of the React {@link Component} state of {@link Avatar}.
- */
-type State = {
-
-    /**
-     * Background color for the locally generated avatar.
-     */
-    backgroundColor: string,
-
-    /**
-     * Error indicator for non-local avatars.
-     */
-    error: boolean,
-
-    /**
-     * Indicates if the non-local avatar was loaded or not.
-     */
-    loaded: boolean,
-
-    /**
-     * Source for the non-local avatar.
-     */
-    source: {
-        uri?: string,
-        headers?: Object,
-        priority?: Priorities,
-        cache?: CacheControls,
-    }
-};
-
-/**
- * Implements a React Native/mobile {@link Component} wich renders the content
- * of an Avatar.
- */
-class AvatarContent extends Component<Props, State> {
-    /**
-     * Initializes a new Avatar instance.
-     *
-     * @param {Props} props - The read-only React Component props with which
-     * the new instance is to be initialized.
-     */
-    constructor(props: Props) {
-        super(props);
-
-        // Set the image source. The logic for the character # below is as
-        // follows:
-        // - Technically, URI is supposed to start with a scheme and scheme
-        //   cannot contain the character #.
-        // - Technically, the character # in a URI signals the start of the
-        //   fragment/hash.
-        // - Technically, the fragment/hash does not imply a retrieval
-        //   action.
-        // - Practically, the fragment/hash does not always mandate a
-        //   retrieval action. For example, an HTML anchor with an href that
-        //   starts with the character # does not cause a Web browser to
-        //   initiate a retrieval action.
-        // So I'll use the character # at the start of URI to not initiate
-        // an image retrieval action.
-        const source = {};
-
-        if (props.uri && !props.uri.startsWith('#')) {
-            source.uri = props.uri;
-        }
-
-        this.state = {
-            backgroundColor: this._getBackgroundColor(props),
-            error: false,
-            loaded: false,
-            source
-        };
-
-        // Bind event handlers so they are only bound once per instance.
-        this._onAvatarLoaded = this._onAvatarLoaded.bind(this);
-        this._onAvatarLoadError = this._onAvatarLoadError.bind(this);
-    }
-
-    /**
-     * Computes if the default avatar (ie, locally generated) should be used
-     * or not.
-     */
-    get useDefaultAvatar() {
-        const { error, loaded, source } = this.state;
-
-        return !source.uri || error || !loaded;
-    }
-
-    /**
-     * Computes a hash over the URI and returns a HSL background color. We use
-     * 75% as lightness, for nice pastel style colors.
-     *
-     * @param {Object} props - The read-only React {@code Component} props from
-     * which the background color is to be generated.
-     * @private
-     * @returns {string} - The HSL CSS property.
-     */
-    _getBackgroundColor({ uri }) {
-        if (!uri) {
-            return ColorPalette.white;
-        }
-
-        let hash = 0;
-
-        /* eslint-disable no-bitwise */
-
-        for (let i = 0; i < uri.length; i++) {
-            hash = uri.charCodeAt(i) + ((hash << 5) - hash);
-            hash |= 0; // Convert to 32-bit integer
-        }
-
-        /* eslint-enable no-bitwise */
-
-        return `hsl(${hash % 360}, 100%, 75%)`;
-    }
-
-    /**
-     * Helper which computes the style for the {@code Image} / {@code FastImage}
-     * component.
-     *
-     * @private
-     * @returns {Object}
-     */
-    _getImageStyle() {
-        const { size } = this.props;
-
-        return {
-            ...styles.avatar,
-            borderRadius: size / 2,
-            height: size,
-            width: size
-        };
-    }
-
-    _onAvatarLoaded: () => void;
-
-    /**
-     * Handler called when the remote image loading finishes. This doesn't
-     * necessarily mean the load was successful.
-     *
-     * @private
-     * @returns {void}
-     */
-    _onAvatarLoaded() {
-        this.setState({ loaded: true });
-    }
-
-    _onAvatarLoadError: () => void;
-
-    /**
-     * Handler called when the remote image loading failed.
-     *
-     * @private
-     * @returns {void}
-     */
-    _onAvatarLoadError() {
-        this.setState({ error: true });
-    }
-
-    /**
-     * Renders a default, locally generated avatar image.
-     *
-     * @private
-     * @returns {ReactElement}
-     */
-    _renderDefaultAvatar() {
-        // When using a local image, react-native-fastimage falls back to a
-        // regular Image, so we need to wrap it in a view to make it round.
-        // https://github.com/facebook/react-native/issues/3198
-
-        const { backgroundColor } = this.state;
-        const imageStyle = this._getImageStyle();
-        const viewStyle = {
-            ...imageStyle,
-
-            backgroundColor,
-
-            // FIXME @lyubomir: Without the opacity below I feel like the
-            // avatar colors are too strong. Besides, we use opacity for the
-            // ToolbarButtons. That's where I copied the value from and we
-            // may want to think about "standardizing" the opacity in the
-            // app in a way similar to ColorPalette.
-            opacity: 0.1,
-            overflow: 'hidden'
-        };
-
-        return (
-            <View style = { viewStyle }>
-                <Image
-
-                    // The Image adds a fade effect without asking, so lets
-                    // explicitly disable it. More info here:
-                    // https://github.com/facebook/react-native/issues/10194
-                    fadeDuration = { 0 }
-                    resizeMode = 'contain'
-                    source = { _DEFAULT_SOURCE }
-                    style = { imageStyle } />
-            </View>
-        );
-    }
-
-    /**
-     * Renders an avatar using a remote image.
-     *
-     * @private
-     * @returns {ReactElement}
-     */
-    _renderAvatar() {
-        const { source } = this.state;
-        let extraStyle;
-
-        if (this.useDefaultAvatar) {
-            // On Android, the image loading indicators don't work unless the
-            // Glide image is actually created, so we cannot use display: none.
-            // Instead, render it off-screen, which does the trick.
-            if (Platform.OS === 'android') {
-                const windowDimensions = Dimensions.get('window');
-
-                extraStyle = {
-                    bottom: -windowDimensions.height,
-                    right: -windowDimensions.width
-                };
-            } else {
-                extraStyle = { display: 'none' };
-            }
-        }
-
-        return (
-            <FastImage
-                onError = { this._onAvatarLoadError }
-                onLoadEnd = { this._onAvatarLoaded }
-                resizeMode = 'contain'
-                source = { source }
-                style = { [ this._getImageStyle(), extraStyle ] } />
-        );
-    }
-
-    /**
-     * Implements React's {@link Component#render()}.
-     *
-     * @inheritdoc
-     */
-    render() {
-        const { source } = this.state;
-
-        return (
-            <Fragment>
-                { source.uri && this._renderAvatar() }
-                { this.useDefaultAvatar && this._renderDefaultAvatar() }
-            </Fragment>
-        );
-    }
-}
-
-/* eslint-disable react/no-multi-comp */
-
-/**
- * Implements an avatar as a React Native/mobile {@link Component}.
- *
- * Note: we use `key` in order to trigger a new component creation in case
- * the URI changes.
- */
-export default class Avatar extends PureComponent<Props> {
-    /**
-     * Implements React's {@link Component#render()}.
-     *
-     * @inheritdoc
-     */
-    render() {
-        return (
-            <AvatarContent
-                key = { this.props.uri }
-                { ...this.props } />
-        );
-    }
-}

react/features/base/participants/components/Avatar.web.js

@@ -1,38 +0,0 @@
-// @flow
-
-import React, { Component } from 'react';
-
-/**
- * The type of the React {@link Component} props of {@link Avatar}.
- */
-type Props = {
-
-    /**
-     * The URI of the {@link Avatar}.
-     */
-    uri: string
-};
-
-/**
- * Implements an avatar as a React/Web {@link Component}.
- */
-export default class Avatar extends Component<Props> {
-    /**
-     * Implements React's {@link Component#render()}.
-     *
-     * @inheritdoc
-     */
-    render() {
-        // Propagate all props of this Avatar but the ones consumed by this
-        // Avatar to the img it renders.
-
-        // eslint-disable-next-line no-unused-vars
-        const { uri, ...props } = this.props;
-
-        return (
-            <img
-                { ...props }
-                src = { uri } />
-        );
-    }
-}

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

@@ -2,8 +2,8 @@
 
 import React, { Component } from 'react';
 import { Text, View } from 'react-native';
-import FastImage from 'react-native-fast-image';
 
+import { Avatar } from '../../avatar';
 import { translate } from '../../i18n';
 import { JitsiParticipantConnectionStatus } from '../../lib-jitsi-meet';
 import {
@@ -16,13 +16,7 @@ import { StyleType } from '../../styles';
 import { TestHint } from '../../testing/components';
 import { getTrackByMediaTypeAndParticipant } from '../../tracks';
 
-import Avatar from './Avatar';
-import {
-    getAvatarURL,
-    getParticipantById,
-    getParticipantDisplayName,
-    shouldRenderParticipantVideo
-} from '../functions';
+import { shouldRenderParticipantVideo } from '../functions';
 import styles from './styles';
 
 /**
@@ -30,14 +24,6 @@ import styles from './styles';
  */
 type Props = {
 
-    /**
-     * The source (e.g. URI, URL) of the avatar image of the participant with
-     * {@link #participantId}.
-     *
-     * @private
-     */
-    _avatar: string,
-
     /**
      * The connection status of the participant. Her video will only be rendered
      * if the connection status is 'active'; otherwise, the avatar will be
@@ -192,7 +178,6 @@ class ParticipantView extends Component<Props> {
      */
     render() {
         const {
-            _avatar: avatar,
             _connectionStatus: connectionStatus,
             _renderVideo: renderVideo,
             _videoTrack: videoTrack,
@@ -202,9 +187,6 @@ class ParticipantView extends Component<Props> {
 
         const waitForVideoStarted = false;
 
-        // Is the avatar to be rendered?
-        const renderAvatar = Boolean(!renderVideo && avatar);
-
         // If the connection has problems, we will "tint" the video / avatar.
         const connectionProblem
             = connectionStatus !== JitsiParticipantConnectionStatus.ACTIVE;
@@ -238,10 +220,12 @@ class ParticipantView extends Component<Props> {
                         zOrder = { this.props.zOrder }
                         zoomEnabled = { this.props.zoomEnabled } /> }
 
-                { renderAvatar
-                    && <Avatar
-                        size = { this.props.avatarSize }
-                        uri = { avatar } /> }
+                { !renderVideo
+                    && <View style = { styles.avatarContainer }>
+                        <Avatar
+                            participantId = { this.props.participantId }
+                            size = { this.props.avatarSize } />
+                    </View> }
 
                 { useTint
 
@@ -265,45 +249,14 @@ class ParticipantView extends Component<Props> {
  * @param {Object} ownProps - The React {@code Component} props passed to the
  * associated (instance of) {@code ParticipantView}.
  * @private
- * @returns {{
- *     _avatar: string,
- *     _connectionStatus: string,
- *     _participantName: string,
- *     _renderVideo: boolean,
- *     _videoTrack: Track
- * }}
+ * @returns {Props}
  */
 function _mapStateToProps(state, ownProps) {
     const { participantId } = ownProps;
-    const participant = getParticipantById(state, participantId);
-    let avatar;
     let connectionStatus;
     let participantName;
 
-    if (participant) {
-        avatar = getAvatarURL(participant);
-        connectionStatus = participant.connectionStatus;
-        participantName = getParticipantDisplayName(state, participant.id);
-
-        // Avatar (on React Native) now has the ability to generate an
-        // automatically-colored default image when no URI/URL is specified or
-        // when it fails to load. In order to make the coloring permanent(ish)
-        // per participant, Avatar will need something permanent(ish) per
-        // perticipant, obviously. A participant's ID is such a piece of data.
-        // But the local participant changes her ID as she joins, leaves.
-        // TODO @lyubomir: The participants may change their avatar URLs at
-        // runtime which means that, if their old and new avatar URLs fail to
-        // download, Avatar will change their automatically-generated colors.
-        avatar || participant.local || (avatar = `#${participant.id}`);
-
-        // ParticipantView knows before Avatar that an avatar URL will be used
-        // so it's advisable to prefetch here.
-        avatar && !avatar.startsWith('#')
-            && FastImage.preload([ { uri: avatar } ]);
-    }
-
     return {
-        _avatar: avatar,
         _connectionStatus:
             connectionStatus
                 || JitsiParticipantConnectionStatus.ACTIVE,