feat(base): TERTIARY type rework

* feat(mobile/navigation): replaced native stack with stack navigator and other ui fixes

.github/workflows/ci.yml

@@ -20,6 +20,4 @@ jobs:
       run: $(exit $(git status --porcelain --untracked-files=no | head -255 | wc -l)) || (echo "Dirty git tree"; git diff; exit 1)
     - run: npm run lint
     - run: for file in lang/*.json; do npx --yes jsonlint -q $file || exit 1; done
-    - env:
-        NODE_OPTIONS: '--max-old-space-size=8192'
-      run: make
+    - run: make

Makefile

@@ -4,7 +4,7 @@ DEPLOY_DIR = libs
 LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet
 OLM_DIR = node_modules/@matrix-org/olm
 TF_WASM_DIR = node_modules/@tensorflow/tfjs-backend-wasm/dist/
-RNNOISE_WASM_DIR = node_modules/@jitsi/rnnoise-wasm/dist
+RNNOISE_WASM_DIR = node_modules/rnnoise-wasm/dist
 TFLITE_WASM = react/features/stream-effects/virtual-background/vendor/tflite
 MEET_MODELS_DIR  = react/features/stream-effects/virtual-background/vendor/models
 FACE_MODELS_DIR = node_modules/@vladmandic/human-models/models
@@ -49,8 +49,6 @@ deploy-appbundle:
 		$(BUILD_DIR)/analytics-ga.min.js.map \
 		$(BUILD_DIR)/face-landmarks-worker.min.js \
 		$(BUILD_DIR)/face-landmarks-worker.min.js.map \
-		$(BUILD_DIR)/noise-suppressor-worklet.min.js \
-		$(BUILD_DIR)/noise-suppressor-worklet.min.js.map \
 		$(DEPLOY_DIR)
 	cp \
 		$(BUILD_DIR)/close3.min.js \

android/gradle.properties

@@ -26,5 +26,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false
 
-appVersion=99.0.0
-sdkVersion=99.0.0
+appVersion=22.4.0
+sdkVersion=6.0.0

android/sdk/build.gradle

@@ -51,10 +51,15 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.startup:startup-runtime:1.1.0"
 
-    // Only add these packages if we are NOT doing a LIBRE_BUILD
-    if (!rootProject.ext.libreBuild) {
+    if (rootProject.ext.libreBuild) {
+        implementation(project(':react-native-device-info')) {
+            exclude group: 'com.google.firebase'
+            exclude group: 'com.google.android.gms'
+            exclude group: 'com.android.installreferrer'
+        }
+    } else {
         implementation project(':react-native-amplitude')
-        implementation project(':react-native-giphy')
+        implementation project(':react-native-device-info')
         implementation(project(":react-native-google-signin")) {
             exclude group: 'com.google.android.gms'
             exclude group: 'androidx'
@@ -67,18 +72,15 @@ dependencies {
     implementation project(':react-native-community_clipboard')
     implementation project(':react-native-community_netinfo')
     implementation project(':react-native-default-preference')
-    implementation(project(':react-native-device-info')) {
-        exclude group: 'com.google.firebase'
-        exclude group: 'com.google.android.gms'
-        exclude group: 'com.android.installreferrer'
-    }
     implementation project(':react-native-gesture-handler')
     implementation project(':react-native-get-random-values')
+    implementation project(':react-native-giphy')
     implementation project(':react-native-immersive')
     implementation project(':react-native-keep-awake')
     implementation project(':react-native-masked-view_masked-view')
     implementation project(':react-native-pager-view')
     implementation project(':react-native-performance')
+    implementation project(':react-native-reanimated')
     implementation project(':react-native-safe-area-context')
     implementation project(':react-native-screens')
     implementation project(':react-native-slider')

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

@@ -206,7 +206,7 @@ public class JitsiMeetView extends FrameLayout {
         // by leaving the 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 below introduces
+        // JavaScript source code. The workaround implemented bellow introduces
         // "imperativeness" in React Component props by defining a unique value
         // per setProps() invocation.
         props.putLong("timestamp", System.currentTimeMillis());

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

@@ -193,7 +193,7 @@ class RNConnectionService extends ReactContextBaseJavaModule {
      * Called by the JS side to update the call's state.
      *
      * @param callUUID - the call's UUID.
-     * @param callState - the map which carries info about the current call's
+     * @param callState - the map which carries infor about the current call's
      * state. See static fields in {@link ConnectionService.ConnectionImpl}
      * prefixed with "KEY_" for the values supported by the Android
      * implementation.

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

@@ -46,8 +46,6 @@ import java.util.Arrays;
 import java.util.List;
 
 class ReactInstanceManagerHolder {
-    private static final String TAG = ReactInstanceManagerHolder.class.getSimpleName();
-
     /**
      * FIXME (from linter): Do not place Android context classes in static
      * fields (static reference to ReactInstanceManager which has field
@@ -112,11 +110,13 @@ class ReactInstanceManagerHolder {
             new com.corbt.keepawake.KCKeepAwakePackage(),
             new com.facebook.react.shell.MainReactPackage(),
             new com.reactnativecommunity.clipboard.ClipboardPackage(),
+            new com.giphyreactnativesdk.GiphyReactNativeSdkPackage(),
             new com.reactnativecommunity.netinfo.NetInfoPackage(),
             new com.reactnativepagerview.PagerViewPackage(),
             new com.oblador.performance.PerformancePackage(),
             new com.reactnativecommunity.slider.ReactSliderPackage(),
             new com.brentvatne.react.ReactVideoPackage(),
+            new com.swmansion.reanimated.ReanimatedPackage(),
             new org.reactnative.maskedview.RNCMaskedViewPackage(),
             new com.reactnativecommunity.webview.RNCWebViewPackage(),
             new com.kevinresol.react_native_default_preference.RNDefaultPreferencePackage(),
@@ -146,17 +146,6 @@ class ReactInstanceManagerHolder {
             packages.add((ReactPackage)constructor.newInstance());
         } catch (Exception e) {
             // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            Log.d(TAG, "Not loading AmplitudeReactNativePackage");
-        }
-
-        // GiphyReactNativeSdkPackage
-        try {
-            Class<?> giphyPackageClass = Class.forName("com.giphyreactnativesdk.GiphyReactNativeSdkPackage");
-            Constructor constructor = giphyPackageClass.getConstructor();
-            packages.add((ReactPackage)constructor.newInstance());
-        } catch (Exception e) {
-            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            Log.d(TAG, "Not loading GiphyReactNativeSdkPackage");
         }
 
         // RNGoogleSignInPackage
@@ -166,7 +155,6 @@ class ReactInstanceManagerHolder {
             packages.add((ReactPackage)constructor.newInstance());
         } catch (Exception e) {
             // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            Log.d(TAG, "Not loading RNGoogleSignInPackage");
         }
 
         return packages;
@@ -252,7 +240,7 @@ class ReactInstanceManagerHolder {
             return;
         }
 
-        Log.d(TAG, "initializing RN with Application");
+        Log.d(ReactInstanceManagerHolder.class.getCanonicalName(), "initializing RN with Application");
 
         reactInstanceManager
             = ReactInstanceManager.builder()

android/settings.gradle

@@ -37,6 +37,8 @@ include ':react-native-pager-view'
 project(':react-native-pager-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-pager-view/android')
 include ':react-native-performance'
 project(':react-native-performance').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-performance/android')
+include ':react-native-reanimated'
+project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/android')
 include ':react-native-safe-area-context'
 project(':react-native-safe-area-context').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-safe-area-context/android')
 include ':react-native-screens'

app.js

@@ -1,10 +1,6 @@
 /* application specific logic */
 
-// Re-export jQuery
-// FIXME: Remove this requirement from torture tests.
-import $ from 'jquery';
-
-window.$ = window.jQuery = $;
+import 'jquery';
 
 import '@matrix-org/olm';
 

conference.js

@@ -52,8 +52,7 @@ import {
     onStartMutedPolicyChanged,
     p2pStatusChanged,
     sendLocalParticipant,
-    nonParticipantMessageReceived,
-    CONFERENCE_LEAVE_REASONS
+    nonParticipantMessageReceived
 } from './react/features/base/conference';
 import {
     getReplaceParticipant,
@@ -138,7 +137,6 @@ import {
     submitFeedback
 } from './react/features/feedback';
 import { maybeSetLobbyChatMessageListener } from './react/features/lobby/actions.any';
-import { setNoiseSuppressionEnabled } from './react/features/noise-suppression/actions';
 import {
     isModerationNotificationDisplayed,
     showNotification,
@@ -160,7 +158,6 @@ import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/Au
 import { createPresenterEffect } from './react/features/stream-effects/presenter';
 import { createRnnoiseProcessor } from './react/features/stream-effects/rnnoise';
 import { endpointMessageReceived } from './react/features/subtitles';
-import { handleToggleVideoMuted } from './react/features/toolbox/actions.any';
 import { muteLocal } from './react/features/video-menu/actions.any';
 import UIEvents from './service/UI/UIEvents';
 
@@ -383,7 +380,7 @@ class ConferenceConnector {
             // FIXME the conference should be stopped by the library and not by
             // the app. Both the errors above are unrecoverable from the library
             // perspective.
-            room.leave(CONFERENCE_LEAVE_REASONS.UNRECOVERABLE_ERROR).then(() => connection.disconnect());
+            room.leave().then(() => connection.disconnect());
             break;
 
         case JitsiConferenceErrors.CONFERENCE_MAX_USERS:
@@ -466,7 +463,7 @@ function _connectionFailedHandler(error) {
             _connectionFailedHandler);
         if (room) {
             APP.store.dispatch(conferenceWillLeave(room));
-            room.leave(CONFERENCE_LEAVE_REASONS.UNRECOVERABLE_ERROR);
+            room.leave();
         }
     }
 }
@@ -1153,13 +1150,9 @@ export default {
      * Simulates toolbar button click for video mute. Used by shortcuts and API.
      * @param {boolean} [showUI] when set to false will not display any error
      * dialogs in case of media permissions error.
-     * @param {boolean} ensureTrack - True if we want to ensure that a new track is
-     * created if missing.
      */
-    toggleVideoMuted(showUI = true, ensureTrack = false) {
-        const mute = !this.isLocalVideoMuted();
-
-        APP.store.dispatch(handleToggleVideoMuted(mute, showUI, ensureTrack));
+    toggleVideoMuted(showUI = true) {
+        this.muteVideo(!this.isLocalVideoMuted(), showUI);
     },
 
     /**
@@ -2024,11 +2017,6 @@ export default {
                 }
 
                 if (this._desktopAudioStream) {
-                    // Noise suppression doesn't work with desktop audio because we can't chain
-                    // track effects yet, disable it first.
-                    // We need to to wait for the effect to clear first or it might interfere with the audio mixer.
-                    await APP.store.dispatch(setNoiseSuppressionEnabled(false));
-
                     const localAudio = getLocalJitsiAudioTrack(APP.store.getState());
 
                     // If there is a localAudio stream, mix in the desktop audio stream captured by the screen sharing
@@ -2426,8 +2414,8 @@ export default {
         APP.UI.addListener(UIEvents.AUDIO_MUTED, muted => {
             this.muteAudio(muted);
         });
-        APP.UI.addListener(UIEvents.VIDEO_MUTED, (muted, showUI = false) => {
-            this.muteVideo(muted, showUI);
+        APP.UI.addListener(UIEvents.VIDEO_MUTED, muted => {
+            this.muteVideo(muted);
         });
 
         room.addCommandListener(this.commands.defaults.ETHERPAD,
@@ -2583,16 +2571,16 @@ export default {
                         return stream;
                     })
                     .then(stream => {
-                        logger.info(`Switching the local video device to ${cameraDeviceId}.`);
+                        logger.log('Switching the local video device.');
 
                         return this.useVideoStream(stream);
                     })
                     .then(() => {
-                        logger.info(`Switched local video device to ${cameraDeviceId}.`);
+                        logger.log('Switched local video device.');
                         this._updateVideoDeviceId();
                     })
                     .catch(error => {
-                        logger.error(`Failed to switch to selected camera:${cameraDeviceId}, error:${error}`);
+                        logger.error(`Switching the local video device failed: ${error}`);
 
                         return APP.store.dispatch(notifyCameraError(error));
                     });
@@ -2602,26 +2590,23 @@ export default {
 
         APP.UI.addListener(
             UIEvents.AUDIO_DEVICE_CHANGED,
-            async micDeviceId => {
+            micDeviceId => {
                 const audioWasMuted = this.isLocalAudioMuted();
 
-                // Disable noise suppression if it was enabled on the previous track.
-                await APP.store.dispatch(setNoiseSuppressionEnabled(false));
+                // When the 'default' mic needs to be selected, we need to
+                // pass the real device id to gUM instead of 'default' in order
+                // to get the correct MediaStreamTrack from chrome because of the
+                // following bug.
+                // https://bugs.chromium.org/p/chromium/issues/detail?id=997689
+                const hasDefaultMicChanged = micDeviceId === 'default';
 
-                // When the 'default' mic needs to be selected, we need to pass the real device id to gUM instead of
-                // 'default' in order to get the correct MediaStreamTrack from chrome because of the following bug.
-                // https://bugs.chromium.org/p/chromium/issues/detail?id=997689.
-                const isDefaultMicSelected = micDeviceId === 'default';
-                const selectedDeviceId = isDefaultMicSelected
-                    ? getDefaultDeviceId(APP.store.getState(), 'audioInput')
-                    : micDeviceId;
-
-                logger.info(`Switching audio input device to ${selectedDeviceId}`);
                 sendAnalytics(createDeviceChangedEvent('audio', 'input'));
                 createLocalTracksF({
                     devices: [ 'audio' ],
                     cameraDeviceId: null,
-                    micDeviceId: selectedDeviceId
+                    micDeviceId: hasDefaultMicChanged
+                        ? getDefaultDeviceId(APP.store.getState(), 'audioInput')
+                        : micDeviceId
                 })
                 .then(([ stream ]) => {
                     // if audio was muted before changing the device, mute
@@ -2641,24 +2626,45 @@ export default {
                 .then(() => {
                     const localAudio = getLocalJitsiAudioTrack(APP.store.getState());
 
-                    if (localAudio && isDefaultMicSelected) {
+                    if (localAudio && hasDefaultMicChanged) {
                         // workaround for the default device to be shown as selected in the
                         // settings even when the real device id was passed to gUM because of the
                         // above mentioned chrome bug.
                         localAudio._realDeviceId = localAudio.deviceId = 'default';
                     }
-                    logger.info(`switched local audio input device to: ${selectedDeviceId}`);
+                    logger.log(`switched local audio device: ${localAudio?.getDeviceId()}`);
+
                     this._updateAudioDeviceId();
                 })
                 .catch(err => {
-                    logger.error(`Failed to switch to selected audio input device ${selectedDeviceId}, error=${err}`);
                     APP.store.dispatch(notifyMicError(err));
                 });
             }
         );
 
-        APP.UI.addListener(UIEvents.TOGGLE_AUDIO_ONLY, () => {
-            // Immediately update the UI by having remote videos and the large video update themselves.
+        APP.UI.addListener(UIEvents.TOGGLE_AUDIO_ONLY, audioOnly => {
+
+            // FIXME On web video track is stored both in redux and in
+            // 'localVideo' field, video is attempted to be unmuted twice when
+            // turning off the audio only mode. This will crash the app with
+            // 'unmute operation is already in progress'.
+            // Because there's no logic in redux about creating new track in
+            // case unmute when not track exists the things have to go through
+            // muteVideo logic in such case.
+            const tracks = APP.store.getState()['features/base/tracks'];
+            const isTrackInRedux
+                = Boolean(tracks.find(track => track.jitsiTrack && track.jitsiTrack.getType() === MEDIA_TYPE.VIDEO));
+
+            if (isTrackInRedux && !this.isSharingScreen) {
+                this.muteVideo(audioOnly);
+            }
+
+            // Immediately update the UI by having remote videos and the large
+            // video update themselves instead of waiting for some other event
+            // to cause the update, usually PARTICIPANT_CONN_STATUS_CHANGED.
+            // 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.
             const displayedUserId = APP.UI.getLargeVideoID();
 
             if (displayedUserId) {
@@ -3064,15 +3070,14 @@ export default {
     /**
      * Leaves the room.
      *
-     * @param {boolean} doDisconnect - Whether leaving the room should also terminate the connection.
-     * @param {string} reason - reason for leaving the room.
+     * @param {boolean} doDisconnect - Wether leaving the room should also terminate the connection.
      * @returns {Promise}
      */
-    async leaveRoom(doDisconnect = true, reason = '') {
+    async leaveRoom(doDisconnect = true) {
         APP.store.dispatch(conferenceWillLeave(room));
 
         if (room && room.isJoined()) {
-            return room.leave(reason).finally(() => {
+            return room.leave().finally(() => {
                 if (doDisconnect) {
                     return disconnect();
                 }

config.js

@@ -1,29 +1,11 @@
-/* eslint-disable comma-dangle, no-unused-vars, no-var, prefer-template, vars-on-top */
+
+/* eslint-disable no-unused-vars, no-var */
 
 /*
  * NOTE: If you add a new option please remember to document it here:
  * https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-configuration
  */
 
-var subdir = '<!--# echo var="subdir" default="" -->';
-var subdomain = '<!--# echo var="subdomain" default="" -->';
-
-if (subdomain) {
-    subdomain = subdomain.substr(0, subdomain.length - 1).split('.')
-        .join('_')
-        .toLowerCase() + '.';
-}
-
-// In case of no ssi provided by the webserver, use empty strings
-if (subdir.startsWith('<!--')) {
-    subdir = '';
-}
-if (subdomain.startsWith('<!--')) {
-    subdomain = '';
-}
-
-var enableJaaS = false;
-
 var config = {
     // Connection
     //
@@ -42,14 +24,14 @@ var config = {
         // focus: 'focus.jitsi-meet.example.com',
 
         // XMPP MUC domain. FIXME: use XEP-0030 to discover it.
-        muc: 'conference.' + subdomain + 'jitsi-meet.example.com',
+        muc: 'conference.jitsi-meet.example.com'
     },
 
     // BOSH URL. FIXME: use XEP-0156 to discover it.
-    bosh: '//jitsi-meet.example.com/' + subdir + 'http-bind',
+    bosh: '//jitsi-meet.example.com/http-bind',
 
     // Websocket URL
-    // websocket: 'wss://jitsi-meet.example.com/' + subdir + 'xmpp-websocket',
+    // websocket: 'wss://jitsi-meet.example.com/xmpp-websocket',
 
     // The real JID of focus participant - can be overridden here
     // Do not change username - FIXME: Make focus username configurable
@@ -70,18 +52,18 @@ var config = {
         // enableThumbnailReordering: true,
 
         // Enables XMPP WebSocket (as opposed to BOSH) for the given amount of users.
-        // mobileXmppWsThreshold: 10, // enable XMPP WebSockets on mobile for 10% of the users
+        // mobileXmppWsThreshold: 10 // enable XMPP WebSockets on mobile for 10% of the users
 
         // P2P test mode disables automatic switching to P2P when there are 2
         // participants in the conference.
         // p2pTestMode: false,
 
         // Enables the test specific features consumed by jitsi-meet-torture
-        // testMode: false,
+        // testMode: false
 
         // Disables the auto-play behavior of *all* newly created video element.
         // This is useful when the client runs on a host with limited resources.
-        // noAutoPlayVideo: false,
+        // noAutoPlayVideo: false
 
         // Enable / disable 500 Kbps bitrate cap on desktop tracks. When enabled,
         // simulcast is turned off for the desktop share. If presenter is turned
@@ -90,17 +72,17 @@ var config = {
         // 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.
+        // capScreenshareBitrate: 1 // 0 to disable - deprecated.
 
         // Whether to use fake constraints (height: 99999, width: 99999) when calling getDisplayMedia on
         // Chromium based browsers. This is intended as a workaround for
         // https://bugs.chromium.org/p/chromium/issues/detail?id=1056311
-        // setScreenSharingResolutionConstraints: true,
+        // setScreenSharingResolutionConstraints: true
 
         // Enable callstats only for a percentage of users.
         // This takes a value between 0 and 100 which determines the probability for
         // the callstats to be enabled.
-        // callStatsThreshold: 5, // enable callstats for 5% of the users.
+        // callStatsThreshold: 5 // enable callstats for 5% of the users.
     },
 
     // Feature Flags.
@@ -110,11 +92,7 @@ var config = {
 
         // Enables sending multiple video streams, i.e., camera and desktop tracks can be shared in the conference
         // separately as two different streams instead of one composite stream.
-        // sendMultipleVideoStreams: false,
-
-        // Signal that this client supports receiving multiple video streams. Without this flag jicofo will enable
-        // multi-stream backward compatibility.
-        receiveMultipleVideoStreams: true,
+        // sendMultipleVideoStreams: false
     },
 
     // Disables moderator indicators.
@@ -143,7 +121,7 @@ var config = {
     //      Can be either 'recording' - screensharing screenshots are taken
     //      only when the recording is also on,
     //      or 'always' - screensharing screenshots are always taken.
-    //      mode: 'recording',
+    //      mode: 'recording'
     // }
 
     // Disables ICE/UDP by filtering out local and remote UDP candidates in
@@ -201,7 +179,7 @@ var config = {
 
     // Enabling it (with #params) will disable local audio output of remote
     // participants and to enable it back a reload is needed.
-    // startSilent: false,
+    // startSilent: false
 
     // Enables support for opus-red (redundancy for Opus).
     // enableOpusRed: false,
@@ -210,7 +188,7 @@ var config = {
     // 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.
+    //     opusMaxAverageBitrate: null // Value to fit the 6000 to 510000 range.
     // },
 
     // Video
@@ -229,7 +207,7 @@ var config = {
     //  'role', <- Moderators on top
     //  'name', <- Alphabetically by name
     //  'hasLeft', <- The ones that have left in the bottom
-    // ], <- the order of the array elements determines priority
+    // ] <- the order of the array elements determines priority
 
     // How many participants while in the tile view mode, before the receiving video quality is reduced from HD to SD.
     // Use -1 to disable.
@@ -245,9 +223,9 @@ var config = {
     //         height: {
     //             ideal: 720,
     //             max: 720,
-    //             min: 240,
-    //         },
-    //     },
+    //             min: 240
+    //         }
+    //     }
     // },
 
     // Enable / disable simulcast support.
@@ -282,7 +260,7 @@ var config = {
     // Optional desktop sharing frame rate options. Default value: min:5, max:5.
     // desktopSharingFrameRate: {
     //     min: 5,
-    //     max: 5,
+    //     max: 5
     // },
 
     // This option has been deprecated since it is no longer supported as per the w3c spec.
@@ -299,12 +277,12 @@ var config = {
 
     // Enable the dropbox integration.
     // dropbox: {
-    //     appKey: '<APP_KEY>', // Specify your app key here.
+    //     appKey: '<APP_KEY>' // Specify your app key here.
     //     // A URL to redirect the user to, after authenticating
     //     // by default uses:
     //     // 'https://jitsi-meet.example.com/static/oauth.html'
     //     redirectURI:
-    //          'https://jitsi-meet.example.com/subfolder/static/oauth.html',
+    //          'https://jitsi-meet.example.com/subfolder/static/oauth.html'
     // },
 
     // recordingService: {
@@ -320,7 +298,7 @@ var config = {
     //     sharingEnabled: false,
 
     //     // Hide the warning that says we only store the recording for 24 hours.
-    //     hideStorageWarning: false,
+    //     hideStorageWarning: false
     // },
 
     // DEPRECATED. Use recordingService.enabled instead.
@@ -329,35 +307,17 @@ var config = {
     // DEPRECATED. Use recordingService.sharingEnabled instead.
     // fileRecordingsServiceSharingEnabled: false,
 
+    // Whether to enable live streaming or not.
+    // liveStreamingEnabled: false,
+
     // Local recording configuration.
     // localRecording: {
     //     // Whether to disable local recording or not.
     //     disable: false,
-
     //     // Whether to notify all participants when a participant is recording locally.
-    //     notifyAllParticipants: false,
-
-    //     // Whether to disable the self recording feature (only local participant streams).
-    //     disableSelfRecording: false,
+    //     notifyAllParticipants: false
     // },
 
-    // Customize the Live Streaming dialog. Can be modified for a non-YouTube provider.
-    // liveStreaming: {
-    //    // Whether to enable live streaming or not.
-    //    enabled: false,
-    //    // Terms link
-    //    termsLink: 'https://www.youtube.com/t/terms',
-    //    // Data privacy link
-    //    dataPrivacyLink: 'https://policies.google.com/privacy',
-    //    // RegExp string that validates the stream key input field
-    //    validatorRegExpString: '^(?:[a-zA-Z0-9]{4}(?:-(?!$)|$)){4}',
-    //    // Documentation reference for the live streaming feature.
-    //    helpLink: 'https://jitsi.org/live'
-    // },
-
-    // DEPRECATED. Use liveStreaming.enabled instead.
-    // liveStreamingEnabled: false,
-
     // DEPRECATED. Use transcription.enabled instead.
     // transcribingEnabled: false,
 
@@ -392,7 +352,7 @@ var config = {
     //     disableStartForAll: false,
 
     //     // Enables automatic turning on captions when recording is started
-    //     autoCaptionOnRecord: false,
+    //     autoCaptionOnRecord: false
     // },
 
     // Misc
@@ -427,7 +387,7 @@ var config = {
     //     30: 15,
     //     50: 10,
     //     70: 5,
-    //     90: 2,
+    //     90: 2
     // },
 
     // Provides a way to translate the legacy bridge signaling messages, 'LastNChangedEvent',
@@ -467,18 +427,18 @@ var config = {
     //          H264: {
     //              low: 200000,
     //              standard: 500000,
-    //              high: 1500000,
+    //              high: 1500000
     //          },
     //          VP8 : {
     //              low: 200000,
     //              standard: 500000,
-    //              high: 1500000,
+    //              high: 1500000
     //          },
     //          VP9: {
     //              low: 100000,
     //              standard: 300000,
-    //              high: 1200000,
-    //          },
+    //              high: 1200000
+    //          }
     //    },
     //
     //    // The options can be used to override default thresholds of video thumbnail heights corresponding to
@@ -493,19 +453,19 @@ var config = {
     //    // the high quality.
     //    minHeightForQualityLvl: {
     //        360: 'standard',
-    //        720: 'high',
+    //        720: 'high'
     //    },
     //
     //    // Provides a way to resize the desktop track to 720p (if it is greater than 720p) before creating a canvas
     //    // for the presenter mode (camera picture-in-picture mode with screenshare).
-    //    resizeDesktopForPresenter: false,
+    //    resizeDesktopForPresenter: false
     // },
 
     // Notification timeouts
     // notificationTimeouts: {
     //     short: 2500,
     //     medium: 5000,
-    //     long: 10000,
+    //     long: 10000
     // },
 
     // // Options for the recording limit notification.
@@ -520,7 +480,7 @@ var config = {
     //    appName: 'Unlimited recordings APP',
     //
     //    // The URL of the app with unlimited recordings.
-    //    appURL: 'https://unlimited.recordings.app.com/',
+    //    appURL: 'https://unlimited.recordings.app.com/'
     // },
 
     // Disables or enables RTX (RFC 4588) (defaults to false).
@@ -620,6 +580,9 @@ var config = {
     // Hides the email section under profile settings.
     // hideEmailInSettings: false,
 
+    // Whether or not some features are checked based on token.
+    // enableFeaturesBasedOnToken: false,
+
     // When enabled the password used for locking a room is restricted to up to the number of digits specified
     // default: roomPasswordNumberOfDigits: false,
     // roomPasswordNumberOfDigits: 10,
@@ -642,11 +605,11 @@ var config = {
     //     // either the jwt or the userInfo from the iframe api init object in order for this to have an effect.
     //     hideDisplayName: false,
     //     // List of buttons to hide from the extra join options dropdown.
-    //     hideExtraJoinButtons: ['no-audio', 'by-phone'],
+    //     hideExtraJoinButtons: ['no-audio', 'by-phone']
     // },
 
     // When 'true', the user cannot edit the display name.
-    // (Mainly useful when used in conjunction with the JWT so the JWT name becomes read only.)
+    // (Mainly useful when used in conjuction with the JWT so the JWT name becomes read only.)
     // readOnlyName: false,
 
     // If etherpad integration is enabled, setting this to true will
@@ -677,7 +640,7 @@ var config = {
     //     // Defaults to Gravatar.
     //     baseUrl: 'https://www.gravatar.com/avatar/',
     //     // True if Gravatar should be disabled.
-    //     disabled: false,
+    //     disabled: false
     // },
 
     // App name to be displayed in the invitation email subject, as an alternative to
@@ -700,7 +663,7 @@ var config = {
     //    'chat',
     //    'closedcaptions',
     //    'desktop',
-    //    'dock-iframe',
+    //    'dock-iframe'
     //    'download',
     //    'embedmeeting',
     //    'etherpad',
@@ -714,7 +677,6 @@ var config = {
     //    'linktosalesforce',
     //    'livestreaming',
     //    'microphone',
-    //    'noisesuppression',
     //    'participants-pane',
     //    'profile',
     //    'raisehand',
@@ -730,21 +692,22 @@ var config = {
     //    'toggle-camera',
     //    'undock-iframe',
     //    'videoquality',
+    //    '__end'
     // ],
 
     // Holds values related to toolbar visibility control.
     // toolbarConfig: {
     //     // Moved from interfaceConfig.INITIAL_TOOLBAR_TIMEOUT
-    //     // The initial number of milliseconds for the toolbar buttons to be visible on screen.
+    //     // The initial numer of miliseconds for the toolbar buttons to be visible on screen.
     //     initialTimeout: 20000,
     //     // Moved from interfaceConfig.TOOLBAR_TIMEOUT
-    //     // Number of milliseconds for the toolbar buttons to be visible on screen.
+    //     // Number of miliseconds for the toolbar buttons to be visible on screen.
     //     timeout: 4000,
     //     // Moved from interfaceConfig.TOOLBAR_ALWAYS_VISIBLE
-    //     // Whether toolbar should be always visible or should hide after x milliseconds.
+    //     // Whether toolbar should be always visible or should hide after x miliseconds.
     //     alwaysVisible: false,
     //     // Indicates whether the toolbar should still autohide when chat is open
-    //     autoHideWhileChatIsOpen: false,
+    //     autoHideWhileChatIsOpen: false
     // },
 
     // Toolbar buttons which have their click/tap event exposed through the API on
@@ -779,7 +742,6 @@ var config = {
     //     'microphone',
     //     'mute-everyone',
     //     'mute-video-everyone',
-    //     'noisesuppression',
     //     'participants-pane',
     //     'profile',
     //     {
@@ -801,7 +763,8 @@ var config = {
     //     {
     //         key: 'add-passcode',
     //         preventExecution: false
-    //     },
+    //     }
+    //     '__end'
     // ],
 
     // List of pre meeting screens buttons to hide. The values must be one or more of the 5 allowed buttons:
@@ -824,7 +787,6 @@ var config = {
     // Application ID and Secret.
     // callStatsID: '',
     // callStatsSecret: '',
-    // callstatsStoreLogs: true,
 
     // The callstats initialize config params as described in the API:
     // https://docs.callstats.io/docs/javascript#callstatsinitialize-with-app-secret
@@ -842,10 +804,10 @@ var config = {
     //         pbxID: "PBX Identifier. Example, walmart.",
     //         pbxExtensionID: "PBX Extension Identifier. Example, 5625.",
     //         fqExtensionID: "Fully qualified Extension Identifier. Example, +71 (US) +5625.",
-    //         sessionID: "Session Identifier. Example, session-12-34",
+    //         sessionID: "Session Identifier. Example, session-12-34"
     //     },
     //     collectLegacyStats: true, //enables the collection of legacy stats in chrome browser
-    //     collectIP: true, //enables the collection localIP address
+    //     collectIP: true //enables the collection localIP address
     // },
 
     // Enables sending participants' display names to callstats
@@ -871,7 +833,7 @@ var config = {
     //     faceCenteringThreshold: 10,
 
     //     // Milliseconds for processing a new image capture in order to detect face coordinates if they exist.
-    //     captureInterval: 1000,
+    //     captureInterval: 1000
     // },
 
     // Controls the percentage of automatic feedback shown to participants when callstats is enabled.
@@ -933,8 +895,8 @@ var config = {
         stunServers: [
 
             // { urls: 'stun:jitsi-meet.example.com:3478' },
-            { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' },
-        ],
+            { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' }
+        ]
     },
 
     analytics: {
@@ -942,14 +904,14 @@ var config = {
         // disabled: false,
 
         // The Google Analytics Tracking ID:
-        // googleAnalyticsTrackingId: 'your-tracking-id-UA-123456-1',
+        // googleAnalyticsTrackingId: 'your-tracking-id-UA-123456-1'
 
         // Matomo configuration:
         // matomoEndpoint: 'https://your-matomo-endpoint/',
         // matomoSiteID: '42',
 
         // The Amplitude APP Key:
-        // amplitudeAPPKey: '<APP_KEY>',
+        // amplitudeAPPKey: '<APP_KEY>'
 
         // Obfuscates room name sent to analytics (amplitude, rtcstats)
         // Default value is false.
@@ -961,24 +923,19 @@ var config = {
         // PeerConnection states along with getStats metrics polled at the specified
         // interval.
         // rtcstatsEnabled: false,
-        // rtcstatsStoreLogs: false,
 
         // In order to enable rtcstats one needs to provide a endpoint url.
         // rtcstatsEndpoint: wss://rtcstats-server-pilot.jitsi.net/,
 
-        // The interval at which rtcstats will poll getStats, defaults to 10000ms.
+        // 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.
-        // rtcstatsPollInterval: 10000,
-
-        // This determines if rtcstats sends the SDP to the rtcstats server or replaces
-        // all SDPs with an empty string instead.
-        // rtcstatsSendSdp: false,
+        // rtcstatsPolIInterval: 1000,
 
         // Array of script URLs to load as lib-jitsi-meet "analytics handlers".
         // scriptURLs: [
         //      "libs/analytics-ga.min.js", // google-analytics
-        //      "https://example.com/my-custom-analytics.js",
+        //      "https://example.com/my-custom-analytics.js"
         // ],
     },
 
@@ -987,11 +944,11 @@ var config = {
 
     // Information about the jitsi-meet instance we are connecting to, including
     // the user region as seen by the server.
-    // deploymentInfo: {
-    //     shard: "shard1",
-    //     region: "europe",
-    //     userRegion: "asia",
-    // },
+    deploymentInfo: {
+        // shard: "shard1",
+        // region: "europe",
+        // userRegion: "asia"
+    },
 
     // Array<string> of disabled sounds.
     // Possible values:
@@ -1040,19 +997,19 @@ var config = {
     //     chromeExtensionsInfo: [
     //         {
     //             id: 'kglhbbefdnlheedjiejgomgmfplipfeb',
-    //             path: 'jitsi-logo-48x48.png',
+    //             path: 'jitsi-logo-48x48.png'
     //         },
     //         // Edge extension info
     //         {
     //             id: 'eeecajlpbgjppibfledfihobcabccihn',
-    //             path: 'jitsi-logo-48x48.png',
-    //         },
+    //             path: 'jitsi-logo-48x48.png'
+    //         }
     //     ]
     // },
 
     // e2ee: {
     //   labels,
-    //   externallyManagedKey: false,
+    //   externallyManagedKey: false
     // },
 
     // Options related to end-to-end (participant to participant) ping.
@@ -1067,9 +1024,9 @@ var config = {
     //   maxConferenceSize: 200,
     //
     //   // The maximum number of e2e ping messages per second for the whole conference to aim for.
-    //   // This is used to control the pacing of messages in order to reduce the load on the backend.
-    //   maxMessagesPerSecond: 250,
-    // },
+    //   // This is used to contol the pacing of messages in order to reduce the load on the backend.
+    //   maxMessagesPerSecond: 250
+    //   },
 
     // If set, will attempt to use the provided video input device label when
     // triggering a screenshare, instead of proceeding through the normal flow
@@ -1106,7 +1063,7 @@ var config = {
     //    userDocumentationURL: 'https://docs.example.com/video-meetings.html',
     //    // If specified a 'Download our apps' button will be displayed in the overflow menu with a link
     //    // to the specified URL for an app download page.
-    //    downloadAppsUrl: 'https://docs.example.com/our-apps.html',
+    //    downloadAppsUrl: 'https://docs.example.com/our-apps.html'
     // },
 
     // Options related to the remote participant menu.
@@ -1118,7 +1075,7 @@ var config = {
     //     // If set to true the 'Grant moderator' button will be disabled.
     //     disableGrantModerator: true,
     //     // If set to true the 'Send private message' button will be disabled.
-    //     disablePrivateChat: true,
+    //     disablePrivateChat: true
     // },
 
     // Endpoint that enables support for salesforce integration with in-meeting resource linking
@@ -1134,7 +1091,7 @@ var config = {
     // disableRemoteMute: true,
 
     // Enables support for lip-sync for this client (if the browser supports it).
-    // enableLipSync: false,
+    // enableLipSync: false
 
     /**
      External API url used to receive branding specific information.
@@ -1177,15 +1134,15 @@ var config = {
                 field02Hover: 'red',
                 action01: 'green',
                 action01Hover: 'lightgreen',
-                disabled01: 'beige',
+                action02Disabled: 'beige',
                 success02: 'cadetblue',
-                action02Hover: 'aliceblue',
+                action02Hover: 'aliceblue'
             },
             typography: {
                 labelRegular: {
                     fontSize: 25,
                     lineHeight: 30,
-                    fontWeight: 500,
+                    fontWeight: 500
                 }
             }
         }
@@ -1200,7 +1157,7 @@ var config = {
     //     // Hides the more actions button.
     //     hideMoreActionsButton: false,
     //     // Hides the mute all button.
-    //     hideMuteAllButton: false,
+    //     hideMuteAllButton: false
     // },
 
     // Options related to the breakout rooms feature.
@@ -1210,7 +1167,7 @@ var config = {
     //     // Hides the auto assign participants button.
     //     hideAutoAssignButton: false,
     //     // Hides the join breakout room button.
-    //     hideJoinRoomButton: false,
+    //     hideJoinRoomButton: false
     // },
 
     // When true the user cannot add more images to be used as virtual background.
@@ -1250,7 +1207,7 @@ var config = {
     //         'video-quality',
     //         'insecure-room',
     //         'highlight-moment',
-    //         'top-panel-toggle',
+    //         'top-panel-toggle'
     //     ]
     // },
 
@@ -1277,8 +1234,9 @@ var config = {
     // is not persisting the local storage inside the iframe.
     // useHostPageLocalStorage: true,
 
-    // Etherpad ("shared document") integration.
+    // etherpad ("shared document") integration.
     //
+
     // If set, add a "Open shared document" link to the bottom right menu that
     // will open an etherpad document.
     // etherpad_base: 'https://your-etherpad-installati.on/p/',
@@ -1289,6 +1247,11 @@ var config = {
     // {"countryCode":"US","tollFree":false,"formattedNumber":"+1 123-456-7890"}
     // dialInConfCodeUrl is the conference mapper converting a meeting id to a PIN used for dial-in
     // or the other way around (more info in resources/cloud-api.swagger)
+    //
+    // For JaaS customers the default values are:
+    // dialInNumbersUrl: 'https://conference-mapper.jitsi.net/v1/access/dids',
+    // dialInConfCodeUrl: 'https://conference-mapper.jitsi.net/v1/access',
+    //
 
     // List of undocumented settings used in jitsi-meet
     /**
@@ -1389,7 +1352,6 @@ var config = {
     //     'notify.leftTwoMembers', // show when two participants left simultaneously
     //     'notify.leftThreePlusMembers', // show when more than 2 participants left simultaneously
     //     'notify.grantedTo', // shown when moderator rights were granted to a participant
-    //     'notify.hostAskedUnmute', // shown to participant when host asks them to unmute
     //     'notify.invitedOneMember', // shown when 1 participant has been invited
     //     'notify.invitedThreePlusMembers', // shown when 3+ participants have been invited
     //     'notify.invitedTwoMembers', // shown when 2 participants have been invited
@@ -1410,7 +1372,7 @@ var config = {
     //     'notify.raisedHand', // shown when a partcipant used raise hand,
     //     'notify.startSilentTitle', // shown when user joined with no audio
     //     'notify.unmute', // shown to moderator when user raises hand during AV moderation
-    //     'notify.videoMutedRemotelyTitle', // shown when user's video is muted by a remote party,
+    //     'notify.hostAskedUnmute', // shown to participant when host asks them to unmute
     //     'prejoin.errorDialOut',
     //     'prejoin.errorDialOutDisconnected',
     //     'prejoin.errorDialOutFailed',
@@ -1423,7 +1385,7 @@ var config = {
     //     'toolbar.noAudioSignalTitle', // shown when a broken mic is detected
     //     'toolbar.noisyAudioInputTitle', // shown when noise is detected for the current microphone
     //     'toolbar.talkWhileMutedPopup', // shown when user tries to speak while muted
-    //     'transcribing.failedToStart', // shown when transcribing fails to start
+    //     'transcribing.failedToStart' // shown when transcribing fails to start
     // ],
 
     // List of notifications to be disabled. Works in tandem with the above setting.
@@ -1446,14 +1408,14 @@ var config = {
 
     //     // The minimum number of participants that must be in the call for
     //     // the top panel layout to be used.
-    //     minParticipantCountForTopPanel: 50,
+    //     minParticipantCountForTopPanel: 50
     // },
 
     // Tile view related config options.
     // tileView: {
     //     // The optimal number of tiles that are going to be shown in tile view. Depending on the screen size it may
     //     // not be possible to show the exact number of participants specified here.
-    //     numberOfVisibleTiles: 25,
+    //     numberOfVisibleTiles: 25
     // },
 
     // Specifies whether the chat emoticons are disabled or not
@@ -1470,31 +1432,15 @@ var config = {
     //     // - chat: show the GIF as a message in chat
     //     // - all: all of the above. This is the default option
     //     displayMode: 'all',
-    //     // How long the GIF should be displayed on the tile (in milliseconds).
-    //     tileTime: 5000,
+    //     // How long the GIF should be displayed on the tile (in miliseconds).
+    //     tileTime: 5000
     // },
 
-    // Logging
-    // logging: {
-    //      // Default log level for the app and lib-jitsi-meet.
-    //      defaultLogLevel: 'trace',
-    //      // Option to disable LogCollector (which stores the logs on CallStats).
-    //      //disableLogCollector: true,
-    //      // Individual loggers are customizable.
-    //      loggers: {
-    //      // The following are too verbose in their logging with the default level.
-    //      'modules/RTC/TraceablePeerConnection.js': 'info',
-    //      'modules/statistics/CallStats.js': 'info',
-    //      'modules/xmpp/strophe.util.js': 'log',
-    // },
+    // Allow all above example options to include a trailing comma and
+    // prevent fear when commenting out the last value.
+    makeJsonParserHappy: 'even if last key had a trailing comma'
 
-    // Application logo url
-    // defaultLogoUrl: 'images/watermark.svg',
+    // no configuration value should follow this line.
 };
 
-// Set the default values for JaaS customers
-if (enableJaaS) {
-    config.dialInNumbersUrl = 'https://conference-mapper.jitsi.net/v1/access/dids';
-    config.dialInConfCodeUrl = 'https://conference-mapper.jitsi.net/v1/access';
-    config.roomPasswordNumberOfDigits = 10; // skip re-adding it (do not remove comment)
-}
+/* eslint-enable no-unused-vars, no-var */

css/_chat.scss

@@ -30,18 +30,12 @@
     height: calc(100% - 70px);
 }
 
-#chat-conversation-container {
-    // extract message input height
-    height: calc(100% - 68px);
-    overflow: hidden;
-    position: relative;
-}
-
 #chatconversation {
     box-sizing: border-box;
     flex: 1;
     font-size: 10pt;
-    height: 100%;
+    // extract message input height
+    height: calc(100% - 68px);
     line-height: 20px;
     overflow: auto;
     padding: 16px;
@@ -125,18 +119,63 @@
 
 .chat-input-container {
     padding: 0 16px 16px;
+
+    &.populated {
+        #chat-input {
+            .send-button {
+                background: #1B67EC;
+                cursor: pointer;
+                margin-left: 0.3rem;
+
+                @media (hover: hover) and (pointer: fine) {
+                    &:hover {
+                        background: #3D82FB;
+                    }
+                }
+
+                &:active {
+                    background: #0852D4;
+                }
+
+                path {
+                    fill: #fff;
+                }
+            }
+        }
+    }
 }
 
 #chat-input {
+    border: 1px solid $chatInputSeparatorColor;
     display: flex;
-    align-items: flex-end;
     padding: 4px;
-    position: relative;
+    border-radius: 3px;
+
+    &:focus-within {
+        border: 1px solid #619CF4;
+    }
+
+    * {
+        background-color: transparent;
+    }
 }
 
-.chat-input {
-    flex: 1;
-    margin-right: 8px;
+.send-button-container {
+    display: flex;
+    align-items: center;
+}
+
+.send-button {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 40px;
+    width: 40px;
+    border-radius: 3px;
+
+    path {
+        fill: $chatInputSeparatorColor;
+    }
 }
 
 .smiley-button {
@@ -356,9 +395,7 @@
 
 .smiley-input {
     display: flex;
-    position: absolute;
-    top: 0;
-    left: 0;
+    position: relative;
 }
 
 .smileys-panel {
@@ -366,7 +403,7 @@
     box-sizing: border-box;
     background-color: rgba(0, 0, 0, .6) !important;
     height: auto;
-    display: flex;
+    display: none;
     overflow: hidden;
     position: absolute;
     width: calc(#{$sidebarWidth} - 32px);
@@ -381,6 +418,11 @@
      */
     transition: max-height 0.3s;
 
+    &.show-smileys {
+        display: flex;
+        max-height: 500%;
+    }
+
     #smileysContainer {
         background-color: $chatBackgroundColor;
         border-top: 1px solid $chatInputSeparatorColor;

css/_polls.scss

@@ -28,23 +28,32 @@
 }
 
 .poll-answer-container {
-    display: flex;
-    padding: 4px;
     background: #3D3D3D;
     border-radius: 3px;
     margin-bottom: 8px;
 
     @media (max-width: 580px) {
-        &> span {
-            padding: 8px 0;
-        }
+      &> span {
+        padding: 8px 0;
+      }
 
-        svg {
-            margin-top: 6px;
-        }
+      svg {
+        margin-top: 6px;
+      }
     }
 }
 
+.poll-answer-option {
+   font-weight: 400;
+   display: block;
+   margin: 4px;
+
+   @media (max-width: 580px) {
+      font-size: 16px;
+      margin: 11px 8px
+   }
+}
+
 .poll-answer-field-list, .poll-answer-list, .poll-result-list {
     list-style-type: none;
     padding: 0;
@@ -75,11 +84,11 @@ ol.poll-result-list {
 }
 
 .poll-create-option-row {
-    display: flex;
+    display: 'flex';
     margin-bottom: 4;
 }
 
-// Needed to override atlaskit default blue color
+// Needeed to override atlaskit default blue color
 .poll-create-container .jsYMHu {
     background: #292929;
     border-color: #808090;
@@ -282,10 +291,6 @@ ol.poll-result-list {
     h1, strong ,span {
         color: #fff;
     }
-
-    button > span {
-        color: inherit;
-    }
 }
 
 .poll-create-label {
@@ -358,3 +363,82 @@ ol.poll-result-list {
 .poll-answer-footer {
   padding: 8px 0 0 0;
 }
+
+.poll-button {
+   align-items: center;
+   border: 0;
+   border-radius: 6px;
+   font-size: 14px;
+   font-weight: 600;
+   display: flex;
+   justify-content: center;
+   min-height: 40px;
+   width: 100%;
+
+   &:disabled {
+     cursor: initial;
+   }
+
+   @media (max-width: 580px) {
+     min-height: 48px;
+   }
+}
+
+.poll-button-primary {
+    background-color: #0056E0;
+
+    &:hover {
+        background-color: #246FE5;
+    }
+
+    &:active {
+        background-color: #0045B3;
+    }
+
+    &:focus {
+        background-color: #0045B3;
+        border: 3px solid #99BBF3;
+    }
+
+    &:disabled {
+        background-color: #00225A;
+        color: #858585;
+    }
+}
+
+.poll-button-secondary {
+    background-color: #3D3D3D;
+
+    &:hover {
+        background-color: #525252;
+    }
+
+    &:active {
+        background-color: #292929;
+    }
+
+    &:focus {
+        background-color: #292929;
+        border: 3px solid #858585;
+    }
+
+    &:disabled {
+        background-color: #141414;
+        color: #858585;
+    }
+}
+
+.poll-button-short {
+  max-width: 132px;
+}
+
+.poll-button-shortest {
+  max-width: 117px;
+}
+
+.poll-button-short,
+.poll-button-shortest {
+   @media (max-width: 580px) {
+     min-width: 49%;
+   }
+}

css/_subject.scss

@@ -12,7 +12,6 @@
     &#autoHide.with-always-on {
         overflow: hidden;
         animation: hideSubject forwards .6s ease-out;
-        margin-left: 4px;
 
         & > .subject-info-container {
             justify-content: flex-start;

css/_toolbars.scss

@@ -134,20 +134,6 @@
     }
 }
 
-.hangup-menu-button {
-    background-color: $hangupMenuButtonColor;
-
-    @media (hover: hover) and (pointer: fine) {
-        &:hover {
-            background-color: $hangupMenuButtonHoverColor;
-        }
-    }
-
-    svg {
-        fill: #fff;
-    }
-}
-
 .profile-button-avatar {
     align-items: center;
 }

css/_variables.scss

@@ -6,8 +6,6 @@
 $baseFontFamily: -apple-system, BlinkMacSystemFont, 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;
 $hangupColor:#DD3849;
 $hangupHoverColor: #F25363;
-$hangupMenuButtonColor:#0056E0;;
-$hangupMenuButtonHoverColor: #246FE5;
 $hangupFontSize: 2em;
 
 /**

css/deep-linking/_desktop.scss

@@ -68,12 +68,6 @@
                 }
                 .buttons {
                     margin-top: 16px;
-                    display: flex;
-                    align-items: center;
-
-                    &>button:first-child {
-                        margin-right: 8px;
-                    }
                 }
             }
         }

css/filmstrip/_vertical_filmstrip.scss

@@ -112,7 +112,7 @@
         }
 
         /**
-         * Remove unnecessary padding that is normally used to prevent horizontal
+         * Remove unnecssary padding that is normally used to prevent horizontal
          * filmstrip from overlapping the left edge of the screen.
          */
         #filmstripLocalVideo,

css/modals/invite/_info.scss

@@ -38,6 +38,19 @@
         color: #fff;
     }
 
+    .info-password-input {
+        width: 100%;
+        background-color: #0E1624;
+        border-radius: 3px;
+        border: 2px solid #202B3D;
+        color: inherit;
+        padding-left: 0;
+    }
+    .info-password-input:focus ,
+    .info-password-input:active {
+       border: 2px solid #B8C7E0;
+    }
+
     .info-password-local {
         user-select: text;
     }

css/modals/screen-share/_share-audio.scss

@@ -3,7 +3,9 @@
         width: 100%;
         height: 90%;
         object-fit: contain;
-        margin-bottom: 10px;
+    }
+    input[type="checkbox"] + svg + span {
+        color: #9FB0CC;
     }
 
     .separator-line {

css/modals/security/_security.scss

@@ -13,14 +13,12 @@
             }
 
             .password {
-                align-items: flex-start;
+                align-items: center;
                 display: flex;
-                justify-content: flex-start;
+                justify-content: space-between;
                 margin-top: 15px;
-                flex-direction: column;
 
                 &-actions {
-                    margin-top: 10px;
                     a {
                         cursor: pointer;
                         text-decoration: none;
@@ -28,8 +26,8 @@
                         color: #6FB1EA;
                     }
 
-                    & > :first-child:not(:last-child) {
-                        margin-right: 24px;
+                    & > :first-child:not(:last-child) {	
+                        margin-right: 24px;	
                     }
                 }
             }

css/premeeting/_premeeting-screens.scss

@@ -101,7 +101,7 @@
                 font-weight: 600;
                 letter-spacing: -0.015;
                 line-height: 36px;
-                margin-bottom: 16px;
+                margin-bottom: 32px;
                 text-align: center;
             }
 

custom.d.ts

@@ -1,4 +0,0 @@
-declare module '*.svg' {
-    const content: any;
-    export default content;
-}

debian/control

@@ -33,7 +33,7 @@ Description: Configuration for web serving of Jitsi Meet
 
 Package: jitsi-meet-prosody
 Architecture: all
-Depends: openssl, prosody (>= 0.11.0) | prosody-trunk | prosody-0.12 | prosody-0.11, lua-sec, lua-basexx, lua-luaossl, lua-cjson, lua-inspect
+Depends: openssl, prosody (>= 0.11.0) | prosody-trunk | prosody-0.12 | prosody-0.11, lua-sec, lua-basexx, lua-luaossl, lua-cjson
 Replaces: jitsi-meet-tokens
 Description: Prosody configuration for Jitsi Meet
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi

debian/jitsi-meet-prosody.install

@@ -1,3 +1,2 @@
 doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example   /usr/share/jitsi-meet-prosody/
-doc/debian/jitsi-meet-prosody/jaas.cfg.lua                  /usr/share/jitsi-meet-prosody/
 resources/prosody-plugins/                                  /usr/share/jitsi-meet/

debian/jitsi-meet-prosody.postinst

@@ -83,18 +83,6 @@ case "$1" in
             TURN_SECRET="$RET"
         fi
 
-        db_get jitsi-meet/jaas-choice
-        JAAS_INPUT="$RET"
-        # In the case of updating from an older version the configure of -prosody package may happen before the -config
-        # one, so if JAAS_INPUT is empty (the question is not asked), let's ask it now.
-        if [ -z "$JAAS_INPUT" ] ; then
-            db_subst jitsi-meet/jaas-choice domain "${JVB_HOSTNAME}"
-            db_input critical jitsi-meet/jaas-choice || true
-            db_go
-            db_get jitsi-meet/jaas-choice
-            JAAS_INPUT="$RET"
-        fi
-
         # and we're done with debconf
         db_stop
 
@@ -153,7 +141,7 @@ case "$1" in
         # New:
         # Component "focus.jitmeet.example.com" "client_proxy"
         #    target_address = "focus@auth.jitmeet.example.com"
-        if grep -q "Component \"focus.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG && ! grep -q "Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"" $PROSODY_HOST_CONFIG ;then
+        if grep -q "Component \"focus.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG && ! grep "Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"" $PROSODY_HOST_CONFIG ;then
             sed -i "s/Component \"focus.$JVB_HOSTNAME\"/Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"\n    target_address = \"$JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN\"/g" $PROSODY_HOST_CONFIG
             PROSODY_CONFIG_PRESENT="false"
         fi
@@ -178,29 +166,6 @@ case "$1" in
             PROSODY_CONFIG_PRESENT="false"
         fi
 
-        JAAS_HOST_CONFIG="/etc/prosody/conf.avail/jaas.cfg.lua"
-        if [ "${JAAS_INPUT}" = "true" ] && [ ! -f $JAAS_HOST_CONFIG ]; then
-            sed -i "s/enabled = false -- Jitsi meet components/enabled = true -- Jitsi meet components/g" $PROSODY_HOST_CONFIG
-            PROSODY_CONFIG_PRESENT="false"
-        fi
-
-        # For those deployments that don't have the config in the jitsi-meet prosody config add the new jaas file
-        if [ ! -f $JAAS_HOST_CONFIG ] && ! grep -q "VirtualHost \"jigasi.meet.jitsi\"" $PROSODY_HOST_CONFIG; then
-            PROSODY_CONFIG_PRESENT="false"
-            cp /usr/share/jitsi-meet-prosody/jaas.cfg.lua $JAAS_HOST_CONFIG
-            sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" $JAAS_HOST_CONFIG
-        fi
-
-        if [ "${JAAS_INPUT}" = "true" ]; then
-            JAAS_HOST_CONFIG_ENABLED="/etc/prosody/conf.d/jaas.cfg.lua "
-            if [ ! -f $JAAS_HOST_CONFIG_ENABLED ] && ! grep -q "VirtualHost \"jigasi.meet.jitsi\"" $PROSODY_HOST_CONFIG; then
-                if [ -f $JAAS_HOST_CONFIG ]; then
-                    ln -s $JAAS_HOST_CONFIG $JAAS_HOST_CONFIG_ENABLED
-                    PROSODY_CONFIG_PRESENT="false"
-                fi
-            fi
-        fi
-
         # Make sure the focus@auth user's roster includes the proxy component (this is idempotent)
         prosodyctl mod_roster_command subscribe focus.$JVB_HOSTNAME $JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN
 
@@ -213,6 +178,32 @@ case "$1" in
             ln -sf /var/lib/prosody/$JVB_HOSTNAME.crt /etc/prosody/certs/$JVB_HOSTNAME.crt
         fi
 
+        PRTRUNK_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-trunk' 2>/dev/null | awk '{print $3}' || true)"
+        PR10_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.10' 2>/dev/null | awk '{print $3}' || true)"
+        PR_VER_INSTALLED=$(dpkg-query -f='${Version}\n' --show prosody  2>/dev/null || true)
+        if [ "$PRTRUNK_INSTALL_CHECK" = "installed" ] \
+            || [ "$PRTRUNK_INSTALL_CHECK" = "unpacked" ] ; then
+            if [ -f $PROSODY_HOST_CONFIG ]; then
+                sed -i 's/storage = \"memory\"/storage = \"null\"/g' $PROSODY_HOST_CONFIG
+
+                # trigger a restart
+                PROSODY_CONFIG_PRESENT="false"
+            fi
+        fi
+        if [ "$PR10_INSTALL_CHECK" = "installed" ] \
+            || [ "$PR10_INSTALL_CHECK" = "unpacked" ] \
+            || dpkg --compare-versions "$PR_VER_INSTALLED" gt "0.10" ; then
+
+            # if the version is 0.10.X (>0.10 and <0.11)
+            if [ -f $PROSODY_HOST_CONFIG ] \
+                && dpkg --compare-versions "$PR_VER_INSTALLED" lt "0.11" ; then
+                sed -i 's/storage = \"memory\"/storage = \"none\"/g' $PROSODY_HOST_CONFIG
+
+                # trigger a restart
+                PROSODY_CONFIG_PRESENT="false"
+            fi
+        fi
+
         CERT_ADDED_TO_TRUST="false"
 
         if [ ! -f /var/lib/prosody/$JICOFO_AUTH_DOMAIN.crt ]; then

debian/jitsi-meet-prosody.postrm

@@ -35,8 +35,6 @@ case "$1" in
         if [ -n "$RET" ]; then
             rm -f /etc/prosody/conf.avail/$JVB_HOSTNAME.cfg.lua
             rm -f /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua
-            rm -f /etc/prosody/conf.avail/jaas.cfg.lua
-            rm -f /etc/prosody/conf.d/jaas.cfg.lua
 
             JICOFO_AUTH_DOMAIN="auth.$JVB_HOSTNAME"
             # clean up generated certificates

debian/jitsi-meet-tokens.postinst

@@ -50,15 +50,27 @@ case "$1" in
         if [ -f "$PROSODY_HOST_CONFIG" ] ; then
             # search for the token auth, if this is not enabled this is the
             # first time we install tokens package and needs a config change
-            if ! egrep -q '^\s*authentication\s*=\s*"token" -- do not delete me' "$PROSODY_HOST_CONFIG"; then
+            if ! egrep -q '^\s*authentication\s*=\s*"token"' "$PROSODY_HOST_CONFIG"; then
                 # enable tokens in prosody host config
                 sed -i 's/--plugin_paths/plugin_paths/g' $PROSODY_HOST_CONFIG
-                sed -i 's/authentication = "jitsi-anonymous" -- do not delete me/authentication = "token" -- do not delete me/g' $PROSODY_HOST_CONFIG
+                sed -i 's/authentication = "anonymous"/authentication = "token"/g' $PROSODY_HOST_CONFIG
+                sed -i 's/ --allow_unencrypted_plain_auth/ allow_unencrypted_plain_auth/g' $PROSODY_HOST_CONFIG
                 sed -i "s/ --app_id=\"example_app_id\"/ app_id=\"$APP_ID\"/g" $PROSODY_HOST_CONFIG
                 sed -i "s/ --app_secret=\"example_app_secret\"/ app_secret=\"$APP_SECRET\"/g" $PROSODY_HOST_CONFIG
                 sed -i 's/ --modules_enabled = { "token_verification" }/ modules_enabled = { "token_verification" }/g' $PROSODY_HOST_CONFIG
                 sed -i '/^\s*--\s*"token_verification"/ s/--\s*//' $PROSODY_HOST_CONFIG
 
+                PR10_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.10' 2>/dev/null | awk '{print $3}' || true)"
+                PRTRUNK_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-trunk' 2>/dev/null | awk '{print $3}' || true)"
+                PR_VER_INSTALLED=$(dpkg-query -f='${Version}\n' --show prosody  2>/dev/null || true)
+                if [ "$PR10_INSTALL_CHECK" = "installed" ] \
+                    || [ "$PR10_INSTALL_CHECK" = "unpacked" ] \
+                    || [ "$PRTRUNK_INSTALL_CHECK" = "installed" ] \
+                    || [ "$PRTRUNK_INSTALL_CHECK" = "unpacked" ] \
+                    || dpkg --compare-versions "$PR_VER_INSTALLED" lt "0.11" ; then
+                    sed -i 's/module:hook_global(/module:hook(/g' /usr/share/jitsi-meet/prosody-plugins/mod_auth_token.lua
+                fi
+
                 if [ -x "/etc/init.d/prosody" ]; then
                     invoke-rc.d prosody restart || true
                 fi

debian/jitsi-meet-tokens.postrm

@@ -37,7 +37,7 @@ case "$1" in
             APP_SECRET=$RET
 
             # Revert prosody config
-            sed -i 's/authentication = "token" -- do not delete me/authentication = "jitsi-anonymous" -- do not delete me/g' $PROSODY_HOST_CONFIG
+            sed -i 's/authentication = "token"/authentication = "anonymous"/g' $PROSODY_HOST_CONFIG
             sed -i "s/ app_id=\"$APP_ID\"/ --app_id=\"example_app_id\"/g" $PROSODY_HOST_CONFIG
             sed -i "s/ app_secret=\"$APP_SECRET\"/ --app_secret=\"example_app_secret\"/g" $PROSODY_HOST_CONFIG
             sed -i '/^\s*"token_verification"/ s/"token_verification"/-- "token_verification"/' $PROSODY_HOST_CONFIG

debian/jitsi-meet-web-config.config

@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+# certificate type choice
+db_input critical jitsi-meet/cert-choice || true
+db_go

debian/jitsi-meet-web-config.postinst

@@ -43,6 +43,14 @@ case "$1" in
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME_OLD-config.js
         fi
 
+        JVB_SERVE="false"
+        # this detect only old installations
+        RET=""
+        db_get jitsi-meet/jvb-serve || true
+        if [ "$RET" = "true" ] ; then
+            JVB_SERVE="true"
+        fi
+
         # stores the hostname so we will reuse it later, like in purge
         db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
 
@@ -68,18 +76,10 @@ case "$1" in
             FORCE_NGINX="false"
         fi
 
-        db_subst jitsi-meet/jaas-choice domain "${JVB_HOSTNAME}"
-        db_input critical jitsi-meet/jaas-choice || true
-        db_go
-        db_get jitsi-meet/jaas-choice
-        JAAS_INPUT="$RET"
-
         UPLOADED_CERT_CHOICE="I want to use my own certificate"
         # if first time config ask for certs, or if we are reconfiguring
         if [ -z "$JVB_HOSTNAME_OLD" ] || [ "$RECONFIGURING" = "true" ] ; then
             RET=""
-            db_input critical jitsi-meet/cert-choice || true
-            db_go
             db_get jitsi-meet/cert-choice
             CERT_CHOICE="$RET"
 
@@ -130,20 +130,51 @@ case "$1" in
             sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $JITSI_MEET_CONFIG
         fi
 
-        if [ "${JAAS_INPUT}" = "true" ] && ! grep -q "^var enableJaaS = true;$" $JITSI_MEET_CONFIG;  then
-            if grep -q "^var enableJaaS = false;$" $JITSI_MEET_CONFIG; then
-                sed -i "s/^var enableJaaS = false;$/var enableJaaS = true;/g" $JITSI_MEET_CONFIG
-            else
-                # old config, let's add the lines at the end. Adding var enableJaaS to avoid adding it on update again
-                echo "var enableJaaS = true;" >> $JITSI_MEET_CONFIG
-                echo "config.dialInNumbersUrl = 'https://conference-mapper.jitsi.net/v1/access/dids';" >> $JITSI_MEET_CONFIG
-                echo "config.dialInConfCodeUrl = 'https://conference-mapper.jitsi.net/v1/access';" >> $JITSI_MEET_CONFIG
+        # getting rid of jetty serving web
+        if [[ "$JVB_SERVE" = "true" ]] ; then
+            JVB_CONFIG="/etc/jitsi/videobridge/sip-communicator.properties"
 
-                # Sets roomPasswordNumberOfDigits only if there was not already set
-                if ! cat $JITSI_MEET_CONFIG | grep roomPasswordNumberOfDigits | grep -qv //; then
-                    echo "config.roomPasswordNumberOfDigits = 10; // skip re-adding it (do not remove comment)" >> $JITSI_MEET_CONFIG
+            # we will write to the file if missing create it
+            if [ -f $JVB_CONFIG ] ; then
+                echo ""
+                echo "------------------------------------------------"
+                echo ""
+                echo "You are using jetty to serve jitsi-meet, we are now upgrading you to use nginx!"
+                echo ""
+                echo "If you are using Let’s Encrypt certificates please re-run the script."
+                echo ""
+                echo "------------------------------------------------"
+                echo ""
+
+                sed -i "s/org.jitsi.videobridge.rest.jetty/#org.jitsi.videobridge.rest.jetty/g" $JVB_CONFIG
+                sed -i "s/org.jitsi.videobridge.TCP_HARVESTER_PORT/#org.jitsi.videobridge.TCP_HARVESTER_PORT/g" $JVB_CONFIG
+
+                if [ -d /run/systemd/system ]; then
+                    systemctl restart jitsi-videobridge2.service >/dev/null || true
+                fi
+
+                # Removing this value will force nginx or apache to be locally configured
+                JVB_HOSTNAME_OLD=""
+
+                RET=""
+                db_get jitsi-meet/cert-choice
+                CERT_CHOICE="$RET"
+                # Fix certs on upgrade from jetty
+                if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then
+                    RET=""
+                    db_get jitsi-meet/cert-path-key
+                    CERT_KEY="$RET"
+                    RET=""
+                    db_get jitsi-meet/cert-path-crt
+                    CERT_CRT="$RET"
+                else
+                    # create self-signed certs
+                    CERT_KEY="/etc/jitsi/meet/$JVB_HOSTNAME.key"
+                    CERT_CRT="/etc/jitsi/meet/$JVB_HOSTNAME.crt"
                 fi
             fi
+
+            db_set jitsi-meet/jvb-serve "false"
         fi
 
         if [[ "$FORCE_NGINX" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
@@ -215,30 +246,6 @@ case "$1" in
         echo ""
         echo "----------------"
 
-        if [ "${JAAS_INPUT}" != "true" ]; then
-            echo ""
-            echo ""
-            echo "       ;dOocd;"
-            echo "     .dNMM0dKO."
-            echo "     lNMMMKd0K,"
-            echo "    .xMMMMNxkNc"
-            echo "     dMMMMMkxXc"
-            echo "     cNMMMNl.."
-            echo "     .kMMMX;             Interested in adding telephony to your Jitsi meetings?"
-            echo "      ;XMMMO'"
-            echo "       lNMMWO'           Sign up on https://jaas.8x8.vc/components?host=${JVB_HOSTNAME}"
-            echo "        lNMMM0,                        and follow the guide in the dev console."
-            echo "         lXMMMK:."
-            echo "          ;KMMMNKd.  'oo,"
-            echo "           'xNMMMMXkkkkOKOl'"
-            echo "             :0WMMMMMMNOkk0Kk,"
-            echo "              .cdOWMMMMMWXOkOl"
-            echo "                 .;dKWMMMMMXc."
-            echo "                    .,:cll:'"
-            echo ""
-            echo ""
-        fi
-
         # and we're done with debconf
         db_stop
     ;;

debian/jitsi-meet-web-config.templates

@@ -5,7 +5,6 @@ _Description: SSL certificate for the Jitsi Meet instance
  Jitsi Meet is best to be set up with an SSL certificate.
  Having no certificate, a self-signed one will be generated.
  By choosing self-signed you will later have a chance to install Let’s Encrypt certificates.
- In the case of using a self-signed certificate, only the web app will be available with some warnings, the mobile app will not connect.
  Having a certificate signed by a recognised CA, it can be uploaded on the server
  and point its location. The default filenames will be /etc/ssl/--domain.name--.key
  for the key and /etc/ssl/--domain.name--.crt for the certificate.
@@ -31,11 +30,3 @@ Template: jitsi-videobridge/jvb-hostname
 Type: string
 _Description: Hostname:
  The Jitsi Meet web config package needs the DNS hostname of your instance.
-
-Template: jitsi-meet/jaas-choice
-Type: boolean
-_Description: Interested in adding telephony to your Jitsi meetings?
- You can easily add dialing in support to your meetings using JaaS (Jitsi as a Service).
- You need to:
-  - have a certificate signed by a recognised CA or Let’s Encrypt on your deployment
-  - sign in for JaaS at https://jaas.8x8.vc/components?host=${domain}

debian/jitsi-meet-web.install

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

doc/debian/jitsi-meet-prosody/jaas.cfg.lua

@@ -1,12 +0,0 @@
--- Enables dial-in for Jitsi meet components customers
-VirtualHost "jigasi.meet.jitsi"
-    modules_enabled = {
-        "ping";
-        "bosh";
-        "muc_password_check";
-    }
-    authentication = "token"
-    app_id = "jitsi";
-    asap_key_server = "https://jaas-public-keys.jitsi.net/jitsi-components/prod-8x8"
-    asap_accepted_issuers = { "jaas-components" }
-    asap_accepted_audiences = { "jigasi.jitmeet.example.com" }

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

@@ -36,7 +36,8 @@ unlimited_jids = {
 }
 
 VirtualHost "jitmeet.example.com"
-    authentication = "jitsi-anonymous" -- do not delete me
+    -- enabled = false -- Remove this line to enable this host
+    authentication = "anonymous"
     -- Properties below are modified by jitsi-meet-tokens package config
     -- and authentication above is switched to "token"
     --app_id="example_app_id"
@@ -52,7 +53,6 @@ VirtualHost "jitmeet.example.com"
     av_moderation_component = "avmoderation.jitmeet.example.com"
     speakerstats_component = "speakerstats.jitmeet.example.com"
     conference_duration_component = "conferenceduration.jitmeet.example.com"
-    end_conference_component = "endconference.jitmeet.example.com"
     -- we need bosh
     modules_enabled = {
         "bosh";
@@ -61,7 +61,6 @@ VirtualHost "jitmeet.example.com"
         "speakerstats";
         "external_services";
         "conference_duration";
-        "end_conference";
         "muc_lobby_rooms";
         "muc_breakout_rooms";
         "av_moderation";
@@ -92,6 +91,7 @@ Component "breakout.jitmeet.example.com" "muc"
     modules_enabled = {
         "muc_meeting_id";
         "muc_domain_mapper";
+        --"token_verification";
         "muc_rate_limit";
         "polls";
     }
@@ -125,9 +125,6 @@ Component "speakerstats.jitmeet.example.com" "speakerstats_component"
 Component "conferenceduration.jitmeet.example.com" "conference_duration_component"
     muc_component = "conference.jitmeet.example.com"
 
-Component "endconference.jitmeet.example.com" "end_conference"
-    muc_component = "conference.jitmeet.example.com"
-
 Component "avmoderation.jitmeet.example.com" "av_moderation_component"
     muc_component = "conference.jitmeet.example.com"
 
@@ -140,3 +137,18 @@ Component "lobby.jitmeet.example.com" "muc"
         "muc_rate_limit";
         "polls";
     }
+
+-- Enables dial-in for Jitsi meet components customers
+-- Note: make sure you have the following packages installed: lua-basexx, liblua5.3-dev, libssl-dev, luarocks
+-- and execute $ sudo luarocks install luajwtjitsi 3.0-0
+VirtualHost "jigasi.meet.jitsi"
+    enabled = false -- Jitsi meet components customers remove this line
+    modules_enabled = {
+      "ping";
+      "bosh";
+    }
+    authentication = "token"
+    app_id = "jitsi";
+    asap_key_server = "https://jaas-public-keys.jitsi.net/jitsi-components/prod-8x8"
+    asap_accepted_issuers = { "jaas-components" }
+    asap_accepted_audiences = { "jigasi.jitmeet.example.com" }

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

@@ -1,9 +1,8 @@
 server_names_hash_bucket_size 64;
 
 types {
-# nginx's default mime.types doesn't include a mapping for wasm or wav.
+# nginx's default mime.types doesn't include a mapping for wasm
     application/wasm     wasm;
-    audio/wav            wav;
 }
 upstream prosody {
     zone upstreams 64K;
@@ -74,13 +73,6 @@ server {
         alias /usr/share/jitsi-meet/libs/external_api.min.js;
     }
 
-    location = /_api/room-info {
-        proxy_pass http://prosody/room-info?prefix=$prefix&$args;
-        proxy_http_version 1.1;
-        proxy_set_header X-Forwarded-For $remote_addr;
-        proxy_set_header Host $http_host;
-    }
-
     # ensure all static content can always be found first
     location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$
     {
@@ -164,14 +156,6 @@ server {
         rewrite ^/(.*)$ /xmpp-websocket;
     }
 
-    location ~ ^/([^/?&:'"]+)/_api/room-info {
-        set $subdomain "$1.";
-        set $subdir "$1/";
-        set $prefix "$1";
-
-        rewrite ^/(.*)$ /_api/room-info;
-    }
-
     # Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
     location ~ ^/([^/?&:'"]+)/(.*)$ {
         set $subdomain "$1.";

index.html

@@ -67,6 +67,7 @@
             "utils.js",
             "do_external_connect.js",
             "interface_config.js",
+            "logging_config.js",
             "lib-jitsi-meet.min.js",
             "app.bundle.min.js",
             "all.css"
@@ -184,6 +185,7 @@
     <!--#include virtual="connection_optimization/connection_optimization.html" -->
     <script src="libs/do_external_connect.min.js?v=1"></script>
     <script><!--#include virtual="/interface_config.js" --></script>
+    <script><!--#include virtual="/logging_config.js" --></script>
     <script src="libs/lib-jitsi-meet.min.js?v=139"></script>
     <script src="libs/app.bundle.min.js?v=139"></script>
     <!--#include virtual="title.html" -->

interface_config.js

@@ -27,6 +27,7 @@ var interfaceConfig = {
     CLOSE_PAGE_GUEST_HINT: false, // A html text to be shown to guests on the close page, false disables it
 
     DEFAULT_BACKGROUND: '#040404',
+    DEFAULT_LOGO_URL: 'images/watermark.svg',
     DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/watermark.svg',
 
     DISABLE_DOMINANT_SPEAKER_INDICATOR: false,
@@ -89,6 +90,7 @@ var interfaceConfig = {
     JITSI_WATERMARK_LINK: 'https://jitsi.org',
 
     LANG_DETECTION: true, // Allow i18n to detect the system language
+    LIVE_STREAMING_HELP_LINK: 'https://jitsi.org/live', // Documentation reference for the live streaming feature.
     LOCAL_THUMBNAIL_RATIO: 16 / 9, // 16:9
 
     /**
@@ -240,19 +242,12 @@ var interfaceConfig = {
     // Please use defaultLocalDisplayName from config.js
     // DEFAULT_LOCAL_DISPLAY_NAME: 'me',
 
-    // Please use defaultLogoUrl from config.js
-    // DEFAULT_LOGO_URL: 'images/watermark.svg',
-
     // Please use defaultRemoteDisplayName from config.js
     // DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster',
 
     // Moved to config.js as `toolbarConfig.initialTimeout`.
     // INITIAL_TOOLBAR_TIMEOUT: 20000,
 
-    // Please use `liveStreaming.helpLink` from config.js
-    // Documentation reference for the live streaming feature.
-    // LIVE_STREAMING_HELP_LINK: 'https://jitsi.org/live',
-
     // Moved to config.js as `toolbarConfig.alwaysVisible`.
     // TOOLBAR_ALWAYS_VISIBLE: false,
 

ios/Podfile

@@ -29,14 +29,6 @@ target 'JitsiMeetSDK' do
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
 
-  # We use auto linking, but some dependencies are excluded from the lite build
-  # (see react-native.config.js) so we add them here.
-
-  pod 'giphy-react-native-sdk', :path => '../node_modules/@giphy/react-native-sdk'
-  pod 'RNCalendarEvents', :path => '../node_modules/react-native-calendar-events'
-  pod 'RNGoogleSignin', :path => '../node_modules/@react-native-google-signin/google-signin'
-  pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
-
   # Native pod dependencies
   #
 
@@ -44,30 +36,6 @@ target 'JitsiMeetSDK' do
   pod 'ObjectiveDropboxOfficial', '6.2.3'
 end
 
-target 'JitsiMeetSDKLite' do
-    project 'sdk/sdk.xcodeproj'
-
-    # This is a more lightweight target, which removes some functionality.
-    # Check the react-native.config.js for the list of excluded packages.
-
-    # React Native and its dependencies
-    #
-  
-    config = use_native_modules!
-    use_react_native!(
-      :path => config["reactNativePath"],
-      :hermes_enabled => false,
-      :fabric_enabled => false,
-      # An absolute path to your application root.
-      :app_path => "#{Pod::Config.instance.installation_root}/.."
-    )
-  
-    # Native pod dependencies
-    #
-  
-    pod 'CocoaLumberjack', '3.7.2'
-end
-
 post_install do |installer|
   react_native_post_install(installer)
   __apply_Xcode_12_5_M1_post_install_workaround(installer)

ios/Podfile.lock

@@ -149,8 +149,6 @@ PODS:
   - nanopb/encode (2.30908.0)
   - ObjectiveDropboxOfficial (6.2.3)
   - PromisesObjC (2.1.1)
-  - PromisesSwift (2.1.1):
-    - PromisesObjC (= 2.1.1)
   - RCT-Folly (2021.06.28.00-v2):
     - boost
     - DoubleConversion
@@ -376,11 +374,10 @@ PODS:
     - React-Core
   - react-native-splash-screen (3.3.0):
     - React-Core
-  - react-native-video (6.0.0-alpha.1):
+  - react-native-video (5.2.0):
     - React-Core
-    - react-native-video/Video (= 6.0.0-alpha.1)
-  - react-native-video/Video (6.0.0-alpha.1):
-    - PromisesSwift
+    - react-native-video/Video (= 5.2.0)
+  - react-native-video/Video (5.2.0):
     - React-Core
   - react-native-webrtc (1.100.1):
     - React-Core
@@ -468,6 +465,8 @@ PODS:
   - RNGoogleSignin (7.0.4):
     - GoogleSignIn (~> 6.0.0)
     - React-Core
+  - RNReanimated (1.13.4):
+    - React-Core
   - RNScreens (3.13.1):
     - React-Core
     - React-RCTImage
@@ -476,9 +475,9 @@ PODS:
     - RNSound/Core (= 0.11.1)
   - RNSound/Core (0.11.1):
     - React-Core
-  - RNSVG (12.4.3):
-    - React-Core
-  - RNWatch (1.0.11):
+  - RNSVG (12.1.0):
+    - React
+  - RNWatch (1.0.4):
     - React
   - Yoga (1.14.0)
 
@@ -542,6 +541,7 @@ DEPENDENCIES:
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - "RNGoogleSignin (from `../node_modules/@react-native-google-signin/google-signin`)"
+  - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
   - RNSound (from `../node_modules/react-native-sound`)
   - RNSVG (from `../node_modules/react-native-svg`)
@@ -572,7 +572,6 @@ SPEC REPOS:
     - nanopb
     - ObjectiveDropboxOfficial
     - PromisesObjC
-    - PromisesSwift
 
 EXTERNAL SOURCES:
   amplitude-react-native:
@@ -679,6 +678,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-gesture-handler"
   RNGoogleSignin:
     :path: "../node_modules/@react-native-google-signin/google-signin"
+  RNReanimated:
+    :path: "../node_modules/react-native-reanimated"
   RNScreens:
     :path: "../node_modules/react-native-screens"
   RNSound:
@@ -720,7 +721,6 @@ SPEC CHECKSUMS:
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   ObjectiveDropboxOfficial: fe206ce8c0bc49976c249d472db7fdbc53ebbd53
   PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
-  PromisesSwift: 99fddfe4a0ec88a56486644c0da106694c92a604
   RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
   RCTRequired: 00581111c53531e39e3c6346ef0d2c0cf52a5a37
   RCTTypeSafety: 07e03ee7800e7dd65cba8e52ad0c2edb06c96604
@@ -743,7 +743,7 @@ SPEC CHECKSUMS:
   react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
   react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
   react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
-  react-native-video: bb6f12a7198db53b261fefb5d609dc77417acc8b
+  react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28
   react-native-webrtc: 206a0ac12a5633d2ec4605174d7c9f12f0d674b2
   react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
   React-perflogger: 30ab8d6db10e175626069e742eead3ebe8f24fd5
@@ -766,12 +766,13 @@ SPEC CHECKSUMS:
   RNDeviceInfo: 0400a6d0c94186d1120c3cbd97b23abc022187a9
   RNGestureHandler: e5c7cab5f214503dcefd6b2b0cefb050e1f51c4a
   RNGoogleSignin: c4381751eefd73c552b923ba347a9bfc6f18771c
+  RNReanimated: c1b56d030d1616239861534d9adb531f8cffab68
   RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
   RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
-  RNSVG: f3b60aeeaa81960e2e0536c3a9eef50b667ef3a9
-  RNWatch: dae6c858a2051dbdcfb00b9a86cf4d90400263b4
+  RNSVG: ce9d996113475209013317e48b05c21ee988d42e
+  RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80
   Yoga: 17cd9a50243093b547c1e539c749928dd68152da
 
-PODFILE CHECKSUM: a437875b597d999a137c671b1da54153fe31d23f
+PODFILE CHECKSUM: 0e8826a5cb9ee147354a83321ecb3104132f510b
 
 COCOAPODS: 1.11.3

ios/app/app.entitlements

@@ -8,11 +8,11 @@
 		<string>applinks:beta.meet.jit.si</string>
 		<string>applinks:meet.jit.si</string>
 	</array>
-	<key>com.apple.developer.siri</key>
-	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.org.jitsi.meet.appgroup</string>
 	</array>
+	<key>com.apple.developer.siri</key>
+	<true/>
 </dict>
 </plist>

ios/app/app.xcodeproj/project.pbxproj

@@ -369,7 +369,6 @@
 				DEF4813D224925A2002AD03A /* Copy Google Plist file */,
 				DE11877A21EE09640078D059 /* Setup Google reverse URL handler */,
 				DE4F6D6E22005C0400DE699E /* Setup Dropbox */,
-				4E81688528A408E600F8FA9E /* Update App Entitlements */,
 				0BEA5C491F7B8F73000D0AB4 /* Embed Watch Content */,
 				4EC49B9025BED71300E76218 /* Embed App Extensions */,
 			);
@@ -523,24 +522,6 @@
 			shellPath = /bin/sh;
 			shellScript = "../scripts/run-packager.sh\n";
 		};
-		4E81688528A408E600F8FA9E /* Update App Entitlements */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Update App Entitlements";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if test \"$PRODUCT_BUNDLE_IDENTIFIER\" = \"com.atlassian.JitsiMeet.ios\"; then\n    ENTITLEMENTS_PLIST=\"$PROJECT_DIR/app.entitlements\"\n    \n    /usr/libexec/PlistBuddy -c \"Add :com.apple.developer.avfoundation.multitasking-camera-access bool 1\" $ENTITLEMENTS_PLIST\nfi\n";
-		};
 		69BC5020DBE393B56BD76636 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

ios/app/broadcast-extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>22.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

ios/app/broadcast-extension/SocketConnection.swift

@@ -107,7 +107,7 @@ extension SocketConnection: StreamDelegate {
                 streamHasSpaceAvailable?()
             }
         case .errorOccurred:
-            print("client stream error occurred: \(String(describing: aStream.streamError))")
+            print("client stream error occured: \(String(describing: aStream.streamError))")
             close()
             notifyDidClose(error: aStream.streamError)
 

ios/app/src/Info.plist

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

ios/app/watchos/app/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>22.4.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>99.0.0</string>
+	<string>22.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/scripts/release-sdk-lite.sh

@@ -1,75 +0,0 @@
-#!/bin/bash
-
-set -e -u
-
-THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
-PROJECT_REPO=$(realpath ${THIS_DIR}/../..)
-RELEASE_REPO=$(realpath ${THIS_DIR}/../../../jitsi-meet-ios-sdk-releases)
-DEFAULT_SDK_VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" ${THIS_DIR}/../sdk/src/Lite-Info.plist)
-SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
-DO_GIT_TAG=${GIT_TAG:-0}
-
-
-echo "Releasing Jitsi Meet SDK Lite ${SDK_VERSION}"
-
-pushd ${RELEASE_REPO}
-
-# Generate podspec file
-cat JitsiMeetSDKLite.podspec.tpl | sed -e s/VERSION/${SDK_VERSION}-lite/g > JitsiMeetSDKLite.podspec
-
-# Cleanup
-rm -rf lite/Frameworks/*
-
-popd
-
-# Build the SDK
-pushd ${PROJECT_REPO}
-rm -rf ios/sdk/out
-xcodebuild clean \
-    -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeetSDKLite
-xcodebuild archive \
-    -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeetSDKLite  \
-    -configuration Release \
-    -sdk iphonesimulator \
-    -destination='generic/platform=iOS Simulator' \
-    -archivePath ios/sdk/out/ios-simulator \
-    ENABLE_BITCODE=NO \
-    SKIP_INSTALL=NO \
-    BUILD_LIBRARY_FOR_DISTRIBUTION=YES
-xcodebuild archive \
-    -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeetSDKLite  \
-    -configuration Release \
-    -sdk iphoneos \
-    -destination='generic/platform=iOS' \
-    -archivePath ios/sdk/out/ios-device \
-    ENABLE_BITCODE=NO \
-    SKIP_INSTALL=NO \
-    BUILD_LIBRARY_FOR_DISTRIBUTION=YES
-xcodebuild -create-xcframework \
-    -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
-    -framework ios/sdk/out/ios-simulator.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
-    -output ios/sdk/out/JitsiMeetSDK.xcframework
-if [[ $DO_GIT_TAG == 1 ]]; then
-    git tag ios-sdk-lite-${SDK_VERSION}
-fi
-popd
-
-pushd ${RELEASE_REPO}
-
-# Put the new files in the repo
-cp -a ${PROJECT_REPO}/ios/sdk/out/JitsiMeetSDK.xcframework lite/Frameworks/
-
-# Add all files to git
-if [[ $DO_GIT_TAG == 1 ]]; then
-    git add -A .
-    git commit -m "${SDK_VERSION} lite"
-    git tag "${SDK_VERSION}-lite"
-fi
-
-popd
-
-echo "Finished! Don't forget to push the tags and releases repo artifacts."
-echo "The new pod can be pushed to CocoaPods by doing: pod trunk push JitsiMeetSDKLite.podspec"

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -22,7 +22,6 @@
 		0BCA49601EC4B6C600B793EE /* POSIX.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495D1EC4B6C600B793EE /* POSIX.m */; };
 		0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495E1EC4B6C600B793EE /* Proximity.m */; };
 		0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BD906E81EC0C00300C8C18E /* JitsiMeet.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3453F4A32680898C4A40E821 /* libPods-JitsiMeetSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 927ED7DF018DE5E12C4C3404 /* libPods-JitsiMeetSDK.a */; };
 		4E51B76425E5345E0038575A /* ScheenshareEventEmiter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E51B76225E5345E0038575A /* ScheenshareEventEmiter.h */; };
 		4E51B76525E5345E0038575A /* ScheenshareEventEmiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E51B76325E5345E0038575A /* ScheenshareEventEmiter.m */; };
 		4EBA6E61286072E300B31882 /* JitsiMeetViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EBA6E5F286072E300B31882 /* JitsiMeetViewController.h */; };
@@ -33,8 +32,7 @@
 		4ED4FFF42721B9B90074E620 /* JitsiAudioSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED4FFF22721B9B90074E620 /* JitsiAudioSession.m */; };
 		4EEC9630286C73A2008705FA /* JitsiMeetView+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EEC962E286C73A2008705FA /* JitsiMeetView+Private.h */; };
 		4EEC9631286C73A2008705FA /* JitsiMeetView+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EEC962F286C73A2008705FA /* JitsiMeetView+Private.m */; };
-		6F08DF7D4458EE3CF3F36F6D /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
-		9A8EE79C77C17743BB66E8BD /* libPods-JitsiMeetSDKLite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B46497DE9A95BDF5E312AF48 /* libPods-JitsiMeetSDKLite.a */; };
+		6F08DF7D4458EE3CF3F36F6D /* libPods-JitsiMeetSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */; };
 		A4A934E9212F3ADB001E9388 /* Dropbox.m in Sources */ = {isa = PBXBuildFile; fileRef = A4A934E8212F3ADB001E9388 /* Dropbox.m */; };
 		C6245F5D2053091D0040BE68 /* image-resize@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6245F5B2053091D0040BE68 /* image-resize@2x.png */; };
 		C6245F5E2053091D0040BE68 /* image-resize@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6245F5C2053091D0040BE68 /* image-resize@3x.png */; };
@@ -49,8 +47,6 @@
 		DE438CDA2350934700DD541D /* JavaScriptSandbox.m in Sources */ = {isa = PBXBuildFile; fileRef = DE438CD82350934700DD541D /* JavaScriptSandbox.m */; };
 		DE65AACA2317FFCD00290BEC /* LogUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DE65AAC92317FFCD00290BEC /* LogUtils.h */; };
 		DE65AACC2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = DE65AACB2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h */; };
-		DE66914428BCC1C7007C4533 /* JitsiMeetSDK-Swift.h in Headers */ = {isa = PBXBuildFile; fileRef = DE66914328BCC1C7007C4533 /* JitsiMeetSDK-Swift.h */; };
-		DE66914528BCC1C7007C4533 /* JitsiMeetSDK-Swift.h in Headers */ = {isa = PBXBuildFile; fileRef = DE66914328BCC1C7007C4533 /* JitsiMeetSDK-Swift.h */; };
 		DE762DB422AFDE76000DEBD6 /* JitsiMeetUserInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DE762DB322AFDE76000DEBD6 /* JitsiMeetUserInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DE762DB622AFDE8D000DEBD6 /* JitsiMeetUserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = DE762DB522AFDE8D000DEBD6 /* JitsiMeetUserInfo.m */; };
 		DE81A2D42316AC4D00AE1940 /* JitsiMeetLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = DE81A2D22316AC4D00AE1940 /* JitsiMeetLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -58,58 +54,6 @@
 		DE81A2D92316AC7600AE1940 /* LogBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2D72316AC7600AE1940 /* LogBridge.m */; };
 		DE81A2DE2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DE81A2DF2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */; };
-		DE9A0130289A9A9A00E41CBB /* JitsiMeetUserInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DE762DB322AFDE76000DEBD6 /* JitsiMeetUserInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DE9A0131289A9A9A00E41CBB /* JitsiMeetView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B412F161EDEC65D00B1A0A6 /* JitsiMeetView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DE9A0132289A9A9A00E41CBB /* RCTBridgeWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B93EF7C1EC9DDCD0030D24D /* RCTBridgeWrapper.h */; };
-		DE9A0133289A9A9A00E41CBB /* JitsiMeetBaseLogHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DE9A0134289A9A9A00E41CBB /* JitsiMeetSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DE9A0135289A9A9A00E41CBB /* ScheenshareEventEmiter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E51B76225E5345E0038575A /* ScheenshareEventEmiter.h */; };
-		DE9A0136289A9A9A00E41CBB /* JitsiMeetBaseLogHandler+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = DE65AACB2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h */; };
-		DE9A0137289A9A9A00E41CBB /* JitsiMeetRenderingView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EBA6E632860B1E800B31882 /* JitsiMeetRenderingView.h */; };
-		DE9A0138289A9A9A00E41CBB /* JitsiMeetViewDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B412F1B1EDEC80100B1A0A6 /* JitsiMeetViewDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DE9A0139289A9A9A00E41CBB /* JitsiAudioSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ED4FFF12721B9B90074E620 /* JitsiAudioSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DE9A013A289A9A9A00E41CBB /* JitsiMeetView+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EEC962E286C73A2008705FA /* JitsiMeetView+Private.h */; };
-		DE9A013B289A9A9A00E41CBB /* JitsiMeet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BD906E81EC0C00300C8C18E /* JitsiMeet.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DE9A013C289A9A9A00E41CBB /* JitsiMeetLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = DE81A2D22316AC4D00AE1940 /* JitsiMeetLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DE9A013D289A9A9A00E41CBB /* LogUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DE65AAC92317FFCD00290BEC /* LogUtils.h */; };
-		DE9A013E289A9A9A00E41CBB /* JitsiMeetViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EBA6E5F286072E300B31882 /* JitsiMeetViewController.h */; };
-		DE9A013F289A9A9A00E41CBB /* JitsiMeetConferenceOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DE9A0140289A9A9A00E41CBB /* ExternalAPI.h in Headers */ = {isa = PBXBuildFile; fileRef = C81E9AB825AC5AD800B134D9 /* ExternalAPI.h */; };
-		DE9A0141289A9A9A00E41CBB /* InfoPlistUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = C8AFD27D2462C613000293D2 /* InfoPlistUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DE9A0143289A9A9A00E41CBB /* CallKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB9AD7A1F5EC8F4001C08DB /* CallKit.m */; };
-		DE9A0144289A9A9A00E41CBB /* JitsiMeetBaseLogHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */; };
-		DE9A0145289A9A9A00E41CBB /* JitsiMeetRenderingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EBA6E642860B1E800B31882 /* JitsiMeetRenderingView.m */; };
-		DE9A0146289A9A9A00E41CBB /* JitsiAudioSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED4FFF22721B9B90074E620 /* JitsiAudioSession.m */; };
-		DE9A0147289A9A9A00E41CBB /* AppInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB9AD7C1F60356D001C08DB /* AppInfo.m */; };
-		DE9A0148289A9A9A00E41CBB /* LogBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2D72316AC7600AE1940 /* LogBridge.m */; };
-		DE9A0149289A9A9A00E41CBB /* RNRootView.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAFA778229EAD520033A7FA /* RNRootView.m */; };
-		DE9A014A289A9A9A00E41CBB /* JitsiMeetUserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = DE762DB522AFDE8D000DEBD6 /* JitsiMeetUserInfo.m */; };
-		DE9A014B289A9A9A00E41CBB /* JitsiMeetConferenceOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */; };
-		DE9A014C289A9A9A00E41CBB /* RCTBridgeWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B93EF7D1EC9DDCD0030D24D /* RCTBridgeWrapper.m */; };
-		DE9A014D289A9A9A00E41CBB /* ExternalAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */; };
-		DE9A014E289A9A9A00E41CBB /* POSIX.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495D1EC4B6C600B793EE /* POSIX.m */; };
-		DE9A014F289A9A9A00E41CBB /* InfoPlistUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = C8AFD27E2462C613000293D2 /* InfoPlistUtil.m */; };
-		DE9A0150289A9A9A00E41CBB /* PiPViewCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6CC49AE207412CF000DFA42 /* PiPViewCoordinator.swift */; };
-		DE9A0151289A9A9A00E41CBB /* LocaleDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFC743D21B178FA00E4DD96 /* LocaleDetector.m */; };
-		DE9A0152289A9A9A00E41CBB /* AudioMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495C1EC4B6C600B793EE /* AudioMode.m */; };
-		DE9A0153289A9A9A00E41CBB /* Proximity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495E1EC4B6C600B793EE /* Proximity.m */; };
-		DE9A0154289A9A9A00E41CBB /* JMCallKitEmitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C69EFA09209A0F650027712B /* JMCallKitEmitter.swift */; };
-		DE9A0155289A9A9A00E41CBB /* ReactUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFE535521FB2E8300011A3A /* ReactUtils.m */; };
-		DE9A0156289A9A9A00E41CBB /* JitsiMeetView+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EEC962F286C73A2008705FA /* JitsiMeetView+Private.m */; };
-		DE9A0157289A9A9A00E41CBB /* DragGestureController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A3425E204EF76800E062DD /* DragGestureController.swift */; };
-		DE9A0158289A9A9A00E41CBB /* ScheenshareEventEmiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E51B76325E5345E0038575A /* ScheenshareEventEmiter.m */; };
-		DE9A015A289A9A9A00E41CBB /* JitsiMeetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EBA6E60286072E300B31882 /* JitsiMeetViewController.m */; };
-		DE9A015B289A9A9A00E41CBB /* JMCallKitProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C69EFA0A209A0F660027712B /* JMCallKitProxy.swift */; };
-		DE9A015C289A9A9A00E41CBB /* JitsiMeetLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2D32316AC4D00AE1940 /* JitsiMeetLogger.m */; };
-		DE9A015D289A9A9A00E41CBB /* JMCallKitListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = C69EFA0B209A0F660027712B /* JMCallKitListener.swift */; };
-		DE9A015E289A9A9A00E41CBB /* JitsiMeetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */; };
-		DE9A015F289A9A9A00E41CBB /* JitsiMeet.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFE535321FB1BF800011A3A /* JitsiMeet.m */; };
-		DE9A0160289A9A9A00E41CBB /* JavaScriptSandbox.m in Sources */ = {isa = PBXBuildFile; fileRef = DE438CD82350934700DD541D /* JavaScriptSandbox.m */; };
-		DE9A0162289A9A9A00E41CBB /* Intents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BB9AD781F5EC6D7001C08DB /* Intents.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-		DE9A0163289A9A9A00E41CBB /* CallKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BB9AD761F5EC6CE001C08DB /* CallKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-		DE9A0166289A9A9A00E41CBB /* CallKitIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */; };
-		DE9A0167289A9A9A00E41CBB /* image-resize@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6245F5B2053091D0040BE68 /* image-resize@2x.png */; };
-		DE9A0168289A9A9A00E41CBB /* image-resize@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6245F5C2053091D0040BE68 /* image-resize@3x.png */; };
 		DEA9F284258A5D9900D4CD74 /* JitsiMeetSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DEAD3226220C497000E93636 /* JitsiMeetConferenceOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DEAD3227220C497000E93636 /* JitsiMeetConferenceOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */; };
@@ -150,15 +94,11 @@
 		4ED4FFF52721BAE10074E620 /* JitsiAudioSession+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiAudioSession+Private.h"; sourceTree = "<group>"; };
 		4EEC962E286C73A2008705FA /* JitsiMeetView+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetView+Private.h"; sourceTree = "<group>"; };
 		4EEC962F286C73A2008705FA /* JitsiMeetView+Private.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "JitsiMeetView+Private.m"; sourceTree = "<group>"; };
-		86389F55993FAAF6AEB3FA3E /* Pods-JitsiMeetSDKLite.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDKLite.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDKLite/Pods-JitsiMeetSDKLite.release.xcconfig"; sourceTree = "<group>"; };
 		891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDK.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK.release.xcconfig"; sourceTree = "<group>"; };
-		8F48C340DE0D91D1012976C5 /* Pods-JitsiMeetSDKLite.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDKLite.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDKLite/Pods-JitsiMeetSDKLite.debug.xcconfig"; sourceTree = "<group>"; };
-		927ED7DF018DE5E12C4C3404 /* libPods-JitsiMeetSDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeetSDK.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
 		9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
 		A4A934E8212F3ADB001E9388 /* Dropbox.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Dropbox.m; sourceTree = "<group>"; };
 		A4A934EB21349A06001E9388 /* Dropbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Dropbox.h; sourceTree = "<group>"; };
-		B46497DE9A95BDF5E312AF48 /* libPods-JitsiMeetSDKLite.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeetSDKLite.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C6245F5B2053091D0040BE68 /* image-resize@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "image-resize@2x.png"; path = "src/picture-in-picture/image-resize@2x.png"; sourceTree = "<group>"; };
 		C6245F5C2053091D0040BE68 /* image-resize@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "image-resize@3x.png"; path = "src/picture-in-picture/image-resize@3x.png"; sourceTree = "<group>"; };
 		C69EFA09209A0F650027712B /* JMCallKitEmitter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JMCallKitEmitter.swift; sourceTree = "<group>"; };
@@ -172,7 +112,6 @@
 		DE438CD82350934700DD541D /* JavaScriptSandbox.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JavaScriptSandbox.m; sourceTree = "<group>"; };
 		DE65AAC92317FFCD00290BEC /* LogUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LogUtils.h; sourceTree = "<group>"; };
 		DE65AACB2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetBaseLogHandler+Private.h"; sourceTree = "<group>"; };
-		DE66914328BCC1C7007C4533 /* JitsiMeetSDK-Swift.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetSDK-Swift.h"; sourceTree = "<group>"; };
 		DE762DB322AFDE76000DEBD6 /* JitsiMeetUserInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetUserInfo.h; sourceTree = "<group>"; };
 		DE762DB522AFDE8D000DEBD6 /* JitsiMeetUserInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetUserInfo.m; sourceTree = "<group>"; };
 		DE762DB722AFE166000DEBD6 /* JitsiMeetUserInfo+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetUserInfo+Private.h"; sourceTree = "<group>"; };
@@ -181,8 +120,6 @@
 		DE81A2D72316AC7600AE1940 /* LogBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LogBridge.m; sourceTree = "<group>"; };
 		DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetBaseLogHandler.h; sourceTree = "<group>"; };
 		DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetBaseLogHandler.m; sourceTree = "<group>"; };
-		DE9A016F289A9A9A00E41CBB /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		DE9A0170289A9A9A00E41CBB /* Lite-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Lite-Info.plist"; path = "/Users/saghul/work/jitsi/jitsi-meet-prs/ios/sdk/src/Lite-Info.plist"; sourceTree = "<absolute>"; };
 		DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetSDK.h; sourceTree = "<group>"; };
 		DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetConferenceOptions.h; sourceTree = "<group>"; };
 		DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetConferenceOptions.m; sourceTree = "<group>"; };
@@ -194,6 +131,7 @@
 		DEFE535521FB2E8300011A3A /* ReactUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReactUtils.m; sourceTree = "<group>"; };
 		DEFE535721FB2E9E00011A3A /* ReactUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactUtils.h; sourceTree = "<group>"; };
 		DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeet+Private.h"; sourceTree = "<group>"; };
+		E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeetSDK.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -203,18 +141,7 @@
 			files = (
 				0BB9AD791F5EC6D7001C08DB /* Intents.framework in Frameworks */,
 				0BB9AD771F5EC6CE001C08DB /* CallKit.framework in Frameworks */,
-				6F08DF7D4458EE3CF3F36F6D /* BuildFile in Frameworks */,
-				3453F4A32680898C4A40E821 /* libPods-JitsiMeetSDK.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DE9A0161289A9A9A00E41CBB /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DE9A0162289A9A9A00E41CBB /* Intents.framework in Frameworks */,
-				DE9A0163289A9A9A00E41CBB /* CallKit.framework in Frameworks */,
-				9A8EE79C77C17743BB66E8BD /* libPods-JitsiMeetSDKLite.a in Frameworks */,
+				6F08DF7D4458EE3CF3F36F6D /* libPods-JitsiMeetSDK.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -246,7 +173,6 @@
 			isa = PBXGroup;
 			children = (
 				0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */,
-				DE9A016F289A9A9A00E41CBB /* JitsiMeetSDK.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -305,8 +231,6 @@
 				0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */,
 				4E51B76225E5345E0038575A /* ScheenshareEventEmiter.h */,
 				4E51B76325E5345E0038575A /* ScheenshareEventEmiter.m */,
-				DE9A0170289A9A9A00E41CBB /* Lite-Info.plist */,
-				DE66914328BCC1C7007C4533 /* JitsiMeetSDK-Swift.h */,
 			);
 			path = src;
 			sourceTree = "<group>";
@@ -317,8 +241,7 @@
 				0BB9AD761F5EC6CE001C08DB /* CallKit.framework */,
 				0B93EF7A1EC608550030D24D /* CoreText.framework */,
 				0BB9AD781F5EC6D7001C08DB /* Intents.framework */,
-				B46497DE9A95BDF5E312AF48 /* libPods-JitsiMeetSDKLite.a */,
-				927ED7DF018DE5E12C4C3404 /* libPods-JitsiMeetSDK.a */,
+				E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -339,8 +262,6 @@
 				9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */,
 				09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */,
 				891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */,
-				8F48C340DE0D91D1012976C5 /* Pods-JitsiMeetSDKLite.debug.xcconfig */,
-				86389F55993FAAF6AEB3FA3E /* Pods-JitsiMeetSDKLite.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -379,7 +300,6 @@
 				DEA9F284258A5D9900D4CD74 /* JitsiMeetSDK.h in Headers */,
 				4E51B76425E5345E0038575A /* ScheenshareEventEmiter.h in Headers */,
 				DE65AACC2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h in Headers */,
-				DE66914428BCC1C7007C4533 /* JitsiMeetSDK-Swift.h in Headers */,
 				4EBA6E652860B1E800B31882 /* JitsiMeetRenderingView.h in Headers */,
 				0B412F221EDEF6EA00B1A0A6 /* JitsiMeetViewDelegate.h in Headers */,
 				4ED4FFF32721B9B90074E620 /* JitsiAudioSession.h in Headers */,
@@ -394,32 +314,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DE9A012F289A9A9A00E41CBB /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DE9A0130289A9A9A00E41CBB /* JitsiMeetUserInfo.h in Headers */,
-				DE9A0131289A9A9A00E41CBB /* JitsiMeetView.h in Headers */,
-				DE9A0132289A9A9A00E41CBB /* RCTBridgeWrapper.h in Headers */,
-				DE9A0133289A9A9A00E41CBB /* JitsiMeetBaseLogHandler.h in Headers */,
-				DE9A0134289A9A9A00E41CBB /* JitsiMeetSDK.h in Headers */,
-				DE9A0135289A9A9A00E41CBB /* ScheenshareEventEmiter.h in Headers */,
-				DE9A0136289A9A9A00E41CBB /* JitsiMeetBaseLogHandler+Private.h in Headers */,
-				DE66914528BCC1C7007C4533 /* JitsiMeetSDK-Swift.h in Headers */,
-				DE9A0137289A9A9A00E41CBB /* JitsiMeetRenderingView.h in Headers */,
-				DE9A0138289A9A9A00E41CBB /* JitsiMeetViewDelegate.h in Headers */,
-				DE9A0139289A9A9A00E41CBB /* JitsiAudioSession.h in Headers */,
-				DE9A013A289A9A9A00E41CBB /* JitsiMeetView+Private.h in Headers */,
-				DE9A013B289A9A9A00E41CBB /* JitsiMeet.h in Headers */,
-				DE9A013C289A9A9A00E41CBB /* JitsiMeetLogger.h in Headers */,
-				DE9A013D289A9A9A00E41CBB /* LogUtils.h in Headers */,
-				DE9A013E289A9A9A00E41CBB /* JitsiMeetViewController.h in Headers */,
-				DE9A013F289A9A9A00E41CBB /* JitsiMeetConferenceOptions.h in Headers */,
-				DE9A0140289A9A9A00E41CBB /* ExternalAPI.h in Headers */,
-				DE9A0141289A9A9A00E41CBB /* InfoPlistUtil.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
@@ -445,28 +339,6 @@
 			productReference = 0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		DE9A012D289A9A9A00E41CBB /* JitsiMeetSDKLite */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DE9A016C289A9A9A00E41CBB /* Build configuration list for PBXNativeTarget "JitsiMeetSDKLite" */;
-			buildPhases = (
-				DE9A012E289A9A9A00E41CBB /* [CP] Check Pods Manifest.lock */,
-				DE9A012F289A9A9A00E41CBB /* Headers */,
-				DE9A0142289A9A9A00E41CBB /* Sources */,
-				DE9A0161289A9A9A00E41CBB /* Frameworks */,
-				DE9A0165289A9A9A00E41CBB /* Resources */,
-				DE9A0169289A9A9A00E41CBB /* Copy sounds */,
-				DE9A016A289A9A9A00E41CBB /* Package React bundle */,
-				DE9A016B289A9A9A00E41CBB /* [CP] Copy Pods Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = JitsiMeetSDKLite;
-			productName = "Jitsi Meet SDK";
-			productReference = DE9A016F289A9A9A00E41CBB /* JitsiMeetSDK.framework */;
-			productType = "com.apple.product-type.framework";
-		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -497,7 +369,6 @@
 			projectRoot = "";
 			targets = (
 				0BD906E41EC0C00300C8C18E /* JitsiMeetSDK */,
-				DE9A012D289A9A9A00E41CBB /* JitsiMeetSDKLite */,
 			);
 		};
 /* End PBXProject section */
@@ -513,16 +384,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DE9A0165289A9A9A00E41CBB /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DE9A0166289A9A9A00E41CBB /* CallKitIcon.png in Resources */,
-				DE9A0167289A9A9A00E41CBB /* image-resize@2x.png in Resources */,
-				DE9A0168289A9A9A00E41CBB /* image-resize@3x.png in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -598,76 +459,6 @@
 			shellPath = /bin/sh;
 			shellScript = "SOUNDS_DIR=\"${PROJECT_DIR}/../../sounds\"\n\ncp $SOUNDS_DIR/* ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\n";
 		};
-		DE9A012E289A9A9A00E41CBB /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-JitsiMeetSDKLite-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		DE9A0169289A9A9A00E41CBB /* Copy sounds */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Copy sounds";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "SOUNDS_DIR=\"${PROJECT_DIR}/../../sounds\"\n\ncp $SOUNDS_DIR/* ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\n";
-		};
-		DE9A016A289A9A9A00E41CBB /* Package React bundle */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Package React bundle";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\nexport NODE_ARGS=\"--max_old_space_size=4096\"\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
-		};
-		DE9A016B289A9A9A00E41CBB /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDKLite/Pods-JitsiMeetSDKLite-resources.sh",
-				"${PODS_ROOT}/Amplitude/Sources/Resources/ComodoRsaDomainValidationCA.der",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaDomainValidationCA.der",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDKLite/Pods-JitsiMeetSDKLite-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -708,42 +499,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DE9A0142289A9A9A00E41CBB /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DE9A0143289A9A9A00E41CBB /* CallKit.m in Sources */,
-				DE9A0144289A9A9A00E41CBB /* JitsiMeetBaseLogHandler.m in Sources */,
-				DE9A0145289A9A9A00E41CBB /* JitsiMeetRenderingView.m in Sources */,
-				DE9A0146289A9A9A00E41CBB /* JitsiAudioSession.m in Sources */,
-				DE9A0147289A9A9A00E41CBB /* AppInfo.m in Sources */,
-				DE9A0148289A9A9A00E41CBB /* LogBridge.m in Sources */,
-				DE9A0149289A9A9A00E41CBB /* RNRootView.m in Sources */,
-				DE9A014A289A9A9A00E41CBB /* JitsiMeetUserInfo.m in Sources */,
-				DE9A014B289A9A9A00E41CBB /* JitsiMeetConferenceOptions.m in Sources */,
-				DE9A014C289A9A9A00E41CBB /* RCTBridgeWrapper.m in Sources */,
-				DE9A014D289A9A9A00E41CBB /* ExternalAPI.m in Sources */,
-				DE9A014E289A9A9A00E41CBB /* POSIX.m in Sources */,
-				DE9A014F289A9A9A00E41CBB /* InfoPlistUtil.m in Sources */,
-				DE9A0150289A9A9A00E41CBB /* PiPViewCoordinator.swift in Sources */,
-				DE9A0151289A9A9A00E41CBB /* LocaleDetector.m in Sources */,
-				DE9A0152289A9A9A00E41CBB /* AudioMode.m in Sources */,
-				DE9A0153289A9A9A00E41CBB /* Proximity.m in Sources */,
-				DE9A0154289A9A9A00E41CBB /* JMCallKitEmitter.swift in Sources */,
-				DE9A0155289A9A9A00E41CBB /* ReactUtils.m in Sources */,
-				DE9A0156289A9A9A00E41CBB /* JitsiMeetView+Private.m in Sources */,
-				DE9A0157289A9A9A00E41CBB /* DragGestureController.swift in Sources */,
-				DE9A0158289A9A9A00E41CBB /* ScheenshareEventEmiter.m in Sources */,
-				DE9A015A289A9A9A00E41CBB /* JitsiMeetViewController.m in Sources */,
-				DE9A015B289A9A9A00E41CBB /* JMCallKitProxy.swift in Sources */,
-				DE9A015C289A9A9A00E41CBB /* JitsiMeetLogger.m in Sources */,
-				DE9A015D289A9A9A00E41CBB /* JMCallKitListener.swift in Sources */,
-				DE9A015E289A9A9A00E41CBB /* JitsiMeetView.m in Sources */,
-				DE9A015F289A9A9A00E41CBB /* JitsiMeet.m in Sources */,
-				DE9A0160289A9A9A00E41CBB /* JavaScriptSandbox.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
@@ -891,8 +646,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = NO;
-				SWIFT_INSTALL_OBJC_HEADER = NO;
-				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 			};
@@ -921,77 +675,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = NO;
-				SWIFT_INSTALL_OBJC_HEADER = NO;
-				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Release;
-		};
-		DE9A016D289A9A9A00E41CBB /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8F48C340DE0D91D1012976C5 /* Pods-JitsiMeetSDKLite.debug.xcconfig */;
-			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = "";
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(inherited)",
-					"COCOAPODS=1",
-					"JITSI_MEET_SDK_LITE=1",
-				);
-				INFOPLIST_FILE = "src/Lite-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
-				PRODUCT_NAME = JitsiMeetSDK;
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SKIP_INSTALL = YES;
-				SUPPORTS_MACCATALYST = NO;
-				SWIFT_INSTALL_OBJC_HEADER = NO;
-				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Debug;
-		};
-		DE9A016E289A9A9A00E41CBB /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 86389F55993FAAF6AEB3FA3E /* Pods-JitsiMeetSDKLite.release.xcconfig */;
-			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = "";
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(inherited)",
-					"COCOAPODS=1",
-					JITSI_MEET_SDK_LITE,
-				);
-				INFOPLIST_FILE = "src/Lite-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
-				PRODUCT_NAME = JitsiMeetSDK;
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SKIP_INSTALL = YES;
-				SUPPORTS_MACCATALYST = NO;
-				SWIFT_INSTALL_OBJC_HEADER = NO;
-				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
@@ -1017,15 +701,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		DE9A016C289A9A9A00E41CBB /* Build configuration list for PBXNativeTarget "JitsiMeetSDKLite" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DE9A016D289A9A9A00E41CBB /* Debug */,
-				DE9A016E289A9A9A00E41CBB /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 0BD906DC1EC0C00300C8C18E /* Project object */;

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

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

ios/sdk/src/AppInfo.m

@@ -37,10 +37,8 @@ RCT_EXPORT_MODULE();
         = [[NSBundle mainBundle] infoDictionary];
 
     // calendarEnabled
-    BOOL calendarEnabled = NO;
-#if !defined(JITSI_MEET_SDK_LITE)
-    calendarEnabled = infoDictionary[@"NSCalendarsUsageDescription"] != nil;
-#endif
+    BOOL calendarEnabled
+        = infoDictionary[@"NSCalendarsUsageDescription"] != nil;
 
     // name
     NSString *name = infoDictionary[@"CFBundleDisplayName"];
@@ -65,39 +63,19 @@ RCT_EXPORT_MODULE();
         }
     }
 
-    // SDK version
-    NSDictionary<NSString *, id> *sdkInfoDictionary
-        = [[NSBundle bundleForClass:self.class] infoDictionary];
-    NSString *sdkVersion = sdkInfoDictionary[@"CFBundleShortVersionString"];
-    if (sdkVersion == nil) {
-        sdkVersion = sdkInfoDictionary[@"CFBundleVersion"];
-        if (sdkVersion == nil) {
-            sdkVersion = @"";
-        }
-    }
-
     // build number
     NSString *buildNumber = infoDictionary[@"CFBundleVersion"];
     if (buildNumber == nil) {
         buildNumber = @"";
     }
 
-    // google services (sign in)
     BOOL isGoogleServiceEnabled = [InfoPlistUtil containsRealServiceInfoPlistInBundle:[NSBundle mainBundle]];
     
-    // lite SDK
-    BOOL isLiteSDK = NO;
-#if defined(JITSI_MEET_SDK_LITE)
-    isLiteSDK = YES;
-#endif
-
     return @{
         @"calendarEnabled": [NSNumber numberWithBool:calendarEnabled],
         @"buildNumber": buildNumber,
-        @"isLiteSDK": [NSNumber numberWithBool:isLiteSDK],
         @"name": name,
         @"sdkBundlePath": sdkBundlePath,
-        @"sdkVersion": sdkVersion,
         @"version": version,
         @"GOOGLE_SERVICES_ENABLED": [NSNumber numberWithBool:isGoogleServiceEnabled]
     };

ios/sdk/src/AudioMode.m

@@ -21,6 +21,7 @@
 #import <WebRTC/WebRTC.h>
 
 #import "JitsiAudioSession+Private.h"
+#import "LogUtils.h"
 
 
 // Audio mode
@@ -177,7 +178,7 @@ RCT_EXPORT_METHOD(setMode:(int)mode
 RCT_EXPORT_METHOD(setAudioDevice:(NSString *)device
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-    RCTLogInfo(@"[AudioMode] Selected device: %@", device);
+    DDLogInfo(@"[AudioMode] Selected device: %@", device);
     
     RTCAudioSession *session = JitsiAudioSession.rtcAudioSession;
     [session lockForConfiguration];
@@ -247,7 +248,7 @@ RCT_EXPORT_METHOD(updateDeviceList) {
 - (void)audioSessionDidChangeRoute:(RTCAudioSession *)session
                             reason:(AVAudioSessionRouteChangeReason)reason
                      previousRoute:(AVAudioSessionRouteDescription *)previousRoute {
-    RCTLogInfo(@"[AudioMode] Route changed, reason: %lu", (unsigned long)reason);
+    DDLogInfo(@"[AudioMode] Route changed, reason: %lu", (unsigned long)reason);
 
     // Update JS about the changes.
     [self notifyDevicesChanged];
@@ -274,7 +275,7 @@ RCT_EXPORT_METHOD(updateDeviceList) {
         // This is to play well with other components which could be integrated
         // into the final application.
         if (self->activeMode != kAudioModeDefault) {
-            RCTLogInfo(@"[AudioMode] Route changed, reapplying RTCAudioSession config");
+            DDLogInfo(@"[AudioMode] Route changed, reapplying RTCAudioSession config");
             RTCAudioSessionConfiguration *config = [self configForMode:self->activeMode];
             [self setConfig:config error:nil];
             if (self->forceSpeaker && !self->isSpeakerOn) {
@@ -287,7 +288,7 @@ RCT_EXPORT_METHOD(updateDeviceList) {
 }
 
 - (void)audioSession:(RTCAudioSession *)audioSession didSetActive:(BOOL)active {
-    RCTLogInfo(@"[AudioMode] Audio session didSetActive:%d", active);
+    DDLogInfo(@"[AudioMode] Audio session didSetActive:%d", active);
 }
 
 #pragma mark - Helper methods

ios/sdk/src/Info.plist

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

ios/sdk/src/JitsiMeet.m

@@ -15,8 +15,10 @@
  */
 
 #import <Intents/Intents.h>
+#import <RNGoogleSignin/RNGoogleSignin.h>
 #import <WebRTC/RTCLogging.h>
 
+#import "Dropbox.h"
 #import "JitsiMeet+Private.h"
 #import "JitsiMeetConferenceOptions+Private.h"
 #import "JitsiMeetView+Private.h"
@@ -25,11 +27,6 @@
 #import "RNSplashScreen.h"
 #import "ScheenshareEventEmiter.h"
 
-#if !defined(JITSI_MEET_SDK_LITE)
-#import <RNGoogleSignin/RNGoogleSignin.h>
-#import "Dropbox.h"
-#endif
-
 @implementation JitsiMeet {
     RCTBridgeWrapper *_bridgeWrapper;
     NSDictionary *_launchOptions;
@@ -79,9 +76,7 @@
 
     _launchOptions = [launchOptions copy];
 
-#if !defined(JITSI_MEET_SDK_LITE)
     [Dropbox setAppKey];
-#endif
 
     return YES;
 }
@@ -103,7 +98,6 @@
             openURL:(NSURL *)url
             options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
 
-#if !defined(JITSI_MEET_SDK_LITE)
     if ([Dropbox application:app openURL:url options:options]) {
         return YES;
     }
@@ -113,7 +107,6 @@
                             options:options]) {
         return YES;
     }
-#endif
 
     if (_customUrlScheme == nil || ![_customUrlScheme isEqualToString:url.scheme]) {
         return NO;

ios/sdk/src/JitsiMeetSDK-Swift.h

@@ -1,271 +0,0 @@
-// IMPORTANT!
-// This file was once auto-generated by Xcode, and this is a copy of it. If any of the following
-// classes is modified this file needs to be regenerated.
-//   - JMCallKitListener
-//   - JMCallKitProxy
-#ifndef JITSIMEETSDK_SWIFT_H
-#define JITSIMEETSDK_SWIFT_H
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wgcc-compat"
-
-#if !defined(__has_include)
-# define __has_include(x) 0
-#endif
-#if !defined(__has_attribute)
-# define __has_attribute(x) 0
-#endif
-#if !defined(__has_feature)
-# define __has_feature(x) 0
-#endif
-#if !defined(__has_warning)
-# define __has_warning(x) 0
-#endif
-
-#if __has_include(<swift/objc-prologue.h>)
-# include <swift/objc-prologue.h>
-#endif
-
-#pragma clang diagnostic ignored "-Wauto-import"
-#include <Foundation/Foundation.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <stdbool.h>
-
-#if !defined(SWIFT_TYPEDEFS)
-# define SWIFT_TYPEDEFS 1
-# if __has_include(<uchar.h>)
-#  include <uchar.h>
-# elif !defined(__cplusplus)
-typedef uint_least16_t char16_t;
-typedef uint_least32_t char32_t;
-# endif
-typedef float swift_float2  __attribute__((__ext_vector_type__(2)));
-typedef float swift_float3  __attribute__((__ext_vector_type__(3)));
-typedef float swift_float4  __attribute__((__ext_vector_type__(4)));
-typedef double swift_double2  __attribute__((__ext_vector_type__(2)));
-typedef double swift_double3  __attribute__((__ext_vector_type__(3)));
-typedef double swift_double4  __attribute__((__ext_vector_type__(4)));
-typedef int swift_int2  __attribute__((__ext_vector_type__(2)));
-typedef int swift_int3  __attribute__((__ext_vector_type__(3)));
-typedef int swift_int4  __attribute__((__ext_vector_type__(4)));
-typedef unsigned int swift_uint2  __attribute__((__ext_vector_type__(2)));
-typedef unsigned int swift_uint3  __attribute__((__ext_vector_type__(3)));
-typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
-#endif
-
-#if !defined(SWIFT_PASTE)
-# define SWIFT_PASTE_HELPER(x, y) x##y
-# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y)
-#endif
-#if !defined(SWIFT_METATYPE)
-# define SWIFT_METATYPE(X) Class
-#endif
-#if !defined(SWIFT_CLASS_PROPERTY)
-# if __has_feature(objc_class_property)
-#  define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__
-# else
-#  define SWIFT_CLASS_PROPERTY(...)
-# endif
-#endif
-
-#if __has_attribute(objc_runtime_name)
-# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X)))
-#else
-# define SWIFT_RUNTIME_NAME(X)
-#endif
-#if __has_attribute(swift_name)
-# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X)))
-#else
-# define SWIFT_COMPILE_NAME(X)
-#endif
-#if __has_attribute(objc_method_family)
-# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X)))
-#else
-# define SWIFT_METHOD_FAMILY(X)
-#endif
-#if __has_attribute(noescape)
-# define SWIFT_NOESCAPE __attribute__((noescape))
-#else
-# define SWIFT_NOESCAPE
-#endif
-#if __has_attribute(ns_consumed)
-# define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed))
-#else
-# define SWIFT_RELEASES_ARGUMENT
-#endif
-#if __has_attribute(warn_unused_result)
-# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-#else
-# define SWIFT_WARN_UNUSED_RESULT
-#endif
-#if __has_attribute(noreturn)
-# define SWIFT_NORETURN __attribute__((noreturn))
-#else
-# define SWIFT_NORETURN
-#endif
-#if !defined(SWIFT_CLASS_EXTRA)
-# define SWIFT_CLASS_EXTRA
-#endif
-#if !defined(SWIFT_PROTOCOL_EXTRA)
-# define SWIFT_PROTOCOL_EXTRA
-#endif
-#if !defined(SWIFT_ENUM_EXTRA)
-# define SWIFT_ENUM_EXTRA
-#endif
-#if !defined(SWIFT_CLASS)
-# if __has_attribute(objc_subclassing_restricted)
-#  define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA
-#  define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
-# else
-#  define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
-#  define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
-# endif
-#endif
-#if !defined(SWIFT_RESILIENT_CLASS)
-# if __has_attribute(objc_class_stub)
-#  define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub))
-#  define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME)
-# else
-#  define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME)
-#  define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)
-# endif
-#endif
-
-#if !defined(SWIFT_PROTOCOL)
-# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
-# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
-#endif
-
-#if !defined(SWIFT_EXTENSION)
-# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__)
-#endif
-
-#if !defined(OBJC_DESIGNATED_INITIALIZER)
-# if __has_attribute(objc_designated_initializer)
-#  define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer))
-# else
-#  define OBJC_DESIGNATED_INITIALIZER
-# endif
-#endif
-#if !defined(SWIFT_ENUM_ATTR)
-# if defined(__has_attribute) && __has_attribute(enum_extensibility)
-#  define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility)))
-# else
-#  define SWIFT_ENUM_ATTR(_extensibility)
-# endif
-#endif
-#if !defined(SWIFT_ENUM)
-# define SWIFT_ENUM(_type, _name, _extensibility) enum _name : _type _name; enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
-# if __has_feature(generalized_swift_name)
-#  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
-# else
-#  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) SWIFT_ENUM(_type, _name, _extensibility)
-# endif
-#endif
-#if !defined(SWIFT_UNAVAILABLE)
-# define SWIFT_UNAVAILABLE __attribute__((unavailable))
-#endif
-#if !defined(SWIFT_UNAVAILABLE_MSG)
-# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg)))
-#endif
-#if !defined(SWIFT_AVAILABILITY)
-# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
-#endif
-#if !defined(SWIFT_WEAK_IMPORT)
-# define SWIFT_WEAK_IMPORT __attribute__((weak_import))
-#endif
-#if !defined(SWIFT_DEPRECATED)
-# define SWIFT_DEPRECATED __attribute__((deprecated))
-#endif
-#if !defined(SWIFT_DEPRECATED_MSG)
-# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__)))
-#endif
-#if __has_feature(attribute_diagnose_if_objc)
-# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning")))
-#else
-# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
-#endif
-#if !defined(IBSegueAction)
-# define IBSegueAction
-#endif
-#if !defined(SWIFT_EXTERN)
-# if defined(__cplusplus)
-#  define SWIFT_EXTERN extern "C"
-# else
-#  define SWIFT_EXTERN extern
-# endif
-#endif
-#if __has_feature(modules)
-#if __has_warning("-Watimport-in-framework-header")
-#pragma clang diagnostic ignored "-Watimport-in-framework-header"
-#endif
-@import CallKit;
-@import ObjectiveC;
-#endif
-
-#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
-#pragma clang diagnostic ignored "-Wduplicate-method-arg"
-#if __has_warning("-Wpragma-clang-attribute")
-# pragma clang diagnostic ignored "-Wpragma-clang-attribute"
-#endif
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wnullability"
-
-#if __has_attribute(external_source_symbol)
-# pragma push_macro("any")
-# undef any
-# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="JitsiMeetSDK",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol))
-# pragma pop_macro("any")
-#endif
-
-
-
-@class NSUUID;
-@class AVAudioSession;
-@class CXAction;
-
-SWIFT_PROTOCOL("_TtP12JitsiMeetSDK17JMCallKitListener_")
-@protocol JMCallKitListener <NSObject>
-@optional
-- (void)providerDidReset;
-- (void)performAnswerCallWithUUID:(NSUUID * _Nonnull)UUID;
-- (void)performEndCallWithUUID:(NSUUID * _Nonnull)UUID;
-- (void)performSetMutedCallWithUUID:(NSUUID * _Nonnull)UUID isMuted:(BOOL)isMuted;
-- (void)performStartCallWithUUID:(NSUUID * _Nonnull)UUID isVideo:(BOOL)isVideo;
-- (void)providerDidActivateAudioSessionWithSession:(AVAudioSession * _Nonnull)session;
-- (void)providerDidDeactivateAudioSessionWithSession:(AVAudioSession * _Nonnull)session;
-- (void)providerTimedOutPerformingActionWithAction:(CXAction * _Nonnull)action;
-@end
-
-@class NSString;
-@class NSData;
-@class NSDate;
-@class CXTransaction;
-
-SWIFT_CLASS("_TtC12JitsiMeetSDK14JMCallKitProxy")
-@interface JMCallKitProxy : NSObject
-- (nonnull instancetype)init SWIFT_UNAVAILABLE;
-+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
-/// Enables the proxy in between CallKit and the consumers of the SDK.
-/// Defaults to disabled. Set to true when you want to use CallKit.
-SWIFT_CLASS_PROPERTY(@property (nonatomic, class) BOOL enabled;)
-+ (BOOL)enabled SWIFT_WARN_UNUSED_RESULT;
-+ (void)setEnabled:(BOOL)value;
-+ (void)configureProviderWithLocalizedName:(NSString * _Nonnull)localizedName ringtoneSound:(NSString * _Nullable)ringtoneSound iconTemplateImageData:(NSData * _Nullable)iconTemplateImageData;
-+ (BOOL)isProviderConfigured SWIFT_WARN_UNUSED_RESULT;
-+ (void)addListener:(id <JMCallKitListener> _Nonnull)listener;
-+ (void)removeListener:(id <JMCallKitListener> _Nonnull)listener;
-+ (BOOL)hasActiveCallForUUID:(NSString * _Nonnull)callUUID SWIFT_WARN_UNUSED_RESULT;
-+ (void)reportNewIncomingCallWithUUID:(NSUUID * _Nonnull)UUID handle:(NSString * _Nullable)handle displayName:(NSString * _Nullable)displayName hasVideo:(BOOL)hasVideo completion:(void (^ _Nonnull)(NSError * _Nullable))completion;
-+ (void)reportCallUpdateWith:(NSUUID * _Nonnull)UUID handle:(NSString * _Nullable)handle displayName:(NSString * _Nullable)displayName hasVideo:(BOOL)hasVideo;
-+ (void)reportCallWith:(NSUUID * _Nonnull)UUID endedAt:(NSDate * _Nullable)dateEnded reason:(CXCallEndedReason)endedReason;
-+ (void)reportOutgoingCallWith:(NSUUID * _Nonnull)UUID startedConnectingAt:(NSDate * _Nullable)dateStartedConnecting;
-+ (void)reportOutgoingCallWith:(NSUUID * _Nonnull)UUID connectedAt:(NSDate * _Nullable)dateConnected;
-+ (void)request:(CXTransaction * _Nonnull)transaction completion:(void (^ _Nonnull)(NSError * _Nullable))completion;
-@end
-
-#if __has_attribute(external_source_symbol)
-# pragma clang attribute pop
-#endif
-#pragma clang diagnostic pop
-#endif

ios/sdk/src/Lite-Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>

ios/sdk/src/callkit/CallKit.m

@@ -26,11 +26,12 @@
 #import <React/RCTBridge.h>
 #import <React/RCTEventEmitter.h>
 #import <React/RCTUtils.h>
-#import <React/RCTLog.h>
 #import <WebRTC/WebRTC.h>
 
-#import "../JitsiAudioSession.h"
-#import "../JitsiMeetSDK-Swift.h"
+#import <JitsiMeetSDK/JitsiMeetSDK-Swift.h>
+
+#import "../LogUtils.h"
+#import "JitsiAudioSession.h"
 
 
 // The events emitted/supported by RNCallKit:
@@ -72,7 +73,7 @@ RCT_EXPORT_MODULE();
 RCT_EXPORT_METHOD(endCall:(NSString *)callUUID
                   resolve:(RCTPromiseResolveBlock)resolve
                    reject:(RCTPromiseRejectBlock)reject) {
-    RCTLogInfo(@"[RNCallKit][endCall] callUUID = %@", callUUID);
+    DDLogInfo(@"[RNCallKit][endCall] callUUID = %@", callUUID);
 
     NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
 
@@ -93,7 +94,7 @@ RCT_EXPORT_METHOD(setMuted:(NSString *)callUUID
                      muted:(BOOL)muted
                    resolve:(RCTPromiseResolveBlock)resolve
                     reject:(RCTPromiseRejectBlock)reject) {
-    RCTLogInfo(@"[RNCallKit][setMuted] callUUID = %@", callUUID);
+    DDLogInfo(@"[RNCallKit][setMuted] callUUID = %@", callUUID);
 
     NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
 
@@ -110,7 +111,7 @@ RCT_EXPORT_METHOD(setMuted:(NSString *)callUUID
 }
 
 RCT_EXPORT_METHOD(setProviderConfiguration:(NSDictionary *)dictionary) {
-    RCTLogInfo(@"[RNCallKit][setProviderConfiguration:] dictionary = %@", dictionary);
+    DDLogInfo(@"[RNCallKit][setProviderConfiguration:] dictionary = %@", dictionary);
 
     if (![JMCallKitProxy isProviderConfigured]) {
         JMCallKitProxy.enabled = true;
@@ -127,7 +128,7 @@ RCT_EXPORT_METHOD(startCall:(NSString *)callUUID
                       video:(BOOL)video
                     resolve:(RCTPromiseResolveBlock)resolve
                      reject:(RCTPromiseRejectBlock)reject) {
-    RCTLogInfo(@"[RNCallKit][startCall] callUUID = %@", callUUID);
+    DDLogInfo(@"[RNCallKit][startCall] callUUID = %@", callUUID);
 
     NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
 
@@ -191,7 +192,7 @@ RCT_EXPORT_METHOD(updateCall:(NSString *)callUUID
                      options:(NSDictionary *)options
                      resolve:(RCTPromiseResolveBlock)resolve
                       reject:(RCTPromiseRejectBlock)reject) {
-    RCTLogInfo(@"[RNCallKit][updateCall] callUUID = %@ options = %@", callUUID, options);
+    DDLogInfo(@"[RNCallKit][updateCall] callUUID = %@ options = %@", callUUID, options);
 
     NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
 
@@ -214,7 +215,7 @@ RCT_EXPORT_METHOD(updateCall:(NSString *)callUUID
 #pragma mark - Helper methods
 
 - (void)configureProviderFromDictionary:(NSDictionary* )dictionary {
-    RCTLogInfo(@"[RNCallKit][providerConfigurationFromDictionary: %@]", dictionary);
+    DDLogInfo(@"[RNCallKit][providerConfigurationFromDictionary: %@]", dictionary);
 
     if (!dictionary) {
         dictionary = @{};
@@ -258,12 +259,12 @@ RCT_EXPORT_METHOD(updateCall:(NSString *)callUUID
 - (void)requestTransaction:(CXTransaction *)transaction
                    resolve:(RCTPromiseResolveBlock)resolve
                     reject:(RCTPromiseRejectBlock)reject {
-    RCTLogInfo(@"[RNCallKit][requestTransaction] transaction = %@", transaction);
+    DDLogInfo(@"[RNCallKit][requestTransaction] transaction = %@", transaction);
 
     [JMCallKitProxy request:transaction
                  completion:^(NSError * _Nullable error) {
         if (error) {
-            RCTLogError(@"[RNCallKit][requestTransaction] Error requesting transaction (%@): (%@)", transaction.actions, error);
+            DDLogError(@"[RNCallKit][requestTransaction] Error requesting transaction (%@): (%@)", transaction.actions, error);
             reject(nil, @"Error processing CallKit transaction", error);
         } else {
             resolve(nil);
@@ -275,14 +276,14 @@ RCT_EXPORT_METHOD(updateCall:(NSString *)callUUID
 
 // Called when the provider has been reset. We should terminate all calls.
 - (void)providerDidReset {
-    RCTLogInfo(@"[RNCallKit][CXProviderDelegate][providerDidReset:]");
+    DDLogInfo(@"[RNCallKit][CXProviderDelegate][providerDidReset:]");
 
     [self sendEventWithName:RNCallKitProviderDidReset body:nil];
 }
 
 // Answering incoming call
 - (void) performAnswerCallWithUUID:(NSUUID *)UUID {
-    RCTLogInfo(@"[RNCallKit][CXProviderDelegate][provider:performAnswerCallAction:]");
+    DDLogInfo(@"[RNCallKit][CXProviderDelegate][provider:performAnswerCallAction:]");
 
     [self sendEventWithName:RNCallKitPerformAnswerCallAction
                        body:@{ @"callUUID": UUID.UUIDString }];
@@ -290,7 +291,7 @@ RCT_EXPORT_METHOD(updateCall:(NSString *)callUUID
 
 // Call ended, user request
 - (void) performEndCallWithUUID:(NSUUID *)UUID {
-    RCTLogInfo(@"[RNCallKit][CXProviderDelegate][provider:performEndCallAction:]");
+    DDLogInfo(@"[RNCallKit][CXProviderDelegate][provider:performEndCallAction:]");
 
     [self sendEventWithName:RNCallKitPerformEndCallAction
                        body:@{ @"callUUID": UUID.UUIDString }];
@@ -299,7 +300,7 @@ RCT_EXPORT_METHOD(updateCall:(NSString *)callUUID
 // Handle audio mute from CallKit view
 - (void) performSetMutedCallWithUUID:(NSUUID *)UUID
                              isMuted:(BOOL)isMuted {
-    RCTLogInfo(@"[RNCallKit][CXProviderDelegate][provider:performSetMutedCallAction:]");
+    DDLogInfo(@"[RNCallKit][CXProviderDelegate][provider:performSetMutedCallAction:]");
 
     [self sendEventWithName:RNCallKitPerformSetMutedCallAction
                        body:@{
@@ -311,26 +312,26 @@ RCT_EXPORT_METHOD(updateCall:(NSString *)callUUID
 // Starting outgoing call
 - (void) performStartCallWithUUID:(NSUUID *)UUID
                           isVideo:(BOOL)isVideo {
-    RCTLogInfo(@"[RNCallKit][CXProviderDelegate][provider:performStartCallAction:]");
+    DDLogInfo(@"[RNCallKit][CXProviderDelegate][provider:performStartCallAction:]");
 
     [JMCallKitProxy reportOutgoingCallWith:UUID
                        startedConnectingAt:nil];
 }
 
 - (void) providerDidActivateAudioSessionWithSession:(AVAudioSession *)session {
-    RCTLogInfo(@"[RNCallKit][CXProviderDelegate][provider:didActivateAudioSession:]");
+    DDLogInfo(@"[RNCallKit][CXProviderDelegate][provider:didActivateAudioSession:]");
 
     [JitsiAudioSession activateWithAudioSession:session];
 }
 
 - (void) providerDidDeactivateAudioSessionWithSession:(AVAudioSession *)session {
-    RCTLogInfo(@"[RNCallKit][CXProviderDelegate][provider:didDeactivateAudioSession:]");
+    DDLogInfo(@"[RNCallKit][CXProviderDelegate][provider:didDeactivateAudioSession:]");
 
     [JitsiAudioSession deactivateWithAudioSession:session];
 }
 
 - (void) providerTimedOutPerformingActionWithAction:(CXAction *)action {
-    RCTLogWarn(@"[RNCallKit][CXProviderDelegate][provider:timedOutPerformingAction:]");
+    DDLogWarn(@"[RNCallKit][CXProviderDelegate][provider:timedOutPerformingAction:]");
 }
 
 

lang/languages-af.json

@@ -22,7 +22,6 @@
     "sl": "Sloweens",
     "sv": "Sweeds",
     "tr": "Turks",
-    "uk": "Oekraïens",
     "vi": "Viëtnamees",
     "zhCN": "Sjinees (Sjina)"
 }

lang/languages-be.json

@@ -28,7 +28,6 @@
     "ru": "Расійская",
     "sv": "Шведская",
     "tr": "Турэцкая",
-    "uk": "Украінская",
     "vi": "В'етнамская",
     "zhCN": "Кітайская (Кітай)",
     "zhTW": "Кітайская (Тайвань)"

lang/languages-bg.json

@@ -26,7 +26,6 @@
     "ru": "Руски",
     "sv": "Шведски",
     "tr": "Турски",
-    "uk": "Украински",
     "vi": "Виетнамски",
     "zhCN": "Китайски (Китай)",
     "zhTW": "Тайвански"

lang/languages-da.json

@@ -27,7 +27,6 @@
     "ru": "Russisk",
     "sv": "Svensk",
     "tr": "Tyrkisk",
-    "uk": "Ukrainsk",
     "vi": "Vietnamesisk",
     "zhCN": "Kinesisk (China)",
     "zhTW": "Kinesisk (Taiwan)"

lang/languages-de.json

@@ -17,7 +17,6 @@
     "fr": "Französisch",
     "frCA": "Französisch (Kanada)",
     "hr": "Kroatisch",
-    "hsb": "Obersorbisch",
     "hu": "Ungarisch",
     "hy": "Armenisch",
     "it": "Italienisch",
@@ -34,7 +33,6 @@
     "sr": "Serbish",
     "sv": "Schwedisch",
     "tr": "Türkisch",
-    "uk": "Ukrainisch",
     "vi": "Vietnamesisch",
     "zhCN": "Chinesisch (China)",
     "zhTW": "Chinesisch (Taiwan)"

lang/languages-enGB.json

@@ -17,7 +17,6 @@
     "fr": "French",
     "frCA": "French (Canadian)",
     "hr": "Croatian",
-    "hsb": "Upper Sorbian",
     "hu": "Hungarian",
     "hy": "Armenian",
     "it": "Italian",
@@ -34,7 +33,6 @@
     "sr": "Serbian",
     "sv": "Swedish",
     "tr": "Turkish",
-    "uk": "Ukrainian",
     "vi": "Vietnamese",
     "zhCN": "Chinese (China)",
     "zhTW": "Chinese (Taiwan)"

lang/languages-eo.json

@@ -22,7 +22,6 @@
     "sl": "Slovena",
     "sv": "Sveda",
     "tr": "Turka",
-    "uk": "Ukraina",
     "vi": "Vjetnama",
     "zhCN": "Ĉina (Ĉinuja)"
 }

lang/languages-es.json

@@ -30,7 +30,6 @@
     "sk": "Eslovaco",
     "sv": "Sueco",
     "tr": "Turco",
-    "uk": "Ucraniano",
     "vi": "Vietnamita",
     "zhCN": "Chino (China)",
     "zhTW": "Chino (Taiwán)"

lang/languages-esUS.json

@@ -28,7 +28,6 @@
     "sk": "Eslovaco",
     "sv": "Sueco",
     "tr": "Turco",
-    "uk": "Ucraniano",
     "vi": "Vietnamita",
     "zhCN": "Chino (China)",
     "zhTW": "Chino (Taiwan)"

lang/languages-et.json

@@ -27,7 +27,6 @@
     "ru": "Vene keel",
     "sv": "Roosi keel",
     "tr": "Türgi keel",
-    "uk": "Ukraina keel",
     "vi": "Vietnami keel",
     "zhCN": "Hiina keel (Hiina)",
     "zhTW": "Hiina keel (Tai)"

lang/languages-fi.json

@@ -32,7 +32,6 @@
     "sl": "",
     "sv": "ruotsi",
     "tr": "turkki",
-    "uk": "ukraina",
     "vi": "vietnam",
     "zhCN": "kiina (Kiina)",
     "zhTW": "kiina (Taiwan)"

lang/languages-fr.json

@@ -29,7 +29,6 @@
     "sk": "Slovaque",
     "sv": "Suédois",
     "tr": "Turc",
-    "uk": "Ukrainien",
     "vi": "Vietnamien",
     "zhCN": "Chinois (Chine)",
     "zhTW": "Chinois (Taiwan)"

lang/languages-frCA.json

@@ -29,7 +29,6 @@
     "sk": "Slovaque",
     "sv": "Suédois",
     "tr": "Turc",
-    "uk": "Ukrainien",
     "vi": "Vietnamien",
     "zhCN": "Chinois (Chine)",
     "zhTW": "Chinois (Taiwan)"

lang/languages-hr.json

@@ -1,56 +1,28 @@
 {
     "af": "Afrikanski",
-    "ar": "Arapski",
+    "az": "Ažerbejdžanski",
     "bg": "Bugarski",
-    "ca": "Katalanski",
     "cs": "Češki",
-    "da": "Danski",
     "de": "Njemački",
     "el": "Grčki",
     "en": "Engleski",
-    "enGB": "Engleski (Ujedinjeno Kraljevstvo)",
     "eo": "Esperanto",
     "es": "Španjolski",
-    "esUS": "Španjolski (Latinska Amerika)",
-    "et": "Estonski",
-    "eu": "Baskijski",
-    "fa": "Perzijski",
-    "fi": "Finski",
     "fr": "Francuski",
-    "frCA": "Francuski (Canada)",
-    "he": "Hebrejski",
-    "hi": "Hindski",
-    "hr": "Hrvatski",
-    "hsb": "Gornjolužičkosrpski",
-    "hu": "Mađarski",
     "hy": "Armenski",
-    "id": "Indonezijski",
     "it": "Talijanski",
     "ja": "Japanski",
     "ko": "Korejski",
-    "lt": "Litvanski",
-    "lv": "Latvijski",
-    "ml": "Malayalam",
-    "mr": "Marathi",
     "nb": "Norveški Bokmal",
-    "nl": "Nizozemski",
     "oc": "Okcitanski",
     "pl": "Poljski",
-    "pt": "Portugalski",
     "ptBR": "Portugalski (Brazil)",
-    "ro": "Rumunjski",
     "ru": "Ruski",
-    "sc": "Sardijski",
     "sk": "Slovački",
     "sl": "Slovenski",
-    "sq": "Albanski",
     "sr": "Srpski",
     "sv": "Švedski",
-    "te": "Teluški",
-    "th": "Tajski",
     "tr": "Turski",
-    "uk": "Ukrajinski",
     "vi": "Vijetnamski",
-    "zhCN": "Kineski (Kina)",
-    "zhTW": "Kineski (Taiwan)"
+    "zhCN": "Kineski (Kina)"
 }

lang/languages-hsb.json

@@ -1,47 +0,0 @@
-{
-    "ar": "arabšćina",
-    "bg": "bołharšćina",
-    "cs": "čěšćina",
-    "da": "danšćina",
-    "de": "němčina",
-    "el": "grjekšćina",
-    "en": "jendźelšćina",
-    "enGB": "jendźelšćina (Wulka Britaniska)",
-    "eo": "esperanto",
-    "es": "španišćina",
-    "esUS": "španišćina (Łaćonska)",
-    "et": "estišćina",
-    "eu": "baskišćina",
-    "fa": "persišćina",
-    "fi": "finšćina",
-    "fr": "francošćina",
-    "frCA": "francošćina (Kanada)",
-    "he": "hebrejšćina",
-    "hi": "hindišćina",
-    "hr": "chorwatšćina",
-    "hsb": "hornjoserbšćina",
-    "hu": "madźaršćina",
-    "hy": "armenšćina",
-    "id": "indonešćina",
-    "it": "italšćina",
-    "ja": "japanšćina",
-    "ko": "korejšćina",
-    "lt": "litawšćina",
-    "lv": "letišćina",
-    "nl": "nižozemšćina",
-    "pl": "pólšćina",
-    "pt": "portugalšćina",
-    "ptBR": "portugalšćina (Brazilska)",
-    "ro": "rumunšćina",
-    "ru": "rušćina",
-    "sk": "słowakšćina",
-    "sl": "słowjenšćina",
-    "sq": "albanšćina",
-    "sr": "serbišćina",
-    "sv": "šwedšćina",
-    "tr": "turkowšćina",
-    "uk": "ukrainšćina",
-    "vi": "vietnamšćina",
-    "zhCN": "chinšćina (China)",
-    "zhTW": "chinšćina (Taiwan)"
-}

lang/languages-hu.json

@@ -29,7 +29,6 @@
     "sk": "Szlovákul",
     "sv": "Svéd",
     "tr": "Török",
-    "uk": "Ukrán",
     "vi": "Vietnámi",
     "zhCN": "Kínai (Kína)",
     "zhTW": "Kínai (Tajvan)"

lang/languages-hy.json

@@ -22,7 +22,6 @@
     "sl": "Սլովեներեն ",
     "sv": "Շվեդերեն ",
     "tr": "Թուրքերեն",
-    "uk": "Ուկրաիներեն",
     "vi": "",
     "zhCN": "Չիներեն"
 }

lang/languages-id.json

@@ -33,7 +33,6 @@
     "sk": "Bahasa Slovakia",
     "sv": "Bahasa Swedia",
     "tr": "Bahasa Turki",
-    "uk": "Bahasa Ukraina",
     "vi": "Bahasa Vietnam",
     "zhCN": "Bahasa Mandarin",
     "zhTW": "Bahasa Mandarin - Taiwan"

lang/languages-is.json

@@ -28,7 +28,6 @@
     "ru": "Rússneska",
     "sv": "Sænska",
     "tr": "Tyrkneska",
-    "uk": "Úkraínska",
     "vi": "Víetnamska",
     "zhCN": "Kínverska (Kína)",
     "zhTW": "Kínverska (Taívan)"

lang/languages-lt.json

@@ -29,7 +29,6 @@
     "ru": "Rusų",
     "sv": "Švedų",
     "tr": "Turkų",
-    "uk": "Ukrainiečių",
     "vi": "Vietnamiečių",
     "zhCN": "Kinų (China)",
     "zhTW": "Kinų (Taivanas)"

lang/languages-lv.json

@@ -28,7 +28,6 @@
     "ru": "krievu",
     "sv": "zviedru",
     "tr": "turku",
-    "uk": "ukraiņu",
     "vi": "vjetnamiešu",
     "zhCN": "ķīniešu (Ķīna)",
     "zhTW": "ķīniešu (Taivana)"

lang/languages-nb.json

@@ -26,7 +26,6 @@
     "sl": "",
     "sv": "Svensk",
     "tr": "Tyrkisk",
-    "uk": "Ukrainsk",
     "vi": "Vietnamesisk",
     "zhCN": ""
 }

lang/languages-nl.json

@@ -32,7 +32,6 @@
     "sl": "Sloveens",
     "sv": "Zweeds",
     "tr": "Turks",
-    "uk": "Oekraïens",
     "vi": "Vietnamees",
     "zhCN": "Chinees (China)",
     "zhTW": "Chinees (Taiwan)"

lang/languages-ptBR.json

@@ -26,7 +26,6 @@
     "ru": "Russo",
     "sv": "Sueco",
     "tr": "Turco",
-    "uk": "Ucraniano",
     "vi": "Vietnamita",
     "zhCN": "Chinês (China)",
     "zhTW": "Chinês (Taiwan)"

lang/languages-ru.json

@@ -29,7 +29,6 @@
     "sr": "Сербский",
     "sv": "Шведский",
     "tr": "Турецкий",
-    "uk": "Украинский",
     "vi": "Вьетнамский",
     "zhCN": "Китайский (Китай)",
     "zhTW": "Китайский (Тайвань)"

lang/languages-sc.json

@@ -28,7 +28,6 @@
     "sc": "Sardu",
     "sv": "Isvedesu",
     "tr": "Turcu",
-    "uk": "Ucràinu",
     "vi": "Vietnamita",
     "zhCN": "Tzinesu (Tzina)",
     "zhTW": "Tzinesu (Taiwan)"

lang/languages-sk.json

@@ -29,7 +29,6 @@
     "sk": "Slovenčina",
     "sv": "Švédčina",
     "tr": "Turečtina",
-    "uk": "Ukrajinčina",
     "vi": "Vietnamčina",
     "zhCN": "Čínština (Čína)",
     "zhTW": "Čínština (Taiwan)"

lang/languages-sl.json

@@ -22,7 +22,6 @@
     "sl": "Slovenščina",
     "sv": "Švedščina",
     "tr": "Turščina",
-    "uk": "Ukrajinščina",
     "vi": "Vietnamščina",
     "zhCN": "kitajščina (poenostavljena)"
 }

lang/languages-sr.json

@@ -33,7 +33,6 @@
     "sr": "Српски",
     "sv": "Шведски",
     "tr": "Турски",
-    "uk": "Украјински",
     "vi": "Вијетнамски",
     "zhCN": "Кинески (Кина)",
     "zhTW": "Кинески (Тајван)"

lang/languages-sv.json

@@ -32,7 +32,6 @@
     "sl": "Slovenska",
     "sv": "Svenska",
     "tr": "Turkiska",
-    "uk": "Ukrainska",
     "vi": "Vietnamesiska",
     "zhCN": "Kinesiska (Kina)",
     "zhTW": "Kinesiska (Taiwan)"

lang/languages-tr.json

@@ -32,7 +32,6 @@
     "sl": "Slovence",
     "sv": "Isveççe",
     "tr": "Türkçe",
-    "uk": "Ukraynaca",
     "vi": "Vietnamca",
     "zhCN": "Çince (Çin)",
     "zhTW": "Çince (Tayvan)"

lang/languages-uk.json

@@ -1,6 +1,5 @@
 {
     "af": "Африкаанс",
-    "ar": "Арабська",
     "bg": "Болгарська",
     "ca": "Каталонська",
     "cs": "Чеська",
@@ -8,48 +7,27 @@
     "de": "Німецька",
     "el": "Грецька",
     "en": "Англійська",
-    "enGB": "Англійська (Сполучене Королівство)",
+    "enGB": "Англійська (Велика Британія)",
     "eo": "Есперанто",
     "es": "Іспанська",
     "esUS": "Іспанська (Латинська Америка)",
     "et": "Естонська",
-    "eu": "Баскська",
-    "fa": "Перська",
     "fi": "Фінська",
     "fr": "Французька",
     "frCA": "Французька (Канада)",
-    "he": "Іврит",
-    "hi": "Гінді",
     "hr": "Хорватська",
-    "hsb": "Верхньолужицька",
     "hu": "Угорська",
     "hy": "Вірменська",
-    "id": "Індонезійська",
     "it": "Італійська",
     "ja": "Японська",
-    "kab": "Кабільська",
     "ko": "Корейська",
-    "lt": "Литовська",
-    "lv": "Латвійська",
-    "ml": "Малаялам",
-    "mr": "Маратхі",
     "nl": "Голландська",
     "oc": "Окситанська",
     "pl": "Польська",
-    "pt": "Португальська",
     "ptBR": "Португальська (Бразилія)",
-    "ro": "Румунська",
     "ru": "Російська",
-    "sc": "Сардинська",
-    "sk": "Словацька",
-    "sl": "Словенська",
-    "sq": "Албанська",
-    "sr": "Сербська",
     "sv": "Шведська",
-    "te": "Телуґу",
-    "th": "Тайська",
     "tr": "Турецька",
-    "uk": "Українська",
     "vi": "В'єтнамська",
     "zhCN": "Китайська (Китай)",
     "zhTW": "Китайська (Тайвань)"

lang/languages.json

@@ -21,7 +21,6 @@
     "he": "Hebrew",
     "hi": "Hindi",
     "hr": "Croatian",
-    "hsb": "Upper Sorbian",
     "hu": "Hungarian",
     "hy": "Armenian",
     "id": "Indonesian",

lang/main-ar.json

@@ -11,6 +11,7 @@
         "defaultEmail": "بريدك الافتراضي",
         "disabled": "لا يمكنك دعوة أحد.",
         "failedToAdd": "فشل إضافة مشاركين",
+        "footerText": "الاتصال لدعوة الغير مُعطَّل.",
         "googleEmail": "بريد غوغل",
         "inviteMoreHeader": "أنت بمفردك في هذا المُلتقى",
         "inviteMoreMailSubject": "ضم {{appName}} للمُلتقى",
@@ -78,6 +79,7 @@
     },
     "carmode": {
         "actions": {
+            "leaveMeeting": "اترك الاجتماع",
             "selectSoundDevice": "حدد جهاز الصوت"
         },
         "labels": {
@@ -96,7 +98,6 @@
         "messageAccessibleTitleMe": "أنا أقول:",
         "messageTo": "أرسل رسالة خاصة إلى {{recipient}}",
         "messagebox": "اكتب رسالة",
-        "newMessages": "رسائل جديدة",
         "nickname": {
             "popover": "اختر لقبًا",
             "title": "اكتب لقبًا لاعتماده في المحادثة",
@@ -146,6 +147,7 @@
         "bridgeCount": "عدد المخدِّمات: ",
         "codecs": "المرماز (A/V): ",
         "connectedTo": "وصل إلى:",
+        "e2e_rtt": "E2E RTT:",
         "framerate": "مُعدَّل الإطارات:",
         "less": "اخف",
         "localaddress": "العنوان المحلي:",
@@ -197,8 +199,8 @@
     "deviceError": {
         "cameraError": "فشل الوصول إلى كاميرتك",
         "cameraPermission": "خطأ في تحصيل إذن استخدام كاميرتك",
-        "microphoneError": "فشل الوصول إلى المايكروفون",
-        "microphonePermission": "خطأ في تحصيل إذن استخدام المايكروفون"
+        "microphoneError": "فشل الوصول إلى مجهارك (المايكروفون)",
+        "microphonePermission": "خطأ في تحصيل إذن استخدام المجهار (المايكروفون)"
     },
     "deviceSelection": {
         "noPermission": "لم يُمنَح الإذن",
@@ -284,6 +286,7 @@
         "linkMeetingTitle": "ربط المُلتقى بـ Salesforce",
         "liveStreaming": "البث المباشر الحي",
         "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "غير ممكن أثناء التسجيل",
+        "liveStreamingDisabledTooltip": "بدء بثٍ حيٍّ مُعطَّل",
         "localUserControls": "ضوابط المستخدم المحلي",
         "lockMessage": "فشل جعل المؤتمر مغلقًا.",
         "lockRoom": "أضف المُلتقى $t(lockRoomPasswordUppercase)",
@@ -293,11 +296,11 @@
         "logoutTitle": "الخروج",
         "maxUsersLimitReached": "وصل عدد المشاركين إلى الحد الأقصى. المؤتمر مكتمل الحضور. اتصل رجاءً براعي المؤتمر أو جرب مرة أخرى لاحقًا.",
         "maxUsersLimitReachedTitle": "وصل عدد المشاركين إلى الحد الأقصى",
-        "micConstraintFailedError": "لا يوافق المايكروفون لديك بعض القيود المطلوبة.",
-        "micNotFoundError": "لم يُعثَر على أي مايكروفون",
-        "micNotSendingData": "اذهب إلى إعدادات حاسوبك لإلغاء كتم المايكروفون وضبط مستواه",
-        "micNotSendingDataTitle": "كتم ضبط الإعدادات لديك المايكروفون",
-        "micPermissionDeniedError": "لم تعط إذن استعمال المايكروفون الخاص بك. ما يزال بإمكانك الإنضمام إلى المؤتمر ولكن دون أن يسمعك الآخرون. جرب استعمال زر الكاميرا في شريط العنوان لإصلاح هذه المشكلة.",
+        "micConstraintFailedError": "لا يوافق المجهار (المايكروفون) لديك بعض القيود المطلوبة.",
+        "micNotFoundError": "لم يُعثَر على أي مجهار (مايكروفون)",
+        "micNotSendingData": "اذهب إلى إعدادات حاسوبك لإلغاء كتم المجهار (المايكروفون) وضبط مستواه",
+        "micNotSendingDataTitle": "كتم ضبط الإعدادات لديك المجهار (المايكروفون)",
+        "micPermissionDeniedError": "لم تعط إذن استعمال المجهار (المايكروفون) الخاص بك. ما يزال بإمكانك الإنضمام إلى المؤتمر ولكن دون أن يسمعك الآخرون. جرب استعمال زر الكاميرا في شريط العنوان لإصلاح هذه المشكلة.",
         "micTimeoutError": "تعذر بدء مصدر الصوت. انقضت المهلة!",
         "micUnknownError": "لا يمكن استخدام الميكروفون لسبب غير معروف.",
         "moderationAudioLabel": "السماح للحاضرين بإعادة الصوت بأنفسهم",
@@ -338,6 +341,7 @@
         "recentlyUsedObjects": "الأشياء المستخدمة مؤخرًا",
         "recording": "قيد التسجيل",
         "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "ليس بالإمكان ما دمت قيد البث المباشر",
+        "recordingDisabledTooltip": "عملية التسجيل معطلة.",
         "rejoinNow": "انضم مجدَّدًا الآن",
         "remoteControlAllowedMessage": "قبل {{user}} طلب إمكانية التحكم البعيد!",
         "remoteControlDeniedMessage": "رفض {{user}} طلب إمكانية التحكم البعيد!",
@@ -503,7 +507,7 @@
         "giphyMenu": "تبديل قائمة GIPHY",
         "keyboardShortcuts": "اختصارات لوحة المفاتيح",
         "localRecording": "اظهِر أو اخفِ التحكم بالتسجيل المحلي",
-        "mute": "اكتم أو ألغ كتم المايكروفون الخاص بك",
+        "mute": "اكتم أو ألغ كتم المجهار (المايكروفون) الخاص بك",
         "pushToTalk": "اضغط للتحدث",
         "raiseHand": "ارفع/اخفض يدك",
         "showSpeakerStats": "اظهر حالة مكبر الصوت",
@@ -514,10 +518,6 @@
         "toggleShortcuts": "أظهِر/اخفِ اختصارات لوحة المفاتيح",
         "videoMute": "ابدأ/أوقف كاميرتك"
     },
-    "largeVideo": {
-        "screenIsShared": "أنت تشارك شاشتك",
-        "showMeWhatImSharing": "أرني ما أشاركه"
-    },
     "liveStreaming": {
         "busy": "نعمل على تحرير موارد البث. حاول مرة أخرى رجاءً بعض بضعة دقائق.",
         "busyTitle": "جميع من يبث الفيديو مشغولون حاليًا",
@@ -647,7 +647,7 @@
         "focusFail": "إنَّ {{component}} غير متاح. ستعاد المحاولة مرة أخرى خلال {{ms}} ثانية.",
         "gifsMenu": "GIPHY",
         "groupTitle": "إشعارات",
-        "hostAskedUnmute": "يريدك مدير اللقاء أن تتحدث.",
+        "hostAskedUnmute": "The moderator would like you to speak",
         "invitedOneMember": "دُعِي {{name}}",
         "invitedThreePlusMembers": "دُعِي {{name}} وعدد {{count}} آخرين",
         "invitedTwoMembers": "دُعِي {{first}} و {{second}}",
@@ -683,10 +683,6 @@
         "newDeviceAction": "استعمل",
         "newDeviceAudioTitle": "اكتُشفَ جهاز صوت جديد",
         "newDeviceCameraTitle": "اكتُشفَت كاميرا جديدة",
-        "noiseSuppressionDesktopAudioDescription": "لا يمكن تمكين منع الضوضاء أثناء مشاركة صوت سطح المكتب ، يرجى تعطيله والمحاولة مرة أخرى.",
-        "noiseSuppressionFailedTitle": "فشل في بدء قمع الضوضاء",
-        "noiseSuppressionNoTrackDescription": "يرجى إعادة صوت الميكروفون أولاً.",
-        "noiseSuppressionStereoDescription": "قمع ضوضاء صوت الاستريو غير مدعوم حاليًا.",
         "oldElectronClientDescription1": "يبدو أنَّك تستعمل إصدارًا قديمًا من جيتسي يحوي ثغرة أمنية. تأكد رجاءً من أنَّك حدَّثته إلى ",
         "oldElectronClientDescription2": "أحدث إصدار",
         "oldElectronClientDescription3": " الآن!",
@@ -708,8 +704,8 @@
         "suboptimalBrowserWarning": "نخشى أن لا تكون تجربة المُلتقى جيدة. نعمل على تحسين الكثير من الأمور، لكن ننصحك حتى ذلك الحين باستعمال باستعمال أحد <a href='static/recommendedBrowsers.html' target='_blank'>المتصفحات المدعومة</a>.",
         "suboptimalExperienceTitle": "تحذير من المتصفح",
         "unmute": "إلغاء الكتم",
-        "videoMutedRemotelyDescription": "يمكنك دائمًا تشغيله مرة أخرى.",
-        "videoMutedRemotelyTitle": "تم إيقاف الفيديو الخاص بك بواسطة {{participantDisplayName}}",
+        "videoMutedRemotelyDescription": "You can always turn it on again.",
+        "videoMutedRemotelyTitle": "Your video has been turned off by {{participantDisplayName}}",
         "videoUnmuteBlockedDescription": "تم حظر عملية إلغاء كتم الكاميرا مؤقتًا بسبب قيود النظام.",
         "videoUnmuteBlockedTitle": "تم حظر إعادة الكاميرا!",
         "viewLobby": "مشاهدة اللوبي",
@@ -798,7 +794,7 @@
             "goodQuality": "رائع! الجودة في تحسن للأفضل!",
             "noMediaConnectivity": "لم نتمكن من إيجاد وسيلة لإنشاء اتصال لهذه التجربة، وسبب هذا عائد إلى الجدار الناري أو مترجم عناوين الشبكة NAT في أغلب الأحيان.",
             "noVideo": "نتوقع أن تكون جودة الفيديو تعيسة.",
-            "undetectable": "إن مازلت غير قادر على إجراء اتصالات من المتصفح، ننصح بالتأكد من حالة مكبرات الصوت والمايكروفون والكاميرا، وأنَّك منحت المتصفح إذن الوصول إليها وأن المتصفح محدَّث إلى أحدث إصدار. إن ما زلت تواجه مشاكل في الاتصال بعد ذلك، حاول التواصل مع مطوري تطبيق الويب.",
+            "undetectable": "إن مازلت غير قادر على إجراء اتصالات من المتصفح، ننصح بالتأكد من حالة مكبرات الصوت والمجهار (المايكروفون) والكاميرا، وأنَّك منحت المتصفح إذن الوصول إليها وأن المتصفح محدَّث إلى أحدث إصدار. إن ما زلت تواجه مشاكل في الاتصال بعد ذلك، حاول التواصل مع مطوري تطبيق الويب.",
             "veryPoorConnection": "نتوقع أن تكون جودة الاتصال تعيسة.",
             "videoFreezing": "نتوقع حصول جمود في الفيديو أو تحول الصورة للسواد",
             "videoHighQuality": "نتوقع أن تكون جودة الفيديو جيدة",
@@ -826,7 +822,7 @@
         "joinWithoutAudio": "انضم دون صوت",
         "keyboardShortcuts": "تفعيل اختصارات لوحة المفاتيح",
         "linkCopied": "نُسِخ الرابط",
-        "lookGood": "يبدو أن الميكروفون لديك سيء",
+        "lookGood": "يبدو أن المجهار لديك تعيس",
         "or": "أو",
         "premeeting": "ما قبل المُلتقى",
         "screenSharingError": "خطأ في مشاركة الشاشة:",
@@ -898,20 +894,12 @@
         "limitNotificationDescriptionWeb": "نظرًا للضغط الكبير، سيقيَّد التسجيل إلى {{limit}} د، ولكن إن أردت التسجيل لمدة مفتوحة، جرِّب <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
         "linkGenerated": "لقد أنشأنا رابطًا لتسجيلك.",
         "live": "مباشر",
-        "localRecordingNoNotificationWarning": "لن يتم الإعلان عن التسجيل للمشاركين الآخرين. ستحتاج إلى إخبارهم بأنه تم تسجيل الاجتماع.",
-        "localRecordingNoVideo": "لا يتم تسجيل الفيديو",
-        "localRecordingStartWarning": "يرجى التأكد من إيقاف التسجيل قبل الخروج من الاجتماع من أجل حفظه.",
-        "localRecordingStartWarningTitle": "أوقف التسجيل لحفظه",
-        "localRecordingVideoStop": "سيؤدي إيقاف الفيديو أيضًا إلى إيقاف التسجيل المحلي. هل أنت متأكد أنك تريد الاستمرار؟",
-        "localRecordingVideoWarning": "لتسجيل الفيديو الخاص بك ، يجب أن يكون لديك عند بدء التسجيل",
         "localRecordingWarning": "تأكد من تحديد علامة التبويب الحالية لاستخدام الفيديو والصوت الصحيحين. التسجيل محدود حاليًا بـ 1 كيغابايت ، أي حوالي 100 دقيقة.",
         "loggedIn": "مُسجَّل باسم {{userName}}",
-        "noStreams": "لم يتم الكشف عن دفق الصوت أو الفيديو.",
         "off": "أوقِف التسجيل",
         "offBy": "أوقَف {{name}} التسجيل",
         "on": "تسجيل",
         "onBy": "بدأ {{name}} التسجيل",
-        "onlyRecordSelf": "تسجيل فقط دفق الصوت والفيديو الخاصة بي",
         "pending": "التحضير لتسجيل المُلتقى...",
         "rec": "تسجيل",
         "saveLocalRecording": "حفظ ملف التسجيل محليا",
@@ -938,7 +926,6 @@
         "insecureRoomNameWarning": "اسم الغرفة غير آمن، فقد ينضم عبره مشاركون غرباء إلى المُلتقى. ننصحك بتأمين المُلتقى عبر  وسائل الحماية التي يوفرها زر الحماية."
     },
     "settings": {
-        "buttonLabel": "إعدادات",
         "calendar": {
             "about": "تُستعمَل الرزنامة {{appName}} المدمجة للوصل بأمان إلى رزنامتك، لذا بالإمكان معرفة الأحداث القادمة.",
             "disconnect": "قطع الاتصال",
@@ -956,13 +943,12 @@
         "language": "اللغة",
         "loggedIn": "الدخول باسم {{name}}",
         "maxStageParticipants": "الحد الأقصى لعدد المشاركين الذين يمكن تثبيتهم في المرحلة الرئيسية",
-        "microphones": "المايكروفون",
+        "microphones": "المجهار (المايكروفون)",
         "moderator": "رئيس الجلسة",
         "more": "المزيد",
         "name": "الاسم",
         "noDevice": "لا يوجد",
         "participantJoined": "انضم مشارك",
-        "participantKnocking": "دخل المشارك في الردهة",
         "participantLeft": "غادر المشارك",
         "playSounds": "تشغيل الصوت عند:",
         "reactions": "ردود فعل المُلتقى",
@@ -970,7 +956,7 @@
         "screenTitle": "إعدادات",
         "selectAudioOutput": "خرج الصوت",
         "selectCamera": "الكاميرا",
-        "selectMic": "المايكروفون",
+        "selectMic": "المجهار (المايكروفون)",
         "selfView": "عرض ذاتي",
         "sounds": "اصوات",
         "speakers": "المذياع (مكبر الصوت)",
@@ -995,17 +981,12 @@
         "displayName": "عرض الاسم",
         "displayNamePlaceholderText": "على سبيل المثال: علي الحيدري",
         "email": "البريد الإلكتروني",
-        "goTo": "اذهب إلى",
         "header": "الإعدادات",
-        "help": "مساعدة",
-        "links": "روابط",
-        "privacy": "خصوصية",
         "profileSection": "الملف الشخصي",
         "serverURL": "رابط المُخدِّم",
         "showAdvanced": "أظهِر الإعدادات المتقدمة",
         "startWithAudioMuted": "بدء الجميع مكتومي الصوت",
         "startWithVideoMuted": "بدء الجميع دون فيديو",
-        "terms": "شروط",
         "version": "الإصدار"
     },
     "share": {
@@ -1033,7 +1014,7 @@
     "startupoverlay": {
         "genericTitle": "يحتاج المُلتقى إلى استخدام الميكروفون والكاميرا.",
         "policyText": " ",
-        "title": "يريد {{app}} استعمال الميكروفون والكاميرا خاصَّتك."
+        "title": "يريد {{app}} استعمال المجهار والكاميرا خاصَّتك."
     },
     "suspendedoverlay": {
         "rejoinKeyTitle": "المنطقة",
@@ -1043,7 +1024,6 @@
     "termsView": {
         "header": "مصطلحات"
     },
-    "toggleTopPanelLabel": "تبديل اللوحة العلوية",
     "toolbar": {
         "Settings": "الإعدادات",
         "accessibilityLabel": {
@@ -1062,7 +1042,6 @@
             "document": "اظهِر/اخفِ الملف المشارك",
             "download": "نزِّل التطبيق",
             "embedMeeting": "ضمِّن المُلتقى",
-            "endConference": "End meeting for all",
             "expand": "وسّع",
             "feedback": "أبدِ رأيك",
             "fullScreen": "استعمل/اخرج من وضع الشاشة الكاملة",
@@ -1073,7 +1052,6 @@
             "invite": "ادعُ آخرين",
             "kick": "اطرد مشاركًا",
             "laugh": "يضحك",
-            "leaveConference": "اترك الاجتماع",
             "like": "رفع الإبهام متمنيا النجاح",
             "linkToSalesforce": "ارتباط إلى Salesforce",
             "lobbyButton": "فعِّل/عطِّل وضع غرفة الانتظار",
@@ -1087,7 +1065,6 @@
             "muteEveryoneElse": "كتم صوت الآخرين",
             "muteEveryoneElsesVideoStream": "وقّف فيديو أي شخص آخر",
             "muteEveryonesVideoStream": "وقّف فيديو الجميع",
-            "noiseSuppression": "قمع الضوضاء",
             "participants": "مشاركون",
             "pip": "استعمل/اخرج من وضع صورة-في-صورة",
             "privateMessage": "أرسل رسالة خاصة",
@@ -1128,7 +1105,6 @@
         "clap": "تصفيق",
         "closeChat": "أغلق الدردشة",
         "closeReactionsMenu": "إغلاق قائمة ردود الفعل",
-        "disableNoiseSuppression": "قم بتعطيل خاصية منع الضوضاء",
         "disableReactionSounds": "يمكنك تعطيل أصوات ردود الفعل لهذا المُلتقى",
         "dock": "إرساء في النافذة الرئيسية",
         "documentClose": "أغلق الملف المشارك",
@@ -1136,7 +1112,6 @@
         "download": "نزِّل التطبيق",
         "e2ee": "تعمية طرف-لطرف",
         "embedMeeting": "ضمِّن المُلتقى",
-        "endConference": "إنهاء الاجتماع للجميع",
         "enterFullScreen": "تعمية طرف-لطرف",
         "enterTileView": "عرض بشاشة كاملة",
         "exitFullScreen": "أدخل عنوان العرض",
@@ -1149,7 +1124,6 @@
         "joinBreakoutRoom": "انضم إلى غرفة الجانبية",
         "laugh": "يضحك",
         "leaveBreakoutRoom": "اترك إلى غرفة الجانبية",
-        "leaveConference": "اترك الاجتماع",
         "like": "رفع الإبهام متمنيا النجاح",
         "linkToSalesforce": "ارتباط إلى Salesforce",
         "lobbyButtonDisable": "عطِّل وضع غرفة الانتظار",
@@ -1166,10 +1140,9 @@
         "noAudioSignalDescSuggestion": "إن لم تكتمه عمدًا من إعدادات النظام لديك أو من الجهاز نفسه، بدِّله إلى الجهاز الموصى به.",
         "noAudioSignalDialInDesc": "يمكن أيضًا الاتصال باستعمال:",
         "noAudioSignalDialInLinkDesc": "أرقام الاتصال",
-        "noAudioSignalTitle": "لا يصلنا شيئًا من المايكروفون الخاص بك",
-        "noiseSuppression": "قمع الضوضاء",
-        "noisyAudioInputDesc": "يبدو أنَّ المايكروفون لديك يلتقط الكثير من الضجة، اكتمه رجاءً أو استعمل ميكروفونًا آخر.",
-        "noisyAudioInputTitle": "يبدو أنَّ المايكروفون لديك يلتقط الكثير من الضجة!",
+        "noAudioSignalTitle": "لا يصلنا شيئًا من المجهار (المايكروفون) الخاص بك",
+        "noisyAudioInputDesc": "يبدو أنَّ المجهار (المايكروفون) لديك يصدر الكثير من الضجة، اكتمه رجاءً أو استعمل مجهارًا آخر.",
+        "noisyAudioInputTitle": "يبدو أنَّ المجهار (المايكروفون) لديك يصدر الكثير من الضجة!",
         "openChat": "فتح الدرشة",
         "openReactionsMenu": "افتح قائمة التفاعلات",
         "participants": "مشاركون",
@@ -1199,7 +1172,7 @@
         "stopSharedVideo": "أوقف فيديو يوتيوب المشارك",
         "stopSubtitles": "أخفِ الترجمة",
         "surprised": "مندهش",
-        "talkWhileMutedPopup": "أتحاول التحدث؟ الميكروفون لديك مكتوم.",
+        "talkWhileMutedPopup": "أتحاول التحدث؟ المجهار مكتوم لديك.",
         "tileViewToggle": "بدِّل عنوان العرض",
         "toggleCamera": "بدِّل الكاميرا",
         "undock": "فك في نافذة منفصلة",
@@ -1216,18 +1189,16 @@
         "pending": "التحضير لإذاعة المُلتقى...",
         "start": "بدء إظهار الترجمة",
         "stop": "إيقاف عرض الترجمة",
-        "subtitles": "ترجمات",
-        "subtitlesOff": "إيقاف",
         "tr": "يذاع"
     },
     "userMedia": {
         "androidGrantPermissions": "اختر <b><i>السماح</i></b> عندما يطلب المتصفح الأذونات.",
         "chromeGrantPermissions": "اختر <b><i>السماح</i></b> عندما يطلب المتصفح الأذونات.",
         "edgeGrantPermissions": "اختر <b><i>نعم</i></b> عندما يطلب المتصفح الأذونات.",
-        "electronGrantPermissions": "امنح إذنًا باستعمال الكاميرا والمايكروفون.",
+        "electronGrantPermissions": "امنح إذنًا باستعمال الكاميرا والمجهار (المايكروفون).",
         "firefoxGrantPermissions": "اختر <b><i>مشاركة الجهاز المحدَّد</i></b> عندما يطل بالمتصفح الأذونات.",
         "iexplorerGrantPermissions": "اختر <b><i>تمام</i></b> عندما يطلب المتصفح الأذونات.",
-        "nwjsGrantPermissions": "امنح إذنًا باستعمال الكاميرا والمايكروفون.",
+        "nwjsGrantPermissions": "امنح إذنًا باستعمال الكاميرا والمجهار (المايكروفون).",
         "operaGrantPermissions": "اختر <b><i>السماح</i></b> عندما يطلب المتصفح الأذونات.",
         "react-nativeGrantPermissions": "اختر <b><i>السماح</i></b> عندما يطلب المتصفح الأذونات.",
         "safariGrantPermissions": "اختر <b><i>تمام</i></b> عندما يطلب المتصفح الأذونات."

lang/main-be.json

@@ -90,6 +90,7 @@
         "bitrate": "Бітрэйт:",
         "bridgeCount": "Колькасць сервераў: ",
         "connectedTo": "Падключаны да:",
+        "e2e_rtt": "E2E RTT:",
         "framerate": "Частата кадраў:",
         "less": "Кароткая інфармацыя",
         "localaddress_0": "Мясцовы адрас:",

lang/main-ca.json

@@ -79,6 +79,7 @@
     },
     "carmode": {
         "actions": {
+            "leaveMeeting": "Abandona la reunió",
             "selectSoundDevice": "Seleccioneu l'aparell d'àudio"
         },
         "labels": {
@@ -145,6 +146,7 @@
         "bridgeCount": "Nombre de servidors: ",
         "codecs": "Còdecs (A/V):",
         "connectedTo": "Connectat a:",
+        "e2e_rtt": "E2E RTT:",
         "framerate": "Taxa de fotogrames:",
         "less": "Menys informació",
         "localaddress": "Adreça local:",
@@ -1037,7 +1039,6 @@
             "invite": "Convida-hi persones",
             "kick": "Expulsa el participant",
             "laugh": "Riure",
-            "leaveConference": "Abandona la reunió",
             "like": "Polzes amunt",
             "linkToSalesforce": "Enllaç a Salesforce",
             "lobbyButton": "Activa o desactiva la sala d'espera",
@@ -1110,7 +1111,6 @@
         "joinBreakoutRoom": "Entra a la sala de descans",
         "laugh": "Riure",
         "leaveBreakoutRoom": "Surt de la sala de descans",
-        "leaveConference": "Abandona la reunió",
         "like": "Polzes amunt",
         "linkToSalesforce": "Enllaç a Salesforce",
         "lobbyButtonDisable": "Desactiva el mode de sala d'espera",

lang/main-cs.json

@@ -108,6 +108,7 @@
         "bridgeCount": "Počet serverů: ",
         "codecs": "Kodeky (A/V): ",
         "connectedTo": "Připojeno k:",
+        "e2e_rtt": "E2E RTT:",
         "framerate": "Rychlost snímkování:",
         "less": "Zobrazit méně",
         "localaddress_0": "Místní adresa:",

lang/main-da.json

@@ -90,6 +90,7 @@
         "bitrate": "Bitrate:",
         "bridgeCount": "Server antal: ",
         "connectedTo": "Forbundet til:",
+        "e2e_rtt": "E2E RTT:",
         "framerate": "Frame rate:",
         "less": "Vis mindre",
         "localaddress": "Lokal adresse:",

lang/main-de.json

@@ -11,6 +11,7 @@
         "defaultEmail": "Ihre Standard-E-Mail",
         "disabled": "Sie können keine Personen einladen.",
         "failedToAdd": "Fehler beim Hinzufügen von Personen",
+        "footerText": "Abgehender Ruf ist deaktiviert.",
         "googleEmail": "Google-E-Mail",
         "inviteMoreHeader": "Sie sind alleine in der Sitzung",
         "inviteMoreMailSubject": "An {{appName}} Meeting teilnehmen",
@@ -39,6 +40,9 @@
     "audioOnly": {
         "audioOnly": "Geringe Bandbreite"
     },
+    "blankPage": {
+        "meetingEnded": "Konferenz beendet."
+    },
     "breakoutRooms": {
         "actions": {
             "add": "Breakout-Raum hinzufügen",
@@ -76,16 +80,6 @@
         "refresh": "Kalender aktualisieren",
         "today": "Heute"
     },
-    "carmode": {
-        "actions": {
-            "selectSoundDevice": "Audiogerät auswählen"
-        },
-        "labels": {
-            "buttonLabel": "Automodus",
-            "title": "Automodus",
-            "videoStopped": "Ihre Kamera ist deaktiviert"
-        }
-    },
     "chat": {
         "enter": "Chat-Raum betreten",
         "error": "Fehler: Ihre Nachricht wurde nicht versendet. Grund: {{error}}",
@@ -96,7 +90,6 @@
         "messageAccessibleTitleMe": "Ich sage:",
         "messageTo": "Private Nachricht an {{recipient}}",
         "messagebox": "Nachricht eingeben",
-        "newMessages": "Neue Nachrichten",
         "nickname": {
             "popover": "Wähle einen Alias",
             "title": "Geben Sie einen Alias zum Chatten ein",
@@ -115,7 +108,6 @@
     },
     "chromeExtensionBanner": {
         "buttonText": "Chrome-Erweiterung installieren",
-        "buttonTextEdge": "Edge-Erweiterung installieren",
         "close": "Schließen",
         "dontShowAgain": "Hinweis nicht mehr anzeigen",
         "installExtensionText": "Installieren Sie die Erweiterung für die Integration von Google Calendar und Office 365"
@@ -146,6 +138,7 @@
         "bridgeCount": "Serverzahl: ",
         "codecs": "Codecs (A/V): ",
         "connectedTo": "Verbunden mit:",
+        "e2e_rtt": "Ende-zu-Ende-Paketumlaufzeit:",
         "framerate": "Bildwiederholrate:",
         "less": "Weniger anzeigen",
         "localaddress": "Lokale Adresse:",
@@ -206,9 +199,6 @@
         "selectADevice": "Ein Gerät wählen",
         "testAudio": "Prüfton wiedergeben"
     },
-    "dialIn": {
-        "screenTitle": "Einwahldaten"
-    },
     "dialOut": {
         "statusMessage": "ist jetzt {{status}}"
     },
@@ -284,6 +274,7 @@
         "linkMeetingTitle": "Konferenz mit Salesforce verlinken",
         "liveStreaming": "Livestreaming",
         "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Während einer Aufnahme nicht möglich",
+        "liveStreamingDisabledTooltip": "Starten des Livestreams deaktiviert.",
         "localUserControls": "Lokale Benutzersteuerung",
         "lockMessage": "Die Konferenz konnte nicht gesperrt werden.",
         "lockRoom": "Konferenz$t(lockRoomPassword) hinzufügen",
@@ -338,6 +329,7 @@
         "recentlyUsedObjects": "Ihre zuletzt verwendeten Objekte",
         "recording": "Aufnahme",
         "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Während eines Livestreams nicht möglich",
+        "recordingDisabledTooltip": "Start der Aufzeichnung deaktiviert.",
         "rejoinNow": "Jetzt erneut beitreten",
         "remoteControlAllowedMessage": "{{user}} hat die Anfrage zur Fernsteuerung angenommen!",
         "remoteControlDeniedMessage": "{{user}} hat die Anfrage zur Fernsteuerung verweigert!",
@@ -514,10 +506,6 @@
         "toggleShortcuts": "Tastenkombinationen ein- oder ausblenden",
         "videoMute": "Kamera starten oder stoppen"
     },
-    "largeVideo": {
-        "screenIsShared": "Ihr Bildschirm wird freigegeben",
-        "showMeWhatImSharing": "Anzeigen, was freigegeben wird"
-    },
     "liveStreaming": {
         "busy": "Es werden Ressourcen zum Streamen bereitgestellt. Bitte in ein paar Minuten erneut versuchen.",
         "busyTitle": "Alle Streaming-Instanzen sind in Gebrauch",
@@ -661,8 +649,6 @@
         "linkToSalesforceKey": "Konferenz verlinken",
         "linkToSalesforceProgress": "Konferenz wird mit Salesforce verlinkt...",
         "linkToSalesforceSuccess": "Die Konferenz wurde mit Salesforce verlinkt",
-        "localRecordingStarted": "{{name}} hat eine lokale Aufzeichnung gestartet.",
-        "localRecordingStopped": "{{name}} hat eine lokale Aufzeichnung gestoppt.",
         "me": "Ich",
         "moderationInEffectCSDescription": "Bitte melden um ein Video zu teilen",
         "moderationInEffectCSTitle": "Die Videofreigabe ist von der Moderation gesperrt",
@@ -683,10 +669,6 @@
         "newDeviceAction": "Verwenden",
         "newDeviceAudioTitle": "Neues Audiogerät erkannt",
         "newDeviceCameraTitle": "Neue Kamera erkannt",
-        "noiseSuppressionDesktopAudioDescription": "Die Rauschunterdrückung kann nicht genutzt werden, wenn der Computersound geteilt wird, bitte zuerst deaktivieren und dann nochmals versuchen.",
-        "noiseSuppressionFailedTitle": "Rauschunterdrückung konnte nicht gestartet werden",
-        "noiseSuppressionNoTrackDescription": "Bitte eigenes Mikrofon zuerst aktivieren.",
-        "noiseSuppressionStereoDescription": "Rauschunterdrückung unterstützt aktuell keinen Stereoton.",
         "oldElectronClientDescription1": "Sie scheinen eine alte Version des Jitsi-Meet-Clients zu nutzen. Diese hat bekannte Schwachstellen. Bitte aktualisieren Sie auf unsere ",
         "oldElectronClientDescription2": "aktuelle Version",
         "oldElectronClientDescription3": "!",
@@ -822,7 +804,6 @@
         "initiated": "Anruf gestartet",
         "joinAudioByPhone": "Per Telefon teilnehmen",
         "joinMeeting": "Konferenz beitreten",
-        "joinMeetingInLowBandwidthMode": "Konferenz im Datensparmodus beitreten",
         "joinWithoutAudio": "Ohne Ton beitreten",
         "keyboardShortcuts": "Tastaturkurzbefehle aktivieren",
         "linkCopied": "Link in die Zwischenablage kopiert",
@@ -898,23 +879,13 @@
         "limitNotificationDescriptionWeb": "Wegen hoher Nachfrage ist Ihre Aufnahme auf {{limit}} Min. begrenzt. Für unlimitierte Aufnahmen nutzen Sie bitte <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
         "linkGenerated": "Link zur Aufzeichnung wurde generiert.",
         "live": "LIVE",
-        "localRecordingNoNotificationWarning": "Die Aufzeichnung wird anderen Anwesenden nicht mitgeteilt. Sie müssen diese selbst darauf hinweisen, dass die Konferenz aufgezeichnet wird.",
-        "localRecordingNoVideo": "Videos werden nicht aufgenommen",
-        "localRecordingStartWarning": "Bitte beenden Sie die Aufzeichnung vor dem Verlassen der Konferenz, um die Aufzeichnung zu speichern.",
-        "localRecordingStartWarningTitle": "Aufzeichnung zum Speichern beenden",
-        "localRecordingVideoStop": "Wenn Sie ihre Kamera abschalten wird auch die Aufnahme beendet. Sind Sie sicher, dass Sie fortfahren möchten?",
-        "localRecordingVideoWarning": "Um Ihr eigenes Kamerabild aufzuzeichnen, müssen Sie Ihre Kamera beim Start der Aufnahme einschalten",
-        "localRecordingWarning": "Bitte prüfen Sie, dass das aktuelle Tab auswählen, um Bild und Ton aufzuzeichnen. Die Länge der Aufzeichnung ist aktuell auf 1GB beschränkt, was ungefähr 100 Minuten entspricht.",
         "loggedIn": "Als {{userName}} angemeldet",
-        "noStreams": "Kein Ton oder Video erkannt.",
         "off": "Aufnahme gestoppt",
         "offBy": "{{name}} stoppte die Aufnahme",
         "on": "Aufnahme",
         "onBy": "{{name}} startete die Aufnahme",
-        "onlyRecordSelf": "Nur eigenes Kamerabild und Ton aufzeichnen",
         "pending": "Aufzeichnung des Meetings wird vorbereitet…",
         "rec": "AUFZ",
-        "saveLocalRecording": "Aufzeichnung lokal abspeichern",
         "serviceDescription": "Ihre Aufzeichnung wird vom Aufzeichnungsdienst gespeichert",
         "serviceDescriptionCloud": "Cloud-Aufzeichnung",
         "serviceDescriptionCloudInfo": "Aufzeichnungen werden 24 Stunden nach Aufzeichnungsende automatisch gelöscht.",
@@ -922,12 +893,10 @@
         "sessionAlreadyActive": "Diese Konferenz wird bereits aufgezeichnet.",
         "signIn": "Anmelden",
         "signOut": "Abmelden",
-        "surfaceError": "Bitte das aktuelle Tab auswählen.",
         "unavailable": "Oh! Der {{serviceName}} ist aktuell nicht verfügbar. Wir arbeiten an der Behebung des Problems. Bitte versuchen Sie es später noch einmal.",
         "unavailableTitle": "Aufnahme nicht verfügbar",
         "uploadToCloud": "In die Cloud hochladen"
     },
-    "screenshareDisplayName": "{{name}}s Bildschirmfreigabe",
     "sectionList": {
         "pullToRefresh": "Ziehen, um zu aktualisieren"
     },
@@ -961,12 +930,10 @@
         "name": "Name",
         "noDevice": "Kein",
         "participantJoined": "Neue Person nimmt teil",
-        "participantKnocking": "Person hat Lobby betreten",
         "participantLeft": "Person verlässt die Konferenz",
         "playSounds": "Hinweistöne aktiviert",
         "reactions": "Interaktionen",
         "sameAsSystem": "Wie System ({{label}})",
-        "screenTitle": "Einstellungen",
         "selectAudioOutput": "Audioausgabe",
         "selectCamera": "Kamera",
         "selectMic": "Mikrofon",
@@ -992,19 +959,13 @@
         "disableCrashReportingWarning": "Möchten Sie die Absturzberichte wirklich deaktivieren? Diese Einstellung wird nach einem Neustart der App wirksam.",
         "disableP2P": "Ende-zu-Ende-Modus deaktivieren",
         "displayName": "Anzeigename",
-        "displayNamePlaceholderText": "z.B. Erika Musterfrau",
         "email": "E-Mail",
-        "goTo": "Gehe zu",
         "header": "Einstellungen",
-        "help": "Hilfe",
-        "links": "Links",
-        "privacy": "Datenschutz",
         "profileSection": "Profil",
         "serverURL": "Server-URL",
         "showAdvanced": "Erweiterte Einstellungen anzeigen",
         "startWithAudioMuted": "Stumm beitreten",
         "startWithVideoMuted": "Ohne Video beitreten",
-        "terms": "Nutzungsbedingungen",
         "version": "Version"
     },
     "share": {
@@ -1042,7 +1003,6 @@
     "termsView": {
         "header": "Nutzungsbedingungen"
     },
-    "toggleTopPanelLabel": "Obere Leiste ein-/ausschalten",
     "toolbar": {
         "Settings": "Einstellungen",
         "accessibilityLabel": {
@@ -1052,16 +1012,13 @@
             "boo": "Buhen",
             "breakoutRoom": "Breakout-Räume betreten/verlassen",
             "callQuality": "Qualitätseinstellungen",
-            "carmode": "Automodus",
             "cc": "Untertitel ein-/ausschalten",
             "chat": "Chatfenster öffnen / schließen",
             "clap": "Klatschen",
             "collapse": "Einklappen",
-            "dock": "In Hauptfenster einbinden",
             "document": "Geteiltes Dokument schließen",
             "download": "Unsere Apps herunterladen",
             "embedMeeting": "Konferenz einbetten",
-            "endConference": "Konferenz für alle beenden",
             "expand": "Ausklappen",
             "feedback": "Feedback hinterlassen",
             "fullScreen": "Vollbildmodus ein-/ausschalten",
@@ -1072,7 +1029,6 @@
             "invite": "Person einladen",
             "kick": "Person entfernen",
             "laugh": "Lachen",
-            "leaveConference": "Konferenz verlassen",
             "like": "Daumen nach oben",
             "linkToSalesforce": "Mit Salesforce verlinken",
             "lobbyButton": "Lobbymodus ein-/ausschalten",
@@ -1086,7 +1042,6 @@
             "muteEveryoneElse": "Alle anderen stummschalten",
             "muteEveryoneElsesVideoStream": "Alle anderen Kameras ausschalten",
             "muteEveryonesVideoStream": "Alle Kameras ausschalten",
-            "noiseSuppression": "Rauschunterdrückung",
             "participants": "Anwesende",
             "pip": "Bild-in-Bild-Modus ein-/ausschalten",
             "privateMessage": "Private Nachricht senden",
@@ -1111,7 +1066,6 @@
             "tileView": "Kachelansicht ein-/ausschalten",
             "toggleCamera": "Kamera wechseln",
             "toggleFilmstrip": "Miniaturansichten ein-/ausschalten",
-            "undock": "In eigenem Fenster anzeigen",
             "videoblur": "Unscharfer Hintergrund ein-/ausschalten",
             "videomute": "„Video stummschalten“ ein-/ausschalten"
         },
@@ -1127,15 +1081,12 @@
         "clap": "Klatschen",
         "closeChat": "Chat schließen",
         "closeReactionsMenu": "Interaktionsmenü schließen",
-        "disableNoiseSuppression": "Rauschunterdrückung deaktivieren",
         "disableReactionSounds": "Sie können die Interaktionstöne für diese Konferenz deaktivieren",
-        "dock": "In Hauptfenster einbinden",
         "documentClose": "Geteiltes Dokument schließen",
         "documentOpen": "Geteiltes Dokument öffnen",
         "download": "Unsere Apps herunterladen",
         "e2ee": "Ende-zu-Ende-Verschlüsselung",
         "embedMeeting": "Konferenz einbetten",
-        "endConference": "Konferenz für alle beenden",
         "enterFullScreen": "Vollbildmodus",
         "enterTileView": "Kachelansicht einschalten",
         "exitFullScreen": "Vollbildmodus verlassen",
@@ -1148,7 +1099,6 @@
         "joinBreakoutRoom": "In Breakout-Raum wechseln",
         "laugh": "Lachen",
         "leaveBreakoutRoom": "Breakout-Raum verlassen",
-        "leaveConference": "Konferenz verlassen",
         "like": "Daumen hoch",
         "linkToSalesforce": "Mit Salesforce verknüpfen",
         "lobbyButtonDisable": "Lobbymodus deaktivieren",
@@ -1166,7 +1116,6 @@
         "noAudioSignalDialInDesc": "Sie können sich auch über die Einwahlnummer einwählen:",
         "noAudioSignalDialInLinkDesc": "Einwahlnummern",
         "noAudioSignalTitle": "Es kommt kein Input von Ihrem Mikrofon!",
-        "noiseSuppression": "Rauschunterdrückung",
         "noisyAudioInputDesc": "Es klingt, als ob Ihr Mikrofon Störgeräusche verursacht. Bitte überlegen Sie, ob Sie das Gerät stummschalten oder austauschen wollen.",
         "noisyAudioInputTitle": "Ihr Mikrofon scheint lärmintensiv zu sein!",
         "openChat": "Chat öffnen",
@@ -1201,7 +1150,6 @@
         "talkWhileMutedPopup": "Versuchen Sie zu sprechen? Ihr Mikrofon ist stummgeschaltet.",
         "tileViewToggle": "Kachelansicht ein-/ausschalten",
         "toggleCamera": "Kamera wechseln",
-        "undock": "In eigenem Fenster anzeigen",
         "videoSettings": "Kameraeinstellungen",
         "videomute": "Kamera starten / stoppen"
     },
@@ -1215,8 +1163,6 @@
         "pending": "Transkribieren des Meetings wird vorbereitet…",
         "start": "Anzeige der Untertitel starten",
         "stop": "Anzeige der Untertitel stoppen",
-        "subtitles": "Untertitel",
-        "subtitlesOff": "Ausschalten",
         "tr": "TR"
     },
     "userMedia": {

lang/main-el.json

@@ -105,6 +105,7 @@
         "bitrate": "Ρυθμός μετάδοσης:",
         "bridgeCount": "Αριθμός server: ",
         "connectedTo": "Συνδεδεμένος με:",
+        "e2e_rtt": "E2E RTT:",
         "framerate": "Ρυθμός ανανέωσης:",
         "less": "Δείξε λιγότερα",
         "localaddress": "Τοπική διεύθυνση:",

lang/main-enGB.json

@@ -92,6 +92,7 @@
         "bridgeCount": "Server count: ",
         "codecs": "Codecs (A/V): ",
         "connectedTo": "Connected to:",
+        "e2e_rtt": "",
         "framerate": "Frame rate:",
         "less": "Show less",
         "localaddress": "Local address:",

lang/main-eo.json

@@ -90,6 +90,7 @@
         "bitrate": "Bitrate:",
         "bridgeCount": "Server count: ",
         "connectedTo": "Connected to:",
+        "e2e_rtt": "E2E RTT:",
         "framerate": "Frame rate:",
         "less": "Show less",
         "localaddress": "Local address:",

lang/main-es.json

@@ -114,6 +114,7 @@
         "bridgeCount": "Contador del servidor: ",
         "codecs": "Codecs (A/V):",
         "connectedTo": "Conectado a:",
+        "e2e_rtt": "E2E RTT:",
         "framerate": "Fotogramas por segundo:",
         "less": "Mostrar menos",
         "localaddress": "Dirección local:",