chore(rn,versions) set mobile app and SDK versions

The implemented options are the call handle and UUID.

.eslintignore

@@ -7,6 +7,7 @@ flow-typed/*
 libs/*
 resources/*
 react/features/stream-effects/virtual-background/vendor/*
+load-test/*
 
 # ESLint will by default ignore its own configuration file. However, there does
 # not seem to be a reason why we will want to risk being inconsistent with our

android/app/build.gradle

@@ -122,7 +122,7 @@ gradle.projectsEvaluated {
         android.applicationVariants.all { variant ->
             variant.outputs.each { output ->
                 output.getProcessManifestProvider().get().doLast {
-                    def outputDir = manifestOutputDirectory.get().asFile
+                    def outputDir = multiApkManifestOutputDirectory.get().asFile
                     def manifestPath = new File(outputDir, 'AndroidManifest.xml')
                     def charset = 'UTF-8'
                     def text

android/gradle.properties

@@ -25,5 +25,5 @@ android.enableDexingArtifactTransform.desugaring=false
 android.useAndroidX=true
 android.enableJetifier=true
 
-appVersion=21.0.0
-sdkVersion=3.2.0
+appVersion=21.2.0
+sdkVersion=3.5.0

android/sdk/build.gradle

@@ -70,7 +70,6 @@ dependencies {
     implementation project(':react-native-default-preference')
     implementation project(':react-native-immersive')
     implementation project(':react-native-keep-awake')
-    implementation project(':react-native-linear-gradient')
     implementation project(':react-native-sound')
     implementation project(':react-native-svg')
     implementation project(':react-native-webrtc')

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

@@ -36,8 +36,17 @@ public class BroadcastAction {
 
         for (String key : this.data.keySet()) {
             try {
-                // TODO add support for different types of objects
-                nativeMap.putString(key, this.data.get(key).toString());
+                if (this.data.get(key) instanceof Boolean) {
+                    nativeMap.putBoolean(key, (Boolean) this.data.get(key));
+                } else if (this.data.get(key) instanceof Integer) {
+                    nativeMap.putInt(key, (Integer) this.data.get(key));
+                } else if (this.data.get(key) instanceof Double) {
+                    nativeMap.putDouble(key, (Double) this.data.get(key));
+                } else if (this.data.get(key) instanceof String) {
+                    nativeMap.putString(key, (String) this.data.get(key));
+                } else {
+                    throw new Exception("Unsupported extra data type");
+                }
             } catch (Exception e) {
                 JitsiMeetLogger.w(TAG + " invalid extra data in event", e);
             }
@@ -66,7 +75,8 @@ public class BroadcastAction {
         RETRIEVE_PARTICIPANTS_INFO("org.jitsi.meet.RETRIEVE_PARTICIPANTS_INFO"),
         OPEN_CHAT("org.jitsi.meet.OPEN_CHAT"),
         CLOSE_CHAT("org.jitsi.meet.CLOSE_CHAT"),
-        SEND_CHAT_MESSAGE("org.jitsi.meet.SEND_CHAT_MESSAGE");
+        SEND_CHAT_MESSAGE("org.jitsi.meet.SEND_CHAT_MESSAGE"),
+        SET_VIDEO_MUTED("org.jitsi.meet.SET_VIDEO_MUTED");
 
         private final String action;
 

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

@@ -85,7 +85,9 @@ public class BroadcastEvent {
         SCREEN_SHARE_TOGGLED("org.jitsi.meet.SCREEN_SHARE_TOGGLED"),
         PARTICIPANTS_INFO_RETRIEVED("org.jitsi.meet.PARTICIPANTS_INFO_RETRIEVED"),
         CHAT_MESSAGE_RECEIVED("org.jitsi.meet.CHAT_MESSAGE_RECEIVED"),
-        CHAT_TOGGLED("org.jitsi.meet.CHAT_TOGGLED");
+        CHAT_TOGGLED("org.jitsi.meet.CHAT_TOGGLED"),
+        VIDEO_MUTED_CHANGED("org.jitsi.meet.VIDEO_MUTED_CHANGED");
+
 
         private static final String CONFERENCE_WILL_JOIN_NAME = "CONFERENCE_WILL_JOIN";
         private static final String CONFERENCE_JOINED_NAME = "CONFERENCE_JOINED";
@@ -98,6 +100,7 @@ public class BroadcastEvent {
         private static final String PARTICIPANTS_INFO_RETRIEVED_NAME = "PARTICIPANTS_INFO_RETRIEVED";
         private static final String CHAT_MESSAGE_RECEIVED_NAME = "CHAT_MESSAGE_RECEIVED";
         private static final String CHAT_TOGGLED_NAME = "CHAT_TOGGLED";
+        private static final String VIDEO_MUTED_CHANGED_NAME = "VIDEO_MUTED_CHANGED";
 
         private final String action;
 
@@ -142,6 +145,8 @@ public class BroadcastEvent {
                     return CHAT_MESSAGE_RECEIVED;
                 case CHAT_TOGGLED_NAME:
                     return CHAT_TOGGLED;
+                case VIDEO_MUTED_CHANGED_NAME:
+                    return VIDEO_MUTED_CHANGED;
             }
 
             return null;

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

@@ -20,8 +20,10 @@ public class BroadcastIntentHelper {
         return intent;
     }
 
-    public static Intent buildToggleScreenShareIntent() {
-        return new Intent(BroadcastAction.Type.TOGGLE_SCREEN_SHARE.getAction());
+    public static Intent buildToggleScreenShareIntent(boolean enabled) {
+        Intent intent = new Intent(BroadcastAction.Type.TOGGLE_SCREEN_SHARE.getAction());
+        intent.putExtra("enabled", enabled);
+        return intent;
     }
 
     public static Intent buildOpenChatIntent(String participantId) {
@@ -40,4 +42,10 @@ public class BroadcastIntentHelper {
         intent.putExtra("message", message);
         return intent;
     }
+
+    public static Intent buildSetVideoMutedIntent(boolean muted) {
+        Intent intent = new Intent(BroadcastAction.Type.SET_VIDEO_MUTED.getAction());
+        intent.putExtra("muted", muted);
+        return intent;
+    }
 }

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

@@ -85,6 +85,7 @@ class ExternalAPIModule
         constants.put("OPEN_CHAT", BroadcastAction.Type.OPEN_CHAT.getAction());
         constants.put("CLOSE_CHAT", BroadcastAction.Type.CLOSE_CHAT.getAction());
         constants.put("SEND_CHAT_MESSAGE", BroadcastAction.Type.SEND_CHAT_MESSAGE.getAction());
+        constants.put("SET_VIDEO_MUTED", BroadcastAction.Type.SET_VIDEO_MUTED.getAction());
 
         return constants;
     }

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

@@ -32,6 +32,7 @@ import com.facebook.react.modules.core.PermissionListener;
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
 import java.util.HashMap;
+import android.app.Activity;
 
 /**
  * A base activity for SDK users to embed. It uses {@link JitsiMeetFragment} to do the heavy
@@ -58,6 +59,9 @@ public class JitsiMeetActivity extends FragmentActivity
         Intent intent = new Intent(context, JitsiMeetActivity.class);
         intent.setAction(ACTION_JITSI_MEET_CONFERENCE);
         intent.putExtra(JITSI_MEET_CONFERENCE_OPTIONS, options);
+        if (!(context instanceof Activity)) {
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
         context.startActivity(intent);
     }
 

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

@@ -132,6 +132,7 @@ public class JitsiMeetOngoingConferenceService extends Service
     public void onCurrentConferenceChanged(String conferenceUrl) {
         if (conferenceUrl == null) {
             stopSelf();
+            OngoingNotification.resetStartingtime();
             JitsiMeetLogger.i(TAG + "Service stopped");
         }
     }

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

@@ -43,6 +43,7 @@ class OngoingNotification {
     private static final String CHANNEL_NAME = "Ongoing Conference Notifications";
 
     static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
+    private static long startingTime = 0;
 
     static void createOngoingConferenceNotificationChannel() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
@@ -85,6 +86,10 @@ class OngoingNotification {
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID);
 
+        if (startingTime == 0) {
+            startingTime = System.currentTimeMillis();
+        }
+
         builder
             .setCategory(NotificationCompat.CATEGORY_CALL)
             .setContentTitle(context.getString(R.string.ongoing_notification_title))
@@ -92,6 +97,8 @@ class OngoingNotification {
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .setContentIntent(pendingIntent)
             .setOngoing(true)
+            .setWhen(startingTime)
+            .setUsesChronometer(true)
             .setAutoCancel(false)
             .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
             .setOnlyAlertOnce(true)
@@ -110,6 +117,10 @@ class OngoingNotification {
         return builder.build();
     }
 
+    static void resetStartingtime() {
+        startingTime = 0;
+    }
+
     private static NotificationCompat.Action createAction(Context context, JitsiMeetOngoingConferenceService.Action action, @StringRes int titleId) {
         Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
         intent.setAction(action.getName());

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

@@ -178,7 +178,6 @@ class ReactInstanceManagerHolder {
 
         List<ReactPackage> packages
             = new ArrayList<>(Arrays.asList(
-                new com.BV.LinearGradient.LinearGradientPackage(),
                 new com.calendarevents.CalendarEventsPackage(),
                 new com.corbt.keepawake.KCKeepAwakePackage(),
                 new com.facebook.react.shell.MainReactPackage(),

android/settings.gradle

@@ -19,8 +19,6 @@ include ':react-native-immersive'
 project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
 include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
-include ':react-native-linear-gradient'
-project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
 include ':react-native-sound'
 project(':react-native-sound').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sound/android')
 include ':react-native-splash-screen'

app.js

@@ -1,8 +1,6 @@
 /* application specific logic */
 
 import 'jquery';
-import 'jquery-contextmenu';
-import 'jQuery-Impromptu';
 
 import 'olm';
 

conference.js

@@ -1,10 +1,12 @@
 /* global APP, JitsiMeetJS, config, interfaceConfig */
 
+import { jitsiLocalStorage } from '@jitsi/js-utils';
 import EventEmitter from 'events';
 import Logger from 'jitsi-meet-logger';
 
 import { openConnection } from './connection';
 import { ENDPOINT_TEXT_MESSAGE_NAME } from './modules/API/constants';
+import { AUDIO_ONLY_SCREEN_SHARE_NO_TRACK } from './modules/UI/UIErrors';
 import AuthHandler from './modules/UI/authentication/AuthHandler';
 import UIUtil from './modules/UI/util/UIUtil';
 import mediaDeviceHelper from './modules/devices/mediaDeviceHelper';
@@ -125,6 +127,7 @@ import {
     makePrecallTest
 } from './react/features/prejoin';
 import { disableReceiver, stopReceiver } from './react/features/remote-control';
+import { setScreenAudioShareState, isScreenAudioShared } from './react/features/screen-share/';
 import { toggleScreenshotCaptureEffect } from './react/features/screenshot-capture';
 import { setSharedVideoStatus } from './react/features/shared-video/actions';
 import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/AudioMixerEffect';
@@ -378,7 +381,6 @@ class ConferenceConnector {
         if (this.reconnectTimeout !== null) {
             clearTimeout(this.reconnectTimeout);
         }
-        AuthHandler.closeAuth();
     }
 
     /**
@@ -393,7 +395,8 @@ class ConferenceConnector {
      *
      */
     connect() {
-        room.join();
+        // the local storage overrides here and in connection.js can be used by jibri
+        room.join(jitsiLocalStorage.getItem('xmpp_conference_password_override'));
     }
 }
 
@@ -506,7 +509,7 @@ export default {
         let tryCreateLocalTracks;
 
         // On Electron there is no permission prompt for granting permissions. That's why we don't need to
-        // spend much time displaying the overlay screen. If GUM is not resolved withing 15 seconds it will
+        // spend much time displaying the overlay screen. If GUM is not resolved within 15 seconds it will
         // probably never resolve.
         const timeout = browser.isElectron() ? 15000 : 60000;
 
@@ -568,7 +571,7 @@ export default {
 
                         if (err.name === JitsiTrackErrors.TIMEOUT && !browser.isElectron()) {
                             // In this case we expect that the permission prompt is still visible. There is no point of
-                            // executing GUM with different source. Also at the time of writting the following
+                            // executing GUM with different source. Also at the time of writing the following
                             // inconsistency have been noticed in some browsers - if the permissions prompt is visible
                             // and another GUM is executed the prompt does not change its content but if the user
                             // clicks allow the user action isassociated with the latest GUM call.
@@ -625,7 +628,7 @@ export default {
 
         // Hide the permissions prompt/overlay as soon as the tracks are
         // created. Don't wait for the connection to be made, since in some
-        // cases, when auth is rquired, for instance, that won't happen until
+        // cases, when auth is required, for instance, that won't happen until
         // the user inputs their credentials, but the dialog would be
         // overshadowed by the overlay.
         tryCreateLocalTracks.then(tracks => {
@@ -1399,9 +1402,6 @@ export default {
                     .then(() => {
                         this.localVideo = newTrack;
                         this._setSharingScreen(newTrack);
-                        if (newTrack) {
-                            APP.UI.addLocalVideoStream(newTrack);
-                        }
                         this.setVideoMuteStatus(this.isLocalVideoMuted());
                     })
                     .then(resolve)
@@ -1553,6 +1553,8 @@ export default {
             this._desktopAudioStream = undefined;
         }
 
+        APP.store.dispatch(setScreenAudioShareState(false));
+
         if (didHaveVideo) {
             promise = promise.then(() => createLocalTracksF({ devices: [ 'video' ] }))
                 .then(([ stream ]) => {
@@ -1669,6 +1671,23 @@ export default {
                 = this._turnScreenSharingOff.bind(this, didHaveVideo);
 
             const desktopVideoStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.VIDEO);
+            const dekstopAudioStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.AUDIO);
+
+            if (dekstopAudioStream) {
+                dekstopAudioStream.on(
+                    JitsiTrackEvents.LOCAL_TRACK_STOPPED,
+                    () => {
+                        logger.debug(`Local screensharing audio track stopped. ${this.isSharingScreen}`);
+
+                        // Handle case where screen share was stopped from  the browsers 'screen share in progress'
+                        // window. If audio screen sharing is stopped via the normal UX flow this point shouldn't
+                        // be reached.
+                        isScreenAudioShared(APP.store.getState())
+                            && this._untoggleScreenSharing
+                            && this._untoggleScreenSharing();
+                    }
+                );
+            }
 
             if (desktopVideoStream) {
                 desktopVideoStream.on(
@@ -1752,16 +1771,12 @@ export default {
             const isPortrait = height >= width;
             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);
 
             // 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);
+            const resizeDesktopStream = highResolutionTrack && config.videoQuality?.resizeDesktopForPresenter;
 
             if (resizeDesktopStream) {
                 let desktopResizeConstraints = {};
@@ -1779,7 +1794,7 @@ export default {
                     };
                 }
 
-                // Apply the contraints on the desktop track.
+                // Apply the constraints on the desktop track.
                 try {
                     await this.localVideo.track.applyConstraints(desktopResizeConstraints);
                 } catch (err) {
@@ -1837,14 +1852,28 @@ export default {
 
         return this._createDesktopTrack(options)
             .then(async streams => {
-                const desktopVideoStream = streams.find(stream => stream.getType() === MEDIA_TYPE.VIDEO);
+                let desktopVideoStream = streams.find(stream => stream.getType() === MEDIA_TYPE.VIDEO);
+
+                this._desktopAudioStream = streams.find(stream => stream.getType() === MEDIA_TYPE.AUDIO);
+
+                const { audioOnly = false } = options;
+
+                // If we're in audio only mode dispose of the video track otherwise the screensharing state will be
+                // inconsistent.
+                if (audioOnly) {
+                    desktopVideoStream.dispose();
+                    desktopVideoStream = undefined;
+
+                    if (!this._desktopAudioStream) {
+                        return Promise.reject(AUDIO_ONLY_SCREEN_SHARE_NO_TRACK);
+                    }
+                }
 
                 if (desktopVideoStream) {
                     logger.debug(`_switchToScreenSharing is using ${desktopVideoStream} for useVideoStream`);
                     await this.useVideoStream(desktopVideoStream);
                 }
 
-                this._desktopAudioStream = streams.find(stream => stream.getType() === MEDIA_TYPE.AUDIO);
 
                 if (this._desktopAudioStream) {
                     // If there is a localAudio stream, mix in the desktop audio stream captured by the screen sharing
@@ -1857,7 +1886,9 @@ export default {
                         // If no local stream is present ( i.e. no input audio devices) we use the screen share audio
                         // stream as we would use a regular stream.
                         await this.useAudioStream(this._desktopAudioStream);
+
                     }
+                    APP.store.dispatch(setScreenAudioShareState(true));
                 }
             })
             .then(() => {
@@ -1925,6 +1956,9 @@ export default {
         } else if (error.name === JitsiTrackErrors.SCREENSHARING_GENERIC_ERROR) {
             descriptionKey = 'dialog.screenSharingFailed';
             titleKey = 'dialog.screenSharingFailedTitle';
+        } else if (error === AUDIO_ONLY_SCREEN_SHARE_NO_TRACK) {
+            descriptionKey = 'notify.screenShareNoAudio';
+            titleKey = 'notify.screenShareNoAudioTitle';
         }
 
         APP.UI.messageHandler.showError({
@@ -1970,7 +2004,7 @@ export default {
             }
 
             APP.store.dispatch(updateRemoteParticipantFeatures(user));
-            logger.log(`USER ${id} connnected:`, user);
+            logger.log(`USER ${id} connected:`, user);
             APP.UI.addUser(user);
         });
 
@@ -2408,11 +2442,17 @@ export default {
             // There is no guarantee another event will trigger the update
             // immediately and in all situations, for example because a remote
             // participant is having connection trouble so no status changes.
-            APP.UI.updateAllVideos();
+            const displayedUserId = APP.UI.getLargeVideoID();
+
+            if (displayedUserId) {
+                APP.UI.updateLargeVideo(displayedUserId, true);
+            }
         });
 
         APP.UI.addListener(
-            UIEvents.TOGGLE_SCREENSHARING, this.toggleScreenSharing.bind(this)
+            UIEvents.TOGGLE_SCREENSHARING, audioOnly => {
+                this.toggleScreenSharing(undefined, { audioOnly });
+            }
         );
 
         /* eslint-disable max-params */

config.js

@@ -59,8 +59,10 @@ var config = {
         // simulcast is turned off for the desktop share. If presenter is turned
         // on while screensharing is in progress, the max bitrate is automatically
         // adjusted to 2.5 Mbps. This takes a value between 0 and 1 which determines
-        // the probability for this to be enabled.
-        // capScreenshareBitrate: 1 // 0 to disable
+        // the probability for this to be enabled. This setting has been deprecated.
+        // desktopSharingFrameRate.max now determines whether simulcast will be enabled
+        // or disabled for the screenshare.
+        // capScreenshareBitrate: 1 // 0 to disable - deprecated.
 
         // Enable callstats only for a percentage of users.
         // This takes a value between 0 and 100 which determines the probability for
@@ -117,13 +119,15 @@ var config = {
     // participants and to enable it back a reload is needed.
     // startSilent: false
 
-    // Sets the preferred target bitrate for the Opus audio codec by setting its
-    // 'maxaveragebitrate' parameter. Currently not available in p2p mode.
-    // Valid values are in the range 6000 to 510000
-    // opusMaxAverageBitrate: 20000,
-
     // Enables support for opus-red (redundancy for Opus).
-    // enableOpusRed: false
+    // enableOpusRed: false,
+
+    // Specify audio quality stereo and opusMaxAverageBitrate values in order to enable HD audio.
+    // Beware, by doing so, you are disabling echo cancellation, noise suppression and AGC.
+    // audioQuality: {
+    //     stereo: false,
+    //     opusMaxAverageBitrate: null // Value to fit the 6000 to 510000 range.
+    // },
 
     // Video
 
@@ -224,6 +228,11 @@ var config = {
     // Default value for the channel "last N" attribute. -1 for unlimited.
     channelLastN: -1,
 
+    // Provides a way for the lastN value to be controlled through the UI.
+    // When startLastN is present, conference starts with a last-n value of startLastN and channelLastN
+    // value will be used when the quality level is selected using "Manage Video Quality" slider.
+    // startLastN: 1,
+
     // Provides a way to use different "last N" values based on the number of participants in the conference.
     // The keys in an Object represent number of participants and the values are "last N" to be used when number of
     // participants gets to or above the number.
@@ -261,12 +270,24 @@ var config = {
     //    // to take effect.
     //    preferredCodec: 'VP8',
     //
+    //    // Provides a way to enforce the preferred codec for the conference even when the conference has endpoints
+    //    // that do not support the preferred codec. For example, older versions of Safari do not support VP9 yet.
+    //    // This will result in Safari not being able to decode video from endpoints sending VP9 video.
+    //    // When set to false, the conference falls back to VP8 whenever there is an endpoint that doesn't support the
+    //    // preferred codec and goes back to the preferred codec when that endpoint leaves.
+    //    // enforcePreferredCodec: false,
+    //
     //    // Provides a way to configure the maximum bitrates that will be enforced on the simulcast streams for
     //    // video tracks. The keys in the object represent the type of the stream (LD, SD or HD) and the values
     //    // are the max.bitrates to be set on that particular type of stream. The actual send may vary based on
     //    // the available bandwidth calculated by the browser, but it will be capped by the values specified here.
     //    // This is currently not implemented on app based clients on mobile.
     //    maxBitratesVideo: {
+    //          H264: {
+    //              low: 200000,
+    //              standard: 500000,
+    //              high: 1500000
+    //          },
     //          VP8 : {
     //              low: 200000,
     //              standard: 500000,
@@ -332,8 +353,7 @@ var config = {
     // enableIceRestart: false,
 
     // Enables forced reload of the client when the call is migrated as a result of
-    // the bridge going down. Currently enabled by default as call migration through
-    // session-terminate is causing siganling issues when Octo is enabled.
+    // the bridge going down.
     // enableForcedReload: true,
 
     // Use TURN/UDP servers for the jitsi-videobridge connection (by default
@@ -428,7 +448,7 @@ var config = {
     // toolbarButtons: [
     //    'microphone', 'camera', 'closedcaptions', 'desktop', 'embedmeeting', 'fullscreen',
     //    'fodeviceselection', 'hangup', 'profile', 'chat', 'recording',
-    //    'livestreaming', 'etherpad', 'sharedvideo', 'settings', 'raisehand',
+    //    'livestreaming', 'etherpad', 'sharedvideo', 'shareaudio', 'settings', 'raisehand',
     //    'videoquality', 'filmstrip', 'invite', 'feedback', 'stats', 'shortcuts',
     //    'tileview', 'select-background', 'download', 'help', 'mute-everyone', 'mute-video-everyone', 'security'
     // ],
@@ -456,6 +476,10 @@ var config = {
     // Enables sending participants' emails (if available) to callstats and other analytics
     // enableEmailInStats: false,
 
+    // Controls the percentage of automatic feedback shown to participants when callstats is enabled.
+    // The default value is 100%. If set to 0, no automatic feedback will be requested
+    // feedbackPercentage: 100,
+
     // Privacy
     //
 
@@ -477,13 +501,6 @@ var config = {
         // connection.
         enabled: true,
 
-        // The STUN servers that will be used in the peer to peer connections
-        stunServers: [
-
-            // { urls: 'stun:jitsi-meet.example.com:3478' },
-            { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' }
-        ]
-
         // Sets the ICE transport policy for the p2p connection. At the time
         // of this writing the list of possible values are 'all' and 'relay',
         // but that is subject to change in the future. The enum is defined in
@@ -494,7 +511,7 @@ var config = {
 
         // If set to true, it will prefer to use H.264 for P2P calls (if H.264
         // is supported). This setting is deprecated, use preferredCodec instead.
-        // preferH264: true
+        // preferH264: true,
 
         // Provides a way to set the video codec preference on the p2p connection. Acceptable
         // codec values are 'VP8', 'VP9' and 'H264'.
@@ -509,7 +526,14 @@ var config = {
 
         // How long we're going to wait, before going back to P2P after the 3rd
         // participant has left the conference (to filter out page reload).
-        // backToP2PDelay: 5
+        // backToP2PDelay: 5,
+
+        // The STUN servers that will be used in the peer to peer connections
+        stunServers: [
+
+            // { urls: 'stun:jitsi-meet.example.com:3478' },
+            { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' }
+        ]
     },
 
     analytics: {
@@ -536,7 +560,7 @@ var config = {
         // The interval at which rtcstats will poll getStats, defaults to 1000ms.
         // If the value is set to 0 getStats won't be polled and the rtcstats client
         // will only send data related to RTCPeerConnection events.
-        // rtcstatsPolIInterval: 1000
+        // rtcstatsPolIInterval: 1000,
 
         // Array of script URLs to load as lib-jitsi-meet "analytics handlers".
         // scriptURLs: [
@@ -559,6 +583,10 @@ var config = {
     // Decides whether the start/stop recording audio notifications should play on record.
     // disableRecordAudioNotification: false,
 
+    // Disables the sounds that play when other participants join or leave the
+    // conference (if set to true, these sounds will not be played).
+    // disableJoinLeaveSounds: false,
+
     // Information for the chrome extension banner
     // chromeExtensionBanner: {
     //     // The chrome extension to be installed address
@@ -618,6 +646,10 @@ var config = {
     // the menu has option to flip the locally seen video for local presentations
     // disableLocalVideoFlip: false,
 
+    // A property used to unset the default flip state of the local video.
+    // When it is set to 'true', the local(self) video will not be mirrored anymore.
+    // doNotFlipLocalVideo: false,
+
     // Mainly privacy related settings
 
     // Disables all invite functions from the app (share, invite, dial out...etc)
@@ -665,6 +697,9 @@ var config = {
     */
     // dynamicBrandingUrl: '',
 
+    // Sets the background transparency level. '0' is fully transparent, '1' is opaque.
+    // backgroundAlpha: 1,
+
     // 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.
@@ -674,13 +709,13 @@ var config = {
     // disableTileView: true,
 
     // Hides the conference subject
-    // hideConferenceSubject: true
+    // hideConferenceSubject: true,
 
     // Hides the conference timer.
     // hideConferenceTimer: true,
 
     // Hides the participants stats
-    // hideParticipantsStats: true
+    // hideParticipantsStats: true,
 
     // Sets the conference subject
     // subject: 'Conference Subject',

connection.js

@@ -3,18 +3,20 @@
 import { jitsiLocalStorage } from '@jitsi/js-utils';
 import Logger from 'jitsi-meet-logger';
 
-import AuthHandler from './modules/UI/authentication/AuthHandler';
+import { redirectToTokenAuthService } from './modules/UI/authentication/AuthHandler';
+import { LoginDialog } from './react/features/authentication/components';
+import { isTokenAuthEnabled } from './react/features/authentication/functions';
 import {
     connectionEstablished,
     connectionFailed
 } from './react/features/base/connection/actions';
+import { openDialog } from './react/features/base/dialog/actions';
 import {
     isFatalJitsiConnectionError,
     JitsiConnectionErrors,
     JitsiConnectionEvents
 } from './react/features/base/lib-jitsi-meet';
 import { setPrejoinDisplayNameRequired } from './react/features/prejoin/actions';
-
 const logger = Logger.getLogger(__filename);
 
 /**
@@ -80,7 +82,7 @@ function checkForAttachParametersAndConnect(id, password, connection) {
  * @returns {Promise<JitsiConnection>} connection if
  * everything is ok, else error.
  */
-function connect(id, password, roomName) {
+export function connect(id, password, roomName) {
     const connectionConfig = Object.assign({}, config);
     const { jwt } = APP.store.getState()['features/base/jwt'];
 
@@ -214,10 +216,38 @@ export function openConnection({ id, password, retry, roomName }) {
             const { jwt } = APP.store.getState()['features/base/jwt'];
 
             if (err === JitsiConnectionErrors.PASSWORD_REQUIRED && !jwt) {
-                return AuthHandler.requestAuth(roomName, connect);
+                return requestAuth(roomName);
             }
         }
 
         throw err;
     });
 }
+
+/**
+ * Show Authentication Dialog and try to connect with new credentials.
+ * If failed to connect because of PASSWORD_REQUIRED error
+ * then ask for password again.
+ * @param {string} [roomName] name of the conference room
+ *
+ * @returns {Promise<JitsiConnection>}
+ */
+function requestAuth(roomName) {
+    const config = APP.store.getState()['features/base/config'];
+
+    if (isTokenAuthEnabled(config)) {
+        // This Promise never resolves as user gets redirected to another URL
+        return new Promise(() => redirectToTokenAuthService(roomName));
+    }
+
+    return new Promise(resolve => {
+        const onSuccess = connection => {
+            resolve(connection);
+        };
+
+        APP.store.dispatch(
+            openDialog(LoginDialog, { onSuccess,
+                roomName })
+        );
+    });
+}

css/_atlaskit_overrides.scss

@@ -72,8 +72,10 @@
  * Keep overflow menu within screen vertical bounds and make it scrollable.
  */
  .toolbox-button-wth-dialog > div:nth-child(2) {
+    background: $menuBG;
     max-height: calc(100vh - #{$newToolbarSizeWithPadding} - 46px);
     margin-bottom: 4px;
+    padding: 0;
     overflow-y: auto;
 }
 
@@ -111,15 +113,16 @@
     }
 }
 
-@media (min-width: 580px) and (max-width: 680px) {
-    .mobile-browser {
-        &.shift-right .focus-lock > div > div {
-            @include full-size-modal-positioner();
-        }
+@media (max-width: 580px) {
+    // Override Atlaskit inline style for the modal background.
+    // Important is unfortunately needed for that.
+    .shift-right .focus-lock [role="dialog"][style] {
+        background-color: $chatBackgroundColor !important;
+    }
 
-        &.shift-right .focus-lock [role="dialog"] {
-            @include full-size-modal-dialog();
-        }
+    // Remove Atlaskit padding from the chat dialog.
+    .shift-right .focus-lock [role="dialog"] > div:first-child > div:nth-child(2) {
+        padding: 0;
     }
 }
 

css/_audio-preview.scss

@@ -72,7 +72,7 @@
 
                 &--selected {
                     padding-left: 18px;
-                    background: #131519;
+                    background: $newToolbarBackgroundColor;
                 }
             }
 
@@ -104,7 +104,7 @@
                 padding-left: 48px;
 
                 &--selected {
-                    background: #131519;
+                    background: $newToolbarBackgroundColor;
                     padding-left: 18px;
                 }
             }

css/_base.scss

@@ -55,6 +55,10 @@ body {
     fill: white;
 }
 
+.disabled .jitsi-icon svg {
+    fill: #929292;
+}
+
 .jitsi-icon.gray svg {
     fill: #5E6D7A;
     cursor: pointer;

css/_chat.scss

@@ -1,5 +1,5 @@
 #sideToolbarContainer {
-    background-color: $newToolbarBackgroundColor;
+    background-color: $chatBackgroundColor;
     box-sizing: border-box;
     color: #FFF;
     display: flex;
@@ -105,13 +105,12 @@
 }
 
 .chat-header {
-    background-color: $chatHeaderBackgroundColor;
     height: 70px;
     position: relative;
     width: 100%;
     z-index: 1;
     display: flex;
-    justify-content: space-between;
+    justify-content: flex-end;
     padding: 16px;
     align-items: center;
     box-sizing: border-box;
@@ -123,23 +122,27 @@
     .jitsi-icon {
         cursor: pointer;
     }
-
-    .jitsi-icon > svg {
-        fill: #A4B8D1;
-    }
 }
 
 .chat-input-container {
-    padding: 0 16px 24px;
+    padding: 0 16px 16px;
 
     &.populated {
         #chat-input {
-            border: 1px solid #619CF4;
-
             .send-button {
                 background: #1B67EC;
                 cursor: pointer;
 
+                @media (hover: hover) and (pointer: fine) {
+                    &:hover {
+                        background: #3D82FB;
+                    }
+                }
+
+                &:active {
+                    background: #0852D4;
+                }
+
                 path {
                     fill: #fff;
                 }
@@ -151,9 +154,13 @@
 #chat-input {
     border: 1px solid $chatInputSeparatorColor;
     display: flex;
-    padding: 5px 10px;
+    padding: 4px;
     border-radius: 3px;
 
+    &:focus-within {
+        border: 1px solid #619CF4;
+    }
+
     * {
         background-color: transparent;
     }
@@ -177,10 +184,20 @@
     }
 }
 
-.mobile-browser {
-    .send-button {
-        height: 48px;
-        width: 48px;
+.smiley-button {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 40px;
+    width: 40px;
+    border-radius: 3px;
+}
+
+#chat-input .smiley-button {
+    @media (hover: hover) and (pointer: fine) {
+        &:hover {
+            background-color: #484A4F;
+        }
     }
 }
 
@@ -197,7 +214,7 @@
     border-radius:0;
     box-shadow: none;
     color: white;
-    font-size: 15px;
+    font-size: 14px;
     padding: 10px;
     overflow-y: auto;
     resize: none;
@@ -254,6 +271,14 @@
             height: 48px;
         }
     }
+
+    #usermsg {
+        font-size: 16px;
+    }
+
+    .chatmessage .usermessage {
+        font-size: 16px;
+    }
 }
 
 .sideToolbarContainer {
@@ -263,8 +288,8 @@
     }
 
     .display-name {
-        font-size: 13px;
-        font-weight: bold;
+        font-size: 12px;
+        font-weight: 600;
         margin-bottom: 5px;
         white-space: nowrap;
         text-overflow: ellipsis;
@@ -292,6 +317,7 @@
 
     .usermessage {
         white-space: pre-wrap;
+        font-size: 14px;
     }
 
     &.error {
@@ -314,12 +340,16 @@
     }
 
     .messagecontent {
-        margin: 5px 10px;
+        margin: 8px;
         max-width: 100%;
         overflow: hidden;
     }
 }
 
+.timestamp {
+    color: #757575;
+}
+
 .smiley {
     font-size: 14pt;
 }
@@ -355,7 +385,9 @@
     max-height: 0;
     overflow: hidden;
     position: absolute;
-    width: $sidebarWidth;
+    width: calc(#{$sidebarWidth} - 32px);
+    margin-bottom: 5px;
+    margin-left: -5px;
 
     /**
      * CSS transitions do not apply for auto dimensions. So to produce the css
@@ -370,9 +402,8 @@
     }
 
     #smileysContainer {
-        background-color: $newToolbarBackgroundColor;
-        border-bottom: 1px solid;
-        border-top: 1px solid;
+        background-color: $chatBackgroundColor;
+        border-top: 1px solid $chatInputSeparatorColor;
     }
 }
 
@@ -478,9 +509,9 @@
 
     &-header {
         display: flex;
-        justify-content: space-between;
+        justify-content: flex-end;
         align-items: center;
-        margin: 16px 16px 24px;
+        margin: 16px;
         width: calc(100% - 32px);
         box-sizing: border-box;
         color: #fff;
@@ -491,19 +522,11 @@
         .jitsi-icon {
             cursor: pointer;
         }
-
-        .jitsi-icon > svg {
-            fill: #A4B8D1;
-        }
     }
 
     #chatconversation {
         width: 100%;
     }
-
-    .chat-input-container {
-        padding: 0 0 24px;
-    }
 }
 
 .touchmove-hack {
@@ -520,6 +543,6 @@
     place-items: center;
     height: 48px;
     width: 48px;
-    background: #2a3a4b;
+    background: #36383C;
     border-radius: 3px;
 }

css/_jquery-impromptu.scss

@@ -1,129 +0,0 @@
-/*
-------------------------------
-	Impromptu
-------------------------------
-*/
-.jqifade{
-	position: absolute; 
-	background-color: #000;
-}
-div.jqi{ 
-	width: 400px;
-	position: absolute;
-    color: #3a3a3a;
-	background-color: #ffffff; 
-	font-size: 11px; 
-	text-align: left; 
-	border: solid 1px #eeeeee;
-	border-radius: 6px;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-	padding: 7px;
-}
-div.jqi .jqicontainer{ 
-}
-div.jqi .jqiclose{ 
-	position: absolute;
-	top: 4px; right: -2px; 
-	width: 18px; 
-	cursor: default; 
-	color: #bbbbbb; 
-	font-weight: bold; 
-}
-div.jqi .jqistate{
-	background-color: #fff;
-}
-div.jqi .jqititle{
-	padding: 5px 10px;
-	font-size: 16px; 
-	line-height: 20px; 
-	border-bottom: solid 1px #eeeeee;
-}
-div.jqi .jqimessage{ 
-	padding: 10px; 
-	line-height: 20px; 
-	color: #444444; 
-}
-div.jqi .jqibuttons{ 
-	text-align: right; 
-	margin: 0 -7px -7px -7px;
-	border-top: solid 1px #e4e4e4; 
-	background-color: #f4f4f4;
-	border-radius: 0 0 6px 6px;
-	-moz-border-radius: 0 0 6px 6px;
-	-webkit-border-radius: 0 0 6px 6px;
-}
-div.jqi .jqibuttons button{ 
-	margin: 0;
-	padding: 5px 20px;
-	background-color: transparent !important;
-	font-weight: normal; 
-	border: none;
-	border-left: solid 1px #e4e4e4; 
-	color: #777; 
-	font-weight: bold; 
-	font-size: 12px; 
-}
-div.jqi .jqibuttons button.jqidefaultbutton{
-	color: #489afe;
-}
-
-div.jqi .jqibuttons button:disabled {
-    color: #b6b6b6 !important;
-}
-div.jqi .jqibuttons button:hover,
-div.jqi .jqibuttons button:focus{
-	color: #287ade;
-	outline: none;
-}
-.jqiwarning .jqi .jqibuttons{ 
-	background-color: #b95656;
-}
-
-/* sub states */
-div.jqi .jqiparentstate::after{ 
-	background-color: #777;
-	opacity: 0.6;
-	filter: alpha(opacity=60);
-	content: '';
-	position: absolute;
-	top:0;left:0;bottom:0;right:0;
-	border-radius: 6px;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-}
-div.jqi .jqisubstate{
-	position: absolute;
-	top:0;
-	left: 20%;
-	width: 60%;
-	padding: 7px;
-	border: solid 1px #eeeeee;
-	border-top: none;
-	border-radius: 0 0 6px 6px;
-	-moz-border-radius: 0 0 6px 6px;
-	-webkit-border-radius: 0 0 6px 6px;
-}
-div.jqi .jqisubstate .jqibuttons button{
-	padding: 10px 18px;
-}
-
-/* arrows for tooltips/tours */
-.jqi .jqiarrow{ position: absolute; height: 0; width:0; line-height: 0; font-size: 0; border: solid 10px transparent;}
-
-.jqi .jqiarrowtl{ left: 10px; top: -20px; border-bottom-color: #ffffff; }
-.jqi .jqiarrowtc{ left: 50%; top: -20px; border-bottom-color: #ffffff; margin-left: -10px; }
-.jqi .jqiarrowtr{ right: 10px; top: -20px; border-bottom-color: #ffffff; }
-
-.jqi .jqiarrowbl{ left: 10px; bottom: -20px; border-top-color: #ffffff; }
-.jqi .jqiarrowbc{ left: 50%; bottom: -20px; border-top-color: #ffffff; margin-left: -10px; }
-.jqi .jqiarrowbr{ right: 10px; bottom: -20px; border-top-color: #ffffff; }
-
-.jqi .jqiarrowlt{ left: -20px; top: 10px; border-right-color: #ffffff; }
-.jqi .jqiarrowlm{ left: -20px; top: 50%; border-right-color: #ffffff; margin-top: -10px; }
-.jqi .jqiarrowlb{ left: -20px; bottom: 10px; border-right-color: #ffffff; }
-
-.jqi .jqiarrowrt{ right: -20px; top: 10px; border-left-color: #ffffff; }
-.jqi .jqiarrowrm{ right: -20px; top: 50%; border-left-color: #ffffff; margin-top: -10px; }
-.jqi .jqiarrowrb{ right: -20px; bottom: 10px; border-left-color: #ffffff; }
-

css/_jquery.contextMenu.scss

@@ -1,206 +0,0 @@
-@charset "UTF-8";
-/*!
- * jQuery contextMenu - Plugin for simple contextMenu handling
- *
- * Version: v2.1.1
- *
- * Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
- * Web: http://swisnl.github.io/jQuery-contextMenu/
- *
- * Copyright (c) 2011-2016 SWIS BV and contributors
- *
- * Licensed under
- *   MIT License http://www.opensource.org/licenses/mit-license
- *
- * Date: 2016-02-28T09:53:18.890Z
- */
-@font-face {
-  font-family: "context-menu-icons";
-  font-style: normal; 
-  font-weight: normal;
-
-  src: url("font/context-menu-icons.eot?2qmzf");
-  src: url("font/context-menu-icons.eot?2qmzf#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?2qmzf") format("woff2"), url("font/context-menu-icons.woff?2qmzf") format("woff"), url("font/context-menu-icons.ttf?2qmzf") format("truetype");
-}
-
-.context-menu-icon:before {
-  position: absolute;
-  top: 50%;
-  left: 0;
-  width: 28px; 
-  font-family: "context-menu-icons";
-  font-size: 16px;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  color: #2980b9;
-  text-align: center;
-  -webkit-transform: translateY(-50%);
-      -ms-transform: translateY(-50%);
-       -o-transform: translateY(-50%);
-          transform: translateY(-50%);
-
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.context-menu-icon-add:before {
-  content: "";
-}
-
-.context-menu-icon-copy:before {
-  content: "";
-}
-
-.context-menu-icon-cut:before {
-  content: "";
-}
-
-.context-menu-icon-delete:before {
-  content: "";
-}
-
-.context-menu-icon-edit:before {
-  content: "";
-}
-
-.context-menu-icon-paste:before {
-  content: "";
-}
-
-.context-menu-icon-quit:before {
-  content: "";
-}
-
-.context-menu-icon.context-menu-hover:before {
-  color: #fff;
-}
-
-.context-menu-list {
-  position: absolute; 
-  display: inline-block;
-  min-width: 180px;
-  max-width: 360px;
-  padding: 4px 0;
-  margin: 5px;
-  font-family: inherit;
-  font-size: inherit;
-  list-style-type: none;
-  background: #fff;
-  border: 1px solid #bebebe;
-  border-radius: $borderRadius;
-  -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, .5);
-          box-shadow: 0 2px 5px rgba(0, 0, 0, .5);
-}
-
-.context-menu-item {
-  position: relative;
-  padding: 3px 28px;
-  color: #2f2f2f;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none; 
-  background-color: #fff;
-}
-
-.context-menu-separator {
-  padding: 0; 
-  margin: 5px 0;
-  border-bottom: 1px solid #e6e6e6;
-}
-
-.context-menu-item > label > input,
-.context-menu-item > label > textarea {
-  -webkit-user-select: text;
-     -moz-user-select: text;
-      -ms-user-select: text;
-          user-select: text;
-}
-
-.context-menu-item.context-menu-hover {
-  color: #fff;
-  cursor: pointer; 
-  background-color: #2980b9;
-}
-
-.context-menu-item.context-menu-disabled {
-  color: #626262; 
-  background-color: #fff;
-}
-
-.context-menu-item.context-menu-disabled {
-  color: #626262;
-}
-
-.context-menu-input.context-menu-hover,
-.context-menu-item.context-menu-disabled.context-menu-hover {
-  cursor: default; 
-  background-color: #eee;
-}
-
-.context-menu-submenu:after {
-  position: absolute;
-  top: 50%;
-  right: 8px;
-  z-index: $zindex1;
-  width: 0;
-  height: 0;
-  content: '';
-  border-color: transparent transparent transparent #2f2f2f;
-  border-style: solid;
-  border-width: 4px 0 4px 4px;
-  -webkit-transform: translateY(-50%);
-      -ms-transform: translateY(-50%);
-       -o-transform: translateY(-50%);
-          transform: translateY(-50%);
-}
-
-/**
- * Inputs
- */
-.context-menu-item.context-menu-input {
-  padding: 5px 10px;
-}
-
-/* vertically align inside labels */
-.context-menu-input > label > * {
-  vertical-align: top;
-}
-
-/* position checkboxes and radios as icons */
-.context-menu-input > label > input[type="checkbox"],
-.context-menu-input > label > input[type="radio"] {
-  position: relative;
-  top: 3px;
-}
-
-.context-menu-input > label,
-.context-menu-input > label > input[type="text"],
-.context-menu-input > label > textarea,
-.context-menu-input > label > select {
-  display: block;
-  width: 100%; 
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.context-menu-input > label > textarea {
-  height: 100px;
-}
-
-.context-menu-item > .context-menu-list {
-  top: 5px; 
-  /* re-positioned by js */
-  right: -5px;
-  display: none;
-}
-
-.context-menu-item.context-menu-visible > .context-menu-list {
-  display: block;
-}
-
-.context-menu-accesskey {
-  text-decoration: underline;
-}

css/_labels.scss

@@ -1,68 +1,37 @@
-.large-video-labels {
+.label {
+    align-items: center;
+    background: #36383C;
+    border-radius: 3px;
+    color: #fff;
     display: flex;
-    position: absolute;
-    top: 30px;
-    right: 30px;
-    transition: right 0.5s;
-    z-index: $labelsZ;
+    font-size: 12px;
+    font-weight: 600;
+    height: 28px;
+    margin: 0 0 4px 4px;
+    padding: 0 8px;
 
-    .circular-label {
-        align-items: center;
-        color: white;
-        display: flex;
-        font-weight: bold;
-        justify-content: center;
-        margin-left: 8px;
-        opacity: 0.8;
+    &--green {
+        background: #31B76A;
     }
 
-    .circular-label {
-        background: #B8C7E0;
+    &--red {
+        background: #E34F56
     }
 
-    .circular-label.e2ee {
-        align-items: center;
-        background: #76CF9C;
-        display: flex;
-        justify-content: center;
-    }
+    &--white {
+        background: #fff;
+        color: #5e6d7a;
 
-    .circular-label.file {
-        background: #FF5630;
-    }
-
-    .circular-label.local-rec {
-        background: #FF5630;
-    }
-
-    .circular-label.stream {
-        background: #0065FF;
-    }
-
-    .circular-label.insecure {
-        background: $defaultWarningColor;
-    }
-
-    .recording-label.center-message {
-        background: $videoStateIndicatorBackground;
-        bottom: 50%;
-        display: block;
-        left: 50%;
-        padding: 10px;
-        position: fixed;
-        transform: translate(-50%, -50%);
-        z-index: $centeredVideoLabelZ;
+        svg {
+            fill: #5e6d7a;
+        }
     }
 }
 
-.circular-label {
-    background: $videoStateIndicatorBackground;
-    border-radius: 50%;
-    box-sizing: border-box;
-    cursor: default;
-    font-size: 13px;
-    height: $videoStateIndicatorSize;
-    line-height: $videoStateIndicatorSize;
-    text-align: center;
-    min-width: $videoStateIndicatorSize;
-}
+.label-text-with-icon {
+    margin-left: 8px;
+}
+
+.participants-count {
+    cursor: pointer;
+}

css/_lobby.scss

@@ -9,7 +9,7 @@
             .spinner {
                 margin: 30px;
             }
-    
+
             .joining-message {
                 margin: 10px;
             }
@@ -49,7 +49,7 @@
     position: fixed;
     top: 20;
     transition: top 1s ease;
-    z-index: 100;
+    z-index: $toolbarZ + 1;
 
     &.toolbox-visible {
         // Same as toolbox subject position
@@ -62,31 +62,6 @@
         padding: 15px
     }
 
-    ul {
-        list-style-type: none;
-        padding: 0 15px 15px 15px;
-
-        li {
-            align-items: center;
-            display: flex;
-            flex-direction: row;
-            margin: 8px 0;
-
-            .details {
-                display: flex;
-                flex: 1;
-                flex-direction: column;
-                justify-content: space-evenly;
-                margin: 0 30px 0 10px;
-            }
-
-            button {
-                align-self: unset;
-                margin: 0 5px;
-            }
-        }
-    }
-
     button {
         align-self: stretch;
         margin: 8px 0;
@@ -116,3 +91,50 @@
         }
     }
 }
+
+.knocking-participants-container {
+    list-style-type: none;
+    max-height: 600px;
+    overflow-y: scroll;
+    padding: 0 15px 15px 15px;
+}
+
+.knocking-participant {
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    margin: 8px 0;
+
+    .details {
+        display: flex;
+        flex: 1;
+        flex-direction: column;
+        justify-content: space-evenly;
+        margin: 0 30px 0 10px;
+    }
+
+    button {
+        align-self: unset;
+        margin: 0 5px;
+    }
+}
+
+@media (max-width: 300px) {
+    #knocking-participant-list {
+        margin: 0;
+        text-align: center;
+        width: 100%;
+
+        .avatar {
+            display: none;
+        }
+    }
+
+    .knocking-participant {
+        flex-direction: column;
+
+        .details {
+            margin: 0;
+        }
+    }
+}

css/_mini_toolbox.scss

@@ -8,9 +8,11 @@
     .toolbox-icon {
         cursor: pointer;
         padding: 7px;
+        width: 22px;
+        height : 22px;
 
         &.toggled {
-            background: $AOTToolbarButtonToggleColor;
+            background: none;
         }
 
         &.disabled {
@@ -23,44 +25,11 @@
     flex-direction: row;
     left: 50%;
     position: absolute;
-    top: 10px;
+    bottom: 10px;
     transform: translateX(-50%);
-
-    .toolbox-button {
-        &:first-child {
-            .toolbox-icon {
-                border-top-left-radius: 3px;
-                border-bottom-left-radius: 3px;
-            }
-        }
-
-        &:nth-child(2) {
-            svg {
-                fill: $hangupColor;
-            }
-        }
-
-        &:last-child {
-            .toolbox-icon {
-                border-top-right-radius: 3px;
-                border-bottom-right-radius: 3px;
-            }
-        }
-    }
+    padding: 3px !important;
 }
 
 .filmstrip-toolbox {
     flex-direction: column;
-
-    .toolbox-button {
-        &:nth-child(1) {
-            svg {
-                fill: $hangupColor;
-            }
-        }
-
-        .toolbox-icon {
-            border-radius: 3px;
-        }
-    }
-}
+}

css/_participants-count.scss

@@ -1,26 +0,0 @@
-.participants-count {
-    background: #fff;
-    border-radius: 4px;
-    color: #5e6d7a;
-    cursor: pointer;
-    display: inline-block;
-    font-size: 13px;
-    line-height: 20px;
-    margin-left: 16px;
-    padding: 4px 8px;
-    pointer-events: auto;
-
-    &-number {
-        margin-right: 8px;
-        vertical-align: middle;
-    }
-
-    &-icon {
-        background: url('../images/user-groups.svg');
-        background-repeat: no-repeat;
-        display: inline-block;
-        height: 16px;
-        width: 16px;
-        vertical-align: middle;
-    }
-}

css/_participants-pane.scss

@@ -0,0 +1,51 @@
+.participants_pane {
+    background-color: $participantsPaneBgColor;
+    flex-shrink: 0;
+    overflow: hidden;
+    position: relative;
+    transition: width .16s ease-in-out;
+    width: 315px;
+    z-index: $zindex0;
+
+    &--closed {
+        width: 0;
+    }
+}
+
+.participants_pane-content {
+    display: flex;
+    flex-direction: column;
+    font-weight: 600;
+    height: 100%;
+    width: 315px;
+
+    & > *:first-child,
+    & > *:last-child {
+        flex-shrink: 0;
+    }
+}
+
+.participant-avatar {
+    margin: 8px 16px 8px 0;
+}
+
+@media (max-width: 375px) {
+    .participants_pane {
+        height: 100vh;
+        height: -webkit-fill-available;
+        left: 0;
+        position: fixed;
+        right: 0;
+        top: 0;
+        width: auto;
+
+        &--closed {
+            display: none;
+            width: auto;
+        }
+    }
+
+    .participants_pane-content {
+        width: 100%;
+    }
+}

css/_popup_menu.scss

@@ -3,7 +3,9 @@
 **/
 
 .popupmenu {
-    min-width: 75px;
+    background-color: $menuBG;
+    border-radius: 3px;
+    min-width: 150px;
     text-align: left;
     padding: 0px;
     white-space: nowrap;
@@ -38,6 +40,7 @@
 
     &__text {
         display: inline-block;
+        margin-left: 8px;
         vertical-align: middle;
     }
 
@@ -109,6 +112,6 @@ ul.popupmenu {
     margin: -16px -24px;
 }
 
-span.remotevideomenu:hover ul.popupmenu, ul.popupmenu:hover {
+span.localvideomenu:hover ul.popupmenu, span.remotevideomenu:hover ul.popupmenu, ul.popupmenu:hover {
     display:block !important;
 }

css/_settings-button.scss

@@ -39,6 +39,8 @@
         }
 
         &.settings-button-small-icon--disabled {
+            background: #36383C;
+
             &> svg {
                fill: #929292;
            }

css/_subject.scss

@@ -1,35 +1,60 @@
 .subject {
+    box-sizing: border-box;
+    color: #fff;
+    margin-top: 20px;
+    position: absolute;
     top: -120px;
     transition: top .3s ease-in;
-    height: 95px;
     width: 100%;
-    pointer-events: none;
-    position: absolute;
-    padding: 25px 140px 0 140px;
-    text-align: center;
-    font-size: 17px;
-    color: #fff;
-    z-index: $zindex10;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    box-sizing: border-box;
-    white-space: nowrap;
+    z-index: $zindex3;
 
     &.visible {
         top: 0px;
     }
+}
 
-    &.gradient {
-        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+.subject-info-container {
+    display: flex;
+    justify-content: center;
+    max-width: calc(100% - 280px);
+    margin: 0 auto;
+
+    &--full-width {
+        max-width: 100%;
     }
 
-    &-text {
-        vertical-align: middle;
-    }
-
-    &-conference-timer {
-        display: block;
-        font-size: 15px;
-        opacity: 0.6;
+    @media (max-width: 500px) {
+        flex-wrap: wrap;
+        max-width: 100%;
     }
 }
+
+.subject-info {
+    align-items: center;
+    display: flex;
+    margin-bottom: 4px;
+    max-width: 80%;
+    height: 28px;
+}
+
+.subject-text {
+    background: rgba(0, 0, 0, 0.6);
+    border-radius: 3px 0px 0px 3px;
+    font-size: 14px;
+    line-height: 24px;
+    padding: 2px 16px;
+    height: 24px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.subject-timer {
+    background: rgba(0, 0, 0, 0.8);
+    border-radius: 0px 3px 3px 0px;
+    display: inline-block;
+    font-size: 12px;
+    line-height: 16px;
+    min-width: 34px;
+    padding: 6px 8px;
+}

css/_toolbars.scss

@@ -72,10 +72,6 @@
 
     .toolbox-button-wth-dialog {
         display: inline-block;
-
-        &> div {
-            padding: 0;
-        }
     }
 }
 
@@ -102,9 +98,15 @@
     }
 }
 
+.toolbox-content-wrapper {
+    display: flex;
+    flex-direction: column;
+    margin: 0 auto;
+    max-width: 100%;
+}
 
 .toolbox-content-items {
-    background: #131519;
+    background: $newToolbarBackgroundColor;
     box-shadow: 0px 2px 8px 4px rgba(0, 0, 0, 0.25), 0px 0px 0px 1px rgba(0, 0, 0, 0.15);
     border-radius: 6px;
     margin: 0 auto;
@@ -165,9 +167,14 @@
         cursor: initial;
         color: #929292;
 
+        &:hover {
+            background: none;
+        }
+
         svg {
             fill: #929292;
         }
+
     }
 
     @media (hover: hover) and (pointer: fine) {
@@ -235,6 +242,11 @@
         }
     }
 
+    @media (max-width: 320px) {
+        height: 36px;
+        width: 36px;
+    }
+
     &.toggled {
         background: $newToolbarButtonToggleColor;
     }
@@ -294,12 +306,16 @@
 }
 
 /**
- * On small mobile devices make the toolbar full width.
+ * On small mobile devices make the toolbar full width and pad the invite prompt.
  */
 .toolbox-content-mobile {
     @media (max-width: 500px) {
         margin-bottom: 0;
 
+        .toolbox-content-wrapper {
+            width: 100%;
+        }
+
         .toolbox-content-items {
             border-radius: 0;
             display: flex;
@@ -307,5 +323,13 @@
             padding: 6px 0;
             width: 100%;
         }
+
+        .invite-more-container {
+            margin: 0 16px 8px;
+        }
+
+        .invite-more-container.elevated {
+            margin-bottom: 52px;
+        }
     }
 }

css/_transcription-subtitles.scss

@@ -1,10 +1,11 @@
-.transcription-subtitles{
-    bottom: 10%;
+.transcription-subtitles {
+    bottom: $newToolbarSize + 40px;
     font-size: 16px;
     font-weight: 1000;
     left: 50%;
     max-width: 50vw;
     opacity: 0.80;
+    overflow-wrap: break-word;
     pointer-events: none;
     position: absolute;
     text-shadow: 0px 0px 1px rgba(0,0,0,0.3),
@@ -14,6 +15,11 @@
     transform: translateX(-50%);
     z-index: $subtitlesZ;
 
+    &.lifted {
+        // Lift subtitle above toolbar+invite box.
+        bottom: $newToolbarSize + 112px + 40px;
+    }
+
     span {
         background: black;
     }

css/_variables.scss

@@ -30,6 +30,7 @@ $defaultSideBarFontColor: #44A5FF;
 $defaultSemiDarkColor: #ACACAC;
 $defaultDarkColor: #2b3d5c;
 $defaultWarningColor: rgb(215, 121, 118);
+$participantsPaneBgColor: #141414;
 $presence-available: rgb(110, 176, 5);
 $presence-away: rgb(250, 201, 20);
 $presence-busy: rgb(233, 0, 27);
@@ -38,11 +39,9 @@ $presence-idle: rgb(172, 172, 172);
 /**
  * Toolbar
  */
-$newToolbarBackgroundColor: rgba(22, 38, 55, 0.8);
+$newToolbarBackgroundColor: #131519;
 $newToolbarButtonHoverColor: rgba(255, 255, 255, 0.2);
 $newToolbarButtonToggleColor: rgba(255, 255, 255, 0.15);
-$AOTToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
-$AOTToolbarButtonToggleColor: rgba(14, 20, 35, 1);
 $menuBG:#242528;
 $newToolbarFontSize: 24px;
 $newToolbarHangupFontSize: 32px;
@@ -91,12 +90,12 @@ $modalTextColor: #333;
  * Chat
  */
 $chatActionsSeparatorColor: rgb(173, 105, 112);
-$chatHeaderBackgroundColor: rgba(42, 58, 75, 0.9);
+$chatBackgroundColor: #131519;
 $chatInputSeparatorColor: #A4B8D1;
-$chatLocalMessageBackgroundColor: rgb(4, 98, 178);
+$chatLocalMessageBackgroundColor: #484A4F;
 $chatPrivateMessageBackgroundColor: rgb(153, 69, 77);
-$chatRemoteMessageBackgroundColor:  rgb(86, 101, 114);
-$sidebarWidth: 375px;
+$chatRemoteMessageBackgroundColor:  #242528;
+$sidebarWidth: 315px;
 
  /**
  * Misc.

css/_videolayout_default.scss

@@ -1,5 +1,13 @@
 #videoconference_page {
     min-height: 100%;
+    position: relative;
+    transform: translate3d(0, 0, 0);
+    width: 100%;
+}
+
+#layout_wrapper {
+    display: flex;
+    height: 100%;
 }
 
 #videospace {
@@ -400,7 +408,9 @@
     }
 }
 
+.local-video-menu-trigger,
 .remote-video-menu-trigger,
+.localvideomenu,
 .remotevideomenu
 {
     display: inline-block;
@@ -418,6 +428,7 @@
         cursor: hand;
     }
 }
+.local-video-menu-trigger,
 .remote-video-menu-trigger {
     margin-top: 7px;
 }

css/_welcome_page.scss

@@ -233,6 +233,10 @@ body.welcome-page {
         }
     }
 
+    &.without-footer {
+        justify-content: start;
+    }
+
     .welcome-cards-container {
         color:#131519;
         padding-top: 40px;

css/components/_input-slider.scss

@@ -1,3 +1,5 @@
+$rangeInputThumbSize: 14;
+
 /**
  * Disable the default webkit styles for range inputs (sliders).
  */

css/filmstrip/_small_video.scss

@@ -19,7 +19,7 @@
         0 0 3px $videoThumbnailSelected;
     }
 
-    .remotevideomenu > .icon-menu {
+    .remotevideomenu > .icon-menu, .localvideomenu > .icon-menu {
         display: none;
     }
 
@@ -32,7 +32,7 @@
         box-shadow: inset 0 0 3px $videoThumbnailHovered,
         0 0 3px $videoThumbnailHovered;
 
-        .remotevideomenu > .icon-menu {
+        .remotevideomenu > .icon-menu, .localvideomenu > .icon-menu {
             display: inline-block;
         }
     }

css/filmstrip/_tile_view.scss

@@ -16,7 +16,7 @@
         display: flex;
         flex-direction: column;
         height: 100%;
-        width: 100vw;
+        width: 100%;
     }
 
     .filmstrip__videos .videocontainer {
@@ -50,10 +50,6 @@
             &.shift-right {
                 margin-left: $sidebarWidth;
                 width: calc(100% - #{$sidebarWidth});
-
-                #filmstripRemoteVideos {
-                    width: calc(100vw - #{$sidebarWidth});
-                }
             }
         }
     }
@@ -121,3 +117,15 @@
         align-self: baseline;
     }
 }
+
+.shift-right #filmstripRemoteVideosContainer {
+    /**
+     * Max-width corresponding to the ASPECT_RATIO_BREAKPOINT from features/filmstrip/constants,
+     * from which we subtract the chat size.
+     */
+    @media only screen and (max-width: calc(500px + #{$sidebarWidth})) {
+        video {
+            object-fit: cover;
+        }
+    }
+}

css/filmstrip/_tile_view_overrides.scss

@@ -43,6 +43,7 @@
      * specifically the various status icons.
      */
     .remotevideomenu,
+    .localvideomenu,
     .videocontainer__toptoolbar {
         z-index: auto;
     }

css/filmstrip/_vertical_filmstrip_overrides.scss

@@ -51,6 +51,7 @@
      * and tooltips from getting a new location context due to translate3d.
      */
     .connection-indicator,
+    .local-video-menu-trigger,
     .remote-video-menu-trigger,
     .indicator-icon-container {
         transform: translate3d(0, 0, 0);
@@ -68,7 +69,9 @@
      * Move the remote video menu trigger to the bottom left of the video
      * thumbnail.
      */
+    .localvideomenu,
     .remotevideomenu,
+    .local-video-menu-trigger,
     .remote-video-menu-trigger {
         bottom: 0;
         left: 0;
@@ -76,6 +79,7 @@
         right: auto;
     }
 
+    .local-video-menu-trigger,
     .remote-video-menu-trigger {
         margin-bottom: 7px;
         margin-left: $remoteVideoMenuIconMargin;

css/main.scss

@@ -48,7 +48,6 @@ $flagsImagePath: "../images/";
 @import 'videolayout_default';
 @import 'notice';
 @import 'subject';
-@import 'participants-count';
 @import 'popup_menu';
 @import 'recording';
 @import 'login_menu';
@@ -58,7 +57,6 @@ $flagsImagePath: "../images/";
 @import 'welcome_page_content';
 @import 'welcome_page_settings_toolbar';
 @import 'toolbars';
-@import 'jquery.contextMenu';
 @import 'keyboard-shortcuts';
 @import 'redirect_page';
 @import 'components/form-control';
@@ -105,5 +103,6 @@ $flagsImagePath: "../images/";
 @import 'responsive';
 @import 'connection-status';
 @import 'drawer';
+@import 'participants-pane';
 
 /* Modules END */

css/modals/invite/_invite_more.scss

@@ -1,31 +1,42 @@
 .invite-more {
     &-container {
+        margin-bottom: 8px;
+        transition: margin-bottom 0.3s;
+
+        &.elevated {
+            margin-bottom: 36px;
+        }
+    }
+
+    &-content {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        padding: 16px;
+        background: rgba(0, 0, 0, 0.7);
+        border-radius: 8px;
         color: #fff;
+        font-size: 14px;
+        line-height: 24px;
         font-weight: 600;
-        position: absolute;
-        width: 100%;
-        text-align: center;
-        z-index: $zindex2;
-        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
     }
 
     &-header {
-        font-size: 19px;
-        line-height: 28px;
-        margin: 24px 0 16px 0;
+        max-width: 100%;
+        margin-bottom: 16px;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
     }
 
     &-button {
         display: flex;
-        margin: auto;
+        max-width: 100%;
+        height: 40px;
+        box-sizing: border-box;
         padding: 8px 16px;
-        width: fit-content;
-        width: -moz-fit-content;
-        height: 24px;
         background: #0376DA;
         border-radius: 3px;
-        font-size: 14px;
-        line-height: 24px;
         cursor: pointer;
 
         @media (hover: hover) and (pointer: fine) {
@@ -36,8 +47,9 @@
 
         &-text {
             margin-left: 8px;
-            font-size: 15px;
-            line-height: 24px;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
         }
     }
     &-dialog {
@@ -85,18 +97,18 @@
                 border-top: none;
                 border-radius: 0 0 3px 3px;
 
-                & > * {
-                    display: flex;
-                    justify-content: center;
+                .copy-invite-icon, .provider-icon {
                     align-items: center;
-                    height: 40px;
-                    width: 40px;
-                    border-radius: 4px;
                     cursor: pointer;
+                    display: flex;
+                    height: 40px;
+                    place-content: center;
+                    width: 40px;
                 }
 
                 &:hover > div:hover {
                     background-color: rgba(255, 255, 255, 0.2);
+                    border-radius: 4px;
                 }
 
                 & > :not(:last-child) {
@@ -195,3 +207,14 @@
         }
     }
 }
+
+.mobile-browser {
+    .invite-more-content {
+        font-size: 16px;
+    }
+
+    .invite-more-button {
+        height: 48px;
+        padding: 12px 16px;
+    }
+}

css/modals/settings/_settings.scss

@@ -47,6 +47,7 @@
 
     .language-settings {
         max-width: 50%;
+        width: 35%;
     }
 
     .calendar-tab {

css/modals/virtual-background/_virtual-background.scss

@@ -1,44 +1,159 @@
-.virtual-background-dialog{
-  display: inline-flex;
-  cursor: pointer;
-  .thumbnail{
-    object-fit: cover;
-    padding: 5px;
-    height: 40px;
-    width: 40px;
-  }
-  .thumbnail-selected{
-    object-fit: cover;
-    padding: 5px;
-    height: 40px;
-    width: 40px;
-    border: 2px solid #a4b8d1;
-  }
-  .blur-selected{
-    border: 2px solid #a4b8d1;
-  }
-  .virtual-background-none{
-    font-weight: bold;
-    padding: 5px;
-    height: 35px;
-    width: 35px;
-    border-radius: 10px;
-    border: 1px solid #a4b8d1;
-    text-align: center;
-    vertical-align: middle;
-    line-height: 35px;
-    margin-right: 5px;
-  }
-  .none-selected{
-    font-weight: bold;
-    padding: 5px;
-    height: 35px;
-    width: 35px;
-    border-radius: 10px;
-    border: 2px solid #a4b8d1;
-    text-align: center;
-    vertical-align: middle;
-    line-height: 35px;
-    margin-right: 5px;
-  }
-}
+.virtual-background-dialog {
+    max-height: 300px;
+    color: white;
+    display: inline-grid;
+    grid-template-columns: auto auto auto auto auto;
+    column-gap: 8px;
+    cursor: pointer;
+    .thumbnail:hover, .blur:hover, .slight-blur:hover, .virtual-background-none:hover{
+        height: 56px;
+        width: 103px;
+        opacity: .5;
+        border: 2px solid #99bbf3;
+        @media (min-width: 432px) and (max-width: 632px) {
+            height: 56px;
+            width: 56px;
+        }
+    }
+    .thumbnail {
+        margin-top: 8px;
+        border-radius: 6px;
+        object-fit: cover;
+        height: 60px;
+        width: 107px;
+    }
+
+    .thumbnail:hover ~ .delete-image-icon {
+        display: block;
+    }
+    .thumbnail-selected {
+        margin-top: 8px;
+        border-radius: 6px;
+        object-fit: cover;
+        height: 60px;
+        width: 107px;
+        border: 2px solid #246FE5;
+    }
+    .blur{
+        box-shadow: inset 0 0 12px #000000;
+        margin-top: 8px;
+        background: #7E8287;
+        font-weight: bold;
+        height: 60px;
+        width: 107px;
+        border-radius: 6px;
+        text-align: center;
+        vertical-align: middle;
+        line-height: 60px;
+    }
+    .blur-selected {
+        box-shadow: inset 0 0 12px #000000;
+        margin-top: 8px;
+        background: #7E8287;
+        font-weight: bold;
+        height: 60px;
+        width: 107px;
+        border-radius: 6px;
+        border: 2px solid #246FE5;
+        text-align: center;
+        vertical-align: middle;
+        line-height: 60px;
+    }
+    .slight-blur{
+        box-shadow: inset 0 0 12px #000000;
+        margin-top: 8px;
+        background: #A4A4A4;
+        font-weight: bold;
+        height: 60px;
+        width: 107px;
+        border-radius: 6px;
+        text-align: center;
+        vertical-align: middle;
+        line-height: 60px;
+    }
+    .slight-blur-selected{
+        box-shadow: inset 0 0 12px #000000;
+        margin-top: 8px;
+        background: #A4A4A4;
+        font-weight: bold;
+        height: 60px;
+        width: 107px;
+        border-radius: 6px;
+        border: 2px solid #246FE5;
+        text-align: center;
+        vertical-align: middle;
+        line-height: 60px;
+    }
+    .virtual-background-none {
+        margin-top: 8px;
+        background: #525252;
+        font-weight: bold;
+        height: 60px;
+        width: 107px;
+        border-radius: 6px;
+        text-align: center;
+        vertical-align: middle;
+        line-height: 60px;
+    }
+    .none-selected {
+        margin-top: 8px;
+        background: #525252;
+        font-weight: bold;
+        height: 60px;
+        width: 107px;
+        border-radius: 6px;
+        border: 2px solid #246FE5;
+        text-align: center;
+        vertical-align: middle;
+        line-height: 60px;
+    }
+    @media (min-width: 432px) and (max-width: 632px) {
+        font-size: 1.5vw;
+        .virtual-background-none, .thumbnail, .thumbnail-selected, .none-selected, .blur, .blur-selected, .slight-blur, .slight-blur-selected{
+            height: 60px;
+            width: 60px;
+        }
+    }
+}
+
+.modal-dialog-form .virtual-background-loading {
+    overflow: hidden;
+}
+.file-upload-btn {
+    display: none;
+}
+.file-upload-label{
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 20px;
+    margin-bottom: 8px;
+    color: #669AEC;
+    display: inline-flex;
+    cursor: pointer;
+}
+
+.delete-image-icon {
+    background: #3d3d3d;
+    position: absolute;
+    display: none;
+    left: 96;
+    bottom: 51;
+    @media (min-width: 432px) and (max-width: 632px) {
+        left: 51px
+    }
+}
+.delete-image-icon:hover {
+    display: block;
+}
+
+.thumbnail-container {
+    position: relative;
+}
+
+.loading-content-text{
+  margin-right: 15px;
+}
+
+.add-background{
+    margin-right: 8px;
+}

debian/jitsi-meet-web.install

@@ -1,6 +1,5 @@
 interface_config.js		/usr/share/jitsi-meet/
 logging_config.js		/usr/share/jitsi-meet/
-*.json					/usr/share/jitsi-meet/
 *.html					/usr/share/jitsi-meet/
 *.ico					/usr/share/jitsi-meet/
 libs					/usr/share/jitsi-meet/

interface_config.js

@@ -1,6 +1,13 @@
 /* eslint-disable no-unused-vars, no-var, max-len */
 /* eslint sort-keys: ["error", "asc", {"caseSensitive": false}] */
 
+/**
+ * !!!IMPORTANT!!!
+ *
+ * This file is considered deprecated. All options will eventually be moved to
+ * config.js, and no new options should be added here.
+ */
+
 var interfaceConfig = {
     APP_NAME: 'Jitsi Meet',
     AUDIO_LEVEL_PRIMARY_COLOR: 'rgba(255,255,255,0.4)',

ios/Podfile

@@ -61,7 +61,6 @@ target 'JitsiMeetSDK' do
   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 'RNGoogleSignin', :path => '../node_modules/@react-native-community/google-signin'

ios/Podfile.lock

@@ -5,8 +5,6 @@ PODS:
   - AppAuth/Core (1.2.0)
   - AppAuth/ExternalUserAgent (1.2.0)
   - boost-for-react-native (1.63.0)
-  - BVLinearGradient (2.5.6):
-    - React
   - CocoaLumberjack (3.5.3):
     - CocoaLumberjack/Core (= 3.5.3)
   - CocoaLumberjack/Core (3.5.3)
@@ -292,7 +290,7 @@ PODS:
     - React
   - react-native-splash-screen (3.2.0):
     - React
-  - react-native-webrtc (1.87.3):
+  - react-native-webrtc (1.89.1):
     - React-Core
   - react-native-webview (11.0.2):
     - React-Core
@@ -371,7 +369,6 @@ PODS:
   - Yoga (1.14.0)
 
 DEPENDENCIES:
-  - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - CocoaLumberjack (~> 3.5.3)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector/`)
@@ -442,8 +439,6 @@ SPEC REPOS:
     - PromisesObjC
 
 EXTERNAL SOURCES:
-  BVLinearGradient:
-    :path: "../node_modules/react-native-linear-gradient"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   FBLazyVector:
@@ -526,7 +521,6 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AppAuth: bce82c76043657c99d91e7882e8a9e1a93650cd4
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
-  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
   FBLazyVector: ca7f56c8ff6cd8590f7a673d7903b06019805581
@@ -563,7 +557,7 @@ SPEC CHECKSUMS:
   react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae
   react-native-netinfo: 8d8db463bcc5db66a8ac5c48a7d86beb3b92f61a
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-webrtc: dc1208bdca2c4d091f7b57859e69332bff6f1986
+  react-native-webrtc: ccb0c21eb4fb04326648fbdb4a5d49977e2cf274
   react-native-webview: b2542d6fd424bcc3e3b2ec5f854f0abb4ec86c87
   React-RCTActionSheet: bcbc311dc3b47bc8efb2737ff0940239a45789a9
   React-RCTAnimation: 65f61080ce632f6dea23d52e354ffac9948396c6
@@ -584,6 +578,6 @@ SPEC CHECKSUMS:
   RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
   Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
 
-PODFILE CHECKSUM: 5be5132e41831a98362eeed760558227a4df89ae
+PODFILE CHECKSUM: d059cebf82da14a53940a16c24c3330752d4b0c8
 
 COCOAPODS: 1.10.1

ios/app/app.xcodeproj/project.pbxproj

@@ -23,12 +23,13 @@
 		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 */; };
-		4E51B75E25E4115F0038575A /* DarwinNotificationCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E51B75D25E4115F0038575A /* DarwinNotificationCenter.m */; };
-		4EC49BB725BEDAC100E76218 /* ReplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EC49B8625BED71300E76218 /* ReplayKit.framework */; };
-		4EC49BBB25BEDAC100E76218 /* SampleHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EC49BBA25BEDAC100E76218 /* SampleHandler.m */; };
-		4EC49BBF25BEDAC100E76218 /* JitsiMeetBroadcast Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 4EC49BB625BEDAC100E76218 /* JitsiMeetBroadcast Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		4EC49BCB25BEDB6400E76218 /* SocketConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EC49BCA25BEDB6400E76218 /* SocketConnection.m */; };
-		4EC49BD125BF19CF00E76218 /* SampleUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EC49BD025BF19CF00E76218 /* SampleUploader.m */; };
+		4E90F9402632D1AB001102D4 /* Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E90F93F2632D1AB001102D4 /* Atomic.swift */; };
+		4EB06024260E026600F524C5 /* ReplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EC49B8625BED71300E76218 /* ReplayKit.framework */; };
+		4EB06027260E026600F524C5 /* SampleHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB06026260E026600F524C5 /* SampleHandler.swift */; };
+		4EB0602B260E026600F524C5 /* JitsiMeetBroadcastExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		4EB0603C260E09D000F524C5 /* SocketConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB06039260E09D000F524C5 /* SocketConnection.swift */; };
+		4EB0603D260E09D000F524C5 /* DarwinNotificationCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603A260E09D000F524C5 /* DarwinNotificationCenter.swift */; };
+		4EB0603E260E09D000F524C5 /* SampleUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603B260E09D000F524C5 /* SampleUploader.swift */; };
 		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, ); }; };
@@ -54,11 +55,11 @@
 			remoteGlobalIDString = 0BEA5C241F7B8F73000D0AB4;
 			remoteInfo = JitsiMeetCompanion;
 		};
-		4EC49BBD25BEDAC100E76218 /* PBXContainerItemProxy */ = {
+		4EB06029260E026600F524C5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 4EC49BB525BEDAC100E76218;
+			remoteGlobalIDString = 4EB06022260E026600F524C5;
 			remoteInfo = "JitsiMeetBroadcast Extension";
 		};
 /* End PBXContainerItemProxy section */
@@ -104,7 +105,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
-				4EC49BBF25BEDAC100E76218 /* JitsiMeetBroadcast Extension.appex in Embed App Extensions */,
+				4EB0602B260E026600F524C5 /* JitsiMeetBroadcastExtension.appex in Embed App Extensions */,
 			);
 			name = "Embed App Extensions";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -139,19 +140,18 @@
 		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>"; };
-		4E51B75C25E4115F0038575A /* DarwinNotificationCenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DarwinNotificationCenter.h; sourceTree = "<group>"; };
-		4E51B75D25E4115F0038575A /* DarwinNotificationCenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DarwinNotificationCenter.m; sourceTree = "<group>"; };
+		4E90F93F2632D1AB001102D4 /* Atomic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Atomic.swift; sourceTree = "<group>"; };
+		4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = JitsiMeetBroadcastExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
+		4EB06026260E026600F524C5 /* SampleHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleHandler.swift; sourceTree = "<group>"; };
+		4EB06028260E026600F524C5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		4EB06032260E08CC00F524C5 /* extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = extension.entitlements; sourceTree = "<group>"; };
+		4EB06039260E09D000F524C5 /* SocketConnection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketConnection.swift; sourceTree = "<group>"; };
+		4EB0603A260E09D000F524C5 /* DarwinNotificationCenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DarwinNotificationCenter.swift; sourceTree = "<group>"; };
+		4EB0603B260E09D000F524C5 /* SampleUploader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SampleUploader.swift; sourceTree = "<group>"; };
 		4EC49B8625BED71300E76218 /* ReplayKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReplayKit.framework; path = System/Library/Frameworks/ReplayKit.framework; sourceTree = SDKROOT; };
-		4EC49BB625BEDAC100E76218 /* JitsiMeetBroadcast Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "JitsiMeetBroadcast Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
-		4EC49BB925BEDAC100E76218 /* SampleHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SampleHandler.h; sourceTree = "<group>"; };
-		4EC49BBA25BEDAC100E76218 /* SampleHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SampleHandler.m; sourceTree = "<group>"; };
-		4EC49BBC25BEDAC100E76218 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		4EC49BC925BEDB6400E76218 /* SocketConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SocketConnection.h; sourceTree = "<group>"; };
-		4EC49BCA25BEDB6400E76218 /* SocketConnection.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SocketConnection.m; sourceTree = "<group>"; };
-		4EC49BCF25BF19CF00E76218 /* SampleUploader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SampleUploader.h; sourceTree = "<group>"; };
-		4EC49BD025BF19CF00E76218 /* SampleUploader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SampleUploader.m; sourceTree = "<group>"; };
-		4EC49BDB25BF280A00E76218 /* extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = extension.entitlements; sourceTree = "<group>"; };
+		5FEF9D87A4D2A38AD7193308 /* Pods-JitsiMeet-JitsiMeetBroadcastExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet-JitsiMeetBroadcastExtension.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet-JitsiMeetBroadcastExtension/Pods-JitsiMeet-JitsiMeetBroadcastExtension.release.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>"; };
+		A7B2827E068A0E05260054AC /* Pods-JitsiMeet-JitsiMeetBroadcastExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet-JitsiMeetBroadcastExtension.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet-JitsiMeetBroadcastExtension/Pods-JitsiMeet-JitsiMeetBroadcastExtension.debug.xcconfig"; sourceTree = "<group>"; };
 		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>"; };
@@ -189,11 +189,11 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		4EC49BB325BEDAC100E76218 /* Frameworks */ = {
+		4EB06020260E026600F524C5 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4EC49BB725BEDAC100E76218 /* ReplayKit.framework in Frameworks */,
+				4EB06024260E026600F524C5 /* ReplayKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -261,23 +261,22 @@
 			path = src;
 			sourceTree = "<group>";
 		};
-		4EC49BB825BEDAC100E76218 /* JitsiMeetBroadcast Extension */ = {
+		4EB06025260E026600F524C5 /* JitsiMeetBroadcast Extension */ = {
 			isa = PBXGroup;
 			children = (
-				4EC49BDB25BF280A00E76218 /* extension.entitlements */,
-				4EC49BB925BEDAC100E76218 /* SampleHandler.h */,
-				4EC49BBA25BEDAC100E76218 /* SampleHandler.m */,
-				4EC49BC925BEDB6400E76218 /* SocketConnection.h */,
-				4EC49BCA25BEDB6400E76218 /* SocketConnection.m */,
-				4EC49BCF25BF19CF00E76218 /* SampleUploader.h */,
-				4EC49BD025BF19CF00E76218 /* SampleUploader.m */,
-				4EC49BBC25BEDAC100E76218 /* Info.plist */,
-				4E51B75C25E4115F0038575A /* DarwinNotificationCenter.h */,
-				4E51B75D25E4115F0038575A /* DarwinNotificationCenter.m */,
+				4EB06032260E08CC00F524C5 /* extension.entitlements */,
+				4EB06026260E026600F524C5 /* SampleHandler.swift */,
+				4EB0603B260E09D000F524C5 /* SampleUploader.swift */,
+				4EB06039260E09D000F524C5 /* SocketConnection.swift */,
+				4EB0603A260E09D000F524C5 /* DarwinNotificationCenter.swift */,
+				4E90F93F2632D1AB001102D4 /* Atomic.swift */,
+				4EB06028260E026600F524C5 /* Info.plist */,
 			);
+			indentWidth = 4;
 			name = "JitsiMeetBroadcast Extension";
 			path = "broadcast-extension";
 			sourceTree = "<group>";
+			tabWidth = 4;
 		};
 		5E96ADD5E49F3B3822EF9A52 /* Pods */ = {
 			isa = PBXGroup;
@@ -286,6 +285,8 @@
 				09AA3B93E4CC62D84B424690 /* Pods-jitsi-meet.release.xcconfig */,
 				609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */,
 				FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */,
+				A7B2827E068A0E05260054AC /* Pods-JitsiMeet-JitsiMeetBroadcastExtension.debug.xcconfig */,
+				5FEF9D87A4D2A38AD7193308 /* Pods-JitsiMeet-JitsiMeetBroadcastExtension.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -299,8 +300,8 @@
 				13B07FAE1A68108700A75B9A /* src */,
 				5E96ADD5E49F3B3822EF9A52 /* Pods */,
 				0BEA5C261F7B8F73000D0AB4 /* Watch app */,
-				4EC49BB825BEDAC100E76218 /* JitsiMeetBroadcast Extension */,
 				0BEA5C351F7B8F73000D0AB4 /* WatchKit extension */,
+				4EB06025260E026600F524C5 /* JitsiMeetBroadcast Extension */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -312,7 +313,7 @@
 				13B07F961A680F5B00A75B9A /* jitsi-meet.app */,
 				0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */,
 				0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */,
-				4EC49BB625BEDAC100E76218 /* JitsiMeetBroadcast Extension.appex */,
+				4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -376,28 +377,28 @@
 			);
 			dependencies = (
 				0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */,
-				4EC49BBE25BEDAC100E76218 /* PBXTargetDependency */,
+				4EB0602A260E026600F524C5 /* PBXTargetDependency */,
 			);
 			name = JitsiMeet;
 			productName = "Jitsi Meet";
 			productReference = 13B07F961A680F5B00A75B9A /* jitsi-meet.app */;
 			productType = "com.apple.product-type.application";
 		};
-		4EC49BB525BEDAC100E76218 /* JitsiMeetBroadcast Extension */ = {
+		4EB06022260E026600F524C5 /* JitsiMeetBroadcastExtension */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 4EC49BC025BEDAC100E76218 /* Build configuration list for PBXNativeTarget "JitsiMeetBroadcast Extension" */;
+			buildConfigurationList = 4EB0602C260E026700F524C5 /* Build configuration list for PBXNativeTarget "JitsiMeetBroadcastExtension" */;
 			buildPhases = (
-				4EC49BB225BEDAC100E76218 /* Sources */,
-				4EC49BB325BEDAC100E76218 /* Frameworks */,
-				4EC49BB425BEDAC100E76218 /* Resources */,
+				4EB0601F260E026600F524C5 /* Sources */,
+				4EB06020260E026600F524C5 /* Frameworks */,
+				4EB06021260E026600F524C5 /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
-			name = "JitsiMeetBroadcast Extension";
+			name = JitsiMeetBroadcastExtension;
 			productName = "JitsiMeetBroadcast Extension";
-			productReference = 4EC49BB625BEDAC100E76218 /* JitsiMeetBroadcast Extension.appex */;
+			productReference = 4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */;
 			productType = "com.apple.product-type.app-extension";
 		};
 /* End PBXNativeTarget section */
@@ -406,6 +407,7 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 1240;
 				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
@@ -429,8 +431,8 @@
 							};
 						};
 					};
-					4EC49BB525BEDAC100E76218 = {
-						CreatedOnToolsVersion = 12.2;
+					4EB06022260E026600F524C5 = {
+						CreatedOnToolsVersion = 12.4;
 					};
 				};
 			};
@@ -450,7 +452,7 @@
 				13B07F861A680F5B00A75B9A /* JitsiMeet */,
 				0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */,
 				0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */,
-				4EC49BB525BEDAC100E76218 /* JitsiMeetBroadcast Extension */,
+				4EB06022260E026600F524C5 /* JitsiMeetBroadcastExtension */,
 			);
 		};
 /* End PBXProject section */
@@ -483,7 +485,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		4EC49BB425BEDAC100E76218 /* Resources */ = {
+		4EB06021260E026600F524C5 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -625,14 +627,15 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		4EC49BB225BEDAC100E76218 /* Sources */ = {
+		4EB0601F260E026600F524C5 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4EC49BCB25BEDB6400E76218 /* SocketConnection.m in Sources */,
-				4EC49BBB25BEDAC100E76218 /* SampleHandler.m in Sources */,
-				4E51B75E25E4115F0038575A /* DarwinNotificationCenter.m in Sources */,
-				4EC49BD125BF19CF00E76218 /* SampleUploader.m in Sources */,
+				4EB0603C260E09D000F524C5 /* SocketConnection.swift in Sources */,
+				4EB0603E260E09D000F524C5 /* SampleUploader.swift in Sources */,
+				4EB0603D260E09D000F524C5 /* DarwinNotificationCenter.swift in Sources */,
+				4EB06027260E026600F524C5 /* SampleHandler.swift in Sources */,
+				4E90F9402632D1AB001102D4 /* Atomic.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -649,10 +652,10 @@
 			target = 0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */;
 			targetProxy = 0BEA5C3F1F7B8F73000D0AB4 /* PBXContainerItemProxy */;
 		};
-		4EC49BBE25BEDAC100E76218 /* PBXTargetDependency */ = {
+		4EB0602A260E026600F524C5 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 4EC49BB525BEDAC100E76218 /* JitsiMeetBroadcast Extension */;
-			targetProxy = 4EC49BBD25BEDAC100E76218 /* PBXContainerItemProxy */;
+			target = 4EB06022260E026600F524C5 /* JitsiMeetBroadcastExtension */;
+			targetProxy = 4EB06029260E026600F524C5 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -879,7 +882,7 @@
 			};
 			name = Release;
 		};
-		4EC49BC125BEDAC100E76218 /* Debug */ = {
+		4EB0602D260E026700F524C5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
@@ -890,13 +893,13 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "broadcast-extension/extension.entitlements";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = FC967L3QRG;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "broadcast-extension/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -907,11 +910,14 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.broadcast.extension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
-		4EC49BC225BEDAC100E76218 /* Release */ = {
+		4EB0602E260E026700F524C5 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
@@ -922,14 +928,14 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "broadcast-extension/extension.entitlements";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = FC967L3QRG;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "broadcast-extension/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -939,6 +945,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.broadcast.extension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1087,11 +1095,11 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		4EC49BC025BEDAC100E76218 /* Build configuration list for PBXNativeTarget "JitsiMeetBroadcast Extension" */ = {
+		4EB0602C260E026700F524C5 /* Build configuration list for PBXNativeTarget "JitsiMeetBroadcastExtension" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				4EC49BC125BEDAC100E76218 /* Debug */,
-				4EC49BC225BEDAC100E76218 /* Release */,
+				4EB0602D260E026700F524C5 /* Debug */,
+				4EB0602E260E026700F524C5 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

ios/app/broadcast-extension/Atomic.swift

@@ -0,0 +1,30 @@
+
+import Foundation
+
+@propertyWrapper
+struct Atomic<Value> {
+
+    private var value: Value
+    private let lock = NSLock()
+
+    init(wrappedValue value: Value) {
+        self.value = value
+    }
+
+    var wrappedValue: Value {
+      get { return load() }
+      set { store(newValue: newValue) }
+    }
+
+    func load() -> Value {
+        lock.lock()
+        defer { lock.unlock() }
+        return value
+    }
+
+    mutating func store(newValue: Value) {
+        lock.lock()
+        defer { lock.unlock() }
+        value = newValue
+    }
+}

ios/app/broadcast-extension/DarwinNotificationCenter.h

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

ios/app/broadcast-extension/DarwinNotificationCenter.m

@@ -1,50 +0,0 @@
-/*
- * Copyright @ 2021-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 "DarwinNotificationCenter.h"
-
-NSNotificationName const kBroadcastStartedNotification = @"iOS_BroadcastStarted";
-NSNotificationName const kBroadcastStoppedNotification = @"iOS_BroadcastStopped";
-
-@implementation DarwinNotificationCenter {
-  CFNotificationCenterRef _notificationCenter;
-}
-
-+ (instancetype)sharedInstance {
-  static DarwinNotificationCenter *sharedInstance = nil;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-      sharedInstance = [[self alloc] init];
-  });
-  
-  return sharedInstance;
-}
-
-- (instancetype)init {
-  self = [super init];
-  if (self) {
-    _notificationCenter = CFNotificationCenterGetDarwinNotifyCenter();
-  }
-  
-  return self;
-}
-
-- (void)postNotificationWithName:(NSString*)name {
-  CFNotificationCenterPostNotification(_notificationCenter, (__bridge CFStringRef)name, NULL, NULL, true);
-}
-
-@end
-

ios/app/broadcast-extension/DarwinNotificationCenter.swift

@@ -0,0 +1,37 @@
+/*
+ * Copyright @ 2021-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import Foundation
+
+enum DarwinNotification: String {
+    case broadcastStarted = "iOS_BroadcastStarted"
+    case broadcastStopped = "iOS_BroadcastStopped"
+}
+
+class DarwinNotificationCenter {
+    
+    static var shared = DarwinNotificationCenter()
+    
+    private var notificationCenter: CFNotificationCenter
+    
+    init() {
+        notificationCenter = CFNotificationCenterGetDarwinNotifyCenter()
+    }
+    
+    func postNotification(_ name: DarwinNotification) {
+        CFNotificationCenterPostNotification(notificationCenter, CFNotificationName(rawValue: name.rawValue as CFString), nil, nil, true)
+    }
+}

ios/app/broadcast-extension/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>JitsiMeet Broadcast Extension</string>
+	<string>Jitsi Meet Broadcast Extension</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>21.0.0</string>
+	<string>21.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>
@@ -25,7 +25,7 @@
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.broadcast-services-upload</string>
 		<key>NSExtensionPrincipalClass</key>
-		<string>SampleHandler</string>
+		<string>$(PRODUCT_MODULE_NAME).SampleHandler</string>
 		<key>RPBroadcastProcessMode</key>
 		<string>RPBroadcastProcessModeSampleBuffer</string>
 	</dict>

ios/app/broadcast-extension/SampleHandler.h

@@ -1,21 +0,0 @@
-/*
- * Copyright @ 2021-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 <ReplayKit/ReplayKit.h>
-
-@interface SampleHandler : RPBroadcastSampleHandler
-
-@end

ios/app/broadcast-extension/SampleHandler.m

@@ -1,123 +0,0 @@
-/*
- * Copyright @ 2021-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 "SampleHandler.h"
-#import "SocketConnection.h"
-#import "SampleUploader.h"
-#import "DarwinNotificationCenter.h"
-
-@interface SampleHandler ()
-
-@property (nonatomic, retain) SocketConnection *clientConnection;
-@property (nonatomic, retain) SampleUploader *uploader;
-
-@end
-
-@implementation SampleHandler
-
-- (instancetype)init {
-  self = [super init];
-  if (self) {
-    self.clientConnection = [[SocketConnection alloc] initWithFilePath:self.socketFilePath];
-    [self setupConnection];
-    
-    self.uploader = [[SampleUploader alloc] initWithConnection:self.clientConnection];    
-  }
-  
-  return self;
-}
-
-- (void)broadcastStartedWithSetupInfo:(NSDictionary<NSString *,NSObject *> *)setupInfo {
-  // User has requested to start the broadcast. Setup info from the UI extension can be supplied but optional.
-  NSLog(@"broadcast started");
-  
-  [[DarwinNotificationCenter sharedInstance] postNotificationWithName:kBroadcastStartedNotification];
-  [self openConnection];
-}
-
-- (void)broadcastPaused {
-    // User has requested to pause the broadcast. Samples will stop being delivered.
-}
-
-- (void)broadcastResumed {
-    // User has requested to resume the broadcast. Samples delivery will resume.
-}
-
-- (void)broadcastFinished {
-    // User has requested to finish the broadcast.
-  [[DarwinNotificationCenter sharedInstance] postNotificationWithName:kBroadcastStoppedNotification];
-  [self.clientConnection close];
-}
-
-- (void)processSampleBuffer:(CMSampleBufferRef)sampleBuffer withType:(RPSampleBufferType)sampleBufferType {
-  static NSUInteger frameCount = 0;
-  switch (sampleBufferType) {
-    case RPSampleBufferTypeVideo:
-      // adjust frame rate by using every third frame
-      if (++frameCount%3 == 0 && self.uploader.isReady) {
-        [self.uploader sendSample:sampleBuffer];
-      }
-      break;
-
-    default:
-      break;
-  }
-}
-
-// MARK: Private Methods
-
-- (NSString *)socketFilePath {
-    // the appGroupIdentifier must match the value provided in the app's info.plist for the RTCAppGroupIdentifier key
-    NSString *appGroupIdentifier = @"group.org.jitsi.meet.appgroup";
-    NSURL *sharedContainer = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:appGroupIdentifier];
-    NSString *socketFilePath = [[sharedContainer URLByAppendingPathComponent:@"rtc_SSFD"] path];
-      
-    return socketFilePath;
-}
-
-- (void)setupConnection {
-  __weak __typeof(self) weakSelf = self;
-  self.clientConnection.didClose = ^(NSError *error) {
-    NSLog(@"client connection did close: %@", error);
-    if (error) {
-      [weakSelf finishBroadcastWithError:error];
-    }
-    else {
-      NSInteger JMScreenSharingStopped = 10001;
-      NSError *customError = [NSError errorWithDomain:RPRecordingErrorDomain
-                                                 code:JMScreenSharingStopped
-                                             userInfo:@{NSLocalizedDescriptionKey: @"Screen sharing stopped"}];
-      [weakSelf finishBroadcastWithError:customError];
-    }
-  };
-}
-
-- (void)openConnection {
-  dispatch_queue_t queue = dispatch_queue_create("org.jitsi.meet.broadcast.connectTimer", 0);
-  dispatch_source_t timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue);
-  dispatch_source_set_timer(timer, dispatch_walltime(NULL, 0), 0.1 * NSEC_PER_SEC, 0.1 * NSEC_PER_SEC);
-  
-  dispatch_source_set_event_handler(timer, ^{
-    BOOL success = [self.clientConnection open];
-    if (success) {
-      dispatch_source_cancel(timer);
-    }
-  });
-
-  dispatch_resume(timer);
-}
-
-@end

ios/app/broadcast-extension/SampleHandler.swift

@@ -0,0 +1,117 @@
+/*
+ * Copyright @ 2021-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 ReplayKit
+import JitsiMeetSDK
+
+private enum Constants {
+    // the App Group ID value that the app and the broadcast extension targets are setup with. It differs for each app.
+    static let appGroupIdentifier = "group.org.jitsi.meet.appgroup"
+}
+
+class SampleHandler: RPBroadcastSampleHandler {
+    
+    private var clientConnection: SocketConnection?
+    private var uploader: SampleUploader?
+    
+    private var frameCount: Int = 0
+    
+    var socketFilePath: String {
+      let sharedContainer = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: Constants.appGroupIdentifier)
+        
+        return sharedContainer?.appendingPathComponent("rtc_SSFD").path ?? ""
+    }
+    
+    override init() {
+      super.init()
+        if let connection = SocketConnection(filePath: socketFilePath) {
+          clientConnection = connection
+          setupConnection()
+          
+          uploader = SampleUploader(connection: connection)
+        }
+    }
+
+    override func broadcastStarted(withSetupInfo setupInfo: [String: NSObject]?) {
+        // User has requested to start the broadcast. Setup info from the UI extension can be supplied but optional.
+        print("broadcast started")
+        
+        frameCount = 0
+        
+        DarwinNotificationCenter.shared.postNotification(.broadcastStarted)
+        openConnection()
+    }
+    
+    override func broadcastPaused() {
+        // User has requested to pause the broadcast. Samples will stop being delivered.
+    }
+    
+    override func broadcastResumed() {
+        // User has requested to resume the broadcast. Samples delivery will resume.
+    }
+    
+    override func broadcastFinished() {
+        // User has requested to finish the broadcast.
+        DarwinNotificationCenter.shared.postNotification(.broadcastStopped)
+        clientConnection?.close()
+    }
+    
+    override func processSampleBuffer(_ sampleBuffer: CMSampleBuffer, with sampleBufferType: RPSampleBufferType) {
+        switch sampleBufferType {
+        case RPSampleBufferType.video:
+            // very simple mechanism for adjusting frame rate by using every third frame
+            frameCount += 1
+            if frameCount % 3 == 0 {
+                uploader?.send(sample: sampleBuffer)
+            }
+        default:
+            break
+        }
+    }
+}
+
+private extension SampleHandler {
+  
+    func setupConnection() {
+        clientConnection?.didClose = { [weak self] error in
+            print("client connection did close \(String(describing: error))")
+          
+            if let error = error {
+                self?.finishBroadcastWithError(error)
+            } else {
+                // the displayed failure message is more user friendly when using NSError instead of Error
+                let JMScreenSharingStopped = 10001
+                let customError = NSError(domain: RPRecordingErrorDomain, code: JMScreenSharingStopped, userInfo: [NSLocalizedDescriptionKey: "Screen sharing stopped"])
+                self?.finishBroadcastWithError(customError)
+            }
+        }
+    }
+    
+    func openConnection() {
+        let queue = DispatchQueue(label: "broadcast.connectTimer")
+        let timer = DispatchSource.makeTimerSource(queue: queue)
+        timer.schedule(deadline: .now(), repeating: .milliseconds(100), leeway: .milliseconds(500))
+        timer.setEventHandler { [weak self] in
+            guard self?.clientConnection?.open() == true else {
+                return
+            }
+            
+            timer.cancel()
+        }
+        
+        timer.resume()
+    }
+}

ios/app/broadcast-extension/SampleUploader.h

@@ -1,33 +0,0 @@
-/*
- * Copyright @ 2021-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import <ReplayKit/ReplayKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class SocketConnection;
-
-@interface SampleUploader : NSObject
-
-@property (nonatomic, assign, readonly) BOOL isReady;
-
-- (instancetype)initWithConnection:(SocketConnection *)connection;
-- (void)sendSample:(CMSampleBufferRef)sampleBuffer;
-
-@end
-
-NS_ASSUME_NONNULL_END

ios/app/broadcast-extension/SampleUploader.m

@@ -1,155 +0,0 @@
-/*
- * Copyright @ 2021-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 <MessageUI/MessageUI.h>
-#import <ReplayKit/ReplayKit.h>
-
-#import "SampleUploader.h"
-#import "SocketConnection.h"
-
-static const NSInteger kBufferMaxLenght = 10 * 1024;
-
-@interface SampleUploader ()
-
-@property (nonatomic, assign) BOOL isReady;
-
-@property (nonatomic, strong) dispatch_queue_t serialQueue;
-@property (nonatomic, strong) SocketConnection *connection;
-@property (nonatomic, strong) CIContext *imageContext;
-
-@property (nonatomic, strong) NSData *dataToSend;
-@property (nonatomic, assign) NSUInteger byteIndex;
-
-@end
-
-@implementation SampleUploader
-
-- (instancetype)initWithConnection:(SocketConnection *)connection {
-  self = [super init];
-  if (self) {
-    self.serialQueue = dispatch_queue_create("org.jitsi.meet.broadcast.sampleUploader", DISPATCH_QUEUE_SERIAL);
-    
-    self.connection = connection;
-    [self setupConnection];
-    
-    self.imageContext = [[CIContext alloc] initWithOptions:nil];
-    self.isReady = false;
-  }
-  
-  return self;
-}
-
-- (void)sendSample:(CMSampleBufferRef)sampleBuffer {
-  self.isReady = false;
-  
-  self.dataToSend = [self prepareSample:sampleBuffer];
-  self.byteIndex = 0;
-  
-  dispatch_async(self.serialQueue, ^{
-    [self sendData];
-  });
-}
-
-// MARK: Private Methods
-
-- (void)setupConnection {
-  __weak __typeof(self) weakSelf = self;
-  self.connection.didOpen = ^{
-    weakSelf.isReady = true;
-  };
-  self.connection.streamHasSpaceAvailable = ^{
-    dispatch_async(weakSelf.serialQueue, ^{
-      weakSelf.isReady = ![weakSelf sendData];
-    });
-  };
-}
-
-/**
- This function downscales and converts to jpeg the provided sample buffer, then wraps the resulted image data into a CFHTTPMessageRef. Returns the serialized CFHTTPMessageRef.
- */
-- (NSData *)prepareSample:(CMSampleBufferRef)sampleBuffer {
-  CVImageBufferRef imageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
-    
-  CVPixelBufferLockBaseAddress(imageBuffer, kCVPixelBufferLock_ReadOnly);
-  
-  CGFloat scaleFactor = 2;
-  size_t width = CVPixelBufferGetWidth(imageBuffer)/scaleFactor;
-  size_t height = CVPixelBufferGetHeight(imageBuffer)/scaleFactor;
-    
-  CGAffineTransform scaleTransform = CGAffineTransformMakeScale(1/scaleFactor, 1/scaleFactor);
-  NSData *bufferData = [self jpegDataFromPixelBuffer:imageBuffer withScaling:scaleTransform];
-  
-  CVPixelBufferUnlockBaseAddress(imageBuffer, kCVPixelBufferLock_ReadOnly);
-  
-  if (bufferData) {
-    CFHTTPMessageRef httpResponse = CFHTTPMessageCreateResponse(kCFAllocatorDefault, 200, NULL, kCFHTTPVersion1_1);
-    CFHTTPMessageSetHeaderFieldValue(httpResponse, (__bridge CFStringRef)@"Content-Length", (__bridge CFStringRef)[NSString stringWithFormat:@"%ld", bufferData.length]);
-    CFHTTPMessageSetHeaderFieldValue(httpResponse, (__bridge CFStringRef)@"Buffer-Width", (__bridge CFStringRef)[NSString stringWithFormat:@"%ld", width]);
-    CFHTTPMessageSetHeaderFieldValue(httpResponse, (__bridge CFStringRef)@"Buffer-Height", (__bridge CFStringRef)[NSString stringWithFormat:@"%ld", height]);
-
-    CFHTTPMessageSetBody(httpResponse, (__bridge CFDataRef)bufferData);
-
-    CFDataRef serializedMessage = CFHTTPMessageCopySerializedMessage(httpResponse);
-    CFRelease(httpResponse);
-    
-    return CFBridgingRelease(serializedMessage);
-  }
-  
-  return nil;
-}
-
-- (BOOL)sendData {
-  if (!self.dataToSend) {
-    NSLog(@"no data to send");
-    return false;
-  }
-
-  NSUInteger bytesLeft = self.dataToSend.length - self.byteIndex;
-  
-  NSInteger length = bytesLeft > kBufferMaxLenght ? kBufferMaxLenght : bytesLeft;
-  uint8_t buffer[length];
-  [self.dataToSend getBytes:&buffer range:NSMakeRange(self.byteIndex, length)];
-
-  length = [self.connection writeBufferToStream:buffer maxLength:length];
-  if (length > 0) {
-    self.byteIndex += length;
-    bytesLeft -= length;
-
-    if (bytesLeft == 0) {
-      NSLog(@"video sample processed successfully");
-      self.dataToSend = nil;
-      self.byteIndex = 0;
-    }
-  }
-  else {
-    NSLog(@"writeBufferToStream failure");
-  }
-  
-  return true;
-}
-
-- (NSData *)jpegDataFromPixelBuffer:(CVPixelBufferRef)pixelBuffer withScaling:(CGAffineTransform)scaleTransform {
-  CIImage *image = [[CIImage alloc] initWithCVPixelBuffer:pixelBuffer];
-  image = [image imageByApplyingTransform:scaleTransform];
-  
-  NSDictionary *options = @{(NSString *)kCGImageDestinationLossyCompressionQuality: [NSNumber numberWithFloat:1.0]};
-  NSData *imageData = [self.imageContext JPEGRepresentationOfImage:image
-                                                        colorSpace:image.colorSpace
-                                                           options:options];
-  return imageData;
-}
-
-@end

ios/app/broadcast-extension/SampleUploader.swift

@@ -0,0 +1,154 @@
+/*
+ * Copyright @ 2021-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import Foundation
+import ReplayKit
+
+private enum Constants {
+    static let bufferMaxLength = 10240
+}
+
+class SampleUploader {
+    
+    private static var imageContext = CIContext(options: nil)
+    
+    @Atomic private var isReady: Bool = false
+    private var connection: SocketConnection
+  
+    private var dataToSend: Data?
+    private var byteIndex = 0
+  
+    private let serialQueue: DispatchQueue
+    
+    init(connection: SocketConnection) {
+        self.connection = connection
+        self.serialQueue = DispatchQueue(label: "org.jitsi.meet.broadcast.sampleUploader")
+      
+        setupConnection()
+    }
+  
+    @discardableResult func send(sample buffer: CMSampleBuffer) -> Bool {
+        guard isReady == true else {
+            return false
+        }
+        
+        isReady = false
+
+        dataToSend = prepare(sample: buffer)
+        byteIndex = 0
+
+        serialQueue.async { [weak self] in
+            self?.sendDataChunk()
+        }
+        
+        return true
+    }
+}
+
+private extension SampleUploader {
+    
+    func setupConnection() {
+        connection.didOpen = { [weak self] in
+            self?.isReady = true
+        }
+        connection.streamHasSpaceAvailable = { [weak self] in
+            self?.serialQueue.async {
+                self?.isReady = !(self?.sendDataChunk() ?? true)
+            }
+        }
+    }
+    
+    @discardableResult func sendDataChunk() -> Bool {
+        guard let dataToSend = dataToSend else {
+            return false
+        }
+      
+        var bytesLeft = dataToSend.count - byteIndex
+        var length = bytesLeft > Constants.bufferMaxLength ? Constants.bufferMaxLength : bytesLeft
+
+        length = dataToSend[byteIndex..<(byteIndex + length)].withUnsafeBytes {
+            guard let ptr = $0.bindMemory(to: UInt8.self).baseAddress else {
+                return 0
+            }
+          
+            return connection.writeToStream(buffer: ptr, maxLength: length)
+        }
+
+        if length > 0 {
+            byteIndex += length
+            bytesLeft -= length
+
+            if bytesLeft == 0 {
+                self.dataToSend = nil
+                byteIndex = 0
+            }
+        } else {
+            print("writeBufferToStream failure")
+        }
+      
+        return true
+    }
+    
+    func prepare(sample buffer: CMSampleBuffer) -> Data? {
+        guard let imageBuffer = CMSampleBufferGetImageBuffer(buffer) else {
+            print("image buffer not available")
+            return nil
+        }
+        
+        CVPixelBufferLockBaseAddress(imageBuffer, .readOnly)
+        
+        let scaleFactor = 2.0
+        let width = CVPixelBufferGetWidth(imageBuffer)/Int(scaleFactor)
+        let height = CVPixelBufferGetHeight(imageBuffer)/Int(scaleFactor)
+        let orientation = CMGetAttachment(buffer, key: RPVideoSampleOrientationKey as CFString, attachmentModeOut: nil)?.uintValue ?? 0
+                                    
+        let scaleTransform = CGAffineTransform(scaleX: CGFloat(1.0/scaleFactor), y: CGFloat(1.0/scaleFactor))
+        let bufferData = self.jpegData(from: imageBuffer, scale: scaleTransform)
+        
+        CVPixelBufferUnlockBaseAddress(imageBuffer, .readOnly)
+        
+        guard let messageData = bufferData else {
+            print("corrupted image buffer")
+            return nil
+        }
+              
+        let httpResponse = CFHTTPMessageCreateResponse(nil, 200, nil, kCFHTTPVersion1_1).takeRetainedValue()
+        CFHTTPMessageSetHeaderFieldValue(httpResponse, "Content-Length" as CFString, String(messageData.count) as CFString)
+        CFHTTPMessageSetHeaderFieldValue(httpResponse, "Buffer-Width" as CFString, String(width) as CFString)
+        CFHTTPMessageSetHeaderFieldValue(httpResponse, "Buffer-Height" as CFString, String(height) as CFString)
+        CFHTTPMessageSetHeaderFieldValue(httpResponse, "Buffer-Orientation" as CFString, String(orientation) as CFString)
+        
+        CFHTTPMessageSetBody(httpResponse, messageData as CFData)
+        
+        let serializedMessage = CFHTTPMessageCopySerializedMessage(httpResponse)?.takeRetainedValue() as Data?
+      
+        return serializedMessage
+    }
+    
+    func jpegData(from buffer: CVPixelBuffer, scale scaleTransform: CGAffineTransform) -> Data? {
+        var image = CIImage(cvPixelBuffer: buffer)
+        image = image.transformed(by: scaleTransform)
+        
+        guard let colorSpace = image.colorSpace else {
+            return nil
+        }
+      
+        let options: [CIImageRepresentationOption: Float] = [kCGImageDestinationLossyCompressionQuality as CIImageRepresentationOption: 1.0]
+        let imageData = SampleUploader.imageContext.jpegRepresentation(of: image, colorSpace: colorSpace, options: options)
+      
+        return imageData
+    }
+}

ios/app/broadcast-extension/SocketConnection.h

@@ -1,34 +0,0 @@
-/*
- * Copyright @ 2021-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface SocketConnection : NSObject
-
-@property (nonatomic, copy, nullable) void (^didOpen)(void);
-@property (nonatomic, copy, nullable) void (^didClose)(NSError*);
-@property (nonatomic, copy, nullable) void (^streamHasSpaceAvailable)(void);
-
-- (instancetype)initWithFilePath:(nonnull NSString *)filePath;
-- (BOOL)open;
-- (void)close;
-- (NSInteger)writeBufferToStream:(const uint8_t*)buffer maxLength:(NSInteger)length;
-
-@end
-
-NS_ASSUME_NONNULL_END

ios/app/broadcast-extension/SocketConnection.m

@@ -1,189 +0,0 @@
-/*
- * Copyright @ 2021-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.
- */
-
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#import "SocketConnection.h"
-
-@interface SocketConnection () <NSStreamDelegate>
-
-@property (nonatomic, copy) NSString *filePath;
-
-@property (nonatomic, strong) NSInputStream *inputStream;
-@property (nonatomic, strong) NSOutputStream *outputStream;
-
-@property (nonatomic, strong) NSThread *networkThread;
-
-@end
-
-@implementation SocketConnection {
-  int _socket;
-  struct sockaddr_un _socketAddr;
-}
-
-- (instancetype)initWithFilePath:(NSString *)path {
-  self = [super init];
-  if (self) {
-    self.filePath = path;
-    
-    [self setupSocketWithFilePath:path];
-    [self setupNetworkThread];
-  }
-  
-  return self;
-}
-
-- (BOOL)open {
-  NSLog(@"Open socket connection");
-  
-  if (![[NSFileManager defaultManager] fileExistsAtPath:self.filePath]) {
-      NSLog(@"failure: socket file missing");
-      return false;
-  }
-
-  int status = connect(_socket, (struct sockaddr *)&_socketAddr, sizeof(_socketAddr));
-  if (status < 0) {
-      NSLog(@"failure: socket connect (%d)", status);
-      return false;
-  }
-  
-  [self.networkThread start];
-
-  CFReadStreamRef readStream;
-  CFWriteStreamRef writeStream;
-
-  CFStreamCreatePairWithSocket(kCFAllocatorDefault, _socket, &readStream, &writeStream);
-
-  self.inputStream = (__bridge_transfer NSInputStream *)readStream;
-  self.inputStream.delegate = self;
-  [self.inputStream setProperty:@"kCFBooleanTrue" forKey:@"kCFStreamPropertyShouldCloseNativeSocket"];
-
-  self.outputStream = (__bridge_transfer NSOutputStream *)writeStream;
-  self.outputStream.delegate = self;
-  [self.outputStream setProperty:@"kCFBooleanTrue" forKey:@"kCFStreamPropertyShouldCloseNativeSocket"];
-  
-  [self performSelector:@selector(scheduleStreams) onThread:self.networkThread withObject:nil waitUntilDone:true];
-
-  [self.inputStream open];
-  [self.outputStream open];
-
-  NSLog(@"read stream status: %ld", CFReadStreamGetStatus(readStream));
-  NSLog(@"write stream status: %ld", CFWriteStreamGetStatus(writeStream));
-  
-  return true;
-}
-
-- (void)close {
-  [self performSelector:@selector(unscheduleStreams) onThread:self.networkThread withObject:nil waitUntilDone:true];
-
-  self.inputStream.delegate = nil;
-  self.outputStream.delegate = nil;
-  
-  [self.inputStream close];
-  [self.outputStream close];
-
-  [self.networkThread cancel];
-}
-
-- (NSInteger)writeBufferToStream:(const uint8_t*)buffer maxLength:(NSInteger)length {
-  return [self.outputStream write:buffer maxLength:length];
-}
-
-// MARK: Private Methods
-
-- (BOOL)isOpen {
-  return self.inputStream.streamStatus == NSStreamStatusOpen && self.outputStream.streamStatus == NSStreamStatusOpen;
-}
-
-- (void)setupSocketWithFilePath:(NSString*)path {
-  _socket = socket(AF_UNIX, SOCK_STREAM, 0);
-  
-  memset(&_socketAddr, 0, sizeof(_socketAddr));
-  _socketAddr.sun_family = AF_UNIX;
-  strncpy(_socketAddr.sun_path, path.UTF8String, sizeof(_socketAddr.sun_path) - 1);
-}
-
-- (void)setupNetworkThread {
-  self.networkThread = [[NSThread alloc] initWithBlock:^{
-    do {
-      @autoreleasepool {
-        [[NSRunLoop currentRunLoop] run];
-      }
-    } while (![NSThread currentThread].isCancelled);
-  }];
-  self.networkThread.qualityOfService = NSQualityOfServiceUserInitiated;
-}
-
-- (void)scheduleStreams {
-  [self.inputStream scheduleInRunLoop:NSRunLoop.currentRunLoop forMode:NSRunLoopCommonModes];
-  [self.outputStream scheduleInRunLoop:NSRunLoop.currentRunLoop forMode:NSRunLoopCommonModes];
-}
-
-- (void)unscheduleStreams {
-  [self.inputStream removeFromRunLoop:NSRunLoop.currentRunLoop forMode:NSRunLoopCommonModes];
-  [self.outputStream removeFromRunLoop:NSRunLoop.currentRunLoop forMode:NSRunLoopCommonModes];
-}
-
-- (void)notifyDidClose:(NSError *)error {
-  if (self.didClose) {
-    self.didClose(error);
-  }
-}
-
-@end
-
-#pragma mark - NSStreamDelegate
-
-@implementation SocketConnection (NSStreamDelegate)
-
-- (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode {
-  switch (eventCode) {
-    case NSStreamEventOpenCompleted:
-      NSLog(@"client stream open completed");
-      if (aStream == self.outputStream && self.didOpen) {
-        self.didOpen();
-      }
-      break;
-    case NSStreamEventHasBytesAvailable:
-      if (aStream == self.inputStream) {
-        uint8_t buffer;
-        NSInteger numberOfBytesRead = [(NSInputStream *)aStream read:&buffer maxLength:sizeof(buffer)];
-        if (!numberOfBytesRead && aStream.streamStatus == NSStreamStatusAtEnd) {
-          NSLog(@"server socket closed");
-          [self close];
-          [self notifyDidClose:nil];
-        }
-      }
-      break;
-    case NSStreamEventHasSpaceAvailable:
-      if (aStream == self.outputStream && self.streamHasSpaceAvailable) {
-        NSLog(@"client stream has space available");
-        self.streamHasSpaceAvailable();
-      }
-      break;
-    case NSStreamEventErrorOccurred:
-      NSLog(@"client stream error occurred: %@", aStream.streamError);
-      [self close];
-      [self notifyDidClose:aStream.streamError];
-      break;
-      
-    default:
-      break;
-  }
-}
-
-@end

ios/app/broadcast-extension/SocketConnection.swift

@@ -0,0 +1,205 @@
+/*
+ * Copyright @ 2021-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import Foundation
+
+class SocketConnection: NSObject {
+    var didOpen: (() -> Void)?
+    var didClose: ((Error?) -> Void)?
+    var streamHasSpaceAvailable: (() -> Void)?
+
+    private let filePath: String
+    private var socketHandle: Int32 = -1
+    private var address: sockaddr_un?
+
+    private var inputStream: InputStream?
+    private var outputStream: OutputStream?
+    
+    private var networkQueue: DispatchQueue?
+    private var shouldKeepRunning = false
+
+    init?(filePath path: String) {
+        filePath = path
+        socketHandle = Darwin.socket(AF_UNIX, SOCK_STREAM, 0)
+
+        guard socketHandle != -1 else {
+            print("failure: create socket")
+            return nil
+        }
+    }
+
+    func open() -> Bool {
+        print("open socket connection")
+
+        guard FileManager.default.fileExists(atPath: filePath) else {
+            print("failure: socket file missing")
+            return false
+        }
+      
+        guard setupAddress() == true else {
+            return false
+        }
+        
+        guard connectSocket() == true else {
+            return false
+        }
+
+        setupStreams()
+        
+        inputStream?.open()
+        outputStream?.open()
+
+        return true
+    }
+
+    func close() {
+        unscheduleStreams()
+
+        inputStream?.delegate = nil
+        outputStream?.delegate = nil
+
+        inputStream?.close()
+        outputStream?.close()
+        
+        inputStream = nil
+        outputStream = nil
+    }
+
+    func writeToStream(buffer: UnsafePointer<UInt8>, maxLength length: Int) -> Int {
+        return outputStream?.write(buffer, maxLength: length) ?? 0
+    }
+}
+
+extension SocketConnection: StreamDelegate {
+
+    func stream(_ aStream: Stream, handle eventCode: Stream.Event) {
+        switch eventCode {
+        case .openCompleted:
+            print("client stream open completed")
+            if aStream == outputStream {
+                didOpen?()
+            }
+        case .hasBytesAvailable:
+            if aStream == inputStream {
+                var buffer: UInt8 = 0
+                let numberOfBytesRead = inputStream?.read(&buffer, maxLength: 1)
+                if numberOfBytesRead == 0 && aStream.streamStatus == .atEnd {
+                    print("server socket closed")
+                    close()
+                    notifyDidClose(error: nil)
+                }
+            }
+        case .hasSpaceAvailable:
+            if aStream == outputStream {
+                streamHasSpaceAvailable?()
+            }
+        case .errorOccurred:
+            print("client stream error occured: \(String(describing: aStream.streamError))")
+            close()
+            notifyDidClose(error: aStream.streamError)
+
+        default:
+            break
+        }
+    }
+}
+
+private extension SocketConnection {
+  
+    func setupAddress() -> Bool {
+        var addr = sockaddr_un()
+        guard filePath.count < MemoryLayout.size(ofValue: addr.sun_path) else {
+            print("failure: fd path is too long")
+            return false
+        }
+
+        _ = withUnsafeMutablePointer(to: &addr.sun_path.0) { ptr in
+            filePath.withCString {
+                strncpy(ptr, $0, filePath.count)
+            }
+        }
+        
+        address = addr
+        return true
+    }
+
+    func connectSocket() -> Bool {
+        guard var addr = address else {
+            return false
+        }
+        
+        let status = withUnsafePointer(to: &addr) { ptr in
+            ptr.withMemoryRebound(to: sockaddr.self, capacity: 1) {
+                Darwin.connect(socketHandle, $0, socklen_t(MemoryLayout<sockaddr_un>.size))
+            }
+        }
+
+        guard status == noErr else {
+            print("failure: \(status)")
+            return false
+        }
+        
+        return true
+    }
+
+    func setupStreams() {
+        var readStream: Unmanaged<CFReadStream>?
+        var writeStream: Unmanaged<CFWriteStream>?
+
+        CFStreamCreatePairWithSocket(kCFAllocatorDefault, socketHandle, &readStream, &writeStream)
+
+        inputStream = readStream?.takeRetainedValue()
+        inputStream?.delegate = self
+        inputStream?.setProperty(kCFBooleanTrue, forKey: Stream.PropertyKey(kCFStreamPropertyShouldCloseNativeSocket as String))
+
+        outputStream = writeStream?.takeRetainedValue()
+        outputStream?.delegate = self
+        outputStream?.setProperty(kCFBooleanTrue, forKey: Stream.PropertyKey(kCFStreamPropertyShouldCloseNativeSocket as String))
+
+        scheduleStreams()
+    }
+  
+    func scheduleStreams() {
+        shouldKeepRunning = true
+        
+        networkQueue = DispatchQueue.global(qos: .userInitiated)
+        networkQueue?.async { [weak self] in
+            self?.inputStream?.schedule(in: .current, forMode: .common)
+            self?.outputStream?.schedule(in: .current, forMode: .common)
+            
+            var isRunning = false
+                        
+            repeat {
+                isRunning = self?.shouldKeepRunning ?? false && RunLoop.current.run(mode: .default, before: .distantFuture)
+            } while (isRunning)
+        }
+    }
+    
+    func unscheduleStreams() {
+        networkQueue?.sync { [weak self] in
+            self?.inputStream?.remove(from: .current, forMode: .common)
+            self?.outputStream?.remove(from: .current, forMode: .common)
+        }
+        
+        shouldKeepRunning = false
+    }
+    
+    func notifyDidClose(error: Error?) {
+        if didClose != nil {
+            didClose?(error)
+        }
+    }
+}

ios/app/src/AppDelegate.m

@@ -35,6 +35,7 @@
 
     jitsiMeet.defaultConferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
         [builder setFeatureFlag:@"resolution" withValue:@(360)];
+        [builder setFeatureFlag:@"ios.screensharing.enabled" withBoolean:YES];
         builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"];
         builder.welcomePageEnabled = YES;
 
@@ -51,7 +52,7 @@
   if ([FIRUtilities appContainsRealServiceInfoPlist]) {
         NSLog(@"Enabling Firebase");
         [FIRApp configure];
-        // Crashlytics defaults to disabled wirth the FirebaseCrashlyticsCollectionEnabled Info.plist key.
+        // Crashlytics defaults to disabled with the FirebaseCrashlyticsCollectionEnabled Info.plist key.
         [[FIRCrashlytics crashlytics] setCrashlyticsCollectionEnabled:![jitsiMeet isCrashReportingDisabled]];
     }
 

ios/app/src/Info.plist

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

ios/app/src/ViewController.m

@@ -131,6 +131,10 @@
   NSLog(@"%@%@", @"Chat toggled: ", data);
 }
 
+- (void)videoMutedChanged:(NSDictionary *)data {
+  NSLog(@"%@%@", @"Video muted changed: ", data[@"muted"]);
+}
+
 #pragma mark - Helpers
 
 - (void)terminate {

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>21.2.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>21.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/ci/build-ipa.sh

@@ -35,7 +35,7 @@ fi
 
 echo "PR_REPO_SLUG=${PR_REPO_SLUG} PR_BRANCH=${PR_BRANCH}"
 
-# do the marge and git log
+# do the merge and git log
 
 if [ $PR_BRANCH != "master" ]; then
     echo "Will merge ${PR_REPO_SLUG}/${PR_BRANCH} into master"

ios/ci/setup-certificates.sh

@@ -90,7 +90,7 @@ echo "importing dev-key.p12"
 security import ${CERT_DIR}/dev-key.p12 -k ios-build.keychain -P $IOS_SIGNING_CERT_PASSWORD -A
 
 echo "will set-key-partition-list"
-# Fix for OS X Sierra that hungs in the codesign step
+# Fix for OS X Sierra that hangs in the codesign step
 security set-key-partition-list -S apple-tool:,apple: -s -k $ENCRYPTION_PASSWORD ios-build.keychain > /dev/null
 echo "done set-key-partition-list"
 

ios/fastlane/Fastfile

@@ -9,6 +9,15 @@ platform :ios do
     # Make sure we are on a clean tree
     ensure_git_status_clean
 
+    # Connect to Apple Store Connect
+    app_store_connect_api_key(
+      key_id: ENV["ASC_KEY_ID"],
+      issuer_id: ENV["ASC_ISSUER_ID"],
+      key_content: ENV["ASC_KEY_CONTENT"],
+      duration: 1200,
+      in_house: false
+    )
+
     # Set the app identifier
     update_app_identifier(
       xcodeproj: "app/app.xcodeproj",
@@ -94,12 +103,24 @@ platform :ios do
       uses_non_exempt_encryption: false
     )
 
-    # Upload dSYMs to Crashlytics
-    download_dsyms
-    upload_symbols_to_crashlytics
-
     # Cleanup
     clean_build_artifacts
     reset_git_repo(skip_clean: true)
   end
+
+  lane :refresh_dsyms do
+    # Connect to Apple Store Connect
+    app_store_connect_api_key(
+      key_id: ENV["ASC_KEY_ID"],
+      issuer_id: ENV["ASC_ISSUER_ID"],
+      key_content: ENV["ASC_KEY_CONTENT"],
+      duration: 1200,
+      in_house: false
+    )
+
+    # Upload dSYMs to Crashlytics
+    download_dsyms(min_version: ENV["DSYMS_MIN_VERSION"])  # Download dSYM files from iTC
+    upload_symbols_to_crashlytics                          # Upload them to Crashlytics
+    clean_build_artifacts                                  # Delete the local dSYM files
+  end
 end

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -198,7 +198,6 @@
 				0BCA495C1EC4B6C600B793EE /* AudioMode.m */,
 				C69EFA02209A0EFD0027712B /* callkit */,
 				A4A934E7212F3AB8001E9388 /* dropbox */,
-				0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */,
 				0BD906E91EC0C00300C8C18E /* Info.plist */,
 				DE438CD82350934700DD541D /* JavaScriptSandbox.m */,
 				0BD906E81EC0C00300C8C18E /* JitsiMeet.h */,
@@ -235,6 +234,7 @@
 				C8AFD27D2462C613000293D2 /* InfoPlistUtil.h */,
 				C8AFD27E2462C613000293D2 /* InfoPlistUtil.m */,
 				C81E9AB825AC5AD800B134D9 /* ExternalAPI.h */,
+				0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */,
 				4E51B76225E5345E0038575A /* ScheenshareEventEmiter.h */,
 				4E51B76325E5345E0038575A /* ScheenshareEventEmiter.m */,
 			);

ios/sdk/src/ExternalAPI.h

@@ -21,10 +21,11 @@
 - (void)sendHangUp;
 - (void)sendSetAudioMuted:(BOOL)muted;
 - (void)sendEndpointTextMessage:(NSString*)message :(NSString*)to;
-- (void)toggleScreenShare;
+- (void)toggleScreenShare:(BOOL)enabled;
 - (void)retrieveParticipantsInfo:(void (^)(NSArray*))completion;
 - (void)openChat:(NSString*)to;
 - (void)closeChat;
 - (void)sendChatMessage:(NSString*)message :(NSString*)to ;
+- (void)sendSetVideoMuted:(BOOL)muted;
 
 @end

ios/sdk/src/ExternalAPI.m

@@ -26,6 +26,7 @@ static NSString * const retrieveParticipantsInfoAction = @"org.jitsi.meet.RETRIE
 static NSString * const openChatAction = @"org.jitsi.meet.OPEN_CHAT";
 static NSString * const closeChatAction = @"org.jitsi.meet.CLOSE_CHAT";
 static NSString * const sendChatMessageAction = @"org.jitsi.meet.SEND_CHAT_MESSAGE";
+static NSString * const setVideoMutedAction = @"org.jitsi.meet.SET_VIDEO_MUTED";
 
 @implementation ExternalAPI
 
@@ -47,7 +48,8 @@ RCT_EXPORT_MODULE();
         @"RETRIEVE_PARTICIPANTS_INFO": retrieveParticipantsInfoAction,
         @"OPEN_CHAT": openChatAction,
         @"CLOSE_CHAT": closeChatAction,
-        @"SEND_CHAT_MESSAGE": sendChatMessageAction
+        @"SEND_CHAT_MESSAGE": sendChatMessageAction,
+        @"SET_VIDEO_MUTED" : setVideoMutedAction
     };
 };
 
@@ -70,7 +72,8 @@ RCT_EXPORT_MODULE();
               retrieveParticipantsInfoAction,
               openChatAction,
               closeChatAction,
-              sendChatMessageAction
+              sendChatMessageAction,
+              setVideoMutedAction
     ];
 }
 
@@ -161,8 +164,11 @@ RCT_EXPORT_METHOD(sendEvent:(NSString *)name
     [self sendEventWithName:sendEndpointTextMessageAction body:data];
 }
 
-- (void)toggleScreenShare {
-    [self sendEventWithName:toggleScreenShareAction body:nil];
+- (void)toggleScreenShare:(BOOL)enabled {
+    NSMutableDictionary *data = [[NSMutableDictionary alloc] init];
+    data[@"enabled"] = [NSNumber numberWithBool:enabled];
+    
+    [self sendEventWithName:toggleScreenShareAction body:data];
 }
 
 - (void)retrieveParticipantsInfo:(void (^)(NSArray*))completionHandler {
@@ -193,4 +199,11 @@ RCT_EXPORT_METHOD(sendEvent:(NSString *)name
     [self sendEventWithName:sendChatMessageAction body:data];
 }
 
+- (void)sendSetVideoMuted:(BOOL)muted {
+    NSDictionary *data = @{ @"muted": [NSNumber numberWithBool:muted]};
+
+    [self sendEventWithName:setVideoMutedAction body:data];
+}
+
+
 @end

ios/sdk/src/Info.plist

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

ios/sdk/src/JitsiMeetConferenceOptions.h

@@ -71,6 +71,16 @@
 - (void)setFeatureFlag:(NSString *_Nonnull)flag withBoolean:(BOOL)value;
 - (void)setFeatureFlag:(NSString *_Nonnull)flag withValue:(id _Nonnull)value;
 
+/**
+ * CallKit call handle, to be used when implementing incoming calls.
+ */
+@property (nonatomic, copy, nullable) NSString *callHandle;
+
+/**
+ * CallKit call UUID, to be used when implementing incoming calls.
+ */
+@property (nonatomic, copy, nullable) NSUUID *callUUID;
+
 @end
 
 @interface JitsiMeetConferenceOptions : NSObject
@@ -92,6 +102,9 @@
 
 @property (nonatomic, nullable) JitsiMeetUserInfo *userInfo;
 
+@property (nonatomic, copy, nullable, readonly) NSString *callHandle;
+@property (nonatomic, copy, nullable, readonly) NSUUID *callUUID;
+
 + (instancetype _Nonnull)fromBuilder:(void (^_Nonnull)(JitsiMeetConferenceOptionsBuilder *_Nonnull))initBlock;
 - (instancetype _Nonnull)init NS_UNAVAILABLE;
 

ios/sdk/src/JitsiMeetConferenceOptions.m

@@ -52,6 +52,9 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
         _videoMuted = nil;
 
         _userInfo = nil;
+
+        _callHandle = nil;
+        _callUUID = nil;
     }
     
     return self;
@@ -168,6 +171,9 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
         _featureFlags = [NSDictionary dictionaryWithDictionary:builder.featureFlags];
 
         _userInfo = builder.userInfo;
+
+        _callHandle = builder.callHandle;
+        _callUUID = builder.callUUID;
     }
 
     return self;
@@ -205,6 +211,12 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
     if (_subject != nil) {
         config[@"subject"] = self.subject;
     }
+    if (_callHandle != nil) {
+        config[@"callHandle"] = self.callHandle;
+    }
+    if (_callUUID != nil) {
+        config[@"callUUID"] = [self.callUUID UUIDString];
+    }
 
     NSMutableDictionary *urlProps = [[NSMutableDictionary alloc] init];
 

ios/sdk/src/JitsiMeetView.h

@@ -39,10 +39,11 @@
 - (void)hangUp;
 - (void)setAudioMuted:(BOOL)muted;
 - (void)sendEndpointTextMessage:(NSString * _Nonnull)message :(NSString * _Nullable)to;
-- (void)toggleScreenShare;
+- (void)toggleScreenShare:(BOOL)enabled;
 - (void)retrieveParticipantsInfo:(void (^ _Nonnull)(NSArray * _Nullable))completionHandler;
 - (void)openChat:(NSString * _Nullable)to;
 - (void)closeChat;
 - (void)sendChatMessage:(NSString * _Nonnull)message :(NSString * _Nullable)to;
+- (void)setVideoMuted:(BOOL)muted;
 
 @end

ios/sdk/src/JitsiMeetView.m

@@ -130,9 +130,9 @@ static void initializeViewsMap() {
     [externalAPI sendEndpointTextMessage:message :to];
 }
 
-- (void)toggleScreenShare {
+- (void)toggleScreenShare:(BOOL)enabled {
     ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI toggleScreenShare];
+    [externalAPI toggleScreenShare:enabled];
 }
 
 - (void)retrieveParticipantsInfo:(void (^ _Nonnull)(NSArray * _Nullable))completionHandler {
@@ -155,6 +155,11 @@ static void initializeViewsMap() {
     [externalAPI sendChatMessage:message :to];
 }
 
+- (void)setVideoMuted:(BOOL)muted {
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI sendSetVideoMuted:muted];
+}
+
 #pragma mark Private methods
 
 /**
@@ -184,7 +189,7 @@ static void initializeViewsMap() {
     // conference. However, React and, respectively,
     // appProperties/initialProperties are declarative expressions i.e. one and
     // the same URL will not trigger an automatic re-render in the JavaScript
-    // source code. The workaround implemented bellow introduces imperativeness
+    // source code. The workaround implemented below introduces imperativeness
     // in React Component props by defining a unique value per invocation.
     props[@"timestamp"] = @(mach_absolute_time());
 

ios/sdk/src/JitsiMeetViewDelegate.h

@@ -95,7 +95,7 @@
  *
  * The `data` dictionary contains `message`, `senderId` and  `isPrivate` keys.
  */
-- (void)chatMessaageReceived:(NSDictionary *)data;
+- (void)chatMessageReceived:(NSDictionary *)data;
 
 /**
  * Called when the chat dialog is displayed/hidden.
@@ -104,4 +104,11 @@
  */
 - (void)chatToggled:(NSDictionary *)data;
 
+/**
+ * Called when videoMuted state changed.
+ *
+ * The `data` dictionary contains a `muted` key with state of the videoMuted for the localParticipant.
+ */
+- (void)videoMutedChanged:(NSDictionary *)data;
+
 @end

ios/sdk/src/ScheenshareEventEmiter.m

@@ -42,8 +42,8 @@ NSNotificationName const kBroadcastStoppedNotification = @"iOS_BroadcastStopped"
 // MARK: Private Methods
 
 - (void)setupObserver {
-    CFNotificationCenterAddObserver(_notificationCenter, (__bridge const void *)(self), broadcastToggleNotificationCallback, (__bridge CFStringRef)kBroadcastStartedNotification, NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
-    CFNotificationCenterAddObserver(_notificationCenter, (__bridge const void *)(self), broadcastToggleNotificationCallback, (__bridge CFStringRef)kBroadcastStoppedNotification, NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
+    CFNotificationCenterAddObserver(_notificationCenter, (__bridge const void *)(self), broadcastStartedNotificationCallback, (__bridge CFStringRef)kBroadcastStartedNotification, NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
+    CFNotificationCenterAddObserver(_notificationCenter, (__bridge const void *)(self), broadcastStoppedNotificationCallback, (__bridge CFStringRef)kBroadcastStoppedNotification, NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
 }
 
 - (void)clearObserver {
@@ -51,13 +51,22 @@ NSNotificationName const kBroadcastStoppedNotification = @"iOS_BroadcastStopped"
     CFNotificationCenterRemoveObserver(_notificationCenter, (__bridge const void *)(self), (__bridge CFStringRef)kBroadcastStoppedNotification, NULL);
 }
 
-void broadcastToggleNotificationCallback(CFNotificationCenterRef center,
-                                         void *observer,
-                                         CFStringRef name,
-                                         const void *object,
-                                         CFDictionaryRef userInfo) {
+void broadcastStartedNotificationCallback(CFNotificationCenterRef center,
+                                          void *observer,
+                                          CFStringRef name,
+                                          const void *object,
+                                          CFDictionaryRef userInfo) {
     ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI toggleScreenShare];
+    [externalAPI toggleScreenShare:true];
+}
+
+void broadcastStoppedNotificationCallback(CFNotificationCenterRef center,
+                                          void *observer,
+                                          CFStringRef name,
+                                          const void *object,
+                                          CFDictionaryRef userInfo) {
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI toggleScreenShare:false];
 }
 
 @end

ios/sdk/src/callkit/JMCallKitEmitter.swift

@@ -76,7 +76,7 @@ internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
 
         // Avoid mute actions ping-pong: if the mute action was caused by
         // the JS side (we requested a transaction) don't call the delegate
-        // method. If it was called by the provder itself (when the user presses
+        // method. If it was called by the provider itself (when the user presses
         // the mute button in the CallKit view) then call the delegate method.
         //
         // NOTE: don't try to be clever and remove this. Been there, done that.

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

@@ -29,7 +29,7 @@ public protocol PiPViewCoordinatorDelegate: class {
 /// when is presented in Picure in Picture mode.
 public class PiPViewCoordinator {
 
-    /// Limits the boundries of view position on screen when minimized
+    /// Limits the boundaries of view position on screen when minimized
     public var dragBoundInsets: UIEdgeInsets = UIEdgeInsets(top: 25,
                                                             left: 5,
                                                             bottom: 5,

ios/travis-ci/build-ipa.sh

@@ -60,7 +60,7 @@ fi
 
 echo "PR_REPO_SLUG=${PR_REPO_SLUG} PR_BRANCH=${PR_BRANCH}"
 
-# do the marge and git log
+# do the merge and git log
 
 if [ $PR_BRANCH != "master" ]; then
     echo "Will merge ${PR_REPO_SLUG}/${PR_BRANCH} into master"

lang/languages-hi.json

@@ -0,0 +1,53 @@
+{
+    "en": "अंग्रेज़ी",
+	"hi": "हिन्दी",
+	"mr":"मराठी",
+	"ml": "मलयालम",
+	"enGB": "अंग्रेज़ी (UK)",
+    "af": "Afrikaans",
+    "ar": "Arabic",
+    "bg": "Bulgarian",
+    "ca": "Catalan",
+    "cs": "Czech",
+    "da": "Danish",
+    "de": "German",
+    "el": "Greek",
+    "eo": "Esperanto",
+    "es": "Spanish",
+    "esUS": "Spanish (Latin America)",
+    "et": "Estonian",
+    "eu": "Basque",
+    "fi": "Finnish",
+    "fr": "French",
+    "frCA": "French (Canadian)",
+    "he": "Hebrew", 
+    "hr": "Croatian",
+    "hu": "Hungarian",
+    "hy": "Armenian",
+    "id": "Indonesian",
+    "it": "Italian",
+    "ja": "Japanese",
+    "kab": "Kabyle",
+    "ko": "Korean",
+    "lt": "Lithuanian",
+    "lv": "Latvian",
+    "nl": "Dutch",
+    "oc": "Occitan",
+    "fa": "Persian",
+    "pl": "Polish",
+    "pt": "Portuguese",
+    "ptBR": "Portuguese (Brazil)",
+    "ru": "Russian",
+    "ro": "Romanian",
+    "sc": "Sardinian",
+    "sk": "Slovak",
+    "sl": "Slovenian",
+    "sr": "Serbian",
+    "sv": "Swedish",
+    "th": "Thailand",
+    "tr": "Turkish",
+    "uk": "Ukrainian",
+    "vi": "Vietnamese",
+    "zhCN": "Chinese (China)",
+    "zhTW": "Chinese (Taiwan)"
+}

lang/languages-ko.json

@@ -1,27 +1,52 @@
 {
     "en": "영어",
-    "af": "",
+    "af": "아프리칸스어",
+    "ar": "아랍어",
     "az": "아제르바이잔어",
     "bg": "불가리어",
-    "cs": "체코어",
+    "ca": "카탈루냐어",
+    "cs": "체코어",    
+    "da": "덴마크어",
     "de": "독일어",
     "el": "그리스어",
+    "enGB": "영어(영국)",
     "eo": "에스페란토어",
     "es": "스페인어",
+    "esUS": "스페인어(라틴 아메리카)",
+    "et": "에스토니아어",
+    "eu": "바스크어",
+    "fi": "핀란드어",
     "fr": "프랑스어",
+    "frCA": "프랑스어(캐나다)",
+    "he": "히브리어",
+    "mr":"마라티어",
+    "hr": "크로아티아어",
+    "hu": "헝가리어",
     "hy": "아르메니아어",
+    "id": "인도네시아어",
     "it": "이탈리아어",
     "ja": "일본어",
+    "kab": "커바일어",
     "ko": "한국어",
-    "nb": "노르웨이어",
-    "oc": "",
+    "lt": "리투아니아어",
+    "ml": "말라얄람어",
+    "lv": "라트비아어",
+    "nl": "네덜란드어",
+    "oc": "오크어",
+    "fa": "페르시아어",
     "pl": "폴란드어",
     "ptBR": "포르투갈어(브라질)",
     "ru": "러시아어",
+    "ro": "루마니아어",
+    "sc": "사르데냐어",
     "sk": "슬로바키아어",
     "sl": "슬로베니아어",
+    "sr": "세르비아어",
     "sv": "스웨덴어",
+    "th": "태국어",
     "tr": "터키어",
+    "uk": "우크라이나어",
     "vi": "베트남어",
-    "zhCN": "중국어(중국)"
-}
+    "zhCN": "중국어(중국)",
+    "zhTW": "중국어(대만)"
+}

lang/languages-oc.json

@@ -32,7 +32,9 @@
     "lv": "Leton",
     "nl": "Neerlandés",
     "oc": "Occitan",
+    "fa": "Persa",    
     "pl": "Polonés",
+    "pt": "Portugués",    
     "ptBR": "Portugués (Brasil)",
     "ru": "Rus",
     "ro": "Romanian",
@@ -48,5 +50,3 @@
     "zhCN": "Chinés (China)",
     "zhTW": "Chinés (Taiwan)"
 }
-
-

lang/languages-te.json

@@ -0,0 +1,54 @@
+{
+    "en": "ఆంగ్లం",
+    "af": "ఆఫ్రికాన్స్",
+    "ar": "అరబిక్",
+    "bg": "బల్గేరియన్",
+    "ca": "కాటలన్",
+    "cs": "చెక్",
+    "da": "డేనిష్",
+    "de": "జెర్మన్",
+    "el": "గ్రీకు",
+    "enGB": "ఆంగ్లం (యునైటెడ్ కింగ్‌డమ్)",
+    "eo": "ఎస్పరాంతో",
+    "es": "స్పానిష్",
+    "esUS": "స్పానిష్ (లాటిన్ అమెరిగా)",
+    "et": "ఎస్టోనియన్",
+    "eu": "బాస్క్",
+    "fi": "ఫిన్నిష్",
+    "fr": "ఫ్రెంచ్",
+    "frCA": "ఫ్రెంచ్ (కెనడియన్)",
+    "he": "హీబ్రూ",
+    "hi": "హిందీ",
+    "mr": "మరాఠీ",
+    "hr": "క్రొయేషియన్",
+    "hu": "హంగేరియన్",
+    "hy": "ఆర్మేనియన్",
+    "id": "ఇండొనేషియన్",
+    "it": "ఇటాలియన్",
+    "ja": "జపనీ",
+    "kab": "కబైల్",
+    "ko": "కొరియన్",
+    "lt": "లిథుయేనియన్",
+    "ml": "మలయాళం",
+    "lv": "లాత్వియన్",
+    "nl": "డచ్",
+    "oc": "ఆక్సిటన్",
+    "fa": "పెర్షియన్",
+    "pl": "పోలిష్",
+    "pt": "పోర్చుగీస్",
+    "ptBR": "పోర్చుగీస్ (బ్రెజిల్)",
+    "ru": "రష్యన్",
+    "ro": "రొమేనియన్",
+    "sc": "సార్డీనియన్",
+    "sk": "స్లొవాక్",
+    "sl": "స్లొవేనియన్",
+    "sr": "సెర్బియన్",
+    "sv": "స్వీడిష్",
+    "te": "తెలుగు",
+    "th": "థాయిలాండ్",
+    "tr": "టర్కిష్",
+    "uk": "ఉక్రేనియన్",
+    "vi": "వియెత్నామీ",
+    "zhCN": "చైనీ (చైనా)",
+    "zhTW": "చైనీ (తైవాన్)"
+}

lang/languages.json

@@ -18,6 +18,7 @@
     "fr": "French",
     "frCA": "French (Canadian)",
     "he": "Hebrew",
+    "hi": "Hindi",
     "mr":"Marathi",
     "hr": "Croatian",
     "hu": "Hungarian",
@@ -34,6 +35,7 @@
     "oc": "Occitan",
     "fa": "Persian",
     "pl": "Polish",
+    "pt": "Portuguese",
     "ptBR": "Portuguese (Brazil)",
     "ru": "Russian",
     "ro": "Romanian",
@@ -42,6 +44,7 @@
     "sl": "Slovenian",
     "sr": "Serbian",
     "sv": "Swedish",
+    "te": "Telugu",
     "th": "Thailand",
     "tr": "Turkish",
     "uk": "Ukrainian",

lang/main-bg.json

@@ -1,19 +1,31 @@
 {
     "addPeople": {
         "add": "Покани",
-        "countryNotSupported": "Желаната дестинация не се поддържа.",
-        "countryReminder": "Международно обаждане? Започнете номера с международният код!",
+        "addContacts": "Покани участници",
+        "copyInvite": "Копирай покана в срещата",
+        "copyLink": "Копирай линк към срещата",
+        "copyStream": "Копирай линк за излъчване на живо",
+        "countryNotSupported": "Желаната дестинация не се поддържа все още.",
+        "countryReminder": "Международно обаждане? Започнете номера с международен код!",
+        "defaultEmail": "Покана по имейл",
         "disabled": "Не можете да каните хора.",
         "failedToAdd": "Неуспешно добавяне на участници",
         "footerText": "Изходящите разговори не са разрешени.",
+        "inviteMoreHeader": "Вие сте единственият участник в срещата",
+        "inviteMoreMailSubject": "Включи се в {{appName}} среща",
+        "inviteMorePrompt": "Покани още участници",
+        "linkCopied": "Линкът е копиран",
         "loading": "Търсене на хора и телефонни номера",
-        "loadingNumber": "Валидиране на номера",
+        "loadingNumber": "Валидиране на номер",
         "loadingPeople": "Търсене на хора",
         "noResults": "Няма резултати",
-        "noValidNumbers": "Моля въведете телефонен номер",
-        "searchNumbers": "Добавяне на номера",
+        "noValidNumbers": "Въведете телефонен номер",
+        "searchNumbers": "Добави номер",
         "searchPeople": "Търсене на хора",
-        "searchPeopleAndNumbers": "Търсене на участници или добавяне с телефони номера",
+        "searchPeopleAndNumbers": "Търсене на участници или добавяне по телефонен номер",
+        "shareInvite": "Сподели покана за среща",
+        "shareLink": "Сподели линк към срещата, за да поканиш някого",
+        "shareStream": "Сподели линк за излъчване на живо",
         "telephone": "Телефон: {{number}}",
         "title": "Добавяне на участници в срещата"
     },
@@ -21,19 +33,19 @@
         "bluetooth": "Bluetooth",
         "headphones": "Слушалки",
         "phone": "Телефон",
-        "speaker": "Говорещ",
+        "speaker": "Високоговорител",
         "none": "Няма налични устройства за звук"
     },
     "audioOnly": {
-        "audioOnly": "Нисък дебит"
+        "audioOnly": "Само звук"
     },
     "calendarSync": {
         "addMeetingURL": "Добавяне на връзка за среща",
         "confirmAddLink": "Искате ли да добавите връзка към това събитие?",
         "error": {
             "appConfiguration": "Интеграцията с календара не е настроена.",
-            "generic": "Грешка, моля проверете настройката за календара или го обновете.",
-            "notSignedIn": "Грешка при идентификация за изтегляне на събития. Моля проверете настройките на календара и опитайте отново."
+            "generic": "Грешка! Моля, проверете настройката за календара или го обновете.",
+            "notSignedIn": "Грешка при идентификация за изтегляне на събития. Моля, проверете настройките на календара и опитайте отново."
         },
         "join": "Влизане",
         "joinTooltip": "Влизане в срещата",
@@ -53,7 +65,7 @@
         "noMessagesMessage": "Все още няма съобщения в срещата. Започнете разговор тук!",
         "nickname": {
             "popover": "Избор на име",
-            "title": "Въведете име за да обменяте съобщения"
+            "title": "Въведете име, за да обменяте съобщения"
         },
         "privateNotice": "Лично съобщение до {{recipient}}",
         "title": "Текстови съобщения",
@@ -73,8 +85,8 @@
         "DISCONNECTING": "Прекъсване на връзката",
         "ERROR": "Грешка",
         "RECONNECTING": "Появи се проблем с мрежата. Връзваме се наново...",
-        "LOW_BANDWIDTH": "Виеото на {{displayName}} беше изключено поради слаба Интернет връзка",
-        "GOT_SESSION_ID": "Отваряне на сесията...Завърши",
+        "LOW_BANDWIDTH": "Видеото на {{displayName}} беше изключено, поради слаба Интернет връзка",
+        "GOT_SESSION_ID": "Отваряне на сесията... Готово",
         "GET_SESSION_ID_ERROR": "Грешка при отваряне на сесията: {{code}}",
         "FETCH_SESSION_ID": "Отваряне на сесия..."
     },
@@ -144,13 +156,13 @@
         "allow": "Разрешаване",
         "alreadySharedVideoMsg": "Друг участник вече е споделил видео. Тази среща позволява само едно споделено видео.",
         "alreadySharedVideoTitle": "Разрешено е споделянето само на едно видео в даден момент",
-        "applicationWindow": "Прозореца на програмата",
+        "applicationWindow": "Прозорец на програмата",
         "Back": "Назад",
         "cameraConstraintFailedError": "Камерата Ви не покрива някои от изискванията.",
         "cameraNotFoundError": "Не е открита камера.",
         "cameraNotSendingData": "Камерата е недостъпна. Моля, проверете дали друго приложение не използва това устройство, изберете друго устройство от менюто с настройките, или презаредете приложението.",
         "cameraNotSendingDataTitle": "Камерата е недостъпна",
-        "cameraPermissionDeniedError": "Не сте дали разрешение за използване на камерата. Ще можете да се присъедините в беседата, но другите няма да Ви виждат. Използвайте бутона с камерата в адресната лента, за да оправите това.",
+        "cameraPermissionDeniedError": "Не сте дали разрешение за използване на камерата. Ще можете да се присъедините в срещата, но другите няма да Ви виждат. Използвайте бутона с камерата в адресната лента, за да оправите това.",
         "cameraUnknownError": "Невъзможен достъп до камерата по неясна причина.",
         "cameraUnsupportedResolutionError": "Камерата Ви не поддържа нужната резолюция.",
         "Cancel": "Отказ",
@@ -170,13 +182,13 @@
         "dismiss": "Отхвърляне",
         "displayNameRequired": "Здравей! Как се казваш?",
         "done": "Готово",
-        "enterDisplayName": "Моля въведете вашето име",
+        "enterDisplayName": "Моля, въведете Вашето име",
         "error": "Грешка",
         "externalInstallationMsg": "Трябва да инсталирате разширението за споделяне на екрана.",
         "externalInstallationTitle": "Нужно е разширение",
         "goToStore": "Към магазина в Интернет",
-        "gracefulShutdown": "Услугата временно не е достъпна поради профилактика. Моля опитайте по-късно.",
-        "IamHost": "Аз съм домакина",
+        "gracefulShutdown": "Услугата временно не е достъпна поради профилактика. Моля, опитайте по-късно.",
+        "IamHost": "Аз съм домакинът",
         "incorrectRoomLockPassword": "Грешна парола",
         "incorrectPassword": "Неправилно потребителско име или парола",
         "inlineInstallationMsg": "Трябва да инсталирате разширението за споделяне на екрана.",
@@ -185,9 +197,9 @@
         "internalErrorTitle": "Вътрешна грешка",
         "kickMessage": "Може да се свържете с {{participantDisplayName}} за повече подробности.",
         "kickParticipantButton": "Изгони",
-        "kickParticipantDialog": "Сигурни ли сте че искате да изгоните участника?",
+        "kickParticipantDialog": "Сигурни ли сте, че искате да изгоните участника?",
         "kickParticipantTitle": "Изгонване на този участник?",
-        "kickTitle": "Ауч! {{participantDisplayName}} ви изгони от тази среща",
+        "kickTitle": "Ауч! {{participantDisplayName}} Ви изгони от тази среща",
         "liveStreaming": "Излъчване на живо",
         "liveStreamingDisabledForGuestTooltip": "Гостите не могат да стартират излъчване на живо.",
         "liveStreamingDisabledTooltip": "Излъчването на живо е деактивирано.",
@@ -196,20 +208,20 @@
         "lockTitle": "Неуспешно заключване",
         "logoutQuestion": "Сигурни ли сте, че искате да излезете и да прекъснете конференцията?",
         "logoutTitle": "Изход",
-        "maxUsersLimitReached": "Лимитът за максимален брой участници бе достигнат. Капацитета на срещата е запълнен. Моля свържете се с организатора или опитайте по-късно!",
-        "maxUsersLimitReachedTitle": "Достигнат е лимита за максимален брой участници",
+        "maxUsersLimitReached": "Лимитът за максимален брой участници бе достигнат. Капацитетът на срещата е запълнен. Моля, свържете се с организатора или опитайте по-късно!",
+        "maxUsersLimitReachedTitle": "Достигнат е лимитът за максимален брой участници",
         "micConstraintFailedError": "Микрофонът Ви не покрива някои от изискванията.",
         "micNotFoundError": "Не е открит микрофон.",
-        "micNotSendingData": "Пуснете микрофона си от системните настройки на компютъра ви",
-        "micNotSendingDataTitle": "Микрофона ви е спрян от системните настройки",
-        "micPermissionDeniedError": "Не сте дали разрешение за използване на микрофона. Ще можете да се присъедините в беседата, но другите няма да Ви чуват. Използвайте бутона с камерата в адресната лента, за да оправите това.",
+        "micNotSendingData": "Пуснете микрофона си от системните настройки на компютъра",
+        "micNotSendingDataTitle": "Микрофонът Ви е спрян от системните настройки",
+        "micPermissionDeniedError": "Не сте дали разрешение за използване на микрофона. Ще можете да се присъедините в срещата, но другите няма да Ви чуват. Използвайте бутона с микрофон в адресната лента, за да оправите това.",
         "micUnknownError": "Невъзможен достъп до микрофона по неясна причина.",
         "muteParticipantBody": "Вие няма да можете да спрете заглушаването на участника, но той ще може да го направи по всяко време.",
         "muteParticipantButton": "Изключи микрофона",
-        "muteParticipantDialog": "Сигурни ли сте че искате да заглушите този участник? Няма да можете да пуснете обратно звука му, но участникът ще може да направи това сам.",
+        "muteParticipantDialog": "Сигурни ли сте, че искате да заглушите този участник? Няма да можете да пуснете обратно звука му, но участникът ще може да направи това сам.",
         "muteParticipantTitle": "Спиране звука на участник?",
         "Ok": "Готово",
-        "passwordLabel": "Тази среща е заключена. Моля въведете $t(lockRoomPassword) за да влезнете.",
+        "passwordLabel": "Тази среща е заключена. Моля, въведете $t(lockRoomPassword), за да влезете.",
         "passwordNotSupported": "Задаването на $t(lockRoomPassword) за срещата не се поддържа.",
         "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) не се поддържа",
         "passwordRequired": "Изисква се $t(lockRoomPassword)",
@@ -235,7 +247,7 @@
         "retry": "Повторен опит",
         "screenSharingFailedToInstall": "Опа! Разширението за споделяне на екрана не успя да се инсталира.",
         "screenSharingFailedToInstallTitle": "Разширението за споделяне на екрана не успя да се инсталира",
-        "screenSharingFirefoxPermissionDeniedError": "Нещо се обърка докато се опитвахме да споделим екрана. Моля уверете се че сте дали права за това. ",
+        "screenSharingFirefoxPermissionDeniedError": "Нещо се обърка докато се опитвахме да споделим екрана. Моля, уверете се, че сте дали права за това. ",
         "screenSharingFirefoxPermissionDeniedTitle": "Упс! Не успяхме да стартираме споделянето на екрана!",
         "screenSharingPermissionDeniedError": "Опа! Нещо се обърка с разрешенията на разширението за споделяне на екрана. Моля, презаредете и опитайте отново.",
         "sendPrivateMessage": "Наскоро получихте лично съобщение. Искате да отговорите на това съобшение или да изпратите до всички?",
@@ -245,7 +257,7 @@
         "serviceUnavailable": "Услугата не е налична",
         "sessTerminated": "Разговорът приключи",
         "Share": "Споделяне",
-        "shareVideoLinkError": "Моля въведете правилна връзка към YouTube.",
+        "shareVideoLinkError": "Моля, въведете правилна връзка към YouTube.",
         "shareVideoTitle": "Сподели видео",
         "shareYourScreen": "Споделяне на екрана",
         "shareYourScreenDisabled": "Споделянето на екрана не се поддържа.",
@@ -266,18 +278,18 @@
         "transcribing": "Транскрипция",
         "unlockRoom": "Премахване $t(lockRoomPassword) от срещата",
         "userPassword": "потребителска парола",
-        "WaitForHostMsg": "Конференцията <b>{{room}}</b> все още не е започнала. Ако сте домакинът тогава се идентифицирайте. В противен случай изчакайте докато домакинът пристигне.",
-        "WaitForHostMsgWOk": "Конференцията <b>{{room}}</b> все още не е започнала. Ако сте домакинът тогава натиснете бутона за да се идентифицирате. В противен случай изчакайте докато домакинът пристигне.",
-        "WaitingForHost": "Чакаме домакина ...",
+        "WaitForHostMsg": "Конференцията <b>{{room}}</b> все още не е започнала. Ако сте домакинът, тогава се идентифицирайте. В противен случай изчакайте докато домакинът пристигне.",
+        "WaitForHostMsgWOk": "Конференцията <b>{{room}}</b> все още не е започнала. Ако сте домакинът, тогава натиснете бутона, за да се идентифицирате. В противен случай изчакайте докато домакинът пристигне.",
+        "WaitingForHost": "Чакаме домакина...",
         "Yes": "Да",
-        "yourEntireScreen": "Целия екран",
+        "yourEntireScreen": "Целият екран",
         "screenSharingAudio": "Сподели и звука",
         "muteEveryoneStartMuted": "Всички да влизат без звук",
         "muteEveryoneSelf": "себе си",
         "muteEveryoneTitle": "Заглуши всички?",
         "muteEveryoneDialog": "Сигурни ли сте, че искате да заглушите всички? Няма да можете да пуснете звука им отново, но участниците ще могат да направят това сами.",
-        "muteEveryoneElseTitle": "Заглушете всички освен {{whom}}?",
-        "muteEveryoneElseDialog": "След като заглушите някой, няма да можете да пуснете обратно звука му, но участникът ще може да направи това сам."
+        "muteEveryoneElseTitle": "Заглушете всички, освен {{whom}}?",
+        "muteEveryoneElseDialog": "След като заглушите някого, няма да можете да пуснете обратно звука му, но участникът ще може да направи това сам."
     },
     "dialOut": {
         "statusMessage": "в момента е {{status}}"
@@ -289,10 +301,10 @@
         "average": "Средно",
         "bad": "Лошо",
         "detailsLabel": "Разкажете ни повече.",
-        "good": "Добра",
+        "good": "Добро",
         "rateExperience": "Моля, оценете качеството на срещата",
         "veryBad": "Много лошо",
-        "veryGood": "Много добра"
+        "veryGood": "Много добро"
     },
     "incomingCall": {
         "answer": "Вдигни",
@@ -311,12 +323,12 @@
         "dialInConferenceID": "Код:",
         "dialInNotSupported": "Съжаляваме, обаждането в момента не се поддържа.",
         "dialInNumber": "Тел:",
-        "dialInSummaryError": "Проблем при достъпа на информация за опциите за влизане през телефон. Моля опитайте отново по-късно.",
+        "dialInSummaryError": "Проблем при достъпа на информация за опциите за влизане през телефон. Моля, опитайте отново по-късно.",
         "dialInTollFree": "Безплатен",
-        "genericError": "Упс, нещо се случи.",
+        "genericError": "Упс, нещо се обърка.",
         "inviteLiveStream": "За да видите предаването на живо на срещата, използвйте тази връзка: {{url}}",
         "invitePhone": "За влизане през телефон, използвайте: {{number}},,{{conferenceID}}#\n",
-        "invitePhoneAlternatives": "Вижте още номера: {{url}}\n\n\nАко вече сте набрали от телефон в стаята, влезте без да е пуснат звука: {{silentUrl}}",
+        "invitePhoneAlternatives": "Вижте още номера: {{url}}\n\n\nАко вече сте набрали от телефон в стаята, влезте без да е пуснат звукът: {{silentUrl}}",
         "inviteURLFirstPartGeneral": "Поканени сте да се присъедините към среща.",
         "inviteURLFirstPartPersonal": "{{name}} ви кани за среща.\n",
         "inviteURLSecondPart": "\nВлезте в срещата:\n{{url}}\n",
@@ -343,7 +355,7 @@
         "msg": "Имаше грешка.",
         "retry": "Опитайте отново",
         "support": "Поддръжка",
-        "supportMsg": "Ако това се случва често, свържете се с нашата"
+        "supportMsg": "Ако това се случва често, свържете се с"
     },
     "keyboardShortcuts": {
         "focusLocal": "Фокусиране върху Вашето видео",
@@ -370,8 +382,8 @@
         "chooseCTA": "Изберете опция за предаване. Влезли сте като {{email}}.",
         "enterStreamKey": "Въведете ключа от YouTube за предаване на живо.",
         "error": "Излъчването на живо беше неуспешно. Моля, опитайте отново.",
-        "errorAPI": "Изникна проблем с връзката към YouTube. Моля опитайте отново.",
-        "errorLiveStreamNotEnabled": "Предаването на живо не е пуснато за {{email}}. Моля активирайте го или сменете акаунта.",
+        "errorAPI": "Изникна проблем с връзката към YouTube. Моля, опитайте отново.",
+        "errorLiveStreamNotEnabled": "Предаването на живо не е пуснато за {{email}}. Моля, активирайте го или сменете акаунта.",
         "expandedOff": "Предаването на живо бе спряно",
         "expandedOn": "Срещата се излъчва на живо в YouTube.",
         "expandedPending": "Излъчването на живо се стартира...",
@@ -386,7 +398,7 @@
         "serviceName": "Предаване на живо",
         "signedInAs": "В момента сте влезли като:",
         "signIn": "Влезте с Гугъл",
-        "signInCTA": "Влезте или въведете ключът за излъчване на живо от YouTube.",
+        "signInCTA": "Влезте или въведете ключа за излъчване на живо от YouTube.",
         "signOut": "Излизане",
         "start": "Започни излъчване на живо",
         "streamIdHelp": "Какво е това?",
@@ -405,13 +417,13 @@
         "durationNA": "Няма",
         "encoding": "Кодек",
         "label": "Етикет",
-        "labelToolTip": "Локалния запис е включен",
+        "labelToolTip": "Локалният запис е включен",
         "localRecording": "Локален запис",
         "me": "Аз",
         "messages": {
-            "engaged": "Локалния запис е включен.",
-            "finished": "Записа на сесията {{token}} приключи. Моля изпратете записа на вашият домакин.",
-            "finishedModerator": "Сесията {{token}} за запис приключи. Локалният запис беше запазен. Моля поканете останалите участници да ви изпратят техните записи.",
+            "engaged": "Локалният запис е включен.",
+            "finished": "Записа на сесията {{token}} приключи. Моля, изпратете записа на вашият домакин.",
+            "finishedModerator": "Сесията {{token}} за запис приключи. Локалният запис беше запазен. Моля, поканете останалите участници да ви изпратят техните записи.",
             "notModerator": "Нямате права да пускате спирате локален запис."
         },
         "moderator": "Модератор",
@@ -427,11 +439,11 @@
     "lockRoomPasswordUppercase": "Парола",
     "me": "аз",
     "notify": {
-        "connectedOneMember": "{{name}} влезна в срещата",
-        "connectedThreePlusMembers": "{{name}} и още {{count}} влезнаха в срещата",
-        "connectedTwoMembers": "{{first}} и {{second}} влезнаха в срещата",
+        "connectedOneMember": "{{name}} влезе в срещата",
+        "connectedThreePlusMembers": "{{name}} и още {{count}} влязоха в срещата",
+        "connectedTwoMembers": "{{first}} и {{second}} влязоха в срещата",
         "disconnected": "Напусна срещата",
-        "focus": "Конферентен фокус",
+        "focus": "Фокус на срещата",
         "focusFail": "{{component}} не е на раположение - следващ опит след {{ms}} секунди",
         "grantedTo": "Даване на роля модератор на {{to}}!",
         "invitedOneMember": "{{name}} бе поканен",
@@ -441,20 +453,20 @@
         "me": "Аз",
         "moderator": "Придобихте права на модератор!",
         "muted": "Започвате разговора без звук.",
-        "mutedTitle": "Звукът ви е спрян!",
-        "mutedRemotelyTitle": "Микрофонът ви бе спрян от {{participantDisplayName}}!",
-        "mutedRemotelyDescription": "Винаги можете да пуснете микрофона си когато сте готови да говорите. Заглушете го отново за да не изпращате шум в срещата.",
+        "mutedTitle": "Звукът Ви е спрян!",
+        "mutedRemotelyTitle": "Микрофонът Ви бе спрян от {{participantDisplayName}}!",
+        "mutedRemotelyDescription": "Винаги можете да пуснете микрофона си, когато сте готови да говорите. Заглушете го отново, за да не изпращате шум в срещата.",
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) е премахната от друг потребител",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) създадена от друг потребител",
         "raisedHand": "{{name}} иска думата.",
         "somebody": "Някой",
         "startSilentTitle": "Влязохте с опция да не чувате аудио!",
-        "startSilentDescription": "Влезте повторно за да пуснете звука",
+        "startSilentDescription": "Влезте повторно, за да пуснете звука",
         "suboptimalBrowserWarning": "Опасяваме се, че няма да можете да се насладите на срещата. Работим по въпроса, междувременно използвайте някой от <a href='{{recommendedBrowserPageLink}}' target='_blank'>напълно поддържаните браузъри</a>.",
         "suboptimalExperienceTitle": "Внимание",
         "unmute": "Пускане на микрофона",
         "newDeviceCameraTitle": "Засечена е нова камера",
-        "newDeviceAudioTitle": "Ново аудио устройство е засечено",
+        "newDeviceAudioTitle": "Засечено е ново аудио устройство",
         "newDeviceAction": "Използвай"
     },
     "passwordSetRemotely": "зададена от друг участник",
@@ -469,7 +481,7 @@
         "disconnected": "Изключен",
         "expired": "Изтекъл",
         "ignored": "Пренебрегнат",
-        "initializingCall": "Свързване на обаждането...",
+        "initializingCall": "Започване на обаждането...",
         "invited": "Поканен",
         "rejected": "Отхвърлен",
         "ringing": "Звъни..."
@@ -487,7 +499,7 @@
         "beta": "БЕТА",
         "busy": "Работим върху това да освободим ресурси за запис. Моля, опитайте отново след няколко минути.",
         "busyTitle": "Всички възможности за запис в момента са заети",
-        "error": "Грешка при опит за запис. Моля опитайте отново.",
+        "error": "Грешка при опит за запис. Моля, опитайте отново.",
         "expandedOff": "Записът спря",
         "expandedOn": "Срещата се записва в момента.",
         "expandedPending": "Записът започва...",
@@ -495,28 +507,28 @@
         "fileSharingdescription": "Споделете записа с участниците в срещата",
         "live": "На Живо",
         "loggedIn": "Влезли сте като {{userName}}",
-        "off": "Записът спрян",
-        "offBy": "{{name}} спря записът",
+        "off": "Записът е спрян",
+        "offBy": "{{name}} спря записа",
         "on": "Запис",
         "onBy": "{{name}} пусна запис",
         "pending": "Стартира запис на срещата...",
         "rec": "ЗАПИС",
-        "serviceDescription": "Записът ви ще се запише от специална записваща услуга",
+        "serviceDescription": "Записът Ви ще се запише от специална записваща услуга",
         "serviceName": "Записваща услуга",
         "signIn": "Влизане",
         "signOut": "Излизане",
-        "unavailable": "Упс! В момент {{serviceName}} е недостъпна. В момента се опитваме да решим проблема. Моля опитайте отново малко по-късно.",
+        "unavailable": "Упс! В момента {{serviceName}} е недостъпна. В момента се опитваме да решим проблема. Моля, опитайте отново малко по-късно.",
         "unavailableTitle": "Записът е невъзможен"
     },
     "sectionList": {
-        "pullToRefresh": "Издърпай за да се обнови"
+        "pullToRefresh": "Издърпай, за да се обнови"
     },
     "settings": {
         "calendar": {
-            "about": "Календарната интеграция на {{appName}} сигурно достъпва вашия календар за да покаже настъпващите събития.",
+            "about": "Календарната интеграция на {{appName}} сигурно достъпва Вашия календар, за да покаже настъпващите събития.",
             "disconnect": "Разкачи",
             "microsoftSignIn": "Влез с Microsoft акаунт",
-            "signedIn": "В момента достъпва календара с {{email}}. Натиснете бутона Разкачи за да спрете достъпа.",
+            "signedIn": "В момента достъпва календара с {{email}}. Натиснете бутона Разкачи, за да спрете достъпа.",
             "title": "Календар"
         },
         "devices": "Устройства",
@@ -543,7 +555,7 @@
         "alertURLText": "Въведената връзка за сървър е невалидна",
         "buildInfoSection": "Информация за програмата",
         "conferenceSection": "Конференция",
-        "disableCallIntegration": "Декативирнае на интеграция с обажданията",
+        "disableCallIntegration": "Деактивиране на интеграция с обажданията",
         "disableP2P": "Деактивиране на опцията за пряка връзка (p2p)",
         "displayName": "Име",
         "email": "Поща",
@@ -557,7 +569,7 @@
     },
     "share": {
         "dialInfoText": "\n\n=====\n\nИскате да наберете от телефона?\n\n{{defaultDialInNumber}}Използвайте този линк за повече номера\n{{dialInfoPageUrl}}",
-        "mainText": "Използвайте линка за да влезете в срещата:\n{{roomUrl}}"
+        "mainText": "Използвайте линка, за да влезете в срещата:\n{{roomUrl}}"
     },
     "speaker": "Говорещ",
     "speakerStats": {
@@ -579,7 +591,7 @@
     },
     "toolbar": {
         "accessibilityLabel": {
-            "audioOnly": "Пускане на режим само с звук",
+            "audioOnly": "Пускане на режим само със звук",
             "audioRoute": "Изберете устройство за звук",
             "callQuality": "Промяна качеството на видеото",
             "cc": "Пускане на субтитри",
@@ -587,7 +599,7 @@
             "document": "Показване на споделен документ",
             "download": "Свалете приложението",
             "feedback": "Отзиви",
-            "fullScreen": "Пускане/Спиране на изглед в цял екран",
+            "fullScreen": "Пускане/спиране на изглед в цял екран",
             "hangup": "Напускане на срещата",
             "help": "Помощ",
             "invite": "Поканете участници",
@@ -626,7 +638,7 @@
         "callQuality": "Промяна качеството на видеото",
         "chat": "Отваряне/затваряне на текстовите съобщения",
         "closeChat": "Затваряне на съобщенията",
-        "documentClose": "Затваряне на споделеният документ",
+        "documentClose": "Затваряне на споделения документ",
         "documentOpen": "Отваряне на споделен документ",
         "download": "Свалете приложението",
         "enterFullScreen": "Вижте на цял екран",
@@ -642,7 +654,7 @@
         "lowerYourHand": "Махни искането на думата",
         "moreActions": "Още опции",
         "mute": "Спиране/пускане на микрофона",
-        "noAudioSignalTitle": "Няма сигнал идващ от микрофона!",
+        "noAudioSignalTitle": "Няма сигнал, идващ от микрофона!",
         "noAudioSignalDesc": "Ако не сте спрели звука на устройството от системните настройки, сменете с друго устройство.",
         "noAudioSignalDescSuggestion": "Ако не сте спрели звука на устройството от системните настройки, използвайте някое от предложените устройства.",
         "openChat": "Отвори съобщенията",
@@ -667,16 +679,16 @@
         "videomute": "Пускане/спиране на камерата",
         "startvideoblur": "Замъгли фона ми",
         "stopvideoblur": "Спиране замъгляването на фона",
-        "noisyAudioInputDesc": "Изглежда доста шум идва от микрофона ви, заглушете го или сменете устройството.",
-        "noisyAudioInputTitle": "Изглежда е шумно около вас!",
+        "noisyAudioInputDesc": "Изглежда доста шум идва от микрофона Ви, заглушете го или сменете устройството.",
+        "noisyAudioInputTitle": "Изглежда е шумно около Вас!",
         "noAudioSignalDialInLinkDesc": "Номера за обаждане",
         "noAudioSignalDialInDesc": "Може да влезнете чрез обаждане на:",
         "muteEveryone": "Заглуши всички",
         "moreOptions": "Повече опции"
     },
     "transcribing": {
-        "ccButtonTooltip": "Пускане / Спиране на субтитри",
-        "error": "Грешка при опит за транскрибиране. Моля опитайте отново.",
+        "ccButtonTooltip": "Пускане/спиране на субтитри",
+        "error": "Грешка при опит за транскрибиране. Моля, опитайте отново.",
         "expandedLabel": "Транскрибирането е пуснато",
         "failedToStart": "Транскрибирането не успя при пускане",
         "labelToolTip": "Тази среща се транскрибира",
@@ -712,17 +724,17 @@
         "audioOnly": "АУДИО",
         "audioOnlyExpanded": "Вие сте в режим на нисък трафик. В този режим ще получавате само аудио или споделени екрани.",
         "callQuality": "Качество на видеото",
-        "hd": "ВК",
+        "hd": "HD",
         "hdTooltip": "Гледате високо качество на видеото",
         "highDefinition": "Високо качество",
         "labelTooiltipNoVideo": "Няма видео",
         "labelTooltipAudioOnly": "Пуснат режим на нисък трафик",
-        "ld": "НК",
+        "ld": "LD",
         "ldTooltip": "Виждате ниско качество на видеото",
         "lowDefinition": "Ниско качество",
         "onlyAudioAvailable": "Само аудио е налично",
         "onlyAudioSupported": "Този браузър поддържа само аудио.",
-        "sd": "СК",
+        "sd": "SD",
         "sdTooltip": "Гледате стандартно качество на видеото",
         "standardDefinition": "Стандартно качество"
     },
@@ -731,16 +743,16 @@
         "flip": "Огледално",
         "kick": "Изгони",
         "moderator": "Модератор",
-        "mute": "Участника е с изключен микрофон",
+        "mute": "Участникът е с изключен микрофон",
         "muted": "Изключен микрофон",
         "remoteControl": "Отдалечено управление",
         "show": "Покажи на главния екран",
-        "videomute": "Участник е спрял камерата си",
+        "videomute": "Участникът е спрял камерата си",
         "domuteOthers": "Заглушете всички останали"
     },
     "welcomepage": {
         "accessibilityLabel": {
-            "join": "Натиснете за да влезете",
+            "join": "Натиснете, за да влезете",
             "roomname": "Въведете име на стаята"
         },
         "appDescription": "Хайде на видео разговор с целия екип! Всъщност, поканете всички свои познати! {{app}} е напълно защитено решение за видеоконференции със 100% отворен код, което може да ползвате по цял ден, всеки ден, безплатно - без да ви е нужна регистрация.",
@@ -749,10 +761,10 @@
             "video": "Видео"
         },
         "calendar": "Календар",
-        "connectCalendarButton": "Свържете вашия календар",
-        "connectCalendarText": "Свържете вашия календар за да видите срещите си в {{app}}. Добавяйки {{provider}} срещите в календара си ще можете да ги старирате с едно докосване.",
+        "connectCalendarButton": "Свържете своя календар",
+        "connectCalendarText": "Свържете своя календар, за да видите срещите си в {{app}}. Добавяйки {{provider}} срещите в календара си, ще можете да ги старирате с едно докосване.",
         "enterRoomTitle": "Започни нова среща",
-        "roomNameAllowedChars": "Името на срещата не трябва да съдържа някой от символите: ?, &, :, ', \", %, #.",
+        "roomNameAllowedChars": "Името на срещата не трябва да съдържа никой от символите: ?, &, :, ', \", %, #.",
         "go": "НАПРЕД",
         "goSmall": "НАПРЕД",
         "join": "Създай / Влез",
@@ -760,10 +772,10 @@
         "privacy": "Поверителност",
         "recentList": "Скорошни срещи",
         "recentListDelete": "Изтрий",
-        "recentListEmpty": "Списъка с скорошни срещи е празен. След като участвате в някоя среща, ще я намерите тук.",
+        "recentListEmpty": "Списъкът със скорошни срещи е празен. След като участвате в някоя среща, ще я намерите тук.",
         "reducedUIText": "Добре дошли в {{app}}!",
         "roomname": "Въведете име на стаята",
-        "roomnameHint": "Въведете името или връзката на стаята в която искате да влезете. Също може да си измислите име. Само го споделете с някой, за да може и той да въведе същото име за да се срещнете.",
+        "roomnameHint": "Въведете името или връзката на стаята, в която искате да влезете. Също така може да си измислите име. Само го споделете с някого, за да може и той да въведе същото име и да се срещнете.",
         "sendFeedback": "Изпращане на отзиви",
         "terms": "Условия",
         "title": "Сигурна, с много възможности, и напълно безплатна платформа за видео конференции",

lang/main-de.json

@@ -28,6 +28,7 @@
         "shareInvite": "Einladung zur Versammlung teilen",
         "shareLink": "Teilen Sie den Konferenzlink, um andere einzuladen",
         "shareStream": "Den Livestreaminglink freigeben",
+        "sip": "SIP: {{address}}",
         "telephone": "Telefon: {{number}}",
         "title": "Personen zu dieser Konferenz einladen",
         "yahooEmail": "Yahoo-E-Mail"
@@ -61,13 +62,14 @@
         "today": "Heute"
     },
     "chat": {
+        "enter": "Chat-Raum betreten",
         "error": "Fehler: Ihre Nachricht wurde nicht versendet. Grund: {{error}}",
         "fieldPlaceHolder": "Geben Sie Ihre Nachricht hier ein",
         "messagebox": "Nachricht eingeben",
         "messageTo": "Private Nachricht an {{recipient}}",
         "noMessagesMessage": "Es gibt noch keine Nachricht in dieser Konferenz. Starten Sie hier eine Unterhaltung!",
         "nickname": {
-            "popover": "Name",
+            "popover": "Wähle einen Alias",
             "title": "Geben Sie einen Alias zum Chatten ein"
         },
         "privateNotice": "Private Nachricht an {{recipient}}",
@@ -120,7 +122,7 @@
             "inactive": "Inaktiv",
             "lost": "Verloren",
             "nonoptimal": "Nicht optimal",
-            "poor": "Dürftig"
+            "poor": "Schlecht"
         },
         "remoteaddress": "Entfernte Adresse:",
         "remoteaddress_plural": "Entfernte Adressen:",
@@ -152,7 +154,7 @@
         "tryAgainButton": "Erneut mit der nativen Applikation versuchen"
     },
     "defaultLink": "Bsp.: {{url}}",
-    "defaultNickname": "Z.B. Jane Pink",
+    "defaultNickname": "Z. B. Jane Pink",
     "deviceError": {
         "cameraError": "Fehler beim Zugriff auf die Kamera",
         "cameraPermission": "Fehler beim Bezug der Kamera-Zugriffsberechtigungen",
@@ -174,12 +176,14 @@
         "alreadySharedVideoMsg": "Eine andere Person gibt bereits ein Video weiter. Bei dieser Konferenz ist jeweils nur ein geteiltes Video möglich.",
         "alreadySharedVideoTitle": "Nur ein geteiltes Video gleichzeitig",
         "applicationWindow": "Anwendungsfenster",
+        "authenticationRequired": "Authentifizierung benötigt",
         "Back": "Zurück",
         "cameraConstraintFailedError": "Ihre Kamera erfüllt die notwendigen Anforderungen nicht.",
         "cameraNotFoundError": "Kamera nicht gefunden.",
         "cameraNotSendingData": "Die Kamera ist nicht verfügbar. Bitte prüfen, ob eine andere Applikation die Kamera verwendet, eine andere Kamera vom Einstellungs-Menü auswählen oder die Applikation neu laden.",
         "cameraNotSendingDataTitle": "Zugriff auf Kamera nicht möglich",
         "cameraPermissionDeniedError": "Die Berechtigung zur Verwendung der Kamera wurde nicht erteilt. Sie können trotzdem an der Konferenz teilnehmen, aber die anderen Personen können Sie nicht sehen. Verwenden Sie die Kamera-Schaltfläche in der Adressleiste, um die Berechtigungen zu erteilen.",
+        "cameraTimeoutError": "Die Videoquelle konnte nicht gestartet werden. Es ist eine Zeitüberschreitung aufgetreten!",
         "cameraUnknownError": "Die Kamera kann aus einem unbekannten Grund nicht verwendet werden.",
         "cameraUnsupportedResolutionError": "Die Kamera unterstützt die erforderliche Auflösung nicht.",
         "Cancel": "Abbrechen",
@@ -220,12 +224,12 @@
         "kickTitle": "Autsch! {{participantDisplayName}} hat Sie aus dem Meeting geworfen",
         "liveStreaming": "Livestreaming",
         "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Während einer Aufnahme nicht möglich",
-        "liveStreamingDisabledForGuestTooltip": "Gäste können kein Livestreaming starten.",
         "liveStreamingDisabledTooltip": "Starten des Livestreams deaktiviert.",
         "lockMessage": "Die Konferenz konnte nicht gesperrt werden.",
         "lockRoom": "Konferenz$t(lockRoomPassword) hinzufügen",
         "lockTitle": "Sperren fehlgeschlagen",
         "logoutQuestion": "Sind Sie sicher, dass Sie sich abmelden und die Konferenz verlassen möchten?",
+        "login": "Anmelden",
         "logoutTitle": "Abmelden",
         "maxUsersLimitReached": "Das Limit für die maximale Personenzahl ist erreicht. Die Konferenz ist voll. Bitte wenden Sie sich an die Konferenzleitung oder versuchen Sie es später noch einmal!",
         "maxUsersLimitReachedTitle": "Maximale Personenzahl erreicht",
@@ -234,6 +238,7 @@
         "micNotSendingData": "Gehen Sie zu den Einstellungen Ihres Computers, um die Stummschaltung Ihres Mikrofons aufzuheben und seinen Pegel einzustellen",
         "micNotSendingDataTitle": "Ihr Mikrofon ist durch Ihre Systemeinstellungen stumm geschaltet",
         "micPermissionDeniedError": "Die Berechtigung zur Verwendung des Mikrofons wurde nicht erteilt. Sie können trotzdem an der Konferenz teilnehmen, aber die anderen Personen können Sie nicht hören. Verwenden Sie die Kamera-Schaltfläche in der Adressleiste, um die Berechtigungen zu erteilen.",
+        "micTimeoutError": "Audioquelle konnte nicht gestartet werden. Zeitüberschreitung",
         "micUnknownError": "Das Mikrofon kann aus einem unbekannten Grund nicht verwendet werden.",
         "muteEveryoneElseDialog": "Einmal stummgeschaltet, können Sie deren Stummschaltung nicht mehr beenden, aber sie können ihre Stummschaltung jederzeit selbst beenden.",
         "muteEveryoneElseTitle": "Alle außer {{whom}} stummschalten?",
@@ -242,6 +247,7 @@
         "muteEveryoneElsesVideoDialog": "Sobald die Kamera deaktiviert ist, können Sie sie nicht wieder aktivieren, die Teilnehmer können dies aber jederzeit wieder ändern.",
         "muteEveryoneElsesVideoTitle": "Die Kamera von allen außer {{whom}} ausschalten?",
         "muteEveryonesVideoDialog": "Sind Sie sicher, dass Sie die Kamera von allen Teilnehmern deaktivieren möchten? Sie können sie nicht wieder aktivieren, die Teilnehmer können dies aber jederzeit wieder ändern.",
+        "muteEveryonesVideoDialogOk": "deaktivieren",
         "muteEveryonesVideoTitle": "Die Kamera von allen anderen ausschalten?",
         "muteEveryoneSelf": "sich selbst",
         "muteEveryoneStartMuted": "Alle beginnen von jetzt an stummgeschaltet",
@@ -294,7 +300,6 @@
         "shareVideoTitle": "Video teilen",
         "shareYourScreen": "Bildschirm freigeben",
         "shareYourScreenDisabled": "Bildschirmfreigabe deaktiviert.",
-        "shareYourScreenDisabledForGuest": "Gäste können den Bildschirm nicht freigeben.",
         "startLiveStreaming": "Livestream starten",
         "startRecording": "Aufnahme starten",
         "startRemoteControlErrorMessage": "Beim Versuch, die Fernsteuerung zu starten, ist ein Fehler aufgetreten!",
@@ -311,10 +316,12 @@
         "transcribing": "Wird transkribiert",
         "unlockRoom": "Konferenz$t(lockRoomPassword) entfernen",
         "user": "Anmeldename",
+        "userIdentifier": "Benutzername",
         "userPassword": "Passwort",
+        "videoLink": "Video link",
         "WaitForHostMsg": "Die Konferenz <b>{{room}}</b> wurde noch nicht gestartet. Falls Sie die Konferenz leiten, authentifizieren Sie sich bitte. Warten Sie andernfalls, bis die Konferenz gestartet wird.",
         "WaitForHostMsgWOk": "Die Konferenz <b>{{room}}</b> wurde noch nicht gestartet. Falls Sie die Konferenz leiten, authentifizieren Sie sich bitte. Warten Sie andernfalls, bis die Konferenz gestartet wird.",
-        "WaitingForHost": "Warten auf den Beginn der Konferenz …",
+        "WaitingForHostTitle": "Warten auf den Beginn der Konferenz …",
         "Yes": "Ja",
         "yourEntireScreen": "Ganzer Bildschirm"
     },
@@ -330,6 +337,15 @@
     "embedMeeting": {
         "title": "Diese Konferenz einbetten"
     },
+    "virtualBackground": {
+        "title": "Hintergründe",
+        "blur": "Hintergrund unscharf",
+        "slightBlur": "Hintergrund leicht unscharf",
+        "removeBackground": "Hintergrund entfernen",
+        "uploadImage": "Bild hochladen",
+        "pleaseWait": "Bitte warten...",
+        "none": "keiner"
+    },
     "feedback": {
         "average": "Durchschnittlich",
         "bad": "Schlecht",
@@ -404,8 +420,7 @@
         "toggleFilmstrip": "Video-Miniaturansichten ein- oder ausblenden",
         "toggleScreensharing": "Zwischen Kamera und Bildschirmfreigabe wechseln",
         "toggleShortcuts": "Tastenkombinationen ein- oder ausblenden",
-        "videoMute": "Kamera starten oder stoppen",
-        "videoQuality": "Anrufqualität verwalten"
+        "videoMute": "Kamera starten oder stoppen"
     },
     "liveStreaming": {
         "limitNotificationDescriptionWeb": "Wegen hoher Nachfrage ist Ihr Stream auf {{limit}} Min. begrenzt. Für unlimitiertes Streaming nutzen Sie bitte <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
@@ -470,7 +485,7 @@
         "stop": "Aufnahme stoppen",
         "yes": "Ja"
     },
-    "lockRoomPassword": "passwort",
+    "lockRoomPassword": "Passwort",
     "lockRoomPasswordUppercase": "Passwort",
     "me": "ich",
     "notify": {
@@ -496,6 +511,8 @@
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) von einer anderen Person entfernt",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) von einer anderen Person gesetzt",
         "raisedHand": "{{name}} möchte sprechen.",
+        "screenShareNoAudio": " Share audio box was not checked in the window selection screen.",
+        "screenShareNoAudioTitle": "Share audio was not checked",
         "somebody": "Jemand",
         "startSilentTitle": "Sie sind ohne Audioausgabe beigetreten!",
         "startSilentDescription": "Treten Sie dem Meeting noch einmal bei, um Ihr Audio zu aktivieren",
@@ -562,8 +579,8 @@
         "linkCopied": "Link in die Zwischenablage kopiert",
         "lookGood": "Ihr Mikrofon scheint zu funktionieren.",
         "or": "oder",
-        "premeeting": "Vorraum",
-        "showScreen": "Konferenzvorraum aktivieren",
+        "premeeting": "Vorschau",
+        "showScreen": "Konferenzvorschau aktivieren",
         "startWithPhone": "Mit Telefonaudio starten",
         "screenSharingError": "Fehler bei Bildschirmfreigabe:",
         "videoOnlyError": "Videofehler:",
@@ -614,6 +631,7 @@
         "pending": "Aufzeichnung des Meetings wird vorbereitet…",
         "rec": "AUFZ",
         "serviceDescription": "Ihre Aufzeichnung wird vom Aufzeichnungsdienst gespeichert",
+        "serviceDescriptionCloud": "Cloud-Aufzeichnung",
         "serviceName": "Aufnahmedienst",
         "signIn": "Anmelden",
         "signOut": "Abmelden",
@@ -624,9 +642,9 @@
         "pullToRefresh": "Ziehen, um zu aktualisieren"
     },
     "security": {
-        "about": "Sie können Ihre Konferenz mit einem Passwort sichern. Personen müssen dieses eingeben, bevor sie an der Sitzung teilnehmen dürfen.",
+        "about": "Sie können Ihre Konferenz mit einem Passwort sichern. Teilnehmer müssen dieses eingeben, bevor sie an der Sitzung teilnehmen dürfen.",
         "aboutReadOnly": "Mit Moderationsrechten kann die Konferenz mit einem Passwort gesichert werden. Personen müssen dieses eingeben, bevor sie an der Sitzung teilnehmen dürfen.",
-        "insecureRoomNameWarning": "Der Raumname ist unsicher. Unerwünschte Personen könnten Ihrer Konferenz beitreten",
+        "insecureRoomNameWarning": "Der Raumname ist unsicher. Unerwünschte Teilnehmer könnten Ihrer Konferenz beitreten",
         "securityOptions": "Sicherheitsoptionen"
     },
     "settings": {
@@ -736,6 +754,7 @@
             "remoteVideoMute": "Kamera von dieser Person ausschalten",
             "security": "Sicherheitsoptionen",
             "Settings": "Einstellungen ein-/ausschalten",
+            "shareaudio": "Audio teilen",
             "sharedvideo": "YouTube-Videofreigabe ein-/ausschalten",
             "shareRoom": "Person einladen",
             "shareYourScreen": "Bildschirmfreigabe ein-/ausschalten",
@@ -746,9 +765,10 @@
             "toggleCamera": "Kamera wechseln",
             "toggleFilmstrip": "Miniaturansichten ein-/ausschalten",
             "videomute": "„Video stummschalten“ ein-/ausschalten",
-            "videoblur": "Video-Unschärfe ein-/ausschalten"
+            "selectBackground": "Hintergrund auswählen"
         },
         "addPeople": "Personen zur Konferenz hinzufügen",
+        "audioSettings": "Ton-Einstellungen",
         "audioOnlyOff": "Modus „Nur Audio“ deaktivieren",
         "audioOnlyOn": "Modus „Nur Audio“ aktivieren",
         "audioRoute": "Audiogerät auswählen",
@@ -794,6 +814,7 @@
         "raiseYourHand": "Melden",
         "security": "Sicherheitsoptionen",
         "Settings": "Einstellungen",
+        "shareaudio": "Audio teilen",
         "sharedvideo": "YouTube-Video teilen",
         "shareRoom": "Person einladen",
         "shortcuts": "Tastenkürzel anzeigen",
@@ -807,8 +828,8 @@
         "tileViewToggle": "Kachelansicht ein-/ausschalten",
         "toggleCamera": "Kamera wechseln",
         "videomute": "Kamera starten / stoppen",
-        "startvideoblur": "Hintergrundunschärfe aktivieren",
-        "stopvideoblur": "Hintergrundunschärfe deaktivieren"
+        "videoSettings": "Video-Einstellungen",
+        "selectBackground": "Hintergrund auswählen"
     },
     "transcribing": {
         "ccButtonTooltip": "Untertitel ein-/ausschalten",
@@ -856,13 +877,12 @@
         "ld": "LD",
         "ldTooltip": "Video wird in niedriger Auflösung angezeigt",
         "lowDefinition": "Niedrige Auflösung",
-        "onlyAudioAvailable": "Nur Ton",
-        "onlyAudioSupported": "In diesem Browser wird nur Audio unterstützt.",
         "sd": "SD",
         "sdTooltip": "Video wird in Standardauflösung angezeigt",
         "standardDefinition": "Standardauflösung"
     },
     "videothumbnail": {
+        "connectionInfo": "Verbindungsinformationen",
         "domute": "Stummschalten",
         "domuteVideo": "Kamera ausschalten",
         "domuteOthers": "Alle anderen stummschalten",
@@ -899,6 +919,7 @@
         "headerSubtitle": "Sichere und hochqualitative Meetings",
         "info": "Einwahlinformationen",
         "join": "ERSTELLEN / BEITRETEN",
+        "jitsiOnMobile": "Jitsi on mobile – Download unsere Apps und starte ein Meeting von überall",
         "moderatedMessage": "Oder <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">reservieren Sie sich eine Konferenz-URL</a>, die nur Sie moderieren.",
         "privacy": "Datenschutz",
         "recentList": "Verlauf",

lang/main-fr.json

@@ -201,9 +201,9 @@
         "dismiss": "Rejeter",
         "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.",
+        "e2eeDescription": "Le chiffrement de Bout-en-Bout est actuellement EXPERIMENTAL. Veuillez garder à l'esprit que l'activation du chiffrement 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 chiffrement 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 chiffrement, ils ne pourront ni vous voir, ni vous entendre.",
         "enterDisplayName": "Merci de saisir votre nom ici",
         "error": "Erreur",
         "externalInstallationMsg": "Vous devez installer notre extension de partage de bureau.",
@@ -326,7 +326,7 @@
         "title": "Document partagé"
     },
     "e2ee": {
-        "labelToolTip": "L'audio et la vidéo de cette conférence sont cryptés de Bout-en-Bout"
+        "labelToolTip": "L'audio et la vidéo de cette conférence sont chiffrés de Bout-en-Bout"
     },
     "embedMeeting": {
         "title": "Intégrer cette réunion"
@@ -757,7 +757,7 @@
         "documentClose": "Fermer le document partagé",
         "documentOpen": "Ouvrir le document partagé",
         "download": "Télécharger nos applications",
-        "e2ee": "Cryptage de Bout-en-Bout",
+        "e2ee": "Chiffrement de Bout-en-Bout",
         "embedMeeting": "Intégrer la réunion",
         "enterFullScreen": "Afficher en plein écran",
         "enterTileView": "Accéder au mode mosaïque",