ref(Thumbnail): Create React component.

.gitignore

@@ -69,7 +69,6 @@ buck-out/
 *.framework
 android/app/debug
 android/app/release
-ios/sdk/out
 
 # precommit-hook
 .jshintignore

ConferenceEvents.js

@@ -0,0 +1,4 @@
+/**
+ * Notifies interested parties that hangup procedure will start.
+ */
+export const BEFORE_HANGUP = 'conference.before_hangup';

android/gradle.properties

@@ -25,5 +25,5 @@ android.enableDexingArtifactTransform.desugaring=false
 android.useAndroidX=true
 android.enableJetifier=true
 
-appVersion=21.0.0
-sdkVersion=3.0.0
+appVersion=20.5.0
+sdkVersion=2.11.0

android/sdk/build.gradle

@@ -25,6 +25,10 @@ android {
     sourceSets {
         main {
             java {
+                if (rootProject.ext.libreBuild) {
+                    srcDir "src"
+                    exclude "**/AmplitudeModule.java"
+                }
                 exclude "test/"
             }
         }
@@ -47,23 +51,17 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'com.squareup.duktape:duktape-android:1.3.0'
 
-    if (rootProject.ext.libreBuild) {
-        implementation(project(':react-native-device-info')) {
-            exclude group: 'com.google.firebase'
-            exclude group: 'com.google.android.gms'
-            exclude group: 'com.android.installreferrer'
-        }
-    } else {
-        implementation project(':react-native-device-info')
+    if (!rootProject.ext.libreBuild) {
+        implementation 'com.amplitude:android-sdk:2.14.1'
         implementation(project(":react-native-google-signin")) {
             exclude group: 'com.google.android.gms'
             exclude group: 'androidx'
         }
     }
 
-    implementation project(':react-native-async-storage')
     implementation project(':react-native-background-timer')
     implementation project(':react-native-calendar-events')
+    implementation project(':react-native-community-async-storage')
     implementation project(':react-native-community_netinfo')
     implementation project(':react-native-default-preference')
     implementation project(':react-native-immersive')

android/sdk/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="org.jitsi.meet.sdk">
     <!-- XXX ACCESS_NETWORK_STATE is required by WebRTC. -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -35,7 +34,7 @@
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true"
-            android:windowSoftInputMode="adjustResize"/>
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
 
         <service
@@ -49,13 +48,6 @@
         <service
             android:name="org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService"
             android:foregroundServiceType="mediaProjection" />
-
-        <provider
-            android:name="com.reactnativecommunity.webview.RNCWebViewFileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:enabled="false"
-            tools:replace="android:authorities">
-        </provider>
     </application>
 
 </manifest>

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

@@ -0,0 +1,122 @@
+/*
+ * Copyright @ 2019-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jitsi.meet.sdk;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+
+import com.amplitude.api.Amplitude;
+import com.facebook.react.module.annotations.ReactModule;
+
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Implements the react-native module for the Amplitude integration.
+ */
+@ReactModule(name = AmplitudeModule.NAME)
+class AmplitudeModule
+        extends ReactContextBaseJavaModule {
+
+    public static final String NAME = "Amplitude";
+    public static final String JITSI_PREFERENCES = "jitsi-preferences";
+    public static final String AMPLITUDE_DEVICE_ID_KEY = "amplitudeDeviceId";
+
+    public AmplitudeModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    /**
+     * Initializes the Amplitude SDK.
+     *
+     * @param instanceName The name of the Amplitude instance. Should
+     * be used only for multi-project logging.
+     * @param apiKey The API_KEY of the Amplitude project.
+     */
+    @ReactMethod
+    @SuppressLint("HardwareIds")
+    public void init(String instanceName, String apiKey) {
+        Amplitude.getInstance(instanceName).initialize(getCurrentActivity(), apiKey);
+
+        // Set the device ID to something consistent.
+        SharedPreferences sharedPreferences = getReactApplicationContext().getSharedPreferences(JITSI_PREFERENCES, Context.MODE_PRIVATE);
+        String android_id = sharedPreferences.getString(AMPLITUDE_DEVICE_ID_KEY, "");
+        if (!TextUtils.isEmpty(android_id)) {
+            Amplitude.getInstance(instanceName).setDeviceId(android_id);
+        } else {
+            String amplitudeId = Amplitude.getInstance(instanceName).getDeviceId();
+            SharedPreferences.Editor editor = sharedPreferences.edit();
+            editor.putString(JITSI_PREFERENCES, amplitudeId).apply();
+        }
+    }
+
+    /**
+     * 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.
+     *
+     * @param instanceName The name of the Amplitude instance.
+     * @param userProps JSON string with user properties to be set.
+     */
+    @ReactMethod
+    public void setUserProperties(String instanceName, ReadableMap userProps) {
+        if (userProps != null) {
+            Amplitude.getInstance(instanceName).setUserProperties(
+                    new JSONObject(userProps.toHashMap()));
+        }
+    }
+
+    /**
+     * Log an analytics event.
+     *
+     * @param instanceName The name of the Amplitude instance.
+     * @param eventType The event type.
+     * @param eventPropsString JSON string with the event properties.
+     */
+    @ReactMethod
+    public void logEvent(String instanceName, String eventType, String eventPropsString) {
+        try {
+            JSONObject eventProps = new JSONObject(eventPropsString);
+            Amplitude.getInstance(instanceName).logEvent(eventType, eventProps);
+        } catch (JSONException e) {
+            JitsiMeetLogger.e(e, "Error logging event");
+        }
+    }
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+}

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

@@ -16,11 +16,8 @@
 
 package org.jitsi.meet.sdk;
 
-import android.media.AudioAttributes;
 import android.media.AudioDeviceInfo;
-import android.media.AudioFocusRequest;
 import android.media.AudioManager;
-import android.os.Build;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -63,7 +60,7 @@ class AudioDeviceHandlerGeneric implements
     private AudioManager audioManager;
 
     /**
-     * {@link Runnable} for running audio device detection in the audio thread.
+     * {@link Runnable} for running audio device detection the main thread.
      * This is only used on Android >= M.
      */
     private final Runnable onAudioDeviceChangeRunner = new Runnable() {
@@ -145,7 +142,7 @@ class AudioDeviceHandlerGeneric implements
                         // Some other application potentially stole our audio focus
                         // temporarily. Restore our mode.
                         if (audioFocusLost) {
-                            module.resetAudioRoute();
+                            module.updateAudioRoute();
                         }
                         audioFocusLost = false;
                         break;
@@ -219,24 +216,8 @@ class AudioDeviceHandlerGeneric implements
         audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
         audioManager.setMicrophoneMute(false);
 
-        int gotFocus;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            gotFocus = audioManager.requestAudioFocus(new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
-                .setAudioAttributes(
-                    new AudioAttributes.Builder()
-                        .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
-                        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-                        .build()
-                )
-                .setAcceptsDelayedFocusGain(true)
-                .setOnAudioFocusChangeListener(this)
-                .build()
-            );
-        } else {
-            gotFocus = audioManager.requestAudioFocus(this, AudioManager.STREAM_VOICE_CALL, AudioManager.AUDIOFOCUS_GAIN);
-        }
-
-        if (gotFocus == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
+        if (audioManager.requestAudioFocus(this, AudioManager.STREAM_VOICE_CALL, AudioManager.AUDIOFOCUS_GAIN)
+            == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
             JitsiMeetLogger.w(TAG + " Audio focus request failed");
             return false;
         }

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

@@ -16,7 +16,6 @@
 
 package org.jitsi.meet.sdk;
 
-import android.app.Activity;
 import android.content.Context;
 import android.media.AudioManager;
 import android.os.Build;
@@ -257,7 +256,7 @@ class AudioModeModule extends ReactContextBaseJavaModule {
                 if (mode != -1) {
                     JitsiMeetLogger.i(TAG + " User selected device set to: " + device);
                     userSelectedDevice = device;
-                    updateAudioRoute(mode, false);
+                    updateAudioRoute(mode);
                 }
             }
         });
@@ -277,22 +276,13 @@ class AudioModeModule extends ReactContextBaseJavaModule {
             return;
         }
 
-        Activity currentActivity = getCurrentActivity();
-        if (currentActivity != null) {
-            if (mode == DEFAULT) {
-                currentActivity.setVolumeControlStream(AudioManager.USE_DEFAULT_STREAM_TYPE);
-            } else {
-                currentActivity.setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
-            }
-        }
-
         runInAudioThread(new Runnable() {
             @Override
             public void run() {
                 boolean success;
 
                 try {
-                    success = updateAudioRoute(mode, false);
+                    success = updateAudioRoute(mode);
                 } catch (Throwable e) {
                     success = false;
                     JitsiMeetLogger.e(e, TAG + " Failed to update audio route for mode: " + mode);
@@ -331,7 +321,7 @@ class AudioModeModule extends ReactContextBaseJavaModule {
      * @return {@code true} if the audio route was updated successfully;
      * {@code false}, otherwise.
      */
-    private boolean updateAudioRoute(int mode, boolean force) {
+    private boolean updateAudioRoute(int mode) {
         JitsiMeetLogger.i(TAG + " Update audio route for mode: " + mode);
 
         if (!audioDeviceHandler.setMode(mode)) {
@@ -366,7 +356,7 @@ class AudioModeModule extends ReactContextBaseJavaModule {
 
         // If the previously selected device and the current default one
         // match, do nothing.
-        if (!force && selectedDevice != null && selectedDevice.equals(audioDevice)) {
+        if (selectedDevice != null && selectedDevice.equals(audioDevice)) {
             return true;
         }
 
@@ -431,16 +421,7 @@ class AudioModeModule extends ReactContextBaseJavaModule {
      */
     void updateAudioRoute() {
         if (mode != -1) {
-            updateAudioRoute(mode, false);
-        }
-    }
-
-    /**
-     * Re-sets the current audio route. Needed when focus is lost and regained.
-     */
-    void resetAudioRoute() {
-        if (mode != -1) {
-            updateAudioRoute(mode, true);
+            updateAudioRoute(mode);
         }
     }
 

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

@@ -107,7 +107,7 @@ public class JitsiMeetActivity extends FragmentActivity
     protected JitsiMeetView getJitsiView() {
         JitsiMeetFragment fragment
             = (JitsiMeetFragment) getSupportFragmentManager().findFragmentById(R.id.jitsiFragment);
-        return fragment != null ? fragment.getJitsiView() : null;
+        return fragment.getJitsiView();
     }
 
     public void join(@Nullable String url) {
@@ -119,23 +119,11 @@ public class JitsiMeetActivity extends FragmentActivity
     }
 
     public void join(JitsiMeetConferenceOptions options) {
-        JitsiMeetView view = getJitsiView();
-
-        if (view != null) {
-            view.join(options);
-        } else {
-            JitsiMeetLogger.w("Cannot join, view is null");
-        }
+        getJitsiView().join(options);
     }
 
     public void leave() {
-        JitsiMeetView view = getJitsiView();
-
-        if (view != null) {
-            view.leave();
-        } else {
-            JitsiMeetLogger.w("Cannot leave, view is null");
-        }
+        getJitsiView().leave();
     }
 
     private @Nullable JitsiMeetConferenceOptions getConferenceOptions(Intent intent) {
@@ -203,11 +191,7 @@ public class JitsiMeetActivity extends FragmentActivity
 
     @Override
     protected void onUserLeaveHint() {
-        JitsiMeetView view = getJitsiView();
-
-        if (view != null) {
-            view.enterPictureInPicture();
-        }
+        getJitsiView().enterPictureInPicture();
     }
 
     // JitsiMeetActivityInterface

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

@@ -91,6 +91,14 @@ class ReactInstanceManagerHolder {
 
         nativeModules.add(new WebRTCModule(reactContext, options));
 
+        try {
+            Class<?> amplitudeModuleClass = Class.forName("org.jitsi.meet.sdk.AmplitudeModule");
+            Constructor constructor = amplitudeModuleClass.getConstructor(ReactApplicationContext.class);
+            nativeModules.add((NativeModule)constructor.newInstance(reactContext));
+        } catch (Exception e) {
+            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
+        }
+
         return nativeModules;
     }
 
@@ -184,7 +192,6 @@ class ReactInstanceManagerHolder {
                 new com.facebook.react.shell.MainReactPackage(),
                 new com.horcrux.svg.SvgPackage(),
                 new com.kevinresol.react_native_default_preference.RNDefaultPreferencePackage(),
-                new com.learnium.RNDeviceInfo.RNDeviceInfo(),
                 new com.ocetnik.timer.BackgroundTimerPackage(),
                 new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
                 new com.reactnativecommunity.netinfo.NetInfoPackage(),

android/settings.gradle

@@ -1,18 +1,16 @@
 rootProject.name = 'jitsi-meet'
 
 include ':app', ':sdk'
-include ':react-native-async-storage'
-project(':react-native-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-async-storage/async-storage/android')
 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-community_netinfo'
 project(':react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')
 include ':react-native-default-preference'
 project(':react-native-default-preference').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-default-preference/android')
-include ':react-native-device-info'
-project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
 include ':react-native-google-signin'
 project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/google-signin/android')
 include ':react-native-immersive'

app.js

@@ -17,6 +17,7 @@ import conference from './conference';
 import API from './modules/API';
 import UI from './modules/UI/UI';
 import keyboardshortcut from './modules/keyboardshortcut/keyboardshortcut';
+import remoteControl from './modules/remotecontrol/RemoteControl';
 import translation from './modules/translation/translation';
 
 // Initialize Olm as early as possible.
@@ -48,6 +49,7 @@ window.APP = {
     },
 
     keyboardshortcut,
+    remoteControl,
     translation,
     UI
 };

conference.js

@@ -3,6 +3,7 @@
 import EventEmitter from 'events';
 import Logger from 'jitsi-meet-logger';
 
+import * as JitsiMeetConferenceEvents from './ConferenceEvents';
 import { openConnection } from './connection';
 import { ENDPOINT_TEXT_MESSAGE_NAME } from './modules/API/constants';
 import AuthHandler from './modules/UI/authentication/AuthHandler';
@@ -52,7 +53,6 @@ import {
     updateDeviceList
 } from './react/features/base/devices';
 import {
-    browser,
     isFatalJitsiConnectionError,
     JitsiConferenceErrors,
     JitsiConferenceEvents,
@@ -85,8 +85,7 @@ import {
     participantMutedUs,
     participantPresenceChanged,
     participantRoleChanged,
-    participantUpdated,
-    updateRemoteParticipantFeatures
+    participantUpdated
 } from './react/features/base/participants';
 import {
     getUserSelectedCameraDeviceId,
@@ -122,13 +121,14 @@ import {
     isPrejoinPageVisible,
     makePrecallTest
 } from './react/features/prejoin';
-import { disableReceiver, stopReceiver } from './react/features/remote-control';
 import { toggleScreenshotCaptureEffect } from './react/features/screenshot-capture';
 import { setSharedVideoStatus } from './react/features/shared-video';
 import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/AudioMixerEffect';
 import { createPresenterEffect } from './react/features/stream-effects/presenter';
 import { endpointMessageReceived } from './react/features/subtitles';
 import UIEvents from './service/UI/UIEvents';
+import * as RemoteControlEvents
+    from './service/remotecontrol/RemoteControlEvents';
 
 const logger = Logger.getLogger(__filename);
 
@@ -472,8 +472,8 @@ export default {
      */
     createInitialLocalTracks(options = {}) {
         const errors = {};
-        const initialDevices = config.disableInitialGUM ? [] : [ 'audio' ];
-        const requestedAudio = !config.disableInitialGUM;
+        const initialDevices = [ 'audio' ];
+        const requestedAudio = true;
         let requestedVideo = false;
 
         // Always get a handle on the audio input device so that we have statistics even if the user joins the
@@ -484,22 +484,19 @@ export default {
             this.muteAudio(true, true);
         }
 
-        if (!config.disableInitialGUM
-                && !options.startWithVideoMuted
+        if (!options.startWithVideoMuted
                 && !options.startAudioOnly
                 && !options.startScreenSharing) {
             initialDevices.push('video');
             requestedVideo = true;
         }
 
-        if (!config.disableInitialGUM) {
-            JitsiMeetJS.mediaDevices.addEventListener(
-                JitsiMediaDevicesEvents.PERMISSION_PROMPT_IS_SHOWN,
-                browserName =>
-                    APP.store.dispatch(
-                        mediaPermissionPromptVisibilityChanged(true, browserName))
-            );
-        }
+        JitsiMeetJS.mediaDevices.addEventListener(
+            JitsiMediaDevicesEvents.PERMISSION_PROMPT_IS_SHOWN,
+            browser =>
+                APP.store.dispatch(
+                    mediaPermissionPromptVisibilityChanged(true, browser))
+        );
 
         let tryCreateLocalTracks;
 
@@ -597,42 +594,6 @@ export default {
         };
     },
 
-    /**
-     * Displays error notifications according to the state carried by {@code errors} object returned
-     * by {@link createInitialLocalTracks}.
-     * @param {Object} errors - the errors (if any) returned by {@link createInitialLocalTracks}.
-     *
-     * @returns {void}
-     * @private
-     */
-    _displayErrorsForCreateInitialLocalTracks(errors) {
-        const {
-            audioAndVideoError,
-            audioOnlyError,
-            screenSharingError,
-            videoOnlyError
-        } = errors;
-
-        // FIXME If there will be microphone error it will cover any screensharing dialog, but it's still better than in
-        // the reverse order where the screensharing dialog will sometimes be closing the microphone alert
-        // ($.prompt.close(); is called). Need to figure out dialogs chaining to fix that.
-        if (screenSharingError) {
-            this._handleScreenSharingError(screenSharingError);
-        }
-        if (audioAndVideoError || audioOnlyError) {
-            if (audioOnlyError || videoOnlyError) {
-                // 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));
-            } 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));
-            }
-        }
-    },
-
     /**
      * Creates local media tracks and connects to a room. Will show error
      * dialogs in case accessing the local microphone and/or camera failed. Will
@@ -653,11 +614,38 @@ export default {
      */
     createInitialLocalTracksAndConnect(roomName, options = {}) {
         const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(options);
+        const {
+            audioAndVideoError,
+            audioOnlyError,
+            screenSharingError,
+            videoOnlyError
+        } = errors;
 
         return Promise.all([ tryCreateLocalTracks, connect(roomName) ])
             .then(([ tracks, con ]) => {
-
-                this._displayErrorsForCreateInitialLocalTracks(errors);
+                // FIXME If there will be microphone error it will cover any
+                // screensharing dialog, but it's still better than in
+                // the reverse order where the screensharing dialog will
+                // sometimes be closing the microphone alert ($.prompt.close();
+                // is called). Need to figure out dialogs chaining to fix that.
+                if (screenSharingError) {
+                    this._handleScreenSharingError(screenSharingError);
+                }
+                if (audioAndVideoError || audioOnlyError) {
+                    if (audioOnlyError || videoOnlyError) {
+                        // 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));
+                    } 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));
+                    }
+                }
 
                 return [ tracks, con ];
             });
@@ -682,6 +670,7 @@ export default {
         APP.connection = connection = con;
 
         this._createRoom(tracks);
+        APP.remoteControl.init();
 
         // if user didn't give access to mic or camera or doesn't have
         // them at all, we mark corresponding toolbar buttons as muted,
@@ -765,15 +754,7 @@ export default {
             // they may remain as empty strings.
             this._initDeviceList(true);
 
-            if (isPrejoinPageVisible(APP.store.getState())) {
-                return APP.store.dispatch(initPrejoin(tracks, errors));
-            }
-
-            logger.debug('Prejoin screen no longer displayed at the time when tracks were created');
-
-            this._displayErrorsForCreateInitialLocalTracks(errors);
-
-            return this._setLocalAudioVideoStreams(tracks);
+            return APP.store.dispatch(initPrejoin(tracks, errors));
         }
 
         const [ tracks, con ] = await this.createInitialLocalTracksAndConnect(
@@ -1446,8 +1427,11 @@ export default {
     async _turnScreenSharingOff(didHaveVideo) {
         this._untoggleScreenSharing = null;
         this.videoSwitchInProgress = true;
+        const { receiver } = APP.remoteControl;
 
-        APP.store.dispatch(stopReceiver());
+        if (receiver) {
+            receiver.stop();
+        }
 
         this._stopProxyConnection();
         if (config.enableScreenshotCapture) {
@@ -1621,10 +1605,8 @@ export default {
      */
     async _createPresenterStreamEffect(height = null, cameraDeviceId = null) {
         if (!this.localPresenterVideo) {
-            const camera = cameraDeviceId ?? getUserSelectedCameraDeviceId(APP.store.getState());
-
             try {
-                this.localPresenterVideo = await createLocalPresenterTrack({ cameraDeviceId: camera }, height);
+                this.localPresenterVideo = await createLocalPresenterTrack({ cameraDeviceId }, height);
             } catch (err) {
                 logger.error('Failed to create a camera track for presenter', err);
 
@@ -1665,38 +1647,38 @@ export default {
 
         // Create a new presenter track and apply the presenter effect.
         if (!this.localPresenterVideo && !mute) {
-            const { height, width } = this.localVideo.track.getSettings() ?? this.localVideo.track.getConstraints();
-            const isPortrait = height >= width;
+            let { aspectRatio, height } = this.localVideo.track.getSettings();
+            const { width } = this.localVideo.track.getSettings();
+            let desktopResizeConstraints = {};
+            let resizeDesktopStream = false;
             const DESKTOP_STREAM_CAP = 720;
 
-            // Config.js setting for resizing high resolution desktop tracks to 720p when presenter is turned on.
-            const resizeEnabled = config.videoQuality && config.videoQuality.resizeDesktopForPresenter;
-            const highResolutionTrack
-                = (isPortrait && width > DESKTOP_STREAM_CAP) || (!isPortrait && height > DESKTOP_STREAM_CAP);
+            // Determine the constraints if the desktop track needs to be resized.
+            // Resizing is needed when the resolution cannot be determined or when
+            // the window is bigger than 720p.
+            if (height && width) {
+                aspectRatio = aspectRatio ?? (width / height).toPrecision(4);
+                const advancedConstraints = [ { aspectRatio } ];
+                const isPortrait = height >= width;
 
-            // Resizing the desktop track for presenter is causing blurriness of the desktop share on chrome.
-            // Disable resizing by default, enable it only when config.js setting is enabled.
-            // Firefox doesn't return width and height for desktop tracks. Therefore, track needs to be resized
-            // for creating the canvas for presenter.
-            const resizeDesktopStream = browser.isFirefox() || (highResolutionTrack && resizeEnabled);
-
-            if (resizeDesktopStream) {
-                let desktopResizeConstraints = {};
-
-                if (height && width) {
-                    const advancedConstraints = [ { aspectRatio: (width / height).toPrecision(4) } ];
-                    const constraint = isPortrait ? { width: DESKTOP_STREAM_CAP } : { height: DESKTOP_STREAM_CAP };
-
-                    advancedConstraints.push(constraint);
-                    desktopResizeConstraints.advanced = advancedConstraints;
-                } else {
-                    desktopResizeConstraints = {
-                        width: 1280,
-                        height: 720
-                    };
+                // Determine which dimension needs resizing and resize only that side
+                // keeping the aspect ratio same as before.
+                if (isPortrait && width > DESKTOP_STREAM_CAP) {
+                    resizeDesktopStream = true;
+                    advancedConstraints.push({ width: DESKTOP_STREAM_CAP });
+                } else if (!isPortrait && height > DESKTOP_STREAM_CAP) {
+                    resizeDesktopStream = true;
+                    advancedConstraints.push({ height: DESKTOP_STREAM_CAP });
                 }
-
-                // Apply the contraints on the desktop track.
+                desktopResizeConstraints.advanced = advancedConstraints;
+            } else {
+                resizeDesktopStream = true;
+                desktopResizeConstraints = {
+                    width: 1280,
+                    height: 720
+                };
+            }
+            if (resizeDesktopStream) {
                 try {
                     await this.localVideo.track.applyConstraints(desktopResizeConstraints);
                 } catch (err) {
@@ -1704,22 +1686,20 @@ export default {
 
                     return;
                 }
+                height = this.localVideo.track.getSettings().height ?? DESKTOP_STREAM_CAP;
             }
-            const trackHeight = resizeDesktopStream
-                ? this.localVideo.track.getSettings().height ?? DESKTOP_STREAM_CAP
-                : height;
+            const defaultCamera = getUserSelectedCameraDeviceId(APP.store.getState());
             let effect;
 
             try {
-                effect = await this._createPresenterStreamEffect(trackHeight);
+                effect = await this._createPresenterStreamEffect(height,
+                    defaultCamera);
             } catch (err) {
-                logger.error('Failed to unmute Presenter Video', err);
+                logger.error('Failed to unmute Presenter Video');
                 maybeShowErrorDialog(err);
 
                 return;
             }
-
-            // Replace the desktop track on the peerconnection.
             try {
                 await this.localVideo.setEffect(effect);
                 APP.store.dispatch(setVideoMuted(mute, MEDIA_TYPE.PRESENTER));
@@ -1870,9 +1850,8 @@ export default {
             (authEnabled, authLogin) =>
                 APP.store.dispatch(authStatusChanged(authEnabled, authLogin)));
 
-        room.on(JitsiConferenceEvents.PARTCIPANT_FEATURES_CHANGED, user => {
-            APP.store.dispatch(updateRemoteParticipantFeatures(user));
-        });
+        room.on(JitsiConferenceEvents.PARTCIPANT_FEATURES_CHANGED,
+            user => APP.UI.onUserFeaturesChanged(user));
         room.on(JitsiConferenceEvents.USER_JOINED, (id, user) => {
             // The logic shared between RN and web.
             commonUserJoinedHandling(APP.store, room, user);
@@ -1881,7 +1860,6 @@ export default {
                 return;
             }
 
-            APP.store.dispatch(updateRemoteParticipantFeatures(user));
             logger.log(`USER ${id} connnected:`, user);
             APP.UI.addUser(user);
         });
@@ -2014,7 +1992,6 @@ export default {
                             formattedDisplayName
                                 || interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME)
                 });
-                APP.UI.changeDisplayName(id, formattedDisplayName);
             }
         );
         room.on(
@@ -2052,11 +2029,32 @@ export default {
             JitsiConferenceEvents.LOCK_STATE_CHANGED,
             (...args) => APP.store.dispatch(lockStateChanged(room, ...args)));
 
-        room.on(JitsiConferenceEvents.KICKED, participant => {
-            APP.UI.hideStats();
-            APP.store.dispatch(kickedOut(room, participant));
+        APP.remoteControl.on(RemoteControlEvents.ACTIVE_CHANGED, isActive => {
+            room.setLocalParticipantProperty(
+                'remoteControlSessionStatus',
+                isActive
+            );
+            APP.UI.setLocalRemoteControlActiveChanged();
+        });
 
-            // FIXME close
+        /* eslint-disable max-params */
+        room.on(
+            JitsiConferenceEvents.PARTICIPANT_PROPERTY_CHANGED,
+            (participant, name, oldValue, newValue) => {
+                switch (name) {
+                case 'remoteControlSessionStatus':
+                    APP.UI.setRemoteControlActiveStatus(
+                        participant.getId(),
+                        newValue);
+                    break;
+                default:
+
+                // ignore
+                }
+            });
+
+        room.on(JitsiConferenceEvents.KICKED, participant => {
+            APP.store.dispatch(kickedOut(room, participant));
         });
 
         room.on(JitsiConferenceEvents.PARTICIPANT_KICKED, (kicker, kicked) => {
@@ -2389,11 +2387,25 @@ export default {
         APP.keyboardshortcut.init();
 
         APP.store.dispatch(conferenceJoined(room));
+    },
 
-        const displayName
-            = APP.store.getState()['features/base/settings'].displayName;
+    /**
+    * Adds any room listener.
+    * @param {string} eventName one of the JitsiConferenceEvents
+    * @param {Function} listener the function to be called when the event
+    * occurs
+    */
+    addConferenceListener(eventName, listener) {
+        room.on(eventName, listener);
+    },
 
-        APP.UI.changeDisplayName('localVideoContainer', displayName);
+    /**
+    * Removes any room listener.
+    * @param {string} eventName one of the JitsiConferenceEvents
+    * @param {Function} listener the listener to be removed.
+    */
+    removeConferenceListener(eventName, listener) {
+        room.off(eventName, listener);
     },
 
     /**
@@ -2678,7 +2690,7 @@ export default {
      * requested
      */
     hangup(requestFeedback = false) {
-        APP.store.dispatch(disableReceiver());
+        eventEmitter.emit(JitsiMeetConferenceEvents.BEFORE_HANGUP);
 
         this._stopProxyConnection();
 
@@ -2695,6 +2707,7 @@ export default {
         }
 
         APP.UI.removeAllListeners();
+        APP.remoteControl.removeAllListeners();
 
         let requestFeedbackPromise;
 
@@ -2871,10 +2884,29 @@ export default {
         APP.store.dispatch(updateSettings({
             displayName: formattedNickname
         }));
+    },
 
-        if (room) {
-            APP.UI.changeDisplayName(id, formattedNickname);
-        }
+    /**
+     * Returns the desktop sharing source id or undefined if the desktop sharing
+     * is not active at the moment.
+     *
+     * @returns {string|undefined} - The source id. If the track is not desktop
+     * track or the source id is not available, undefined will be returned.
+     */
+    getDesktopSharingSourceId() {
+        return this.localVideo.sourceId;
+    },
+
+    /**
+     * Returns the desktop sharing source type or undefined if the desktop
+     * sharing is not active at the moment.
+     *
+     * @returns {'screen'|'window'|undefined} - The source type. If the track is
+     * not desktop track or the source type is not available, undefined will be
+     * returned.
+     */
+    getDesktopSharingSourceType() {
+        return this.localVideo.sourceType;
     },
 
     /**

config.js

@@ -14,6 +14,9 @@ var config = {
         // Domain for authenticated users. Defaults to <domain>.
         // authdomain: 'jitsi-meet.example.com',
 
+        // Call control component (Jigasi).
+        // call_control: 'callcontrol.jitsi-meet.example.com',
+
         // Focus component domain. Defaults to focus.<domain>.
         // focus: 'focus.jitsi-meet.example.com',
 
@@ -91,11 +94,6 @@ var config = {
     // input and will suggest another valid device if one is present.
     enableNoAudioDetection: true,
 
-    // Enabling this will show a "Save Logs" link in the GSM popover that can be
-    // used to collect debug information (XMPP IQs, SDP offer/answer cycles)
-    // about the call.
-    // enableSaveLogs: false,
-
     // Enabling this will run the lib-jitsi-meet noise detection module which will
     // notify the user if there is noise, other than voice, coming from the current
     // selected microphone. The purpose it to let the user know that the input could
@@ -122,7 +120,7 @@ var config = {
     // Valid values are in the range 6000 to 510000
     // opusMaxAverageBitrate: 20000,
 
-    // Enables support for opus-red (redundancy for Opus).
+    // Enables redundancy for Opus
     // enableOpusRed: false
 
     // Video
@@ -277,13 +275,9 @@ var config = {
     //    // at least 360 pixels tall. If the thumbnail height reaches 720 pixels then the application will switch to
     //    // the high quality.
     //    minHeightForQualityLvl: {
-    //        360: 'standard',
+    //        360: 'standard,
     //        720: 'high'
-    //    },
-    //
-    //    // Provides a way to resize the desktop track to 720p (if it is greater than 720p) before creating a canvas
-    //    // for the presenter mode (camera picture-in-picture mode with screenshare).
-    //    resizeDesktopForPresenter: false
+    //    }
     // },
 
     // // Options for the recording limit notification.
@@ -304,11 +298,18 @@ var config = {
     // Disables or enables RTX (RFC 4588) (defaults to false).
     // disableRtx: false,
 
-    // Disables or enables TCC support in this client (default: enabled).
+    // Disables or enables TCC (the default is in Jicofo and set to true)
+    // (draft-holmer-rmcat-transport-wide-cc-extensions-01). This setting
+    // affects congestion control, it practically enables send-side bandwidth
+    // estimations.
     // enableTcc: true,
 
-    // Disables or enables REMB support in this client (default: enabled).
-    // enableRemb: true,
+    // Disables or enables REMB (the default is in Jicofo and set to false)
+    // (draft-alvestrand-rmcat-remb-03). This setting affects congestion
+    // control, it practically enables recv-side bandwidth estimations. When
+    // both TCC and REMB are enabled, TCC takes precedence. When both are
+    // disabled, then bandwidth estimations are disabled.
+    // enableRemb: false,
 
     // Enables ICE restart logic in LJM and displays the page reload overlay on
     // ICE failure. Current disabled by default because it's causing issues with
@@ -318,11 +319,23 @@ var config = {
     // TCC sequence numbers starting from 0.
     // enableIceRestart: false,
 
+    // Defines the minimum number of participants to start a call (the default
+    // is set in Jicofo and set to 2).
+    // minParticipants: 2,
+
     // Use TURN/UDP servers for the jitsi-videobridge connection (by default
     // we filter out TURN/UDP because it is usually not needed since the
     // bridge itself is reachable via UDP)
     // useTurnUdp: false
 
+    // Enables / disables a data communication channel with the Videobridge.
+    // Values can be 'datachannel', 'websocket', true (treat it as
+    // 'datachannel'), undefined (treat it as 'datachannel') and false (don't
+    // open any channel).
+    // openBridgeChannel: true,
+    openBridgeChannel: 'websocket',
+
+
     // UI
     //
 
@@ -336,10 +349,6 @@ var config = {
     // will be joined when no room is specified.
     enableWelcomePage: true,
 
-    // Disable initial browser getUserMedia requests.
-    // This is useful for scenarios where users might want to start a conference for screensharing only
-    // disableInitialGUM: false,
-
     // Enabling the close page will ignore the welcome page redirection when
     // a call is hangup.
     // enableClosePage: false,
@@ -350,12 +359,17 @@ var config = {
     // Default language for the user interface.
     // defaultLanguage: 'en',
 
-    // Disables profile and the edit of all fields from the profile settings (display name and email)
-    // disableProfile: false,
+    // If true all users without a token will be considered guests and all users
+    // with token will be considered non-guests. Only guests will be allowed to
+    // edit their profile.
+    enableUserRolesBasedOnToken: false,
 
     // 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,
@@ -371,13 +385,6 @@ var config = {
     // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
     // prejoinPageEnabled: false,
 
-    // If etherpad integration is enabled, setting this to true will
-    // automatically open the etherpad when a participant joins.  This
-    // does not affect the mobile app since opening an etherpad
-    // obscures the conference controls -- it's better to let users
-    // choose to open the pad on their own in that case.
-    // openSharedDocumentOnJoin: false,
-
     // If true, shows the unsafe room name warning label when a room name is
     // deemed unsafe (due to the simplicity in the name) and a password is not
     // set or the lobby is not enabled.
@@ -387,9 +394,6 @@ var config = {
     // Document should be focused for this option to work
     // enableAutomaticUrlCopy: false,
 
-    // Base URL for a Gravatar-compatible service. Defaults to libravatar.
-    // gravatarBaseURL: 'https://seccdn.libravatar.org/avatar/';
-
     // Stats
     //
 
@@ -602,9 +606,6 @@ var config = {
     // If set to true all muting operations of remote participants will be disabled.
     // disableRemoteMute: true,
 
-    // Enables support for lip-sync for this client (if the browser supports it).
-    // enableLipSync: false
-
     /**
      External API url used to receive branding specific information.
      If there is no url set or there are missing fields, the defaults are applied.
@@ -620,28 +621,13 @@ var config = {
          logoImageUrl: 'https://example.com/logo-img.png'
      }
     */
-    // dynamicBrandingUrl: '',
+    // brandingDataUrl: '',
 
     // The URL of the moderated rooms microservice, if available. If it
     // is present, a link to the service will be rendered on the welcome page,
     // otherwise the app doesn't render it.
     // moderatedRoomServiceUrl: 'https://moderated.jitsi-meet.example.com',
 
-    // If true, tile view will not be enabled automatically when the participants count threshold is reached.
-    // disableTileView: true,
-
-    // Hides the conference subject
-    // hideConferenceSubject: true
-
-    // Hides the conference timer.
-    // hideConferenceTimer: true,
-
-    // Hides the participants stats
-    // hideParticipantsStats: true
-
-    // Sets the conference subject
-    // subject: 'Conference Subject',
-
     // List of undocumented settings used in jitsi-meet
     /**
      _immediateReloadThreshold
@@ -688,72 +674,15 @@ var config = {
      disableAP
      disableHPF
      disableNS
+     enableLipSync
      enableTalkWhileMuted
      forceJVB121Ratio
-     forceTurnRelay
      hiddenDomain
      ignoreStartMuted
+     nick
+     startBitrate
      */
 
-    /**
-        Use this array to configure which notifications will be shown to the user
-        The items correspond to the title or description key of that notification
-        Some of these notifications also depend on some other internal logic to be displayed or not,
-        so adding them here will not ensure they will always be displayed
-
-        A falsy value for this prop will result in having all notifications enabled (e.g null, undefined, false)
-    */
-    // notifications: [
-    //     'connection.CONNFAIL', // shown when the connection fails,
-    //     'dialog.cameraNotSendingData', // shown when there's no feed from user's camera
-    //     'dialog.kickTitle', // shown when user has been kicked
-    //     'dialog.liveStreaming', // livestreaming notifications (pending, on, off, limits)
-    //     'dialog.lockTitle', // shown when setting conference password fails
-    //     'dialog.maxUsersLimitReached', // shown when maximmum users limit has been reached
-    //     'dialog.micNotSendingData', // shown when user's mic is not sending any audio
-    //     'dialog.passwordNotSupportedTitle', // shown when setting conference password fails due to password format
-    //     'dialog.recording', // recording notifications (pending, on, off, limits)
-    //     'dialog.remoteControlTitle', // remote control notifications (allowed, denied, start, stop, error)
-    //     'dialog.reservationError',
-    //     'dialog.serviceUnavailable', // shown when server is not reachable
-    //     'dialog.sessTerminated', // shown when there is a failed conference session
-    //     'dialog.tokenAuthFailed', // show when an invalid jwt is used
-    //     'dialog.transcribing', // transcribing notifications (pending, off)
-    //     'dialOut.statusMessage', // shown when dial out status is updated.
-    //     'liveStreaming.busy', // shown when livestreaming service is busy
-    //     'liveStreaming.failedToStart', // shown when livestreaming fails to start
-    //     'liveStreaming.unavailableTitle', // shown when livestreaming service is not reachable
-    //     'lobby.joinRejectedMessage', // shown when while in a lobby, user's request to join is rejected
-    //     'lobby.notificationTitle', // shown when lobby is toggled and when join requests are allowed / denied
-    //     'localRecording.localRecording', // shown when a local recording is started
-    //     'notify.disconnected', // shown when a participant has left
-    //     'notify.grantedTo', // shown when moderator rights were granted to a participant
-    //     'notify.invitedOneMember', // shown when 1 participant has been invited
-    //     'notify.invitedThreePlusMembers', // shown when 3+ participants have been invited
-    //     'notify.invitedTwoMembers', // shown when 2 participants have been invited
-    //     'notify.kickParticipant', // shown when a participant is kicked
-    //     'notify.mutedRemotelyTitle', // shown when user is muted by a remote party
-    //     'notify.mutedTitle', // shown when user has been muted upon joining,
-    //     'notify.newDeviceAudioTitle', // prompts the user to use a newly detected audio device
-    //     'notify.newDeviceCameraTitle', // prompts the user to use a newly detected camera
-    //     'notify.passwordRemovedRemotely', // shown when a password has been removed remotely
-    //     'notify.passwordSetRemotely', // shown when a password has been set remotely
-    //     'notify.raisedHand', // shown when a partcipant used raise hand,
-    //     'notify.startSilentTitle', // shown when user joined with no audio
-    //     'prejoin.errorDialOut',
-    //     'prejoin.errorDialOutDisconnected',
-    //     'prejoin.errorDialOutFailed',
-    //     'prejoin.errorDialOutStatus',
-    //     'prejoin.errorStatusCode',
-    //     'prejoin.errorValidation',
-    //     'recording.busy', // shown when recording service is busy
-    //     'recording.failedToStart', // shown when recording fails to start
-    //     'recording.unavailableTitle', // shown when recording service is not reachable
-    //     'toolbar.noAudioSignalTitle', // shown when a broken mic is detected
-    //     'toolbar.noisyAudioInputTitle', // shown when noise is detected for the current microphone
-    //     'toolbar.talkWhileMutedPopup', // shown when user tries to speak while muted
-    //     'transcribing.failedToStart' // shown when transcribing fails to start
-    // ]
 
     // Allow all above example options to include a trailing comma and
     // prevent fear when commenting out the last value.

css/_base.scss

@@ -17,7 +17,6 @@ textarea {
 html {
     height: 100%;
     width: 100%;
-    overflow: hidden;
 }
 
 body {
@@ -29,6 +28,9 @@ body {
     overflow: hidden;
     color: $defaultColor;
     background: $defaultBackground;
+    &.filmstrip-only {
+        background: transparent;
+    }
 }
 
 /**
@@ -68,6 +70,16 @@ body {
     cursor: pointer;
 }
 
+/**
+ * AtlasKitThemeProvider sets a background color on an app-wrapping div, thereby
+ * preventing transparency in filmstrip-only mode. The selector chosen to
+ * override this behavior is specific to where the AtlasKitThemeProvider might
+ * be placed within the app hierarchy.
+ */
+.filmstrip-only #react > .ckAJgx {
+    background: transparent;
+}
+
 p {
     margin: 0;
 }

css/_chat.scss

@@ -379,31 +379,3 @@
         }
     }
 }
-
-.chat-dialog {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    margin-top: -5px; // Margin set by atlaskit.
-
-    &-header {
-        display: flex;
-        justify-content: space-between;
-        margin: 16px 16px 24px;
-        width: calc(100% - 32px);
-        box-sizing: border-box;
-        color: #fff;
-        font-weight: 600;
-        font-size: 24px;
-        line-height: 32px;
-
-        .jitsi-icon > svg {
-            cursor: pointer;
-            fill: #A4B8D1;
-        }
-    }
-
-    #chatconversation {
-        width: 100%;
-    }
-}

css/_inlay.scss

@@ -27,4 +27,84 @@
         font-size: 50px;
     }
 
+    &-filmstrip-only {
+        background-color: $inlayFilmstripOnlyBg;
+        color: $inlayFilmstripOnlyColor;
+        margin-left: 20px;
+        margin-right: 20px;
+        margin-top: 20px;
+        bottom: 30px;
+        position: absolute;
+        display: flex;
+        max-height: 120px;
+        height: 80%;
+        right: 0px;
+        border-radius: 4px;
+        overflow: hidden;
+        &__content {
+            padding: 20px;
+            display: flex;
+            justify-content: center;
+            position: relative;
+            > .button-control {
+                align-self: center;
+            }
+            > #reloadProgressBar {
+                position: absolute;
+                left: 0px;
+                bottom: 0px;
+                margin-bottom: 0px;
+                width: 100%;
+                border-radius: 0px;
+            }
+        }
+        &__title {
+            font-size: 18px;
+            font-weight: 600;
+        }
+
+        &__container {
+            align-self: center;
+        }
+
+        &__text {
+            margin-top: 10px;
+            font-size: 14px;
+            font-weight: 600;
+        }
+
+        &__icon {
+            font-size: 50px;
+            align-self: center;
+            color: $inlayIconColor;
+            opacity: 0.6;
+        }
+        &__icon-container {
+            text-align: center;
+            display: flex;
+            justify-content: center;
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            top: 0px;
+        }
+
+        &__avatar-container {
+            height: 100%;
+            position: relative;
+            > img {
+                height: 100%;
+            }
+        }
+
+        &__icon-background {
+            background: $inlayIconBg;
+            opacity: 0.6;
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            top: 0px;
+        }
+    }
+
 }

css/_meetings_list.scss

@@ -7,8 +7,9 @@
     display: flex;
     flex-direction: column;
     position: relative;
-    overflow: auto;
     width: 100%;
+    height: 100%;
+    overflow: auto;
 
     .meetings-list-empty {
         text-align: center;
@@ -19,34 +20,11 @@
         flex-direction: column;
 
         .description {
-           color: #2f3237;
-           font-size: 14px;
-           line-height: 18px;
-           margin-bottom: 16px;
-           max-width: 436px;
+            font-size: 16px;
+            padding: 20px;
         }
     }
 
-    .meetings-list-empty-image {
-        text-align: center;
-        margin: 24px 0 20px 0;
-    }
-
-    .meetings-list-empty-button {
-        align-items: center;
-        color: #0163FF;
-        cursor: pointer;
-        display: flex;
-        font-size: 14px;
-        line-height: 18px;
-        margin: 24px 0 32px 0;
-    }
-
-    .meetings-list-empty-icon {
-        display: inline-block;
-        margin-right: 8px;
-    }
-
     .button {
         background: #0074E0;
         border-radius: 4px;
@@ -54,7 +32,7 @@
         display: flex;
         justify-content: center;
         align-items: center;
-        padding: 8px;
+        padding: 5px 10px;
         cursor: pointer;
     }
 
@@ -65,13 +43,12 @@
     }
 
     .item {
-        background: #fff;
+        background: rgba(255,255,255,0.50);
         box-sizing: border-box;
-        border-radius: 4px;
         display: inline-flex;
-        margin: 4px 4px 0 4px;
-        min-height: 60px;
-        width: calc(100% - 8px);
+        margin-top: 5px;
+        min-height: 92px;
+        width: 100%;
         word-break: break-word;
         display: flex;
         flex-direction: row;
@@ -84,41 +61,37 @@
         .left-column {
             display: flex;
             flex-direction: column;
+            width: 140px;
             flex-grow: 0;
-            padding-left: 16px;
-            padding-top: 13px;
+            padding-left: 30px;
+            padding-top: 25px;
+
+            .date {
+                font-weight: bold;
+                padding-bottom: 5px;
+            }
         }
 
         .right-column {
             display: flex;
             flex-direction: column;
             flex-grow: 1;
-            padding-left: 16px;
-            padding-top: 13px;
-            position: relative;
-        }
+            padding-left: 30px;
+            padding-top: 25px;
 
-        .title {
-                font-size: 12px;
-                font-weight: 600;
-                line-height: 16px;
-                padding-bottom: 4px;
+            .title {
+                font-size: 16px;
+                font-weight: bold;
+                padding-bottom: 5px;
             }
-
-        .subtitle {
-            color: #5E6D7A;
-            font-weight: normal;
-            font-size: 12px;
-            line-height: 16px;
         }
 
-
         .actions {
             display: flex;
             align-items: center;
             justify-content: center;
             flex-grow: 0;
-            margin-right: 16px;
+            padding-right: 30px;
         }
 
         &.with-click-handler {
@@ -126,7 +99,7 @@
         }
 
         &.with-click-handler:hover {
-            background-color: #c7ddff;
+            background-color: #75A7E7;
         }
 
         .add-button {
@@ -147,20 +120,4 @@
             display: block
         }
     }
-
-    .delete-meeting {
-        display: none;
-        margin-right: 16px;
-        position: absolute;
-
-        &> svg {
-            fill: #0074e0;
-        }
-    }
-
-    .item:hover {
-        .delete-meeting {
-            display: block;
-        }
-    }
 }

css/_responsive.scss

@@ -1,4 +1,9 @@
-@mixin small-button-size() {
+@media only screen and (max-width: $smallScreen) {
+    .watermark {
+        width: 20%;
+        height: 20%;
+    }
+
     .new-toolbox {
         .toolbox-content {
             .button-group-center, .button-group-left, .button-group-right {
@@ -24,7 +29,15 @@
     }
 }
 
-@mixin very-small-button-size() {
+@media only screen and (max-width: $verySmallScreen) {
+    #videoResolutionLabel {
+        display: none;
+    }
+    .desktop-browser {
+        .vertical-filmstrip .filmstrip {
+            display: none;
+        }
+    }
     .new-toolbox {
         .toolbox-content {
             .button-group-center, .button-group-left, .button-group-right {
@@ -51,149 +64,7 @@
             }
         }
     }
-}
-
-@mixin full-size-modal-positioner() {
-    height: 100%;
-    left: 0;
-    position: fixed;
-    top: 0;
-    max-width: 100%;
-    width: 100%;
-}
-
-@mixin full-size-modal-dialog() {
-    height: 100%;
-    max-height: 100%;
-    border-radius: 0;
-}
-
-@media only screen and (max-width: $verySmallScreen) {
-    .welcome {
-        display: block;
-
-        #enter_room {
-            position: relative;
-            height: 42px;
-
-            .welcome-page-button {
-            font-size: 16px;
-            left: 0;
-            position: absolute;
-            top: 68px;
-            text-align: center;
-            width: 100%;
-            }
-        }
-
-        .header {
-            background-color: #002637;
-
-            #enter_room {
-                .enter-room-input-container {
-                    padding-right: 0;
-                }
-
-                .warning-without-link,
-                .warning-with-link {
-                    top: 120px;
-                }
-            }
-        }
-
-        .welcome-tabs {
-            display: none;
-        }
-
-        .header-text-title {
-            text-align: center;
-        }
-
-        .welcome-cards-container {
-            padding: 0;
-        }
-
-        &.without-content {
-            .header {
-            height: 100%;
-            }
-        }
-
-        #moderated-meetings {
-            display: none;
-        }
-
-        .welcome-footer-row-block {
-            display: block;
-        }
-        .welcome-badge {
-            margin-right: 16px;
-        }
-
-        .welcome-footer {
-            display: none;
-        }
-    }
-}
-
-.desktop-browser {
-    @media only screen and (max-width: $smallScreen) {
-        @include small-button-size();
-    }
-
-    @media only screen and (max-width: $verySmallScreen) {
-        @include very-small-button-size();
-
-        #videoResolutionLabel {
-            display: none;
-        }
-        .vertical-filmstrip .filmstrip {
-            display: none;
-        }
-        .chrome-extension-banner {
-            display: none;
-        }
-    }
-
-    &.shift-right {
-        @media only screen and (max-width: $smallScreen + $sidebarWidth) {
-            @include small-button-size()
-        }
-
-        @media only screen and (max-width: $verySmallScreen + $sidebarWidth) {
-            @include very-small-button-size();
-
-            #videoResolutionLabel {
-                display: none;
-            }
-            .vertical-filmstrip .filmstrip {
-                display: none;
-            }
-            .chrome-extension-banner {
-                display: none;
-            }
-        }
-    }
-}
-
-@media (min-width: 480px) and (max-width: 580px) {
-    .shift-right [class^="Modal__PositionerAbsolute"] {
-        @include full-size-modal-positioner();
-    }
-
-    .shift-right [class^="Modal__Dialog-"] {
-        @include full-size-modal-dialog();
-    }
-}
-
-@media (min-width: 580px) and (max-width: 680px) {
-    .mobile-browser {
-        &.shift-right [class^="Modal__PositionerAbsolute"] {
-            @include full-size-modal-positioner();
-        }
-
-        &.shift-right [class^="Modal__Dialog-"] {
-            @include full-size-modal-dialog();
-        }
+    .chrome-extension-banner {
+        display: none;
     }
 }

css/_variables.scss

@@ -161,47 +161,71 @@ $unsupportedDesktopBrowserTextFontSize: 21px;
 /**
  * The size of the default watermark.
  */
-$watermarkWidth: 71px;
-$watermarkHeight: 32px;
+$watermarkWidth: 186px;
+$watermarkHeight: 74px;
 
-$welcomePageWatermarkWidth: 71px;
-$welcomePageWatermarkHeight: 32px;
+$welcomePageWatermarkWidth: 186px;
+$welcomePageWatermarkHeight: 74px;
 
 /**
  * Welcome page variables.
  */
 $welcomePageDescriptionColor: #fff;
 $welcomePageFontFamily: inherit;
-$welcomePageBackground: none;
+$welcomePageBackground: linear-gradient(-90deg, #1251AE 0%, #0074FF 50%, #1251AE 100%);
 $welcomePageTitleColor: #fff;
 
-$welcomePageHeaderBackground: linear-gradient(0deg, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url('../images/welcome-background.png');
-$welcomePageHeaderBackgroundPosition: center;
+$welcomePageHeaderBackground: none;
+$welcomePageHeaderBackgroundSmall: none;
+$welcomePageHeaderBackgroundPosition: none;
 $welcomePageHeaderBackgroundRepeat: none;
-$welcomePageHeaderBackgroundSize: cover;
+$welcomePageHeaderBackgroundSize: none;
 $welcomePageHeaderPaddingBottom: 0px;
-$welcomePageHeaderTitleMaxWidth: initial;
-$welcomePageHeaderTextAlign: center;
+$welcomePageHeaderMinHeight: fit-content;
 
-$welcomePageHeaderContainerDisplay: flex;
-$welcomePageHeaderContainerMargin: 104px 32px 0 32px;
+$welcomePageHeaderTextMarginTop: 35px;
+$welcomePageHeaderTextMarginBottom: 35px;
+$welcomePageHeaderTextDisplay: flex;
+$welcomePageHeaderTextWidth: 650px;
 
-$welcomePageHeaderTextTitleMarginBottom: 0;
-$welcomePageHeaderTextTitleFontSize: 42px;
-$welcomePageHeaderTextTitleFontWeight: normal;
-$welcomePageHeaderTextTitleLineHeight: 50px;
+$welcomePageHeaderTextTitleMarginBottom: 16px;
+$welcomePageHeaderTextTitleFontSize: 2.5rem;
+$welcomePageHeaderTextTitleFontWeight: 500;
+$welcomePageHeaderTextTitleLineHeight: 1.18;
 $welcomePageHeaderTextTitleOpacity: 1;
 
+$welcomePageHeaderTextDescriptionDisplay: inherit;
+$welcomePageHeaderTextDescriptionFontSize: 1rem;
+$welcomePageHeaderTextDescriptionFontWeight: 400;
+$welcomePageHeaderTextDescriptionLineHeight: 24px;
+$welcomePageHeaderTextDescriptionMarginBottom: 20px;
+$welcomePageHeaderTextDescriptionAlignSelf: inherit;
+
 $welcomePageEnterRoomDisplay: flex;
-$welcomePageEnterRoomWidth: calc(100% - 32px);
-$welcomePageEnterRoomPadding: 4px;
-$welcomePageEnterRoomMargin: 0 auto;
+$welcomePageEnterRoomWidth: 680px;
+$welcomePageEnterRoomPadding: 25px 30px;
+$welcomePageEnterRoomBorderRadius: 0px;
+
+$welcomePageEnterRoomInputContainerPadding: 0 8px 5px 0px;
+$welcomePageEnterRoomInputContainerBorderWidth: 0px 0px 2px 0px;
+$welcomePageEnterRoomInputContainerBorderStyle: solid;
+$welcomePageEnterRoomInputContainerBorderImage: linear-gradient(to right, #dee1e6, #fff) 1;
+
+$welcomePageEnterRoomTitleDisplay: inherit;
 
 $welcomePageTabContainerDisplay: flex;
 $welcomePageTabContentDisplay: inherit;
 $welcomePageTabButtonsDisplay: flex;
 $welcomePageTabDisplay: block;
 
+$welcomePageButtonWidth: 51px;
+$welcomePageButtonMinWidth: inherit;
+$welcomePageButtonFontSize: 14px;
+$welcomePageButtonHeight: 35px;
+$welcomePageButtonFontWeight: inherit;
+$welcomePageButtonBorderRadius: 4px;
+$welcomePageButtonLineHeight: 35px;
+
 /**
  * Deep-linking page variables.
  */

css/_welcome_page.scss

@@ -5,7 +5,6 @@ body.welcome-page {
 
 .welcome {
     background-image: $welcomePageBackground;
-    background-color: #fff;
     display: flex;
     flex-direction: column;
     font-family: $welcomePageFontFamily;
@@ -19,15 +18,21 @@ body.welcome-page {
         background-repeat: $welcomePageHeaderBackgroundRepeat;
         background-size: $welcomePageHeaderBackgroundSize;
         padding-bottom: $welcomePageHeaderPaddingBottom;
-        background-color: #131519;
-        height: 400px;
+        align-items: center;
+        display: flex;
+        flex-direction: column;
+        min-height: $welcomePageHeaderMinHeight;
         overflow: hidden;
         position: relative;
+        text-align: center;
 
-        .header-container {
-            display: $welcomePageHeaderContainerDisplay;
+        .header-text {
+            display: $welcomePageHeaderTextDisplay;
             flex-direction: column;
-            margin: $welcomePageHeaderContainerMargin;
+            margin-top: $watermarkHeight + $welcomePageHeaderTextMarginTop;
+            margin-bottom: $welcomePageHeaderTextMarginBottom;
+            max-width: calc(100% - 40px);
+            width: $welcomePageHeaderTextWidth;
             z-index: $zindex2;
         }
 
@@ -37,52 +42,50 @@ body.welcome-page {
             font-weight: $welcomePageHeaderTextTitleFontWeight;
             line-height: $welcomePageHeaderTextTitleLineHeight;
             margin-bottom: $welcomePageHeaderTextTitleMarginBottom;
-            max-width: $welcomePageHeaderTitleMaxWidth;
             opacity: $welcomePageHeaderTextTitleOpacity;
-            text-align: $welcomePageHeaderTextAlign;
         }
 
-        .header-text-subtitle {
-            color: #fff;
-            font-size: 20px;
-            font-weight: 600;
-            line-height: 26px;
-            margin: 16px 0 32px 0;
-            text-align: $welcomePageHeaderTextAlign;
-
+        .header-text-description {
+            display: $welcomePageHeaderTextDescriptionDisplay;
+            color: $welcomePageDescriptionColor;
+            font-size: $welcomePageHeaderTextDescriptionFontSize;
+            font-weight: $welcomePageHeaderTextDescriptionFontWeight;
+            line-height: $welcomePageHeaderTextDescriptionLineHeight;
+            margin-bottom: $welcomePageHeaderTextDescriptionMarginBottom;
+            align-self: $welcomePageHeaderTextDescriptionAlignSelf;
         }
 
         #enter_room {
             display: $welcomePageEnterRoomDisplay;
             align-items: center;
-            max-width: 480px;
+            max-width: calc(100% - 40px);
             width: $welcomePageEnterRoomWidth;
             z-index: $zindex2;
             background-color: #fff;
             padding: $welcomePageEnterRoomPadding;
-            border-radius: 4px;
-            margin: $welcomePageEnterRoomMargin;
+            border-radius: $welcomePageEnterRoomBorderRadius;
 
             .enter-room-input-container {
+                width: 100%;
+                padding: $welcomePageEnterRoomInputContainerPadding;
                 text-align: left;
                 color: #253858;
-                flex-grow: 1;
                 height: fit-content;
-                padding-right: 4px;
-                position: relative;
+
+                .enter-room-title {
+                    display: $welcomePageEnterRoomTitleDisplay;
+                    font-size: 18px;
+                    font-weight: bold;
+                    padding-bottom: 5px;
+                }
 
                 .enter-room-input {
-                    border: 0;
-                    background: #fff;
+                    border-width: $welcomePageEnterRoomInputContainerBorderWidth;
+                    border-style: $welcomePageEnterRoomInputContainerBorderStyle;
+                    border-image: $welcomePageEnterRoomInputContainerBorderImage;
                     display: inline-block;
-                    height: 50px;
                     width: 100%;
                     font-size: 14px;
-                    padding-left: 10px;
-
-                    &:focus {
-                        outline: auto 2px #005fcc;
-                    }
                 }
 
                 .insecure-room-name-warning {
@@ -90,7 +93,7 @@ body.welcome-page {
                     color: $defaultWarningColor;
                     display: flex;
                     flex-direction: row;
-                    margin-top: 15px;
+                    margin-top: 5px;
 
                     .jitsi-icon {
                         margin-right: 15px;
@@ -106,28 +109,16 @@ body.welcome-page {
                 }
             }
 
-            .warning-without-link {
-                position: absolute;
-                top: 44px;
-                left: -10px;
-            }
-
-            .warning-with-link {
-                position: absolute;
-                top: 84px;
-            }
-
         }
 
         #moderated-meetings {
             max-width: calc(100% - 40px);
             padding: 16px 0 39px 0;
-            margin: $welcomePageEnterRoomMargin;
             width: $welcomePageEnterRoomWidth;
 
             p {
                 color: $welcomePageDescriptionColor;
-                text-align: $welcomePageHeaderTextAlign;
+                text-align: left;
 
                 a {
                     color: inherit;
@@ -135,70 +126,76 @@ body.welcome-page {
                 }
             }
         }
-    }
 
-    .tab-container {
-        font-size: 16px;
-        position: relative;
-        text-align: left;
-        display: $welcomePageTabContainerDisplay;
-        flex-direction: column;
-
-        .tab-content{
-            display: $welcomePageTabContentDisplay;
-            height: 250px;
-            margin: 5px 0px;
-            overflow: hidden;
-            flex-grow: 1;
+        .tab-container {
+            font-size: 16px;
             position: relative;
-        }
+            text-align: left;
+            min-height: 354px;
+            width: 710px;
+            background: #75A7E7;
+            display: $welcomePageTabContainerDisplay;
+            flex-direction: column;
 
-        .tab-buttons {
-            background-color: #c7ddff;
-            border-radius: 6px;
-            color: #0163FF;
-            font-size: 14px;
-            line-height: 18px;
-            margin: 4px;
-            display: $welcomePageTabButtonsDisplay;
-
-            .tab {
-                background-color: #c7ddff;
-                border-radius: 7px;
-                cursor: pointer;
-                display: $welcomePageTabDisplay;
+            .tab-content{
+                display: $welcomePageTabContentDisplay;
+                margin: 5px 0px;
+                overflow: hidden;
                 flex-grow: 1;
-                margin: 2px;
-                padding: 7px 0;
-                text-align: center;
+                position: relative;
 
-                &.selected {
-                    background-color: #FFF;
+                > * {
+                    position: absolute;
                 }
             }
 
+            .tab-buttons {
+                font-size: 18px;
+                color: #FFFFFF;
+                display: $welcomePageTabButtonsDisplay;
+                flex-grow: 0;
+                flex-direction: row;
+                min-height: 54px;
+                width: 100%;
+
+                .tab {
+                    display: $welcomePageTabDisplay;
+                    text-align: center;
+                    background: rgba(9,30,66,0.37);
+                    height: 55px;
+                    line-height: 54px;
+                    flex-grow: 1;
+                    cursor: pointer;
+
+                    &.selected, &:hover {
+                        background: rgba(9,30,66,0.71);
+                    }
+
+                    &:last-child {
+                        margin-left: 1px;
+                    }
+                }
+            }
         }
     }
 
     .welcome-page-button {
-        border: 0;
-        font-size: 14px;
+        width: $welcomePageButtonWidth;
+        min-width: $welcomePageButtonMinWidth;
+        height: $welcomePageButtonHeight;
+        font-size: $welcomePageButtonFontSize;
+        font-weight: $welcomePageButtonFontWeight;
         background: #0074E0;
-        border-radius: 3px;
+        border-radius: $welcomePageButtonBorderRadius;
         color: #FFFFFF;
+        text-align: center;
+        vertical-align: middle;
+        line-height: $welcomePageButtonLineHeight;
         cursor: pointer;
-        padding: 16px 20px;
-
-        &:focus-within {
-            outline: auto 2px #022e61;
-        }
     }
 
     .welcome-page-settings {
-        background: rgba(255, 255, 255, 0.38);
-        border-radius: 3px;
         color: $welcomePageDescriptionColor;
-        padding: 4px;
         position: absolute;
         top: 32px;
         right: 32px;
@@ -220,84 +217,4 @@ body.welcome-page {
             height: $welcomePageWatermarkHeight;
         }
     }
-
-    &.without-content {
-        .welcome-card {
-            min-width: 500px;
-            max-width: 580px;
-        }
-    }
-
-    .welcome-cards-container {
-        color:#131519;
-        padding-top: 40px;
-    }
-
-    .welcome-card-row {
-        display: flex;
-        justify-content: center;
-        padding: 0 32px;
-    }
-
-    .welcome-card-text {
-        padding: 32px;
-    }
-
-    .welcome-card {
-        width: 49%;
-        border-radius: 8px;
-
-        &--dark {
-            background: #444447;
-            color: #fff;
-        }
-
-        &--blue {
-            background: #D5E5FF;
-        }
-
-        &--grey {
-            background: #F2F3F4;
-        }
-
-        &--shadow {
-            box-shadow: 0px 4px 30px rgba(0, 0, 0, 0.15);
-        }
-    }
-
-    .welcome-footer {
-        background: #131519;
-        color: #fff;
-        margin-top: 40px;
-        position: relative;
-    }
-
-    .welcome-footer-centered {
-        max-width: 688px;
-        margin: 0 auto;
-    }
-
-    .welcome-footer-padded {
-        padding: 0px 16px;
-    }
-
-    .welcome-footer-row-block {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        border-bottom: 1px solid #424447;
-
-        &:last-child {
-            border-bottom: none;
-        }
-    }
-
-    .welcome-footer--row-1 {
-        padding: 40px 0 24px 0;
-    }
-
-    .welcome-footer-row-1-text {
-        max-width: 200px;
-        margin-right: 16px;
-    }
 }

css/filmstrip/_horizontal_filmstrip.scss

@@ -67,6 +67,20 @@
         }
     }
 
+    /**
+     * Style the filmstrip videos in filmstrip-only mode.
+     */
+    &__videos-filmstripOnly {
+        margin-top: auto;
+        margin-bottom: auto;
+
+        .filmstrip__videos {
+            &#filmstripLocalVideo {
+                bottom: 0px;
+            }
+        }
+    }
+
     .remote-videos-container {
         transition: opacity 1s;
     }

css/filmstrip/_tile_view.scss

@@ -15,8 +15,9 @@
         box-sizing: border-box;
         display: flex;
         flex-direction: column;
-        height: 100vh;
+        height: calc(100vh - 200px);
         width: 100vw;
+        margin: 100px 0px;
     }
 
     .filmstrip__videos .videocontainer {
@@ -94,7 +95,7 @@
             border: 0;
             box-sizing: border-box;
             display: block;
-            margin: 2px;
+            margin: 5px;
         }
 
         video {
@@ -109,4 +110,14 @@
     .has-overflow .videocontainer {
         align-self: baseline;
     }
+
+    /**
+     * Firefox flex acts a little differently. To make sure the bottom row of
+     * thumbnails is not overlapped by the horizontal toolbar, margin is added
+     * to the local thumbnail to keep it from the bottom of the screen. It is
+     * assumed the local thumbnail will always be on the bottom row.
+     */
+    .has-overflow #localVideoContainer {
+        margin-bottom: 100px !important;
+    }
 }

css/filmstrip/_tile_view_overrides.scss

@@ -22,7 +22,8 @@
         display: none;
     }
 
-    #remoteConnectionMessage {
+    #remoteConnectionMessage,
+    .watermark {
         z-index: $filmstripVideosZ + 1;
     }
 

css/filmstrip/_vertical_filmstrip.scss

@@ -145,6 +145,26 @@
     }
 }
 
+/**
+ * Override other styles to support vertical filmstrip mode.
+ */
+.filmstrip-only .vertical-filmstrip {
+    .filmstrip {
+        flex-direction: row-reverse;
+    }
+    .filmstrip__videos-filmstripOnly {
+        margin-top: auto;
+        margin-bottom: auto;
+        height: 100%;
+    }
+
+    .filmstrip__videos {
+        &#filmstripLocalVideo {
+            bottom: 0px;
+        }
+    }
+}
+
 /**
  * Workarounds for Edge and Firefox not handling scrolling properly with
  * flex-direction: column-reverse. The remove videos in filmstrip should

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

@@ -1,4 +1,9 @@
 .video-quality-dialog {
+    .hide-warning {
+        height: 0;
+        visibility: hidden;
+    }
+
     .video-quality-dialog-title {
         margin-bottom: 10px;
     }
@@ -104,6 +109,30 @@
             word-spacing: unset;
         }
     }
+
+    &.video-not-supported {
+        .video-quality-dialog-labels {
+            color: gray;
+        }
+
+        .video-quality-dialog-slider {
+            @mixin sliderTrackDisabledStyles() {
+                background: rgba(14, 22, 36, 0.1);
+            }
+
+            &::-ms-track {
+                @include sliderTrackDisabledStyles();
+            }
+
+            &::-moz-range-track {
+                @include sliderTrackDisabledStyles();
+            }
+
+            &::-webkit-slider-runnable-track {
+                @include sliderTrackDisabledStyles();
+            }
+        }
+    }
 }
 
 .modal-dialog-form {

css/overlay/_overlay.scss

@@ -8,10 +8,16 @@
         position: fixed;
         z-index: $overlayZ;
         background: $defaultBackground;
+        &.filmstrip-only {
+            @include transparentBg($filmstripOnlyOverlayBg, 0.8);
+        }
     }
 
     &__container-light {
         @include transparentBg($defaultBackground, 0.7);
+        &.filmstrip-only {
+            @include transparentBg($filmstripOnlyOverlayBg, 0.2);
+        }
     }
 
     &__content {
@@ -21,6 +27,11 @@
         width: 56%;
         left: 50%;
         @include transform(translateX(-50%));
+        &.filmstrip-only {
+            left: 0px;
+            width: 100%;
+            @include transform(none);
+        }
 
         &_bottom {
             position: absolute;

css/themes/_light.scss

@@ -41,6 +41,7 @@ $overlayButtonBg: #0074E0;
 * Color variables
 **/
 $defaultBackground: #474747;
+$filmstripOnlyOverlayBg: #000;
 $reloadProgressBarBg: #0074E0;
 
 /**
@@ -58,6 +59,10 @@ $dialogErrorText: #344563;
 **/
 $inlayColorBg: lighten($defaultBackground, 20%);
 $inlayBorderColor: lighten($baseLight, 10%);
+$inlayIconBg: #000;
+$inlayIconColor: #fff;
+$inlayFilmstripOnlyColor: #474747;
+$inlayFilmstripOnlyBg: #fff;
 
 // Main controls
 $placeHolderColor: #a7a7a7;

debian/jitsi-meet-prosody.postinst

@@ -142,21 +142,6 @@ case "$1" in
             echo -e "    admins = { \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\", \"jvb@auth.$JVB_HOSTNAME\" }" >> $PROSODY_HOST_CONFIG
         fi
 
-        # Convert the old focus component config to the new one.
-        # Old:
-        # Component "focus.jitmeet.example.com"
-        #     component_secret = "focusSecret"
-        # New:
-        # Component "focus.jitmeet.example.com" "client_proxy"
-        #    target_address = "focus@auth.jitmeet.example.com"
-        if grep -q "Component \"focus.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG && ! grep "Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"" $PROSODY_HOST_CONFIG ;then
-            sed -i -e "s/Component \"focus.$JVB_HOSTNAME\"/Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"\n    target_address = \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\"/" $PROSODY_HOST_CONFIG
-            PROSODY_CONFIG_PRESENT="false"
-        fi
-
-        # Make sure the focus@auth user's roster includes the proxy component (this is idempotent)
-        prosodyctl mod_roster_command subscribe focus.$JVB_HOSTNAME $JICOFO_AUTH_USER@auth.$JVB_HOSTNAME
-
         if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
             # prosodyctl takes care for the permissions
             # echo for using all default values

debian/jitsi-meet-web-config.postinst

@@ -30,7 +30,6 @@ case "$1" in
             db_set jitsi-videobridge/jvb-hostname "localhost"
             db_input critical jitsi-videobridge/jvb-hostname || true
             db_go
-            db_get jitsi-videobridge/jvb-hostname
         fi
         JVB_HOSTNAME="$RET"
 
@@ -76,21 +75,15 @@ case "$1" in
             CERT_CHOICE="$RET"
 
             if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then
+                db_set jitsi-meet/cert-path-key "/etc/ssl/$JVB_HOSTNAME.key"
+                db_input critical jitsi-meet/cert-path-key || true
+                db_go
                 db_get jitsi-meet/cert-path-key
-                if [ -z "$RET" ] ; then
-                    db_set jitsi-meet/cert-path-key "/etc/ssl/$JVB_HOSTNAME.key"
-                    db_input critical jitsi-meet/cert-path-key || true
-                    db_go
-                    db_get jitsi-meet/cert-path-key
-                fi
                 CERT_KEY="$RET"
+                db_set jitsi-meet/cert-path-crt "/etc/ssl/$JVB_HOSTNAME.crt"
+                db_input critical jitsi-meet/cert-path-crt || true
+                db_go
                 db_get jitsi-meet/cert-path-crt
-                if [ -z "$RET" ] ; then
-                    db_set jitsi-meet/cert-path-crt "/etc/ssl/$JVB_HOSTNAME.crt"
-                    db_input critical jitsi-meet/cert-path-crt || true
-                    db_go
-                    db_get jitsi-meet/cert-path-crt
-                fi
                 CERT_CRT="$RET"
             else
                 # create self-signed certs

doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example

@@ -6,9 +6,9 @@ muc_mapper_domain_base = "jitmeet.example.com";
 turncredentials_secret = "__turnSecret__";
 
 turncredentials = {
-    { type = "stun", host = "jitmeet.example.com", port = "3478" },
-    { type = "turn", host = "jitmeet.example.com", port = "3478", transport = "udp" },
-    { type = "turns", host = "jitmeet.example.com", port = "5349", transport = "tcp" }
+  { type = "stun", host = "jitmeet.example.com", port = "3478" },
+  { type = "turn", host = "jitmeet.example.com", port = "3478", transport = "udp" },
+  { type = "turns", host = "jitmeet.example.com", port = "5349", transport = "tcp" }
 };
 
 cross_domain_bosh = false;
@@ -17,48 +17,48 @@ consider_bosh_secure = true;
 
 -- https://ssl-config.mozilla.org/#server=haproxy&version=2.1&config=intermediate&openssl=1.1.0g&guideline=5.4
 ssl = {
-    protocol = "tlsv1_2+";
-    ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"
+  protocol = "tlsv1_2+";
+  ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"
 }
 
 VirtualHost "jitmeet.example.com"
-    -- enabled = false -- Remove this line to enable this host
-    authentication = "anonymous"
-    -- Properties below are modified by jitsi-meet-tokens package config
-    -- and authentication above is switched to "token"
-    --app_id="example_app_id"
-    --app_secret="example_app_secret"
-    -- Assign this host a certificate for TLS, otherwise it would use the one
-    -- set in the global section (if any).
-    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
-    -- use the global one.
-    ssl = {
-        key = "/etc/prosody/certs/jitmeet.example.com.key";
-        certificate = "/etc/prosody/certs/jitmeet.example.com.crt";
-    }
-    speakerstats_component = "speakerstats.jitmeet.example.com"
-    conference_duration_component = "conferenceduration.jitmeet.example.com"
-    -- we need bosh
-    modules_enabled = {
-        "bosh";
-        "pubsub";
-        "ping"; -- Enable mod_ping
-        "speakerstats";
-        "turncredentials";
-        "conference_duration";
-        "muc_lobby_rooms";
-    }
-    c2s_require_encryption = false
-    lobby_muc = "lobby.jitmeet.example.com"
-    main_muc = "conference.jitmeet.example.com"
-    -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
+        -- enabled = false -- Remove this line to enable this host
+        authentication = "anonymous"
+        -- Properties below are modified by jitsi-meet-tokens package config
+        -- and authentication above is switched to "token"
+        --app_id="example_app_id"
+        --app_secret="example_app_secret"
+        -- Assign this host a certificate for TLS, otherwise it would use the one
+        -- set in the global section (if any).
+        -- Note that old-style SSL on port 5223 only supports one certificate, and will always
+        -- use the global one.
+        ssl = {
+                key = "/etc/prosody/certs/jitmeet.example.com.key";
+                certificate = "/etc/prosody/certs/jitmeet.example.com.crt";
+        }
+        speakerstats_component = "speakerstats.jitmeet.example.com"
+        conference_duration_component = "conferenceduration.jitmeet.example.com"
+        -- we need bosh
+        modules_enabled = {
+            "bosh";
+            "pubsub";
+            "ping"; -- Enable mod_ping
+            "speakerstats";
+            "turncredentials";
+            "conference_duration";
+            "muc_lobby_rooms";
+        }
+        c2s_require_encryption = false
+        lobby_muc = "lobby.jitmeet.example.com"
+        main_muc = "conference.jitmeet.example.com"
+        -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
 
 Component "conference.jitmeet.example.com" "muc"
     storage = "memory"
     modules_enabled = {
         "muc_meeting_id";
         "muc_domain_mapper";
-        --"token_verification";
+        -- "token_verification";
     }
     admins = { "focusUser@auth.jitmeet.example.com" }
     muc_room_locking = false
@@ -68,7 +68,7 @@ Component "conference.jitmeet.example.com" "muc"
 Component "internal.auth.jitmeet.example.com" "muc"
     storage = "memory"
     modules_enabled = {
-        "ping";
+      "ping";
     }
     admins = { "focusUser@auth.jitmeet.example.com", "jvb@auth.jitmeet.example.com" }
     muc_room_locking = false
@@ -77,9 +77,8 @@ Component "internal.auth.jitmeet.example.com" "muc"
 VirtualHost "auth.jitmeet.example.com"
     authentication = "internal_plain"
 
--- Proxy to jicofo's user JID, so that it doesn't have to register as a component.
-Component "focus.jitmeet.example.com" "client_proxy"
-    target_address = "focusUser@auth.jitmeet.example.com"
+Component "focus.jitmeet.example.com"
+    component_secret = "focusSecret"
 
 Component "speakerstats.jitmeet.example.com" "speakerstats_component"
     muc_component = "conference.jitmeet.example.com"

doc/debian/jitsi-meet/jitsi-meet.example

@@ -6,14 +6,14 @@ server {
     server_name jitsi-meet.example.com;
 
     location ^~ /.well-known/acme-challenge/ {
-        default_type "text/plain";
-        root         /usr/share/jitsi-meet;
+       default_type "text/plain";
+       root         /usr/share/jitsi-meet;
     }
     location = /.well-known/acme-challenge/ {
-        return 404;
+       return 404;
     }
     location / {
-        return 301 https://$host$request_uri;
+       return 301 https://$host$request_uri;
     }
 }
 server {
@@ -21,7 +21,7 @@ server {
     listen [::]:443 ssl;
     server_name jitsi-meet.example.com;
 
-    # Mozilla Guideline v5.4, nginx 1.17.7, OpenSSL 1.1.1d, intermediate configuration
+# Mozilla Guideline v5.4, nginx 1.17.7, OpenSSL 1.1.1d, intermediate configuration
     ssl_protocols TLSv1.2 TLSv1.3;
     ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
     ssl_prefer_server_ciphers off;
@@ -58,7 +58,7 @@ server {
         alias /usr/share/jitsi-meet/libs/external_api.min.js;
     }
 
-    # ensure all static content can always be found first
+    #ensure all static content can always be found first
     location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$
     {
         add_header 'Access-Control-Allow-Origin' '*';
@@ -66,13 +66,13 @@ server {
 
         # cache all versioned files
         if ($arg_v) {
-            expires 1y;
+          expires 1y;
         }
     }
 
     # BOSH
     location = /http-bind {
-        proxy_pass       http://localhost:5280/http-bind;
+        proxy_pass      http://localhost:5280/http-bind;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $http_host;
     }
@@ -89,11 +89,11 @@ server {
 
     # colibri (JVB) websockets for jvb1
     location ~ ^/colibri-ws/default-id/(.*) {
-        proxy_pass http://127.0.0.1:9090/colibri-ws/default-id/$1$is_args$args;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        tcp_nodelay on;
+       proxy_pass http://127.0.0.1:9090/colibri-ws/default-id/$1$is_args$args;
+       proxy_http_version 1.1;
+       proxy_set_header Upgrade $http_upgrade;
+       proxy_set_header Connection "upgrade";
+       tcp_nodelay on;
     }
 
     location ~ ^/([^/?&:'"]+)$ {
@@ -106,13 +106,13 @@ server {
 
     location ~ ^/([^/?&:'"]+)/config.js$
     {
-        set $subdomain "$1.";
-        set $subdir "$1/";
+       set $subdomain "$1.";
+       set $subdir "$1/";
 
-        alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
+       alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
     }
 
-    # Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
+    #Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
     location ~ ^/([^/?&:'"]+)/(.*)$ {
         set $subdomain "$1.";
         set $subdir "$1/";

doc/debian/jitsi-meet/jitsi-meet.example-apache

@@ -8,49 +8,50 @@
 </VirtualHost>
 
 <VirtualHost *:443>
-    ServerName jitsi-meet.example.com
 
-    # enable HTTP/2, if available
-    Protocols h2 http/1.1
+  ServerName jitsi-meet.example.com
 
-    SSLEngine on
-    SSLProxyEngine on
-    SSLCertificateFile /etc/jitsi/meet/jitsi-meet.example.com.crt
-    SSLCertificateKeyFile /etc/jitsi/meet/jitsi-meet.example.com.key
+  # enable HTTP/2, if available
+  Protocols h2 http/1.1
 
-    Header always set Strict-Transport-Security "max-age=63072000"
+  SSLEngine on
+  SSLProxyEngine on
+  SSLCertificateFile /etc/jitsi/meet/jitsi-meet.example.com.crt
+  SSLCertificateKeyFile /etc/jitsi/meet/jitsi-meet.example.com.key
 
-    DocumentRoot "/usr/share/jitsi-meet"
-    <Directory "/usr/share/jitsi-meet">
-        Options Indexes MultiViews Includes FollowSymLinks
-        AddOutputFilter Includes html
-        AllowOverride All
-        Order allow,deny
-        Allow from all
-    </Directory>
+  Header always set Strict-Transport-Security "max-age=63072000"
 
-    ErrorDocument 404 /static/404.html
+  DocumentRoot "/usr/share/jitsi-meet"
+  <Directory "/usr/share/jitsi-meet">
+    Options Indexes MultiViews Includes FollowSymLinks
+    AddOutputFilter Includes html
+    AllowOverride All
+    Order allow,deny
+    Allow from all
+  </Directory>
 
-    Alias "/config.js" "/etc/jitsi/meet/jitsi-meet.example.com-config.js"
-    <Location /config.js>
-        Require all granted
-    </Location>
+  ErrorDocument 404 /static/404.html
 
-    Alias "/external_api.js" "/usr/share/jitsi-meet/libs/external_api.min.js"
-    <Location /external_api.js>
-        Require all granted
-    </Location>
+  Alias "/config.js" "/etc/jitsi/meet/jitsi-meet.example.com-config.js"
+  <Location /config.js>
+    Require all granted
+  </Location>
 
-    ProxyPreserveHost on
-    ProxyPass /http-bind http://localhost:5280/http-bind/
-    ProxyPassReverse /http-bind http://localhost:5280/http-bind/
+  Alias "/external_api.js" "/usr/share/jitsi-meet/libs/external_api.min.js"
+  <Location /external_api.js>
+    Require all granted
+  </Location>
 
-    RewriteEngine on
-    RewriteRule ^/([a-zA-Z0-9]+)$ /index.html
+  ProxyPreserveHost on
+  ProxyPass /http-bind http://localhost:5280/http-bind/
+  ProxyPassReverse /http-bind http://localhost:5280/http-bind/
+
+  RewriteEngine on
+  RewriteRule ^/([a-zA-Z0-9]+)$ /index.html
 </VirtualHost>
 
 # Mozilla Guideline v5.4, Apache 2.4.41, OpenSSL 1.1.1d, intermediate configuration, no OCSP
-SSLProtocol         all -SSLv3 -TLSv1 -TLSv1.1
-SSLCipherSuite      ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
-SSLHonorCipherOrder off
-SSLSessionTickets   off
+SSLProtocol             all -SSLv3 -TLSv1 -TLSv1.1
+SSLCipherSuite          ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
+SSLHonorCipherOrder     off
+SSLSessionTickets       off

doc/example-config-files/config.js.example

@@ -4,5 +4,6 @@ var config = {
         muc: 'conference.jitsi.example.com', // FIXME: use XEP-0030
         bridge: 'jitsi-videobridge.jitsi.example.com' // FIXME: use XEP-0030
     },
+    useNicks: false,
     bosh: '//jitsi.example.com/http-bind' // FIXME: use xep-0156 for that
 };

doc/example-config-files/multidomain/config.js.multidomain.example

@@ -9,6 +9,7 @@ var config = {
         muc: 'conference.'+subdomain+'jitsi.example.com', // FIXME: use XEP-0030
         focus: 'focus.jitsi.example.com',
     },
+    useNicks: false,
     bosh: '//jitsi.example.com/http-bind', // FIXME: use xep-0156 for that
     websocket: 'wss://jitsi.example.com/xmpp-websocket'
 };

doc/example-config-files/multidomain/jitsi.example.com.multidomain.example

@@ -10,6 +10,7 @@ server {
     index index.html;
     set $prefix "";
 
+
     # BOSH
     location /http-bind {
         proxy_pass      http://localhost:5280/http-bind;
@@ -43,13 +44,13 @@ server {
 
     location ~ ^/([^/?&:'"]+)/config.js$
     {
-        set $subdomain "$1.";
-        set $subdir "$1/";
+       set $subdomain "$1.";
+       set $subdir "$1/";
 
-        alias /etc/jitsi/meet/{{jitsi_meet_domain_name}}-config.js;
+       alias /etc/jitsi/meet/{{jitsi_meet_domain_name}}-config.js;
     }
 
-    # Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
+    #Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
     location ~ ^/([^/?&:'"]+)/(.*)$ {
         set $subdomain "$1.";
         set $subdir "$1/";

doc/example-config-files/multidomain/prosody.cfg.multidomain.example

@@ -34,56 +34,55 @@ component_ports = { 5347 }
 -- Documentation on modules can be found at: http://prosody.im/doc/modules
 modules_enabled = {
 
-    -- Generally required
-    "roster"; -- Allow users to have a roster. Recommended ;)
-    "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
-    "tls"; -- Add support for secure TLS on c2s/s2s connections
-    "dialback"; -- s2s dialback support
-    "disco"; -- Service discovery
-    "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+	-- Generally required
+		"roster"; -- Allow users to have a roster. Recommended ;)
+		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
+		"tls"; -- Add support for secure TLS on c2s/s2s connections
+		"dialback"; -- s2s dialback support
+		"disco"; -- Service discovery
+		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
 
-    -- Not essential, but recommended
-    "private"; -- Private XML storage (for room bookmarks, etc.)
-    "vcard"; -- Allow users to set vCards
+	-- Not essential, but recommended
+		"private"; -- Private XML storage (for room bookmarks, etc.)
+		"vcard"; -- Allow users to set vCards
 
-    -- These are commented by default as they have a performance impact
-    --"privacy"; -- Support privacy lists
-    "compression"; -- Stream compression (requires the lua-zlib package installed)
+	-- These are commented by default as they have a performance impact
+		--"privacy"; -- Support privacy lists
+		"compression"; -- Stream compression (requires the lua-zlib package installed)
 
-    -- Nice to have
-    "version"; -- Replies to server version requests
-    "uptime"; -- Report how long server has been running
-    "time"; -- Let others know the time here on this server
-    "ping"; -- Replies to XMPP pings with pongs
-    "pep"; -- Enables users to publish their mood, activity, playing music and more
-    "register"; -- Allow users to register on this server using a client and change passwords
+	-- Nice to have
+		"version"; -- Replies to server version requests
+		"uptime"; -- Report how long server has been running
+		"time"; -- Let others know the time here on this server
+		"ping"; -- Replies to XMPP pings with pongs
+		"pep"; -- Enables users to publish their mood, activity, playing music and more
+		"register"; -- Allow users to register on this server using a client and change passwords
 
-    -- Admin interfaces
-    "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
-    --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+	-- Admin interfaces
+		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
 
-    -- HTTP modules
-    "bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
-    --"http_files"; -- Serve static files from a directory over HTTP
+	-- HTTP modules
+		"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+		--"http_files"; -- Serve static files from a directory over HTTP
 
-    -- Other specific functionality
-    --"groups"; -- Shared roster support
-    --"announce"; -- Send announcement to all online users
-    --"welcome"; -- Welcome users who register accounts
-    --"watchregistrations"; -- Alert admins of registrations
-    --"motd"; -- Send a message to users when they log in
-    --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-
-    -- jitsi
-    "smacks";
-    "carbons";
-    "mam";
-    "lastactivity";
-    "offline";
-    "pubsub";
-    "adhoc";
-    "websocket";
-    "http_altconnect";
+	-- Other specific functionality
+		--"groups"; -- Shared roster support
+		--"announce"; -- Send announcement to all online users
+		--"welcome"; -- Welcome users who register accounts
+		--"watchregistrations"; -- Alert admins of registrations
+		--"motd"; -- Send a message to users when they log in
+		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+	-- jitsi
+		"smacks";
+		"carbons";
+		"mam";
+		"lastactivity";
+		"offline";
+		"pubsub";
+		"adhoc";
+		"websocket";
+		"http_altconnect";
 }
 
 -- domain mapper options, must at least have domain base set to use the mapper
@@ -92,9 +91,9 @@ muc_mapper_domain_base = "jitsi.example.com";
 -- These modules are auto-loaded, but should you want
 -- to disable them then uncomment them here:
 modules_disabled = {
-    --"offline"; -- Store offline messages
-    --"c2s"; -- Handle client connections
-    --"s2s"; -- Handle server-to-server connections
+	-- "offline"; -- Store offline messages
+	-- "c2s"; -- Handle client connections
+	-- "s2s"; -- Handle server-to-server connections
 }
 
 -- Disable account creation by default, for security
@@ -111,7 +110,7 @@ ssl = {
 -- Force clients to use encrypted connections? This option will
 -- prevent clients from authenticating unless they are using encryption.
 
---c2s_require_encryption = true
+-- c2s_require_encryption = true
 
 -- Force certificate authentication for server-to-server connections?
 -- This provides ideal security, but requires servers you communicate
@@ -119,7 +118,7 @@ ssl = {
 -- NOTE: Your version of LuaSec must support certificate verification!
 -- For more information see http://prosody.im/doc/s2s#security
 
---s2s_secure_auth = false
+-- s2s_secure_auth = false
 
 -- Many servers don't support encryption or have invalid or self-signed
 -- certificates. You can list domains here that will not be required to
@@ -160,9 +159,9 @@ authentication = "internal_hashed"
 -- Logging configuration
 -- For advanced logging see http://prosody.im/doc/logging
 log = {
-    info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-    error = "/var/log/prosody/prosody.err";
-    "*syslog";
+	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
+	error = "/var/log/prosody/prosody.err";
+	"*syslog";
 }
 
 ----------- Virtual hosts -----------
@@ -172,25 +171,25 @@ log = {
 --VirtualHost "localhost"
 
 VirtualHost "jitsi.example.com"
-    -- enabled = false -- Remove this line to enable this host
-    authentication = "anonymous"
-    -- Assign this host a certificate for TLS, otherwise it would use the one
-    -- set in the global section (if any).
-    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
-    -- use the global one.
-    ssl = {
-        key = "/var/lib/prosody/jitsi.example.com.key";
-        certificate = "/var/lib/prosody/jitsi.example.com.crt";
-    }
+	-- enabled = false -- Remove this line to enable this host
+	authentication = "anonymous"
+	-- Assign this host a certificate for TLS, otherwise it would use the one
+	-- set in the global section (if any).
+	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
+	-- use the global one.
+	ssl = {
+		key = "/var/lib/prosody/jitsi.example.com.key";
+		certificate = "/var/lib/prosody/jitsi.example.com.crt";
+	}
 
-    c2s_require_encryption = false
+	c2s_require_encryption = false
 
 VirtualHost "auth.jitsi.example.com"
-    ssl = {
-        key = "/var/lib/prosody/auth.jitsi.example.com.key";
-        certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
-    }
-    authentication = "internal_plain"
+	ssl = {
+		key = "/var/lib/prosody/auth.jitsi.example.com.key";
+		certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
+	}
+	authentication = "internal_plain"
 
 ------ Components ------
 -- You can specify components to add hosts that provide special services,
@@ -210,7 +209,7 @@ VirtualHost "auth.jitsi.example.com"
 -- see: http://prosody.im/doc/components#adding_an_external_component
 --
 --Component "gateway.example.com"
---    component_secret = "password"
+--	component_secret = "password"
 
 Component "conference.jitsi.example.com" "muc"
     modules_enabled = { "muc_domain_mapper" }

doc/example-config-files/prosody.cfg.lua.example

@@ -34,64 +34,63 @@ component_ports = { 5347 }
 -- Documentation on modules can be found at: http://prosody.im/doc/modules
 modules_enabled = {
 
-    -- Generally required
-    "roster"; -- Allow users to have a roster. Recommended ;)
-    "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
-    "tls"; -- Add support for secure TLS on c2s/s2s connections
-    "dialback"; -- s2s dialback support
-    "disco"; -- Service discovery
-    "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+	-- Generally required
+		"roster"; -- Allow users to have a roster. Recommended ;)
+		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
+		"tls"; -- Add support for secure TLS on c2s/s2s connections
+		"dialback"; -- s2s dialback support
+		"disco"; -- Service discovery
+		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
 
-    -- Not essential, but recommended
-    "private"; -- Private XML storage (for room bookmarks, etc.)
-    "vcard"; -- Allow users to set vCards
+	-- Not essential, but recommended
+		"private"; -- Private XML storage (for room bookmarks, etc.)
+		"vcard"; -- Allow users to set vCards
 
-    -- These are commented by default as they have a performance impact
-    --"privacy"; -- Support privacy lists
-    "compression"; -- Stream compression (requires the lua-zlib package installed)
+	-- These are commented by default as they have a performance impact
+		--"privacy"; -- Support privacy lists
+		"compression"; -- Stream compression (requires the lua-zlib package installed)
 
-    -- Nice to have
-    "version"; -- Replies to server version requests
-    "uptime"; -- Report how long server has been running
-    "time"; -- Let others know the time here on this server
-    "ping"; -- Replies to XMPP pings with pongs
-    "pep"; -- Enables users to publish their mood, activity, playing music and more
-    "register"; -- Allow users to register on this server using a client and change passwords
+	-- Nice to have
+		"version"; -- Replies to server version requests
+		"uptime"; -- Report how long server has been running
+		"time"; -- Let others know the time here on this server
+		"ping"; -- Replies to XMPP pings with pongs
+		"pep"; -- Enables users to publish their mood, activity, playing music and more
+		"register"; -- Allow users to register on this server using a client and change passwords
 
-    -- Admin interfaces
-    "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
-    --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+	-- Admin interfaces
+		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
 
-    -- HTTP modules
-    "bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
-    --"http_files"; -- Serve static files from a directory over HTTP
+	-- HTTP modules
+		"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+		--"http_files"; -- Serve static files from a directory over HTTP
 
-    -- Other specific functionality
-    --"groups"; -- Shared roster support
-    --"announce"; -- Send announcement to all online users
-    --"welcome"; -- Welcome users who register accounts
-    --"watchregistrations"; -- Alert admins of registrations
-    --"motd"; -- Send a message to users when they log in
-    --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-
-    -- jitsi
-    "smacks";
-    "carbons";
-    "mam";
-    "lastactivity";
-    "offline";
-    "pubsub";
-    "adhoc";
-    "websocket";
-    "http_altconnect";
+	-- Other specific functionality
+		--"groups"; -- Shared roster support
+		--"announce"; -- Send announcement to all online users
+		--"welcome"; -- Welcome users who register accounts
+		--"watchregistrations"; -- Alert admins of registrations
+		--"motd"; -- Send a message to users when they log in
+		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+	-- jitsi
+		"smacks";
+		"carbons";
+		"mam";
+		"lastactivity";
+		"offline";
+		"pubsub";
+		"adhoc";
+		"websocket";
+		"http_altconnect";
 }
 
 -- These modules are auto-loaded, but should you want
 -- to disable them then uncomment them here:
 modules_disabled = {
-    --"offline"; -- Store offline messages
-    --"c2s"; -- Handle client connections
-    --"s2s"; -- Handle server-to-server connections
+	-- "offline"; -- Store offline messages
+	-- "c2s"; -- Handle client connections
+	-- "s2s"; -- Handle server-to-server connections
 }
 
 -- Disable account creation by default, for security
@@ -108,7 +107,7 @@ ssl = {
 -- Force clients to use encrypted connections? This option will
 -- prevent clients from authenticating unless they are using encryption.
 
---c2s_require_encryption = true
+-- c2s_require_encryption = true
 
 -- Force certificate authentication for server-to-server connections?
 -- This provides ideal security, but requires servers you communicate
@@ -116,7 +115,7 @@ ssl = {
 -- NOTE: Your version of LuaSec must support certificate verification!
 -- For more information see http://prosody.im/doc/s2s#security
 
---s2s_secure_auth = false
+-- s2s_secure_auth = false
 
 -- Many servers don't support encryption or have invalid or self-signed
 -- certificates. You can list domains here that will not be required to
@@ -157,9 +156,9 @@ authentication = "internal_hashed"
 -- Logging configuration
 -- For advanced logging see http://prosody.im/doc/logging
 log = {
-    info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-    error = "/var/log/prosody/prosody.err";
-    "*syslog";
+	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
+	error = "/var/log/prosody/prosody.err";
+	"*syslog";
 }
 
 ----------- Virtual hosts -----------
@@ -169,25 +168,25 @@ log = {
 --VirtualHost "localhost"
 
 VirtualHost "jitsi.example.com"
-    -- enabled = false -- Remove this line to enable this host
-    authentication = "anonymous"
-    -- Assign this host a certificate for TLS, otherwise it would use the one
-    -- set in the global section (if any).
-    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
-    -- use the global one.
-    ssl = {
-        key = "/var/lib/prosody/jitsi.example.com.key";
-        certificate = "/var/lib/prosody/jitsi.example.com.crt";
-    }
+	-- enabled = false -- Remove this line to enable this host
+	authentication = "anonymous"
+	-- Assign this host a certificate for TLS, otherwise it would use the one
+	-- set in the global section (if any).
+	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
+	-- use the global one.
+	ssl = {
+		key = "/var/lib/prosody/jitsi.example.com.key";
+		certificate = "/var/lib/prosody/jitsi.example.com.crt";
+	}
 
-    c2s_require_encryption = false
+	c2s_require_encryption = false
 
 VirtualHost "auth.jitsi.example.com"
-    ssl = {
-        key = "/var/lib/prosody/auth.jitsi.example.com.key";
-        certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
-    }
-    authentication = "internal_plain"
+	ssl = {
+		key = "/var/lib/prosody/auth.jitsi.example.com.key";
+		certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
+	}
+	authentication = "internal_plain"
 
 ------ Components ------
 -- You can specify components to add hosts that provide special services,
@@ -207,7 +206,7 @@ VirtualHost "auth.jitsi.example.com"
 -- see: http://prosody.im/doc/components#adding_an_external_component
 --
 --Component "gateway.example.com"
---    component_secret = "password"
+--	component_secret = "password"
 
 Component "conference.jitsi.example.com" "muc"
 

doc/example-config-files/scalable/jicofo_config.scalable.example

@@ -24,9 +24,4 @@ JICOFO_AUTH_PASSWORD=$JICOFO_PASSWORD
 JICOFO_OPTS=""
 
 # adds java system props that are passed to jicofo (default are for home and logging config file)
-JAVA_SYS_PROPS=" \
-    -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi \
-    -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo \
-    -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi \
-    -Djava.util.logging.config.file=/etc/jitsi/jicofo/logging.properties \
-"
+JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi -Djava.util.logging.config.file=/etc/jitsi/jicofo/logging.properties"

doc/example-config-files/scalable/meet.example.com.cfg.lua.scalable.example

@@ -6,48 +6,48 @@ muc_mapper_domain_base = "meet.example.com";
 turncredentials_secret = "turncredentials_secret_test";
 
 turncredentials = {
-    { type = "stun", host = "meet.example.com", port = "443" },
-    { type = "turn", host = "meet.example.com", port = "443", transport = "udp" },
-    { type = "turns", host = "meet.example.com", port = "443", transport = "tcp" }
+  { type = "stun", host = "meet.example.com", port = "443" },
+  { type = "turn", host = "meet.example.com", port = "443", transport = "udp" },
+  { type = "turns", host = "meet.example.com", port = "443", transport = "tcp" }
 };
 
 cross_domain_bosh = false;
 consider_bosh_secure = true;
 
 VirtualHost "meet.example.com"
-    -- enabled = false -- Remove this line to enable this host
-    authentication = "anonymous"
-    -- Properties below are modified by jitsi-meet-tokens package config
-    -- and authentication above is switched to "token"
-    --app_id="example_app_id"
-    --app_secret="example_app_secret"
-    -- Assign this host a certificate for TLS, otherwise it would use the one
-    -- set in the global section (if any).
-    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
-    -- use the global one.
-    ssl = {
-        key = "/etc/prosody/certs/meet.example.com.key";
-        certificate = "/etc/prosody/certs/meet.example.com.crt";
-    }
-    speakerstats_component = "speakerstats.meet.example.com"
-    conference_duration_component = "conferenceduration.meet.example.com"
-    -- we need bosh
-    modules_enabled = {
-        "bosh";
-        "pubsub";
-        "ping"; -- Enable mod_ping
-        "speakerstats";
-        "turncredentials";
-        "conference_duration";
-    }
-    c2s_require_encryption = false
+        -- enabled = false -- Remove this line to enable this host
+        authentication = "anonymous"
+        -- Properties below are modified by jitsi-meet-tokens package config
+        -- and authentication above is switched to "token"
+        --app_id="example_app_id"
+        --app_secret="example_app_secret"
+        -- Assign this host a certificate for TLS, otherwise it would use the one
+        -- set in the global section (if any).
+        -- Note that old-style SSL on port 5223 only supports one certificate, and will always
+        -- use the global one.
+        ssl = {
+                key = "/etc/prosody/certs/meet.example.com.key";
+                certificate = "/etc/prosody/certs/meet.example.com.crt";
+        }
+        speakerstats_component = "speakerstats.meet.example.com"
+        conference_duration_component = "conferenceduration.meet.example.com"
+        -- we need bosh
+        modules_enabled = {
+            "bosh";
+            "pubsub";
+            "ping"; -- Enable mod_ping
+            "speakerstats";
+            "turncredentials";
+            "conference_duration";
+        }
+        c2s_require_encryption = false
 
 Component "conference.meet.example.com" "muc"
     storage = "memory"
     modules_enabled = {
         "muc_meeting_id";
         "muc_domain_mapper";
-        --"token_verification";
+        -- "token_verification";
     }
     admins = { "focus@auth.meet.example.com" }
     muc_room_locking = false
@@ -58,7 +58,7 @@ Component "conference.meet.example.com" "muc"
 Component "internal.auth.meet.example.com" "muc"
     storage = "memory"
     modules_enabled = {
-        "ping";
+      "ping";
     }
     admins = { "focus@auth.meet.example.com", "jvb@auth.meet.example.com" }
 
@@ -75,6 +75,7 @@ Component "focus.meet.example.com"
 Component "speakerstats.meet.example.com" "speakerstats_component"
     muc_component = "conference.meet.example.com"
 
+
 Component "conferenceduration.meet.example.com" "conference_duration_component"
     muc_component = "conference.meet.example.com"
 

doc/example-config-files/scalable/prosody.cfg.lua.scalable.example

@@ -13,58 +13,58 @@ network_backend = "epoll"
 -- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
 modules_enabled = {
 
-    -- Generally required
-    "roster"; -- Allow users to have a roster. Recommended ;)
-    "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
-    "tls"; -- Add support for secure TLS on c2s/s2s connections
-    "dialback"; -- s2s dialback support
-    "disco"; -- Service discovery
+	-- Generally required
+		"roster"; -- Allow users to have a roster. Recommended ;)
+		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
+		"tls"; -- Add support for secure TLS on c2s/s2s connections
+		"dialback"; -- s2s dialback support
+		"disco"; -- Service discovery
 
-    -- Not essential, but recommended
-    "carbons"; -- Keep multiple clients in sync
-    "pep"; -- Enables users to publish their avatar, mood, activity, playing music and more
-    "private"; -- Private XML storage (for room bookmarks, etc.)
-    "blocklist"; -- Allow users to block communications with other users
-    "vcard4"; -- User profiles (stored in PEP)
-    "vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
+	-- Not essential, but recommended
+		"carbons"; -- Keep multiple clients in sync
+		"pep"; -- Enables users to publish their avatar, mood, activity, playing music and more
+		"private"; -- Private XML storage (for room bookmarks, etc.)
+		"blocklist"; -- Allow users to block communications with other users
+		"vcard4"; -- User profiles (stored in PEP)
+		"vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
 
-    -- Nice to have
-    "version"; -- Replies to server version requests
-    "uptime"; -- Report how long server has been running
-    "time"; -- Let others know the time here on this server
-    "ping"; -- Replies to XMPP pings with pongs
-    "register"; -- Allow users to register on this server using a client and change passwords
-    --"mam"; -- Store messages in an archive and allow users to access it
-    --"csi_simple"; -- Simple Mobile optimizations
+	-- Nice to have
+		"version"; -- Replies to server version requests
+		"uptime"; -- Report how long server has been running
+		"time"; -- Let others know the time here on this server
+		"ping"; -- Replies to XMPP pings with pongs
+		"register"; -- Allow users to register on this server using a client and change passwords
+		--"mam"; -- Store messages in an archive and allow users to access it
+		--"csi_simple"; -- Simple Mobile optimizations
 
-    -- Admin interfaces
-    "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
-    --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+	-- Admin interfaces
+		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
 
-    -- HTTP modules
-    --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
-    --"websocket"; -- XMPP over WebSockets
-    --"http_files"; -- Serve static files from a directory over HTTP
+	-- HTTP modules
+		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+		--"websocket"; -- XMPP over WebSockets
+		--"http_files"; -- Serve static files from a directory over HTTP
 
-    -- Other specific functionality
-    --"limits"; -- Enable bandwidth limiting for XMPP connections
-    --"groups"; -- Shared roster support
-    --"server_contact_info"; -- Publish contact information for this service
-    --"announce"; -- Send announcement to all online users
-    --"welcome"; -- Welcome users who register accounts
-    --"watchregistrations"; -- Alert admins of registrations
-    --"motd"; -- Send a message to users when they log in
-    --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-    --"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
+	-- Other specific functionality
+		--"limits"; -- Enable bandwidth limiting for XMPP connections
+		--"groups"; -- Shared roster support
+		--"server_contact_info"; -- Publish contact information for this service
+		--"announce"; -- Send announcement to all online users
+		--"welcome"; -- Welcome users who register accounts
+		--"watchregistrations"; -- Alert admins of registrations
+		--"motd"; -- Send a message to users when they log in
+		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+		--"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
 }
 
 -- These modules are auto-loaded, but should you want
 -- to disable them then uncomment them here:
 modules_disabled = {
-    --"offline"; -- Store offline messages
-    --"c2s"; -- Handle client connections
-    --"s2s"; -- Handle server-to-server connections
-    --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+	-- "offline"; -- Store offline messages
+	-- "c2s"; -- Handle client connections
+	-- "s2s"; -- Handle server-to-server connections
+	-- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
 }
 
 -- Disable account creation by default, for security
@@ -85,6 +85,7 @@ s2s_require_encryption = true
 
 s2s_secure_auth = false
 
+
 -- Required for init scripts and prosodyctl
 pidfile = "/var/run/prosody/prosody.pid"
 
@@ -98,12 +99,13 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week
 -- Logging configuration
 -- For advanced logging see https://prosody.im/doc/logging
 log = {
-    info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-    error = "/var/log/prosody/prosody.err";
-    --"*syslog"; -- Uncomment this for logging to syslog
-    --"*console"; -- Log to the console, useful for debugging with daemonize=false
+	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
+	error = "/var/log/prosody/prosody.err";
+	-- "*syslog"; -- Uncomment this for logging to syslog
+	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
 }
 
+
 -- Location of directory to find certificates in (relative to main config file):
 certificates = "certs"
 

doc/example-config-files/scalable/videobridge_config.scalable.example

@@ -15,10 +15,6 @@ JVB_SECRET=$VP_SECRET
 # extra options to pass to the JVB daemon
 JVB_OPTS="--apis=rest,"
 
+
 # adds java system props that are passed to jvb (default are for home and logging config file)
-JAVA_SYS_PROPS=" \
-    -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi \
-    -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge \
-    -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi \
-    -Djava.util.logging.config.file=/etc/jitsi/videobridge/logging.properties \
-"
+JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi -Djava.util.logging.config.file=/etc/jitsi/videobridge/logging.properties"

doc/examples/api.html

@@ -13,7 +13,9 @@
                 height: 180,
                 parentNode: undefined,
                 configOverwrite: {},
-                interfaceConfigOverwrite: {}
+                interfaceConfigOverwrite: {
+                    filmStripOnly: true
+                }
             }
             var api = new JitsiMeetExternalAPI(domain, options);
         </script>

images/calendar.svg

@@ -1,21 +0,0 @@
-<svg width="68" height="72" viewBox="0 0 68 72" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="5.64514" width="65.3548" height="65.3548" rx="7" stroke="#A4B8D1" stroke-width="2"/>
-<rect y="23.2258" width="67.3548" height="2.0213" fill="#A4B8D1"/>
-<rect x="14.5161" width="2.32258" height="14.5161" fill="#A4B8D1"/>
-<rect x="11.6129" y="12.1935" width="8.12903" height="2.32258" fill="#A4B8D1"/>
-<rect x="50.5161" width="2.32258" height="14.5161" fill="#A4B8D1"/>
-<rect x="47.6129" y="12.1935" width="8.12903" height="2.32258" fill="#A4B8D1"/>
-<circle cx="24.387" cy="37.7419" r="2.32258" fill="#A4B8D1"/>
-<circle cx="33.6774" cy="37.7419" r="2.32258" fill="#A4B8D1"/>
-<circle cx="42.9677" cy="37.7419" r="2.32258" fill="#A4B8D1"/>
-<circle cx="52.258" cy="37.7419" r="2.32258" fill="#A4B8D1"/>
-<circle cx="24.387" cy="47.0322" r="2.32258" fill="#A4B8D1"/>
-<circle cx="15.0968" cy="47.0322" r="2.32258" fill="#A4B8D1"/>
-<circle cx="33.6774" cy="47.0322" r="2.32258" fill="#A4B8D1"/>
-<circle cx="42.9677" cy="47.0322" r="2.32258" fill="#A4B8D1"/>
-<circle cx="24.387" cy="56.3226" r="2.32258" fill="#A4B8D1"/>
-<circle cx="15.0968" cy="56.3226" r="2.32258" fill="#A4B8D1"/>
-<circle cx="33.6774" cy="56.3226" r="2.32258" fill="#A4B8D1"/>
-<circle cx="42.9677" cy="56.3226" r="2.32258" fill="#A4B8D1"/>
-<circle cx="52.258" cy="47.0322" r="2.32258" fill="#A4B8D1"/>
-</svg>

index.html

@@ -182,7 +182,6 @@
     <!--#include virtual="title.html" -->
     <!--#include virtual="plugin.head.html" -->
     <!--#include virtual="static/welcomePageAdditionalContent.html" -->
-    <!--#include virtual="static/welcomePageAdditionalCard.html" -->
     <!--#include virtual="static/settingsToolbarAdditionalContent.html" -->
   </head>
   <body>

interface_config.js

@@ -46,9 +46,9 @@ var interfaceConfig = {
 
     DEFAULT_BACKGROUND: '#474747',
     DEFAULT_LOCAL_DISPLAY_NAME: 'me',
-    DEFAULT_LOGO_URL: 'images/watermark.svg',
+    DEFAULT_LOGO_URL: 'images/watermark.png',
     DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster',
-    DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/watermark.svg',
+    DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/watermark.png',
 
     DISABLE_DOMINANT_SPEAKER_INDICATOR: false,
 
@@ -86,9 +86,7 @@ var interfaceConfig = {
      */
     DISABLE_VIDEO_BACKGROUND: false,
 
-    DISPLAY_WELCOME_FOOTER: true,
-    DISPLAY_WELCOME_PAGE_ADDITIONAL_CARD: false,
-    DISPLAY_WELCOME_PAGE_CONTENT: false,
+    DISPLAY_WELCOME_PAGE_CONTENT: true,
     DISPLAY_WELCOME_PAGE_TOOLBAR_ADDITIONAL_CONTENT: false,
 
     ENABLE_DIAL_OUT: true,
@@ -97,6 +95,11 @@ var interfaceConfig = {
 
     FILM_STRIP_MAX_HEIGHT: 120,
 
+    /**
+     * Whether to only show the filmstrip (and hide the toolbar).
+     */
+    filmStripOnly: false,
+
     GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true,
 
     /**
@@ -133,21 +136,6 @@ var interfaceConfig = {
      */
     MOBILE_APP_PROMO: true,
 
-    /**
-     * Specify custom URL for downloading android mobile app.
-     */
-    MOBILE_DOWNLOAD_LINK_ANDROID: 'https://play.google.com/store/apps/details?id=org.jitsi.meet',
-
-    /**
-     * Specify custom URL for downloading f droid app.
-     */
-    MOBILE_DOWNLOAD_LINK_F_DROID: 'https://f-droid.org/en/packages/org.jitsi.meet/',
-
-    /**
-     * Specify URL for downloading ios mobile app.
-     */
-    MOBILE_DOWNLOAD_LINK_IOS: 'https://itunes.apple.com/us/app/jitsi-meet/id1165103905',
-
     NATIVE_APP_NAME: 'Jitsi Meet',
 
     // Names of browsers which should show a warning stating the current browser
@@ -181,6 +169,7 @@ var interfaceConfig = {
     SHOW_JITSI_WATERMARK: true,
     SHOW_POWERED_BY: false,
     SHOW_PROMOTIONAL_CLOSE_PAGE: false,
+    SHOW_WATERMARK_FOR_GUESTS: true, // if watermark is disabled by default, it can be shown only for guests
 
     /*
      * If indicated some of the error dialogs may point to the support URL for
@@ -234,12 +223,27 @@ var interfaceConfig = {
      */
     VIDEO_QUALITY_LABEL_DISABLED: false,
 
+    /**
+     * When enabled, the kick participant button will not be presented for users without a JWT
+     */
+    // HIDE_KICK_BUTTON_FOR_GUESTS: false,
+
     /**
      * How many columns the tile view can expand to. The respected range is
      * between 1 and 5.
      */
     // TILE_VIEW_MAX_COLUMNS: 5,
 
+    /**
+     * Specify custom URL for downloading android mobile app.
+     */
+    // MOBILE_DOWNLOAD_LINK_ANDROID: 'https://play.google.com/store/apps/details?id=org.jitsi.meet',
+
+    /**
+     * Specify URL for downloading ios mobile app.
+     */
+    // MOBILE_DOWNLOAD_LINK_IOS: 'https://itunes.apple.com/us/app/jitsi-meet/id1165103905',
+
     /**
      * Specify Firebase dynamic link properties for the mobile apps.
      */

ios/Podfile

@@ -1,9 +1,8 @@
 platform :ios, '11.0'
 workspace 'jitsi-meet'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
-install! 'cocoapods', :deterministic_uuids => false
 
-target 'JitsiMeet' do
+target 'jitsi-meet' do
   project 'app/app.xcodeproj'
 
   pod 'Firebase/Analytics', '~> 6.33.0'
@@ -11,7 +10,7 @@ target 'JitsiMeet' do
   pod 'Firebase/DynamicLinks', '~> 6.33.0'
 end
 
-target 'JitsiMeetSDK' do
+target 'JitsiMeet' do
   project 'sdk/sdk.xcodeproj'
 
   # React Native and its dependencies
@@ -58,21 +57,21 @@ target 'JitsiMeetSDK' do
   pod 'react-native-calendar-events', :path => '../node_modules/react-native-calendar-events'
   pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake'
   pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
-  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
   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-async-storage/async-storage'
-  pod 'RNDeviceInfo', :path => '../node_modules/react-native-device-info'
+  pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-community/async-storage'
   pod 'RNGoogleSignin', :path => '../node_modules/@react-native-community/google-signin'
   pod 'RNSound', :path => '../node_modules/react-native-sound'
   pod 'RNSVG', :path => '../node_modules/react-native-svg'
   pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
   pod 'RNDefaultPreference', :path => '../node_modules/react-native-default-preference'
+  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
 
   # Native pod dependencies
   #
 
+  pod 'Amplitude-iOS', '~> 4.0.4'
   pod 'CocoaLumberjack', '~>3.5.3'
   pod 'ObjectiveDropboxOfficial', '~> 3.9.4'
 

ios/Podfile.lock

@@ -1,4 +1,5 @@
 PODS:
+  - Amplitude-iOS (4.0.4)
   - AppAuth (1.2.0):
     - AppAuth/Core (= 1.2.0)
     - AppAuth/ExternalUserAgent (= 1.2.0)
@@ -292,10 +293,10 @@ PODS:
     - React
   - react-native-splash-screen (3.2.0):
     - React
-  - react-native-webrtc (1.87.2):
-    - React-Core
-  - react-native-webview (11.0.2):
+  - react-native-webrtc (1.84.1):
     - React-Core
+  - react-native-webview (10.9.0):
+    - React
   - React-RCTActionSheet (0.61.5-jitsi.2):
     - React-Core/RCTActionSheetHeaders (= 0.61.5-jitsi.2)
   - React-RCTAnimation (0.61.5-jitsi.2):
@@ -350,12 +351,10 @@ PODS:
     - React-jsi (= 0.61.5-jitsi.2)
     - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
     - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
-  - RNCAsyncStorage (1.13.2):
+  - RNCAsyncStorage (1.3.4):
     - React
   - RNDefaultPreference (1.4.2):
     - React
-  - RNDeviceInfo (8.0.0):
-    - React-Core
   - RNGoogleSignin (3.0.1):
     - GoogleSignIn (~> 5.0.0)
     - React
@@ -364,13 +363,14 @@ PODS:
     - RNSound/Core (= 0.11.0)
   - RNSound/Core (0.11.0):
     - React
-  - RNSVG (12.1.0):
+  - RNSVG (10.1.0):
     - React
   - RNWatch (0.4.3):
     - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
+  - Amplitude-iOS (~> 4.0.4)
   - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - CocoaLumberjack (~> 3.5.3)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
@@ -410,9 +410,8 @@ DEPENDENCIES:
   - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - ReactCommon/turbomodule (from `../node_modules/react-native/ReactCommon`)
-  - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
+  - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
   - RNDefaultPreference (from `../node_modules/react-native-default-preference`)
-  - RNDeviceInfo (from `../node_modules/react-native-device-info`)
   - "RNGoogleSignin (from `../node_modules/@react-native-community/google-signin`)"
   - RNSound (from `../node_modules/react-native-sound`)
   - RNSVG (from `../node_modules/react-native-svg`)
@@ -421,6 +420,7 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - Amplitude-iOS
     - AppAuth
     - boost-for-react-native
     - CocoaLumberjack
@@ -507,11 +507,9 @@ EXTERNAL SOURCES:
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
   RNCAsyncStorage:
-    :path: "../node_modules/@react-native-async-storage/async-storage"
+    :path: "../node_modules/@react-native-community/async-storage"
   RNDefaultPreference:
     :path: "../node_modules/react-native-default-preference"
-  RNDeviceInfo:
-    :path: "../node_modules/react-native-device-info"
   RNGoogleSignin:
     :path: "../node_modules/@react-native-community/google-signin"
   RNSound:
@@ -524,6 +522,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
+  Amplitude-iOS: 2ad4d7270c99186236c1272a3a9425463b1ae1a7
   AppAuth: bce82c76043657c99d91e7882e8a9e1a93650cd4
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
@@ -563,8 +562,8 @@ SPEC CHECKSUMS:
   react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae
   react-native-netinfo: 8d8db463bcc5db66a8ac5c48a7d86beb3b92f61a
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-webrtc: e6fca8432542dd1c77afa6c59629f0176ed78ee6
-  react-native-webview: b2542d6fd424bcc3e3b2ec5f854f0abb4ec86c87
+  react-native-webrtc: edd689b0d5a462d7a6f6f52bca3f9414fc0ee11c
+  react-native-webview: 6ee7868ca8eba635dbf7963986d1ab7959da0391
   React-RCTActionSheet: bcbc311dc3b47bc8efb2737ff0940239a45789a9
   React-RCTAnimation: 65f61080ce632f6dea23d52e354ffac9948396c6
   React-RCTBlob: 70d88f7b68b5c44953cdb286ac2e36a7a509a97e
@@ -575,15 +574,14 @@ SPEC CHECKSUMS:
   React-RCTText: 4f1b99f228278d2a5e9008eced8dc9c974c4a270
   React-RCTVibration: c1041024893fdfdb8371e7c720c437751b711676
   ReactCommon: 18014e1d98dbeb9141e935cfe35fc93bd511ffb6
-  RNCAsyncStorage: bc2f81cc1df90c267ce9ed30bb2dbc93b945a8ee
+  RNCAsyncStorage: 8e31405a9f12fbf42c2bb330e4560bfd79c18323
   RNDefaultPreference: 56a405ce61033ac77b95004dccd7ac54c2eb50d1
-  RNDeviceInfo: 72ded653ce636b3f03571e90bed99309a714944e
   RNGoogleSignin: 39336070b35fc4cea6a98cf111e00480317be0ae
   RNSound: c980916b596cc15c8dcd2f6ecd3b13c4881dbe20
-  RNSVG: ce9d996113475209013317e48b05c21ee988d42e
+  RNSVG: 069864be08c9fe065a2cf7e63656a34c78653c99
   RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
   Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
 
-PODFILE CHECKSUM: 5be5132e41831a98362eeed760558227a4df89ae
+PODFILE CHECKSUM: f2400f8e5a52c4d91697cbacba6956569efc5ab8
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.9.3

ios/app/app.xcodeproj/project.pbxproj

@@ -3,14 +3,18 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0B26BE6E1EC5BC3C00EEFB41 /* JitsiMeet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */; };
+		0B26BE6F1EC5BC3C00EEFB41 /* JitsiMeet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		0B412F1F1EDEE6E800B1A0A6 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B412F1E1EDEE6E800B1A0A6 /* ViewController.m */; };
 		0B412F211EDEE95300B1A0A6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0B412F201EDEE95300B1A0A6 /* Main.storyboard */; };
 		0B5418471F7C5D8C00A2DD86 /* MeetingRowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B5418461F7C5D8C00A2DD86 /* MeetingRowController.swift */; };
 		0B7001701F7C51CC005944F4 /* InCallController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B70016F1F7C51CC005944F4 /* InCallController.swift */; };
+		0BD6B4371EF82A6B00D1F4CD /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */; };
+		0BD6B4381EF82A6B00D1F4CD /* WebRTC.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		0BEA5C291F7B8F73000D0AB4 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0BEA5C271F7B8F73000D0AB4 /* Interface.storyboard */; };
 		0BEA5C2B1F7B8F73000D0AB4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0BEA5C2A1F7B8F73000D0AB4 /* Assets.xcassets */; };
 		0BEA5C321F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -23,12 +27,8 @@
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		55BEDABDA92D47D399A70A5E /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */; };
-		DE050389256E904600DEE3A5 /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE050388256E904600DEE3A5 /* WebRTC.xcframework */; };
-		DE05038A256E904600DEE3A5 /* WebRTC.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE050388256E904600DEE3A5 /* WebRTC.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		695AF3ED6F686F9C5EE40F9A /* libPods-jitsi-meet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */; };
 		DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */; };
-		DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; };
-		DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E588011722789D43008B0561 /* JitsiMeetContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = E58801132278944E008B0561 /* JitsiMeetContext.swift */; };
 		E5C97B63227A1EB400199214 /* JitsiMeetCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */; };
 /* End PBXBuildFile section */
@@ -57,8 +57,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */,
-				DE05038A256E904600DEE3A5 /* WebRTC.xcframework in Embed Frameworks */,
+				0B26BE6F1EC5BC3C00EEFB41 /* JitsiMeet.framework in Embed Frameworks */,
+				0BD6B4381EF82A6B00D1F4CD /* WebRTC.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -115,17 +115,12 @@
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-jitsi-meet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-jitsi-meet/Pods-jitsi-meet.debug.xcconfig"; sourceTree = "<group>"; };
-		609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
+		489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-jitsi-meet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B3B083EB1D4955FF0069CEE7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = app.entitlements; sourceTree = "<group>"; };
-		D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		DE050388256E904600DEE3A5 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/apple/WebRTC.xcframework"; sourceTree = "<group>"; };
 		DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRUtilities.m; sourceTree = "<group>"; };
 		DE4C456021DE1E4E00EA0709 /* FIRUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRUtilities.h; sourceTree = "<group>"; };
-		DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.xcframework"; sourceTree = "<group>"; };
 		E58801132278944E008B0561 /* JitsiMeetContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetContext.swift; sourceTree = "<group>"; };
 		E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetCommands.swift; sourceTree = "<group>"; };
-		FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -140,9 +135,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DE050389256E904600DEE3A5 /* WebRTC.xcframework in Frameworks */,
-				DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */,
-				55BEDABDA92D47D399A70A5E /* libPods-JitsiMeet.a in Frameworks */,
+				0B26BE6E1EC5BC3C00EEFB41 /* JitsiMeet.framework in Frameworks */,
+				0BD6B4371EF82A6B00D1F4CD /* WebRTC.framework in Frameworks */,
+				695AF3ED6F686F9C5EE40F9A /* libPods-jitsi-meet.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -159,12 +154,9 @@
 		0B26BE711EC5BC4D00EEFB41 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */,
-				DE050388256E904600DEE3A5 /* WebRTC.xcframework */,
 				0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */,
-				DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */,
 				0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */,
-				D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */,
+				489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -221,8 +213,6 @@
 			children = (
 				4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */,
 				09AA3B93E4CC62D84B424690 /* Pods-jitsi-meet.release.xcconfig */,
-				609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */,
-				FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -290,9 +280,9 @@
 			productReference = 0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */;
 			productType = "com.apple.product-type.watchkit2-extension";
 		};
-		13B07F861A680F5B00A75B9A /* JitsiMeet */ = {
+		13B07F861A680F5B00A75B9A /* jitsi-meet */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */;
+			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */;
 			buildPhases = (
 				B6607F42A5CF0C76E98929E2 /* [CP] Check Pods Manifest.lock */,
 				0BBA83C41EC9F7600075A103 /* Run React packager */,
@@ -300,6 +290,8 @@
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				0B26BE701EC5BC3C00EEFB41 /* Embed Frameworks */,
+				B35383AD1DDA0083008F406A /* Adjust embedded framework architectures */,
+				DE3A859324C701EA009B7D76 /* Copy WebRTC dSYM */,
 				0BB7DA181EC9E695007AAE98 /* Adjust ATS */,
 				DEF4813D224925A2002AD03A /* Copy Google Plist file */,
 				DE11877A21EE09640078D059 /* Setup Google reverse URL handler */,
@@ -311,7 +303,7 @@
 			dependencies = (
 				0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */,
 			);
-			name = JitsiMeet;
+			name = "jitsi-meet";
 			productName = "Jitsi Meet";
 			productReference = 13B07F961A680F5B00A75B9A /* jitsi-meet.app */;
 			productType = "com.apple.product-type.application";
@@ -362,7 +354,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				13B07F861A680F5B00A75B9A /* JitsiMeet */,
+				13B07F861A680F5B00A75B9A /* jitsi-meet */,
 				0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */,
 				0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */,
 			);
@@ -428,6 +420,20 @@
 			shellPath = /bin/sh;
 			shellScript = "../scripts/run-packager.sh\n";
 		};
+		B35383AD1DDA0083008F406A /* Adjust embedded framework architectures */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Adjust embedded framework architectures";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "../scripts/fixup-frameworks.sh\n";
+		};
 		B6607F42A5CF0C76E98929E2 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -443,7 +449,7 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-JitsiMeet-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-jitsi-meet-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -468,6 +474,24 @@
 			shellPath = /bin/sh;
 			shellScript = "INFO_PLIST=\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"\nGOOGLE_PLIST=\"$PROJECT_DIR/GoogleService-Info.plist\"\n\nif [[ -f $GOOGLE_PLIST ]]; then\n    REVERSED_CLIENT_ID=$(/usr/libexec/PlistBuddy -c \"Print :REVERSED_CLIENT_ID:\" $GOOGLE_PLIST)\n    /usr/libexec/PlistBuddy -c \"Set :CFBundleURLTypes:1:CFBundleURLSchemes:0 $REVERSED_CLIENT_ID\" $INFO_PLIST\nfi\n";
 		};
+		DE3A859324C701EA009B7D76 /* Copy WebRTC dSYM */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Copy WebRTC dSYM";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "set -x\n\nif [[ \"${CONFIGURATION}\" != \"Debug\" ]]; then\n    cp -r ../../node_modules/react-native-webrtc/ios/WebRTC.dSYM ${DWARF_DSYM_FOLDER_PATH}/\nfi\n";
+		};
 		DE4F6D6E22005C0400DE699E /* Setup Dropbox */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -628,8 +652,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 4.0;
@@ -656,11 +679,7 @@
 				DEVELOPMENT_TEAM = FC967L3QRG;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = watchos/extension/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@executable_path/../../Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.watchkit.extension;
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = watchos;
@@ -694,17 +713,12 @@
 				DEVELOPMENT_TEAM = FC967L3QRG;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = watchos/extension/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@executable_path/../../Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.watchkit.extension;
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 4.0;
@@ -713,7 +727,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */;
+			baseConfigurationReference = 4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
@@ -724,11 +738,16 @@
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = FC967L3QRG;
 				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = src/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
+				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"@executable_path/Frameworks",
+					"../../node_modules/react-native-webrtc/ios",
 				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+				);
+				INFOPLIST_FILE = src/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -743,7 +762,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */;
+			baseConfigurationReference = 09AA3B93E4CC62D84B424690 /* Pods-jitsi-meet.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease;
@@ -753,11 +772,16 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = FC967L3QRG;
 				ENABLE_BITCODE = YES;
-				INFOPLIST_FILE = src/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
+				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"@executable_path/Frameworks",
+					"../../node_modules/react-native-webrtc/ios",
 				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+				);
+				INFOPLIST_FILE = src/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -905,7 +929,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */ = {
+		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				13B07F941A680F5B00A75B9A /* Debug */,

ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme

@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-               BuildableName = "JitsiMeetSDK.framework"
-               BlueprintName = "JitsiMeetSDK"
+               BuildableName = "JitsiMeet.framework"
+               BlueprintName = "JitsiMeet"
                ReferencedContainer = "container:../sdk/sdk.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -30,7 +30,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
                BuildableName = "jitsi-meet.app"
-               BlueprintName = "JitsiMeet"
+               BlueprintName = "jitsi-meet"
                ReferencedContainer = "container:app.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -46,7 +46,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
             BuildableName = "jitsi-meet.app"
-            BlueprintName = "JitsiMeet"
+            BlueprintName = "jitsi-meet"
             ReferencedContainer = "container:app.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -69,7 +69,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
             BuildableName = "jitsi-meet.app"
-            BlueprintName = "JitsiMeet"
+            BlueprintName = "jitsi-meet"
             ReferencedContainer = "container:app.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
@@ -86,7 +86,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
             BuildableName = "jitsi-meet.app"
-            BlueprintName = "JitsiMeet"
+            BlueprintName = "jitsi-meet"
             ReferencedContainer = "container:app.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>

ios/app/src/AppDelegate.m

@@ -21,7 +21,7 @@
 #import "ViewController.h"
 
 @import Firebase;
-@import JitsiMeetSDK;
+@import JitsiMeet;
 
 @implementation AppDelegate
 
@@ -45,8 +45,6 @@
 #endif
     }];
 
-  [jitsiMeet application:application didFinishLaunchingWithOptions:launchOptions];
-
     // Initialize Crashlytics and Firebase if a valid GoogleService-Info.plist file was provided.
   if ([FIRUtilities appContainsRealServiceInfoPlist]) {
         NSLog(@"Enabling Firebase");
@@ -57,6 +55,8 @@
 
     ViewController *rootController = (ViewController *)self.window.rootViewController;
     [jitsiMeet showSplashScreen:rootController.view];
+  
+    [jitsiMeet application:application didFinishLaunchingWithOptions:launchOptions];
 
     return YES;
 }

ios/app/src/FIRUtilities.m

@@ -16,7 +16,7 @@
 
 #import "FIRUtilities.h"
 
-@import JitsiMeetSDK;
+@import JitsiMeet;
 
 @implementation FIRUtilities
 

ios/app/src/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>21.0.0</string>
+	<string>20.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/app/src/ViewController.h

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-@import UIKit;
-@import JitsiMeetSDK;
+#import <UIKit/UIKit.h>
+
+#import <JitsiMeet/JitsiMeet.h>
 
 @interface ViewController : UIViewController<JitsiMeetViewDelegate>
 

ios/app/src/ViewController.m

@@ -21,7 +21,7 @@
 @import MobileCoreServices;
 @import Intents;  // Needed for NSUserActivity suggestedInvocationPhrase
 
-@import JitsiMeetSDK;
+@import JitsiMeet;
 
 #import "Types.h"
 #import "ViewController.h"

ios/app/watchos/app/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>21.0.0</string>
+	<string>20.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>

ios/app/watchos/extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>21.0.0</string>
+	<string>20.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/fastlane/Fastfile

@@ -54,7 +54,7 @@ platform :ios do
 
     # Actually build the app
     build_app(
-        scheme: "JitsiMeet",
+        scheme: "jitsi-meet",
         include_bitcode: true,
         include_symbols: true,
         export_xcargs: "-allowProvisioningUpdates"

ios/scripts/bitcode.sh

@@ -0,0 +1,15 @@
+#!/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/fixup-frameworks.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# This script gets executed from Xcode to fixup the embedded frameworks and
+# bundle the necessary architectures.
+
+
+APP_PATH="${TARGET_BUILD_DIR}/${WRAPPER_NAME}"
+
+# This script loops through the frameworks embedded in the application and
+# removes unused architectures.
+find "$APP_PATH" -name '*.framework' -type d | while read -r FRAMEWORK
+do
+    FRAMEWORK_EXECUTABLE_NAME=$(defaults read "$FRAMEWORK/Info.plist" CFBundleExecutable)
+    FRAMEWORK_EXECUTABLE_PATH="$FRAMEWORK/$FRAMEWORK_EXECUTABLE_NAME"
+    echo "Executable is $FRAMEWORK_EXECUTABLE_PATH"
+
+    EXTRACTED_ARCHS=()
+
+    for ARCH in $ARCHS
+    do
+        if lipo -info "$FRAMEWORK_EXECUTABLE_PATH" | grep -q -v "^Non-fat"
+        then
+            echo "Extracting $ARCH from $FRAMEWORK_EXECUTABLE_NAME"
+            lipo -extract "$ARCH" "$FRAMEWORK_EXECUTABLE_PATH" -o "$FRAMEWORK_EXECUTABLE_PATH-$ARCH"
+            EXTRACTED_ARCHS+=("$FRAMEWORK_EXECUTABLE_PATH-$ARCH")
+        fi
+    done
+
+    if [ -n "$EXTRACTED_ARCHS" ]
+    then
+        echo "Merging extracted architectures: ${ARCHS}"
+        lipo -o "$FRAMEWORK_EXECUTABLE_PATH-merged" -create "${EXTRACTED_ARCHS[@]}"
+        rm "${EXTRACTED_ARCHS[@]}"
+
+        echo "Replacing original executable with thinned version"
+        rm "$FRAMEWORK_EXECUTABLE_PATH"
+        mv "$FRAMEWORK_EXECUTABLE_PATH-merged" "$FRAMEWORK_EXECUTABLE_PATH"
+    fi
+done

ios/scripts/release-sdk.sh

@@ -24,36 +24,8 @@ popd
 
 # Build the SDK
 pushd ${PROJECT_REPO}
-rm -rf ios/sdk/out
-xcodebuild clean \
-    -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeetSDK
-xcodebuild archive \
-    -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeetSDK  \
-    -configuration Release \
-    -sdk iphonesimulator \
-    -destination='generic/platform=iOS Simulator' \
-    -archivePath ios/sdk/out/ios-simulator \
-    VALID_ARCHS=x86_64 \
-    ENABLE_BITCODE=NO \
-    SKIP_INSTALL=NO \
-    BUILD_LIBRARY_FOR_DISTRIBUTION=YES
-xcodebuild archive \
-    -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeetSDK  \
-    -configuration Release \
-    -sdk iphoneos \
-    -destination='generic/platform=iOS' \
-    -archivePath ios/sdk/out/ios-device \
-    VALID_ARCHS=arm64 \
-    ENABLE_BITCODE=NO \
-    SKIP_INSTALL=NO \
-    BUILD_LIBRARY_FOR_DISTRIBUTION=YES
-xcodebuild -create-xcframework \
-    -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
-    -framework ios/sdk/out/ios-simulator.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
-    -output ios/sdk/out/JitsiMeetSDK.xcframework
+rm -rf ios/sdk/JitsiMeet.framework
+xcodebuild -workspace ios/jitsi-meet.xcworkspace -scheme JitsiMeet -destination='generic/platform=iOS' -configuration Release ENABLE_BITCODE=NO clean archive
 if [[ $DO_GIT_TAG == 1 ]]; then
     git tag ios-sdk-${SDK_VERSION}
 fi
@@ -62,8 +34,12 @@ popd
 pushd ${RELEASE_REPO}
 
 # Put the new files in the repo
-cp -a ${PROJECT_REPO}/ios/sdk/out/JitsiMeetSDK.xcframework Frameworks/
-cp -a ${PROJECT_REPO}/node_modules/react-native-webrtc/apple/WebRTC.xcframework Frameworks/
+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

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -24,13 +24,14 @@
 		0BCA49601EC4B6C600B793EE /* POSIX.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495D1EC4B6C600B793EE /* POSIX.m */; };
 		0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495E1EC4B6C600B793EE /* Proximity.m */; };
 		0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BD906E81EC0C00300C8C18E /* JitsiMeet.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0F65EECE1D95DA94561BB47E /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */; };
 		6C31EDC820C06D490089C899 /* recordingOn.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6C31EDC720C06D490089C899 /* recordingOn.mp3 */; };
 		6C31EDCA20C06D530089C899 /* recordingOff.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6C31EDC920C06D530089C899 /* recordingOff.mp3 */; };
-		6F08DF7D4458EE3CF3F36F6D /* libPods-JitsiMeetSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */; };
 		75635B0A20751D6D00F29C9F /* joined.wav in Resources */ = {isa = PBXBuildFile; fileRef = 75635B0820751D6D00F29C9F /* joined.wav */; };
 		75635B0B20751D6D00F29C9F /* left.wav in Resources */ = {isa = PBXBuildFile; fileRef = 75635B0920751D6D00F29C9F /* left.wav */; };
 		87FE6F3321E52437004A5DC7 /* incomingMessage.wav in Resources */ = {isa = PBXBuildFile; fileRef = 87FE6F3221E52437004A5DC7 /* incomingMessage.wav */; };
 		A4414AE020B37F1A003546E6 /* rejected.wav in Resources */ = {isa = PBXBuildFile; fileRef = A4414ADF20B37F1A003546E6 /* rejected.wav */; };
+		A480429C21EE335600289B73 /* AmplitudeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = A480429B21EE335600289B73 /* AmplitudeModule.m */; };
 		A4A934E9212F3ADB001E9388 /* Dropbox.m in Sources */ = {isa = PBXBuildFile; fileRef = A4A934E8212F3ADB001E9388 /* Dropbox.m */; };
 		C30F88D0CB0F4F5593216D24 /* liveStreamingOff.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C30F88D1CB0F4F5593216D24 /* liveStreamingOff.mp3 */; };
 		C30F88D2CB0F4F5593216D24 /* liveStreamingOn.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C30F88D3CB0F4F5593216D24 /* liveStreamingOn.mp3 */; };
@@ -53,7 +54,6 @@
 		DE81A2D92316AC7600AE1940 /* LogBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2D72316AC7600AE1940 /* LogBridge.m */; };
 		DE81A2DE2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DE81A2DF2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */; };
-		DEA9F284258A5D9900D4CD74 /* JitsiMeetSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		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 */; };
@@ -63,7 +63,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDK.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK.debug.xcconfig"; sourceTree = "<group>"; };
+		03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		0B412F161EDEC65D00B1A0A6 /* JitsiMeetView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JitsiMeetView.h; sourceTree = "<group>"; };
 		0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetView.m; sourceTree = "<group>"; };
 		0B412F1B1EDEC80100B1A0A6 /* JitsiMeetViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetViewDelegate.h; sourceTree = "<group>"; };
@@ -81,7 +81,9 @@
 		0BCA495C1EC4B6C600B793EE /* AudioMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioMode.m; sourceTree = "<group>"; };
 		0BCA495D1EC4B6C600B793EE /* POSIX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = POSIX.m; sourceTree = "<group>"; };
 		0BCA495E1EC4B6C600B793EE /* Proximity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Proximity.m; sourceTree = "<group>"; };
-		0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		0BCA49631EC4B76D00B793EE /* WebRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebRTC.framework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.framework"; sourceTree = "<group>"; };
+		0BCA496B1EC4BBF900B793EE /* jitsi.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = jitsi.ttf; path = ../../fonts/jitsi.ttf; sourceTree = "<group>"; };
+		0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JitsiMeet.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0BD906E81EC0C00300C8C18E /* JitsiMeet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeet.h; sourceTree = "<group>"; };
 		0BD906E91EC0C00300C8C18E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6C31EDC720C06D490089C899 /* recordingOn.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = recordingOn.mp3; path = ../../sounds/recordingOn.mp3; sourceTree = "<group>"; };
@@ -89,10 +91,10 @@
 		75635B0820751D6D00F29C9F /* joined.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = joined.wav; path = ../../sounds/joined.wav; sourceTree = "<group>"; };
 		75635B0920751D6D00F29C9F /* left.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = left.wav; path = ../../sounds/left.wav; sourceTree = "<group>"; };
 		87FE6F3221E52437004A5DC7 /* incomingMessage.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = incomingMessage.wav; path = ../../sounds/incomingMessage.wav; sourceTree = "<group>"; };
-		891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDK.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK.release.xcconfig"; sourceTree = "<group>"; };
 		98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
 		9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
 		A4414ADF20B37F1A003546E6 /* rejected.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = rejected.wav; path = ../../sounds/rejected.wav; sourceTree = "<group>"; };
+		A480429B21EE335600289B73 /* AmplitudeModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AmplitudeModule.m; path = src/analytics/AmplitudeModule.m; sourceTree = SOURCE_ROOT; };
 		A4A934E8212F3ADB001E9388 /* Dropbox.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Dropbox.m; sourceTree = "<group>"; };
 		A4A934EB21349A06001E9388 /* Dropbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Dropbox.h; sourceTree = "<group>"; };
 		C30F88D1CB0F4F5593216D24 /* liveStreamingOff.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = liveStreamingOff.mp3; path = ../../sounds/liveStreamingOff.mp3; sourceTree = "<group>"; };
@@ -118,7 +120,6 @@
 		DE81A2D72316AC7600AE1940 /* LogBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LogBridge.m; sourceTree = "<group>"; };
 		DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetBaseLogHandler.h; sourceTree = "<group>"; };
 		DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetBaseLogHandler.m; sourceTree = "<group>"; };
-		DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetSDK.h; sourceTree = "<group>"; };
 		DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetConferenceOptions.h; sourceTree = "<group>"; };
 		DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetConferenceOptions.m; sourceTree = "<group>"; };
 		DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetConferenceOptions+Private.h"; sourceTree = "<group>"; };
@@ -129,7 +130,6 @@
 		DEFE535521FB2E8300011A3A /* ReactUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReactUtils.m; sourceTree = "<group>"; };
 		DEFE535721FB2E9E00011A3A /* ReactUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactUtils.h; sourceTree = "<group>"; };
 		DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeet+Private.h"; sourceTree = "<group>"; };
-		E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeetSDK.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -139,7 +139,7 @@
 			files = (
 				0BB9AD791F5EC6D7001C08DB /* Intents.framework in Frameworks */,
 				0BB9AD771F5EC6CE001C08DB /* CallKit.framework in Frameworks */,
-				6F08DF7D4458EE3CF3F36F6D /* libPods-JitsiMeetSDK.a in Frameworks */,
+				0F65EECE1D95DA94561BB47E /* libPods-JitsiMeet.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -153,6 +153,7 @@
 				0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */,
 				C6245F5B2053091D0040BE68 /* image-resize@2x.png */,
 				C6245F5C2053091D0040BE68 /* image-resize@3x.png */,
+				0BCA496B1EC4BBF900B793EE /* jitsi.ttf */,
 				75635B0820751D6D00F29C9F /* joined.wav */,
 				75635B0920751D6D00F29C9F /* left.wav */,
 				C30F88D1CB0F4F5593216D24 /* liveStreamingOff.mp3 */,
@@ -180,7 +181,7 @@
 		0BD906E61EC0C00300C8C18E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */,
+				0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -188,6 +189,7 @@
 		0BD906E71EC0C00300C8C18E /* src */ = {
 			isa = PBXGroup;
 			children = (
+				A480429821ECE2D800289B73 /* analytics */,
 				0BB9AD7C1F60356D001C08DB /* AppInfo.m */,
 				0BCA495C1EC4B6C600B793EE /* AudioMode.m */,
 				C69EFA02209A0EFD0027712B /* callkit */,
@@ -197,7 +199,6 @@
 				DE438CD82350934700DD541D /* JavaScriptSandbox.m */,
 				0BD906E81EC0C00300C8C18E /* JitsiMeet.h */,
 				DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */,
-				DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */,
 				DEFE535321FB1BF800011A3A /* JitsiMeet.m */,
 				DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */,
 				DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */,
@@ -238,11 +239,21 @@
 				0BB9AD761F5EC6CE001C08DB /* CallKit.framework */,
 				0B93EF7A1EC608550030D24D /* CoreText.framework */,
 				0BB9AD781F5EC6D7001C08DB /* Intents.framework */,
-				E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */,
+				03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */,
+				0BCA49631EC4B76D00B793EE /* WebRTC.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		A480429821ECE2D800289B73 /* analytics */ = {
+			isa = PBXGroup;
+			children = (
+				A480429B21EE335600289B73 /* AmplitudeModule.m */,
+			);
+			name = analytics;
+			path = "New Group";
+			sourceTree = "<group>";
+		};
 		A4A934E7212F3AB8001E9388 /* dropbox */ = {
 			isa = PBXGroup;
 			children = (
@@ -257,8 +268,6 @@
 			children = (
 				98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */,
 				9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */,
-				09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */,
-				891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -294,7 +303,6 @@
 				0B412F181EDEC65D00B1A0A6 /* JitsiMeetView.h in Headers */,
 				0B93EF7E1EC9DDCD0030D24D /* RCTBridgeWrapper.h in Headers */,
 				DE81A2DE2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h in Headers */,
-				DEA9F284258A5D9900D4CD74 /* JitsiMeetSDK.h in Headers */,
 				DE65AACC2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h in Headers */,
 				0B412F221EDEF6EA00B1A0A6 /* JitsiMeetViewDelegate.h in Headers */,
 				0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */,
@@ -308,11 +316,12 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		0BD906E41EC0C00300C8C18E /* JitsiMeetSDK */ = {
+		0BD906E41EC0C00300C8C18E /* JitsiMeet */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeetSDK" */;
+			buildConfigurationList = 0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeet" */;
 			buildPhases = (
 				26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */,
+				DE3D81D6228B50FB00A6C149 /* Bitcode */,
 				0BD906E01EC0C00300C8C18E /* Sources */,
 				0BD906E11EC0C00300C8C18E /* Frameworks */,
 				0BD906E21EC0C00300C8C18E /* Headers */,
@@ -324,9 +333,9 @@
 			);
 			dependencies = (
 			);
-			name = JitsiMeetSDK;
+			name = JitsiMeet;
 			productName = "Jitsi Meet SDK";
-			productReference = 0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */;
+			productReference = 0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
@@ -358,7 +367,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				0BD906E41EC0C00300C8C18E /* JitsiMeetSDK */,
+				0BD906E41EC0C00300C8C18E /* JitsiMeet */,
 			);
 		};
 /* End PBXProject section */
@@ -412,7 +421,7 @@
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-JitsiMeetSDK-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-JitsiMeet-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -425,18 +434,44 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet-resources.sh",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/api.amplitude.com.der",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoCaLimitedRsaCertificationAuthority.der",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaCA.der",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaDomainValidationCA.der",
 				"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/api.amplitude.com.der",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoCaLimitedRsaCertificationAuthority.der",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaCA.der",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaDomainValidationCA.der",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh\"\n";
+			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 */
@@ -459,6 +494,7 @@
 				DEFC743F21B178FA00E4DD96 /* LocaleDetector.m in Sources */,
 				0BCA495F1EC4B6C600B793EE /* AudioMode.m in Sources */,
 				0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */,
+				A480429C21EE335600289B73 /* AmplitudeModule.m in Sources */,
 				C69EFA0C209A0F660027712B /* JMCallKitEmitter.swift in Sources */,
 				DEFE535621FB2E8300011A3A /* ReactUtils.m in Sources */,
 				C6A34261204EF76800E062DD /* DragGestureController.swift in Sources */,
@@ -596,9 +632,10 @@
 		};
 		0BD906EE1EC0C00300C8C18E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */;
+			baseConfigurationReference = 98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -609,6 +646,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = src/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -617,15 +655,17 @@
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		0BD906EF1EC0C00300C8C18E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */;
+			baseConfigurationReference = 9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -636,6 +676,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				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";
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -643,6 +684,7 @@
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
@@ -659,7 +701,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeetSDK" */ = {
+		0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeet" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0BD906EE1EC0C00300C8C18E /* Debug */,

ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1020"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
+               BuildableName = "JitsiMeet.framework"
+               BlueprintName = "JitsiMeet"
+               ReferencedContainer = "container:sdk.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
+            BuildableName = "JitsiMeet.framework"
+            BlueprintName = "JitsiMeet"
+            ReferencedContainer = "container:sdk.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
+            BuildableName = "JitsiMeet.framework"
+            BlueprintName = "JitsiMeet"
+            ReferencedContainer = "container:sdk.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+      <PostActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "exec &gt; /tmp/${PROJECT_NAME}_archive.log 2&gt;&amp;1&#10;&#10;UNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/${CONFIGURATION}-universal&#10;&#10;if [ &quot;true&quot; == ${ALREADYINVOKED:-false} ]&#10;then&#10;echo &quot;RECURSION: Detected, stopping&quot;&#10;else&#10;export ALREADYINVOKED=&quot;true&quot;&#10;&#10;# make sure the output directory exists&#10;mkdir -p &quot;${UNIVERSAL_OUTPUTFOLDER}&quot;&#10;&#10;echo &quot;Building for iPhoneSimulator&quot;&#10;xcodebuild -workspace &quot;${WORKSPACE_PATH}&quot; -scheme &quot;${TARGET_NAME}&quot; -configuration ${CONFIGURATION} -sdk iphonesimulator -destination &apos;platform=iOS Simulator,name=iPhone 8&apos; ONLY_ACTIVE_ARCH=NO ARCHS=&apos;x86_64&apos; BUILD_DIR=&quot;${BUILD_DIR}&quot; BUILD_ROOT=&quot;${BUILD_ROOT}&quot; ENABLE_BITCODE=YES OTHER_CFLAGS=&quot;-fembed-bitcode&quot; BITCODE_GENERATION_MODE=bitcode build&#10;&#10;# Step 1. Copy the framework structure (from iphoneos build) to the universal folder&#10;echo &quot;Copying to output folder&quot;&#10;cp -R &quot;${BUILD_DIR}/${CONFIGURATION}-iphoneos/${FULL_PRODUCT_NAME}&quot; &quot;${UNIVERSAL_OUTPUTFOLDER}/&quot;&#10;&#10;# Step 2. Copy Swift modules from iphonesimulator build (if it exists) to the copied framework directory&#10;SIMULATOR_SWIFT_MODULES_DIR=&quot;${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${TARGET_NAME}.framework/Modules/${TARGET_NAME}.swiftmodule/.&quot;&#10;if [ -d &quot;${SIMULATOR_SWIFT_MODULES_DIR}&quot; ]; then&#10;cp -R &quot;${SIMULATOR_SWIFT_MODULES_DIR}&quot; &quot;${UNIVERSAL_OUTPUTFOLDER}/${TARGET_NAME}.framework/Modules/${TARGET_NAME}.swiftmodule&quot;&#10;fi&#10;&#10;# Step 3. Create universal binary file using lipo and place the combined executable in the copied framework directory&#10;echo &quot;Combining executables&quot;&#10;lipo -create -output &quot;${UNIVERSAL_OUTPUTFOLDER}/${EXECUTABLE_PATH}&quot; &quot;${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${EXECUTABLE_PATH}&quot; &quot;${BUILD_DIR}/${CONFIGURATION}-iphoneos/${EXECUTABLE_PATH}&quot;&#10;&#10;fi&#10;&#10;# Step 4. Convenience step to copy the framework to the project&amp;apos;s directory&#10;echo &quot;Copying to project dir&amp;quot&quot;&#10;yes | cp -Rf ${UNIVERSAL_OUTPUTFOLDER}/${FULL_PRODUCT_NAME} ${PROJECT_DIR}&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
+                     BuildableName = "JitsiMeet.framework"
+                     BlueprintName = "JitsiMeet"
+                     ReferencedContainer = "container:sdk.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PostActions>
+   </ArchiveAction>
+</Scheme>

ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeetSDK.xcscheme

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1020"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-               BuildableName = "JitsiMeetSDK.framework"
-               BlueprintName = "JitsiMeetSDK"
-               ReferencedContainer = "container:sdk.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-            BuildableName = "JitsiMeetSDK.framework"
-            BlueprintName = "JitsiMeetSDK"
-            ReferencedContainer = "container:sdk.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-            BuildableName = "JitsiMeetSDK.framework"
-            BlueprintName = "JitsiMeetSDK"
-            ReferencedContainer = "container:sdk.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

ios/sdk/src/Info.plist

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

ios/sdk/src/JitsiMeet.h

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,13 @@
  * limitations under the License.
  */
 
-@import UIKit;
-@import Foundation;
+#import <JitsiMeet/JitsiMeetView.h>
+#import <JitsiMeet/JitsiMeetViewDelegate.h>
+#import <JitsiMeet/JitsiMeetConferenceOptions.h>
+#import <JitsiMeet/JitsiMeetLogger.h>
+#import <JitsiMeet/JitsiMeetBaseLogHandler.h>
+#import <JitsiMeet/InfoPlistUtil.h>
 
-#import <JitsiMeetSDK/JitsiMeetConferenceOptions.h>
 
 @interface JitsiMeet : NSObject
 

ios/sdk/src/JitsiMeetSDK.h

@@ -1,23 +0,0 @@
-/*
- * Copyright @ 2020-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 <JitsiMeetSDK/JitsiMeet.h>
-#import <JitsiMeetSDK/JitsiMeetView.h>
-#import <JitsiMeetSDK/JitsiMeetViewDelegate.h>
-#import <JitsiMeetSDK/JitsiMeetConferenceOptions.h>
-#import <JitsiMeetSDK/JitsiMeetLogger.h>
-#import <JitsiMeetSDK/JitsiMeetBaseLogHandler.h>
-#import <JitsiMeetSDK/InfoPlistUtil.h>

ios/sdk/src/analytics/AmplitudeModule.m

@@ -0,0 +1,61 @@
+/*
+ * Copyright @ 2018-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <React/RCTBridgeModule.h>
+
+#import "Amplitude.h"
+#import "LogUtils.h"
+
+
+@interface AmplitudeModule : NSObject<RCTBridgeModule>
+@end
+
+@implementation AmplitudeModule
+
+RCT_EXPORT_MODULE(Amplitude)
+
++ (BOOL)requiresMainQueueSetup {
+    return NO;
+}
+
+RCT_EXPORT_METHOD(init:(NSString*)instanceName API_KEY:(NSString*)apiKey) {
+    [[Amplitude instanceWithName:instanceName] initializeApiKey:apiKey];
+}
+
+RCT_EXPORT_METHOD(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];
+    }
+}
+
+RCT_EXPORT_METHOD(logEvent:(NSString*)instanceName eventType:(NSString*)eventType eventPropsString:(NSString*)eventPropsString) {
+    NSError *error;
+    NSData *eventPropsData = [eventPropsString dataUsingEncoding:NSUTF8StringEncoding];
+    NSDictionary *eventProperties = [NSJSONSerialization JSONObjectWithData:eventPropsData
+                                                                   options:NSJSONReadingMutableContainers
+                                                                     error:&error];
+    if (eventProperties == nil) {
+        DDLogError(@"[Amplitude] Error parsing event properties: %@", error);
+    } else {
+        [[Amplitude instanceWithName:instanceName] logEvent:eventType withEventProperties:eventProperties];
+    }
+}
+
+@end

ios/sdk/src/callkit/CallKit.m

@@ -28,9 +28,9 @@
 #import <React/RCTUtils.h>
 #import <WebRTC/WebRTC.h>
 
-#import <JitsiMeetSDK/JitsiMeetSDK-Swift.h>
+#import <JitsiMeet/JitsiMeet-Swift.h>
 
-#import "../LogUtils.h"
+#import "LogUtils.h"
 
 
 // The events emitted/supported by RNCallKit:

ios/sdk/src/callkit/JMCallKitProxy.swift

@@ -18,29 +18,6 @@
 import CallKit
 import Foundation
 
-public protocol CXProviderProtocol: class {
-    var configuration: CXProviderConfiguration { get set }
-    func setDelegate(_ delegate: CXProviderDelegate?, queue: DispatchQueue?)
-    func reportNewIncomingCall(with UUID: UUID, update: CXCallUpdate, completion: @escaping (Error?) -> Void)
-    func reportCall(with UUID: UUID, updated update: CXCallUpdate)
-    func reportCall(with UUID: UUID, endedAt dateEnded: Date?, reason endedReason: CXCallEndedReason)
-    func reportOutgoingCall(with UUID: UUID, startedConnectingAt dateStartedConnecting: Date?)
-    func reportOutgoingCall(with UUID: UUID, connectedAt dateConnected: Date?)
-    func invalidate()
-}
-
-public protocol CXCallControllerProtocol: class {
-    var calls: [CXCall] { get }
-    func request(_ transaction: CXTransaction, completion: @escaping (Error?) -> Swift.Void)
-}
-
-extension CXProvider: CXProviderProtocol {}
-extension CXCallController: CXCallControllerProtocol {
-    public var calls: [CXCall] {
-        return callObserver.calls
-    }
-}
-
 /// JitsiMeet CallKit proxy
 // NOTE: The methods this class exposes are meant to be called in the UI thread.
 // All delegate methods called by JMCallKitEmitter will be called in the UI thread.
@@ -49,17 +26,11 @@ extension CXCallController: CXCallControllerProtocol {
     private override init() {}
 
     // MARK: - CallKit proxy
-    
-    public static var callKitProvider: CXProviderProtocol?
-    public static var callKitCallController: CXCallControllerProtocol?
 
-    private static var provider: CXProviderProtocol {
-        callKitProvider ?? defaultProvider
-    }
-    
-    private static var callController: CXCallControllerProtocol {
-        callKitCallController ?? defaultCallController
-    }
+    private static var provider: CXProvider = {
+        let configuration = CXProviderConfiguration(localizedName: "")
+        return CXProvider(configuration: configuration)
+    }()
 
     private static var providerConfiguration: CXProviderConfiguration? {
         didSet {
@@ -68,15 +39,10 @@ extension CXCallController: CXCallControllerProtocol {
             provider.setDelegate(emitter, queue: nil)
         }
     }
-    
-    private static let defaultCallController: CXCallController = {
+
+    private static let callController: CXCallController = {
         return CXCallController()
     }()
-    
-    private static var defaultProvider: CXProvider = {
-        let configuration = CXProviderConfiguration(localizedName: "")
-        return CXProvider(configuration: configuration)
-    }()
 
     private static let emitter: JMCallKitEmitter = {
         return JMCallKitEmitter()
@@ -86,16 +52,10 @@ extension CXCallController: CXCallControllerProtocol {
     /// Defaults to enabled, set to false when you don't want to use CallKit.
     @objc public static var enabled: Bool = true {
         didSet {
-            if callKitProvider == nil {
-                provider.invalidate()
-            }
-            
+            provider.invalidate()
             if enabled {
-                guard isProviderConfigured() else  { return }
-                if callKitProvider == nil {
-                    defaultProvider = CXProvider(configuration: providerConfiguration!)
-                }
-                
+                guard isProviderConfigured() else  { return; }
+                provider = CXProvider(configuration: providerConfiguration!)
                 provider.setDelegate(emitter, queue: nil)
             } else {
                 provider.setDelegate(nil, queue: nil)
@@ -132,18 +92,19 @@ extension CXCallController: CXCallControllerProtocol {
     }
 
     @objc public static func hasActiveCallForUUID(_ callUUID: String) -> Bool {
-        let activeCallForUUID = callController.calls.first {
+        let activeCallForUUID = callController.callObserver.calls.first {
             $0.uuid == UUID(uuidString: callUUID)
         }
         guard activeCallForUUID != nil else { return false }
         return true
     }
 
-    @objc public static func reportNewIncomingCall(UUID: UUID,
-                                                   handle: String?,
-                                                   displayName: String?,
-                                                   hasVideo: Bool,
-                                                   completion: @escaping (Error?) -> Void) {
+    @objc public static func reportNewIncomingCall(
+            UUID: UUID,
+            handle: String?,
+            displayName: String?,
+            hasVideo: Bool,
+            completion: @escaping (Error?) -> Void) {
         guard enabled else { return }
 
         let callUpdate = makeCXUpdate(handle: handle,
@@ -171,6 +132,7 @@ extension CXCallController: CXCallControllerProtocol {
             endedAt dateEnded: Date?,
             reason endedReason: CXCallEndedReason) {
         guard enabled else { return }
+
         provider.reportCall(with: UUID,
                             endedAt: dateEnded,
                             reason: endedReason)
@@ -180,6 +142,7 @@ extension CXCallController: CXCallControllerProtocol {
             with UUID: UUID,
             startedConnectingAt dateStartedConnecting: Date?) {
         guard enabled else { return }
+
         provider.reportOutgoingCall(with: UUID,
                                     startedConnectingAt: dateStartedConnecting)
     }

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

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import UIKit
-
 final class DragGestureController {
 
     var insets: UIEdgeInsets = UIEdgeInsets.zero

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

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import UIKit
-
 public typealias AnimationCompletion = (Bool) -> Void
 
 public protocol PiPViewCoordinatorDelegate: class {

lang/languages-ar.json

@@ -1,5 +1,4 @@
 {
-    "ar": "العربية",
     "en": "الإنجليزية",
     "af": "الأفريكانية",
     "bg": "البلغارية",
@@ -39,9 +38,5 @@
     "sk": "السلوفاكية",
     "lt": "الليتوانية",
     "id": "الإندونيسية",
-    "he": "العبرية",
-    "mr":"الماراثى",
-    "kab": "قَبَلي",
-    "ro": "الرومانية",
-    "sl": "السلوفينية",
+    "he": "العبرية"
 }

lang/languages-cs.json

@@ -1,50 +1,27 @@
 {
     "en": "Angličtina",
-    "af": "Afrikánština",
-    "ar": "Arabština",
-    "az": "Ázerbájdžánština",
+    "af": "",
+    "az": "",
     "bg": "Bulharština",
-    "ca": "Katalánština",
-    "cs": "Čeština",
-    "da": "Dánština",
+    "cs": "",
     "de": "Němčina",
-    "el": "Řečtina",
-    "enGB": "Angličtina (Spojené království)",
+    "el": "",
     "eo": "Esperanto",
     "es": "Španělština",
-    "esUS": "Španělština (Latinská Amerika)",
-    "et": "Estonština",
-    "eu": "Baskičtina",
-    "fi": "Finština",
     "fr": "Francouština",
-    "frCA": "Francouzština (Kanada)",
-    "he": "Hebrejština",
-    "mr":"Maráthština",
-    "hr": "Chorvatština",
-    "hu": "Maďarština",
     "hy": "Arménština",
-    "id": "Indonéština",
     "it": "Italština",
-    "ja": "Japonština",
-    "kab": "Kabylština",
-    "ko": "Korejština",
-    "lt": "Litevština",
-    "nl": "Nizozemština",
+    "ja": "",
+    "ko": "",
     "nb": "Norština Bokmal",
     "oc": "Okcitánština",
     "pl": "Polština",
-    "ptBR": "Portugalština (Brazílie)",
+    "ptBR": "Portugalština (Brazilská)",
     "ru": "Ruština",
-    "ro": "Rumunština",
-    "sc": "Sardinština",
     "sk": "Slovenština",
     "sl": "Slovinština",
-    "sr": "Srbština",
     "sv": "Švédština",
-    "th": "Thajština",
     "tr": "Turečtina",
-    "uk": "Ukrajinština",
-    "vi": "Vietnamština",
-    "zhCN": "Čínština (Čína)",
-    "zhTW": "Čínština (Taiwan)"
-}
+    "vi": "",
+    "zhCN": "Čínština (Čína)"
+}

lang/languages-fa.json

@@ -1,50 +1,32 @@
 {
     "en": "انگلیسی",
     "af": "آفریقایی",
-    "ar": "عربی",
     "bg": "بلغاری",
     "ca": "کاتالانی",
     "cs": "چک",
-    "da": "دانمارکی",
     "de": "آلمانی",
     "el": "یونانی",
     "enGB": "انگلیسی (انگلستان)",
     "eo": "اسپرانتو",
     "es": "اسپانیایی",
     "esUS": "اسپانیایی (آمریکا لاتین)",
-    "et": "استونیایی",
-    "eu": "باسکایی",
     "fi": "فنلاندی",
     "fr": "فرانسوی",
     "frCA": "فرانسوی (کانادا)",
-    "he": "عبری",
-    "mr":"مراتی",
-    "hr": "کرواتی",
+    "hr": "",
     "hu": "بلغاری",
     "hy": "ارمنی",
-    "id": "اندونزیایی",
     "it": "ایتالیایی",
     "ja": "ژاپنی",
-    "kab": "کابیلی",
     "ko": "کره ای",
-    "lt": "لیتوانیایی",
-    "ml": "مالایایی",
-    "lv": "لتونیایی",
-    "nl": "هلندی",
+    "nl": "",
     "oc": "اکسیتان(قدیمی)",
     "pl": "لهستانی",
     "ptBR": "پرتغالی (برزیل)",
     "ru": "روسی",
-    "ro": "رومانیایی",
-    "sc": "ساردینی",
-    "sk": "اسلواکیایی",
-    "sl": "اسلوونیایی",
-    "sr": "صربی",
     "sv": "سوئدی",
-    "th": "تایلندی",
     "tr": "ترکی",
-    "uk": "اوکراینی",
     "vi": "ویتنامی",
     "zhCN": "چینی",
-    "zhTW": "چینی (تایوان)"
+    "zhTW": ""
 }

lang/languages-gl.json

@@ -1,50 +1,34 @@
 {
     "en": "Inglés",
     "af": "Afrikans",
-    "ar": "Árabe",
     "bg": "Búlgaro",
     "ca": "Catalán",
     "cs": "Checo",
-    "da": "Dinamarqués",
     "de": "Alemán",
     "el": "Grego",
-    "enGB": "Inglés (Reino Unido)",
+    "enGB": "Inglés (RU)",
     "eo": "Esperanto",
-    "es": "Español",
+    "es": "Castelán",
     "esUS": "Español (Hispanoamérica)",
-    "et": "Estoniano",
-    "eu": "Éuscaro",
-    "fi": "Finlandés",
+    "fi": "Finés",
     "fr": "Francés",
     "frCA": "Francés (Canadá)",
-    "he": "Hebreo",
-    "mr":"Marathi",
     "hr": "Croata",
     "hu": "Húngaro",
     "hy": "Armenio",
-    "id": "Indonesio",
     "it": "Italiano",
     "ja": "Xaponés",
-    "kab": "Cabila",
     "ko": "Coreano",
-    "lt": "Lituano",
-    "ml": "Malayalam",
-    "lv": "Letón",
-    "nl": "Holandés",
+    "nl": "Neerlandés",
     "oc": "Occitano",
     "pl": "Polaco",
     "ptBR": "Portugués (Brasil)",
     "ru": "Ruso",
-    "ro": "Romanés",
-    "sc": "Sardo",
-    "sk": "Eslovaco",
-    "sl": "Esloveno",
-    "sr": "Serbio",
     "sv": "Sueco",
-    "th": "Tailandés",
     "tr": "Turco",
-    "uk": "Ucraíno",
     "vi": "Vietnamita",
     "zhCN": "Chinés (China)",
-    "zhTW": "Chinés (Taiwán)"
+    "zhTW": "Chinés (Taiwan)",
+    "et": "Estoniano",
+    "da": "Dinamarqués"
 }

lang/languages-it.json

@@ -27,12 +27,12 @@
     "enGB": "Inglese (Regno Unito)",
     "da": "Danese",
     "ca": "Catalano",
-    "zhTW": "Cinese (Taiwan)",
-    "nl": "Olandese",
-    "hu": "Ungaro",
-    "hr": "Croato",
-    "frCA": "Francese (Canada)",
-    "fi": "Finlandese",
-    "et": "Etiope",
-    "esUS": "Spagnolo (USA)"
+    "zhTW": "",
+    "nl": "",
+    "hu": "",
+    "hr": "",
+    "frCA": "",
+    "fi": "",
+    "et": "",
+    "esUS": ""
 }

lang/languages-ja.json

@@ -1,48 +1,27 @@
 {
     "en": "英語",
     "af": "アフリカーンス語",
-    "ar": "アラビア語",
+    "az": "アゼルバイジャン語",
     "bg": "ブルガリア語",
-    "ca": "カタルーニャ語",
     "cs": "チェコ語",
-    "da": "デンマーク語",
     "de": "ドイツ語",
     "el": "ギリシア語",
-    "enGB": "英語 (英国)",
     "eo": "エスペラント語",
     "es": "スペイン語",
-    "esUS": "スペイン語 (ラテンアメリカ)",
-    "et": "エストニア語",
-    "eu": "バスク語",
-    "fi": "フィンランド語",
     "fr": "フランス語",
-    "frCA": "フランス語 (カナダ)",
-    "he": "ヘブライ語",
-    "mr": "マラーティー語",
-    "hr": "クロアチア語",
-    "hu": "ハンガリー語",
     "hy": "アルメニア語",
-    "id": "インドネシア語",
     "it": "イタリア語",
     "ja": "日本語",
-    "kab": "カビル語",
     "ko": "韓国語",
-    "lt": "リトアニア語",
-    "nl": "オランダ語",
+    "nb": "ノルウェー語 (ブークモール)",
     "oc": "オック語",
     "pl": "ポーランド語",
     "ptBR": "ポルトガル語 (ブラジル)",
     "ru": "ロシア語",
-    "ro": "ルーマニア語",
-    "sc": "サルデーニャ語",
     "sk": "スロバキア語",
     "sl": "スロベニア語",
-    "sr": "セルビア語",
     "sv": "スウェーデン語",
-    "th": "タイ語",
     "tr": "トルコ語",
-    "uk": "ウクライナ語",
     "vi": "ベトナム語",
-    "zhCN": "中国語 (中国)",
-    "zhTW": "中国語 (台湾)"
-}
+    "zhCN": "中国語 (中国)"
+}

lang/languages-ka.json

@@ -1,36 +0,0 @@
-{
-    "en": "ინგლისური",
-    "af": "აფრიკული",
-    "bg": "ბულგარული",
-    "ca": "კატალონიური",
-    "cs": "ჩეხური",
-    "de": "გერმანული",
-    "el": "ბერძნული",
-    "enGB": "ინგლისური (დიდი ბრიტანეთი)",
-    "eo": "ესტონური",
-    "es": "ესპანური",
-    "esUS": "ესპანური (ლათინური ამერიკა)",
-    "fi": "ფინური",
-    "fr": "ფრანგული",
-    "frCA": "ფრანგული (კანადური)",
-    "hr": "ხორვატიული",
-    "hu": "უნგრული",
-    "hy": "სომხური",
-    "it": "იტალიური",
-    "ja": "იაპონური",
-    "ka": "ქართული",
-    "ko": "კორეული",
-    "nl": "ჰოლანდიური",
-    "oc": "ოქსიტანური",
-    "pl": "პოლონური",
-    "ptBR": "პორტუგალიური (ბრაზილია)",
-    "ru": "რუსული",
-    "sr": "სერბული",
-    "sv": "შვედური",
-    "tr": "თურქული",
-    "vi": "ვიეტნამური",
-    "zhCN": "ჩინური (ჩინეთი)",
-    "zhTW": "ჩინური (ტაივანი)",
-    "et": "ესტონური",
-    "da": "დანიური"
-}

lang/languages-oc.json

@@ -1,52 +1,48 @@
 {
     "en": "Anglés",
     "af": "Afrikaans",
-    "ar": "Arabi",
     "bg": "Bulgar",
     "ca": "Catalan",
     "cs": "Chèc",
-    "da": "Danés",
     "de": "Aleman",
     "el": "Grèc",
     "enGB": "Anglés (Reialme Unit)",
     "eo": "Esperanto",
     "es": "Castelhan",
     "esUS": "Espanhòl (America latina)",
-    "et": "Estonian",
-    "eu": "Basc",
     "fi": "Finés",
     "fr": "Francés",
     "frCA": "Francés (Canadian)",
-    "he": "Ebrèu",
-    "mr":"Marathi",
     "hr": "Croat",
     "hu": "Ongrés",
     "hy": "Armenian",
-    "id": "Indonesian",
     "it": "Italian",
     "ja": "Japonés",
-    "kab": "Cabil",
     "ko": "Corean",
-    "lt": "Lituanian",
-    "ml": "Malaialam",
-    "lv": "Leton",
     "nl": "Neerlandés",
     "oc": "Occitan",
     "pl": "Polonés",
     "ptBR": "Portugués (Brasil)",
     "ru": "Rus",
-    "ro": "Romanian",
-    "sc": "Sarde",
-    "sk": "Eslovac",
-    "sl": "Eslovèn",
-    "sr": "Sèrbe",
     "sv": "Suedés",
-    "th": "Tai",
     "tr": "Turc",
-    "uk": "Ucraïnian",
     "vi": "Vietnamian",
     "zhCN": "Chinés (China)",
-    "zhTW": "Chinés (Taiwan)"
+    "zhTW": "Chinés (Taiwan)",
+    "et": "Estonian",
+    "da": "Danés",
+    "uk": "Ucraïnian",
+    "th": "Tai",
+    "sk": "Eslovac",
+    "sc": "Sarde",
+    "lt": "Lituanian",
+    "id": "Indonesian",
+    "he": "Ebrèu",
+    "eu": "Basc",
+    "mr": "Marathi",
+    "sl": "Eslovèn",
+    "ro": "Romanian",
+    "ar": "Arabi"
 }
 
 

lang/languages-zhCN.json

@@ -1,47 +1,32 @@
 {
     "en": "英语",
     "af": "南非荷兰语",
-    "ar": "阿拉伯语",
     "bg": "保加利亚语",
     "ca": "加泰罗尼亚语",
     "cs": "捷克语",
-    "da": "丹麦语",
     "de": "德语",
     "el": "希腊语",
     "enGB": "英语（英国）",
     "eo": "世界语",
     "es": "西班牙语",
     "esUS": "西班牙语（拉丁美洲）",
-    "et": "爱沙尼亚语",
-    "eu": "巴斯克语",
     "fi": "芬兰语",
     "fr": "法语",
     "frCA": "法语（加拿大）",
-    "he": "希伯来语",
-    "mr":"马拉地语",
     "hr": "克罗地亚语",
     "hu": "匈牙利语",
     "hy": "亚美尼亚语",
-    "id": "印度尼西亚语",
     "it": "意大利语",
     "ja": "日语",
-    "kab": "卡比尔语",
     "ko": "韩语",
-    "lt": "立陶宛语",
     "nl": "荷兰语",
     "oc": "欧西坦语",
     "pl": "波兰语",
     "ptBR": "葡萄牙语（巴西）",
     "ru": "俄语",
-    "ro": "罗马尼亚语",
-    "sc": "撒丁岛语",
-    "sk": "斯洛伐克语",
-    "sl": "斯洛文尼亚语",
     "sv": "瑞典语",
-    "th": "泰语",
     "tr": "土耳其语",
-    "uk": "乌克兰语",
     "vi": "越南语",
     "zhCN": "中文(中国)",
     "zhTW": "中文（台湾）"
-}
+}

lang/languages.json

@@ -28,8 +28,6 @@
     "kab": "Kabyle",
     "ko": "Korean",
     "lt": "Lithuanian",
-    "ml": "Malayalam",
-    "lv": "Latvian",
     "nl": "Dutch",
     "oc": "Occitan",
     "pl": "Polish",

lang/main-de.json

@@ -99,11 +99,9 @@
     },
     "connectionindicator": {
         "address": "Adresse:",
-        "audio_ssrc": "Audio-SSRC:",
         "bandwidth": "Geschätzte Bandbreite:",
         "bitrate": "Bitrate:",
         "bridgeCount": "Serverzahl: ",
-        "codecs": "Codecs (A/V): ",
         "connectedTo": "Verbunden mit:",
         "e2e_rtt": "E2E RTT:",
         "framerate": "Bildwiederholrate:",
@@ -127,12 +125,9 @@
         "remoteport": "Entfernter Port:",
         "remoteport_plural": "Entfernte Ports:",
         "resolution": "Auflösung:",
-        "savelogs": "Logs speichern",
-        "participant_id": "Teilnehmer-ID:",
         "status": "Verbindung:",
         "transport": "Protokoll:",
-        "transport_plural": "Protokolle:",
-        "video_ssrc": "Video-SSRC:"
+        "transport_plural": "Protokolle:"
     },
     "dateUtils": {
         "earlier": "Früher",
@@ -201,7 +196,10 @@
         "displayNameRequired": "Hallo! Wie ist Ihr Name?",
         "done": "Fertig",
         "e2eeDescription": "Ende-zu-Ende-Verschlüsselung ist derzeit noch EXPERIMENTELL. Bitte beachten Sie, dass das Aktivieren der Ende-zu-Ende-Verschlüsselung diverse serverseitige Funktionen deaktiviert: Aufnahmen, Livestreaming und Telefoneinwahl. Bitte beachten Sie außerdem, dass der Konferenz dann nur noch mit Browsern beigetreten werden kann, die Insertable Streams unterstützen.",
-        "e2eeLabel": "Ende-zu-Ende-Verschlüsselung aktivieren",
+        "e2eeLabel": "E2EE-Schlüssel",
+        "e2eeNoKey": "Keiner",
+        "e2eeToggleSet": "Schlüssel festlegen",
+        "e2eeSet": "Setzen",
         "e2eeWarning": "WARNUNG: Nicht alle Teilnehmer dieser Konferenz scheinen Ende-zu-Ende-Verschlüsselung zu unterstützen. Wenn Sie diese aktivieren, können die entsprechenden Teilnehmer nichts mehr sehen oder hören.",
         "enterDisplayName": "Bitte geben Sie hier Ihren Namen ein",
         "error": "Fehler",
@@ -366,7 +364,7 @@
         "password": "$t(lockRoomPasswordUppercase):",
         "title": "Teilen",
         "tooltip": "Freigabe-Link und Einwahlinformationen für dieses Meeting",
-        "label": "Einwahlinformationen"
+        "label": "Konferenzinformationen"
     },
     "inviteDialog": {
         "alertText": "Die Einladung einiger Teilnehmer ist fehlgeschlagen.",
@@ -505,7 +503,6 @@
     "poweredby": "Betrieben von",
     "prejoin": {
         "audioAndVideoError": "Audio- und Videofehler:",
-        "audioDeviceProblem": "Es gibt ein Problem mit Ihrem Audiogerät.",
         "audioOnlyError": "Audiofehler:",
         "audioTrackError": "Audiotrack konnte nicht erstellt werden.",
         "calling": "Rufaufbau",
@@ -513,35 +510,15 @@
         "callMeAtNumber": "Mich unter dieser Nummer anrufen:",
         "configuringDevices": "Geräte werden eingerichtet …",
         "connectedWithAudioQ": "Sie sind mit Audio verbunden?",
-        "connection": {
-           "good": "Ihre Internetverbindung sieht gut aus!",
-           "nonOptimal": "Ihre Internetverbindung ist nicht optimal.",
-           "poor": "Sie haben eine schlechte Internetverbindung."
-        },
-        "connectionDetails": {
-          "audioClipping": "Ihr Ton wird wahrscheinlich abgehackt sein.",
-          "audioHighQuality": "Ihr Ton sollte exzellent klingen.",
-          "audioLowNoVideo": "Ihr Ton wird wahrscheinlich schlecht klingen und es wird kein Video geben.",
-          "goodQuality": "Großartig! Ihre Bild- und Tonqualität sollte super sein.",
-          "noMediaConnectivity": "Es konnte für diesen Test keine Medienverbindung hergestellt werden. Das wird gewöhnlich durch eine Firewall oder ein NAT ausgelöst.",
-          "noVideo": "Ihr Bild wird wahrscheinlich eine schlechte Qualität haben.",
-          "undetectable": "Wenn Sie mit Ihrem Browser weiterhin Probleme in Konferenzen haben, sollten Sie die Verbindung und Funktion Ihrer Lautsprecher, Ihres Mikrofons und Ihrer Kamera überprüfen. Stellen Sie außerdem sicher, dass Ihr Browser die erforderlichen Rechte hat, auf das Mikrofon und die Kamera zuzugreifen, und dass Sie die neuste Browserversion installiert haben. Sollten Sie immer noch Probleme haben, kontaktieren Sie bitte den Entwickler der Webanwendung.",
-          "veryPoorConnection": "Ihre Konferenzqualität wird wahrscheinlich sehr schlecht sein.",
-          "videoFreezing": "Ihr Bild wird wahrscheinlich einfrieren, schwarz werden und eine geringe Auflösung haben.",
-          "videoHighQuality": "Ihr Bild sollte sehr gut aussehen.",
-          "videoLowQuality": "Ihr Bild wird wahrscheinlich eine geringe Auflösung und Bildrate haben.",
-          "videoTearing": "Ihr Bild wird wahrscheinlich eine geringe Auflösung haben oder Artefakte aufweisen."
-        },
         "copyAndShare": "Konferenzlink kopieren & teilen",
         "dialInMeeting": "Telefoneinwahl",
         "dialInPin": "In die Konferenz einwählen und PIN eingeben:",
         "dialing": "Wählen",
-        "doNotShow": "Diesen Bildschirm nicht mehr anzeigen",
+        "doNotShow": "Nicht mehr anzeigen",
         "errorDialOut": "Anruf fehlgeschlagen",
         "errorDialOutDisconnected": "Anruf fehlgeschlagen. Verbindungsabbruch",
         "errorDialOutFailed": "Anruf fehlgeschlagen. Anruf fehlgeschlagen",
         "errorDialOutStatus": "Fehler beim Abrufen des Anrufstatus",
-        "errorMissingName": "Bitte geben Sie Ihren Namen ein, um der Konferenz beizutreten.",
         "errorStatusCode": "Anruf fehlgeschlagen. Statuscode: {{status}}",
         "errorValidation": "Nummerverifikation fehlgeschlagen",
         "iWantToDialIn": "Ich möchte mich einwählen",
@@ -698,6 +675,7 @@
             "document": "Geteiltes Dokument schließen",
             "download": "Unsere Apps herunterladen",
             "embedMeeting": "Konferenz einbetten",
+            "e2ee": "Ende-zu-Ende-Verschlüsselung",
             "feedback": "Feedback hinterlassen",
             "fullScreen": "Vollbildmodus ein-/ausschalten",
             "grantModerator": "Zum Moderator machen",
@@ -707,7 +685,7 @@
             "kick": "Teilnehmer entfernen",
             "lobbyButton": "Lobbymodus ein-/ausschalten",
             "localRecording": "Lokale Aufzeichnungssteuerelemente ein-/ausschalten",
-            "lockRoom": "Konferenzpasswort ein-/ausschalten",
+            "lockRoom": "Konferenzpasswort ein-/auschalten",
             "moreActions": "Menü „Weitere Aktionen“ ein-/ausschalten",
             "moreActionsMenu": "Menü „Weitere Aktionen“",
             "moreOptions": "Menü „Weitere Optionen“",
@@ -864,7 +842,7 @@
             "join": "Zum Teilnehmen tippen",
             "roomname": "Konferenzname eingeben"
         },
-        "appDescription": "Auf geht's! Starten Sie eine Videokonferenz mit Ihrem Team oder besser noch: Laden Sie alle ein, die Sie kennen. {{app}} ist eine vollständig verschlüsselte und 100 % quelloffene Videokonferenzlösung, die Sie immer und überall kostenlos verwenden können – ohne Registrierung.",
+        "appDescription": "Auf geht's! Starten Sie eine Videokonferenz mit ihrem Team oder besser noch: Laden Sie alle ein, die Sie kennen. {{app}} ist eine vollständig verschlüsselte und 100 % quelloffene Videokonferenzlösung, die Sie immer und überall kostenlos verwenden können – ohne Registrierung.",
         "audioVideoSwitch": {
             "audio": "Audio",
             "video": "Video"
@@ -876,12 +854,12 @@
         "getHelp": "Hilfe",
         "go": "Los",
         "goSmall": "Los",
-        "info": "Einwahlinformationen",
+        "info": "Informationen",
         "join": "ERSTELLEN / BEITRETEN",
         "moderatedMessage": "Oder <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">reservieren Sie sich eine Konferenz-URL</a>, unter der Sie der einzige Moderator sind.",
         "privacy": "Datenschutz",
         "recentList": "Verlauf",
-        "recentListDelete": "Eintrag löschen",
+        "recentListDelete": "Löschen",
         "recentListEmpty": "Ihr Konferenzverlauf ist derzeit leer. Reden Sie mit Ihrem Team und Ihre vergangenen Konferenzen landen hier.",
         "reducedUIText": "Willkommen bei {{app}}!",
         "roomNameAllowedChars": "Der Konferenzname sollte keines der folgenden Zeichen enthalten: ?, &, :, ', \", %, #.",
@@ -903,7 +881,7 @@
         "allow": "Annehmen",
         "backToKnockModeButton": "Kein Passwort, stattdessen Beitritt anfragen",
         "dialogTitle": "Lobbymodus",
-        "disableDialogContent": "Lobbymodus derzeit aktiviert. Diese Funktion stellt sicher, dass unerwünschte Personen Ihrer Konferenz nicht beitreten können. Funktion deaktivieren?",
+        "disableDialogContent": "Lobbymodus derzeit deaktiviert. Diese Funktion stellt sicher, dass unerwünschte Personen Ihrer Konferenz nicht beitreten können. Funktion aktivieren?",
         "disableDialogSubmit": "Deaktivieren",
         "emailField": "E-Mail-Adresse eingeben",
         "enableDialogPasswordField": "Passwort setzen (optional)",

lang/main-enGB.json

@@ -83,7 +83,6 @@
         "bandwidth": "Estimated bandwidth:",
         "bitrate": "Bitrate:",
         "bridgeCount": "Server count: ",
-        "codecs": "Codecs (A/V): ",
         "connectedTo": "Connected to:",
         "framerate": "Frame rate:",
         "less": "Show less",
@@ -380,7 +379,7 @@
         "getStreamKeyManually": "We weren’t able to fetch any live streams. Try getting your live stream key from YouTube.",
         "invalidStreamKey": "Live stream key may be incorrect.",
         "off": "Live Streaming stopped",
-        "on": "Live Streaming started",
+        "on": "Live Streaming",
         "pending": "Starting Live Stream…",
         "serviceName": "Live Streaming service",
         "signedInAs": "You are currently signed in as:",
@@ -497,7 +496,7 @@
         "live": "LIVE",
         "loggedIn": "Logged in as {{userName}}",
         "off": "Recording stopped",
-        "on": "Recording started",
+        "on": "Recording",
         "pending": "Preparing to record the meeting…",
         "rec": "REC",
         "serviceDescription": "Your recording will be saved by the recording service",

lang/main-fr.json

@@ -53,7 +53,7 @@
         "join": "Joindre",
         "joinTooltip": "Rejoindre la réunion",
         "nextMeeting": "prochaine réunion",
-        "noEvents": "Il n'y a pas d'événement à venir.",
+        "noEvents": "Il n'y a pas d’événement à venir.",
         "ongoingMeeting": "La réunion en cours",
         "permissionButton": "Afficher les réglages",
         "permissionMessage": "La permission du calendrier est requise pour afficher vos réunions dans l'application.",
@@ -80,7 +80,7 @@
         "dontShowAgain": "Ne plus me montrer ceci"
     },
     "connectingOverlay": {
-        "joiningRoom": "Connexion à la réunion ..."
+        "joiningRoom": "Connexion à la réunion…"
     },
     "connection": {
         "ATTACHED": "Attachée",
@@ -92,29 +92,25 @@
         "DISCONNECTED": "Déconnecté",
         "DISCONNECTING": "Déconnexion en cours",
         "ERROR": "Erreur",
-        "RECONNECTING": "Un problème réseau est survenue. Reconnexion en cours ...",
-        "FETCH_SESSION_ID": "Obtention d'un identifiant de session ...",
-        "GET_SESSION_ID_ERROR": "Obtenir une erreur d'identifiant de session : {{code}}",
-        "GOT_SESSION_ID": "Obtention d'un identifiant de session ... Terminée",
+        "RECONNECTING": "Un problème réseau est survenue. Reconnexion en cours...",
+        "FETCH_SESSION_ID": "Obtention d’un identifiant de session…",
+        "GET_SESSION_ID_ERROR": "Obtenir une erreur d’identifiant de session : {{code}}",
+        "GOT_SESSION_ID": "Obtention d’un identifiant de session… Terminée",
         "LOW_BANDWIDTH": "La vidéo de {{displayName}} a été désactivée pour économiser de la bande passante"
     },
     "connectionindicator": {
         "address": "Adresse :",
-        "audio_ssrc": "Audio SSRC :",
         "bandwidth": "Bande passante estimée :",
         "bitrate": "Débit :",
-        "bridgeCount": "Nombre de serveurs :",
-        "codecs": "Codecs (A/V) :",
-        "e2e_rtt": "E2E RTT :",
+        "bridgeCount": "Nombre de serveurs : ",
         "connectedTo": "Connecté à :",
         "framerate": "Images par seconde :",
-        "less": "Cacher les détails",
+        "less": "Cacher le détail",
         "localaddress": "Adresse locale :",
         "localaddress_plural": "Adresses locales :",
         "localport": "Port local :",
         "localport_plural": "Ports locaux :",
-        "maxEnabledResolution": "débit max",
-        "more": "Montrer les détails",
+        "more": "Montrer le détail",
         "packetloss": "Perte de paquets :",
         "quality": {
             "good": "Bien",
@@ -128,11 +124,10 @@
         "remoteport": "Port distant :",
         "remoteport_plural": "Ports distants :",
         "resolution": "Résolution :",
-        "savelogs": "Enregistrer les logs",
         "status": "Connexion :",
         "transport": "Transport :",
         "transport_plural": "Transports :",
-        "video_ssrc": "Video SSRC :"
+        "e2e_rtt": "E2E RTT :"
     },
     "dateUtils": {
         "earlier": "Plus tôt",
@@ -149,7 +144,7 @@
         "joinInApp": "Rejoindre la réunion en utilisant l'application",
         "launchWebButton": "Lancer dans le navigateur",
         "openApp": "Continuer vers l'application",
-        "title": "Lancement de votre réunion dans {{app}} en cours ...",
+        "title": "Lancement de votre réunion dans {{app}} en cours...",
         "tryAgainButton": "Réessayez sur le bureau"
     },
     "defaultLink": "ex. {{url}}",
@@ -185,45 +180,41 @@
         "cameraUnsupportedResolutionError": "Votre appareil ne prend pas en charge la résolution vidéo requise.",
         "Cancel": "Annuler",
         "close": "Fermer",
-        "conferenceDisconnectMsg": "Veuillez vérifier votre connexion réseau. Reconnexion dans {{seconds}} sec ...",
+        "conferenceDisconnectMsg": "Veuillez vérifier votre connexion réseau. Reconnexion dans {{seconds}} sec...",
         "conferenceDisconnectTitle": "Vous avez été déconnecté.",
-        "conferenceReloadMsg": "On essaie d'arranger ça. Reconnexion dans {{seconds}} secondes ...",
+        "conferenceReloadMsg": "On essaie d'arranger ça. Reconnexion dans {{seconds}} secondes...",
         "conferenceReloadTitle": "Malheureusement, un problème est survenu",
         "confirm": "Confirmer",
         "confirmNo": "Non",
         "confirmYes": "Oui",
-        "connectError": "Oups ! Un problème est survenu et la connexion à la conférence est impossible.",
-        "connectErrorWithMsg": "Oups ! Un problème est survenu et la connexion à la conférence est impossible : {{msg}}",
+        "connectError": "Oups ! Un problème est survenu et la connexion à la conférence est impossible.",
+        "connectErrorWithMsg": "Oups ! Un problème est survenu et la connexion à la conférence est impossible : {{msg}}",
         "connecting": "Connexion en cours",
         "contactSupport": "Contacter le support",
-        "copied": "Copié",
         "copy": "Copier",
         "dismiss": "Rejeter",
-        "displayNameRequired": "Bonjour ! Quel est votre nom ?",
+        "displayNameRequired": "Bonjour! Quel est votre nom ?",
         "done": "Terminé",
-        "e2eeDescription": "Le cryptage de Bout-en-Bout est actuellement EXPERIMENTAL. Veuillez garder à l'esprit que l'activation du cryptage de Bout-en-Bout désactivera les services fournis côté serveur tels que : l'enregistrement, la diffusion en direct et la participation par téléphone. Gardez également à l'esprit que la réunion ne fonctionnera que pour les personnes qui se joignent à partir de navigateurs prenant en charge les flux insérables.",
-        "e2eeLabel": "Activer le cryptage de Bout-en-Bout",
-        "e2eeWarning": "ATTENTION : Tous les participants de cette réunion ne semblent pas prendre en charge le chiffrement de Bout-en-Bout. Si vous activez le cryptage, ils ne pourront ni vous voir, ni vous entendre.",
         "enterDisplayName": "Merci de saisir votre nom ici",
         "error": "Erreur",
+        "grantModeratorDialog": "Êtes-vous sûr de vouloir rendre ce participant modérateur?",
+        "grantModeratorTitle": "Nommer modérateur",
         "externalInstallationMsg": "Vous devez installer notre extension de partage de bureau.",
         "externalInstallationTitle": "Extension requise",
         "goToStore": "Aller sur le webstore",
-        "gracefulShutdown": "Notre service est actuellement en maintenance. Veuillez réessayer plus tard.",
-        "grantModeratorDialog": "Êtes-vous sûr de vouloir rendre ce participant modérateur ?",
-        "grantModeratorTitle": "Nommer modérateur",
-        "IamHost": "Je suis l'hôte",
+        "gracefulShutdown": "Le service est actuellement en maintenance. Réessayez plus tard.",
+        "IamHost": "Je suis l’hôte",
         "incorrectRoomLockPassword": "Mot de passe incorrect",
         "incorrectPassword": "Nom d'utilisateur ou mot de passe incorrect",
         "inlineInstallationMsg": "Vous devez installer notre extension de partage de bureau.",
         "inlineInstallExtension": "Installer maintenant",
-        "internalError": "Oups ! Quelque chose s'est mal passée. L'erreur suivante s'est produite : {{error}}",
+        "internalError": "Oups ! Quelque chose s'est mal passée. L'erreur suivante s'est produite : {{error}}",
         "internalErrorTitle": "Erreur interne",
         "kickMessage": "Vous pouvez contacter {{participantDisplayName}} pour plus de détails.",
         "kickParticipantButton": "Expulser",
         "kickParticipantDialog": "Êtes-vous sûr(e) de vouloir expulser ce participant ?",
         "kickParticipantTitle": "Expulser ce participant ?",
-        "kickTitle": "Oups ! vous avez été expulsé(e) par {{participantDisplayName}}",
+        "kickTitle": "Oups! vous avez été expulsé(e) par {{participantDisplayName}}",
         "liveStreaming": "Direct",
         "liveStreamingDisabledForGuestTooltip": "Les invités ne peuvent démarrer la diffusion en direct.",
         "liveStreamingDisabledTooltip": "La diffusion en direct est désactivé",
@@ -232,7 +223,7 @@
         "lockTitle": "Échec du verrouillage",
         "logoutQuestion": "Voulez-vous vraiment vous déconnecter et arrêter la conférence ?",
         "logoutTitle": "Déconnexion",
-        "maxUsersLimitReached": "Le nombre maximal de participant est atteint. Le conférence est complète. Merci de contacter l'organisateur de la réunion ou réessayer plus tard !",
+        "maxUsersLimitReached": "Le nombre maximal de participant est atteint. Le conférence est complète. Merci de contacter l'organisateur de la réunion ou réessayer plus tard!",
         "maxUsersLimitReachedTitle": "Le nombre maximal de participants est atteint",
         "micConstraintFailedError": "Votre microphone ne satisfait pas certaines des contraintes nécessaires.",
         "micNotFoundError": "Le microphone n'a pas été détecté.",
@@ -257,17 +248,16 @@
         "passwordRequired": "$t(lockRoomPasswordUppercase) requis",
         "popupError": "Votre navigateur bloque les fenêtres pop-up. Veuillez autoriser les fenêtres pop-up dans les paramètres de votre navigateur.",
         "popupErrorTitle": "Pop-up bloquée",
-        "readMore": "plus",
         "recording": "Enregistrement",
         "recordingDisabledForGuestTooltip": "Les invités ne peuvent enregistrer.",
         "recordingDisabledTooltip": "L'enregistrement est désactivé.",
         "rejoinNow": "Rejoindre maintenant",
         "remoteControlAllowedMessage": "{{user}} a accepté votre demande de prise en main à distance !",
         "remoteControlDeniedMessage": "{{user}} a refusé votre demande de prise en main à distance !",
-        "remoteControlErrorMessage": "Une erreur s'est produite lors de la demande d'autorisation de prise en main à distance avec {{user}} !",
+        "remoteControlErrorMessage": "Une erreur s'est produite lors de la demande d’autorisation de prise en main à distance avec {{user}} !",
         "remoteControlRequestMessage": "Voulez-vous autoriser {{user}} à contrôler votre bureau ?",
         "remoteControlShareScreenWarning": "Si vous appuyez sur \"Autoriser\", vous allez partager votre écran !",
-        "remoteControlStopMessage": "La prise en main à distance est terminée !",
+        "remoteControlStopMessage": "La prise en main à distance est terminée!",
         "remoteControlTitle": "Contrôle de bureau à distance",
         "Remove": "Supprimer",
         "removePassword": "Supprimer le $t(lockRoomPassword)",
@@ -276,15 +266,11 @@
         "reservationError": "Erreur du système de réservation",
         "reservationErrorMsg": "Code d'erreur: {{code}}, message: {{msg}}",
         "retry": "Réessayer",
-        "screenSharingAudio": "Partager l'audio",
-        "screenSharingFailed": "Oops ! Quelque chose s'est mal passée, nous n'avons pas pu démarrer le partage d'écran !",
-        "screenSharingFailedTitle": "Echec du partage d'écran !",
-        "screenSharingPermissionDeniedError": "Oops ! Un problème est survenu avec vos autorisations de partage d'écran. Veuillez réessayer.",
-        "screenSharingFailedToInstall": "Oups ! Votre extension de partage d'écran n'a pas pu être installée.",
+        "screenSharingFailedToInstall": "Oups! Votre extension de partage d'écran n'a pas pu être installée.",
         "screenSharingFailedToInstallTitle": "L'extension de partage d'écran n'a pas pu être installée",
         "screenSharingFirefoxPermissionDeniedError": "Quelque chose s'est mal passé pendant que nous essayions de partager votre écran. S'il vous plaît assurez-vous que vous nous avez donné la permission de le faire. ",
-        "screenSharingFirefoxPermissionDeniedTitle": "Oups ! Nous ne pouvions pas démarrer le partage d'écran !",
-        "screenSharingPermissionDeniedError": "Oups ! Une erreur s'est produite avec vos autorisations d'extension de partage d'écran. Veuillez rafraîchir et réessayer.",
+        "screenSharingFirefoxPermissionDeniedTitle": "Oups! Nous ne pouvions pas démarrer le partage d'écran !",
+        "screenSharingPermissionDeniedError": "Oups! Une erreur s'est produite avec vos autorisations d'extension de partage d'écran. Veuillez rafraîchir et réessayer.",
         "sendPrivateMessage": "Vous avez récemment reçu un message privé. Aviez-vous l'intention d'y répondre en privé, ou vouliez-vous envoyer votre message au groupe ?",
         "sendPrivateMessageCancel": "Envoyer au groupe",
         "sendPrivateMessageOk": "Envoyer en privé",
@@ -292,14 +278,14 @@
         "serviceUnavailable": "Service indisponible",
         "sessTerminated": "Appel terminé",
         "Share": "Partager",
-        "shareVideoLinkError": "Veuillez renseigner un lien Youtube fonctionnel.",
+        "shareVideoLinkError": "Fournissez s'il vous plaît un lien Youtube fonctionnel.",
         "shareVideoTitle": "Partager une vidéo",
-        "shareYourScreen": "Partager votre écran",
-        "shareYourScreenDisabled": "Le partage d'écran est désactivé.",
-        "shareYourScreenDisabledForGuest": "Les invités ne peuvent pas partager leur écran.",
+        "shareYourScreen": "Partagez votre écran",
+        "shareYourScreenDisabled": "Le partage d’écran est désactivé.",
+        "shareYourScreenDisabledForGuest": "Les invités ne peuvent partager l'écran.",
         "startLiveStreaming": "Démarrer la diffusion en direct",
         "startRecording": "Commencer l'enregistrement",
-        "startRemoteControlErrorMessage": "Une erreur est survenue lors de la tentative de démarrage de la session de contrôle à distance !",
+        "startRemoteControlErrorMessage": "Une erreur est survenue lors de la tentative de démarrage de la session de contrôle à distance!",
         "stopLiveStreaming": "Arrêter la diffusion en direct",
         "stopRecording": "Arrêter l'enregistrement",
         "stopRecordingWarning": "Désirez-vous vraiment arrêter l'enregistrement ?",
@@ -317,7 +303,8 @@
         "WaitForHostMsgWOk": "La conférence <b>{{room}}</b> n'a pas encore commencé. Si vous en êtes l'hôte, veuillez appuyer sur Ok pour vous authentifier. Sinon, veuillez attendre son arrivée.",
         "WaitingForHost": "En attente de l'hôte ...",
         "Yes": "Oui",
-        "yourEntireScreen": "Votre écran entier"
+        "yourEntireScreen": "Votre écran entier",
+        "screenSharingAudio": "Partager l’audio"
     },
     "dialOut": {
         "statusMessage": "est maintenant {{status}}"
@@ -325,12 +312,6 @@
     "documentSharing": {
         "title": "Document partagé"
     },
-    "e2ee": {
-        "labelToolTip": "L'audio et la vidéo de cette conférence sont cryptés de Bout-en-Bout"
-    },
-    "embedMeeting": {
-        "title": "Intégrer cette réunion"
-    },
     "feedback": {
         "average": "Moyen",
         "bad": "Mauvais",
@@ -365,7 +346,7 @@
         "invitePhoneAlternatives": "Vous cherchez un numéro d'appel différent ?\nAfficher les numéros d'appel de la réunion: {{url}}\n\n\nSi vous appelez également via un téléphone de salle, vous pouvez vous connecter sans audio: {{silentUrl}}",
         "inviteURLFirstPartGeneral": "Vous êtes invité(e) à participer à une réunion.",
         "inviteURLFirstPartPersonal": "{{name}} vous invite à une réunion.\n",
-        "inviteURLSecondPart": "\nRejoindre la réunion :\n{{url}}\n",
+        "inviteURLSecondPart": "\nRejoindre la réunion :\n{{url}}\n",
         "liveStreamURL": "Diffusion en direct :",
         "moreNumbers": "Plus de numéros ",
         "noNumbers": "Numéros non trouvés",
@@ -422,17 +403,15 @@
         "errorLiveStreamNotEnabled": "La diffusion en direct n'est pas activée pour {{email}}. Merci de l'activer ou de vous connecter avec un compte où elle est déjà activée.",
         "expandedOff": "La diffusion en direct a été arrêtée",
         "expandedOn": "La conférence est en cours de diffusion sur YouTube.",
-        "expandedPending": "La diffusion en direct a commencé ...",
+        "expandedPending": "La diffusion en direct a commencé...",
         "failedToStart": "La diffusion n'as pas réussi à démarrer",
-        "getStreamKeyManually": "Nous n'avons pu récupérer aucun flux en direct. Essayez d'obtenir votre clé de diffusion en direct sur YouTube.",
+        "getStreamKeyManually": "Nous n'avons pu récupérer aucun flux en direct. Essayez d’obtenir votre clé de diffusion en direct sur YouTube.",
         "invalidStreamKey": "La clé de diffusion en direct n'est peut-être pas correcte.",
-        "limitNotificationDescriptionWeb": "En raison de la forte demande, votre diffusion sera limitée à {{limit}} min. Pour un streaming illimité, essayez <a href={{url}} rel='noopener noreferrer' target='_blank'> {{app}} </a>.",
-        "limitNotificationDescriptionNative": "Votre diffusion sera limitée à {{limit}} min. Pour un streaming illimité, essayez {{app}}.",
         "off": "Le Streaming a été arrêté",
         "offBy": "{{name}} a arrêté la diffusion en continu",
-        "on": "En direct",
-        "onBy": "{{name}} a démarré la diffusion en continu",
-        "pending": "Lancement du direct ...",
+        "on": "Direct",
+        "onBy": "{{name}}  démarré la diffusion en continu",
+        "pending": "Commencer le direct...",
         "serviceName": "Service de diffusion en direct",
         "signedInAs": "Vous êtes connecté en tant que :",
         "signIn": "Se connecter avec Google",
@@ -441,7 +420,7 @@
         "start": "Démarrer la diffusion en direct",
         "streamIdHelp": "Qu'est-ce que c'est ?",
         "unavailableTitle": "La diffusion est indisponible",
-        "youtubeTerms": "Conditions d'utilisation de YouTube",
+        "youtubeTerms": "Conditions d’utilisation de YouTube",
         "googlePrivacyPolicy": "Politique de confidentialité de Google"
     },
     "localRecording": {
@@ -492,24 +471,20 @@
         "moderator": "Droits modérateur accordés !",
         "muted": "Vous avez commencé la conversation en muet.",
         "mutedTitle": "Vous êtes en muet !",
-        "mutedRemotelyTitle": "Votre micro a été coupé par {{participantDisplayName}} !",
+        "mutedRemotelyTitle": "Votre micro a été coupé par {{participantDisplayName}} !",
         "mutedRemotelyDescription": "Vous pouvez toujours activer votre micro pour prendre la parole. Désactivez votre micro quand vous terminez pour éviter les bruits parasites.",
         "passwordRemovedRemotely": "Le $t(lockRoomPassword) a été supprimé par un autre participant",
         "passwordSetRemotely": "Un $t(lockRoomPassword) a été défini par un autre participant",
         "raisedHand": "{{name}} aimerait prendre la parole.",
         "somebody": "Quelqu'un",
-        "startSilentTitle": "Vous avez rejoint sans sortie audio !",
+        "startSilentTitle": "Vous avez rejoint sans sortie audio !",
         "startSilentDescription": "Rejoignez la réunion de nouveau pour activer l'audio",
-        "suboptimalBrowserWarning": "Nous craignons que votre expérience de réunion en ligne ne soit bonne ici. Nous cherchons des moyens d'améliorer cela, mais d'ici-là, essayez d'utiliser l'un des <a href='{{recommendedBrowserPageLink}}' target='_blank'>navigateurs supportés</a>.",
+        "suboptimalBrowserWarning": "Nous craignons que votre expérience de réunion en ligne ne soit bonne ici. Nous cherchons des moyens d’améliorer cela, mais d’ici-là, essayez d’utiliser l’un des <a href='{{recommendedBrowserPageLink}}' target='_blank'>navigateurs supportés</a>.",
         "suboptimalExperienceTitle": "Avertissement du navigateur",
         "unmute": "Rétablir le son",
         "newDeviceCameraTitle": "Nouvelle caméra détectée",
         "newDeviceAudioTitle": "Nouveau périphérique audio détecté",
-        "newDeviceAction": "Utiliser",
-        "OldElectronAPPTitle": "Vulnérabilité de sécurité !",
-        "oldElectronClientDescription1": "Vous semblez utiliser une ancienne version du client Jitsi Meet qui présente des vulnérabilités de sécurité connues. Veuillez vous assurer de mettre à jour vers notre ",
-        "oldElectronClientDescription2": "dernière build",
-        "oldElectronClientDescription3": " rapidement !"
+        "newDeviceAction": "Utiliser"
     },
     "passwordSetRemotely": "défini par un autre participant",
     "passwordDigitsOnly": "Jusqu'à {{number}} chiffres",
@@ -518,40 +493,19 @@
         "audioAndVideoError": "Erreur audio et video:",
         "audioOnlyError": "Erreur audio:",
         "audioTrackError": "N'a pas pu créer la piste audio.",
-        "calling": "Appel",
         "callMe": "Appelez-moi",
-        "callMeAtNumber": "Appelez-moi à ce numéro :",
-        "configuringDevices": "Configuration des appareils ...",
-        "connectedWithAudioQ": "Êtes-vous connecté avec le microphone ?",
-        "connection": {
-           "good": "Votre connexion Internet est bonne !",
-           "nonOptimal": "Votre connexion n'est pas optimale",
-           "poor": "Vous avez une mauvaise connexion"
-        },
-        "connectionDetails": {
-          "audioClipping": "Attendez vous à ce que votre audio soit coupé.",
-          "audioHighQuality": "Votre audio sera de bonne qualité.",
-          "audioLowNoVideo": "Attendez vous à une faible qualité audio et aucune vidéo",
-          "goodQuality": "Impressionnant ! La qualité de vos médias sera excellente",
-          "noMediaConnectivity": "Nous n'avons pas pu trouver un moyen d'établir une connectivité multimédia pour ce test. Cela est généralement causé par un pare-feu ou un NAT.",
-          "noVideo": "Attendez vous à ce que votre qualité vidéo soit très mauvaise.",
-          "undetectable": "Si vous ne parvenez toujours pas à passer des appels dans le navigateur, nous vous recommandons de vous assurer que vos haut-parleurs, microphone et caméra sont correctement configurés, que vous avez accordé à votre navigateur les droits d'utiliser votre microphone et votre caméra et que la version de votre navigateur est à jour. Si vous rencontrez toujours des difficultés pour appeler, vous devez contacter le développeur de l'application Web.",
-          "veryPoorConnection": "Attendez vous à ce que la qualité de votre appel soit très mauvaise",
-          "videoFreezing": "Attendez vous à ce que votre vidéo saute, soit noire, et pixelisée.",
-          "videoHighQuality": "Votre vidéo sera de bonne qualité",
-          "videoLowQuality": "Votre vidéo sera de basse qualité en terme d'images par seconde et de résolution.",
-          "videoTearing": "Attendez vous à ce que votre vidéo soit pixélisée ou contienne des artefacts visuels."
-        },
+        "callMeAtNumber": "Appelez-moi à ce numéro:",
+        "configuringDevices": "Configuration des appareils...",
+        "connectedWithAudioQ": "Êtes-vous connecté avec le microphone?",
         "copyAndShare": "Copier & partager le lien",
         "dialInMeeting": "Participez à la réunion",
-        "dialInPin": "Participez à la réunion et saisir le code PIN :",
+        "dialInPin": "Participez à la réunion et saisir le code PIN:",
         "dialing": "Numérotation",
         "doNotShow": "Ne plus afficher ceci",
         "errorDialOut": "Impossible de composer le numéro",
         "errorDialOutDisconnected": "Impossible de composer le numéro. Déconnecté",
         "errorDialOutFailed": "Impossible de composer le numéro. L'appel a échoué",
         "errorDialOutStatus": "Erreur lors de l'obtention de l'état d'appel sortant",
-        "errorMissingName": "Veuillez entrer votre nom pour entrer en conférence",
         "errorStatusCode": "Erreur de numérotation, code d'état: {{status}}",
         "errorValidation": "La validation du numéro a échoué",
         "iWantToDialIn": "Je veux me connecter",
@@ -563,8 +517,6 @@
         "lookGood": "Il semble que votre microphone fonctionne correctement",
         "or": "ou",
         "calling": "Appel",
-        "premeeting": "Pré-séance",
-        "showScreen": "Activer l'écran de pré-séance",
         "startWithPhone": "Commencez avec l'audio du téléphone",
         "screenSharingError": "Erreur de partage d'écran:",
         "videoOnlyError": "Erreur vidéo:",
@@ -573,17 +525,17 @@
     },
     "presenceStatus": {
         "busy": "Occupé",
-        "calling": "Appel ...",
+        "calling": "Appel...",
         "connected": "Connecté",
-        "connecting": "Connexion en cours ...",
-        "connecting2": "Connexion en cours* ...",
+        "connecting": "Connexion en cours...",
+        "connecting2": "Connexion en cours*...",
         "disconnected": "Déconnecté",
         "expired": "Expiré",
         "ignored": "Ignoré",
-        "initializingCall": "Lancement de l'appel ...",
+        "initializingCall": "Lancement de l'appel...",
         "invited": "Invité(e)",
         "rejected": "Rejeté",
-        "ringing": "Appel en cours ..."
+        "ringing": "Appel en cours..."
     },
     "profile": {
         "setDisplayNameLabel": "Choisissez un pseudo",
@@ -594,45 +546,37 @@
     "raisedHand": "Aimerait prendre la parole",
     "recording": {
         "authDropboxText": "Téléchargement vers Dropbox",
-        "availableSpace": "Espace disponible : {{spaceLeft}} Mo (approximativement {{duration}} minutes d'enregistrement)",
+        "availableSpace": "Espace disponible : {{spaceLeft}} Mo (approximativement {{duration}} minutes d'enregistrement)",
         "beta": "BETA",
         "busy": "Nous sommes en train de libérer les ressources d'enregistrement. Réessayez dans quelques minutes.",
         "busyTitle": "Tous les enregistreurs sont actuellement occupés",
         "error": "Échec de l'enregistrement. Veuillez réessayer.",
         "expandedOff": "L'enregistrement a été arrêté",
         "expandedOn": "Cette conférence est actuellement en cours d'enregistrement.",
-        "expandedPending": "Démarrage de l'enregistrement ...",
+        "expandedPending": "Démarrage de l'enregistrement...",
         "failedToStart": "L'enregistrement n'as pas réussi à démarrer",
         "fileSharingdescription": "Partager l'enregistrement avec les participants de la réunion",
-        "limitNotificationDescriptionWeb": "En raison d'une forte demande, votre enregistrement sera limité à {{limit}} min. Pour des enregistrements illimités, essayez <a href={{url}} rel='noopener noreferrer' target='_blank'> {{app}} </a>.",
-        "limitNotificationDescriptionNative": "En raison d'une forte demande, votre enregistrement sera limité à {{limit}} min. Pour des enregistrements illimités, essayez <3> {{app}} </3>.",
         "live": "DIRECT",
         "loggedIn": "Connecté en tant que {{userName}}",
         "off": "Enregistrement arrêté",
         "offBy": "{{name}} a arrêté l'enregistrement",
         "on": "Enregistrement",
         "onBy": "{{name}} a démarré l'enregistrement",
-        "pending": "Préparation de l'enregistrement de la réunion ...",
+        "pending": "Préparation de l'enregistrement de la réunion...",
         "rec": "REC",
         "serviceDescription": "Votre enregistrement sera enregistré par le service dédié",
         "serviceName": "Service d'enregistrement",
         "signIn": "Se connecter",
         "signOut": "Se déconnecter",
-        "unavailable": "Oups ! Le {{serviceName}} est actuellement indisponible. Nous tentons de résoudre le problème. Veuillez réessayer plus tard.",
+        "unavailable": "Oups! Le {{serviceName}} est actuellement indisponible. Nous tentons de résoudre le problème. Veuillez réessayer plus tard.",
         "unavailableTitle": "Enregistrement indisponible"
     },
     "sectionList": {
         "pullToRefresh": "Tirer pour recharger"
     },
-    "security": {
-        "about": "Vous pouvez ajouter un mot de passe à votre réunion. Les participants devront fournir le mot de passe avant qu'ils soient autorisés à rejoindre la réunion.",
-        "aboutReadOnly": "Les modérateurs peuvent ajouter un mot de passe à la réunion. Les participants devront fournir le mot de passe avant qu'ils soient autorisés à rejoindre la réunion.",
-        "insecureRoomNameWarning": "Le nom de la salle est peu sûr. Des participants non désirés peuvent rejoindre votre réunion. Pensez à sécuriser votre réunion en cliquant sur le bouton de sécurité.",
-        "securityOptions": "Options de sécurité"
-    },
     "settings": {
         "calendar": {
-            "about": "L'intégration de {{appName}} avec votre calendrier permet d'accéder de manière sécurisée aux événement à venir.",
+            "about": "L'intégration de {{appName}} avec votre calendrier permet d’accéder de manière sécurisée aux événement à venir.",
             "disconnect": "Se déconnecter",
             "microsoftSignIn": "Se connecter avec Microsoft",
             "signedIn": "Accès aux événements du calendrier {{email}}. Cliquez sur le bouton se déconnecter ci-dessous pour arrêter l'accès aux événements du calendrier.",
@@ -642,7 +586,6 @@
         "followMe": "Tout le monde me suit",
         "language": "Langue",
         "loggedIn": "Connecté en tant que {{name}}",
-        "microphones": "Microphones",
         "moderator": "Modérateur",
         "more": "Plus",
         "name": "Nom",
@@ -650,23 +593,21 @@
         "selectAudioOutput": "Sortie audio",
         "selectCamera": "Caméra",
         "selectMic": "Microphone",
-        "speakers": "Intervenants",
         "startAudioMuted": "Tout le monde commence en muet",
         "startVideoMuted": "Tout le monde commence sans vidéo",
-        "title": "Paramètres"
+        "title": "Paramètres",
+        "microphones": "Microphones",
+        "speakers": "Intervenants"
     },
     "settingsView": {
         "advanced": "Avancé",
         "alertOk": "D'accord",
-        "alertCancel": "Annuler",
         "alertTitle": "Avertissement",
         "alertURLText": "L'URL du serveur est invalide",
         "buildInfoSection": "Informations de build",
         "conferenceSection": "Conférence",
         "disableCallIntegration": "Désactiver l'intégration d'appels native",
         "disableP2P": "Désactiver le mode pair à pair",
-        "disableCrashReporting": "Désactiver les rapports de plantage",
-        "disableCrashReportingWarning": "Etes-vous certain de vouloir désactiver les rapports de plantage ? Le paramètre sera effectif après le redémarrage de l'application.",
         "displayName": "Pseudo",
         "email": "Email",
         "header": "Paramètres",
@@ -692,7 +633,6 @@
     },
     "startupoverlay": {
         "policyText": " ",
-        "genericTitle": "La conférence a besoin d'utiliser votre microphone et votre caméra.",
         "title": "{{app}} a besoin d'accéder à votre microphone et votre caméra."
     },
     "suspendedoverlay": {
@@ -709,41 +649,37 @@
             "chat": "Afficher/masquer la discussion instantanée",
             "document": "Activer/désactiver le document partagé",
             "download": "Télécharger nos applications",
-            "embedMeeting": "Intégrer la réunion",
             "feedback": "Laisser des commentaires",
             "fullScreen": "Activer/désactiver le plein écran",
-            "grantModerator": "Nommer modérateur",
             "hangup": "Quitter la conversation",
             "help": "Aide",
             "invite": "Inviter des participants",
             "kick": "Expulser le participant",
-            "lobbyButton": "Activer / désactiver le mode lobby",
             "localRecording": "Activer/désactiver les contrôles d'enregistrement local",
             "lockRoom": "Activer/Désactiver le mot de passe de la réunion",
             "moreActions": "Activer/désactiver le menu d'actions supplémentaires",
             "moreActionsMenu": "Menu d'actions supplémentaires",
-            "moreOptions": "Voir plus d'options",
             "mute": "Activer/désactiver l'audio",
-            "muteEveryone": "Rendre muet tout le monde",
             "pip": "Activer/désactiver le mode Picture in Picture",
             "privateMessage": "Envoyer un message privé",
             "profile": "Éditer votre profil",
             "raiseHand": "Lever/baisser la main",
             "recording": "Activer/désactiver l'enregistrement",
             "remoteMute": "Désactiver le micro du participant",
-            "security": "Options de sécurité",
             "Settings": "Afficher/masquer le menu des paramètres",
             "sharedvideo": "Démarrer/arrêter le partage de vidéo YouTube",
             "shareRoom": "Inviter quelqu'un",
-            "shareYourScreen": "Activer/désactiver le partage d'écran",
+            "shareYourScreen": "Activer/désactiver le partage d’écran",
             "shortcuts": "Afficher/masquer les raccourcis",
             "show": "Afficher en premier plan",
             "speakerStats": "Afficher/cacher les statistiques de parole",
             "tileView": "Activer/désactiver la vue mosaïque",
             "toggleCamera": "Changer de caméra",
-            "toggleFilmstrip": "Basculer de pellicule",
             "videomute": "Activer/désactiver la vidéo",
-            "videoblur": "Activer/désactiver le flou de la vidéo"
+            "videoblur": "Activer/désactiver le flou de la vidéo",
+            "muteEveryone": "Mettre tout le monde en sourdine",
+            "moreOptions": "Afficher plus d'options",
+            "toggleFilmstrip": "Basculer la bande de film"
         },
         "addPeople": "Ajouter des personnes à votre appel",
         "audioOnlyOff": "Désactiver le mode bande passante réduite",
@@ -756,8 +692,6 @@
         "documentClose": "Fermer le document partagé",
         "documentOpen": "Ouvrir le document partagé",
         "download": "Télécharger nos applications",
-        "e2ee": "Cryptage de Bout-en-Bout",
-        "embedMeeting": "Intégrer la réunion",
         "enterFullScreen": "Afficher en plein écran",
         "enterTileView": "Accéder au mode mosaïque",
         "exitFullScreen": "Quitter le mode plein écran",
@@ -778,8 +712,6 @@
         "noAudioSignalTitle": "Il n'y a pas de signal provenant de votre micro !",
         "noAudioSignalDesc": "Si vous n'avez pas délibérément coupé le son des paramètres du système ou du matériel, envisagez de changer de périphérique utilisé.",
         "noAudioSignalDescSuggestion": "Si vous n'avez pas délibérément coupé le son des paramètres du système ou du matériel, pensez à utiliser le périphérique suivant :",
-        "noAudioSignalDialInDesc": "Vous pouvez également appeler en utilisant :",
-        "noAudioSignalDialInLinkDesc": "Numéros d'appel",
         "noisyAudioInputTitle": "Votre microphone semble être bruyant !",
         "noisyAudioInputDesc": "Il semble que votre microphone fasse du bruit, veuillez le couper ou changer de périphérique.",
         "openChat": "Ouvrir le chat",
@@ -788,7 +720,6 @@
         "profile": "Éditer votre profil",
         "raiseHand": "Lever / Baisser la main",
         "raiseYourHand": "Lever la main",
-        "security": "Options de sécurité",
         "Settings": "Paramètres",
         "sharedvideo": "Partager une vidéo YouTube",
         "shareRoom": "Inviter quelqu'un",
@@ -804,7 +735,9 @@
         "toggleCamera": "Changer de caméra",
         "videomute": "Démarrer / Arrêter la caméra",
         "startvideoblur": "Flouter mon arrière plan",
-        "stopvideoblur": "Désactiver le flou d'arrière-plan"
+        "stopvideoblur": "Désactiver le flou d'arrière-plan",
+        "noAudioSignalDialInDesc": "Vous pouvez également composer un numéro en utilisant :",
+        "noAudioSignalDialInLinkDesc": "Numéros d'appel"
     },
     "transcribing": {
         "ccButtonTooltip": "Activer/Désactiver les sous-titres",
@@ -813,7 +746,7 @@
         "failedToStart": "Échec de démarrage de la transcription",
         "labelToolTip": "La transcription de la réunion est en cours",
         "off": "La transcription désactivée",
-        "pending": "Préparation de la transcription de la réunion ...",
+        "pending": "Préparation de la transcription de la réunion...",
         "start": "Afficher/masquer les sous-titres",
         "stop": "Désactiver le sous-titrage",
         "tr": "TR"
@@ -842,7 +775,7 @@
     },
     "videoStatus": {
         "audioOnly": "VOIX",
-        "audioOnlyExpanded": "Vous êtes en mode bande passante réduite. Dans ce mode, vous ne recevrez que le partage audio et le partage d'écran.",
+        "audioOnlyExpanded": "Vous êtes en mode bande passante réduite. Dans ce mode, vous ne recevrez que le partage audio et le partage d’écran.",
         "callQuality": "Qualité vidéo",
         "hd": "HD",
         "hdTooltip": "Regardez la vidéo en haute définition",
@@ -885,27 +818,22 @@
         "connectCalendarButton": "Connecter votre calendrier",
         "connectCalendarText": "Connectez-vous à votre calendrier pour afficher toutes les réunions {{app}}. Ajoutez également les réunions de {{provider}} à votre calendrier et démarrez-les d'un simple clic.",
         "enterRoomTitle": "Démarrer une nouvelle réunion",
-        "getHelp": "Obtenir de l'aide",
+        "roomNameAllowedChars": "Le nom de la réunion ne doit contenir aucun de ces caractères : ?, &, :, ', \", %, #.",
         "go": "Créer",
         "goSmall": "Créer",
-        "headerTitle": "Jitsi Meet",
-        "headerSubtitle": "Conférences sécurisées et de haute qualité",
-        "info": "Infos",
         "join": "CRÉER / REJOINDRE",
-        "jitsiOnMobile": "Jitsi sur mobile – télécharger notre application et démarrez des conférences de n'import où",
-        "moderatedMessage": "Ou <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">réserver une URL de réunion</a> à l'avance et où vous êtes le seul modérateur.",
+        "info": "Infos",
         "privacy": "Confidentialité",
         "recentList": "Récent",
         "recentListDelete": "Supprimer",
         "recentListEmpty": "Votre liste récente est actuellement vide. Discuter avec votre équipe et vous trouverez toutes vos réunions récentes ici.",
-        "reducedUIText": "Bienvenue sur {{app}} !",
-        "roomNameAllowedChars": "Le nom de la réunion ne doit contenir aucun de ces caractères : ?, &, :, ', \", %, #.",
+        "reducedUIText": "Bienvenue sur {{app}} !",
         "roomname": "Saisissez un nom de salle",
         "roomnameHint": "Entrez le nom ou l'URL de la salle que vous souhaitez rejoindre. Vous pouvez faire un nom, laissez les gens que vous rencontrerez le savoir afin qu'ils entrent le même nom.",
         "sendFeedback": "Envoyer votre avis",
-        "startMeeting": "Démarrer la conférence",
         "terms": "Termes",
-        "title": "Système de vidéoconférence sécurisé, riche en fonctionnalités et gratuit"
+        "title": "Système de vidéoconférence sécurisé, riche en fonctionnalités et gratuit",
+        "getHelp": "Obtenir de l'aide"
     },
     "lonelyMeetingExperience": {
         "button": "Inviter d'autres personnes",
@@ -915,36 +843,37 @@
         "header": "Centre d'aide"
     },
     "lobby": {
-        "knockingParticipantList": "Liste des participants en attente",
+        "knockingParticipantList" : "Liste des participants en attente",
         "allow": "Autoriser",
         "backToKnockModeButton": "Aucun mot de passe, demander à rejoindre plutôt",
-        "dialogTitle": "Mode salle d'attente",
-        "disableDialogContent": "Le mode salle d'attente est actuellement activé. Cette fonctionnalité garantit que les participants indésirables ne peuvent pas rejoindre votre réunion. Souhaitez-vous la désactiver ?",
+        "dialogTitle": "Mode lobby",
+        "disableDialogContent": "Le mode lobby est actuellement activé. Cette fonctionnalité garantit que les participants indésirables ne peuvent pas rejoindre votre réunion. Souhaitez-vous la désactiver ?",
         "disableDialogSubmit": "Désactiver",
         "emailField": "Saisissez votre adresse email",
         "enableDialogPasswordField": "Définir le mot de passe (optionnel)",
         "enableDialogSubmit": "Activer",
-        "enableDialogText": "Le mode salle d'attente vous permet de protéger votre réunion en autorisant les personnes à entrer qu'après l'approbation formelle d'un modérateur.",
+        "enableDialogText": "Le mode lobby vous permet de protéger votre réunion en autorisant les personnes à entrer qu'après l'approbation formelle d'un modérateur.",
         "enterPasswordButton": "Saisissez un mot de passe de réunion",
         "enterPasswordTitle": "Saisissez le mot de passe pour rejoindre la réunion",
         "invalidPassword": "Mot de passe invalide",
         "joiningMessage": "Vous allez rejoindre une réunion dès que quelqu'un aura accepté votre demande",
-        "joinWithPasswordMessage": "Tentative de rejoindre avec mot de passe, patientez s'il vous plait ...",
+        "joinWithPasswordMessage": "Tentative de rejoindre avec mot de passe, patientez s'il vous plait...",
         "joinRejectedMessage": "Votre requête pour rejoindre une réunion a été refusée par un modérateur.",
         "joinTitle": "Rejoindre une réunion",
-        "joiningTitle": "Demander à rejoindre une réunion ...",
-        "joiningWithPasswordTitle": "Rejoindre avec mot de passe ...",
+        "joiningTitle": "Demander à rejoindre une réunion...",
+        "joiningWithPasswordTitle": "Rejoindre avec mot de passe...",
         "knockButton": "Demander à rejoindre",
         "knockTitle": "Quelqu'un souhaite rejoindre la réunion",
         "nameField": "Saisissez votre nom",
-        "notificationLobbyAccessDenied": "{{targetParticipantName}} a été refusé par {{originParticipantName}}",
-        "notificationLobbyAccessGranted": "{{targetParticipantName}} a été accepté par {{originParticipantName}}",
-        "notificationLobbyDisabled": "Lobby a été désactivé par {{originParticipantName}}",
-        "notificationLobbyEnabled": "Lobby a été activé par {{originParticipantName}}",
-        "notificationTitle": "Lobby",
         "passwordField": "Saisissez le mot de passe de la réunion",
         "passwordJoinButton": "Rejoindre",
         "reject": "Refuser",
-        "toggleLabel": "Activer la salle d'attente"
+        "toggleLabel": "Activer le lobby"
+    },
+    "security": {
+        "about": "Vous pouvez ajouter un mot de passe à votre réunion. Les participants devront fournir le mot de passe avant qu'ils soient autorisés à rejoindre la réunion.",
+        "aboutReadOnly": "Les modérateurs peuvent ajouter un mot de passe à la réunion. Les participants devront fournir le mot de passe avant qu'ils soient autorisés à rejoindre la réunion.",
+        "insecureRoomNameWarning": "Le nom de la salle est peu sûr. Des participants non désirés peuvent rejoindre votre réunion. Pensez à sécuriser votre réunion en cliquant sur le bouton de sécurité.",
+        "securityOptions": "Options de sécurité"
     }
 }

lang/main-gl.json

@@ -2,7 +2,7 @@
     "addPeople": {
         "add": "Convidar",
         "countryNotSupported": "Aínda non é posíbel chamar a este destino",
-        "countryReminder": "Quere chamar fóra dos EEUU? Asegúrese de comezar co código de país!",
+        "countryReminder": "Chamar fóra dos EE.UU. ? Asegúrese de comezar co código de país!",
         "disabled": "Non pode convidar xente.",
         "failedToAdd": "Produciuse un erro ao engadir participantes",
         "footerText": "As chamadas están desactivadas",
@@ -62,7 +62,7 @@
     "chromeExtensionBanner": {
         "installExtensionText": "Instala a extensión para a integración con Google Calendar e Office 365",
         "buttonText": "Instalar Extensión Chrome",
-        "dontShowAgain": "Non mostrar isto máis"
+        "dontShowAgain": ""
     },
     "connectingOverlay": {
         "joiningRoom": "Está a conectar coa reunión…"
@@ -632,8 +632,8 @@
         "noAudioSignalTitle": "Non hai sinal de entrada desde o seu micro!",
         "noAudioSignalDesc": "Se vostede non o silenciou adrede na configuración do seu sistema ou hardware, considere cambiar de dispositivo.",
         "noAudioSignalDescSuggestion": "Se vostede non o silenciou adrede na configuración do sistema ou no hardware, considere utilizar o seguinte dispositivo:",
-        "noisyAudioInputTitle": "Parece que seu micrófono fai moito ruído",
-        "noisyAudioInputDesc": "Parece que o seu micrófono está a crear ruído. Considere a posibilidade de calalo ou de cambiar de dispositivo",
+        "noisyAudioInputTitle": "",
+        "noisyAudioInputDesc": "",
         "openChat": "Abrir chat",
         "pip": "Entrar no modo Picture-in-Picture",
         "privateMessage": "Enviar mensaxe privada",
@@ -716,7 +716,7 @@
         "moderator": "Moderador",
         "mute": "O participante está silenciado",
         "muted": "Silenciado",
-        "remoteControl": "Iniciar / Deter control remoto",
+        "remoteControl": "",
         "show": "Amosar en primeiro plano",
         "videomute": "O participante parou a cámara"
     },

lang/main-ko.json

@@ -2,7 +2,7 @@
     "addPeople": {
         "add": "초대",
         "addContacts": "연락처로 초대하세요",
-        "copyInvite": "회의 초대 복사",
+        "copyInvite": "호의 초대 복사",
         "copyLink": "회의 링크 복사",
         "copyStream": "라이브 스트리밍 링크 복사",
         "countryNotSupported": "아직 해당 지역을 지원하지 않습니다.",
@@ -17,7 +17,7 @@
         "inviteMorePrompt": "더 많은 사람을 초대하세요",
         "linkCopied": "링크가 클립보드에 복사되었습니다.",
         "loading": "사람 및 전화번호 검색",
-        "loadingNumber": "전화번호 확인중",
+        "loadingNumber": "전화번호 확인 중",
         "loadingPeople": "초대할 사람 찾기",
         "noResults": "일치하는 검색 결과 없음",
         "noValidNumbers": "전화 번호를 입력하십시오.",
@@ -80,21 +80,21 @@
         "dontShowAgain": "다시 보지 않기"
     },
     "connectingOverlay": {
-        "joiningRoom": "회의에 연결중 ..."
+        "joiningRoom": "회의에 연결 중 ..."
     },
     "connection": {
         "ATTACHED": "첨부",
-        "AUTHENTICATING": "인증중",
+        "AUTHENTICATING": "인증 중",
         "AUTHFAIL": "인증 실패",
-        "CONNECTED": "연결됨",
-        "CONNECTING": "연결중",
+        "CONNECTED": "연결 됨",
+        "CONNECTING": "연결 중",
         "CONNFAIL": "연결 실패",
         "DISCONNECTED": "연결 끊김",
-        "DISCONNECTING": "연결 종료중",
+        "DISCONNECTING": "연결 종료 중",
         "ERROR": "에러",
-        "RECONNECTING": "네트워크 문제가 발생했습니다. 다시 연결중...",
-        "GET_SESSION_ID_ERROR": "세션 ID 가져오기 오류 : {{code}}",
-        "GOT_SESSION_ID": "세션 ID를 가져오는중 ... 완료",
+        "RECONNECTING": "네트워크 문제가 발생했습니다. 다시 연결 중...",
+        "GET_SESSION_ID_ERROR": "세션 ID 가져 오기 오류 : {{code}}",
+        "GOT_SESSION_ID": "세션 ID를 가져 오는 중 ... 완료",
         "LOW_BANDWIDTH": "대역폭을 절약하기 위해 {{displayName}}의 동영상이 중지되었습니다."
     },
     "connectionindicator": {
@@ -160,16 +160,16 @@
         },
         "add": "추가",
         "allow": "허락",
-        "alreadySharedVideoMsg": "다른 참가자가 이미 비디오를 공유하고 있습니다. 이 회의는 한 번에 하나의 공유 비디오만 허용합니다.",
-        "alreadySharedVideoTitle": "한 번에 하나의 공유 비디오만 허용됩니다",
+        "alreadySharedVideoMsg": "다른 참가자가 이미 비디오를 공유하고 있습니다. 이 회의는 한 번에 하나의 공유 비디오 만 허용합니다.",
+        "alreadySharedVideoTitle": "한 번에 하나의 공유 비디오 만 허용됩니다",
         "applicationWindow": "응용 프로그램 창",
         "Back": "뒤로가기",
         "cameraConstraintFailedError": "카메라가 필요한 제약 조건 중 일부를 만족하지 못합니다",
         "cameraNotFoundError": "카메라를 찾을 수 없습니다",
-        "cameraNotSendingData": "카메라에 액세스 할 수 없습니다. 다른 응용 프로그램이 장치를 사용하고 있는지 확인한 후 설정 메뉴에서 다른 장치를 선택하거나 응용 프로그램을 다시 로드하십시오.",
+        "cameraNotSendingData": "카메라에 액세스 할 수 없습니다. 다른 응용 프로그램이이 장치를 사용하고 있는지 확인한 후 설정 메뉴에서 다른 장치를 선택하거나 응용 프로그램을 다시로드하십시오.",
         "cameraNotSendingDataTitle": "카메라에 액세스 할 수 없습니다",
         "cameraPermissionDeniedError": "카메라 사용 권한을 부여하지 않았습니다. 회의에 계속 참여할 수 있지만 다른 참석자는 귀하를 볼 수 없습니다. 검색 주소창의 카메라 버튼을 사용하여 문제를 해결하십시오.",
-        "cameraUnknownError": "알 수 없는 이유로 카메라를 사용할 수 없습니다",
+        "cameraUnknownError": "알 수없는 이유로 카메라를 사용할 수 없습니다",
         "cameraUnsupportedResolutionError": "카메라가 필요한 비디오 해상도를 지원하지 않습니다",
         "Cancel": "취소",
         "close": "닫기",
@@ -182,7 +182,7 @@
         "confirmYes": "예",
         "connectError": "죄송합니다. 문제가 발생하여 회의에 연결할 수 없습니다",
         "connectErrorWithMsg": "죄송합니다. 뭔가 잘못되어 회의에 연결할 수 없습니다: {{msg}}",
-        "connecting": "연결중",
+        "connecting": "연결 중",
         "contactSupport": "지원 연락처",
         "copy": "복사",
         "dismiss": "",
@@ -190,7 +190,7 @@
         "done": "완료",
         "enterDisplayName": "당신의 이름을 입력해주세요.",
         "error": "에러",
-        "externalInstallationMsg": "데스크톱 공유 확장 프로그램을 설치해야 합니다",
+        "externalInstallationMsg": "데스크톱 공유 확장 프로그램을 설치해야합니다",
         "externalInstallationTitle": "확장 프로그램이 필요합니다",
         "goToStore": "웹 스토어로 이동",
         "gracefulShutdown": "서비스는 현재 유지 관리를 위해 중단되었습니다. 나중에 다시 시도 해주십시오.",
@@ -227,7 +227,7 @@
         "muteParticipantDialog": "",
         "muteParticipantTitle": "이 참가자를 음소거 하시겠습니까?",
         "Ok": "확인",
-        "passwordLabel": "잠긴 회의입니다. 회의에 참여하려면 비밀번호를 입력하세요.",
+        "passwordLabel": "잠긴 회의 입니다. 회의에 참여하려면 비밀번호를 입력하세요.",
         "passwordNotSupported": "회의 비밀번호 설정은 지원되지 않습니다",
         "passwordNotSupportedTitle": "비밀번호 미지원",
         "passwordRequired": "비밀번호 필수",
@@ -285,8 +285,8 @@
         "transcribing": "",
         "unlockRoom": "회의 비밀번호 제거",
         "userPassword": "사용자 비밀번호",
-        "WaitForHostMsg": "<b>{{room}}</b> 회의가 시작되지 않았습니다. 호스트인 경우 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
-        "WaitForHostMsgWOk": "<b>{{room}}</b> 회의가 아직 시작되지 않았습니다. 호스트인 경우 확인을 눌러 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
+        "WaitForHostMsg": "<b>{{room}}</b> 회의가 시작되지 않았습니다. 호스트 인 경우 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
+        "WaitForHostMsgWOk": "<b>{{room}}</b> 회의가 아직 시작되지 않았습니다. 호스트 인 경우 확인을 눌러 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
         "WaitingForHost": "호스트를 기다리는 중입니다…",
         "Yes": "예",
         "yourEntireScreen": "전체 화면"
@@ -371,8 +371,7 @@
         "toggleFilmstrip": "동영상 표시 또는 숨기기",
         "toggleScreensharing": "카메라와 화면 공유간에 전환",
         "toggleShortcuts": "도움말 메뉴 표시 또는 숨기기",
-        "videoMute": "카메라 시작 또는 중지",
-        "videoQuality": "비디오 품질"
+        "videoMute": "카메라 시작 또는 중지"
     },
     "liveStreaming": {
         "busy": "스트리밍 자원을 확보하기 위해 노력하고 있습니다. 몇 분 후에 다시 시도하십시오.",
@@ -383,7 +382,7 @@
         "enterStreamKey": "YouTube 실시간 스트리밍 키를 입력하십시오",
         "error": "실시간 스트리밍에 실패했습니다. 다시 시도하십시오.",
         "errorAPI": "YouTube 방송에 액세스하는 중에 오류가 발생했습니다. 다시 로그인하십시오.",
-        "errorLiveStreamNotEnabled": "{{email}}에 의해 라이브 스트리밍이 활성화되지 않았습니다. 라이브 스트리밍을 활성화하거나 라이브 스트리밍이 활성화된 계정으로 로그인하십시오.",
+        "errorLiveStreamNotEnabled": "{{email}}에 의해 라이브 스트리밍이 활성화되지 않았습니다. 라이브 스트리밍을 활성화하거나 라이브 스트리밍이 활성화 된 계정으로 로그인하십시오.",
         "expandedOff": "라이브 스트리밍이 중지되었습니다",
         "expandedOn": "현재 회의가 YouTube로 스트리밍되고 있습니다.",
         "expandedPending": "라이브 스트리밍이 시작됩니다 ...",
@@ -472,17 +471,17 @@
     "poweredby": "powered by",
     "presenceStatus": {
         "busy": "바쁨",
-        "calling": "전화 거는중",
-        "connected": "연결됨",
-        "connecting": "연결중",
-        "connecting2": "연결중*",
+        "calling": "전화 거는 중",
+        "connected": "연결 됨",
+        "connecting": "연결 중",
+        "connecting2": "연결 중*",
         "disconnected": "연결 끊김",
-        "expired": "만료됨",
-        "ignored": "무시됨",
-        "initializingCall": "통화 초기화중",
-        "invited": "초대됨",
-        "rejected": "거부됨",
-        "ringing": "전화중"
+        "expired": "만료 됨",
+        "ignored": "무시 됨",
+        "initializingCall": "통화 초기화 중",
+        "invited": "초대 됨",
+        "rejected": "거부 됨",
+        "ringing": "전화 중"
     },
     "profile": {
         "setDisplayNameLabel": "표시 이름 설정",
@@ -495,10 +494,10 @@
         "availableSpace": "사용 가능한 공간 : {{spaceLeft}}MB (약 {{duration}}분 녹화)",
         "beta": "베타",
         "busy": "레코딩 자원을 확보하고 있습니다. 몇 분 후에 다시 시도하십시오.",
-        "busyTitle": "모든 레코더가 현재 사용중입니다",
+        "busyTitle": "모든 레코더가 현재 사용 중입니다",
         "error": "레코딩이 실패했습니다. 다시 시도하십시오.",
         "expandedOff": "레코딩이 중지됨",
-        "expandedOn": "회의가 현재 녹화중입니다.",
+        "expandedOn": "회의가 현재 녹화 중입니다.",
         "expandedPending": "녹화가 시작됩니다 ...",
         "failedToStart": "레코딩을 시작하지 못했습니다",
         "fileSharingdescription": "회의 참가자와 녹음 공유",
@@ -619,7 +618,7 @@
         "audioOnlyOff": "음성전용 모드 끄기",
         "audioOnlyOn": "음성전용 모드 끄기",
         "audioRoute": "음성 장비 선택하기",
-        "authenticate": "인증중",
+        "authenticate": "인증 중",
         "callQuality": "품질 설정하기",
         "chat": "대화 열기/닫기",
         "closeChat": "대화 닫기",
@@ -666,7 +665,7 @@
     "transcribing": {
         "ccButtonTooltip": "자막 시작/종료",
         "error": "레코딩이 실패했습니다. 다시 시도하십시오.",
-        "expandedLabel": "현재 스크립트 작성중",
+        "expandedLabel": "현재 스크립트 작성 중",
         "failedToStart": "스크립트 작성을 시작하지 못했습니다.",
         "labelToolTip": "회의가 기록되고 있습니다.",
         "off": "스크립트 작성이 중지되었습니다.",
@@ -699,7 +698,7 @@
     },
     "videoStatus": {
         "audioOnly": "오디오 전용",
-        "audioOnlyExpanded": "낮은 대역폭 모드에 있습니다. 이 모드에서는 오디오 및 화면 공유만 수신합니다.",
+        "audioOnlyExpanded": "낮은 대역폭 모드에 있습니다. 이 모드에서는 오디오 및 화면 공유 만 수신합니다.",
         "callQuality": "비디오 품질",
         "hd": "HD",
         "highDefinition": "고해상도",