ref(base/session): createSession on APP_WILL_NAVIGATE

Do not return anything from JitsiConnection.connect, because it's not
a promise and returns void. Doing so is confusing to the reader.

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

@@ -2,6 +2,5 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="android:navigationBarColor">#1081B2</item>
     </style>
 </resources>

android/scripts/release-sdk.sh

@@ -10,7 +10,6 @@ MVN_HTTP=0
 DEFAULT_SDK_VERSION=$(grep sdkVersion ${THIS_DIR}/../gradle.properties | cut -d"=" -f2)
 SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
 RN_VERSION=$(jq -r '.dependencies."react-native"' ${THIS_DIR}/../../package.json)
-DO_GIT_TAG=${GIT_TAG:-0}
 
 if [[ $THE_MVN_REPO == http* ]]; then
     MVN_HTTP=1
@@ -65,15 +64,17 @@ pushd ${THIS_DIR}/../
 ./gradlew clean assembleRelease publish
 popd
 
-if [[ $DO_GIT_TAG == 1 ]]; then
+if [[ $MVN_HTTP == 0 ]]; then
     # The artifacts are now on the Maven repo, commit them
     pushd ${MVN_REPO_PATH}
-    git add -A .
-    git commit -m "Jitsi Meet SDK + dependencies: ${SDK_VERSION}"
+    if [[ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" == "true" ]]; then
+        git add -A .
+        git commit -m "Jitsi Meet SDK + dependencies"
+    fi
     popd
 
     # Tag the release
-    git tag android-sdk-${SDK_VERSION}
+    git tag -a android-sdk-${SDK_VERSION}
 fi
 
 # Done!

android/sdk/build.gradle

@@ -53,7 +53,6 @@ dependencies {
 
     implementation project(':react-native-background-timer')
     implementation project(':react-native-calendar-events')
-    implementation project(':react-native-community-async-storage')
     implementation(project(':react-native-fast-image')) {
         exclude group: 'com.android.support'
     }
@@ -63,7 +62,6 @@ dependencies {
     implementation project(':react-native-sound')
     implementation project(':react-native-vector-icons')
     implementation project(':react-native-webrtc')
-    implementation project(':react-native-webview')
 
     testImplementation 'junit:junit:4.12'
 }
@@ -207,7 +205,8 @@ publishing {
                     def groupId = it.moduleGroup
                     def artifactId = it.moduleName
 
-                    if (artifactId.startsWith('react-native-') && groupId.equals('jitsi-meet')) {
+                    if (artifactId.startsWith('react-native-')
+                            && groupId.equals('jitsi-meet')) {
                         groupId = rootProject.ext.moduleGroupId
                     }
 

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

@@ -52,17 +52,6 @@ class AmplitudeModule
         Amplitude.getInstance(instanceName).initialize(getCurrentActivity(), apiKey);
     }
 
-    /**
-     * Sets the user ID for an Amplitude instance.
-     *
-     * @param instanceName The name of the Amplitude instance.
-     * @param userId The new value for the user ID.
-     */
-    @ReactMethod
-    public void setUserId(String instanceName, String userId) {
-            Amplitude.getInstance(instanceName).setUserId(userId);
-    }
-
     /**
      * Sets the user properties for an Amplitude instance.
      *

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

@@ -40,15 +40,6 @@ public class JitsiMeetActivityDelegate {
     private static PermissionListener permissionListener;
     private static Callback permissionsCallback;
 
-    /**
-     * Tells whether or not the permissions request is currently in progress.
-     *
-     * @return {@code true} if the permssions are being requested or {@code false} otherwise.
-     */
-    static boolean arePermissionsBeingRequested() {
-        return permissionListener != null;
-    }
-
     /**
      * {@link Activity} lifecycle method which should be called from
      * {@code Activity#onActivityResult} so we are notified about results of external intents

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

@@ -40,10 +40,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
      * Room name.
      */
     private String room;
-    /**
-     * Conference subject.
-     */
-    private String subject;
     /**
      * JWT token used for authentication.
      */
@@ -74,7 +70,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
     public static class Builder {
         private URL serverURL;
         private String room;
-        private String subject;
         private String token;
 
         private Bundle colorScheme;
@@ -110,17 +105,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
             return this;
         }
 
-        /**
-         * Sets the conference subject.
-         * @param subject - Subject for the conference.
-         * @return - The {@link Builder} object itself so the method calls can be chained.
-         */
-        public Builder setSubject(String subject) {
-            this.subject = subject;
-
-            return this;
-        }
-
         /**
          * Sets the JWT token to be used for authentication when joining a conference.
          * @param token - The JWT token to be used for authentication.
@@ -201,7 +185,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
 
             options.serverURL = this.serverURL;
             options.room = this.room;
-            options.subject = this.subject;
             options.token = this.token;
             options.colorScheme = this.colorScheme;
             options.audioMuted = this.audioMuted;
@@ -218,7 +201,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
 
     private JitsiMeetConferenceOptions(Parcel in) {
         room = in.readString();
-        subject = in.readString();
         token = in.readString();
         colorScheme = in.readBundle();
         byte tmpAudioMuted = in.readByte();
@@ -256,9 +238,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
         if (videoMuted != null) {
             config.putBoolean("startWithVideoMuted", videoMuted);
         }
-        if (subject != null) {
-            config.putString("subject", subject);
-        }
 
         Bundle urlProps = new Bundle();
 
@@ -302,7 +281,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(room);
-        dest.writeString(subject);
         dest.writeString(token);
         dest.writeBundle(colorScheme);
         dest.writeByte((byte) (audioMuted == null ? 0 : audioMuted ? 1 : 2));

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

@@ -123,7 +123,6 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener> {
                 PictureInPictureModule.class);
         if (pipModule != null
                 && PictureInPictureModule.isPictureInPictureSupported()
-                && !JitsiMeetActivityDelegate.arePermissionsBeingRequested()
                 && this.url != null) {
             try {
                 pipModule.enterPictureInPicture();

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

@@ -66,7 +66,7 @@ class ReactInstanceManagerHolder {
         }
 
         try {
-            Class<?> amplitudeModuleClass = Class.forName("org.jitsi.meet.sdk.AmplitudeModule");
+            Class<?> amplitudeModuleClass = Class.forName("AmplitudeModule");
             Constructor constructor = amplitudeModuleClass.getConstructor(ReactApplicationContext.class);
             nativeModules.add((NativeModule)constructor.newInstance(reactContext));
         } catch (Exception e) {
@@ -147,8 +147,6 @@ class ReactInstanceManagerHolder {
                 new com.oblador.vectoricons.VectorIconsPackage(),
                 new com.ocetnik.timer.BackgroundTimerPackage(),
                 new com.oney.WebRTCModule.WebRTCModulePackage(),
-                new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
-                new com.reactnativecommunity.webview.RNCWebViewPackage(),
                 new com.rnimmersive.RNImmersivePackage(),
                 new com.zmxv.RNSound.RNSoundPackage(),
                 new ReactPackageAdapter() {

android/settings.gradle

@@ -3,10 +3,6 @@ rootProject.name = 'jitsi-meet'
 include ':app', ':sdk'
 include ':react-native-background-timer'
 project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android')
-include ':react-native-calendar-events'
-project(':react-native-calendar-events').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-calendar-events/android')
-include ':react-native-community-async-storage'
-project(':react-native-community-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android')
 include ':react-native-fast-image'
 project(':react-native-fast-image').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fast-image/android')
 include ':react-native-google-signin'
@@ -23,5 +19,5 @@ include ':react-native-vector-icons'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 include ':react-native-webrtc'
 project(':react-native-webrtc').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webrtc/android')
-include ':react-native-webview'
-project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
+include ':react-native-calendar-events'
+project(':react-native-calendar-events').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-calendar-events/android')

conference.js

@@ -51,8 +51,6 @@ import {
 import {
     checkAndNotifyForNewDevice,
     getAvailableDevices,
-    notifyCameraError,
-    notifyMicError,
     setAudioOutputDeviceId,
     updateDeviceList
 } from './react/features/base/devices';
@@ -696,14 +694,13 @@ export default {
                         // If both requests for 'audio' + 'video' and 'audio'
                         // only failed, we assume that there are some problems
                         // with user's microphone and show corresponding dialog.
-                        APP.store.dispatch(notifyMicError(audioOnlyError));
-                        APP.store.dispatch(notifyCameraError(videoOnlyError));
+                        APP.UI.showMicErrorNotification(audioOnlyError);
+                        APP.UI.showCameraErrorNotification(videoOnlyError);
                     } else {
                         // If request for 'audio' + 'video' failed, but request
                         // for 'audio' only was OK, we assume that we had
                         // problems with camera and show corresponding dialog.
-                        APP.store.dispatch(
-                            notifyCameraError(audioAndVideoError));
+                        APP.UI.showCameraErrorNotification(audioAndVideoError);
                     }
                 }
 
@@ -721,21 +718,13 @@ export default {
         this.roomName = options.roomName;
 
         return (
-
-            // Initialize the device list first. This way, when creating tracks
-            // 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.
-            this._initDeviceList()
-                .catch(error => logger.warn(
-                    'initial device list initialization failed', error))
-                .then(() => this.createInitialLocalTracksAndConnect(
+            this.createInitialLocalTracksAndConnect(
                 options.roomName, {
                     startAudioOnly: config.startAudioOnly,
                     startScreenSharing: config.startScreenSharing,
                     startWithAudioMuted: config.startWithAudioMuted,
                     startWithVideoMuted: config.startWithVideoMuted
-                }))
+                })
             .then(([ tracks, con ]) => {
                 tracks.forEach(track => {
                     if ((track.isAudioTrack() && this.isLocalAudioMuted())
@@ -780,10 +769,7 @@ export default {
                     this.setVideoMuteStatus(true);
                 }
 
-                // Initialize device list a second time to ensure device labels
-                // get populated in case of an initial gUM acceptance; otherwise
-                // they may remain as empty strings.
-                this._initDeviceList(true);
+                this._initDeviceList();
 
                 if (config.iAmRecorder) {
                     this.recorder = new Recorder();
@@ -842,7 +828,7 @@ export default {
 
         if (!this.localAudio && !mute) {
             const maybeShowErrorDialog = error => {
-                showUI && APP.store.dispatch(notifyMicError(error));
+                showUI && APP.UI.showMicErrorNotification(error);
             };
 
             createLocalTracksF({ devices: [ 'audio' ] }, false)
@@ -905,7 +891,7 @@ export default {
 
         if (!this.localVideo && !mute) {
             const maybeShowErrorDialog = error => {
-                showUI && APP.store.dispatch(notifyCameraError(error));
+                showUI && APP.UI.showCameraErrorNotification(error);
             };
 
             // Try to create local video if there wasn't any.
@@ -2112,7 +2098,7 @@ export default {
                     this._updateVideoDeviceId();
                 })
                 .catch(err => {
-                    APP.store.dispatch(notifyCameraError(err));
+                    APP.UI.showCameraErrorNotification(err);
                 });
             }
         );
@@ -2145,7 +2131,7 @@ export default {
                     this._updateAudioDeviceId();
                 })
                 .catch(err => {
-                    APP.store.dispatch(notifyMicError(err));
+                    APP.UI.showMicErrorNotification(err);
                 });
             }
         );
@@ -2291,23 +2277,20 @@ export default {
     },
 
     /**
-     * Updates the list of current devices.
-     * @param {boolean} setDeviceListChangeHandler - Whether to add the deviceList change handlers.
+     * Inits list of current devices and event listener for device change.
      * @private
      * @returns {Promise}
      */
-    _initDeviceList(setDeviceListChangeHandler = false) {
+    _initDeviceList() {
         const { mediaDevices } = JitsiMeetJS;
 
         if (mediaDevices.isDeviceListAvailable()
                 && mediaDevices.isDeviceChangeAvailable()) {
-            if (setDeviceListChangeHandler) {
-                this.deviceChangeListener = devices =>
-                    window.setTimeout(() => this._onDeviceListChanged(devices), 0);
-                mediaDevices.addEventListener(
-                    JitsiMediaDevicesEvents.DEVICE_LIST_CHANGED,
-                    this.deviceChangeListener);
-            }
+            this.deviceChangeListener = devices =>
+                window.setTimeout(() => this._onDeviceListChanged(devices), 0);
+            mediaDevices.addEventListener(
+                JitsiMediaDevicesEvents.DEVICE_LIST_CHANGED,
+                this.deviceChangeListener);
 
             const { dispatch } = APP.store;
 
@@ -2405,26 +2388,17 @@ export default {
         // Let's handle unknown/non-preferred devices
         const newAvailDevices
             = APP.store.getState()['features/base/devices'].availableDevices;
-        let newAudioDevices = [];
-        let oldAudioDevices = [];
 
         if (typeof newDevices.audiooutput === 'undefined') {
-            newAudioDevices = newAvailDevices.audioOutput;
-            oldAudioDevices = oldDevices.audioOutput;
+            APP.store.dispatch(
+                checkAndNotifyForNewDevice(newAvailDevices.audioOutput, oldDevices.audioOutput));
         }
 
         if (!requestedInput.audio) {
-            newAudioDevices = newAudioDevices.concat(newAvailDevices.audioInput);
-            oldAudioDevices = oldAudioDevices.concat(oldDevices.audioInput);
-        }
-
-        // check for audio
-        if (newAudioDevices.length > 0) {
             APP.store.dispatch(
-                checkAndNotifyForNewDevice(newAudioDevices, oldAudioDevices));
+                checkAndNotifyForNewDevice(newAvailDevices.audioInput, oldDevices.audioInput));
         }
 
-        // check for video
         if (!requestedInput.video) {
             APP.store.dispatch(
                 checkAndNotifyForNewDevice(newAvailDevices.videoInput, oldDevices.videoInput));

config.js

@@ -266,13 +266,6 @@ var config = {
     // Whether or not some features are checked based on token.
     // enableFeaturesBasedOnToken: false,
 
-    // Enable lock room for all moderators, even when userRolesBasedOnToken is enabled and participants are guests.
-    // lockRoomGuestEnabled: false,
-
-    // When enabled the password used for locking a room is restricted to up to the number of digits specified
-    // roomPasswordNumberOfDigits: 10,
-    // default: roomPasswordNumberOfDigits: false,
-
     // Message to show the users. Example: 'The service will be down for
     // maintenance at 01:00 AM GMT,
     // noticeMessage: '',
@@ -414,10 +407,6 @@ var config = {
     // use only.
     // _desktopSharingSourceDevice: 'sample-id-or-label'
 
-    // A property to disable the right click context menu for localVideo
-    // the menu has option to flip the locally seen video for local presentations
-    // disableLocalVideoFlip: false
-
     // List of undocumented settings used in jitsi-meet
     /**
      _immediateReloadThreshold
@@ -432,6 +421,7 @@ var config = {
      dialOutCodesUrl
      disableRemoteControl
      displayJids
+     enableLocalVideoFlip
      etherpad_base
      externalConnectUrl
      firefox_fake_device

connection.js

@@ -5,7 +5,8 @@ import jitsiLocalStorage from './modules/util/JitsiLocalStorage';
 
 import {
     connectionEstablished,
-    connectionFailed
+    connectionFailed,
+    connectionWillConnect
 } from './react/features/base/connection';
 import {
     isFatalJitsiConnectionError,
@@ -74,6 +75,7 @@ function checkForAttachParametersAndConnect(id, password, connection) {
 function connect(id, password, roomName) {
     const connectionConfig = Object.assign({}, config);
     const { issuer, jwt } = APP.store.getState()['features/base/jwt'];
+    const { locationURL } = APP.store.getState()['features/base/connection'];
 
     connectionConfig.bosh += `?room=${roomName}`;
 
@@ -83,6 +85,8 @@ function connect(id, password, roomName) {
             jwt && issuer && issuer !== 'anonymous' ? jwt : undefined,
             connectionConfig);
 
+    APP.store.dispatch(connectionWillConnect(connection, locationURL));
+
     return new Promise((resolve, reject) => {
         connection.addEventListener(
             JitsiConnectionEvents.CONNECTION_ESTABLISHED,

css/_chat.scss

@@ -1,9 +1,6 @@
 #sideToolbarContainer {
     background-color: $newToolbarBackgroundColor;
-    box-sizing: border-box;
-    color: #FFF;
     display: flex;
-    flex-direction: column;
     /**
      * Make the sidebar flush with the top of the toolbar. Take the size of
      * the toolbar and subtract from 100%.
@@ -24,6 +21,20 @@
     &.slideInExt {
         left: 0;
     }
+
+    .sideToolbarContainer__inner {
+        box-sizing: border-box;
+        color: #FFF;
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+        width: $sidebarWidth;
+    }
+}
+
+#chat_container * {
+    -webkit-user-select: text;
+    user-select: text;
 }
 
 #chatconversation {
@@ -31,8 +42,9 @@
     flex: 1;
     font-size: 10pt;
     line-height: 20px;
+    margin-top: $desktopAppDragBarHeight + 5px;
     overflow: auto;
-    padding: 16px;
+    padding: 5px;
     text-align: left;
     width: $sidebarWidth;
     word-wrap: break-word;
@@ -80,41 +92,26 @@
     }
 }
 
-.chat-header {
-    background-color: $chatHeaderBackgroundColor;
-    height: 70px;
-    position: relative;
-    width: 100%;
+.chat-close {
+    background: gray;
+    border: 3px solid rgba(255, 255, 255, 0.1);
+    border-radius: 100%;
+    color: white;
+    cursor:pointer;
+    height: 10px;
+    line-height: 10px;
+    padding: 4px;
+    position: absolute;
+    right: 5px;
+    text-align: center;
+    top: $desktopAppDragBarHeight;
+    width: 10px;
     z-index: 1;
-
-    .chat-close {
-        align-items: center;
-        bottom: 8px;
-        color: white;
-        cursor: pointer;
-        display: flex;
-        font-size: 18px;
-        height: 40px;
-        justify-content: center;
-        line-height: 15px;
-        padding: 4px;
-        position: absolute;
-        right: 5px;
-        width: 40px;
-
-        &:hover {
-            color: rgba(255, 255, 255, 0.8);
-        }
-    }
 }
 
 #chat-input {
-    border-top: 1px solid $chatInputSeparatorColor;
+    background-color: $newToolbarBackgroundColor;
     display: flex;
-
-    * {
-        background-color: transparent;
-    }
 }
 
 .remoteuser {
@@ -126,13 +123,16 @@
 }
 
 #usermsg {
+    background-color: $newToolbarBackgroundColor;
     border: 0px none;
     border-radius:0;
     box-shadow: none;
     color: white;
-    font-size: 15px;
+    font-size: 10pt;
     line-height: 30px;
     padding: 5px;
+    max-height:150px;
+    min-height:35px;
     overflow-y: auto;
     resize: none;
     width: 100%;
@@ -145,47 +145,64 @@
 }
 
 #nickname {
+    position: absolute;
     text-align: center;
     color: #9d9d9d;
     font-size: 18px;
-    margin-top: 30px;
+    top: 100px;
     left: 5px;
     right: 5px;
+    width: 95%;
 }
 
-.sideToolbarContainer {
-    * {
-        -webkit-user-select: text;
-        user-select: text;
-    }
+#chat_container .display-name {
+    float: left;
+    padding-left: 5px;
+    font-weight: bold;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 95%;
+    overflow: hidden;
+}
 
-    .display-name {
-        font-size: 13px;
-        font-weight: bold;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        overflow: hidden;
-    }
+#chat_container .timestamp {
+    float: right;
+    padding-right: 5px;
+    font-size: 11px;
+}
+
+.usermessage {
+    padding-top: 20px;
+    padding-left: 5px;
+}
+
+.chatArrow {
+    border-color:
+        transparent $newToolbarBackgroundColor transparent transparent;
+    border-style: solid;
+    border-width: 0 10px 10px 0;
+    left: -10px;
+    position: absolute;
 }
 
 .chatmessage {
-    background-color: $chatRemoteMessageBackgroundColor;
-    border-radius: 0px 6px 6px 6px;
-    box-sizing: border-box;
-    color: white;
+    background-color: $newToolbarBackgroundColor;
+    width: 93%;
+    margin-left: 9px;
+    margin-right: auto;
+    border-radius: 5px;
+    border-top-left-radius: 0px;
     margin-top: 3px;
-    max-width: 100%;
+    color: white;
     padding-bottom: 3px;
     position: relative;
 
-    &.localuser {
-        background-color: $chatLocalMessageBackgroundColor;
-        border-radius: 6px 0px 6px 6px;
+    &.localuser .display-name {
+        color: #4C9AFF
     }
 
     &.error {
-        border-radius: 0px;
-
+        .chatArrow,
         .timestamp,
         .display-name {
             display: none;
@@ -214,6 +231,7 @@
 }
 
 #smileysarea {
+    background-color: $newToolbarBackgroundColor;
     display: flex;
     max-height: 150px;
     min-height: 35px;
@@ -228,22 +246,14 @@
 .smileys-panel {
     bottom: 100%;
     box-sizing: border-box;
-    height: auto;
-    max-height: 0;
+    height: 0;
     overflow: hidden;
     position: absolute;
+    transition: height 0.3s;
     width: $sidebarWidth;
 
-    /**
-     * CSS transitions do not apply for auto dimensions. So to produce the css
-     * accordion effect for showing and hiding the smiley-panel, while allowing
-     * for variable panel, height, use a very large max-height and animate off
-     * of that.
-     */
-    transition: max-height 0.3s;
-
     &.show-smileys {
-        max-height: 500%;
+        height: 146px;
     }
 
     #smileysContainer {
@@ -277,49 +287,3 @@
 #usermsg::-webkit-scrollbar-track-piece {
     background: #3a3a3a;
 }
-
-.chat-message-group {
-    display: flex;
-    flex-direction: column;
-
-    &.local {
-        align-items: flex-end;
-
-        .chatmessage {
-            background-color: $chatLocalMessageBackgroundColor;
-            border-radius: 6px 0px 6px 6px;
-        }
-
-        .display-name {
-            display: none;
-        }
-
-        .timestamp {
-            text-align: right;
-        }
-    }
-
-    &.error {
-        .chatmessage {
-            border-radius: 0px;
-            color: red;
-        }
-
-        .display-name {
-            display: none;
-        }
-    }
-
-    .chatmessage-wrapper {
-        max-width: 100%;
-    }
-
-    .chatmessage {
-        background-color: $chatRemoteMessageBackgroundColor;
-        border-radius: 0px 6px 6px 6px;
-        display: inline-block;
-        margin-top: 3px;
-        color: white;
-        padding: 8px;
-    }
-}

css/_variables.scss

@@ -83,19 +83,11 @@ $modalMockAKInputBorder: 1px solid #f4f5f7;
 $modalTextColor: #333;
 
 /**
- * Chat
- */
-$chatHeaderBackgroundColor: rgba(42, 58, 75, 0.9);
-$chatInputSeparatorColor: #A4B8D1;
-$chatLocalMessageBackgroundColor: rgba(26, 108, 180, 1);
-$chatRemoteMessageBackgroundColor:  rgba(240, 243, 247, 0.15);
-$sidebarWidth: 375px;
-
- /**
  * Misc.
  */
 $borderRadius: 4px;
 $defaultWatermarkLink: '../images/watermark.png';
+$sidebarWidth: 220px;
 $popoverMenuPadding: 13px;
 $happySoftwareBackground: transparent;
 $desktopAppDragBarHeight: 25px;

css/_videolayout_default.scss

@@ -514,7 +514,6 @@
 }
 #dominantSpeakerAvatar {
     background-color: #000000;
-    object-fit: cover;
 }
 
 .dynamic-shadow {
@@ -526,21 +525,12 @@
     transition: box-shadow 0.3s ease;
 }
 
-.avatar-container {
+.userAvatar {
     @include maxSize(60px);
     @include absoluteAligning();
     border-radius: 50%;
-    display: flex;
-    justify-content: center;
     height: 50%;
-    overflow: hidden;
     width: auto;
-
-    .userAvatar {
-        height: 100%;
-        object-fit: cover;
-        width: 100%;
-    }
 }
 
 #videoNotAvailableScreen {

css/_welcome_page.scss

@@ -162,10 +162,4 @@ body.welcome-page {
             font-size: 32px;
         }
     }
-
-    .welcome-watermark {
-        position: absolute;
-        width: 100%;
-        height: 100%;
-    }
 }

css/filmstrip/_tile_view_overrides.scss

@@ -6,7 +6,7 @@
     /**
      * Let the avatar grow with the tile.
      */
-    .avatar-container {
+    .userAvatar {
         max-height: initial;
         max-width: initial;
     }

css/modals/invite/_info.scss

@@ -185,7 +185,6 @@
     font-size: 12px;
     max-height: 100%;
     overflow: auto;
-    padding: 15pt;
     position: absolute;
     transform: translateY(-50%);
     top: 50%;

doc/api.md

@@ -222,11 +222,6 @@ api.executeCommand('toggleChat');
 api.executeCommand('toggleShareScreen');
 ```
 
-* **toggleTileView** - Enter / exit tile view layout mode. No arguments are required.
-```javascript
-api.executeCommand('toggleTileView');
-```
-
 * **hangup** - Hangups the call. No arguments are required.
 ```javascript
 api.executeCommand('hangup');
@@ -264,14 +259,6 @@ The `event` parameter is a String object with the name of the event.
 The `listener` parameter is a Function object with one argument that will be notified when the event occurs with data related to the event.
 
 The following events are currently supported:
-* **cameraError** - event notifications about Jitsi-Meet having failed to access the camera. The listener will receive an object with the following structure:
-```javascript
-{
-    type: string, // A constant representing the overall type of the error.
-    message: string // Additional information about the error.
-}
-```
-
 * **avatarChanged** - event notifications about avatar
 changes. The listener will receive an object with the following structure:
 ```javascript
@@ -295,14 +282,6 @@ changes. The listener will receive an object with the following structure:
 }
 ```
 
-* **micError** - event notifications about Jitsi-Meet having failed to access the mic. The listener will receive an object with the following structure:
-```javascript
-{
-    type: string, // A constant representing the overall type of the error.
-    message: string // Additional information about the error.
-}
-```
-
 * **screenSharingStatusChanged** - receives event notifications about turning on/off the local user screen sharing. The listener will receive object with the following structure:
 ```javascript
 {
@@ -317,13 +296,6 @@ changes. The listener will receive an object with the following structure:
 }
 ```
 
-* **tileViewChanged** - event notifications about tile view layout mode being entered or exited. The listener will receive object with the following structure:
-```javascript
-{
-    enabled: boolean, // whether tile view is not displayed or not
-}
-```
-
 * **incomingMessage** - Event notifications about incoming
 messages. The listener will receive an object with the following structure:
 ```javascript

doc/mobile-google-auth.md

@@ -5,7 +5,7 @@ signed Android build for that, that can be a debug self-signed build too, just
 retrieve the signing hash. The key hash of an already signed ap can be obtained
 as follows (on macOS): ```keytool -list -printcert -jarfile the-app.apk```
 - Place the generated ```google-services.json``` file in ```android/app```
-for Android and the ```GoogleService-Info.plist``` into ```ios/app``` for
+for Android and the ```GoogleService-Info.plist``` into ```ios/app/src``` for
 iOS (you can stop at that step, no need for the driver and the code changes they
 suggest in the wizard).
 - You may want to exclude these files in YOUR GIT config (do not exclude them in

ios/Podfile

@@ -14,9 +14,6 @@ end
 target 'JitsiMeet' do
   project 'sdk/sdk.xcodeproj'
 
-  # React Native and its dependencies
-  #
-
   pod 'React', :path => '../node_modules/react-native', :subspecs => [
     'Core',
     'CxxBridge',
@@ -30,31 +27,33 @@ target 'JitsiMeet' do
     'RCTWebSocket',
   ]
   pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
-  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
-  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
-  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
-  # React Native plugins
-  #
-
-  pod 'react-native-background-timer', :path => '../node_modules/react-native-background-timer'
-  pod 'react-native-calendar-events', :path => '../node_modules/react-native-calendar-events'
-  pod 'react-native-fast-image', :path => '../node_modules/react-native-fast-image'
-  pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake'
-  pod 'react-native-webview', :path => '../node_modules/react-native-webview'
-  pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
-  pod 'BVLinearGradient', :path => '../node_modules/react-native-linear-gradient'
-  pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-community/async-storage'
-  pod 'RNGoogleSignin', :path => '../node_modules/react-native-google-signin'
-  pod 'RNSound', :path => '../node_modules/react-native-sound'
-  pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
-  pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
-
-  # Native pod dependencies
-  #
+  pod 'DoubleConversion',
+    :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
+  pod 'glog',
+    :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
+  pod 'Folly',
+    :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
   pod 'Amplitude-iOS', '~> 4.0.4'
   pod 'ObjectiveDropboxOfficial', '~> 3.9.4'
+
+  pod 'react-native-background-timer',
+    :path => '../node_modules/react-native-background-timer'
+  pod 'react-native-fast-image',
+    :path => '../node_modules/react-native-fast-image'
+  pod 'react-native-keep-awake',
+    :path => '../node_modules/react-native-keep-awake'
+  pod 'BVLinearGradient',
+    :path => '../node_modules/react-native-linear-gradient'
+  pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
+  pod 'RNGoogleSignin',
+    :path => '../node_modules/react-native-google-signin'
+  pod 'RNSound', :path => '../node_modules/react-native-sound'
+  pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
+  pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
+  pod 'react-native-calendar-events',
+    :path => '../node_modules/react-native-calendar-events'
 end
 
 post_install do |installer|

ios/Podfile.lock

@@ -84,8 +84,8 @@ PODS:
   - nanopb/decode (0.3.901)
   - nanopb/encode (0.3.901)
   - ObjectiveDropboxOfficial (3.9.4)
-  - React (0.59.8):
-    - React/Core (= 0.59.8)
+  - React (0.59.5):
+    - React/Core (= 0.59.5)
   - react-native-background-timer (2.1.1):
     - React
   - react-native-calendar-events (1.6.4):
@@ -99,57 +99,53 @@ PODS:
     - React
   - react-native-webrtc (1.69.1):
     - React
-  - react-native-webview (5.8.1):
-    - React
-  - React/Core (0.59.8):
-    - yoga (= 0.59.8.React)
-  - React/CxxBridge (0.59.8):
+  - React/Core (0.59.5):
+    - yoga (= 0.59.5.React)
+  - React/CxxBridge (0.59.5):
     - Folly (= 2018.10.22.00)
     - React/Core
     - React/cxxreact
     - React/jsiexecutor
-  - React/cxxreact (0.59.8):
+  - React/cxxreact (0.59.5):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
     - React/jsinspector
-  - React/DevSupport (0.59.8):
+  - React/DevSupport (0.59.5):
     - React/Core
     - React/RCTWebSocket
-  - React/fishhook (0.59.8)
-  - React/jsi (0.59.8):
+  - React/fishhook (0.59.5)
+  - React/jsi (0.59.5):
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-  - React/jsiexecutor (0.59.8):
+  - React/jsiexecutor (0.59.5):
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
     - React/cxxreact
     - React/jsi
-  - React/jsinspector (0.59.8)
-  - React/RCTActionSheet (0.59.8):
+  - React/jsinspector (0.59.5)
+  - React/RCTActionSheet (0.59.5):
     - React/Core
-  - React/RCTAnimation (0.59.8):
+  - React/RCTAnimation (0.59.5):
     - React/Core
-  - React/RCTBlob (0.59.8):
+  - React/RCTBlob (0.59.5):
     - React/Core
-  - React/RCTImage (0.59.8):
+  - React/RCTImage (0.59.5):
     - React/Core
     - React/RCTNetwork
-  - React/RCTLinkingIOS (0.59.8):
+  - React/RCTLinkingIOS (0.59.5):
     - React/Core
-  - React/RCTNetwork (0.59.8):
+  - React/RCTNetwork (0.59.5):
     - React/Core
-  - React/RCTText (0.59.8):
+  - React/RCTText (0.59.5):
     - React/Core
-  - React/RCTWebSocket (0.59.8):
+  - React/RCTWebSocket (0.59.5):
     - React/Core
     - React/fishhook
     - React/RCTBlob
-  - RNCAsyncStorage (1.3.4):
-    - React
   - RNGoogleSignin (1.0.2):
     - GoogleSignIn
     - React
@@ -166,7 +162,7 @@ PODS:
   - SDWebImage/GIF (4.4.6):
     - FLAnimatedImage (~> 1.0)
     - SDWebImage/Core
-  - yoga (0.59.8.React)
+  - yoga (0.59.5.React)
 
 DEPENDENCIES:
   - Amplitude-iOS (~> 4.0.4)
@@ -184,7 +180,6 @@ DEPENDENCIES:
   - react-native-fast-image (from `../node_modules/react-native-fast-image`)
   - react-native-keep-awake (from `../node_modules/react-native-keep-awake`)
   - react-native-webrtc (from `../node_modules/react-native-webrtc`)
-  - react-native-webview (from `../node_modules/react-native-webview`)
   - React/Core (from `../node_modules/react-native`)
   - React/CxxBridge (from `../node_modules/react-native`)
   - React/DevSupport (from `../node_modules/react-native`)
@@ -195,7 +190,6 @@ DEPENDENCIES:
   - React/RCTNetwork (from `../node_modules/react-native`)
   - React/RCTText (from `../node_modules/react-native`)
   - React/RCTWebSocket (from `../node_modules/react-native`)
-  - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
   - RNGoogleSignin (from `../node_modules/react-native-google-signin`)
   - RNSound (from `../node_modules/react-native-sound`)
   - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
@@ -245,10 +239,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-keep-awake"
   react-native-webrtc:
     :path: "../node_modules/react-native-webrtc"
-  react-native-webview:
-    :path: "../node_modules/react-native-webview"
-  RNCAsyncStorage:
-    :path: "../node_modules/@react-native-community/async-storage"
   RNGoogleSignin:
     :path: "../node_modules/react-native-google-signin"
   RNSound:
@@ -283,21 +273,19 @@ SPEC CHECKSUMS:
   GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
   nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
   ObjectiveDropboxOfficial: a5afefc83f6467c42c45f2253f583f2ad1ffc701
-  React: 76e6aa2b87d05eb6cccb6926d72685c9a07df152
+  React: 90adac468c7b72bf1fa6c64bf230650f851a8388
   react-native-background-timer: 0d34748e53a972507c66963490c775321a88f6f2
   react-native-calendar-events: ee9573e355711ac679e071be70789542431f4ce3
   react-native-fast-image: 47487b71169aea34868e7b38bf870b6b3f2157c5
   react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae
   react-native-webrtc: 90a847d19deb2d7323fef8cc89ca12b8995fbc90
-  react-native-webview: a95842e3f351a6d2c8bc8bcc9eab689c7e7e5ad4
-  RNCAsyncStorage: 8e31405a9f12fbf42c2bb330e4560bfd79c18323
   RNGoogleSignin: 361174d9a3090d295b06257162b560d8efc8a6ed
   RNSound: e157320f503bdd4f4ee6d8542e948d54f90c3c3a
   RNVectorIcons: d819334932bcda3332deb3d2c8ea4d069e0b98f9
   RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42
   SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
-  yoga: 92b2102c3d373d1a790db4ab761d2b0ffc634f64
+  yoga: 2e571f113e8cbeb0eb752aeebc86c1bfe7a8200c
 
-PODFILE CHECKSUM: b55338cc43312051ed83f8d9c6aadbd8c9402e6a
+PODFILE CHECKSUM: 9e6bc935ea7d2974604572cc68938281a88cf35c
 
 COCOAPODS: 1.6.1

ios/README.md

@@ -92,7 +92,7 @@ Leaves the currently active conference.
 
 #### Universal / deep linking
 
-In order to support Universal / deep linking, `JitsiMeet` offers 2 class
+In order to support Universal / deep linking, `JitsiMeetView` offers 2 class
 methods that you app's delegate should call in order for the app to follow those
 links.
 
@@ -104,7 +104,7 @@ is useful when the host application uses other SDKs which also use linking.
 continueUserActivity:(NSUserActivity *)userActivity
   restorationHandler:(void (^)(NSArray *restorableObjects))restorationHandler
 {
-  return [[JitsiMeet sharedInstance] application:application
+  return [JitsiMeetView application:application
                continueUserActivity:userActivity
                  restorationHandler:restorationHandler];
 }
@@ -117,7 +117,7 @@ And also one of the following:
 - (BOOL)application:(UIApplication *)app
             openURL:(NSURL *)url
             options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
-  return [[JitsiMeet sharedInstance] application:app
+  return [JitsiMeetView application:app
                             openURL:url
                             options: options];
 }

ios/app/app.xcodeproj/project.pbxproj

@@ -737,7 +737,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = FC967L3QRG;
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"../../node_modules/react-native-webrtc/ios",

ios/app/src/ViewController.m

@@ -42,11 +42,11 @@
 
 - (void)_onJitsiMeetViewDelegateEvent:(NSString *)name
                              withData:(NSDictionary *)data {
+#if DEBUG
     NSLog(
         @"[%s:%d] JitsiMeetViewDelegate %@ %@",
         __FILE__, __LINE__, name, data);
 
-#if DEBUG
     NSAssert(
         [NSThread isMainThread],
         @"JitsiMeetViewDelegate %@ method invoked on a non-main thread",

ios/app/watchos/app/Base.lproj/Interface.storyboard

@@ -14,7 +14,6 @@
             <objects>
                 <controller title="Meetings" id="AgC-eL-Hgc" customClass="InterfaceController" customModule="JitsiMeetCompanion" customModuleProvider="target">
                     <items>
-                        <label alignment="left" textAlignment="left" numberOfLines="0" id="OQN-sx-tDt"/>
                         <table alignment="left" id="gpO-ql-Xsr">
                             <items>
                                 <tableRow identifier="MeetingRowType" id="GGl-av-xeJ" customClass="MeetingRowController" customModule="JitsiMeetCompanion_Extension">
@@ -40,7 +39,6 @@
                         </table>
                     </items>
                     <connections>
-                        <outlet property="infoLabel" destination="OQN-sx-tDt" id="Juv-tb-SNj"/>
                         <outlet property="table" destination="gpO-ql-Xsr" id="aVV-iZ-z3l"/>
                     </connections>
                 </controller>

ios/app/watchos/extension/InterfaceController.swift

@@ -16,31 +16,17 @@
  */
 
 import WatchKit
-import WatchConnectivity
 import Foundation
 
 
 class InterfaceController: WKInterfaceController {
 
-    @IBOutlet var infoLabel: WKInterfaceLabel!
     @IBOutlet var table: WKInterfaceTable!
 
-    override func didAppear(){
-        self.updateUI(ExtensionDelegate.currentJitsiMeetContext)
-    }
-
     func updateUI(_ newContext:JitsiMeetContext) {
-      if (newContext.recentURLs == nil || newContext.recentURLs!.count == 0) {
-        infoLabel.setText("There are no recent meetings. Please use the app on the phone to start a new call.")
-
-        table.setHidden(true)
-        infoLabel.setHidden(false)
-      } else {
-        updateRecents(withRecents: newContext.recentURLs!, currentContext: newContext)
-
-        table.setHidden(false)
-        infoLabel.setHidden(true)
-      }
+        if let recentURLsArray = newContext.recentURLs {
+            updateRecents(withRecents:  recentURLsArray, currentContext: newContext)
+        }
     }
 
     private func updateRecents(withRecents recents: NSArray, currentContext: JitsiMeetContext) {
@@ -82,7 +68,7 @@ class InterfaceController: WKInterfaceController {
     override func contextForSegue(withIdentifier segueIdentifier: String, in table: WKInterfaceTable, rowIndex: Int) -> Any? {
         let controller = table.rowController(at: rowIndex) as! MeetingRowController
         let currentContext = ExtensionDelegate.currentJitsiMeetContext
-
+      
         // Copy the current context and add the joinConferenceURL to trigger the command when the in-call screen is displayed
         let actionContext = JitsiMeetContext(jmContext: currentContext)
         actionContext.joinConferenceURL = controller.roomUrl

ios/scripts/bitcode.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# This script will download a bitcode build of the WebRTC framework, if needed.
-
-if [[ ! "$CONFIGURATION" = "Debug" ]]; then
-    RN_WEBRTC="$SRCROOT/../../node_modules/react-native-webrtc"
-
-    if otool -arch arm64 -l $RN_WEBRTC/ios/WebRTC.framework/WebRTC | grep -q LLVM; then
-        echo "WebRTC framework has bitcode"
-    else
-        echo "WebRTC framework has NO bitcode"
-        $RN_WEBRTC/tools/downloadBitcode.sh
-    fi
-fi
-

ios/scripts/release-sdk.sh

@@ -5,9 +5,7 @@ set -e -u
 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 PROJECT_REPO=$(realpath ${THIS_DIR}/../..)
 RELEASE_REPO=$(realpath ${THIS_DIR}/../../../jitsi-meet-ios-sdk-releases)
-DEFAULT_SDK_VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" ${THIS_DIR}/../sdk/src/Info.plist)
-SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
-DO_GIT_TAG=${GIT_TAG:-0}
+SDK_VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" ${THIS_DIR}/../sdk/src/Info.plist)
 
 
 echo "Releasing Jitsi Meet SDK ${SDK_VERSION}"
@@ -26,9 +24,7 @@ popd
 pushd ${PROJECT_REPO}
 rm -rf ios/sdk/JitsiMeet.framework
 xcodebuild -workspace ios/jitsi-meet.xcworkspace -scheme JitsiMeet -destination='generic/platform=iOS' -configuration Release archive
-if [[ $DO_GIT_TAG == 1 ]]; then
-    git tag ios-sdk-${SDK_VERSION}
-fi
+git tag -a ios-sdk-${SDK_VERSION}
 popd
 
 pushd ${RELEASE_REPO}
@@ -37,16 +33,10 @@ pushd ${RELEASE_REPO}
 cp -r ${PROJECT_REPO}/ios/sdk/JitsiMeet.framework Frameworks/
 cp -r ${PROJECT_REPO}/node_modules/react-native-webrtc/ios/WebRTC.framework Frameworks/
 
-# Strip bitcode
-xcrun bitcode_strip -r Frameworks/JitsiMeet.framework/JitsiMeet -o Frameworks/JitsiMeet.framework/JitsiMeet
-xcrun bitcode_strip -r Frameworks/WebRTC.framework/WebRTC -o Frameworks/WebRTC.framework/WebRTC
-
 # Add all files to git
-if [[ $DO_GIT_TAG == 1 ]]; then
-    git add -A .
-    git commit -m "${SDK_VERSION}"
-    git tag ${SDK_VERSION}
-fi
+git add -A .
+git commit -m "${SDK_VERSION}"
+git tag ${SDK_VERSION}
 
 popd
 

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -44,7 +44,6 @@
 		C6CC49AF207412CF000DFA42 /* PiPViewCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6CC49AE207412CF000DFA42 /* PiPViewCoordinator.swift */; };
 		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 */; };
 		DEFC743F21B178FA00E4DD96 /* LocaleDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFC743D21B178FA00E4DD96 /* LocaleDetector.m */; };
 		DEFE535421FB1BF800011A3A /* JitsiMeet.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFE535321FB1BF800011A3A /* JitsiMeet.m */; };
 		DEFE535621FB2E8300011A3A /* ReactUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFE535521FB2E8300011A3A /* ReactUtils.m */; };
@@ -97,8 +96,6 @@
 		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>"; };
-		DEAFA777229EAD3B0033A7FA /* RNRootView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNRootView.h; sourceTree = "<group>"; };
-		DEAFA778229EAD520033A7FA /* RNRootView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNRootView.m; sourceTree = "<group>"; };
 		DEFC743D21B178FA00E4DD96 /* LocaleDetector.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LocaleDetector.m; sourceTree = "<group>"; };
 		DEFE535321FB1BF800011A3A /* JitsiMeet.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeet.m; sourceTree = "<group>"; };
 		DEFE535521FB2E8300011A3A /* ReactUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReactUtils.m; sourceTree = "<group>"; };
@@ -176,8 +173,6 @@
 				DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */,
 				0B412F161EDEC65D00B1A0A6 /* JitsiMeetView.h */,
 				0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */,
-				DEAFA777229EAD3B0033A7FA /* RNRootView.h */,
-				DEAFA778229EAD520033A7FA /* RNRootView.m */,
 				C6F99C13204DB63D0001F710 /* JitsiMeetView+Private.h */,
 				0B412F1B1EDEC80100B1A0A6 /* JitsiMeetViewDelegate.h */,
 				DEFC743D21B178FA00E4DD96 /* LocaleDetector.m */,
@@ -275,7 +270,6 @@
 			buildConfigurationList = 0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeet" */;
 			buildPhases = (
 				26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */,
-				DE3D81D6228B50FB00A6C149 /* Bitcode */,
 				0BD906E01EC0C00300C8C18E /* Sources */,
 				0BD906E11EC0C00300C8C18E /* Frameworks */,
 				0BD906E21EC0C00300C8C18E /* Headers */,
@@ -456,24 +450,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		DE3D81D6228B50FB00A6C149 /* Bitcode */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = Bitcode;
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "../scripts/bitcode.sh\n";
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -483,7 +459,6 @@
 			files = (
 				0BB9AD7B1F5EC8F4001C08DB /* CallKit.m in Sources */,
 				0BB9AD7D1F60356D001C08DB /* AppInfo.m in Sources */,
-				DEAFA779229EAD520033A7FA /* RNRootView.m in Sources */,
 				DEAD3227220C497000E93636 /* JitsiMeetConferenceOptions.m in Sources */,
 				0B93EF7F1EC9DDCD0030D24D /* RCTBridgeWrapper.m in Sources */,
 				0BA13D311EE83FF8007BEF7F /* ExternalAPI.m in Sources */,
@@ -640,7 +615,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = src/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

ios/sdk/src/JitsiMeet+Private.h

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#import <React/RCTBridge.h>
-
 #import "JitsiMeet.h"
 
 @interface JitsiMeet ()

ios/sdk/src/JitsiMeetConferenceOptions.h

@@ -26,10 +26,6 @@
  * Room name.
  */
 @property (nonatomic, copy, nullable) NSString *room;
-/**
- * Conference subject.
- */
-@property (nonatomic, copy, nullable) NSString *subject;
 /**
  * JWT token used for authentication.
  */
@@ -60,9 +56,7 @@
 @interface JitsiMeetConferenceOptions : NSObject
 
 @property (nonatomic, copy, nullable, readonly) NSURL *serverURL;
-
 @property (nonatomic, copy, nullable, readonly) NSString *room;
-@property (nonatomic, copy, nullable, readonly) NSString *subject;
 @property (nonatomic, copy, nullable, readonly) NSString *token;
 
 @property (nonatomic, copy, nullable) NSDictionary *colorScheme;

ios/sdk/src/JitsiMeetConferenceOptions.m

@@ -34,7 +34,6 @@
     if (self = [super init]) {
         _serverURL = nil;
         _room = nil;
-        _subject = nil;
         _token = nil;
 
         _colorScheme = nil;
@@ -139,7 +138,6 @@
     if (self = [super init]) {
         _serverURL = builder.serverURL;
         _room = builder.room;
-        _subject = builder.subject;
         _token = builder.token;
 
         _colorScheme = builder.colorScheme;
@@ -185,9 +183,6 @@
     if (_videoMuted != nil) {
         config[@"startWithVideoMuted"] = @(self.videoMuted);
     }
-    if (_subject != nil) {
-        config[@"subject"] = self.subject;
-    }
 
     NSMutableDictionary *urlProps = [[NSMutableDictionary alloc] init];
 

ios/sdk/src/JitsiMeetView.m

@@ -17,11 +17,12 @@
 
 #include <mach/mach_time.h>
 
+#import <React/RCTRootView.h>
+
 #import "JitsiMeet+Private.h"
 #import "JitsiMeetConferenceOptions+Private.h"
 #import "JitsiMeetView+Private.h"
 #import "ReactUtils.h"
-#import "RNRootView.h"
 
 
 @implementation JitsiMeetView {
@@ -35,7 +36,7 @@
     /**
      * React Native view where the entire content will be rendered.
      */
-    RNRootView *rootView;
+    RCTRootView *rootView;
 }
 
 /**
@@ -144,9 +145,9 @@ static void initializeViewsMap() {
     } else {
         RCTBridge *bridge = [[JitsiMeet sharedInstance] getReactBridge];
         rootView
-            = [[RNRootView alloc] initWithBridge:bridge
-                                      moduleName:@"App"
-                               initialProperties:props];
+            = [[RCTRootView alloc] initWithBridge:bridge
+                                       moduleName:@"App"
+                                initialProperties:props];
         rootView.backgroundColor = self.backgroundColor;
 
         // Add rootView as a subview which completely covers this one.

ios/sdk/src/RNRootView.h

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

ios/sdk/src/RNRootView.m

@@ -1,45 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <React/RCTRootContentView.h>
-#import <React/RCTLog.h>
-
-#import "RNRootView.h"
-
-@implementation RNRootView
-
-// Monkey-patch RCTRootView.runApplication to avoid logging initial props.
-- (void)runApplication:(RCTBridge *)bridge
-{
-    NSString *moduleName = [self valueForKey:@"_moduleName"] ?: @"";
-    RCTRootContentView *_contentView = [self valueForKey:@"_contentView"];
-    NSNumber *reactTag = [_contentView valueForKey:@"reactTag"];
-
-    NSDictionary *appParameters = @{
-                                    @"rootTag": reactTag,
-                                    @"initialProps": self.appProperties ?: @{},
-                                    };
-#if DEBUG
-    RCTLogInfo(@"Running application %@ (%@)", moduleName, appParameters);
-#endif
-
-    [bridge enqueueJSCall:@"AppRegistry"
-                   method:@"runApplication"
-                     args:@[moduleName, appParameters]
-               completion:NULL];
-}
-
-@end

ios/sdk/src/analytics/AmplitudeModule.m

@@ -33,10 +33,6 @@ RCT_EXPORT_METHOD(init:(NSString*)instanceName API_KEY:(NSString*)apiKey) {
     [[Amplitude instanceWithName:instanceName] initializeApiKey:apiKey];
 }
 
-RCT_EXPORT_METHOD(setUserId:(NSString*)instanceName userId: (NSString *) userId) {
-    [[Amplitude instanceWithName:instanceName] setUserId:userId];
-}
-
 RCT_EXPORT_METHOD(setUserProperties:(NSString*)instanceName userPropsString:(NSDictionary*)userProps) {
     if (userProps != nil) {
         [[Amplitude instanceWithName:instanceName] setUserProperties:userProps];

ios/sdk/src/callkit/CallKit.m

@@ -26,7 +26,6 @@
 #import <React/RCTBridge.h>
 #import <React/RCTEventEmitter.h>
 #import <React/RCTUtils.h>
-#import <WebRTC/WebRTC.h>
 
 #import <JitsiMeet/JitsiMeet-Swift.h>
 
@@ -308,35 +307,21 @@ RCT_EXPORT_METHOD(updateCall:(NSString *)callUUID
                        startedConnectingAt:nil];
 }
 
-- (void) providerDidActivateAudioSessionWithSession:(AVAudioSession *)session {
+// The following just help with debugging:
 #ifdef DEBUG
+
+- (void) providerDidActivateAudioSessionWithSession:(AVAudioSession *)session {
     NSLog(@"[RNCallKit][CXProviderDelegate][provider:didActivateAudioSession:]");
-#endif
-    [[RTCAudioSession sharedInstance] audioSessionDidActivate:session];
 }
 
 - (void) providerDidDeactivateAudioSessionWithSession:(AVAudioSession *)session {
-#ifdef DEBUG
     NSLog(@"[RNCallKit][CXProviderDelegate][provider:didDeactivateAudioSession:]");
-#endif
-    [[RTCAudioSession sharedInstance] audioSessionDidDeactivate:session];
 }
 
 - (void) providerTimedOutPerformingActionWithAction:(CXAction *)action {
-#ifdef DEBUG
     NSLog(@"[RNCallKit][CXProviderDelegate][provider:timedOutPerformingAction:]");
+}
+
 #endif
-}
-
-
-// The bridge might already be invalidated by the time a CallKit event is processed,
-// just ignore it and don't emit it.
-- (void)sendEventWithName:(NSString *)name body:(id)body {
-    if (!self.bridge) {
-        return;
-    }
-
-    [super sendEventWithName:name body:body];
-}
 
 @end

ios/sdk/src/callkit/JMCallKitEmitter.swift

@@ -21,7 +21,6 @@ import Foundation
 internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
 
     private let listeners = NSMutableArray()
-    private var pendingMuteActions = Set<UUID>()
 
     internal override init() {}
 
@@ -37,12 +36,6 @@ internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
         listeners.remove(listener)
     }
 
-    // MARK: - Add mute action
-
-    func addMuteAction(_ actionUUID: UUID) {
-        pendingMuteActions.insert(actionUUID)
-    }
-
     // MARK: - CXProviderDelegate
 
     func providerDidReset(_ provider: CXProvider) {
@@ -50,7 +43,6 @@ internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
             let listener = $0 as! JMCallKitListener
             listener.providerDidReset?()
         }
-        pendingMuteActions.removeAll()
     }
 
     func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
@@ -72,20 +64,9 @@ internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
     }
 
     func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) {
-        let uuid = pendingMuteActions.remove(action.uuid)
-
-        // Avoid mute actions ping-pong: if the mute action was caused by
-        // the JS side (we requested a transaction) don't call the delegate
-        // method. If it was called by the provder itself (when the user presses
-        // the mute button in the CallKit view) then call the delegate method.
-        //
-        // NOTE: don't try to be clever and remove this. Been there, done that.
-        // Won't work.
-        if (uuid == nil) {
-            listeners.forEach {
-                let listener = $0 as! JMCallKitListener
-                listener.performSetMutedCall?(UUID: action.callUUID, isMuted: action.isMuted)
-            }
+        listeners.forEach {
+            let listener = $0 as! JMCallKitListener
+            listener.performSetMutedCall?(UUID: action.callUUID, isMuted: action.isMuted)
         }
 
         action.fulfill()

ios/sdk/src/callkit/JMCallKitProxy.swift

@@ -160,14 +160,6 @@ import Foundation
             completion: @escaping (Error?) -> Swift.Void) {
         guard enabled else { return }
 
-        // XXX keep track of muted actions to avoid "ping-pong"ing. See
-        // JMCallKitEmitter for details on the CXSetMutedCallAction handling.
-        for action in transaction.actions {
-            if (action as? CXSetMutedCallAction) != nil {
-                emitter.addMuteAction(action.uuid)
-            }
-        }
-
         callController.request(transaction, completion: completion)
     }
 
@@ -195,4 +187,3 @@ import Foundation
         return update
     }
 }
-

ios/travis-ci/build-ipa.sh

@@ -98,13 +98,11 @@ curl -L -o ${CERT_DIR}/AppleWWDRCA.cer 'http://developer.apple.com/certification
 curl -L -o ${CERT_DIR}/dev-cert.cer.enc ${IOS_DEV_CERT_URL}
 curl -L -o ${CERT_DIR}/dev-key.p12.enc ${IOS_DEV_CERT_KEY_URL}
 curl -L -o ${CERT_DIR}/dev-profile.mobileprovision.enc ${IOS_DEV_PROV_PROFILE_URL}
-curl -L -o ${CERT_DIR}/dev-watch-profile.mobileprovision.enc ${IOS_DEV_WATCH_PROV_PROFILE_URL}
 curl -L -o ${CERT_DIR}/id_rsa.enc ${DEPLOY_SSH_CERT_URL}
 
 openssl aes-256-cbc -k "$ENCRYPTION_PASSWORD" -in ${CERT_DIR}/dev-cert.cer.enc -d -a -out ${CERT_DIR}/dev-cert.cer
 openssl aes-256-cbc -k "$ENCRYPTION_PASSWORD" -in ${CERT_DIR}/dev-key.p12.enc -d -a -out ${CERT_DIR}/dev-key.p12
 openssl aes-256-cbc -k "$ENCRYPTION_PASSWORD" -in ${CERT_DIR}/dev-profile.mobileprovision.enc -d -a -out ${CERT_DIR}/dev-profile.mobileprovision
-openssl aes-256-cbc -k "$ENCRYPTION_PASSWORD" -in ${CERT_DIR}/dev-watch-profile.mobileprovision.enc -d -a -out ${CERT_DIR}/dev-watch-profile.mobileprovision
 openssl aes-256-cbc -k "$ENCRYPTION_PASSWORD" -in ${CERT_DIR}/id_rsa.enc -d -a -out ${CERT_DIR}/id_rsa
 chmod 0600 ${CERT_DIR}/id_rsa
 
@@ -128,13 +126,9 @@ echo "done set-key-partition-list"
 mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
 
 cp "${CERT_DIR}/dev-profile.mobileprovision"  ~/Library/MobileDevice/Provisioning\ Profiles/
-cp "${CERT_DIR}/dev-watch-profile.mobileprovision"  ~/Library/MobileDevice/Provisioning\ Profiles/
 
 npm install
 
-# Ever since the Apple Watch app has been added the bitcode for WebRTC needs to be downloaded in order to build successfully
-./node_modules/react-native-webrtc/tools/downloadBitcode.sh
-
 cd ios
 pod update
 pod install
@@ -152,12 +146,4 @@ xcodebuild -quiet -exportArchive -archivePath /tmp/jitsi-meet/jitsi-meet.xcarchi
 
 echo "Will try deploy the .ipa to: ${IPA_DEPLOY_LOCATION}"
 
-ssh-add ${CERT_DIR}/id_rsa
-
-if [ ! -z ${SCP_PROXY_HOST} ];
-then
-    scp -o ProxyCommand="ssh -t -A -l %r ${SCP_PROXY_HOST} -o \"StrictHostKeyChecking no\" -o \"BatchMode yes\" -W %h:%p"  -o StrictHostKeyChecking=no -o LogLevel=DEBUG "${IPA_EXPORT_DIR}/jitsi-meet.ipa" "${IPA_DEPLOY_LOCATION}"
-else
-    scp -o StrictHostKeyChecking=no -o LogLevel=DEBUG "${IPA_EXPORT_DIR}/jitsi-meet.ipa" "${IPA_DEPLOY_LOCATION}"
-fi
-
+scp -i ${CERT_DIR}/id_rsa -o StrictHostKeyChecking=no -o LogLevel=DEBUG "${IPA_EXPORT_DIR}/jitsi-meet.ipa" "${IPA_DEPLOY_LOCATION}"

lang/languages-bg.json

@@ -1,19 +1,11 @@
 {
     "en": "Английски",
-    "af": "",
-    "az": "",
     "bg": "Български",
-    "cs": "",
     "de": "Немски",
-    "el": "",
-    "eo": "Есперанто",
     "es": "Испански",
     "fr": "Френски",
     "hy": "Арменски",
     "it": "Италиански",
-    "ja": "",
-    "ko": "",
-    "nb": "Норвежки букмол",
     "oc": "Окситански",
     "pl": "Полски",
     "ptBR": "Португалски (Бразилия)",
@@ -22,6 +14,7 @@
     "sl": "Словенски",
     "sv": "Шведски",
     "tr": "Турски",
-    "vi": "",
-    "zhCN": "Китайски (Китай)"
+    "zhCN": "Китайски (Китай)",
+    "nb": "Норвежки букмол",
+    "eo": "Есперанто"
 }

lang/languages-de.json

@@ -1,18 +1,11 @@
 {
     "en": "Englisch",
-    "az": "",
     "bg": "Bulgarisch",
-    "cs": "",
     "de": "Deutsch",
-    "el": "",
-    "eo": "Esperanto",
     "es": "Spanisch",
     "fr": "Französisch",
     "hy": "Armenisch",
     "it": "Italienisch",
-    "ja": "",
-    "ko": "",
-    "nb": "Norwegisch (Bokmal)",
     "oc": "Okzitanisch",
     "pl": "Polnisch",
     "ptBR": "Portugiesisch (Brasilien)",
@@ -21,6 +14,7 @@
     "sl": "Slowenisch",
     "sv": "Schwedisch",
     "tr": "Türkisch",
-    "vi": "",
-    "zhCN": "Chinesisch (China)"
+    "zhCN": "Chinesisch (China)",
+    "nb": "Norwegisch (Bokmal)",
+    "eo": "Esperanto"
 }

lang/languages-hr.json

@@ -1,27 +0,0 @@
-{
-    "en": "",
-    "af": "",
-    "az": "",
-    "bg": "",
-    "cs": "",
-    "de": "",
-    "el": "",
-    "eo": "",
-    "es": "",
-    "fr": "",
-    "hy": "",
-    "it": "",
-    "ja": "",
-    "ko": "",
-    "nb": "",
-    "oc": "",
-    "pl": "",
-    "ptBR": "",
-    "ru": "",
-    "sk": "",
-    "sl": "",
-    "sv": "",
-    "tr": "",
-    "vi": "",
-    "zhCN": ""
-}

lang/main-de.json

@@ -35,43 +35,31 @@
         "raiseHand": "Hand erheben",
         "pushToTalk": "Drücken um zu sprechen",
         "toggleScreensharing": "Zwischen Kamera und Bildschirmfreigabe wechseln",
-        "toggleFilmstrip": "",
-        "toggleShortcuts": "",
+        "toggleFilmstrip": "Videos anzeigen oder verbergen",
+        "toggleShortcuts": "Hilfe-Menu anzeigen oder verdecken",
         "focusLocal": "Lokales Video fokussieren",
         "focusRemote": "Auf das Video eines anderen Teilnehmers fokussieren",
         "toggleChat": "Chat öffnen oder schliessen",
         "mute": "Stummschaltung aktivieren oder deaktivieren",
         "fullScreen": "Vollbildmodus aktivieren / deaktivieren",
         "videoMute": "Kamera starten oder stoppen",
-        "showSpeakerStats": "Statistiken für Sprecher anzeigen",
-        "localRecording": ""
+        "showSpeakerStats": "Statistiken für Sprecher anzeigen"
     },
-    "\u0005keyboardShortcuts": {},
     "welcomepage": {
-        "accessibilityLabel": {
-            "join": "",
-            "roomname": "Konferenzname eingeben"
-        },
         "appDescription": "Auf geht's! Beginne eine Videokonferenz mit dem ganzen Team. Oder eigentlich, lade alle ein die du kennst. __app__ ist eine vollständig verschlüsselte, aus 100% Open-Source-Software bestehende Videokonferenzlösung die du den ganzen Tag kostenlos verwenden kannst — ohne Registrierung.",
         "audioVideoSwitch": {
             "audio": "Sprache",
             "video": "Video"
         },
         "calendar": "Kalender",
-        "connectCalendarText": "",
-        "connectCalendarButton": "",
-        "enterRoomTitle": "",
         "go": "Los",
         "join": "Beitreten",
         "privacy": "Privatsphäre",
-        "recentList": "",
-        "recentListDelete": "",
-        "recentListEmpty": "",
         "roomname": "Konferenzname eingeben",
         "roomnameHint": "Name oder URL der Konferenz der Sie beitreten möchten. Sie können einen Namen erfinden, er muss nur den anderen Teilnehmern übermittelt werden damit sie der gleichen Konferenz beitreten.",
         "sendFeedback": "Senden Sie uns Ihr Feedback",
         "terms": "Bedingungen",
-        "title": ""
+        "title": "Sichere, flexible und vollständig freie Videokonferenzen"
     },
     "startupoverlay": {
         "policyText": "",
@@ -83,41 +71,8 @@
         "rejoinKeyTitle": "Erneut teilnehmen"
     },
     "toolbar": {
-        "accessibilityLabel": {
-            "audioOnly": "",
-            "audioRoute": "",
-            "callQuality": "Qualitätseinstellungen",
-            "chat": "",
-            "cc": "",
-            "document": "Geteiltes Dokument schliessen",
-            "feedback": "Feedback hinterlasen",
-            "fullScreen": "",
-            "hangup": "",
-            "invite": "Teilnehmer einladen",
-            "localRecording": "",
-            "lockRoom": "",
-            "moreActions": "",
-            "moreActionsMenu": "",
-            "mute": "",
-            "pip": "",
-            "profile": "Profil bearbeiten",
-            "raiseHand": "",
-            "recording": "",
-            "Settings": "",
-            "sharedvideo": "",
-            "shareRoom": "",
-            "shareYourScreen": "",
-            "shortcuts": "",
-            "speakerStats": "",
-            "toggleCamera": "",
-            "tileView": "",
-            "videomute": ""
-        },
         "addPeople": "Teilnehmer zur Konferenz hinzufügen",
         "audioonly": "Nur-Audio-Modus aktivieren/deaktivieren (spart Bandbreite)",
-        "audioOnlyOn": "Nur-Audio-Modus aktivieren/deaktivieren (spart Bandbreite)",
-        "audioOnlyOff": "",
-        "audioRoute": "",
         "callQuality": "Qualitätseinstellungen",
         "enterFullScreen": "Vollbildmodus",
         "exitFullScreen": "Vollbildmodus verlassen",
@@ -131,8 +86,8 @@
         "etherpad": "Geteiltes Dokument öffnen / schliessen",
         "documentOpen": "Geteiltes Dokument öffnen",
         "documentClose": "Geteiltes Dokument schliessen",
-        "shareRoom": "",
         "sharedvideo": "YouTube-Video teilen",
+        "sharescreen": "Bildschirmfreigabe",
         "stopSharedVideo": "YouTube Video stoppen",
         "fullscreen": "Vollbildmodus aktivieren / deaktivieren",
         "sip": "SIP Nummer anrufen",
@@ -141,40 +96,25 @@
         "login": "Anmelden",
         "logout": "Abmelden",
         "sharedVideoMutedPopup": "Das freigegebene Video wurde stumm geschaltet um mit den anderen Teilnehmern zu sprechen.",
-        "toggleCamera": "",
         "micMutedPopup": "Das Mikrofon wurde stumm geschaltet um das freigegebene Video geniessen zu können.",
         "talkWhileMutedPopup": "Versuchen sie zu sprechen? Ihr Mikrofon ist stummgeschaltet.",
         "unableToUnmutePopup": "Die Stummschaltung kann nicht aufgehoben werden während das geteilte Video abgespielt wird.",
         "cameraDisabled": "Keine Kamera verfügbar",
         "micDisabled": "Kein Mikrofon verfügbar",
         "filmstrip": "Videos anzeigen / verbergen",
-        "pip": "",
         "profile": "Profil bearbeiten",
         "raiseHand": "Hand erheben",
         "shortcuts": "Tastenkürzel anzeigen",
-        "speakerStats": "Sprecher-Statistiken",
-        "tileViewToggle": "",
-        "invite": "Teilnehmer einladen"
-    },
-    "\u0005toolbar": {
-        "accessibilityLabel": {}
+        "speakerStats": "Sprecher-Statistiken"
     },
     "chat": {
         "nickname": {
             "title": "Name eingeben",
             "popover": "Name"
         },
-        "error": "",
         "messagebox": "Text eingeben..."
     },
     "settings": {
-        "calendar": {
-            "about": "",
-            "disconnect": "Getrennt",
-            "microsoftSignIn": "",
-            "signedIn": "",
-            "title": "Kalender"
-        },
         "title": "Einstellungen",
         "update": "Aktualisieren",
         "name": "Name",
@@ -184,18 +124,11 @@
         "selectMic": "Mikrofon",
         "selectAudioOutput": "Audioausgabe",
         "followMe": "Follow-me für alle Teilnehmer",
-        "language": "",
-        "loggedIn": "",
         "noDevice": "Kein",
         "cameraAndMic": "Kamera und Mikrofon",
-        "moderator": "Moderator",
-        "more": "",
+        "moderator": "MODERATOR",
         "password": "PASSWORT SETZEN",
-        "audioVideo": "AUDIO UND VIDEO",
-        "devices": ""
-    },
-    "\u0005settings": {
-        "calendar": {}
+        "audioVideo": "AUDIO UND VIDEO"
     },
     "profile": {
         "title": "Profil",
@@ -215,9 +148,7 @@
     },
     "connectionindicator": {
         "header": "Verbindungsdaten",
-        "connectedTo": "",
         "bitrate": "Bitrate:",
-        "bridgeCount": "",
         "packetloss": "Paketverlust:",
         "resolution": "Auflösung:",
         "framerate": "Bildwiederholrate:",
@@ -256,6 +187,7 @@
         "focus": "Konferenz-Organisator",
         "focusFail": "__component__ ist im Moment nicht verfügbar - wiederholen in __ms__ Sekunden",
         "grantedTo": "Moderatorenrechte an __to__ vergeben.",
+        "grantedToUnknown": "Moderatorenrechte an $t(notify.somebody) vergeben.",
         "muted": "Der Konferenz wurde stumm beigetreten.",
         "mutedTitle": "Stummschaltung aktiv!",
         "raisedHand": "Möchte sprechen.",
@@ -263,13 +195,8 @@
         "suboptimalExperienceDescription": "Tut uns leid, aber die Konferenz wird mit __appName__ kein grossartiges Erlebnis. Wir versuchen immer die Situation zu verbessern, bis dahin empfehlen wir aber die Verwendung einer der <a href=\"static/recommendedBrowsers.html\" target=\"_blank\">vollständig unterstützen Browser</a>."
     },
     "dialog": {
-        "accessibilityLabel": {
-            "liveStreaming": "Livestream:"
-        },
         "allow": "Erlauben",
-        "confirm": "",
         "kickMessage": "Oh! Sie wurden aus der Konferenz ausgeschlossen.",
-        "kickTitle": "",
         "popupErrorTitle": "Popup blockiert",
         "popupError": "Ihr Browser blockiert Popups von dieser Website. Bitte aktivieren Sie Popups in den Sicherheitseinstellungen des Browsers und versuchen Sie es erneut.",
         "passwordErrorTitle": "Passwort-Fehler",
@@ -292,7 +219,6 @@
         "rejoinNow": "Jetzt erneut beitreten",
         "maxUsersLimitReachedTitle": "Maximale Anzahl Teilnehmer ist erreicht",
         "maxUsersLimitReached": "Das Limit der maximalen Anzahl Teilnehmer wurde erreicht. Die Konferenz ist voll. Bitte benachrichtigen Sie den Konferenzorganisator oder versuchen Sie es später noch einmal.",
-        "lockRoom": "",
         "lockTitle": "Sperren fehlgeschlagen",
         "lockMessage": "Die Konferenz konnte nicht gesperrt werden.",
         "warning": "Warnung",
@@ -340,7 +266,6 @@
         "reservationError": "Fehler im Reservationssystem",
         "reservationErrorMsg": "Fehler, Nummer: __code__, Nachricht: __msg__",
         "password": "Passwort eingeben",
-        "unlockRoom": "",
         "userPassword": "Benutzerpasswort",
         "token": "Token",
         "tokenAuthFailedTitle": "Authentifizierung fehlgeschlagen",
@@ -353,7 +278,7 @@
         "sorryFeedback": "Tut uns leid. Möchten Sie uns mehr mitteilen?",
         "liveStreaming": "Live-Streaming",
         "streamKey": "Name/Schlüssel für den Stream",
-        "startLiveStreaming": "Einen Livestream starten",
+        "startLiveStreaming": "Live-Streaming starten",
         "startRecording": "Aufnahme starten",
         "stopStreamingWarning": "Sind Sie sicher dass Sie das Live-Streaming stoppen möchten?",
         "stopRecordingWarning": "Sind Sie sicher dass Sie die Aufnahme stoppen möchten?",
@@ -387,10 +312,6 @@
         "muteParticipantTitle": "Diesen Teilnehmer stummschalten?",
         "muteParticipantBody": "Sie können die Stummschaltung anderer Teilnehmer nicht aufheben, aber ein Teilnehmer kann seine eigene Stummschaltung jederzeit beenden.",
         "muteParticipantButton": "Stummschalten",
-        "liveStreamingDisabledTooltip": "",
-        "liveStreamingDisabledForGuestTooltip": "",
-        "recordingDisabledTooltip": "",
-        "recordingDisabledForGuestTooltip": "",
         "remoteControlTitle": "Fernsteuerung",
         "remoteControlRequestMessage": "Möchten Sie __user__ erlauben den Computer fernzusteuern?",
         "remoteControlShareScreenWarning": "Achtung, wenn Sie die Anfrage genehmigen starten Sie die Bildschirmfreigabe!",
@@ -401,15 +322,10 @@
         "remoteControlStopMessage": "Die Fernsteuerung wurde beendet.",
         "close": "Schliessen",
         "shareYourScreen": "Bildschirm freigeben",
-        "shareYourScreenDisabled": "",
-        "shareYourScreenDisabledForGuest": "",
         "yourEntireScreen": "Ganzer Bildschirm",
-        "applicationWindow": "Anwendungsfenster",
-        "transcribing": ""
-    },
-    "\u0005dialog": {
-        "accessibilityLabel": {}
+        "applicationWindow": "Anwendungsfenster"
     },
+    "\u0005dialog": {},
     "email": {
         "sharedKey": [
             "Diese Konferenz ist passwortgeschützt. Bitte verwenden Sie diese PIN zum Beitreten:",
@@ -441,10 +357,6 @@
         ],
         "and": "und"
     },
-    "share": {
-        "mainText": "",
-        "dialInfoText": ""
-    },
     "connection": {
         "ERROR": "Fehler",
         "CONNECTING": "Verbindung wird hergestellt",
@@ -458,44 +370,18 @@
         "ATTACHED": "Angehängt"
     },
     "recording": {
-        "beta": "",
         "busy": "Es werden Resourcen für eine Aufnahme bereitgestellt. Bitte in ein paar Minuten erneut versuchen.",
         "busyTitle": "Alle Aufnahme-Instanzen sind in Gebrauch",
         "buttonTooltip": "Aufnahme starten / stoppen",
         "error": "Die Aufzeichnung ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
-        "expandedOff": "",
-        "expandedOn": "",
-        "expandedPending": "",
         "failedToStart": "Die Aufnahme konnte nicht gestartet werden",
-        "live": "",
         "off": "Aufnahme gestoppt",
         "on": "Aufnahme",
-        "pending": "",
-        "rec": "",
-        "authDropboxText": "",
+        "pending": "Die Aufnahme wartet auf den Beitritt eines Teilnehmers...",
         "serviceName": "Aufnahmedienst",
-        "signOut": "",
-        "signIn": "",
-        "loggedIn": "",
-        "availableSpace": "",
-        "startRecordingBody": "Sind Sie sicher dass Sie die Aufnahme stoppen möchten?",
         "unavailable": "Oh! Der __serviceName__ ist aktuell nicht verfügbar. Wir arbeiten an der Behebung des Problems. Bitte versuchen Sie es später noch einmal.",
         "unavailableTitle": "Aufnahme nicht verfügbar"
     },
-    "\u0005recording": {},
-    "transcribing": {
-        "pending": "",
-        "off": "",
-        "error": "Die Aufzeichnung ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
-        "expandedLabel": "",
-        "failedToStart": "",
-        "tr": "",
-        "labelToolTip": "",
-        "ccButtonTooltip": "",
-        "start": "",
-        "stop": ""
-    },
-    "\u0005transcribing": {},
     "liveStreaming": {
         "busy": "Es werden Resourcen zum Streamen bereitgestellt. Bitte in ein paar Minuten erneut versuchen.",
         "busyTitle": "Alle Streaming-Instanzen sind in Gebrauch",
@@ -506,24 +392,17 @@
         "enterStreamKey": "Name/Schlüssel für den YouTube Livestream hier eingeben.",
         "error": "Das Live-Streaming ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
         "errorAPI": "Beim abrufen der YouTube Livestreams ist ein Fehler aufgetreten. Bitte versuchen Sie sich erneut anzumelden.",
-        "errorLiveStreamNotEnabled": "",
-        "expandedOff": "",
-        "expandedOn": "",
-        "expandedPending": "",
         "failedToStart": "Live-Streaming konnte nicht gestartet werden",
         "off": "Live-Streaming gestoppt",
         "on": "Live-Streaming",
         "pending": "Live-Stream wird gestartet...",
         "serviceName": "Live Streaming-Dienst",
-        "signedInAs": "",
         "signIn": "Mit Google anmelden",
-        "signOut": "",
         "signInCTA": "Anmelden oder den Name/Schlüssel des YouTube Livestreams eingeben.",
         "start": "Einen Livestream starten",
         "streamIdHelp": "Was ist das?",
         "unavailableTitle": "Live-Streaming nicht verfügbar"
     },
-    "\u0005liveStreaming": {},
     "videoSIPGW": {
         "busy": "Es stehen keine freien Ressourcen zur Verfügung. Bitte versuchen Sie es später noch einmal.",
         "busyTitle": "Keine freien Ressourcen",
@@ -549,11 +428,9 @@
         "noPermission": "Berechtigungen nicht erteilt",
         "previewUnavailable": "Keine Vorschau verfügbar",
         "selectADevice": "Ein Gerät wählen",
-        "testAudio": ""
+        "testAudio": "Audio testen"
     },
     "videoStatus": {
-        "audioOnly": "",
-        "audioOnlyExpanded": "",
         "callQuality": "Konferenzqualität",
         "hd": "HD",
         "hdTooltip": "Video wird in HD angezeigt",
@@ -581,8 +458,7 @@
         "add": "Einladen",
         "countryNotSupported": "Wir unterstützen dieses Land noch nicht.",
         "countryReminder": "Telefonnummer nicht in den USA? Bitte sicherstellen, dass die Telefonnummer mit dem Ländercode beginnt.",
-        "disabled": "Sie können keine Teilnehmer einladen.",
-        "footerText": "",
+        "disabled": "",
         "invite": "Einladen",
         "loading": "Suche nach Teilnehmern und Telefonnummern",
         "loadingNumber": "Telefonnummer wird überprüft",
@@ -619,7 +495,6 @@
         "veryGood": "Sehr gut"
     },
     "info": {
-        "accessibilityLabel": "",
         "addPassword": "Passwort hinzufügen",
         "cancelPassword": "Password abbrechen",
         "conferenceURL": "Link:",
@@ -641,7 +516,7 @@
         "numbers": "Einwählnummern",
         "password": "Passwort:",
         "title": "Teilen",
-        "tooltip": ""
+        "tooltip": "Zugriffsinformationen über die Konferenz abrufen"
     },
     "settingsView": {
         "alertOk": "OK",
@@ -657,22 +532,17 @@
         "startWithVideoMuted": "Ohne Video beitreten"
     },
     "calendarSync": {
-        "addMeetingURL": "",
-        "confirmAddLink": "",
-        "confirmAddLinkTitle": "Kalender",
-        "join": "",
-        "joinTooltip": "",
+        "later": "Später",
+        "next": "Folgend",
         "nextMeeting": "Nächste Konferenz",
-        "noEvents": "",
-        "ongoingMeeting": "",
+        "now": "Jetzt",
         "permissionButton": "Einstellungen öffnen",
-        "permissionMessage": "Die App benötigt Zugriff auf den Kalender um die Termine und Konferenzen anzuzeigen.",
-        "refresh": "",
-        "today": "Heute"
+        "permissionMessage": "Die App benötigt Zugriff auf den Kalender um die Termine und Konferenzen anzuzeigen."
     },
-    "\u0005calendarSync": {},
     "recentList": {
-        "joinPastMeeting": ""
+        "today": "Heute",
+        "yesterday": "Gestern",
+        "earlier": "Früher"
     },
     "sectionList": {
         "pullToRefresh": "Ziehen um zu aktualisieren"
@@ -685,62 +555,5 @@
         "appNotInstalled": "Sie benötigen die __app__ App um der Konferenz auf dem Smartphone beizutreten.",
         "downloadApp": "App herunterladen",
         "openApp": "In der App fortfahren"
-    },
-    "presenceStatus": {
-        "invited": "Einladen",
-        "ringing": "",
-        "calling": "",
-        "initializingCall": "",
-        "connected": "Verbunden",
-        "connecting": "Verbindung wird hergestellt",
-        "connecting2": "",
-        "disconnected": "Getrennt",
-        "busy": "",
-        "rejected": "",
-        "ignored": "",
-        "expired": ""
-    },
-    "\u0005presenceStatus": {},
-    "dateUtils": {
-        "today": "Heute",
-        "yesterday": "Gestern",
-        "earlier": "Früher"
-    },
-    "incomingCall": {
-        "answer": "",
-        "audioCallTitle": "",
-        "decline": "OK",
-        "productLabel": "",
-        "videoCallTitle": ""
-    },
-    "localRecording": {
-        "localRecording": "",
-        "dialogTitle": "",
-        "start": "Aufnahme starten",
-        "stop": "Aufnahme stoppen",
-        "moderator": "Moderator",
-        "me": "Ich",
-        "duration": "",
-        "durationNA": "",
-        "encoding": "",
-        "participantStats": "",
-        "participant": "Teilnehmer",
-        "sessionToken": "",
-        "clientState": {
-            "on": "",
-            "off": "",
-            "unknown": ""
-        },
-        "messages": {
-            "engaged": "",
-            "finished": "",
-            "finishedModerator": "",
-            "notModerator": ""
-        },
-        "yes": "Ja",
-        "no": "",
-        "label": "",
-        "labelToolTip": ""
-    },
-    "\u0005localRecording": {}
+    }
 }

lang/main-hr.json

@@ -1,746 +0,0 @@
-{
-    "addPeople": {
-        "add": "",
-        "countryNotSupported": "",
-        "countryReminder": "",
-        "disabled": "",
-        "failedToAdd": "",
-        "footerText": "",
-        "invite": "",
-        "loading": "",
-        "loadingNumber": "",
-        "loadingPeople": "",
-        "noResults": "",
-        "notAvailable": "",
-        "noValidNumbers": "",
-        "searchNumbers": "",
-        "searchPeople": "",
-        "searchPeopleAndNumbers": "",
-        "telephone": "",
-        "title": ""
-    },
-    "audioDevices": {
-        "bluetooth": "",
-        "headphones": "",
-        "phone": "",
-        "speaker": ""
-    },
-    "audioOnly": {
-        "audioOnly": "",
-        "featureToggleDisabled": ""
-    },
-    "calendarSync": {
-        "addMeetingURL": "",
-        "confirmAddLink": "",
-        "confirmAddLinkTitle": "",
-        "error": {
-            "appConfiguration": "",
-            "generic": "",
-            "notSignedIn": ""
-        },
-        "join": "",
-        "joinTooltip": "",
-        "nextMeeting": "",
-        "noEvents": "",
-        "ongoingMeeting": "",
-        "permissionButton": "",
-        "permissionMessage": "",
-        "refresh": "",
-        "today": ""
-    },
-    "chat": {
-        "error": "",
-        "messagebox": "",
-        "nickname": {
-            "popover": "",
-            "title": ""
-        },
-        "title": ""
-    },
-    "connection": {
-        "ATTACHED": "",
-        "AUTHENTICATING": "",
-        "AUTHFAIL": "",
-        "CONNECTED": "",
-        "CONNECTING": "",
-        "CONNFAIL": "",
-        "DISCONNECTED": "",
-        "DISCONNECTING": "",
-        "ERROR": "",
-        "RECONNECTING": ""
-    },
-    "connectionindicator": {
-        "address": "",
-        "bandwidth": "",
-        "bitrate": "",
-        "bridgeCount": "",
-        "connectedTo": "",
-        "framerate": "",
-        "header": "",
-        "less": "",
-        "localaddress": "",
-        "localaddress_plural_2": "",
-        "localport": "",
-        "localport_plural_2": "",
-        "more": "",
-        "na": "",
-        "packetloss": "",
-        "quality": {
-            "good": "",
-            "inactive": "",
-            "lost": "",
-            "nonoptimal": "",
-            "poor": ""
-        },
-        "remoteaddress": "",
-        "remoteaddress_plural_2": "",
-        "remoteport": "",
-        "remoteport_plural_2": "",
-        "resolution": "",
-        "status": "",
-        "transport": "",
-        "transport_plural_2": "",
-        "turn": ""
-    },
-    "contactlist_plural": "",
-    "dateUtils": {
-        "earlier": "",
-        "today": "",
-        "yesterday": ""
-    },
-    "deepLinking": {
-        "appNotInstalled": "",
-        "description": "",
-        "downloadApp": "",
-        "launchWebButton": "",
-        "openApp": "",
-        "title": "",
-        "tryAgainButton": ""
-    },
-    "defaultLink": "",
-    "defaultNickname": "",
-    "deviceError": {
-        "cameraError": "",
-        "cameraPermission": "",
-        "microphoneError": "",
-        "microphonePermission": ""
-    },
-    "deviceSelection": {
-        "deviceSettings": "",
-        "noPermission": "",
-        "previewUnavailable": "",
-        "selectADevice": "",
-        "testAudio": ""
-    },
-    "dialog": {
-        "accessibilityLabel": {
-            "liveStreaming": ""
-        },
-        "allow": "",
-        "alreadySharedVideoMsg": "",
-        "alreadySharedVideoTitle": "",
-        "applicationWindow": "",
-        "Back": "",
-        "cameraConstraintFailedError": "",
-        "cameraNotFoundError": "",
-        "cameraNotSendingData": "",
-        "cameraNotSendingDataTitle": "",
-        "cameraPermissionDeniedError": "",
-        "cameraUnknownError": "",
-        "cameraUnsupportedResolutionError": "",
-        "Cancel": "",
-        "close": "",
-        "conferenceDisconnectMsg": "",
-        "conferenceDisconnectTitle": "",
-        "conferenceReloadMsg": "",
-        "conferenceReloadTitle": "",
-        "confirm": "",
-        "confirmNo": "",
-        "confirmYes": "",
-        "connectError": "",
-        "connectErrorWithMsg": "",
-        "connecting": "",
-        "contactSupport": "",
-        "copy": "",
-        "currentPassword": "",
-        "defaultError": "",
-        "detectext": "",
-        "dismiss": "",
-        "displayNameRequired": "",
-        "done": "",
-        "doNotShowMessageAgain": "",
-        "enterDisplayName": "",
-        "error": "",
-        "externalInstallationMsg": "",
-        "externalInstallationTitle": "",
-        "failedpermissions": "",
-        "feedbackHelp": "",
-        "feedbackQuestion": "",
-        "goToStore": "",
-        "gracefulShutdown": "",
-        "hungUp": "",
-        "IamHost": "",
-        "incorrectPassword": "",
-        "inlineInstallationMsg": "",
-        "inlineInstallExtension": "",
-        "internalError": "",
-        "internalErrorTitle": "",
-        "joinAgain": "",
-        "kickMessage": "",
-        "kickParticipantButton": "",
-        "kickParticipantDialog": "",
-        "kickParticipantTitle": "",
-        "kickTitle": "",
-        "liveStreaming": "",
-        "liveStreamingDisabledForGuestTooltip": "",
-        "liveStreamingDisabledTooltip": "",
-        "lockMessage": "",
-        "lockRoom": "",
-        "lockTitle": "",
-        "logoutQuestion": "",
-        "logoutTitle": "",
-        "maxUsersLimitReached": "",
-        "maxUsersLimitReachedTitle": "",
-        "micConstraintFailedError": "",
-        "micNotFoundError": "",
-        "micNotSendingData": "",
-        "micNotSendingDataTitle": "",
-        "micPermissionDeniedError": "",
-        "micUnknownError": "",
-        "muteParticipantBody": "",
-        "muteParticipantButton": "",
-        "muteParticipantDialog": "",
-        "muteParticipantTitle": "",
-        "Ok": "",
-        "oops": "",
-        "password": "",
-        "passwordError": "",
-        "passwordError2": "",
-        "passwordErrorTitle": "",
-        "passwordLabel": "",
-        "passwordNotSupported": "",
-        "passwordNotSupportedTitle": "",
-        "passwordRequired": "",
-        "permissionDenied": "",
-        "popupError": "",
-        "popupErrorTitle": "",
-        "recording": "",
-        "recordingDisabledForGuestTooltip": "",
-        "recordingDisabledTooltip": "",
-        "recordingToken": "",
-        "rejoinNow": "",
-        "remoteControlAllowedMessage": "",
-        "remoteControlDeniedMessage": "",
-        "remoteControlErrorMessage": "",
-        "remoteControlRequestMessage": "",
-        "remoteControlShareScreenWarning": "",
-        "remoteControlStopMessage": "",
-        "remoteControlTitle": "",
-        "Remove": "",
-        "removePassword": "",
-        "removeSharedVideoMsg": "",
-        "removeSharedVideoTitle": "",
-        "reservationError": "",
-        "reservationErrorMsg": "",
-        "retry": "",
-        "Save": "",
-        "screenSharingFailedToInstall": "",
-        "screenSharingFailedToInstallTitle": "",
-        "screenSharingFirefoxPermissionDeniedError": "",
-        "screenSharingFirefoxPermissionDeniedTitle": "",
-        "screenSharingPermissionDeniedError": "",
-        "serviceUnavailable": "",
-        "sessTerminated": "",
-        "Share": "",
-        "shareVideoLinkError": "",
-        "shareVideoTitle": "",
-        "shareYourScreen": "",
-        "shareYourScreenDisabled": "",
-        "shareYourScreenDisabledForGuest": "",
-        "SLDFailure": "",
-        "sorryFeedback": "",
-        "SRDFailure": "",
-        "startLiveStreaming": "",
-        "startRecording": "",
-        "startRemoteControlErrorMessage": "",
-        "stopLiveStreaming": "",
-        "stopRecording": "",
-        "stopRecordingWarning": "",
-        "stopStreamingWarning": "",
-        "streamKey": "",
-        "Submit": "",
-        "thankYou": "",
-        "token": "",
-        "tokenAuthFailed": "",
-        "tokenAuthFailedTitle": "",
-        "transcribing": "",
-        "unableToSwitch": "",
-        "unlockRoom": "",
-        "userPassword": "",
-        "WaitForHostMsg": "",
-        "WaitForHostMsgWOk": "",
-        "WaitingForHost": "",
-        "warning": "",
-        "Yes": "",
-        "yourEntireScreen": ""
-    },
-    "dialOut": {
-        "statusMessage": ""
-    },
-    "email": {
-        "and": "",
-        "body": "",
-        "sharedKey": "",
-        "subject": ""
-    },
-    "feedback": {
-        "average": "",
-        "bad": "",
-        "detailsLabel": "",
-        "good": "",
-        "rateExperience": "",
-        "veryBad": "",
-        "veryGood": ""
-    },
-    "incomingCall": {
-        "answer": "",
-        "audioCallTitle": "",
-        "decline": "",
-        "productLabel": "",
-        "videoCallTitle": ""
-    },
-    "info": {
-        "accessibilityLabel": "",
-        "addPassword": "",
-        "cancelPassword": "",
-        "conferenceURL": "",
-        "country": "",
-        "dialANumber": "",
-        "dialInConferenceID": "",
-        "dialInNotSupported": "",
-        "dialInNumber": "",
-        "dialInTollFree": "",
-        "genericError": "",
-        "inviteLiveStream": "",
-        "invitePhone": "",
-        "invitePhoneAlternatives": "",
-        "inviteURL": "",
-        "liveStreamURL": "",
-        "moreNumbers": "",
-        "noNumbers": "",
-        "noPassword": "",
-        "noRoom": "",
-        "numbers": "",
-        "password": "",
-        "title": "",
-        "tooltip": "",
-        "label": ""
-    },
-    "inviteDialog": {
-        "alertOk": "",
-        "alertText": "",
-        "alertTitle": "",
-        "header": "",
-        "searchCallOnlyPlaceholder": "",
-        "searchPeopleOnlyPlaceholder": "",
-        "searchPlaceholder": "",
-        "send": ""
-    },
-    "inlineDialogFailure": {
-        "msg": "",
-        "retry": "",
-        "support": "",
-        "supportMsg": ""
-    },
-    "inviteUrlDefaultMsg": "",
-    "keyboardShortcuts": {
-        "focusLocal": "",
-        "focusRemote": "",
-        "fullScreen": "",
-        "keyboardShortcuts": "",
-        "localRecording": "",
-        "mute": "",
-        "pushToTalk": "",
-        "raiseHand": "",
-        "showSpeakerStats": "",
-        "toggleChat": "",
-        "toggleFilmstrip": "",
-        "toggleScreensharing": "",
-        "toggleShortcuts": "",
-        "videoMute": ""
-    },
-    "liveStreaming": {
-        "busy": "",
-        "busyTitle": "",
-        "buttonTooltip": "",
-        "changeSignIn": "",
-        "choose": "",
-        "chooseCTA": "",
-        "enterStreamKey": "",
-        "error": "",
-        "errorAPI": "",
-        "errorLiveStreamNotEnabled": "",
-        "expandedOff": "",
-        "expandedOn": "",
-        "expandedPending": "",
-        "failedToStart": "",
-        "getStreamKeyManually": "",
-        "invalidStreamKey": "",
-        "off": "",
-        "on": "",
-        "pending": "",
-        "serviceName": "",
-        "signedInAs": "",
-        "signIn": "",
-        "signInCTA": "",
-        "signOut": "",
-        "start": "",
-        "streamIdHelp": "",
-        "unavailableTitle": ""
-    },
-    "localRecording": {
-        "clientState": {
-            "off": "",
-            "on": "",
-            "unknown": ""
-        },
-        "dialogTitle": "",
-        "duration": "",
-        "durationNA": "",
-        "encoding": "",
-        "label": "",
-        "labelToolTip": "",
-        "localRecording": "",
-        "me": "",
-        "messages": {
-            "engaged": "",
-            "finished": "",
-            "finishedModerator": "",
-            "notModerator": ""
-        },
-        "moderator": "",
-        "no": "",
-        "participant": "",
-        "participantStats": "",
-        "sessionToken": "",
-        "start": "",
-        "stop": "",
-        "yes": ""
-    },
-    "me": "",
-    "notify": {
-        "connectedOneMember": "",
-        "connectedThreePlusMembers": "",
-        "connectedTwoMembers": "",
-        "disconnected": "",
-        "focus": "",
-        "focusFail": "",
-        "grantedTo": "",
-        "me": "",
-        "moderator": "",
-        "muted": "",
-        "mutedTitle": "",
-        "raisedHand": "",
-        "somebody": "",
-        "suboptimalExperienceDescription": "",
-        "suboptimalExperienceTitle": ""
-    },
-    "passwordSetRemotely": "",
-    "poweredby": "",
-    "presenceStatus": {
-        "busy": "",
-        "calling": "",
-        "connected": "",
-        "connecting": "",
-        "connecting2": "",
-        "disconnected": "",
-        "expired": "",
-        "ignored": "",
-        "initializingCall": "",
-        "invited": "",
-        "rejected": "",
-        "ringing": ""
-    },
-    "profile": {
-        "setDisplayNameLabel": "",
-        "setEmailInput": "",
-        "setEmailLabel": "",
-        "title": ""
-    },
-    "raisedHand": "",
-    "recentList": {
-        "joinPastMeeting": ""
-    },
-    "recording": {
-        "authDropboxText": "",
-        "availableSpace": "",
-        "beta": "",
-        "busy": "",
-        "busyTitle": "",
-        "buttonTooltip": "",
-        "error": "",
-        "expandedOff": "",
-        "expandedOn": "",
-        "expandedPending": "",
-        "failedToStart": "",
-        "live": "",
-        "loggedIn": "",
-        "off": "",
-        "on": "",
-        "pending": "",
-        "rec": "",
-        "serviceDescription": "",
-        "serviceName": "",
-        "signIn": "",
-        "signOut": "",
-        "startRecordingBody": "",
-        "unavailable": "",
-        "unavailableTitle": ""
-    },
-    "sectionList": {
-        "pullToRefresh": ""
-    },
-    "settings": {
-        "audioVideo": "",
-        "calendar": {
-            "about": "",
-            "disconnect": "",
-            "microsoftSignIn": "",
-            "signedIn": "",
-            "title": ""
-        },
-        "cameraAndMic": "",
-        "devices": "",
-        "followMe": "",
-        "language": "",
-        "loggedIn": "",
-        "moderator": "",
-        "more": "",
-        "name": "",
-        "noDevice": "",
-        "password": "",
-        "selectAudioOutput": "",
-        "selectCamera": "",
-        "selectMic": "",
-        "startAudioMuted": "",
-        "startVideoMuted": "",
-        "title": "",
-        "update": ""
-    },
-    "settingsView": {
-        "alertOk": "",
-        "alertTitle": "",
-        "alertURLText": "",
-        "conferenceSection": "",
-        "displayName": "",
-        "email": "",
-        "header": "",
-        "profileSection": "",
-        "serverURL": "",
-        "startWithAudioMuted": "",
-        "startWithVideoMuted": ""
-    },
-    "share": {
-        "dialInfoText": "",
-        "mainText": ""
-    },
-    "speaker": "",
-    "speakerStats": {
-        "hours": "",
-        "minutes": "",
-        "name": "",
-        "seconds": "",
-        "speakerStats": "",
-        "speakerTime": ""
-    },
-    "startupoverlay": {
-        "policyText": "",
-        "title": ""
-    },
-    "suspendedoverlay": {
-        "rejoinKeyTitle": "",
-        "text": "",
-        "title": ""
-    },
-    "toolbar": {
-        "accessibilityLabel": {
-            "audioOnly": "",
-            "audioRoute": "",
-            "callQuality": "",
-            "cc": "",
-            "chat": "",
-            "document": "",
-            "feedback": "",
-            "fullScreen": "",
-            "hangup": "",
-            "invite": "",
-            "kick": "",
-            "localRecording": "",
-            "lockRoom": "",
-            "moreActions": "",
-            "moreActionsMenu": "",
-            "mute": "",
-            "pip": "",
-            "profile": "",
-            "raiseHand": "",
-            "recording": "",
-            "remoteMute": "",
-            "Settings": "",
-            "sharedvideo": "",
-            "shareRoom": "",
-            "shareYourScreen": "",
-            "shortcuts": "",
-            "speakerStats": "",
-            "tileView": "",
-            "toggleCamera": "",
-            "videomute": ""
-        },
-        "addPeople": "",
-        "audioonly": "",
-        "audioOnlyOff": "",
-        "audioOnlyOn": "",
-        "audioRoute": "",
-        "authenticate": "",
-        "callQuality": "",
-        "cameraDisabled": "",
-        "chat": "",
-        "closeChat": "",
-        "documentClose": "",
-        "documentOpen": "",
-        "enterFullScreen": "",
-        "enterTileView": "",
-        "etherpad": "",
-        "exitFullScreen": "",
-        "exitTileView": "",
-        "feedback": "",
-        "filmstrip": "",
-        "fullscreen": "",
-        "hangup": "",
-        "invite": "",
-        "lock": "",
-        "login": "",
-        "logout": "",
-        "lowerYourHand": "",
-        "micDisabled": "",
-        "micMutedPopup": "",
-        "moreActions": "",
-        "mute": "",
-        "openChat": "",
-        "pip": "",
-        "profile": "",
-        "raiseHand": "",
-        "raiseYourHand": "",
-        "Settings": "",
-        "sharedvideo": "",
-        "sharedVideoMutedPopup": "",
-        "shareRoom": "",
-        "shortcuts": "",
-        "sip": "",
-        "speakerStats": "",
-        "startScreenSharing": "",
-        "startSubtitles": "",
-        "stopScreenSharing": "",
-        "stopSubtitles": "",
-        "stopSharedVideo": "",
-        "talkWhileMutedPopup": "",
-        "tileViewToggle": "",
-        "toggleCamera": "",
-        "unableToUnmutePopup": "",
-        "videomute": ""
-    },
-    "transcribing": {
-        "ccButtonTooltip": "",
-        "error": "",
-        "expandedLabel": "",
-        "failedToStart": "",
-        "labelToolTip": "",
-        "off": "",
-        "pending": "",
-        "start": "",
-        "stop": "",
-        "tr": ""
-    },
-    "userMedia": {
-        "androidGrantPermissions": "",
-        "chromeGrantPermissions": "",
-        "edgeGrantPermissions": "",
-        "electronGrantPermissions": "",
-        "firefoxGrantPermissions": "",
-        "iexplorerGrantPermissions": "",
-        "nwjsGrantPermissions": "",
-        "operaGrantPermissions": "",
-        "react-nativeGrantPermissions": "",
-        "safariGrantPermissions": ""
-    },
-    "videoSIPGW": {
-        "busy": "",
-        "busyTitle": "",
-        "errorAlreadyInvited": "",
-        "errorInvite": "",
-        "errorInviteFailed": "",
-        "errorInviteFailedTitle": "",
-        "errorInviteTitle": "",
-        "pending": "",
-        "serviceName": "",
-        "unavailableTitle": ""
-    },
-    "videoStatus": {
-        "audioOnly": "",
-        "audioOnlyExpanded": "",
-        "callQuality": "",
-        "hd": "",
-        "hdTooltip": "",
-        "highDefinition": "",
-        "labelTooiltipNoVideo": "",
-        "labelTooltipAudioOnly": "",
-        "labelTooltipVideo": "",
-        "ld": "",
-        "ldTooltip": "",
-        "lowDefinition": "",
-        "onlyAudioAvailable": "",
-        "onlyAudioSupported": "",
-        "p2pEnabled": "",
-        "p2pVideoQualityDescription": "",
-        "qualityButtonTip": "",
-        "recHighDefinitionOnly": "",
-        "sd": "",
-        "sdTooltip": "",
-        "standardDefinition": ""
-    },
-    "videothumbnail": {
-        "domute": "",
-        "flip": "",
-        "kick": "",
-        "moderator": "",
-        "mute": "",
-        "muted": "",
-        "remoteControl": "",
-        "videomute": ""
-    },
-    "welcomepage": {
-        "accessibilityLabel": {
-            "join": "",
-            "roomname": ""
-        },
-        "appDescription": "",
-        "audioVideoSwitch": {
-            "audio": "",
-            "video": ""
-        },
-        "calendar": "",
-        "connectCalendarButton": "",
-        "connectCalendarText": "",
-        "enterRoomTitle": "",
-        "go": "",
-        "join": "",
-        "privacy": "",
-        "recentList": "",
-        "recentListDelete": "",
-        "recentListEmpty": "",
-        "roomname": "",
-        "roomnameHint": "",
-        "sendFeedback": "",
-        "terms": "",
-        "title": ""
-    }
-}

lang/main.json

@@ -50,7 +50,7 @@
     },
     "chat": {
         "error": "Error: your message \"__originalText__\" was not sent. Reason: __error__",
-        "messagebox": "Type a message",
+        "messagebox": "Enter text...",
         "nickname": {
             "popover": "Choose a nickname",
             "title": "Enter a nickname to use chat"
@@ -351,15 +351,12 @@
         "dialInConferenceID": "PIN:",
         "dialInNotSupported": "Sorry, dialing in is currently not supported.",
         "dialInNumber": "Dial-in:",
-        "dialInSummaryError": "Error fetching dial-in info now. Please try again later.",
         "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__",
-        "inviteURLFirstPartGeneral": "You are invited to join a meeting.",
-        "inviteURLFirstPartPersonal": "__name__ is inviting you to a meeting.",
-        "inviteURLSecondPart": "\n__moreInfo__\nJoin meeting: __url__\n",
+        "inviteURL": "You are invited to join a meeting.\n__moreInfo__\nJoin meeting: __url__\n",
         "inviteURLMoreInfo": "Meeting ID: __conferenceID__#\n",
         "liveStreamURL": "Live stream:",
         "moreNumbers": "More numbers",
@@ -481,11 +478,11 @@
         "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",
         "newDeviceCameraTitle": "New camera detected",
-        "newDeviceAudioTitle": "New audio device detected",
+        "newDeviceMicTitle": "New microphone detected",
+        "newDeviceCameraTitle": "New audio output detected",
         "newDeviceAction": "Use"
     },
     "passwordSetRemotely": "set by another member",
-    "passwordDigitsOnly": "Up to __number__ digits",
     "poweredby": "powered by",
     "presenceStatus": {
         "busy": "Busy",
@@ -776,7 +773,6 @@
         "enterRoomTitle": "Start a new meeting",
         "go": "GO",
         "join": "JOIN",
-        "info": "Info",
         "privacy": "Privacy",
         "recentList": "Recent",
         "recentListDelete": "Delete",

modules/API/API.js

@@ -8,7 +8,6 @@ import {
 import { 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';
 import { getJitsiMeetTransport } from '../transport';
 
 import { API_ID } from './constants';
@@ -98,11 +97,6 @@ function initCommands() {
             sendAnalytics(createApiEvent('screen.sharing.toggled'));
             toggleScreenSharing();
         },
-        'toggle-tile-view': () => {
-            sendAnalytics(createApiEvent('tile-view.toggled'));
-
-            APP.store.dispatch(toggleTileView());
-        },
         'video-hangup': () => {
             sendAnalytics(createApiEvent('video.hangup'));
             APP.conference.hangup(true);
@@ -559,38 +553,6 @@ class API {
         });
     }
 
-    /**
-     * Notify external application of an unexpected camera-related error having
-     * occurred.
-     *
-     * @param {string} type - The type of the camera error.
-     * @param {string} message - Additional information about the error.
-     * @returns {void}
-     */
-    notifyOnCameraError(type: string, message: string) {
-        this._sendEvent({
-            name: 'camera-error',
-            type,
-            message
-        });
-    }
-
-    /**
-     * Notify external application of an unexpected mic-related error having
-     * occurred.
-     *
-     * @param {string} type - The type of the mic error.
-     * @param {string} message - Additional information about the error.
-     * @returns {void}
-     */
-    notifyOnMicError(type: string, message: string) {
-        this._sendEvent({
-            name: 'mic-error',
-            type,
-            message
-        });
-    }
-
     /**
      * Notify external application (if API is enabled) that conference feedback
      * has been submitted. Intended to be used in conjunction with the
@@ -660,21 +622,6 @@ class API {
         });
     }
 
-    /**
-     * Notify external application (if API is enabled) that tile view has been
-     * entered or exited.
-     *
-     * @param {string} enabled - True if tile view is currently displayed, false
-     * otherwise.
-     * @returns {void}
-     */
-    notifyTileViewChanged(enabled: boolean) {
-        this._sendEvent({
-            name: 'tile-view-changed',
-            enabled
-        });
-    }
-
     /**
      * Disposes the allocated resources.
      *

modules/API/external/external_api.js

@@ -39,7 +39,6 @@ const commands = {
     toggleChat: 'toggle-chat',
     toggleFilmStrip: 'toggle-film-strip',
     toggleShareScreen: 'toggle-share-screen',
-    toggleTileView: 'toggle-tile-view',
     toggleVideo: 'toggle-video'
 };
 
@@ -51,7 +50,6 @@ const events = {
     'avatar-changed': 'avatarChanged',
     'audio-availability-changed': 'audioAvailabilityChanged',
     'audio-mute-status-changed': 'audioMuteStatusChanged',
-    'camera-error': 'cameraError',
     'device-list-changed': 'deviceListChanged',
     'display-name-change': 'displayNameChange',
     'email-change': 'emailChange',
@@ -59,7 +57,6 @@ const events = {
     'feedback-prompt-displayed': 'feedbackPromptDisplayed',
     'filmstrip-display-changed': 'filmstripDisplayChanged',
     'incoming-message': 'incomingMessage',
-    'mic-error': 'micError',
     'outgoing-message': 'outgoingMessage',
     'participant-joined': 'participantJoined',
     'participant-left': 'participantLeft',
@@ -70,8 +67,7 @@ const events = {
     'video-availability-changed': 'videoAvailabilityChanged',
     'video-mute-status-changed': 'videoMuteStatusChanged',
     'screen-sharing-status-changed': 'screenSharingStatusChanged',
-    'subject-change': 'subjectChange',
-    'tile-view-changed': 'tileViewChanged'
+    'subject-change': 'subjectChange'
 };
 
 /**

modules/UI/UI.js

@@ -13,12 +13,16 @@ import SharedVideoManager from './shared_video/SharedVideo';
 import VideoLayout from './videolayout/VideoLayout';
 import Filmstrip from './videolayout/Filmstrip';
 
+import { JitsiTrackErrors } from '../../react/features/base/lib-jitsi-meet';
 import { getLocalParticipant } from '../../react/features/base/participants';
 import { toggleChat } from '../../react/features/chat';
 import { openDisplayNamePrompt } from '../../react/features/display-name';
 import { setEtherpadHasInitialzied } from '../../react/features/etherpad';
 import { setFilmstripVisible } from '../../react/features/filmstrip';
-import { setNotificationsEnabled } from '../../react/features/notifications';
+import {
+    setNotificationsEnabled,
+    showWarningNotification
+} from '../../react/features/notifications';
 import {
     dockToolbox,
     setToolboxEnabled,
@@ -36,6 +40,39 @@ UI.eventEmitter = eventEmitter;
 let etherpadManager;
 let sharedVideoManager;
 
+const JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP = {
+    microphone: {},
+    camera: {}
+};
+
+JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP
+    .camera[JitsiTrackErrors.UNSUPPORTED_RESOLUTION]
+        = 'dialog.cameraUnsupportedResolutionError';
+JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[JitsiTrackErrors.GENERAL]
+    = 'dialog.cameraUnknownError';
+JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[JitsiTrackErrors.PERMISSION_DENIED]
+    = 'dialog.cameraPermissionDeniedError';
+JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[JitsiTrackErrors.NOT_FOUND]
+    = 'dialog.cameraNotFoundError';
+JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[JitsiTrackErrors.CONSTRAINT_FAILED]
+    = 'dialog.cameraConstraintFailedError';
+JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP
+    .camera[JitsiTrackErrors.NO_DATA_FROM_SOURCE]
+        = 'dialog.cameraNotSendingData';
+JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[JitsiTrackErrors.GENERAL]
+    = 'dialog.micUnknownError';
+JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP
+    .microphone[JitsiTrackErrors.PERMISSION_DENIED]
+        = 'dialog.micPermissionDeniedError';
+JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[JitsiTrackErrors.NOT_FOUND]
+    = 'dialog.micNotFoundError';
+JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP
+    .microphone[JitsiTrackErrors.CONSTRAINT_FAILED]
+        = 'dialog.micConstraintFailedError';
+JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP
+    .microphone[JitsiTrackErrors.NO_DATA_FROM_SOURCE]
+        = 'dialog.micNotSendingData';
+
 const UIListeners = new Map([
     [
         UIEvents.ETHERPAD_CLICKED,
@@ -258,6 +295,12 @@ UI.addLocalStream = track => {
     }
 };
 
+/**
+ * Removed remote stream from UI.
+ * @param {JitsiTrack} track stream to remove
+ */
+UI.removeRemoteStream = track => VideoLayout.onRemoteStreamRemoved(track);
+
 /**
  * Setup and show Etherpad.
  * @param {string} name etherpad id
@@ -731,6 +774,65 @@ UI.showExtensionInlineInstallationDialog = function(callback) {
     });
 };
 
+/**
+ * Shows a notifications about the passed in microphone error.
+ *
+ * @param {JitsiTrackError} micError - An error object related to using or
+ * acquiring an audio stream.
+ * @returns {void}
+ */
+UI.showMicErrorNotification = function(micError) {
+    if (!micError) {
+        return;
+    }
+
+    const { message, name } = micError;
+
+    const micJitsiTrackErrorMsg
+        = JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[name];
+    const micErrorMsg = micJitsiTrackErrorMsg
+        || JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP
+            .microphone[JitsiTrackErrors.GENERAL];
+    const additionalMicErrorMsg = micJitsiTrackErrorMsg ? null : message;
+
+    APP.store.dispatch(showWarningNotification({
+        description: additionalMicErrorMsg,
+        descriptionKey: micErrorMsg,
+        titleKey: name === JitsiTrackErrors.PERMISSION_DENIED
+            ? 'deviceError.microphonePermission'
+            : 'deviceError.microphoneError'
+    }));
+};
+
+/**
+ * Shows a notifications about the passed in camera error.
+ *
+ * @param {JitsiTrackError} cameraError - An error object related to using or
+ * acquiring a video stream.
+ * @returns {void}
+ */
+UI.showCameraErrorNotification = function(cameraError) {
+    if (!cameraError) {
+        return;
+    }
+
+    const { message, name } = cameraError;
+
+    const cameraJitsiTrackErrorMsg
+        = JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[name];
+    const cameraErrorMsg = cameraJitsiTrackErrorMsg
+        || JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP
+            .camera[JitsiTrackErrors.GENERAL];
+    const additionalCameraErrorMsg = cameraJitsiTrackErrorMsg ? null : message;
+
+    APP.store.dispatch(showWarningNotification({
+        description: additionalCameraErrorMsg,
+        descriptionKey: cameraErrorMsg,
+        titleKey: name === JitsiTrackErrors.PERMISSION_DENIED
+            ? 'deviceError.cameraPermission' : 'deviceError.cameraError'
+    }));
+};
+
 /**
  * Shows error dialog that informs the user that no data is received from the
  * device.

modules/UI/videolayout/Filmstrip.js

@@ -361,12 +361,6 @@ const Filmstrip = {
                 'min-width': `${local.thumbWidth}px`,
                 width: `${local.thumbWidth}px`
             });
-
-            const avatarSize = local.thumbHeight / 2;
-
-            thumbs.localThumb.find('.avatar-container')
-                .height(avatarSize)
-                .width(avatarSize);
         }
 
         if (thumbs.remoteThumbs) {
@@ -377,12 +371,6 @@ const Filmstrip = {
                 'min-width': `${remote.thumbWidth}px`,
                 width: `${remote.thumbWidth}px`
             });
-
-            const avatarSize = remote.thumbHeight / 2;
-
-            thumbs.remoteThumbs.find('.avatar-container')
-                .height(avatarSize)
-                .width(avatarSize);
         }
 
         const currentLayout = getCurrentLayout(APP.store.getState());

modules/UI/videolayout/LocalVideo.js

@@ -32,7 +32,7 @@ function LocalVideo(VideoLayout, emitter, streamEndedCallback) {
 
     this.localVideoId = null;
     this.bindHoverHandler();
-    if (!config.disableLocalVideoFlip) {
+    if (config.enableLocalVideoFlip) {
         this._buildContextMenu();
     }
     this.isLocal = true;

modules/UI/videolayout/RemoteVideo.js

@@ -357,11 +357,6 @@ RemoteVideo.prototype.removeRemoteStreamElement = function(stream) {
     logger.info(`${isVideo ? 'Video' : 'Audio'
     } removed ${this.id}`, select);
 
-
-    if (stream === this.videoStream) {
-        this.videoStream = null;
-    }
-
     this.updateView();
 };
 

modules/UI/videolayout/VideoContainer.js

@@ -166,6 +166,22 @@ function getCameraVideoPosition( // eslint-disable-line max-params
         verticalIndent };
 }
 
+/**
+ * Returns an array of the video horizontal and vertical indents.
+ * Centers horizontally and top aligns vertically.
+ *
+ * @return an array with 2 elements, the horizontal indent and the vertical
+ * indent
+ */
+function getDesktopVideoPosition(videoWidth, videoHeight, videoSpaceWidth) {
+    const horizontalIndent = (videoSpaceWidth - videoWidth) / 2;
+
+    const verticalIndent = 0;// Top aligned
+
+    return { horizontalIndent,
+        verticalIndent };
+}
+
 /**
  * Container for user video.
  */
@@ -350,23 +366,23 @@ export class VideoContainer extends LargeContainer {
      * @returns {{horizontalIndent, verticalIndent}}
      */
     getVideoPosition(width, height, containerWidth, containerHeight) {
-        let containerWidthToUse = containerWidth;
-
         /* eslint-enable max-params */
         if (this.stream && this.isScreenSharing()) {
+            let availableContainerWidth = containerWidth;
+
             if (interfaceConfig.VERTICAL_FILMSTRIP) {
-                containerWidthToUse -= Filmstrip.getFilmstripWidth();
+                availableContainerWidth -= Filmstrip.getFilmstripWidth();
             }
 
-            return getCameraVideoPosition(width,
+            return getDesktopVideoPosition(width,
                 height,
-                containerWidthToUse,
+                availableContainerWidth,
                 containerHeight);
         }
 
         return getCameraVideoPosition(width,
                 height,
-                containerWidthToUse,
+                containerWidth,
                 containerHeight);
 
     }

modules/UI/videolayout/VideoLayout.js

@@ -348,6 +348,10 @@ const VideoLayout = {
             remoteVideo.removeRemoteStreamElement(stream);
         }
 
+        if (stream.isVideoTrack()) {
+            this._updateLargeVideoIfDisplayed(id);
+        }
+
         this.updateMutedForNoTracks(id, stream.getType());
     },
 

modules/devices/mediaDeviceHelper.js

@@ -1,15 +1,6 @@
 /* global APP, JitsiMeetJS */
 
-import {
-    getAudioOutputDeviceId,
-    notifyCameraError,
-    notifyMicError
-} from '../../react/features/base/devices';
-import {
-    getUserSelectedCameraDeviceId,
-    getUserSelectedMicDeviceId,
-    getUserSelectedOutputDeviceId
-} from '../../react/features/base/settings';
+import { getAudioOutputDeviceId } from '../../react/features/base/devices';
 
 /**
  * Determines if currently selected audio output device should be changed after
@@ -35,7 +26,8 @@ function getNewAudioOutputDevice(newDevices) {
         return 'default';
     }
 
-    const preferredAudioOutputDeviceId = getUserSelectedOutputDeviceId(APP.store.getState());
+    const settings = APP.store.getState()['features/base/settings'];
+    const preferredAudioOutputDeviceId = settings.userSelectedAudioOutputDeviceId;
 
     // if the preferred one is not the selected and is available in the new devices
     // we want to use it as it was just added
@@ -57,7 +49,8 @@ function getNewAudioOutputDevice(newDevices) {
 function getNewAudioInputDevice(newDevices, localAudio) {
     const availableAudioInputDevices = newDevices.filter(
         d => d.kind === 'audioinput');
-    const selectedAudioInputDeviceId = getUserSelectedMicDeviceId(APP.store.getState());
+    const settings = APP.store.getState()['features/base/settings'];
+    const selectedAudioInputDeviceId = settings.userSelectedMicDeviceId;
     const selectedAudioInputDevice = availableAudioInputDevices.find(
         d => d.deviceId === selectedAudioInputDeviceId);
 
@@ -95,7 +88,8 @@ function getNewAudioInputDevice(newDevices, localAudio) {
 function getNewVideoInputDevice(newDevices, localVideo) {
     const availableVideoInputDevices = newDevices.filter(
         d => d.kind === 'videoinput');
-    const selectedVideoInputDeviceId = getUserSelectedCameraDeviceId(APP.store.getState());
+    const settings = APP.store.getState()['features/base/settings'];
+    const selectedVideoInputDeviceId = settings.userSelectedCameraDeviceId;
     const selectedVideoInputDevice = availableVideoInputDevices.find(
         d => d.deviceId === selectedVideoInputDeviceId);
 
@@ -180,11 +174,11 @@ export default {
                 ]))
                 .then(tracks => {
                     if (audioTrackError) {
-                        APP.store.dispatch(notifyMicError(audioTrackError));
+                        APP.UI.showMicErrorNotification(audioTrackError);
                     }
 
                     if (videoTrackError) {
-                        APP.store.dispatch(notifyCameraError(videoTrackError));
+                        APP.UI.showCameraErrorNotification(videoTrackError);
                     }
 
                     return tracks.filter(t => typeof t !== 'undefined');
@@ -209,7 +203,7 @@ export default {
                 })
                 .catch(err => {
                     audioTrackError = err;
-                    showError && APP.store.disptach(notifyMicError(err));
+                    showError && APP.UI.showMicErrorNotification(err);
 
                     return [];
                 }));
@@ -227,7 +221,7 @@ export default {
                 })
                 .catch(err => {
                     videoTrackError = err;
-                    showError && APP.store.dispatch(notifyCameraError(err));
+                    showError && APP.UI.showCameraErrorNotification(err);
 
                     return [];
                 }));

package-lock.json

@@ -2448,15 +2448,10 @@
         "isomorphic-fetch": "^2.2.1"
       }
     },
-    "@react-native-community/async-storage": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@react-native-community/async-storage/-/async-storage-1.3.4.tgz",
-      "integrity": "sha512-fJmzL27x0BEjhmMXPnDPnUNCZK7bph+NBVCfAz9fzHzAamaiOkdUwuL3PvE4Oj4Kw4knP8ocw5VRDGorAidZ2g=="
-    },
     "@react-native-community/cli": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-1.9.4.tgz",
-      "integrity": "sha512-7XjgqCdi23g6V7RV4tsYvqVqOBtNjAsWe5Oj2dR5KxDi3YqUyIyPjDWzyFkIxiO9XTGp9Al4QSmRwtOERvHO8A==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-1.9.2.tgz",
+      "integrity": "sha512-wSw3g6HrSUvLZiHiWRcO++JrKdbYNRWycGbGHVCnRLsdDRsj/y152xPlvBa29C8w+1SwiiN8aGsBOO0x9hkrCg==",
       "requires": {
         "chalk": "^1.1.1",
         "commander": "^2.19.0",
@@ -2840,7 +2835,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": {
@@ -5485,41 +5480,12 @@
       }
     },
     "errorhandler": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.1.tgz",
-      "integrity": "sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.0.tgz",
+      "integrity": "sha1-6rpkyl1UKjEayUX1gt78M2Fl2fQ=",
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.3",
         "escape-html": "~1.0.3"
-      },
-      "dependencies": {
-        "accepts": {
-          "version": "1.3.7",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-          "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-          "requires": {
-            "mime-types": "~2.1.24",
-            "negotiator": "0.6.2"
-          }
-        },
-        "mime-db": {
-          "version": "1.40.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
-        },
-        "mime-types": {
-          "version": "2.1.24",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-          "requires": {
-            "mime-db": "1.40.0"
-          }
-        },
-        "negotiator": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-          "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
-        }
       }
     },
     "es-abstract": {
@@ -6750,7 +6716,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6768,11 +6735,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 +6754,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 +6868,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6906,6 +6879,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6918,17 +6892,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 +6922,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -7017,7 +6995,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7027,6 +7006,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -7102,7 +7082,8 @@
         },
         "safe-buffer": {
           "version": "5.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -7132,6 +7113,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 +7131,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7187,11 +7170,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -12053,9 +12038,9 @@
       }
     },
     "react-native": {
-      "version": "0.59.8",
-      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.59.8.tgz",
-      "integrity": "sha512-x1T+/pEXrjgdH9uDzd5doJy5aFlBqW04j7ljDKIGALchhnvdFbtXXrUZ/1PfWHMrIdZxtaDt4tkSttp662GSQA==",
+      "version": "0.59.5",
+      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.59.5.tgz",
+      "integrity": "sha512-8Q/9cS6IMsGNiFhJgzmncbUeuacXQMe5EJl0c63fW30DvjEjeTVCvhM08eGzSpsNlOvL2XDRa4YOiCrwI7S1TA==",
       "requires": {
         "@babel/runtime": "^7.0.0",
         "@react-native-community/cli": "^1.2.1",
@@ -12289,25 +12274,6 @@
         "prop-types": "^15.5.10"
       }
     },
-    "react-native-webview": {
-      "version": "5.8.1",
-      "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-5.8.1.tgz",
-      "integrity": "sha512-b6pSvmjoiWtcz6YspggW02X+BRXJWuquHwkh37BRx1NMW1iwMZA31SnFQvTpPzWYYIb9WF/mRsy2nGtt9C6NIg==",
-      "requires": {
-        "escape-string-regexp": "1.0.5",
-        "invariant": "2.2.4"
-      },
-      "dependencies": {
-        "invariant": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-          "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-          "requires": {
-            "loose-envify": "^1.0.0"
-          }
-        }
-      }
-    },
     "react-node-resolver": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/react-node-resolver/-/react-node-resolver-1.0.1.tgz",
@@ -12379,15 +12345,6 @@
         "exenv": "^1.2.2"
       }
     },
-    "react-textarea-autosize": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-7.1.0.tgz",
-      "integrity": "sha512-c2FlR/fP0qbxmlrW96SdrbgP/v0XZMTupqB90zybvmDVDutytUgPl7beU35klwcTeMepUIQEpQUn3P3bdshGPg==",
-      "requires": {
-        "@babel/runtime": "^7.1.2",
-        "prop-types": "^15.6.0"
-      }
-    },
     "react-transform-hmr": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz",

package.json

@@ -34,7 +34,6 @@
     "@atlaskit/toggle": "5.0.14",
     "@atlaskit/tooltip": "12.1.13",
     "@microsoft/microsoft-graph-client": "1.1.0",
-    "@react-native-community/async-storage": "1.3.4",
     "@webcomponents/url": "0.7.1",
     "amplitude-js": "4.5.2",
     "bc-css-flags": "3.0.0",
@@ -63,7 +62,7 @@
     "react-emoji-render": "0.4.6",
     "react-i18next": "7.13.0",
     "react-linkify": "0.2.2",
-    "react-native": "0.59.8",
+    "react-native": "0.59.5",
     "react-native-background-timer": "2.1.1",
     "react-native-calendar-events": "1.6.4",
     "react-native-callstats": "3.58.2",
@@ -77,9 +76,7 @@
     "react-native-vector-icons": "6.0.2",
     "react-native-watch-connectivity": "0.2.0",
     "react-native-webrtc": "github:jitsi/react-native-webrtc#4064c6f2db4f8b961daaaa8dafc6a896d7cfbc43",
-    "react-native-webview": "5.8.1",
     "react-redux": "5.0.7",
-    "react-textarea-autosize": "7.1.0",
     "react-transition-group": "2.4.0",
     "redux": "4.0.0",
     "redux-thunk": "2.2.0",

react/features/analytics/AnalyticsEvents.js

@@ -372,28 +372,6 @@ export function createLiveStreamingDialogEvent(dialogName, buttonName) {
     };
 }
 
-/**
- * Creates an event with the local tracks duration.
- *
- * @param {Object} duration - The object with the duration of the local tracks.
- * @returns {Object} The event in a format suitable for sending via
- * sendAnalytics.
- */
-export function createLocalTracksDurationEvent(duration) {
-    const { audio, video, conference } = duration;
-    const { camera, desktop } = video;
-
-    return {
-        action: 'local.tracks.durations',
-        attributes: {
-            audio: audio.value,
-            camera: camera.value,
-            conference: conference.value,
-            desktop: desktop.value
-        }
-    };
-}
-
 /**
  * Creates an event which indicates that an action related to recording has
  * occured.

react/features/analytics/actionTypes.js

@@ -1,11 +0,0 @@
-// @flow
-
-/**
- * The type of (redux) action which signals that local media duration has changed.
- *
- * {
- *     type: UPDATE_LOCAL_TRACKS_DURATION,
- *     localTracksDuration: Object
- * }
- */
-export const UPDATE_LOCAL_TRACKS_DURATION = 'UPDATE_LOCAL_TRACKS_DURATION';

react/features/analytics/handlers/AmplitudeHandler.js

@@ -15,7 +15,7 @@ export default class AmplitudeHandler extends AbstractHandler {
     constructor(options) {
         super();
 
-        const { amplitudeAPPKey, host, user } = options;
+        const { amplitudeAPPKey, host } = options;
 
         if (!amplitudeAPPKey) {
             throw new Error('Failed to initialize Amplitude handler, no APP key');
@@ -28,10 +28,6 @@ export default class AmplitudeHandler extends AbstractHandler {
         };
 
         amplitude.getInstance(this._amplitudeOptions).init(amplitudeAPPKey);
-
-        if (user) {
-            amplitude.getInstance(this._amplitudeOptions).setUserId(user);
-        }
     }
 
     /**

react/features/analytics/handlers/amplitude/Amplitude.native.js

@@ -31,16 +31,6 @@ class Amplitude {
         AmplitudeNative.init(this._instanceName, apiKey);
     }
 
-    /**
-     * Sets an identifier for the current user.
-     *
-     * @param {string} userId - The new user id.
-     * @returns {void}
-     */
-    setUserId(userId) {
-        AmplitudeNative.setUserId(this._instanceName, userId);
-    }
-
     /**
      * Sets user properties for the current user.
      *

react/features/analytics/index.js

@@ -2,4 +2,3 @@ export * from './AnalyticsEvents';
 export * from './functions';
 
 import './middleware';
-import './reducer';

react/features/analytics/middleware.js

@@ -1,74 +1,8 @@
-// @flow
-
-import {
-    CONFERENCE_JOINED,
-    CONFERENCE_WILL_LEAVE,
-    SET_ROOM
-} from '../base/conference';
+import { SET_ROOM } from '../base/conference';
 import { SET_CONFIG } from '../base/config';
 import { MiddlewareRegistry } from '../base/redux';
-import {
-    getLocalAudioTrack,
-    getLocalVideoTrack,
-    TRACK_ADDED,
-    TRACK_REMOVED,
-    TRACK_UPDATED
-} from '../base/tracks';
 
-import { UPDATE_LOCAL_TRACKS_DURATION } from './actionTypes';
-import { createLocalTracksDurationEvent } from './AnalyticsEvents';
-import { initAnalytics, resetAnalytics, sendAnalytics } from './functions';
-
-/**
- * Calculates the duration of the local tracks.
- *
- * @param {Object} state - The redux state.
- * @returns {Object} - The local tracks duration.
- */
-function calculateLocalTrackDuration(state) {
-    const now = Date.now();
-    const { localTracksDuration } = state['features/analytics'];
-    const { conference } = state['features/base/conference'];
-    const { audio, video } = localTracksDuration;
-    const { camera, desktop } = video;
-    const tracks = state['features/base/tracks'];
-    const audioTrack = getLocalAudioTrack(tracks);
-    const videoTrack = getLocalVideoTrack(tracks);
-    const newDuration = { ...localTracksDuration };
-
-    if (!audioTrack || audioTrack.muted || !conference) {
-        newDuration.audio = {
-            startedTime: -1,
-            value: audio.value + (audio.startedTime === -1 ? 0 : now - audio.startedTime)
-        };
-    } else if (audio.startedTime === -1) {
-        newDuration.audio.startedTime = now;
-    }
-
-    if (!videoTrack || videoTrack.muted || !conference) {
-        newDuration.video = {
-            camera: {
-                startedTime: -1,
-                value: camera.value + (camera.startedTime === -1 ? 0 : now - camera.startedTime)
-            },
-            desktop: {
-                startedTime: -1,
-                value: desktop.value + (desktop.startedTime === -1 ? 0 : now - desktop.startedTime)
-            }
-        };
-    } else {
-        const { videoType } = videoTrack;
-
-        if (video[videoType].startedTime === -1) {
-            newDuration.video[videoType].startedTime = now;
-        }
-    }
-
-    return {
-        ...localTracksDuration,
-        ...newDuration
-    };
-}
+import { initAnalytics, resetAnalytics } from './functions';
 
 /**
  * Middleware which intercepts config actions to handle evaluating analytics
@@ -78,81 +12,25 @@ function calculateLocalTrackDuration(state) {
  * @returns {Function}
  */
 MiddlewareRegistry.register(store => next => action => {
-    if (action.type === SET_CONFIG) {
+    switch (action.type) {
+    case SET_CONFIG: {
         if (navigator.product === 'ReactNative') {
             // Reseting the analytics is currently not needed for web because
             // the user will be redirected to another page and new instance of
             // Analytics will be created and initialized.
             resetAnalytics();
         }
-    }
 
-    const result = next(action);
-
-    switch (action.type) {
-    case CONFERENCE_JOINED: {
-        const { dispatch, getState } = store;
-        const state = getState();
-
-        dispatch({
-            type: UPDATE_LOCAL_TRACKS_DURATION,
-            localTracksDuration: {
-                ...calculateLocalTrackDuration(state),
-                conference: {
-                    startedTime: Date.now(),
-                    value: 0
-                }
-            }
-        });
-        break;
-    }
-
-    case CONFERENCE_WILL_LEAVE: {
-        const { dispatch, getState } = store;
-        const state = getState();
-        const { localTracksDuration } = state['features/analytics'];
-        const newLocalTracksDuration = {
-            ...calculateLocalTrackDuration(state),
-            conference: {
-                startedTime: -1,
-                value: Date.now() - localTracksDuration.conference.startedTime
-            }
-        };
-
-        sendAnalytics(createLocalTracksDurationEvent(newLocalTracksDuration));
-
-        dispatch({
-            type: UPDATE_LOCAL_TRACKS_DURATION,
-            localTracksDuration: newLocalTracksDuration
-        });
         break;
     }
     case SET_ROOM: {
+        const result = next(action);
+
         initAnalytics(store);
-        break;
-    }
-    case TRACK_ADDED:
-    case TRACK_REMOVED:
-    case TRACK_UPDATED: {
-        const { dispatch, getState } = store;
-        const state = getState();
-        const { localTracksDuration } = state['features/analytics'];
 
-        if (localTracksDuration.conference.startedTime === -1) {
-            // We don't want to track the media duration if the conference is not joined yet because otherwise we won't
-            // be able to compare them with the conference duration (from conference join to conference will leave).
-            break;
-        }
-        dispatch({
-            type: UPDATE_LOCAL_TRACKS_DURATION,
-            localTracksDuration: {
-                ...localTracksDuration,
-                ...calculateLocalTrackDuration(state)
-            }
-        });
-        break;
+        return result;
     }
     }
 
-    return result;
+    return next(action);
 });

react/features/analytics/reducer.js

@@ -1,51 +0,0 @@
-// @flow
-
-import { ReducerRegistry } from '../base/redux';
-
-import { UPDATE_LOCAL_TRACKS_DURATION } from './actionTypes';
-
-/**
- * Initial state.
- */
-const DEFAULT_STATE = {
-    localTracksDuration: {
-        audio: {
-            startedTime: -1,
-            value: 0
-        },
-        video: {
-            camera: {
-                startedTime: -1,
-                value: 0
-            },
-            desktop: {
-                startedTime: -1,
-                value: 0
-            }
-        },
-        conference: {
-            startedTime: -1,
-            value: 0
-        }
-    }
-};
-
-/**
- * Listen for actions which changes the state of the analytics feature.
- *
- * @param {Object} state - The Redux state of the feature features/analytics.
- * @param {Object} action - Action object.
- * @param {string} action.type - Type of action.
- * @returns {Object}
- */
-ReducerRegistry.register('features/analytics', (state = DEFAULT_STATE, action) => {
-    switch (action.type) {
-    case UPDATE_LOCAL_TRACKS_DURATION:
-        return {
-            ...state,
-            localTracksDuration: action.localTracksDuration
-        };
-    default:
-        return state;
-    }
-});

react/features/app/actions.js

@@ -2,6 +2,7 @@
 
 import type { Dispatch } from 'redux';
 
+import { appWillNavigate } from '../base/app';
 import { setRoom } from '../base/conference';
 import {
     configWillLoad,
@@ -10,9 +11,8 @@ import {
     setConfig,
     storeConfig
 } from '../base/config';
-import { connect, disconnect, setLocationURL } from '../base/connection';
+import { setLocationURL } from '../base/connection';
 import { loadConfig } from '../base/lib-jitsi-meet';
-import { createDesiredLocalTracks } from '../base/tracks';
 import { parseURIString, toURLString } from '../base/util';
 import { setFatalError } from '../overlay';
 
@@ -59,11 +59,8 @@ export function appNavigate(uri: ?string) {
         const { contextRoot, host, room } = location;
         const locationURL = new URL(location.toString());
 
-        // Disconnect from any current conference.
-        // FIXME: unify with web.
-        if (navigator.product === 'ReactNative') {
-            dispatch(disconnect());
-        }
+        // XXX this looks like CONFIG_WILL_LOAD ?
+        dispatch(appWillNavigate(locationURL, room));
 
         dispatch(configWillLoad(locationURL, room));
 
@@ -81,40 +78,25 @@ export function appNavigate(uri: ?string) {
 
         let config;
 
-        // Avoid (re)loading the config when there is no room.
-        if (!room) {
+        try {
+            config = await loadConfig(url);
+            dispatch(storeConfig(baseURL, config));
+        } catch (error) {
             config = restoreConfig(baseURL);
-        }
 
-        if (!config) {
-            try {
-                config = await loadConfig(url);
-                dispatch(storeConfig(baseURL, config));
-            } catch (error) {
-                config = restoreConfig(baseURL);
+            if (!config) {
+                dispatch(loadConfigError(error, locationURL, room));
 
-                if (!config) {
-                    dispatch(loadConfigError(error, locationURL));
-
-                    return;
-                }
+                return;
             }
         }
 
-        if (getState()['features/base/config'].locationURL !== locationURL) {
-            dispatch(loadConfigError(new Error('Config no longer needed!'), locationURL));
-
-            return;
-        }
-
-        dispatch(setLocationURL(locationURL));
-        dispatch(setConfig(config));
-        dispatch(setRoom(room));
-
-        // FIXME: unify with web, currently the connection and track creation happens in conference.js.
-        if (room && navigator.product === 'ReactNative') {
-            dispatch(createDesiredLocalTracks());
-            dispatch(connect());
+        if (getState()['features/base/config'].locationURL === locationURL) {
+            dispatch(setLocationURL(locationURL));
+            dispatch(setConfig(config));
+            dispatch(setRoom(room));
+        } else {
+            dispatch(loadConfigError(new Error('Config no longer needed!'), locationURL, room));
         }
     };
 }

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

@@ -6,7 +6,6 @@ import React from 'react';
 import { DialogContainer } from '../../base/dialog';
 import '../../base/responsive-ui';
 import '../../chat';
-import '../../external-api';
 import '../../room-lock';
 import '../../video-layout';
 

react/features/authentication/actions.js

@@ -113,6 +113,7 @@ export function cancelWaitForOwner() {
         // clients/consumers need an event.
         const { authRequired } = getState()['features/base/conference'];
 
+        // FIXME remove when external-api ported to base/session
         authRequired && dispatch(conferenceLeft(authRequired));
 
         dispatch(appNavigate(undefined));

react/features/authentication/components/WaitForOwnerDialog.native.js

@@ -64,14 +64,12 @@ class WaitForOwnerDialog extends Component<Props> {
 
         return (
             <ConfirmDialog
-                cancelKey = 'dialog.Cancel'
                 contentKey = {
                     {
                         key: 'dialog.WaitForHostMsgWOk',
                         params: { room }
                     }
                 }
-                okKey = 'dialog.Ok'
                 onCancel = { this._onCancel }
                 onSubmit = { this._onLogin } />
         );

react/features/base/app/actionTypes.js

@@ -9,6 +9,13 @@
  */
 export const APP_WILL_MOUNT = 'APP_WILL_MOUNT';
 
+/**
+ * FIXME.
+ *
+ * @type {string}
+ */
+export const APP_WILL_NAVIGATE = 'APP_WILL_NAVIGATE';
+
 /**
  * The type of (redux) action which signals that a specific App will unmount (in
  * React terms).

react/features/base/app/actions.js

@@ -2,7 +2,7 @@
 
 import type { Dispatch } from 'redux';
 
-import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from './actionTypes';
+import { APP_WILL_MOUNT, APP_WILL_NAVIGATE, APP_WILL_UNMOUNT } from './actionTypes';
 
 declare var APP;
 
@@ -17,6 +17,11 @@ declare var APP;
  */
 export function appWillMount(app: Object) {
     return (dispatch: Dispatch<any>) => {
+        dispatch({
+            type: APP_WILL_MOUNT,
+            app
+        });
+
         // TODO There was a redux action creator appInit which I did not like
         // because we already had the redux action creator appWillMount and,
         // respectively, the redux action APP_WILL_MOUNT. So I set out to remove
@@ -25,11 +30,25 @@ export function appWillMount(app: Object) {
         // API module into its own feature yet so we're bound to work on that in
         // the future.
         typeof APP === 'object' && APP.API.init();
+    };
+}
 
-        dispatch({
-            type: APP_WILL_MOUNT,
-            app
-        });
+/**
+ * FIXME.
+ *
+ * @param {URL} locationURL - FIXME.
+ * @param {string} room - FIXME.
+ * @returns {{
+ *     type: APP_WILL_NAVIGATE,
+ *     locationURL: URL,
+ *     room: ?string
+ * }}
+ */
+export function appWillNavigate(locationURL: URL, room: ?string) {
+    return {
+        type: APP_WILL_NAVIGATE,
+        locationURL,
+        room
     };
 }
 

react/features/base/conference/actions.js

@@ -84,8 +84,6 @@ function _addConferenceListeners(conference, dispatch) {
     conference.on(
         JitsiConferenceEvents.CONFERENCE_LEFT,
         (...args) => dispatch(conferenceLeft(conference, ...args)));
-    conference.on(JitsiConferenceEvents.SUBJECT_CHANGED,
-        (...args) => dispatch(conferenceSubjectChanged(...args)));
 
     conference.on(
         JitsiConferenceEvents.KICKED,
@@ -759,6 +757,10 @@ export function setSubject(subject: string = '') {
         const { conference } = getState()['features/base/conference'];
 
         if (conference) {
+            dispatch({
+                type: SET_PENDING_SUBJECT_CHANGE,
+                subject: undefined
+            });
             conference.setSubject(subject);
         } else {
             dispatch({

react/features/base/conference/functions.js

@@ -1,7 +1,5 @@
 // @flow
 
-import _ from 'lodash';
-
 import { JitsiTrackErrors } from '../lib-jitsi-meet';
 import {
     getLocalParticipant,
@@ -157,10 +155,10 @@ export function forEachConference(
 export function getConferenceName(stateful: Function | Object): string {
     const state = toState(stateful);
     const { callee } = state['features/base/jwt'];
-    const { callDisplayName } = state['features/base/config'];
-    const { pendingSubjectChange, room, subject } = state['features/base/conference'];
 
-    return pendingSubjectChange || subject || callDisplayName || (callee && callee.name) || _.startCase(room);
+    return state['features/base/config'].callDisplayName
+                || (callee && callee.name)
+                || state['features/base/conference'].room;
 }
 
 /**

react/features/base/conference/middleware.js

@@ -24,6 +24,7 @@ import { TRACK_ADDED, TRACK_REMOVED } from '../tracks';
 
 import {
     conferenceFailed,
+    conferenceLeft,
     conferenceWillLeave,
     createConference,
     setLastN,
@@ -37,7 +38,6 @@ import {
     DATA_CHANNEL_OPENED,
     SET_AUDIO_ONLY,
     SET_LASTN,
-    SET_PENDING_SUBJECT_CHANGE,
     SET_ROOM
 } from './actionTypes';
 import {
@@ -329,17 +329,10 @@ function _connectionFailed({ dispatch, getState }, next, action) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _conferenceSubjectChanged({ dispatch, getState }, next, action) {
+function _conferenceSubjectChanged({ getState }, next, action) {
     const result = next(action);
     const { subject } = getState()['features/base/conference'];
 
-    if (subject) {
-        dispatch({
-            type: SET_PENDING_SUBJECT_CHANGE,
-            subject: undefined
-        });
-    }
-
     typeof APP === 'object' && APP.API.notifySubjectChanged(subject);
 
     return result;
@@ -574,30 +567,48 @@ function _setReceiverVideoConstraint(conference, preferred, max) {
 }
 
 /**
- * Notifies the feature base/conference that the action
- * {@code SET_ROOM} is being dispatched within a specific
- *  redux store.
+ * Notifies the feature {@code base/conference} that the redix action
+ * {@link SET_ROOM} is being dispatched within a specific redux store.
  *
  * @param {Store} store - The redux store in which the specified {@code action}
  * is being dispatched.
  * @param {Dispatch} next - The redux {@code dispatch} function to dispatch the
  * specified {@code action} to the specified {@code store}.
- * @param {Action} action - The redux action {@code SET_ROOM}
- * which is being dispatched in the specified {@code store}.
+ * @param {Action} action - The redux action {@code SET_ROOM} which is being
+ * dispatched in the specified {@code store}.
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
 function _setRoom({ dispatch, getState }, next, action) {
-    const state = getState();
-    const { subject } = state['features/base/config'];
-    const { room } = action;
+    const result = next(action);
 
-    if (room) {
-        // Set the stored subject.
-        dispatch(setSubject(subject));
+    // By the time SET_ROOM is dispatched, base/connection's locationURL and
+    // base/conference's leaving should be the only conference-related sources
+    // of truth.
+    const state = getState();
+    const { leaving } = state['features/base/conference'];
+    const { locationURL } = state['features/base/connection'];
+    const dispatchConferenceLeft = new Set();
+
+    // Figure out which of the JitsiConferences referenced by base/conference
+    // have not dispatched or are not likely to dispatch CONFERENCE_FAILED and
+    // CONFERENCE_LEFT.
+    forEachConference(state, (conference, url) => {
+        if (conference !== leaving && url && url !== locationURL) {
+            dispatchConferenceLeft.add(conference);
+        }
+
+        return true; // All JitsiConference instances are to be examined.
+    });
+
+    // Dispatch CONFERENCE_LEFT for the JitsiConferences referenced by
+    // base/conference which have not dispatched or are not likely to dispatch
+    // CONFERENCE_FAILED or CONFERENCE_LEFT.
+    for (const conference of dispatchConferenceLeft) {
+        dispatch(conferenceLeft(conference));
     }
 
-    return next(action);
+    return result;
 }
 
 /**

react/features/base/config/actions.js

@@ -38,17 +38,20 @@ export function configWillLoad(locationURL: URL, room: string) {
  * loading of a configuration.
  * @param {URL} locationURL - The URL of the location which necessitated the
  * loading of a configuration.
+ * @param {string} room - The name of the conference room.
  * @returns {{
  *     type: LOAD_CONFIG_ERROR,
  *     error: Error,
- *     locationURL: URL
+ *     locationURL: URL,
+ *     room: string
  * }}
  */
-export function loadConfigError(error: Error, locationURL: URL) {
+export function loadConfigError(error: Error, locationURL: URL, room: ?string) {
     return {
         type: LOAD_CONFIG_ERROR,
         error,
-        locationURL
+        locationURL,
+        room
     };
 }
 

react/features/base/config/functions.any.js

@@ -21,7 +21,6 @@ const WHITELISTED_KEYS = [
     '_peerConnStatusOutOfLastNTimeout',
     '_peerConnStatusRtcMuteTimeout',
     'abTesting',
-    'analytics.disabled',
     'autoRecord',
     'autoRecordToken',
     'avgRtpStatsN',
@@ -102,7 +101,7 @@ const WHITELISTED_KEYS = [
     'enableDisplayNameInStats',
     'enableLayerSuspension',
     'enableLipSync',
-    'disableLocalVideoFlip',
+    'enableLocalVideoFlip',
     'enableRemb',
     'enableStatsID',
     'enableTalkWhileMuted',
@@ -136,7 +135,6 @@ const WHITELISTED_KEYS = [
     'startVideoMuted',
     'startWithAudioMuted',
     'startWithVideoMuted',
-    'subject',
     'testing',
     'useIPv6',
     'useNicks',

react/features/base/connection/actions.native.js

@@ -3,11 +3,6 @@
 import _ from 'lodash';
 import type { Dispatch } from 'redux';
 
-import {
-    conferenceLeft,
-    conferenceWillLeave,
-    getCurrentConference
-} from '../conference';
 import JitsiMeetJS, { JitsiConnectionEvents } from '../lib-jitsi-meet';
 import { parseURIString } from '../util';
 
@@ -20,7 +15,7 @@ import {
 } from './actionTypes';
 import { JITSI_CONNECTION_URL_KEY } from './constants';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
+import type JitsiConnection from 'lib-jitsi-meet/JitsiConnection';
 
 /**
  * The error structure passed to the {@link connectionFailed} action.
@@ -90,7 +85,7 @@ export function connect(id: ?string, password: ?string) {
 
         connection[JITSI_CONNECTION_URL_KEY] = locationURL;
 
-        dispatch(_connectionWillConnect(connection));
+        dispatch(connectionWillConnect(connection, locationURL));
 
         connection.addEventListener(
             JitsiConnectionEvents.CONNECTION_DISCONNECTED,
@@ -102,7 +97,7 @@ export function connect(id: ?string, password: ?string) {
             JitsiConnectionEvents.CONNECTION_FAILED,
             _onConnectionFailed);
 
-        return connection.connect({
+        connection.connect({
             id,
             password
         });
@@ -258,16 +253,18 @@ export function connectionFailed(
  *
  * @param {JitsiConnection} connection - The {@code JitsiConnection} which will
  * connect.
+ * @param {URL} locationURL - FIXME.
  * @private
  * @returns {{
  *     type: CONNECTION_WILL_CONNECT,
  *     connection: JitsiConnection
  * }}
  */
-function _connectionWillConnect(connection) {
+export function connectionWillConnect(connection: JitsiConnection, locationURL: URL) {
     return {
         type: CONNECTION_WILL_CONNECT,
-        connection
+        connection,
+        locationURL
     };
 }
 
@@ -319,64 +316,6 @@ function _constructOptions(state) {
     return options;
 }
 
-/**
- * Closes connection.
- *
- * @returns {Function}
- */
-export function disconnect() {
-    return (dispatch: Dispatch<any>, getState: Function): Promise<void> => {
-        const state = getState();
-
-        // The conference we have already joined or are joining.
-        const conference_ = getCurrentConference(state);
-
-        // Promise which completes when the conference has been left and the
-        // connection has been disconnected.
-        let promise;
-
-        // Leave the conference.
-        if (conference_) {
-            // In a fashion similar to JitsiConference's CONFERENCE_LEFT event
-            // (and the respective Redux action) which is fired after the
-            // conference has been left, notify the application about the
-            // intention to leave the conference.
-            dispatch(conferenceWillLeave(conference_));
-
-            promise
-                = conference_.leave()
-                    .catch(error => {
-                        logger.warn(
-                            'JitsiConference.leave() rejected with:',
-                            error);
-
-                        // The library lib-jitsi-meet failed to make the
-                        // JitsiConference leave. Which may be because
-                        // JitsiConference thinks it has already left.
-                        // Regardless of the failure reason, continue in
-                        // jitsi-meet as if the leave has succeeded.
-                        dispatch(conferenceLeft(conference_));
-                    });
-        } else {
-            promise = Promise.resolve();
-        }
-
-        // Disconnect the connection.
-        const { connecting, connection } = state['features/base/connection'];
-
-        // The connection we have already connected or are connecting.
-        const connection_ = connection || connecting;
-
-        if (connection_) {
-            promise = promise.then(() => connection_.disconnect());
-        } else {
-            logger.info('No connection found while disconnecting.');
-        }
-
-        return promise;
-    };
-}
-
 /**
  * Sets the location URL of the application, connecton, conference, etc.
  *

react/features/base/connection/actions.web.js

@@ -12,6 +12,7 @@ import { configureInitialDevices } from '../devices';
 export {
     connectionEstablished,
     connectionFailed,
+    connectionWillConnect,
     setLocationURL
 } from './actions.native';
 

react/features/base/devices/actionTypes.js

@@ -1,25 +1,3 @@
-/**
- * The type of Redux action which signals that an error occurred while obtaining
- * a camera.
- *
- * {
- *     type: NOTIFY_CAMERA_ERROR,
- *     error: Object
- * }
- */
-export const NOTIFY_CAMERA_ERROR = 'NOTIFY_CAMERA_ERROR';
-
-/**
- * The type of Redux action which signals that an error occurred while obtaining
- * a microphone.
- *
- * {
- *     type: NOTIFY_MIC_ERROR,
- *     error: Object
- * }
- */
-export const NOTIFY_MIC_ERROR = 'NOTIFY_MIC_ERROR';
-
 /**
  * The type of Redux action which signals that the currently used audio
  * input device should be changed.

react/features/base/devices/actions.js

@@ -1,14 +1,9 @@
 import JitsiMeetJS from '../lib-jitsi-meet';
-import {
-    getUserSelectedOutputDeviceId,
-    updateSettings
-} from '../settings';
+import { updateSettings } from '../settings';
 
 import {
     ADD_PENDING_DEVICE_REQUEST,
     CHECK_AND_NOTIFY_FOR_NEW_DEVICE,
-    NOTIFY_CAMERA_ERROR,
-    NOTIFY_MIC_ERROR,
     REMOVE_PENDING_DEVICE_REQUESTS,
     SET_AUDIO_INPUT_DEVICE,
     SET_VIDEO_INPUT_DEVICE,
@@ -23,28 +18,6 @@ import {
 
 const logger = require('jitsi-meet-logger').getLogger(__filename);
 
-/**
- * Maps the WebRTC string for device type to the keys used to store configure,
- * within redux, which devices should be used by default.
- */
-const DEVICE_TYPE_TO_SETTINGS_KEYS = {
-    audioInput: {
-        currentDeviceId: 'micDeviceId',
-        userSelectedDeviceId: 'userSelectedMicDeviceId',
-        userSelectedDeviceLabel: 'userSelectedMicDeviceLabel'
-    },
-    audioOutput: {
-        currentDeviceId: 'audioOutputDeviceId',
-        userSelectedDeviceId: 'userSelectedAudioOutputDeviceId',
-        userSelectedDeviceLabel: 'userSelectedAudioOutputDeviceLabel'
-    },
-    videoInput: {
-        currentDeviceId: 'audioOutputDeviceId',
-        userSelectedDeviceId: 'userSelectedCameraDeviceId',
-        userSelectedDeviceLabel: 'userSelectedCameraDeviceLabel'
-    }
-};
-
 /**
  * Adds a pending device request.
  *
@@ -94,19 +67,19 @@ export function configureInitialDevices() {
 
                     return;
                 }
-
                 const newSettings = {};
+                const devicesKeysToSettingsKeys = {
+                    audioInput: 'micDeviceId',
+                    audioOutput: 'audioOutputDeviceId',
+                    videoInput: 'cameraDeviceId'
+                };
 
                 Object.keys(deviceLabels).forEach(key => {
                     const label = deviceLabels[key];
                     const deviceId = getDeviceIdByLabel(state, label, key);
 
                     if (deviceId) {
-                        const settingsTranslationMap = DEVICE_TYPE_TO_SETTINGS_KEYS[key];
-
-                        newSettings[settingsTranslationMap.currentDeviceId] = deviceId;
-                        newSettings[settingsTranslationMap.userSelectedDeviceId] = deviceId;
-                        newSettings[settingsTranslationMap.userSelectedDeviceLabel] = label;
+                        newSettings[devicesKeysToSettingsKeys[key]] = deviceId;
                     }
                 });
 
@@ -118,7 +91,8 @@ export function configureInitialDevices() {
 
         return updateSettingsPromise
             .then(() => {
-                const userSelectedAudioOutputDeviceId = getUserSelectedOutputDeviceId(getState());
+                const { userSelectedAudioOutputDeviceId }
+                    = getState()['features/base/settings'];
 
                 return setAudioOutputDeviceId(userSelectedAudioOutputDeviceId, dispatch)
                     .catch(ex => logger.warn(`Failed to set audio output device.
@@ -150,43 +124,6 @@ export function getAvailableDevices() {
     });
 }
 
-/**
- * Signals that an error occurred while trying to obtain a track from a camera.
- *
- * @param {Object} error - The device error, as provided by lib-jitsi-meet.
- * @param {string} error.name - The constant for the type of the error.
- * @param {string} error.message - Optional additional information about the
- * error.
- * @returns {{
- *     type: NOTIFY_CAMERA_ERROR,
- *     error: Object
- * }}
- */
-export function notifyCameraError(error) {
-    return {
-        type: NOTIFY_CAMERA_ERROR,
-        error
-    };
-}
-
-/**
- * Signals that an error occurred while trying to obtain a track from a mic.
- *
- * @param {Object} error - The device error, as provided by lib-jitsi-meet.
- * @param {Object} error.name - The constant for the type of the error.
- * @param {string} error.message - Optional additional information about the
- * error.
- * @returns {{
- *     type: NOTIFY_MIC_ERROR,
- *     error: Object
- * }}
- */
-export function notifyMicError(error) {
-    return {
-        type: NOTIFY_MIC_ERROR,
-        error
-    };
-}
 
 /**
  * Remove all pending device requests.

react/features/base/devices/functions.js

@@ -67,34 +67,6 @@ export function getDeviceIdByLabel(state: Object, label: string, kind: string) {
     }
 }
 
-/**
- * Finds a device with a label that matches the passed id and returns its label.
- *
- * @param {Object} state - The redux state.
- * @param {string} id - The device id.
- * @param {string} kind - The type of the device. One of "audioInput",
- * "audioOutput", and "videoInput". Also supported is all lowercase versions
- * of the preceding types.
- * @returns {string|undefined}
- */
-export function getDeviceLabelById(state: Object, id: string, kind: string) {
-    const webrtcKindToJitsiKindTranslator = {
-        audioinput: 'audioInput',
-        audiooutput: 'audioOutput',
-        videoinput: 'videoInput'
-    };
-
-    const kindToSearch = webrtcKindToJitsiKindTranslator[kind] || kind;
-
-    const device
-        = (state['features/base/devices'].availableDevices[kindToSearch] || [])
-        .find(d => d.deviceId === id);
-
-    if (device) {
-        return device.label;
-    }
-}
-
 /**
  * Returns the devices set in the URL.
  *
@@ -146,29 +118,24 @@ export function groupDevicesByKind(devices: Object[]): Object {
  * @param {string} newId - New audio output device id.
  * @param {Function} dispatch - The Redux dispatch function.
  * @param {boolean} userSelection - Whether this is a user selection update.
- * @param {?string} newLabel - New audio output device label to store.
  * @returns {Promise}
  */
 export function setAudioOutputDeviceId(
         newId: string = 'default',
         dispatch: Function,
-        userSelection: boolean = false,
-        newLabel: ?string): Promise<*> {
+        userSelection: boolean = false): Promise<*> {
     return JitsiMeetJS.mediaDevices.setAudioOutputDevice(newId)
         .then(() => {
             const newSettings = {
                 audioOutputDeviceId: newId,
-                userSelectedAudioOutputDeviceId: undefined,
-                userSelectedAudioOutputDeviceLabel: undefined
+                userSelectedAudioOutputDeviceId: undefined
             };
 
             if (userSelection) {
                 newSettings.userSelectedAudioOutputDeviceId = newId;
-                newSettings.userSelectedAudioOutputDeviceLabel = newLabel;
             } else {
                 // a flow workaround, I needed to add 'userSelectedAudioOutputDeviceId: undefined'
                 delete newSettings.userSelectedAudioOutputDeviceId;
-                delete newSettings.userSelectedAudioOutputDeviceLabel;
             }
 
             return dispatch(updateSettings(newSettings));

react/features/base/devices/middleware.js

@@ -4,7 +4,6 @@ import { CONFERENCE_JOINED } from '../conference';
 import { processExternalDeviceRequest } from '../../device-selection';
 import { MiddlewareRegistry } from '../redux';
 import UIEvents from '../../../../service/UI/UIEvents';
-import { JitsiTrackErrors } from '../lib-jitsi-meet';
 
 import {
     removePendingDeviceRequests,
@@ -13,35 +12,15 @@ import {
 } from './actions';
 import {
     CHECK_AND_NOTIFY_FOR_NEW_DEVICE,
-    NOTIFY_CAMERA_ERROR,
-    NOTIFY_MIC_ERROR,
     SET_AUDIO_INPUT_DEVICE,
     SET_VIDEO_INPUT_DEVICE
 } from './actionTypes';
-import { showNotification, showWarningNotification } from '../../notifications';
+import { showNotification } from '../../notifications';
 import { updateSettings } from '../settings';
 import { setAudioOutputDeviceId } from './functions';
 
 const logger = require('jitsi-meet-logger').getLogger(__filename);
 
-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'
-    }
-};
-
 /**
  * Implements the middleware of the feature base/devices.
  *
@@ -53,53 +32,6 @@ MiddlewareRegistry.register(store => next => action => {
     switch (action.type) {
     case CONFERENCE_JOINED:
         return _conferenceJoined(store, next, action);
-    case NOTIFY_CAMERA_ERROR: {
-        if (typeof APP !== 'object' || !action.error) {
-            break;
-        }
-
-        const { message, name } = action.error;
-
-        const cameraJitsiTrackErrorMsg
-            = JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[name];
-        const cameraErrorMsg = cameraJitsiTrackErrorMsg
-            || JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP
-                .camera[JitsiTrackErrors.GENERAL];
-        const additionalCameraErrorMsg = cameraJitsiTrackErrorMsg ? null : message;
-
-        store.dispatch(showWarningNotification({
-            description: additionalCameraErrorMsg,
-            descriptionKey: cameraErrorMsg,
-            titleKey: name === JitsiTrackErrors.PERMISSION_DENIED
-                ? 'deviceError.cameraPermission' : 'deviceError.cameraError'
-        }));
-
-        break;
-    }
-    case NOTIFY_MIC_ERROR: {
-        if (typeof APP !== 'object' || !action.error) {
-            break;
-        }
-
-        const { message, name } = action.error;
-
-        const micJitsiTrackErrorMsg
-            = JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[name];
-        const micErrorMsg = micJitsiTrackErrorMsg
-            || JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP
-                .microphone[JitsiTrackErrors.GENERAL];
-        const additionalMicErrorMsg = micJitsiTrackErrorMsg ? null : message;
-
-        store.dispatch(showWarningNotification({
-            description: additionalMicErrorMsg,
-            descriptionKey: micErrorMsg,
-            titleKey: name === JitsiTrackErrors.PERMISSION_DENIED
-                ? 'deviceError.microphonePermission'
-                : 'deviceError.microphoneError'
-        }));
-
-        break;
-    }
     case SET_AUDIO_INPUT_DEVICE:
         APP.UI.emitEvent(UIEvents.AUDIO_DEVICE_CHANGED, action.deviceId);
         break;
@@ -147,9 +79,7 @@ function _conferenceJoined({ dispatch, getState }, next, action) {
 
 /**
  * Finds a new device by comparing new and old array of devices and dispatches
- * notification with the new device. For new devices with same groupId only one
- * notification will be shown, this is so to avoid showing multiple notifications
- * for audio input and audio output devices.
+ * notification with the new device.
  *
  * @param {Store} store - The redux store in which the specified {@code action}
  * is being dispatched.
@@ -167,25 +97,7 @@ function _checkAndNotifyForNewDevice(store, newDevices, oldDevices) {
         nDevice => !oldDevices.find(
             device => device.deviceId === nDevice.deviceId));
 
-    // we group devices by groupID which normally is the grouping by physical device
-    // plugging in headset we provide normally two device, one input and one output
-    // and we want to show only one notification for this physical audio device
-    const devicesGroupBy = onlyNewDevices.reduce((accumulated, value) => {
-        accumulated[value.groupId] = accumulated[value.groupId] || [];
-        accumulated[value.groupId].push(value);
-
-        return accumulated;
-    }, {});
-
-    Object.values(devicesGroupBy).forEach(devicesArray => {
-
-        if (devicesArray.length < 1) {
-            return;
-        }
-
-        // let's get the first device as a reference, we will use it for
-        // label and type
-        const newDevice = devicesArray[0];
+    onlyNewDevices.forEach(newDevice => {
 
         // we want to strip any device details that are not very
         // user friendly, like usb ids put in brackets at the end
@@ -203,9 +115,12 @@ function _checkAndNotifyForNewDevice(store, newDevices, oldDevices) {
             titleKey = 'notify.newDeviceCameraTitle';
             break;
         }
-        case 'audioinput' :
+        case 'audioinput': {
+            titleKey = 'notify.newDeviceMicTitle';
+            break;
+        }
         case 'audiooutput': {
-            titleKey = 'notify.newDeviceAudioTitle';
+            titleKey = 'notify.newDeviceCameraTitle';
             break;
         }
         }
@@ -214,7 +129,7 @@ function _checkAndNotifyForNewDevice(store, newDevices, oldDevices) {
             description,
             titleKey,
             customActionNameKey: 'notify.newDeviceAction',
-            customActionHandler: _useDevice.bind(undefined, store, devicesArray)
+            customActionHandler: _useDevice.bind(undefined, store, newDevice)
         }));
     });
 }
@@ -224,49 +139,44 @@ function _checkAndNotifyForNewDevice(store, newDevices, oldDevices) {
  *
  * @param {Store} store - The redux store in which the specified {@code action}
  * is being dispatched.
- * @param {Array<MediaDeviceInfo|InputDeviceInfo>} devices - The devices to save.
+ * @param {MediaDeviceInfo} device - The device to save.
  * @returns {boolean} - Returns true in order notifications to be dismissed.
  * @private
  */
-function _useDevice({ dispatch }, devices) {
-    devices.forEach(device => {
-        switch (device.kind) {
-        case 'videoinput': {
-            dispatch(updateSettings({
-                userSelectedCameraDeviceId: device.deviceId,
-                userSelectedCameraDeviceLabel: device.label
-            }));
+function _useDevice({ dispatch }, device) {
+    switch (device.kind) {
+    case 'videoinput': {
+        dispatch(updateSettings({
+            userSelectedCameraDeviceId: device.deviceId
+        }));
 
-            dispatch(setVideoInputDevice(device.deviceId));
-            break;
-        }
-        case 'audioinput': {
-            dispatch(updateSettings({
-                userSelectedMicDeviceId: device.deviceId,
-                userSelectedMicDeviceLabel: device.label
-            }));
+        dispatch(setVideoInputDevice(device.deviceId));
+        break;
+    }
+    case 'audioinput': {
+        dispatch(updateSettings({
+            userSelectedMicDeviceId: device.deviceId
+        }));
 
-            dispatch(setAudioInputDevice(device.deviceId));
-            break;
-        }
-        case 'audiooutput': {
-            setAudioOutputDeviceId(
-                device.deviceId,
-                dispatch,
-                true,
-                device.label)
-                .then(() => logger.log('changed audio output device'))
-                .catch(err => {
-                    logger.warn(
-                        'Failed to change audio output device.',
-                        'Default or previously set audio output device will',
-                        ' be used instead.',
-                        err);
-                });
-            break;
-        }
-        }
-    });
+        dispatch(setAudioInputDevice(device.deviceId));
+        break;
+    }
+    case 'audiooutput': {
+        setAudioOutputDeviceId(
+            device.deviceId,
+            dispatch,
+            true)
+            .then(() => logger.log('changed audio output device'))
+            .catch(err => {
+                logger.warn(
+                    'Failed to change audio output device.',
+                    'Default or previously set audio output device will',
+                    ' be used instead.',
+                    err);
+            });
+        break;
+    }
+    }
 
     return true;
 }

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

@@ -1,52 +0,0 @@
-// @flow
-
-import React from 'react';
-import { Text } from 'react-native';
-
-import { translate } from '../../../i18n';
-import { connect } from '../../../redux';
-
-import { _abstractMapStateToProps } from '../../functions';
-
-import { type Props as AbstractProps } from './BaseDialog';
-import BaseSubmitDialog from './BaseSubmitDialog';
-
-type Props = AbstractProps & {
-
-    /**
-     * Untranslated i18n key of the content to be displayed.
-     *
-     * NOTE: This dialog also adds support to Object type keys that will be
-     * translated using the provided params. See i18n function
-     * {@code translate(string, Object)} for more details.
-     */
-    contentKey: string | { key: string, params: Object},
-};
-
-/**
- * Implements an alert dialog, to simply show an error or a message, then disappear on dismiss.
- */
-class AlertDialog extends BaseSubmitDialog<Props, *> {
-    /**
-     * Implements {@code BaseSubmitDialog._renderSubmittable}.
-     *
-     * @inheritdoc
-     */
-    _renderSubmittable() {
-        const { _dialogStyles, contentKey, t } = this.props;
-        const content
-            = typeof contentKey === 'string'
-                ? t(contentKey)
-                : this._renderHTML(t(contentKey.key, contentKey.params));
-
-        return (
-            <Text style = { _dialogStyles.text }>
-                { content }
-            </Text>
-        );
-    }
-
-    _renderHTML: string => Object | string
-}
-
-export default translate(connect(_abstractMapStateToProps)(AlertDialog));

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

@@ -1,7 +1,7 @@
 // @flow
 
 import React, { PureComponent, type Node } from 'react';
-import { Platform, SafeAreaView, ScrollView, View } from 'react-native';
+import { SafeAreaView, View } from 'react-native';
 
 import { ColorSchemeRegistry } from '../../../color-scheme';
 import { SlidingView } from '../../../react';
@@ -36,6 +36,21 @@ type Props = {
  * A component emulating Android's BottomSheet.
  */
 class BottomSheet extends PureComponent<Props> {
+    /**
+     * Assembles a style for the BottomSheet container.
+     *
+     * @private
+     * @returns {StyleType}
+     */
+    _getContainerStyle() {
+        const { _styles } = this.props;
+
+        return {
+            ...styles.container,
+            backgroundColor: _styles.sheet.backgroundColor
+        };
+    }
+
     /**
      * Implements React's {@link Component#render()}.
      *
@@ -50,46 +65,15 @@ class BottomSheet extends PureComponent<Props> {
                 onHide = { this.props.onCancel }
                 position = 'bottom'
                 show = { true }>
-                <View
-                    pointerEvents = 'box-none'
-                    style = { styles.sheetContainer }>
-                    <View
-                        pointerEvents = 'box-none'
-                        style = { styles.sheetAreaCover } />
-                    <View
-                        style = { [
-                            styles.sheetItemContainer,
-                            _styles.sheet
-                        ] }>
-                        <ScrollView bounces = { false }>
-                            { this._getWrappedContent() }
-                        </ScrollView>
+                <SafeAreaView
+                    style = { this._getContainerStyle() }>
+                    <View style = { _styles.sheet }>
+                        { this.props.children }
                     </View>
-                </View>
+                </SafeAreaView>
             </SlidingView>
         );
     }
-
-    /**
-     * Wraps the content when needed (iOS 11 and above), or just returns the original children.
-     *
-     * @returns {React$Element}
-     */
-    _getWrappedContent() {
-        if (Platform.OS === 'ios') {
-            const majorVersionIOS = parseInt(Platform.Version, 10);
-
-            if (majorVersionIOS > 10) {
-                return (
-                    <SafeAreaView>
-                        { this.props.children }
-                    </SafeAreaView>
-                );
-            }
-        }
-
-        return this.props.children;
-    }
 }
 
 /**

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

@@ -32,12 +32,7 @@ type Props = BaseProps & {
 
     t: Function,
 
-    textInputProps: ?Object,
-
-    /**
-     * Validating of the input.
-     */
-    validateInput: ?Function
+    textInputProps: ?Object
 }
 
 type State = {
@@ -123,12 +118,6 @@ class InputDialog extends BaseDialog<Props, State> {
      * @returns {void}
      */
     _onChangeText(fieldValue) {
-
-        if (this.props.validateInput
-                && !this.props.validateInput(fieldValue)) {
-            return;
-        }
-
         this.setState({
             fieldValue
         });

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

@@ -4,7 +4,6 @@ export { default as BottomSheet } from './BottomSheet';
 export { default as ConfirmDialog } from './ConfirmDialog';
 export { default as CustomDialog } from './CustomDialog';
 export { default as DialogContainer } from './DialogContainer';
-export { default as AlertDialog } from './AlertDialog';
 export { default as InputDialog } from './InputDialog';
 export { default as CustomSubmitDialog } from './CustomSubmitDialog';
 

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

@@ -27,28 +27,17 @@ export const PLACEHOLDER_COLOR = ColorPalette.lightGrey;
  * been implemented as per the Material Design guidelines:
  * {@link https://material.io/guidelines/components/bottom-sheets.html}.
  */
-export const bottomSheetStyles = {
-    sheetAreaCover: {
-        backgroundColor: ColorPalette.transparent,
-        flex: 1
-    },
-
+export const bottomSheetStyles = createStyleSheet({
     /**
      * Style for the container of the sheet.
      */
-    sheetContainer: {
-        alignItems: 'stretch',
-        flex: 1,
-        flexDirection: 'column',
-        justifyContent: 'flex-end'
-    },
-
-    sheetItemContainer: {
-        flex: -1,
-        maxHeight: '60%',
-        paddingHorizontal: MD_ITEM_MARGIN_PADDING
+    container: {
+        bottom: 0,
+        left: 0,
+        position: 'absolute',
+        right: 0
     }
-};
+});
 
 export const brandedDialog = createStyleSheet({
 
@@ -148,7 +137,10 @@ ColorSchemeRegistry.register('BottomSheet', {
      * Bottom sheet's base style.
      */
     sheet: {
-        backgroundColor: schemeColor('background')
+        backgroundColor: schemeColor('background'),
+        flex: 1,
+        paddingHorizontal: MD_ITEM_MARGIN_PADDING,
+        paddingVertical: 8
     },
 
     /**

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

@@ -43,9 +43,7 @@ export function createLocalTrack(type: string, deviceId: string) {
  * otherwise.
  */
 export function isAnalyticsEnabled(stateful: Function | Object) {
-    const { disableThirdPartyRequests, analytics = {} } = toState(stateful)['features/base/config'];
-
-    return !disableThirdPartyRequests && !analytics.disabled;
+    return !toState(stateful)['features/base/config'].disableThirdPartyRequests;
 }
 
 /**

react/features/base/media/components/AbstractAudio.js

@@ -2,8 +2,6 @@
 
 import { Component } from 'react';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 /**
  * Describes audio element interface used in the base/media feature for audio
  * playback.
@@ -12,7 +10,7 @@ export type AudioElement = {
     currentTime: number,
     pause: () => void,
     play: () => void,
-    setSinkId?: string => Function,
+    setSinkId?: string => void,
     stop: () => void
 };
 
@@ -115,8 +113,7 @@ export default class AbstractAudio extends Component<Props> {
     setSinkId(sinkId: string): void {
         this._audioElementImpl
             && typeof this._audioElementImpl.setSinkId === 'function'
-            && this._audioElementImpl.setSinkId(sinkId)
-                .catch(error => logger.error('Error setting sink', error));
+            && this._audioElementImpl.setSinkId(sinkId);
     }
 
     /**

react/features/base/participants/functions.js

@@ -260,37 +260,15 @@ function _getAllParticipants(stateful) {
             : toState(stateful)['features/base/participants'] || []);
 }
 
-/**
- * Returns true if all of the meeting participants are moderators.
- *
- * @param {Object|Function} stateful -Object or function that can be resolved
- * to the Redux state.
- * @returns {boolean}
- */
-export function isEveryoneModerator(stateful: Object | Function) {
-    const participants = _getAllParticipants(stateful);
-
-    for (const participant of participants) {
-        if (participant.role !== PARTICIPANT_ROLE.MODERATOR) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
 /**
  * Returns true if the current local participant is a moderator in the
  * conference.
  *
  * @param {Object|Function} stateful - Object or function that can be resolved
  * to the Redux state.
- * @param {?boolean} ignoreToken - When true we ignore the token check.
  * @returns {boolean}
  */
-export function isLocalParticipantModerator(
-        stateful: Object | Function,
-        ignoreToken: ?boolean = false) {
+export function isLocalParticipantModerator(stateful: Object | Function) {
     const state = toState(stateful);
     const localParticipant = getLocalParticipant(state);
 
@@ -300,8 +278,7 @@ export function isLocalParticipantModerator(
 
     return (
         localParticipant.role === PARTICIPANT_ROLE.MODERATOR
-        && (ignoreToken
-                || !state['features/base/config'].enableUserRolesBasedOnToken
+            && (!state['features/base/config'].enableUserRolesBasedOnToken
                 || !state['features/base/jwt'].isGuest));
 }
 

react/features/base/react/components/native/HeaderWithNavigation.js

@@ -1,66 +0,0 @@
-// @flow
-
-import React, { Component } from 'react';
-
-import { translate } from '../../../i18n';
-
-import BackButton from './BackButton';
-import ForwardButton from './ForwardButton';
-import Header from './Header';
-import HeaderLabel from './HeaderLabel';
-
-
-type Props = {
-
-    /**
-     * Boolean to set the forward button disabled.
-     */
-    forwardDisabled: boolean,
-
-    /**
-     * The i18n key of the the forward button label.
-     */
-    forwardLabelKey: ?string,
-
-    /**
-     * The i18n key of the header label (title)
-     */
-    headerLabelKey: ?string,
-
-    /**
-     * Callback to be invoked on pressing the back button.
-     */
-    onPressBack: ?Function,
-
-    /**
-     * Callback to be invoked on pressing the forward button.
-     */
-    onPressForward: ?Function,
-}
-
-/**
- * Implements a header with the standard navigation content.
- */
-class HeaderWithNavigation extends Component<Props> {
-    /**
-     * Implements {@code Component#render}.
-     *
-     * @inheritdoc
-     */
-    render() {
-        const { onPressBack, onPressForward } = this.props;
-
-        return (
-            <Header>
-                { onPressBack && <BackButton onPress = { onPressBack } /> }
-                <HeaderLabel labelKey = { this.props.headerLabelKey } />
-                { onPressForward && <ForwardButton
-                    disabled = { this.props.forwardDisabled }
-                    labelKey = { this.props.forwardLabelKey }
-                    onPress = { onPressForward } /> }
-            </Header>
-        );
-    }
-}
-
-export default translate(HeaderWithNavigation);

react/features/base/react/components/native/NavigateSectionListItem.js

@@ -5,11 +5,12 @@ import Swipeout from 'react-native-swipeout';
 
 import { ColorPalette } from '../../../styles';
 
+import Container from './Container';
+import Text from './Text';
+import styles from './styles';
 import type { Item } from '../../Types';
 
 import AvatarListItem from './AvatarListItem';
-import Text from './Text';
-import styles from './styles';
 
 type Props = {
 
@@ -92,6 +93,24 @@ export default class NavigateSectionListItem extends Component<Props> {
         return lines && lines.length ? lines.map(this._renderItemLine) : null;
     }
 
+    /**
+     * Renders the secondary action label.
+     *
+     * @private
+     * @returns {React$Node}
+     */
+    _renderSecondaryAction() {
+        const { secondaryAction } = this.props;
+
+        return (
+            <Container
+                onClick = { secondaryAction }
+                style = { styles.secondaryActionContainer }>
+                <Text style = { styles.secondaryActionLabel }>+</Text>
+            </Container>
+        );
+    }
+
     /**
      * Renders the content of this component.
      *
@@ -119,12 +138,14 @@ export default class NavigateSectionListItem extends Component<Props> {
 
         return (
             <Swipeout
-                autoClose = { true }
                 backgroundColor = { ColorPalette.transparent }
                 right = { right }>
                 <AvatarListItem
                     item = { item }
-                    onPress = { this.props.onPress } />
+                    onPress = { this.props.onPress }>
+                    { this.props.secondaryAction
+                        && this._renderSecondaryAction() }
+                </AvatarListItem>
             </Swipeout>
         );
     }

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

@@ -8,7 +8,6 @@ export { default as Container } from './Container';
 export { default as ForwardButton } from './ForwardButton';
 export { default as Header } from './Header';
 export { default as HeaderLabel } from './HeaderLabel';
-export { default as HeaderWithNavigation } from './HeaderWithNavigation';
 export { default as Image } from './Image';
 export { default as Link } from './Link';
 export { default as LoadingIndicator } from './LoadingIndicator';

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

@@ -4,6 +4,7 @@ import { BoxModel, ColorPalette, createStyleSheet } from '../../../styles';
 
 const AVATAR_OPACITY = 0.4;
 const OVERLAY_FONT_COLOR = 'rgba(255, 255, 255, 0.6)';
+const SECONDARY_ACTION_BUTTON_SIZE = 30;
 
 export const AVATAR_SIZE = 65;
 export const UNDERLAY_COLOR = 'rgba(255, 255, 255, 0.2)';
@@ -217,6 +218,21 @@ const SECTION_LIST_STYLES = {
         color: OVERLAY_FONT_COLOR
     },
 
+    secondaryActionContainer: {
+        alignItems: 'center',
+        backgroundColor: ColorPalette.blue,
+        borderRadius: 3,
+        height: SECONDARY_ACTION_BUTTON_SIZE,
+        justifyContent: 'center',
+        margin: BoxModel.margin * 0.5,
+        marginRight: BoxModel.margin,
+        width: SECONDARY_ACTION_BUTTON_SIZE
+    },
+
+    secondaryActionLabel: {
+        color: ColorPalette.white
+    },
+
     touchableView: {
         flexDirection: 'row'
     }

react/features/base/session/Session.js

@@ -0,0 +1,86 @@
+// @flow
+
+import uuid from 'uuid';
+
+import { toURLString } from '../util';
+
+import type JitsiConference from 'lib-jitsi-meet/JitsiConference';
+import type JitsiConnection from 'lib-jitsi-meet/JitsiConnection';
+
+/**
+ * FIXME.
+ */
+export class Session {
+    _conference: ?JitsiConference;
+    _connection: ?JitsiConnection;
+    conferenceFailed: boolean;
+    id: string;
+    locationURL: URL;
+    room: string;
+
+    /**
+     * FIXME.
+     *
+     * @param {URL} locationURL - FIXME.
+     * @param {string} room - FIXME.
+     */
+    constructor(locationURL: URL, room: string) {
+        this.locationURL = locationURL;
+        this.room = room;
+        this.id = uuid.v4().toUpperCase();
+        this.conferenceFailed = false;
+    }
+
+    /**
+     * FIXME.
+     *
+     * @param {JitsiConference} [conference] - FIXME.
+     */
+    set conference(conference: ?JitsiConference) {
+        if (this._conference && conference && this._conference !== conference) {
+            throw new Error(`Attempt to reassign conference to ${this.toString()}`);
+        }
+
+        this._conference = conference;
+    }
+
+    /**
+     * FIXME.
+     *
+     * @returns {?JitsiConference}
+     */
+    get conference(): ?JitsiConference {
+        return this._conference;
+    }
+
+    /**
+     * FIXME.
+     *
+     * @param {JitsiConnection} [connection] - FIXME.
+     */
+    set connection(connection: ?JitsiConnection) {
+        if (this._connection && connection && this._connection !== connection) {
+            throw new Error(`Attempt to reassign connection to ${this.toString()}`);
+        }
+
+        this._connection = connection;
+    }
+
+    /**
+     * FIXME.
+     *
+     * @returns {?JitsiConnection}
+     */
+    get connection() {
+        return this._connection;
+    }
+
+    /**
+     * FIXME.
+     *
+     * @returns {string}
+     */
+    toString() {
+        return `Session[id=${this.id}, URL: ${toURLString(this.locationURL)} room: ${this.room}]`;
+    }
+}

react/features/base/session/actionTypes.js

@@ -0,0 +1,8 @@
+
+export const SESSION_CREATED = 'SESSION_CREATED';
+
+export const SESSION_STARTED = 'SESSION_STARTED';
+
+export const SESSION_TERMINATED = 'SESSION_TERMINATED';
+
+export const SESSION_FAILED = 'SESSION_FAILED';

react/features/base/session/actions.js

@@ -0,0 +1,135 @@
+// @flow
+
+import { conferenceLeft, conferenceWillLeave } from '../conference';
+
+import { SESSION_CREATED, SESSION_FAILED, SESSION_STARTED, SESSION_TERMINATED } from './actionTypes';
+import { Session } from './Session';
+
+import type { Dispatch } from 'redux';
+
+const logger = require('jitsi-meet-logger').getLogger(__filename);
+
+/**
+ * FIXME.
+ *
+ * @returns {Function}
+ */
+export function endAllSessions() {
+    return (dispatch: Dispatch<any>, getState: Function) => {
+        const sessions = getState()['features/base/session'];
+
+        for (const session of sessions.values()) {
+            dispatch(endSession(session));
+        }
+    };
+}
+
+/**
+ * FIXME.
+ *
+ * @param {Session} session - FIXME.
+ * @returns {function(*): *}
+ */
+export function endSession(session: Session) {
+    return (dispatch: Dispatch<any>) => {
+        // The conference we have already joined or are joining.
+        const conference_ = session.conference;
+
+        // Promise which completes when the conference has been left and the connection has been disconnected.
+        let promise;
+
+        // Leave the conference.
+        if (conference_) {
+            // In a fashion similar to JitsiConference's CONFERENCE_LEFT event (and the respective Redux action) which
+            // is fired after the conference has been left, notify the application about the intention to leave
+            // the conference.
+            dispatch(conferenceWillLeave(conference_));
+
+            promise
+                = conference_.leave()
+                    .catch(error => {
+                        logger.warn('JitsiConference.leave() rejected with:', error);
+
+                        // The library lib-jitsi-meet failed to make the JitsiConference leave. Which may be because
+                        // JitsiConference thinks it has already left. Regardless of the failure reason, continue in
+                        // jitsi-meet as if the leave has succeeded.
+                        dispatch(conferenceLeft(conference_));
+                    });
+        } else {
+            promise = Promise.resolve();
+        }
+
+        const connection_ = session.connection;
+
+        if (connection_) {
+            promise = promise.then(() => connection_.disconnect());
+        }
+
+        return promise;
+    };
+}
+
+/**
+ * FIXME.
+ *
+ * @param {URL} locationURL - FIXME.
+ * @param {string} room - FIXME.
+ * @returns {{
+ *     type: SESSION_CREATED,
+ *     session: Session
+ * }}
+ */
+export function createSession(locationURL: URL, room: string) {
+    return {
+        type: SESSION_CREATED,
+        session: new Session(locationURL, room)
+    };
+}
+
+/**
+ * FIXME.
+ *
+ * @param {Session} session - FIXME.
+ * @returns {{
+ *     type: SESSION_FAILED,
+ *     session: Session
+ * }}
+ */
+export function sessionFailed(session: Session) {
+    return {
+        type: SESSION_FAILED,
+        session
+    };
+}
+
+/**
+ * FIXME.
+ *
+ * @param {Session} session - FIXME.
+ * @returns {{
+ *     session: Session,
+ *     type: string
+ * }}
+ */
+export function sessionStarted(session: Session) {
+    return {
+        type: SESSION_STARTED,
+        session
+    };
+}
+
+/**
+ * FIXME.
+ *
+ * @param {Session} session - FIXME.
+ * @returns {{
+ *     type: SESSION_TERMINATED,
+ *     session: Session
+ * }}
+ */
+export function sessionTerminated(session: Session) {
+    return {
+        type: SESSION_TERMINATED,
+        session
+    };
+}