fix(screenshare-jwt) Disable screen share based on jwt

* feat(settings): fixed scroll, bottom insets and bounce

.eslintrc.js

@@ -1,5 +1,6 @@
 module.exports = {
     'extends': [
         '@jitsi/eslint-config'
-    ]
+    ],
+    'ignorePatterns': [ '*.d.ts' ]
 };

.github/workflows/ci.yml

@@ -3,14 +3,15 @@ name: Simple CI
 on: [pull_request]
 
 jobs:
-  run-ci:
-    name: Build Frontend
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v3
       with:
-        node-version: '16.x'
+        node-version: 16
+        cache: 'npm'
     - run: npm install
     - name: Check git status
       run: git status
@@ -20,6 +21,25 @@ 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=4096'  
-      run: make
+  linux-build:
+    name: Build Frontend (Linux)
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+        cache: 'npm'
+    - run: npm install
+    - run: make
+  macos-ci:
+    name: Build Frontend (macOS)
+    runs-on: macOS-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+        cache: 'npm'
+    - run: npm install
+    - run: make

Makefile

@@ -5,6 +5,8 @@ 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
+EXCALIDRAW_DIR = node_modules/@jitsi/excalidraw/dist/excalidraw-assets
+EXCALIDRAW_DIR_DEV = node_modules/@jitsi/excalidraw/dist/excalidraw-assets-dev
 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
@@ -14,19 +16,25 @@ OUTPUT_DIR = .
 STYLES_BUNDLE = css/all.bundle.css
 STYLES_DESTINATION = css/all.css
 STYLES_MAIN = css/main.scss
-WEBPACK = ./node_modules/.bin/webpack
-WEBPACK_DEV_SERVER = ./node_modules/.bin/webpack serve --mode development
+ifeq ($(OS),Windows_NT)
+	WEBPACK = .\node_modules\.bin\webpack
+	WEBPACK_DEV_SERVER = .\node_modules\.bin\webpack serve --mode development
+else
+	WEBPACK = ./node_modules/.bin/webpack
+	WEBPACK_DEV_SERVER = ./node_modules/.bin/webpack serve --mode development
+endif
 
 all: compile deploy clean
 
 compile:
+	NODE_OPTIONS=--max-old-space-size=8192 \
 	$(WEBPACK)
 
 clean:
 	rm -fr $(BUILD_DIR)
 
 .NOTPARALLEL:
-deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-olm deploy-tf-wasm deploy-css deploy-local deploy-face-landmarks
+deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-excalidraw deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-olm deploy-tf-wasm deploy-css deploy-local deploy-face-landmarks
 
 deploy-init:
 	rm -fr $(DEPLOY_DIR)
@@ -86,6 +94,16 @@ deploy-tflite:
 		$(TFLITE_WASM)/*.wasm \
 		$(DEPLOY_DIR)
 
+deploy-excalidraw:
+	cp -R \
+		$(EXCALIDRAW_DIR) \
+		$(DEPLOY_DIR)/
+
+deploy-excalidraw-dev:
+	cp -R \
+		$(EXCALIDRAW_DIR_DEV) \
+		$(DEPLOY_DIR)/
+
 deploy-meet-models:
 	cp \
 		$(MEET_MODELS_DIR)/*.tflite \
@@ -108,7 +126,7 @@ deploy-local:
 	([ ! -x deploy-local.sh ] || ./deploy-local.sh)
 
 .NOTPARALLEL:
-dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-olm deploy-tf-wasm deploy-face-landmarks
+dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-olm deploy-tf-wasm deploy-excalidraw-dev deploy-face-landmarks
 	$(WEBPACK_DEV_SERVER)
 
 source-package:

README.md

@@ -18,7 +18,6 @@ Amongst others here are the main features Jitsi Meet offers:
 * Web and native SDKs for integration
 * HD audio and video
 * Content sharing
-* End-to-End Encryption
 * Raise hand and reactions
 * Chat with private conversations
 * Polls

android/build.gradle

@@ -27,10 +27,6 @@ ext {
     if (System.properties['os.arch'] == "aarch64") {
         // For M1 Users we need to use the NDK 24 which added support for aarch64
         ndkVersion = "24.0.8215888"
-    } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-        // For Android Users, we need to use NDK 23, otherwise the build will
-        // fail due to paths longer than the OS limit
-        ndkVersion = "23.1.7779620"
     } else {
         // Otherwise we default to the side-by-side NDK version from AGP.
         ndkVersion = "21.4.7075529"

android/scripts/logcat.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+PKG_NAME=${1:-org.jitsi.meet}
+APP_PID=$(adb shell ps | grep $PKG_NAME | awk '{print $2}')
+
+if [[ -z "$APP_PID" ]]; then
+    echo "App is not running"
+    exit 1
+fi
+
+exec adb logcat --pid=$APP_PID

android/sdk/build.gradle

@@ -77,6 +77,7 @@ dependencies {
     implementation project(':react-native-immersive')
     implementation project(':react-native-keep-awake')
     implementation project(':react-native-masked-view_masked-view')
+    implementation project(':react-native-orientation-locker')
     implementation project(':react-native-pager-view')
     implementation project(':react-native-performance')
     implementation project(':react-native-safe-area-context')

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

@@ -15,6 +15,7 @@
  */
 package org.jitsi.meet.sdk;
 
+import android.app.Application;
 import android.content.Context;
 import android.util.Log;
 
@@ -22,6 +23,7 @@ import androidx.annotation.NonNull;
 import androidx.startup.Initializer;
 
 import com.facebook.soloader.SoLoader;
+import org.wonday.orientation.OrientationActivityLifecycle;
 
 import java.util.Collections;
 import java.util.List;
@@ -37,6 +39,10 @@ public class JitsiInitializer implements Initializer<Boolean> {
 
         // Register our uncaught exception handler.
         JitsiMeetUncaughtExceptionHandler.register();
+
+        // Register activity lifecycle handler for the orientation locker module.
+        ((Application) context).registerActivityLifecycleCallbacks(OrientationActivityLifecycle.getInstance());
+
         return true;
     }
 

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

@@ -21,6 +21,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 
@@ -86,6 +87,14 @@ public class JitsiMeetActivity extends AppCompatActivity
     // Overrides
     //
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Intent intent = new Intent("onConfigurationChanged");
+        intent.putExtra("newConfig", newConfig);
+        this.sendBroadcast(intent);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -85,6 +85,7 @@ class ReactInstanceManagerHolder {
         WebRTCModule.Options options = new WebRTCModule.Options();
 
         AudioDeviceModule adm = JavaAudioDeviceModule.builder(reactContext)
+            .setEnableVolumeLogger(false)
             .createAudioDeviceModule();
         options.setAudioDeviceModule(adm);
 
@@ -128,6 +129,7 @@ class ReactInstanceManagerHolder {
             new com.zmxv.RNSound.RNSoundPackage(),
             new com.th3rdwave.safeareacontext.SafeAreaContextPackage(),
             new com.horcrux.svg.SvgPackage(),
+            new org.wonday.orientation.OrientationPackage(),
             new ReactPackageAdapter() {
                 @Override
                 public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {

android/settings.gradle

@@ -33,6 +33,8 @@ include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
 include ':react-native-masked-view_masked-view'
 project(':react-native-masked-view_masked-view').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-masked-view/masked-view/android')
+include ':react-native-orientation-locker'
+project(':react-native-orientation-locker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-orientation-locker/android')
 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'

app.js

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

conference.js

@@ -15,8 +15,8 @@ import Recorder from './modules/recorder/Recorder';
 import { createTaskQueue } from './modules/util/helpers';
 import {
     createDeviceChangedEvent,
-    createStartSilentEvent,
     createScreenSharingEvent,
+    createStartSilentEvent,
     createTrackMutedEvent,
     sendAnalytics
 } from './react/features/analytics';
@@ -30,14 +30,15 @@ import { shouldShowModeratedNotification } from './react/features/av-moderation/
 import { setAudioOnly } from './react/features/base/audio-only';
 import {
     AVATAR_URL_COMMAND,
+    CONFERENCE_LEAVE_REASONS,
     EMAIL_COMMAND,
     _conferenceWillJoin,
     authStatusChanged,
     commonUserJoinedHandling,
     commonUserLeftHandling,
     conferenceFailed,
-    conferenceJoined,
     conferenceJoinInProgress,
+    conferenceJoined,
     conferenceLeft,
     conferenceSubjectChanged,
     conferenceTimestampChanged,
@@ -49,15 +50,14 @@ import {
     getConferenceOptions,
     kickedOut,
     lockStateChanged,
+    nonParticipantMessageReceived,
     onStartMutedPolicyChanged,
     p2pStatusChanged,
-    sendLocalParticipant,
-    nonParticipantMessageReceived,
-    CONFERENCE_LEAVE_REASONS
+    sendLocalParticipant
 } from './react/features/base/conference';
 import {
-    getReplaceParticipant,
-    getMultipleVideoSendingSupportFeatureFlag
+    getMultipleVideoSendingSupportFeatureFlag,
+    getReplaceParticipant
 } from './react/features/base/config/functions';
 import {
     checkAndNotifyForNewDevice,
@@ -69,7 +69,6 @@ import {
     updateDeviceList
 } from './react/features/base/devices';
 import {
-    browser,
     JitsiConferenceErrors,
     JitsiConferenceEvents,
     JitsiConnectionErrors,
@@ -78,14 +77,15 @@ import {
     JitsiMediaDevicesEvents,
     JitsiParticipantConnectionStatus,
     JitsiTrackErrors,
-    JitsiTrackEvents
+    JitsiTrackEvents,
+    browser
 } from './react/features/base/lib-jitsi-meet';
 import { isFatalJitsiConnectionError } from './react/features/base/lib-jitsi-meet/functions';
 import {
+    MEDIA_TYPE,
     getStartWithAudioMuted,
     getStartWithVideoMuted,
     isVideoMutedByUser,
-    MEDIA_TYPE,
     setAudioAvailable,
     setAudioMuted,
     setAudioUnmutePermissions,
@@ -127,6 +127,7 @@ import {
     isLocalTrackMuted,
     isUserInteractionRequiredForUnmute,
     replaceLocalTrack,
+    toggleScreensharing as toggleScreensharingA,
     trackAdded,
     trackRemoved
 } from './react/features/base/tracks';
@@ -140,11 +141,11 @@ import {
 import { maybeSetLobbyChatMessageListener } from './react/features/lobby/actions.any';
 import { setNoiseSuppressionEnabled } from './react/features/noise-suppression/actions';
 import {
+    NOTIFICATION_TIMEOUT_TYPE,
     isModerationNotificationDisplayed,
-    showNotification,
-    NOTIFICATION_TIMEOUT_TYPE
+    showNotification
 } from './react/features/notifications';
-import { mediaPermissionPromptVisibilityChanged, toggleSlowGUMOverlay } from './react/features/overlay';
+import { mediaPermissionPromptVisibilityChanged } from './react/features/overlay';
 import { suspendDetected } from './react/features/power-monitor';
 import {
     initPrejoin,
@@ -153,7 +154,7 @@ import {
     setJoiningInProgress
 } from './react/features/prejoin';
 import { disableReceiver, stopReceiver } from './react/features/remote-control';
-import { setScreenAudioShareState, isScreenAudioShared } from './react/features/screen-share/';
+import { isScreenAudioShared, setScreenAudioShareState } from './react/features/screen-share/';
 import { toggleScreenshotCaptureSummary } from './react/features/screenshot-capture';
 import { isScreenshotCaptureEnabled } from './react/features/screenshot-capture/functions';
 import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/AudioMixerEffect';
@@ -519,11 +520,6 @@ export default {
             );
         }
 
-        JitsiMeetJS.mediaDevices.addEventListener(
-            JitsiMediaDevicesEvents.SLOW_GET_USER_MEDIA,
-            () => APP.store.dispatch(toggleSlowGUMOverlay(true))
-        );
-
         let tryCreateLocalTracks;
 
         // On Electron there is no permission prompt for granting permissions. That's why we don't need to
@@ -533,8 +529,7 @@ export default {
         const audioOptions = {
             devices: [ MEDIA_TYPE.AUDIO ],
             timeout,
-            firePermissionPromptIsShownEvent: true,
-            fireSlowPromiseEvent: true
+            firePermissionPromptIsShownEvent: true
         };
 
         // FIXME is there any simpler way to rewrite this spaghetti below ?
@@ -585,8 +580,7 @@ export default {
             tryCreateLocalTracks = createLocalTracksF({
                 devices: initialDevices,
                 timeout,
-                firePermissionPromptIsShownEvent: true,
-                fireSlowPromiseEvent: true
+                firePermissionPromptIsShownEvent: true
             })
                 .catch(err => {
                     if (requestedAudio && requestedVideo) {
@@ -629,8 +623,7 @@ export default {
                     return requestedVideo
                         ? createLocalTracksF({
                             devices: [ MEDIA_TYPE.VIDEO ],
-                            firePermissionPromptIsShownEvent: true,
-                            fireSlowPromiseEvent: true
+                            firePermissionPromptIsShownEvent: true
                         })
                         : [];
                 })
@@ -651,7 +644,6 @@ export default {
         // the user inputs their credentials, but the dialog would be
         // overshadowed by the overlay.
         tryCreateLocalTracks.then(tracks => {
-            APP.store.dispatch(toggleSlowGUMOverlay(false));
             APP.store.dispatch(mediaPermissionPromptVisibilityChanged(false));
 
             return tracks;
@@ -791,7 +783,6 @@ export default {
             startAudioOnly: config.startAudioOnly,
             startScreenSharing: config.startScreenSharing,
             startWithAudioMuted: getStartWithAudioMuted(APP.store.getState())
-                || config.startSilent
                 || isUserInteractionRequiredForUnmute(APP.store.getState()),
             startWithVideoMuted: getStartWithVideoMuted(APP.store.getState())
                 || isUserInteractionRequiredForUnmute(APP.store.getState())
@@ -1743,6 +1734,8 @@ export default {
      * is not specified and starts the procedure for obtaining new screen
      * sharing/video track otherwise.
      *
+     * NOTE: this is currently ONLY used in the non-multi-stream case.
+     *
      * @param {boolean} [toggle] - If true - new screen sharing track will be
      * obtained. If false - new video track will be obtain. If not specified -
      * toggles between screen sharing and camera video.
@@ -2291,7 +2284,9 @@ export default {
 
         room.on(
             JitsiConferenceEvents.DOMINANT_SPEAKER_CHANGED,
-            (dominant, previous) => APP.store.dispatch(dominantSpeakerChanged(dominant, previous, room)));
+            (dominant, previous, silence) => {
+                APP.store.dispatch(dominantSpeakerChanged(dominant, previous, Boolean(silence), room));
+            });
 
         room.on(
             JitsiConferenceEvents.CONFERENCE_CREATED_TIMESTAMP,
@@ -2665,12 +2660,6 @@ export default {
                 APP.UI.updateLargeVideo(displayedUserId, true);
             }
         });
-
-        APP.UI.addListener(
-            UIEvents.TOGGLE_SCREENSHARING, ({ enabled, audioOnly, ignoreDidHaveVideo }) => {
-                this.toggleScreenSharing(enabled, { audioOnly }, ignoreDidHaveVideo);
-            }
-        );
     },
 
     /**
@@ -2983,7 +2972,6 @@ export default {
         const available = audioDeviceCount > 0 || Boolean(localAudio);
 
         APP.store.dispatch(setAudioAvailable(available));
-        APP.API.notifyAudioAvailabilityChanged(available);
     },
 
     /**
@@ -3225,7 +3213,7 @@ export default {
                         return;
                     }
 
-                    this.toggleScreenSharing(undefined, { desktopStream });
+                    APP.store.dispatch(toggleScreensharingA(undefined, false, false, { desktopStream }));
                 }
             });
         }
@@ -3247,7 +3235,6 @@ export default {
      */
     setAudioMuteStatus(muted) {
         APP.UI.setAudioMuted(this.getMyUserId(), muted);
-        APP.API.notifyAudioMutedStatusChanged(muted);
     },
 
     /**

config.js

@@ -22,6 +22,8 @@ if (subdomain.startsWith('<!--')) {
     subdomain = '';
 }
 
+var enableJaaS = false;
+
 var config = {
     // Connection
     //
@@ -112,7 +114,7 @@ var config = {
 
         // Signal that this client supports receiving multiple video streams. Without this flag jicofo will enable
         // multi-stream backward compatibility.
-        receiveMultipleVideoStreams: true,
+        // receiveMultipleVideoStreams: true,
     },
 
     // Disables moderator indicators.
@@ -206,9 +208,12 @@ var config = {
 
     // Specify audio quality stereo and opusMaxAverageBitrate values in order to enable HD audio.
     // Beware, by doing so, you are disabling echo cancellation, noise suppression and AGC.
+    // Specify enableOpusDtx to enable support for opus-dtx where
+    // audio packets won’t be transmitted while participant is silent or muted.
     // audioQuality: {
     //     stereo: false,
     //     opusMaxAverageBitrate: null, // Value to fit the 6000 to 510000 range.
+    //     enableOpusDtx: false,
     // },
 
     // Video
@@ -373,6 +378,14 @@ var config = {
     //     // Whether the feature should be enabled or not.
     //     enabled: false,
 
+    //     // Translation languages.
+    //     // Available languages can be found in
+    //     // ./src/react/features/transcribing/translation-languages.json.
+    //     translationLanguages: ['en', 'es', 'fr', 'ro'],
+
+    //     // Important languages to show on the top of the language list.
+    //     translationLanguagesHead: ['en'],
+
     //     // If true transcriber will use the application language.
     //     // The application language is either explicitly set by participants in their settings or automatically
     //     // detected based on the environment, e.g. if the app is opened in a chrome instance which
@@ -822,7 +835,7 @@ var config = {
     // Application ID and Secret.
     // callStatsID: '',
     // callStatsSecret: '',
-    // callstatsStoreLogs: true,
+    // callStatsApplicationLogsDisabled: false,
 
     // The callstats initialize config params as described in the API:
     // https://docs.callstats.io/docs/javascript#callstatsinitialize-with-app-secret
@@ -1161,7 +1174,7 @@ var config = {
         // For a list of all possible theme tokens and their current defaults, please check:
         // https://github.com/jitsi/jitsi-meet/tree/master/resources/custom-theme/custom-theme.json
         // For a short explanations on each of the tokens, please check:
-        // https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/ui/Tokens.js
+        // https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/ui/Tokens.ts
         // IMPORTANT!: This is work in progress so many of the various tokens are not yet applied in code
         // or they are partially applied.
         customTheme: {
@@ -1287,11 +1300,6 @@ 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
     /**
@@ -1444,6 +1452,10 @@ var config = {
     //     // (displaying multiple participants on stage besides the vertical filmstrip)
     //     disableStageFilmstrip: false,
 
+    //     // Default number of participants that can be displayed on stage.
+    //     // The user can change this in settings. Number must be between 1 and 6.
+    //     stageFilmstripParticipants: 1,
+
     //     // Disables the top panel (only shown when a user is sharing their screen).
     //     disableTopPanel: false,
 
@@ -1493,4 +1505,20 @@ var config = {
 
     // Application logo url
     // defaultLogoUrl: 'images/watermark.svg',
+
+    // Settings for the Excalidraw whiteboard integration.
+    // whiteboard: {
+    //     // Whether the feature is enabled or not.
+    //     enabled: true,
+    //     // The server used to support whiteboard collaboration.
+    //     // https://github.com/jitsi/excalidraw-backend
+    //     collabServerBaseUrl: 'https://excalidraw-backend.example.com',
+    // },
 };
+
+// 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)
+}

connection.js

@@ -19,7 +19,7 @@ import {
 } from './react/features/base/lib-jitsi-meet';
 import { isFatalJitsiConnectionError } from './react/features/base/lib-jitsi-meet/functions';
 import { getCustomerDetails } from './react/features/jaas/actions.any';
-import { isVpaasMeeting, getJaasJWT } from './react/features/jaas/functions';
+import { getJaasJWT, isVpaasMeeting } from './react/features/jaas/functions';
 import {
     setPrejoinDisplayNameRequired
 } from './react/features/prejoin/actions';

css/_chat.scss

@@ -22,7 +22,7 @@
     display: flex;
     flex-direction: column;
     // extract header + tabs height
-    height: calc(100% - 102px);
+    height: calc(100% - 119px);
 }
 
 .chat-panel-no-tabs {
@@ -531,41 +531,3 @@
     background: #36383C;
     border-radius: 3px;
 }
-
-.chat-tabs-container {
-    width: 100%;
-    border-bottom: thin solid #292929;
-    display: flex;
-    justify-content: space-around;
-}
-
-.chat-tab {
-    font-size: 1.2em;
-    padding-bottom: 0.5em;
-    width: 50%;
-    text-align: center;
-    color: #8B8B8B;
-    cursor: pointer;
-}
-
-.chat-tab-focus {
-    border-bottom-style: solid;
-    color: #FFF;
-}
-
-.chat-tab-title {
-    margin-right: 8px;
-}
-
-.chat-tab-badge {
-    background-color: #165ecc;
-    border-radius: 50%;
-    box-sizing: border-box;
-    font-weight: 700;
-    overflow: hidden;
-    text-align: center;
-    text-overflow: ellipsis;
-    vertical-align: middle;
-    padding: 0 4px;
-    color: #FFF;
-}

css/_drawer.scss

@@ -24,8 +24,6 @@
 }
 
 .drawer-menu {
-    background: #242528;
-    border-radius: 16px 16px 0 0;
     overflow-y: auto;
     margin-bottom: env(safe-area-inset-bottom, 0);
     width: 100%;

css/_polls.scss

@@ -310,7 +310,7 @@ ol.poll-result-list {
 }
 
 #polls-panel {
-    height: calc(100% - 102px);
+    height: calc(100% - 119px);
 }
 
 .poll-container {

css/_popover.scss

@@ -45,3 +45,7 @@
     margin: -16px -24px;
     z-index: $popoverZ;
 }
+
+.excalidraw .popover {
+    margin: 0;
+}

css/filmstrip/_tile_view_overrides.scss

@@ -3,6 +3,7 @@
  * tiled thumbnail experience.
  */
 .tile-view,
+.whiteboard-container,
 .stage-filmstrip {
     /**
      * Let the avatar grow with the tile.

css/modals/_dialog.scss

@@ -38,3 +38,7 @@
     margin-top: 2px;
     display: block;
 }
+
+.dialog-bottom-margin {
+    margin-bottom: 5px;
+}

css/modals/embed-meeting/_embed-meeting.scss

@@ -9,7 +9,6 @@
         font-size: 15px;
         margin-left: auto;
         margin-top: 16px;
-        width: auto;
     }
 
     &-code {

css/modals/feedback/_feedback.scss

@@ -46,6 +46,8 @@
 }
 
 .feedback-dialog {
+    margin-bottom: 5px;
+
     .details {
         textarea {
             min-height: 100px;

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

@@ -1,3 +1,7 @@
+.share-audio-dialog-container {
+    max-height: none;
+}
+
 .share-audio-dialog {
     .share-audio-animation {
         width: 100%;

css/modals/security/_security.scss

@@ -28,7 +28,7 @@
                         color: #6FB1EA;
                     }
 
-                    & > :first-child:not(:last-child) {
+                    & > :not(:last-child) {
                         margin-right: 24px;
                     }
                 }

css/premeeting/_lobby.scss

@@ -204,3 +204,7 @@
         }
     }
 }
+
+.lobby-button-margin {
+    margin-bottom: 16px;
+}

debian/control

@@ -20,7 +20,7 @@ Description: WebRTC JavaScript video conferences
 
 Package: jitsi-meet-web-config
 Architecture: all
-Depends: openssl, nginx | nginx-full | nginx-extras | apache2
+Depends: openssl, nginx | nginx-full | nginx-extras | apache2, curl
 Description: Configuration for web serving of Jitsi Meet
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
  Videobridge to provide high quality, scalable video conferences.
@@ -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.7) | prosody-trunk | prosody-0.12 | prosody-0.11, lua-sec, lua-basexx, lua-luaossl, lua-cjson, lua-inspect
 Replaces: jitsi-meet-tokens
 Description: Prosody configuration for Jitsi Meet
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
@@ -47,7 +47,7 @@ Description: Prosody configuration for Jitsi Meet
 
 Package: jitsi-meet-tokens
 Architecture: all
-Depends: ${misc:Depends}, prosody-trunk | prosody-0.11 | prosody-0.12 | prosody (>= 0.11.2), jitsi-meet-prosody
+Depends: ${misc:Depends}, prosody-trunk | prosody-0.11 | prosody-0.12 | prosody (>= 0.11.7), jitsi-meet-prosody
 Description: Prosody token authentication plugin for Jitsi Meet
 
 Package: jitsi-meet-turnserver

debian/jitsi-meet-prosody.install

@@ -1,2 +1,3 @@
 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,6 +83,31 @@ case "$1" in
             TURN_SECRET="$RET"
         fi
 
+        SELF_SIGNED_CHOICE="Generate a new self-signed certificate"
+        # 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 db_get returns an error (workaround for strange Debian failure) continue without stopping the config
+        db_get jitsi-meet/cert-choice || CERT_CHOICE=$SELF_SIGNED_CHOICE
+        CERT_CHOICE="$RET"
+        if [ -z "$CERT_CHOICE" ] ; then
+            db_input critical jitsi-meet/cert-choice || true
+            db_go
+            db_get jitsi-meet/cert-choice
+            CERT_CHOICE="$RET"
+        fi
+        if [ "$CERT_CHOICE" != "$SELF_SIGNED_CHOICE" ]; then
+            db_get jitsi-meet/jaas-choice
+            JAAS_INPUT="$RET"
+            if [ -z "$JAAS_INPUT" ] ; then
+                db_subst jitsi-meet/jaas-choice domain "${JVB_HOSTNAME}"
+                db_set jitsi-meet/jaas-choice false
+                db_input critical jitsi-meet/jaas-choice || true
+                db_go
+                db_get jitsi-meet/jaas-choice
+                JAAS_INPUT="$RET"
+            fi
+        fi
+
         # and we're done with debconf
         db_stop
 
@@ -141,7 +166,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 "Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"" $PROSODY_HOST_CONFIG ;then
+        if grep -q "Component \"focus.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG && ! grep -q "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
@@ -166,6 +191,29 @@ 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
 
@@ -178,32 +226,6 @@ 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,6 +35,8 @@ 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-prosody.templates

@@ -1,12 +1,12 @@
 Template: jitsi-meet-prosody/jvb-hostname
 Type: string
-_Description: The hostname of the current installation:
- The value for the hostname that is set in Jitsi Videobridge installation.
+_Description: The domain of the current installation (e.g. meet.jitsi.com):
+ The value of the domain that is set in the Jitsi Videobridge installation.
 
 Template: jitsi-videobridge/jvb-hostname
 Type: string
-_Description: The hostname of the current installation:
- The value for the hostname that is set in Jitsi Videobridge installation.
+_Description: The domain of the current installation (e.g. meet.jitsi.com):
+ The value of the domain that is set in the Jitsi Videobridge installation.
 
 Template: jitsi-videobridge/jvbsecret
 Type: password

debian/jitsi-meet-turnserver.install

@@ -1,3 +1,2 @@
 doc/debian/jitsi-meet-turn/turnserver.conf          /usr/share/jitsi-meet-turnserver/
 doc/debian/jitsi-meet/jitsi-meet.conf               /usr/share/jitsi-meet-turnserver/
-doc/debian/jitsi-meet-turn/coturn-certbot-deploy.sh /usr/share/jitsi-meet-turnserver/

debian/jitsi-meet-turnserver.postinst

@@ -107,7 +107,9 @@ denied-peer-ip=240.0.0.0-255.255.255.255" >> $TURN_CONFIG
         db_get jitsi-meet/cert-choice
         CERT_CHOICE="$RET"
 
-        if [ "$CERT_CHOICE" = "I want to use my own certificate" ] ; then
+        UPLOADED_CERT_CHOICE="I want to use my own certificate"
+        LE_CERT_CHOICE="Let's Encrypt certificates"
+        if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ]; then
             db_get jitsi-meet/cert-path-key
             CERT_KEY="$RET"
             db_get jitsi-meet/cert-path-crt
@@ -120,22 +122,13 @@ denied-peer-ip=240.0.0.0-255.255.255.255" >> $TURN_CONFIG
             CERT_CRT_ESC=$(echo $CERT_CRT | sed 's/\./\\\./g')
             CERT_CRT_ESC=$(echo $CERT_CRT_ESC | sed 's/\//\\\//g')
             sed -i "s/cert=\/etc\/jitsi\/meet\/.*crt/cert=$CERT_CRT_ESC/g" $TURN_CONFIG
+        elif [ "$CERT_CHOICE" = "$LE_CERT_CHOICE" ]; then
+            /usr/share/jitsi-meet/scripts/coturn-le-update.sh ${JVB_HOSTNAME}
         fi
 
         sed -i "s/#TURNSERVER_ENABLED/TURNSERVER_ENABLED/g" /etc/default/coturn
         invoke-rc.d coturn restart || true
 
-        NGINX_STREAM_CONFIG="/etc/nginx/modules-enabled/60-jitsi-meet.conf"
-        if [ -f $NGINX_STREAM_CONFIG ] ; then
-            echo "------------------------------------------------"
-            echo ""
-            echo "You have multiplexing enabled, it is recommended to disable it and migrate to using websockets for the bridge channel."
-            echo "The support for sctp data channels is deprecated and will be dropped at some point."
-            echo "How to do it at: https://jitsi.org/multiplexing-to-bridge-ws-howto"
-            echo ""
-            echo "------------------------------------------------"
-        fi
-
         # and we're done with debconf
         db_stop
     ;;

debian/jitsi-meet-turnserver.templates

@@ -1,9 +1,9 @@
 Template: jitsi-meet-turnserver/jvb-hostname
 Type: string
-_Description: The hostname of the current installation:
- The value for the hostname that is set in Jitsi Videobridge installation.
+_Description: The domain of the current installation (e.g. meet.jitsi.com):
+ The value of the domain that is set in the Jitsi Videobridge installation.
 
 Template: jitsi-videobridge/jvb-hostname
 Type: string
-_Description: The hostname of the current installation:
- The value for the hostname that is set in Jitsi Videobridge installation.
+_Description: The domain of the current installation (e.g. meet.jitsi.com):
+ The value of the domain that is set in the Jitsi Videobridge installation.

debian/jitsi-meet-web-config.config

@@ -1,8 +0,0 @@
-#!/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,14 +43,6 @@ 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
 
@@ -77,13 +69,21 @@ case "$1" in
         fi
 
         UPLOADED_CERT_CHOICE="I want to use my own certificate"
+        LE_CERT_CHOICE="Let's Encrypt certificates"
         # if first time config ask for certs, or if we are reconfiguring
         if [ -z "$JVB_HOSTNAME_OLD" ] || [ "$RECONFIGURING" = "true" ] ; then
             RET=""
+            # ask the question only if there is nothing stored, option to pre-set it on install in automations
             db_get jitsi-meet/cert-choice
             CERT_CHOICE="$RET"
+            if [ -z "$CERT_CHOICE" ] ; then
+                db_input critical jitsi-meet/cert-choice || true
+                db_go
+                db_get jitsi-meet/cert-choice
+                CERT_CHOICE="$RET"
+            fi
 
-            if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then
+            if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ]; then
                 RET=""
                 db_get jitsi-meet/cert-path-key
                 if [ -z "$RET" ] ; then
@@ -103,7 +103,7 @@ case "$1" in
                 fi
                 CERT_CRT="$RET"
             else
-                # create self-signed certs
+                # create self-signed certs (we also need them for the case of LE so we can start nginx)
                 CERT_KEY="/etc/jitsi/meet/$JVB_HOSTNAME.key"
                 CERT_CRT="/etc/jitsi/meet/$JVB_HOSTNAME.crt"
                 HOST="$( (hostname -s; echo localhost) | head -n 1)"
@@ -116,6 +116,17 @@ case "$1" in
                     -extensions SAN \
                     -config <(cat /etc/ssl/openssl.cnf \
                         <(printf "[SAN]\nsubjectAltName=DNS:localhost,DNS:$JVB_HOSTNAME"))
+
+                if [ "$CERT_CHOICE" = "$LE_CERT_CHOICE" ]; then
+                    db_subst jitsi-meet/email domain "${JVB_HOSTNAME}"
+                    db_input critical jitsi-meet/email || true
+                    db_go
+                    db_get jitsi-meet/email
+                    EMAIL="$RET"
+                    if [ ! -z "$EMAIL" ] ; then
+                        ISSUE_LE_CERT="true"
+                    fi
+                fi
             fi
         fi
 
@@ -130,51 +141,45 @@ case "$1" in
             sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $JITSI_MEET_CONFIG
         fi
 
-        # getting rid of jetty serving web
-        if [[ "$JVB_SERVE" = "true" ]] ; then
-            JVB_CONFIG="/etc/jitsi/videobridge/sip-communicator.properties"
+        if [ "$CERT_CHOICE" = "$LE_CERT_CHOICE" ] || [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ]; then
+            # Make sure jaas-choice is not answered already
+            db_get jitsi-meet/jaas-choice
+            JAAS_INPUT="$RET"
+            if [ -z "$JAAS_INPUT" ] ; then
+                db_subst jitsi-meet/jaas-choice domain "${JVB_HOSTNAME}"
+                db_set jitsi-meet/jaas-choice false
+                db_input critical jitsi-meet/jaas-choice || true
+                db_go
+                db_get jitsi-meet/jaas-choice
+                JAAS_INPUT="$RET"
+            fi
+        fi
 
-            # 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 ""
+        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
 
-                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"
+                # 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
                 fi
             fi
+        fi
 
-            db_set jitsi-meet/jvb-serve "false"
+        # Fixes multi-stream flags to workaround problem with mobile joining a multi-stream call with multi-stream disabled
+        if ! grep -q "^config.flags.sourceNameSignaling*" $JITSI_MEET_CONFIG; then
+            echo "config.flags.sourceNameSignaling = true;" >> $JITSI_MEET_CONFIG
+        fi
+        if ! grep -q "^config.flags.sendMultipleVideoStreams*" $JITSI_MEET_CONFIG; then
+            echo "config.flags.sendMultipleVideoStreams = true;" >> $JITSI_MEET_CONFIG
+        fi
+        if ! grep -q "^config.flags.receiveMultipleVideoStreams*" $JITSI_MEET_CONFIG; then
+            echo "config.flags.receiveMultipleVideoStreams = true;" >> $JITSI_MEET_CONFIG
         fi
 
         if [[ "$FORCE_NGINX" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
@@ -239,12 +244,16 @@ case "$1" in
             invoke-rc.d apache2 reload || true
         fi
 
-        echo "----------------"
-        echo ""
-        echo "You can now switch to a Let’s Encrypt certificate. To do so, execute:"
-        echo "/usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh"
-        echo ""
-        echo "----------------"
+        # If scripts fail they will print suggestions for next steps, do not fail install
+        # those can be re-run later
+        # run the scripts only on new install or when re-configuring
+        if [[ "$ISSUE_LE_CERT" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
+            /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh $EMAIL $JVB_HOSTNAME || true
+        fi
+        JAAS_REG_ERROR=0
+        if [[ "${JAAS_INPUT}" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
+            /usr/share/jitsi-meet/scripts/register-jaas-account.sh $EMAIL $JVB_HOSTNAME || JAAS_REG_ERROR=$?
+        fi
 
         echo ""
         echo ""
@@ -254,10 +263,17 @@ case "$1" in
         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"
-        echo "        lNMMM0,                        and follow the guide in the dev console."
+        if [ "${JAAS_INPUT}" != "true" ] || [ ${JAAS_REG_ERROR} -ne 0 ]; then
+            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."
+        else
+            echo "     .kMMMX;"
+            echo "      ;XMMMO'            Congratulations! Now you can use telephony in your Jitsi meetings!"
+            echo "       lNMMWO'             We have created a free JaaS (Jitsi as a Service) account for you. "
+            echo "        lNMMM0,              You can login to https://jaas.8x8.vc/components to check our developer console and your account details."
+        fi
         echo "         lXMMMK:."
         echo "          ;KMMMNKd.  'oo,"
         echo "           'xNMMMMXkkkkOKOl'"

debian/jitsi-meet-web-config.templates

@@ -1,13 +1,13 @@
 Template: jitsi-meet/cert-choice
 Type: select
-__Choices: Generate a new self-signed certificate (You will later get a chance to obtain a Let's encrypt certificate), I want to use my own certificate
-_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.
- 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.
+__Choices: Let's Encrypt certificates, I want to use my own certificate, Generate a new self-signed certificate
+_Description: SSL certificate
+ .
+ Jitsi Meet requires an SSL certificate. This installer can generate one automatically for your using "Let’s Encrypt". This is the recommended and simplest option for most installations.
+ .
+ In the event you need to use a certificate of your own, you can configure its location which defaults to /etc/ssl/--domain.name--.key for the key and /etc/ssl/--domain.name--.crt for the certificate.
+ .
+ If you are a developer and are only looking for a quick way to test basic Jitsi Meet functionality then this installer can also generate a self-signed certificate.
 
 Template: jitsi-meet/cert-path-key
 Type: string
@@ -23,10 +23,27 @@ _Description: Full local server path to the SSL certificate file:
 
 Template: jitsi-meet/jvb-hostname
 Type: string
-_Description: The hostname of the current installation:
- The value for the hostname that is set in Jitsi Videobridge installation.
+_Description: The domain of the current installation (e.g. meet.jitsi.com):
+ The value of the domain that is set in the Jitsi Videobridge installation.
 
 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: Add telephony to your Jitsi meetings?
+ You can easily add dial-in support to your meetings. To allow this we would need your permission to create a free JaaS (Jitsi as a Service) account for you.
+
+Template: jitsi-meet/email
+Type: string
+_Description: Enter your email:
+ To successfully issue Let's Encrypt certificates:
+ .
+ You need a working DNS record pointing to this machine(for hostname ${domain})"
+ .
+ You need to agree to the ACME server's Subscriber Agreement (https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf)
+ by providing an email address for important account notifications.
+ .
+ We will use the email for creating your JaaS (Jitsi as a Service) account if that option was selected.

debian/po/templates.pot

@@ -20,7 +20,7 @@ msgstr ""
 #. Type: select
 #. Choices
 #: ../jitsi-meet-web-config.templates:1001
-msgid "Generate a new self-signed certificate (You will later get a chance to obtain a Let's encrypt certificate)"
+msgid "Generate a new self-signed certificate"
 msgstr ""
 
 #. Type: select
@@ -84,7 +84,7 @@ msgstr ""
 #. Description
 #: ../jitsi-meet-web-config.templates:4001
 msgid ""
-"The value for the hostname that is set in Jitsi Videobridge installation."
+"The value of the domain that is set in the Jitsi Videobridge installation."
 msgstr ""
 
 #. Type: boolean

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

@@ -0,0 +1,12 @@
+-- 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

@@ -65,10 +65,12 @@ VirtualHost "jitmeet.example.com"
         "muc_lobby_rooms";
         "muc_breakout_rooms";
         "av_moderation";
+        "room_metadata";
     }
     c2s_require_encryption = false
     lobby_muc = "lobby.jitmeet.example.com"
     breakout_rooms_muc = "breakout.jitmeet.example.com"
+    room_metadata_component = "metadata.jitmeet.example.com"
     main_muc = "conference.jitmeet.example.com"
     -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
 
@@ -141,18 +143,6 @@ Component "lobby.jitmeet.example.com" "muc"
         "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";
-      "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" }
+Component "metadata.jitmeet.example.com" "room_metadata_component"
+    muc_component = "conference.jitmeet.example.com"
+    breakout_rooms_component = "breakout.jitmeet.example.com"

doc/debian/jitsi-meet-turn/coturn-certbot-deploy.sh

@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-COTURN_CERT_DIR="/etc/coturn/certs"
-TURN_CONFIG="/etc/turnserver.conf"
-
-# create a directory to store certs if it does not exists
-if [ ! -d "$COTURN_CERT_DIR" ]; then
-    mkdir -p $COTURN_CERT_DIR
-    chown -R turnserver:turnserver /etc/coturn/
-    chmod -R 700 /etc/coturn/
-fi
-
-# This is a template and when copied to /etc/letsencrypt/renewal-hooks/deploy/
-# during creating the Let's encrypt certs script
-# jitsi-meet.example.com will be replaced with the real domain of deployment
-for domain in $RENEWED_DOMAINS; do
-        case $domain in
-        jitsi-meet.example.com)
-                # Make sure the certificate and private key files are
-                # never world readable, even just for an instant while
-                # we're copying them into daemon_cert_root.
-                umask 077
-
-                cp "$RENEWED_LINEAGE/fullchain.pem" "$COTURN_CERT_DIR/$domain.fullchain.pem"
-                cp "$RENEWED_LINEAGE/privkey.pem" "$COTURN_CERT_DIR/$domain.privkey.pem"
-
-                # Apply the proper file ownership and permissions for
-                # the daemon to read its certificate and key.
-                chown turnserver "$COTURN_CERT_DIR/$domain.fullchain.pem" \
-                        "$COTURN_CERT_DIR/$domain.privkey.pem"
-                chmod 400 "$COTURN_CERT_DIR/$domain.fullchain.pem" \
-                        "$COTURN_CERT_DIR/$domain.privkey.pem"
-
-                if [ -f $TURN_CONFIG ] && grep -q "jitsi-meet coturn config" "$TURN_CONFIG" ; then
-                    echo "Configuring turnserver"
-                    sed -i "/^cert/c\cert=\/etc\/coturn\/certs\/${domain}.fullchain.pem" $TURN_CONFIG
-                    sed -i "/^pkey/c\pkey=\/etc\/coturn\/certs\/${domain}.privkey.pem" $TURN_CONFIG
-                fi
-                service coturn restart
-                ;;
-        esac
-done
-

doc/debian/jitsi-meet-turn/turnserver.conf

@@ -16,6 +16,8 @@ no-tlsv1
 no-tlsv1_1
 # https://ssl-config.mozilla.org/#server=haproxy&version=2.1&config=intermediate&openssl=1.1.0g&guideline=5.4
 cipher-list=ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
+# without it there are errors when running on Ubuntu 20.04
+dh2066
 # jitsi-meet coturn relay disable config. Do not modify this line
 denied-peer-ip=0.0.0.0-0.255.255.255
 denied-peer-ip=10.0.0.0-10.255.255.255

globals.d.ts

@@ -0,0 +1,25 @@
+import { IStore } from "./react/features/app/types";
+import { IConfig } from "./react/features/base/config/configType";
+
+export {};
+
+declare global {
+    const APP: {
+        store: IStore;
+        UI: any;
+        API: any;
+        conference: any;
+    };
+    const interfaceConfig: any;
+
+    interface Window {
+        config: IConfig;
+        JITSI_MEET_LITE_SDK?: boolean;
+        interfaceConfig?: any;
+        JitsiMeetJS?: any;
+    }
+
+    const config: IConfig;
+
+    const JitsiMeetJS: any;
+}

index.html

@@ -13,6 +13,7 @@
     <link rel="manifest" id="manifest-placeholder">
 
     <script>
+        window.EXCALIDRAW_ASSET_PATH = 'libs/';
         // Dynamically generate the manifest location URL. It must be served from the document origin, and we may have
         // the base pointing to the CDN. This way we can generate a full URL which will bypass the base.
         document.querySelector('#manifest-placeholder').setAttribute('href', window.location.origin + '/manifest.json');

ios/Podfile

@@ -42,6 +42,7 @@ target 'JitsiMeetSDK' do
 
   pod 'CocoaLumberjack', '3.7.2'
   pod 'ObjectiveDropboxOfficial', '6.2.3'
+  pod 'JitsiWebRTC', '~> 106.0.0'
 end
 
 target 'JitsiMeetSDKLite' do
@@ -72,8 +73,13 @@ post_install do |installer|
   react_native_post_install(installer)
   __apply_Xcode_12_5_M1_post_install_workaround(installer)
   installer.pods_project.targets.each do |target|
+    # https://github.com/CocoaPods/CocoaPods/issues/11402
+    if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+      target.build_configurations.each do |config|
+        config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+      end
+    end
     target.build_configurations.each do |config|
-      config.build_settings['ENABLE_BITCODE'] = 'YES'
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
     end

ios/Podfile.lock

@@ -13,14 +13,14 @@ PODS:
     - CocoaLumberjack/Core (= 3.7.2)
   - CocoaLumberjack/Core (3.7.2)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.68.1)
-  - FBReactNativeSpec (0.68.1):
+  - FBLazyVector (0.68.4)
+  - FBReactNativeSpec (0.68.4):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.68.1)
-    - RCTTypeSafety (= 0.68.1)
-    - React-Core (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - ReactCommon/turbomodule/core (= 0.68.1)
+    - RCTRequired (= 0.68.4)
+    - RCTTypeSafety (= 0.68.4)
+    - React-Core (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
   - Firebase/Analytics (8.15.0):
     - Firebase/Core
   - Firebase/Core (8.15.0):
@@ -133,6 +133,7 @@ PODS:
     - AppAuth/Core (~> 1.4)
     - GTMSessionFetcher/Core (~> 1.5)
   - GTMSessionFetcher/Core (1.7.0)
+  - JitsiWebRTC (106.0.0)
   - libwebp (1.2.1):
     - libwebp/demux (= 1.2.1)
     - libwebp/mux (= 1.2.1)
@@ -162,201 +163,201 @@ PODS:
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
-  - RCTRequired (0.68.1)
-  - RCTTypeSafety (0.68.1):
-    - FBLazyVector (= 0.68.1)
+  - RCTRequired (0.68.4)
+  - RCTTypeSafety (0.68.4):
+    - FBLazyVector (= 0.68.4)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.68.1)
-    - React-Core (= 0.68.1)
-  - React (0.68.1):
-    - React-Core (= 0.68.1)
-    - React-Core/DevSupport (= 0.68.1)
-    - React-Core/RCTWebSocket (= 0.68.1)
-    - React-RCTActionSheet (= 0.68.1)
-    - React-RCTAnimation (= 0.68.1)
-    - React-RCTBlob (= 0.68.1)
-    - React-RCTImage (= 0.68.1)
-    - React-RCTLinking (= 0.68.1)
-    - React-RCTNetwork (= 0.68.1)
-    - React-RCTSettings (= 0.68.1)
-    - React-RCTText (= 0.68.1)
-    - React-RCTVibration (= 0.68.1)
-  - React-callinvoker (0.68.1)
-  - React-Codegen (0.68.1):
-    - FBReactNativeSpec (= 0.68.1)
+    - RCTRequired (= 0.68.4)
+    - React-Core (= 0.68.4)
+  - React (0.68.4):
+    - React-Core (= 0.68.4)
+    - React-Core/DevSupport (= 0.68.4)
+    - React-Core/RCTWebSocket (= 0.68.4)
+    - React-RCTActionSheet (= 0.68.4)
+    - React-RCTAnimation (= 0.68.4)
+    - React-RCTBlob (= 0.68.4)
+    - React-RCTImage (= 0.68.4)
+    - React-RCTLinking (= 0.68.4)
+    - React-RCTNetwork (= 0.68.4)
+    - React-RCTSettings (= 0.68.4)
+    - React-RCTText (= 0.68.4)
+    - React-RCTVibration (= 0.68.4)
+  - React-callinvoker (0.68.4)
+  - React-Codegen (0.68.4):
+    - FBReactNativeSpec (= 0.68.4)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.68.1)
-    - RCTTypeSafety (= 0.68.1)
-    - React-Core (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - ReactCommon/turbomodule/core (= 0.68.1)
-  - React-Core (0.68.1):
+    - RCTRequired (= 0.68.4)
+    - RCTTypeSafety (= 0.68.4)
+    - React-Core (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-Core (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.68.1)
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-Core/Default (= 0.68.4)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.68.1):
+  - React-Core/CoreModulesHeaders (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/Default (0.68.1):
+  - React-Core/Default (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/DevSupport (0.68.1):
+  - React-Core/DevSupport (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.68.1)
-    - React-Core/RCTWebSocket (= 0.68.1)
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-jsinspector (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-Core/Default (= 0.68.4)
+    - React-Core/RCTWebSocket (= 0.68.4)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-jsinspector (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.68.1):
+  - React-Core/RCTActionSheetHeaders (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.68.1):
+  - React-Core/RCTAnimationHeaders (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.68.1):
+  - React-Core/RCTBlobHeaders (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/RCTImageHeaders (0.68.1):
+  - React-Core/RCTImageHeaders (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.68.1):
+  - React-Core/RCTLinkingHeaders (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.68.1):
+  - React-Core/RCTNetworkHeaders (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.68.1):
+  - React-Core/RCTSettingsHeaders (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/RCTTextHeaders (0.68.1):
+  - React-Core/RCTTextHeaders (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.68.1):
+  - React-Core/RCTVibrationHeaders (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-Core/RCTWebSocket (0.68.1):
+  - React-Core/RCTWebSocket (0.68.4):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.68.1)
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsiexecutor (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-Core/Default (= 0.68.4)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
     - Yoga
-  - React-CoreModules (0.68.1):
+  - React-CoreModules (0.68.4):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.1)
-    - React-Codegen (= 0.68.1)
-    - React-Core/CoreModulesHeaders (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-RCTImage (= 0.68.1)
-    - ReactCommon/turbomodule/core (= 0.68.1)
-  - React-cxxreact (0.68.1):
+    - RCTTypeSafety (= 0.68.4)
+    - React-Codegen (= 0.68.4)
+    - React-Core/CoreModulesHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-RCTImage (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-cxxreact (0.68.4):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-jsinspector (= 0.68.1)
-    - React-logger (= 0.68.1)
-    - React-perflogger (= 0.68.1)
-    - React-runtimeexecutor (= 0.68.1)
-  - React-jsi (0.68.1):
+    - React-callinvoker (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsinspector (= 0.68.4)
+    - React-logger (= 0.68.4)
+    - React-perflogger (= 0.68.4)
+    - React-runtimeexecutor (= 0.68.4)
+  - React-jsi (0.68.4):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi/Default (= 0.68.1)
-  - React-jsi/Default (0.68.1):
+    - React-jsi/Default (= 0.68.4)
+  - React-jsi/Default (0.68.4):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-  - React-jsiexecutor (0.68.1):
+  - React-jsiexecutor (0.68.4):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-perflogger (= 0.68.1)
-  - React-jsinspector (0.68.1)
-  - React-logger (0.68.1):
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-perflogger (= 0.68.4)
+  - React-jsinspector (0.68.4)
+  - React-logger (0.68.4):
     - glog
   - react-native-background-timer (2.4.1):
     - React-Core
@@ -366,6 +367,8 @@ PODS:
     - React
   - react-native-netinfo (7.1.7):
     - React-Core
+  - react-native-orientation-locker (1.5.0):
+    - React-Core
   - react-native-pager-view (5.4.9):
     - React-Core
   - react-native-performance (2.1.0):
@@ -382,75 +385,76 @@ PODS:
   - react-native-video/Video (6.0.0-alpha.1):
     - PromisesSwift
     - React-Core
-  - react-native-webrtc (1.100.1):
+  - react-native-webrtc (1.106.1):
+    - JitsiWebRTC (~> 106.0.0)
     - React-Core
   - react-native-webview (11.15.1):
     - React-Core
-  - React-perflogger (0.68.1)
-  - React-RCTActionSheet (0.68.1):
-    - React-Core/RCTActionSheetHeaders (= 0.68.1)
-  - React-RCTAnimation (0.68.1):
+  - React-perflogger (0.68.4)
+  - React-RCTActionSheet (0.68.4):
+    - React-Core/RCTActionSheetHeaders (= 0.68.4)
+  - React-RCTAnimation (0.68.4):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.1)
-    - React-Codegen (= 0.68.1)
-    - React-Core/RCTAnimationHeaders (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - ReactCommon/turbomodule/core (= 0.68.1)
-  - React-RCTBlob (0.68.1):
+    - RCTTypeSafety (= 0.68.4)
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTAnimationHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTBlob (0.68.4):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.68.1)
-    - React-Core/RCTBlobHeaders (= 0.68.1)
-    - React-Core/RCTWebSocket (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-RCTNetwork (= 0.68.1)
-    - ReactCommon/turbomodule/core (= 0.68.1)
-  - React-RCTImage (0.68.1):
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTBlobHeaders (= 0.68.4)
+    - React-Core/RCTWebSocket (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-RCTNetwork (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTImage (0.68.4):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.1)
-    - React-Codegen (= 0.68.1)
-    - React-Core/RCTImageHeaders (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-RCTNetwork (= 0.68.1)
-    - ReactCommon/turbomodule/core (= 0.68.1)
-  - React-RCTLinking (0.68.1):
-    - React-Codegen (= 0.68.1)
-    - React-Core/RCTLinkingHeaders (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - ReactCommon/turbomodule/core (= 0.68.1)
-  - React-RCTNetwork (0.68.1):
+    - RCTTypeSafety (= 0.68.4)
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTImageHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-RCTNetwork (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTLinking (0.68.4):
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTLinkingHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTNetwork (0.68.4):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.1)
-    - React-Codegen (= 0.68.1)
-    - React-Core/RCTNetworkHeaders (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - ReactCommon/turbomodule/core (= 0.68.1)
-  - React-RCTSettings (0.68.1):
+    - RCTTypeSafety (= 0.68.4)
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTNetworkHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTSettings (0.68.4):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.1)
-    - React-Codegen (= 0.68.1)
-    - React-Core/RCTSettingsHeaders (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - ReactCommon/turbomodule/core (= 0.68.1)
-  - React-RCTText (0.68.1):
-    - React-Core/RCTTextHeaders (= 0.68.1)
-  - React-RCTVibration (0.68.1):
+    - RCTTypeSafety (= 0.68.4)
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTSettingsHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTText (0.68.4):
+    - React-Core/RCTTextHeaders (= 0.68.4)
+  - React-RCTVibration (0.68.4):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.68.1)
-    - React-Core/RCTVibrationHeaders (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - ReactCommon/turbomodule/core (= 0.68.1)
-  - React-runtimeexecutor (0.68.1):
-    - React-jsi (= 0.68.1)
-  - ReactCommon/turbomodule/core (0.68.1):
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTVibrationHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-runtimeexecutor (0.68.4):
+    - React-jsi (= 0.68.4)
+  - ReactCommon/turbomodule/core (0.68.4):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.68.1)
-    - React-Core (= 0.68.1)
-    - React-cxxreact (= 0.68.1)
-    - React-jsi (= 0.68.1)
-    - React-logger (= 0.68.1)
-    - React-perflogger (= 0.68.1)
+    - React-callinvoker (= 0.68.4)
+    - React-Core (= 0.68.4)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-logger (= 0.68.4)
+    - React-perflogger (= 0.68.4)
   - RNCalendarEvents (2.2.0):
     - React
   - RNCAsyncStorage (1.15.14):
@@ -494,6 +498,7 @@ DEPENDENCIES:
   - Firebase/DynamicLinks (~> 8.0)
   - "giphy-react-native-sdk (from `../node_modules/@giphy/react-native-sdk`)"
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
+  - JitsiWebRTC (~> 106.0.0)
   - ObjectiveDropboxOfficial (= 6.2.3)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -514,6 +519,7 @@ DEPENDENCIES:
   - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
   - react-native-keep-awake (from `../node_modules/react-native-keep-awake`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
+  - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
   - react-native-pager-view (from `../node_modules/react-native-pager-view`)
   - react-native-performance (from `../node_modules/react-native-performance/ios`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
@@ -568,6 +574,7 @@ SPEC REPOS:
     - GoogleUtilities
     - GTMAppAuth
     - GTMSessionFetcher
+    - JitsiWebRTC
     - libwebp
     - nanopb
     - ObjectiveDropboxOfficial
@@ -623,6 +630,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-keep-awake"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
+  react-native-orientation-locker:
+    :path: "../node_modules/react-native-orientation-locker"
   react-native-pager-view:
     :path: "../node_modules/react-native-pager-view"
   react-native-performance:
@@ -697,8 +706,8 @@ SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
   DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
-  FBLazyVector: 2c76493a346ef8cacf1f442926a39f805fffec1f
-  FBReactNativeSpec: 371350f24afa87b6aba606972ec959dcd4a95c9a
+  FBLazyVector: 023a2028f218d648b588348bfa9261b4914b93db
+  FBReactNativeSpec: 9f4902cc009389d3704ff75de2aa513dee34d5c2
   Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
   FirebaseAnalytics: 7761cbadb00a717d8d0939363eb46041526474fa
   FirebaseCore: 5743c5785c074a794d35f2fff7ecc254a91e08b1
@@ -716,48 +725,50 @@ SPEC CHECKSUMS:
   GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
   GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
   GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91
+  JitsiWebRTC: f441eb0e2d67f0588bf24e21c5162e97342714fb
   libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   ObjectiveDropboxOfficial: fe206ce8c0bc49976c249d472db7fdbc53ebbd53
   PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
   PromisesSwift: 99fddfe4a0ec88a56486644c0da106694c92a604
   RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
-  RCTRequired: 00581111c53531e39e3c6346ef0d2c0cf52a5a37
-  RCTTypeSafety: 07e03ee7800e7dd65cba8e52ad0c2edb06c96604
-  React: e61f4bf3c573d0c61c56b53dc3eb1d9daf0768a0
-  React-callinvoker: 047d47230bb6fd66827f8cb0bea4e944ffd1309b
-  React-Codegen: bb0403cde7374af091530e84e492589485aab480
-  React-Core: a4a3a8e10d004b08e013c3d0438259dd89a3894c
-  React-CoreModules: bb9f8bc36f1ae6d780b856927fa9d4aa01ccccc0
-  React-cxxreact: 7dd472aefb8629d6080cbb859240bafccd902704
-  React-jsi: b25808afe821b607d51c779bdd1717be8393b7ec
-  React-jsiexecutor: 4a4bae5671b064a2248a690cf75957669489d08c
-  React-jsinspector: 218a2503198ff28a085f8e16622a8d8f507c8019
-  React-logger: f79dd3cc0f9b44f5611c6c7862badd891a862cf8
+  RCTRequired: e6003505912d056f21f64465063cf4b79418f2b9
+  RCTTypeSafety: d7ef4745c8d9c9faa65c26b4b6230fc5cd4c4424
+  React: 6692c30fb74ab29078b25c31c9841d863e08cdd9
+  React-callinvoker: fe2b234fa518d8bb7600707c536ab0a3e1f5edba
+  React-Codegen: 9964bb2422c7014894182ac50068caae05f68551
+  React-Core: a07bcd2f15ff93cddc9ceb07eddeec3d2ff8d990
+  React-CoreModules: 7fb4ee0fc35ad2b7daf775f0ef6309efdd8d3d82
+  React-cxxreact: 51a8058a35a2f02ad4175334a7cd24aa5558ced4
+  React-jsi: 69b974b418d2658a3f1799903be7cbcb8ac59755
+  React-jsiexecutor: 4f35a29798ba9d0d892a84001d11f626688dbb8e
+  React-jsinspector: 6f75220cd4b6020976d340ab21c63458dd3cad9e
+  React-logger: 7013d2499df6346e6a72802d4084badaaa82543b
   react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
   react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
   react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
   react-native-netinfo: 27f287f2d191693f3b9d01a4273137fcf91c3b5d
+  react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
   react-native-pager-view: 3ee7d4c7697fb3ef788346e834a60cca97ed8540
   react-native-performance: f4b6604a9d5a8a7407e34a82fab6c641d9a3ec12
   react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
   react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
   react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
   react-native-video: bb6f12a7198db53b261fefb5d609dc77417acc8b
-  react-native-webrtc: 206a0ac12a5633d2ec4605174d7c9f12f0d674b2
+  react-native-webrtc: 4a4c31be61f88d1d3356526eebce72f462a6760e
   react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
-  React-perflogger: 30ab8d6db10e175626069e742eead3ebe8f24fd5
-  React-RCTActionSheet: 4b45da334a175b24dabe75f856b98fed3dfd6201
-  React-RCTAnimation: d6237386cb04500889877845b3e9e9291146bc2e
-  React-RCTBlob: bc9e2cd738c43bd2948e862e371402ef9584730a
-  React-RCTImage: 9f8cac465c6e5837007f59ade2a0a741016dd6a3
-  React-RCTLinking: 5073abb7d30cc0824b2172bd4582fc15bfc40510
-  React-RCTNetwork: 28ff94aa7d8fc117fc800b87dd80869a00d2bef3
-  React-RCTSettings: f27aa036f7270fe6ca43f8cdd1819e821fa429a0
-  React-RCTText: 7cb6f86fa7bc86f22f16333ad243b158e63b2a68
-  React-RCTVibration: 9e344c840176b0af9c84d5019eb4fed8b3c105a1
-  React-runtimeexecutor: 7285b499d0339104b2813a1f58ad1ada4adbd6c0
-  ReactCommon: bf2888a826ceedf54b99ad1b6182d1bc4a8a3984
+  React-perflogger: 0b0500685176e53ea582c45179a653aa82e4ae49
+  React-RCTActionSheet: 38469be9d20242f9c717e43c2983e8e3e6c640c4
+  React-RCTAnimation: 93774f3e8857e7c3c1cbbd277056d02be4496be1
+  React-RCTBlob: 6d0567d7a6561b62feb8c3b1cc33b3c591ba85ab
+  React-RCTImage: 1006a91318a6181a0256b89d2e321b6ea0e2e6e3
+  React-RCTLinking: 0b2300493c879c3bcac2d4c6b0178e8d0e5e2202
+  React-RCTNetwork: b9a33a95703651abed92490e50396d54b7270a17
+  React-RCTSettings: e6464123e5b5062fc23bb5adb51188a6061e9601
+  React-RCTText: 188d6f0ae20cd28891f59ecad41028ee2f793757
+  React-RCTVibration: a67beb7d2f3c73e9b74c4124ef61b84c601be649
+  React-runtimeexecutor: 088723cf020113e64736a709f52719dbb359c73e
+  ReactCommon: 1a4f19f3b4366feec03a98bdbb200b6085c5000f
   RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3
   RNCAsyncStorage: ea6b5c280997b2b32a587793163b1f10e580c4f7
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
@@ -770,8 +781,8 @@ SPEC CHECKSUMS:
   RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
   RNSVG: f3b60aeeaa81960e2e0536c3a9eef50b667ef3a9
   RNWatch: dae6c858a2051dbdcfb00b9a86cf4d90400263b4
-  Yoga: 17cd9a50243093b547c1e539c749928dd68152da
+  Yoga: c926c8eec5c78a788b51e6c8a604825d00d694d7
 
-PODFILE CHECKSUM: a437875b597d999a137c671b1da54153fe31d23f
+PODFILE CHECKSUM: e671cdcdb80fab67e305861c36bfae8ed5a5b0ef
 
 COCOAPODS: 1.11.3

ios/app/app.xcodeproj/project.pbxproj

@@ -31,11 +31,11 @@
 		4EB0603C260E09D000F524C5 /* SocketConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB06039260E09D000F524C5 /* SocketConnection.swift */; };
 		4EB0603D260E09D000F524C5 /* DarwinNotificationCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603A260E09D000F524C5 /* DarwinNotificationCenter.swift */; };
 		4EB0603E260E09D000F524C5 /* SampleUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603B260E09D000F524C5 /* SampleUploader.swift */; };
-		DE050389256E904600DEE3A5 /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE050388256E904600DEE3A5 /* WebRTC.xcframework */; };
-		DE05038A256E904600DEE3A5 /* WebRTC.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE050388256E904600DEE3A5 /* WebRTC.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */; };
 		DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; };
 		DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		DED016F128ECBC9D009D5E8D /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */; };
+		DED016F228ECBC9D009D5E8D /* WebRTC.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E588011722789D43008B0561 /* JitsiMeetContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = E58801132278944E008B0561 /* JitsiMeetContext.swift */; };
 		E5C97B63227A1EB400199214 /* JitsiMeetCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */; };
 		FD572B9827EDF32300A800FB /* GiphyUISDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD572B9727EDF32300A800FB /* GiphyUISDK.xcframework */; };
@@ -75,7 +75,7 @@
 			files = (
 				DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */,
 				FD572B9927EDF32300A800FB /* GiphyUISDK.xcframework in Embed Frameworks */,
-				DE05038A256E904600DEE3A5 /* WebRTC.xcframework in Embed Frameworks */,
+				DED016F228ECBC9D009D5E8D /* WebRTC.xcframework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -158,6 +158,7 @@
 		DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRUtilities.m; sourceTree = "<group>"; };
 		DE4C456021DE1E4E00EA0709 /* FIRUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRUtilities.h; sourceTree = "<group>"; };
 		DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = ../Pods/JitsiWebRTC/WebRTC.xcframework; sourceTree = "<group>"; };
 		DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.xcframework"; sourceTree = "<group>"; };
 		E58801132278944E008B0561 /* JitsiMeetContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetContext.swift; sourceTree = "<group>"; };
 		E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetCommands.swift; sourceTree = "<group>"; };
@@ -176,7 +177,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DE050389256E904600DEE3A5 /* WebRTC.xcframework in Frameworks */,
+				DED016F128ECBC9D009D5E8D /* WebRTC.xcframework in Frameworks */,
 				DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */,
 				FD572B9827EDF32300A800FB /* GiphyUISDK.xcframework in Frameworks */,
 				2681BB562C7A0B42CFBA6719 /* libPods-JitsiMeet.a in Frameworks */,
@@ -204,6 +205,7 @@
 		0B26BE711EC5BC4D00EEFB41 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */,
 				FD572B9727EDF32300A800FB /* GiphyUISDK.xcframework */,
 				DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */,
 				DE050388256E904600DEE3A5 /* WebRTC.xcframework */,
@@ -854,7 +856,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = FC967L3QRG;
-				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				INFOPLIST_FILE = src/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -885,7 +886,6 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = FC967L3QRG;
-				ENABLE_BITCODE = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				INFOPLIST_FILE = src/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1003,7 +1003,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
@@ -1064,7 +1063,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				ENABLE_BITCODE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";

ios/app/src/AppDelegate.m

@@ -124,4 +124,10 @@
                                            options:options];
 }
 
+- (UIInterfaceOrientationMask)application:(UIApplication *)application
+  supportedInterfaceOrientationsForWindow:(UIWindow *)window {
+    return [[JitsiMeet sharedInstance] application:application 
+           supportedInterfaceOrientationsForWindow:window];
+}
+
 @end

ios/fastlane/Fastfile

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

ios/scripts/release-sdk-lite.sh

@@ -15,7 +15,7 @@ echo "Releasing Jitsi Meet SDK Lite ${SDK_VERSION}"
 pushd ${RELEASE_REPO}
 
 # Generate podspec file
-cat JitsiMeetSDKLite.podspec.tpl | sed -e s/VERSION/${SDK_VERSION}/g > JitsiMeetSDKLite.podspec
+cat JitsiMeetSDKLite.podspec.tpl | sed -e s/VERSION/${SDK_VERSION}-lite/g > JitsiMeetSDKLite.podspec
 
 # Cleanup
 rm -rf lite/Frameworks/*
@@ -35,7 +35,6 @@ xcodebuild archive \
     -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 \
@@ -45,7 +44,6 @@ xcodebuild archive \
     -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 \
@@ -66,7 +64,7 @@ cp -a ${PROJECT_REPO}/ios/sdk/out/JitsiMeetSDK.xcframework lite/Frameworks/
 if [[ $DO_GIT_TAG == 1 ]]; then
     git add -A .
     git commit -m "${SDK_VERSION} lite"
-    git tag "lite-${SDK_VERSION}"
+    git tag "${SDK_VERSION}-lite"
 fi
 
 popd

ios/scripts/release-sdk.sh

@@ -12,8 +12,6 @@ DO_GIT_TAG=${GIT_TAG:-0}
 
 echo "Releasing Jitsi Meet SDK ${SDK_VERSION}"
 
-${THIS_DIR}/../../node_modules/react-native-webrtc/tools/downloadBitcode.sh
-
 pushd ${RELEASE_REPO}
 
 # Generate podspec file
@@ -37,7 +35,6 @@ xcodebuild archive \
     -sdk iphonesimulator \
     -destination='generic/platform=iOS Simulator' \
     -archivePath ios/sdk/out/ios-simulator \
-    ENABLE_BITCODE=YES \
     SKIP_INSTALL=NO \
     BUILD_LIBRARY_FOR_DISTRIBUTION=YES
 xcodebuild archive \
@@ -47,7 +44,6 @@ xcodebuild archive \
     -sdk iphoneos \
     -destination='generic/platform=iOS' \
     -archivePath ios/sdk/out/ios-device \
-    ENABLE_BITCODE=YES \
     SKIP_INSTALL=NO \
     BUILD_LIBRARY_FOR_DISTRIBUTION=YES
 xcodebuild -create-xcframework \

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -23,24 +23,29 @@
 		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 */; };
+		4E0EF63028CA2FB3005D1B03 /* JMCallKitEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E0EF62E28CA2FB3005D1B03 /* JMCallKitEmitter.h */; };
+		4E0EF63128CA2FB3005D1B03 /* JMCallKitEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E0EF62E28CA2FB3005D1B03 /* JMCallKitEmitter.h */; };
+		4E0EF63228CA2FB3005D1B03 /* JMCallKitEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0EF62F28CA2FB3005D1B03 /* JMCallKitEmitter.m */; };
+		4E0EF63328CA2FB3005D1B03 /* JMCallKitEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0EF62F28CA2FB3005D1B03 /* JMCallKitEmitter.m */; };
+		4E0EF63528CA317E005D1B03 /* JMCallKitListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E0EF63428CA317E005D1B03 /* JMCallKitListener.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4E0EF63628CA317E005D1B03 /* JMCallKitListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E0EF63428CA317E005D1B03 /* JMCallKitListener.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4E0EF63928CA4069005D1B03 /* JMCallKitProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E0EF63728CA4069005D1B03 /* JMCallKitProxy.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4E0EF63A28CA4069005D1B03 /* JMCallKitProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E0EF63728CA4069005D1B03 /* JMCallKitProxy.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4E0EF63B28CA4069005D1B03 /* JMCallKitProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0EF63828CA4069005D1B03 /* JMCallKitProxy.m */; };
+		4E0EF63C28CA4069005D1B03 /* JMCallKitProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0EF63828CA4069005D1B03 /* JMCallKitProxy.m */; };
 		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 */; };
-		4EBA6E62286072E300B31882 /* JitsiMeetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EBA6E60286072E300B31882 /* JitsiMeetViewController.m */; };
-		4EBA6E652860B1E800B31882 /* JitsiMeetRenderingView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EBA6E632860B1E800B31882 /* JitsiMeetRenderingView.h */; };
-		4EBA6E662860B1E800B31882 /* JitsiMeetRenderingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EBA6E642860B1E800B31882 /* JitsiMeetRenderingView.m */; };
+		4E812F3328F9A4290087ACC9 /* JitsiMeetView+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E812F3228F9A4290087ACC9 /* JitsiMeetView+Private.h */; };
+		4E812F3428F9A4290087ACC9 /* JitsiMeetView+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E812F3228F9A4290087ACC9 /* JitsiMeetView+Private.h */; };
+		4E812F3928F9A4ED0087ACC9 /* JitsiMeetView+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E812F3628F9A4ED0087ACC9 /* JitsiMeetView+Private.m */; };
+		4E812F3A28F9A4ED0087ACC9 /* JitsiMeetView+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E812F3628F9A4ED0087ACC9 /* JitsiMeetView+Private.m */; };
 		4ED4FFF32721B9B90074E620 /* JitsiAudioSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ED4FFF12721B9B90074E620 /* JitsiAudioSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		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 */; };
 		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 */; };
-		C69EFA0C209A0F660027712B /* JMCallKitEmitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C69EFA09209A0F650027712B /* JMCallKitEmitter.swift */; };
-		C69EFA0D209A0F660027712B /* JMCallKitProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C69EFA0A209A0F660027712B /* JMCallKitProxy.swift */; };
-		C69EFA0E209A0F660027712B /* JMCallKitListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = C69EFA0B209A0F660027712B /* JMCallKitListener.swift */; };
 		C6A34261204EF76800E062DD /* DragGestureController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A3425E204EF76800E062DD /* DragGestureController.swift */; };
 		C6CC49AF207412CF000DFA42 /* PiPViewCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6CC49AE207412CF000DFA42 /* PiPViewCoordinator.swift */; };
 		C81E9AB925AC5AD800B134D9 /* ExternalAPI.h in Headers */ = {isa = PBXBuildFile; fileRef = C81E9AB825AC5AD800B134D9 /* ExternalAPI.h */; };
@@ -49,8 +54,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, ); }; };
@@ -65,20 +68,16 @@
 		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 */; };
@@ -93,15 +92,10 @@
 		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 */; };
@@ -139,17 +133,18 @@
 		0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0BD906E81EC0C00300C8C18E /* JitsiMeet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeet.h; sourceTree = "<group>"; };
 		0BD906E91EC0C00300C8C18E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		4E0EF62E28CA2FB3005D1B03 /* JMCallKitEmitter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JMCallKitEmitter.h; sourceTree = "<group>"; };
+		4E0EF62F28CA2FB3005D1B03 /* JMCallKitEmitter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JMCallKitEmitter.m; sourceTree = "<group>"; };
+		4E0EF63428CA317E005D1B03 /* JMCallKitListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JMCallKitListener.h; sourceTree = "<group>"; };
+		4E0EF63728CA4069005D1B03 /* JMCallKitProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JMCallKitProxy.h; sourceTree = "<group>"; };
+		4E0EF63828CA4069005D1B03 /* JMCallKitProxy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JMCallKitProxy.m; sourceTree = "<group>"; };
 		4E51B76225E5345E0038575A /* ScheenshareEventEmiter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScheenshareEventEmiter.h; sourceTree = "<group>"; };
 		4E51B76325E5345E0038575A /* ScheenshareEventEmiter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ScheenshareEventEmiter.m; sourceTree = "<group>"; };
-		4EBA6E5F286072E300B31882 /* JitsiMeetViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetViewController.h; sourceTree = "<group>"; };
-		4EBA6E60286072E300B31882 /* JitsiMeetViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetViewController.m; sourceTree = "<group>"; };
-		4EBA6E632860B1E800B31882 /* JitsiMeetRenderingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetRenderingView.h; sourceTree = "<group>"; };
-		4EBA6E642860B1E800B31882 /* JitsiMeetRenderingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetRenderingView.m; sourceTree = "<group>"; };
+		4E812F3228F9A4290087ACC9 /* JitsiMeetView+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetView+Private.h"; sourceTree = "<group>"; };
+		4E812F3628F9A4ED0087ACC9 /* JitsiMeetView+Private.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "JitsiMeetView+Private.m"; sourceTree = "<group>"; };
 		4ED4FFF12721B9B90074E620 /* JitsiAudioSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiAudioSession.h; sourceTree = "<group>"; };
 		4ED4FFF22721B9B90074E620 /* JitsiAudioSession.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiAudioSession.m; sourceTree = "<group>"; };
 		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>"; };
@@ -161,9 +156,6 @@
 		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>"; };
-		C69EFA0A209A0F660027712B /* JMCallKitProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JMCallKitProxy.swift; sourceTree = "<group>"; };
-		C69EFA0B209A0F660027712B /* JMCallKitListener.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JMCallKitListener.swift; sourceTree = "<group>"; };
 		C6A3425E204EF76800E062DD /* DragGestureController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DragGestureController.swift; sourceTree = "<group>"; };
 		C6CC49AE207412CF000DFA42 /* PiPViewCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PiPViewCoordinator.swift; sourceTree = "<group>"; };
 		C81E9AB825AC5AD800B134D9 /* ExternalAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExternalAPI.h; sourceTree = "<group>"; };
@@ -172,7 +164,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>"; };
@@ -278,14 +269,10 @@
 				DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */,
 				DE65AACB2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h */,
 				DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */,
+				4E812F3228F9A4290087ACC9 /* JitsiMeetView+Private.h */,
+				4E812F3628F9A4ED0087ACC9 /* JitsiMeetView+Private.m */,
 				0B412F161EDEC65D00B1A0A6 /* JitsiMeetView.h */,
-				4EEC962E286C73A2008705FA /* JitsiMeetView+Private.h */,
-				4EEC962F286C73A2008705FA /* JitsiMeetView+Private.m */,
 				0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */,
-				4EBA6E632860B1E800B31882 /* JitsiMeetRenderingView.h */,
-				4EBA6E642860B1E800B31882 /* JitsiMeetRenderingView.m */,
-				4EBA6E5F286072E300B31882 /* JitsiMeetViewController.h */,
-				4EBA6E60286072E300B31882 /* JitsiMeetViewController.m */,
 				DE81A2D72316AC7600AE1940 /* LogBridge.m */,
 				DE65AAC92317FFCD00290BEC /* LogUtils.h */,
 				DEAFA777229EAD3B0033A7FA /* RNRootView.h */,
@@ -306,7 +293,6 @@
 				4E51B76225E5345E0038575A /* ScheenshareEventEmiter.h */,
 				4E51B76325E5345E0038575A /* ScheenshareEventEmiter.m */,
 				DE9A0170289A9A9A00E41CBB /* Lite-Info.plist */,
-				DE66914328BCC1C7007C4533 /* JitsiMeetSDK-Swift.h */,
 			);
 			path = src;
 			sourceTree = "<group>";
@@ -349,9 +335,11 @@
 			isa = PBXGroup;
 			children = (
 				0BB9AD7A1F5EC8F4001C08DB /* CallKit.m */,
-				C69EFA09209A0F650027712B /* JMCallKitEmitter.swift */,
-				C69EFA0B209A0F660027712B /* JMCallKitListener.swift */,
-				C69EFA0A209A0F660027712B /* JMCallKitProxy.swift */,
+				4E0EF62E28CA2FB3005D1B03 /* JMCallKitEmitter.h */,
+				4E0EF62F28CA2FB3005D1B03 /* JMCallKitEmitter.m */,
+				4E0EF63428CA317E005D1B03 /* JMCallKitListener.h */,
+				4E0EF63728CA4069005D1B03 /* JMCallKitProxy.h */,
+				4E0EF63828CA4069005D1B03 /* JMCallKitProxy.m */,
 			);
 			path = callkit;
 			sourceTree = "<group>";
@@ -379,18 +367,18 @@
 				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 */,
+				4E0EF63528CA317E005D1B03 /* JMCallKitListener.h in Headers */,
+				4E0EF63028CA2FB3005D1B03 /* JMCallKitEmitter.h in Headers */,
 				4ED4FFF32721B9B90074E620 /* JitsiAudioSession.h in Headers */,
-				4EEC9630286C73A2008705FA /* JitsiMeetView+Private.h in Headers */,
+				4E0EF63928CA4069005D1B03 /* JMCallKitProxy.h in Headers */,
 				0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */,
 				DE81A2D42316AC4D00AE1940 /* JitsiMeetLogger.h in Headers */,
 				DE65AACA2317FFCD00290BEC /* LogUtils.h in Headers */,
-				4EBA6E61286072E300B31882 /* JitsiMeetViewController.h in Headers */,
 				DEAD3226220C497000E93636 /* JitsiMeetConferenceOptions.h in Headers */,
 				C81E9AB925AC5AD800B134D9 /* ExternalAPI.h in Headers */,
 				C8AFD27F2462C613000293D2 /* InfoPlistUtil.h in Headers */,
+				4E812F3328F9A4290087ACC9 /* JitsiMeetView+Private.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -405,18 +393,18 @@
 				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 */,
+				4E0EF63628CA317E005D1B03 /* JMCallKitListener.h in Headers */,
+				4E0EF63128CA2FB3005D1B03 /* JMCallKitEmitter.h in Headers */,
 				DE9A0139289A9A9A00E41CBB /* JitsiAudioSession.h in Headers */,
-				DE9A013A289A9A9A00E41CBB /* JitsiMeetView+Private.h in Headers */,
+				4E0EF63A28CA4069005D1B03 /* JMCallKitProxy.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 */,
+				4E812F3428F9A4290087ACC9 /* JitsiMeetView+Private.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -677,8 +665,9 @@
 			files = (
 				0BB9AD7B1F5EC8F4001C08DB /* CallKit.m in Sources */,
 				DE81A2DF2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m in Sources */,
-				4EBA6E662860B1E800B31882 /* JitsiMeetRenderingView.m in Sources */,
+				4E0EF63B28CA4069005D1B03 /* JMCallKitProxy.m in Sources */,
 				4ED4FFF42721B9B90074E620 /* JitsiAudioSession.m in Sources */,
+				4E812F3928F9A4ED0087ACC9 /* JitsiMeetView+Private.m in Sources */,
 				0BB9AD7D1F60356D001C08DB /* AppInfo.m in Sources */,
 				DE81A2D92316AC7600AE1940 /* LogBridge.m in Sources */,
 				DEAFA779229EAD520033A7FA /* RNRootView.m in Sources */,
@@ -692,16 +681,12 @@
 				DEFC743F21B178FA00E4DD96 /* LocaleDetector.m in Sources */,
 				0BCA495F1EC4B6C600B793EE /* AudioMode.m in Sources */,
 				0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */,
-				C69EFA0C209A0F660027712B /* JMCallKitEmitter.swift in Sources */,
+				4E0EF63228CA2FB3005D1B03 /* JMCallKitEmitter.m in Sources */,
 				DEFE535621FB2E8300011A3A /* ReactUtils.m in Sources */,
-				4EEC9631286C73A2008705FA /* JitsiMeetView+Private.m in Sources */,
 				C6A34261204EF76800E062DD /* DragGestureController.swift in Sources */,
 				4E51B76525E5345E0038575A /* ScheenshareEventEmiter.m in Sources */,
 				A4A934E9212F3ADB001E9388 /* Dropbox.m in Sources */,
-				4EBA6E62286072E300B31882 /* JitsiMeetViewController.m in Sources */,
-				C69EFA0D209A0F660027712B /* JMCallKitProxy.swift in Sources */,
 				DE81A2D52316AC4D00AE1940 /* JitsiMeetLogger.m in Sources */,
-				C69EFA0E209A0F660027712B /* JMCallKitListener.swift in Sources */,
 				0B412F191EDEC65D00B1A0A6 /* JitsiMeetView.m in Sources */,
 				DEFE535421FB1BF800011A3A /* JitsiMeet.m in Sources */,
 				DE438CDA2350934700DD541D /* JavaScriptSandbox.m in Sources */,
@@ -714,8 +699,8 @@
 			files = (
 				DE9A0143289A9A9A00E41CBB /* CallKit.m in Sources */,
 				DE9A0144289A9A9A00E41CBB /* JitsiMeetBaseLogHandler.m in Sources */,
-				DE9A0145289A9A9A00E41CBB /* JitsiMeetRenderingView.m in Sources */,
 				DE9A0146289A9A9A00E41CBB /* JitsiAudioSession.m in Sources */,
+				4E0EF63C28CA4069005D1B03 /* JMCallKitProxy.m in Sources */,
 				DE9A0147289A9A9A00E41CBB /* AppInfo.m in Sources */,
 				DE9A0148289A9A9A00E41CBB /* LogBridge.m in Sources */,
 				DE9A0149289A9A9A00E41CBB /* RNRootView.m in Sources */,
@@ -729,15 +714,12 @@
 				DE9A0151289A9A9A00E41CBB /* LocaleDetector.m in Sources */,
 				DE9A0152289A9A9A00E41CBB /* AudioMode.m in Sources */,
 				DE9A0153289A9A9A00E41CBB /* Proximity.m in Sources */,
-				DE9A0154289A9A9A00E41CBB /* JMCallKitEmitter.swift in Sources */,
+				4E812F3A28F9A4ED0087ACC9 /* JitsiMeetView+Private.m 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 */,
+				4E0EF63328CA2FB3005D1B03 /* JMCallKitEmitter.m in Sources */,
 				DE9A015E289A9A9A00E41CBB /* JitsiMeetView.m in Sources */,
 				DE9A015F289A9A9A00E41CBB /* JitsiMeet.m in Sources */,
 				DE9A0160289A9A9A00E41CBB /* JavaScriptSandbox.m in Sources */,
@@ -782,7 +764,6 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
@@ -845,7 +826,6 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_BITCODE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
@@ -882,7 +862,6 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				INFOPLIST_FILE = src/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -912,7 +891,6 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				INFOPLIST_FILE = src/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -941,7 +919,6 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
@@ -976,7 +953,6 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",

ios/sdk/src/JitsiMeet.h

@@ -57,6 +57,9 @@
             openURL:(NSURL *_Nonnull)url
             options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *_Nonnull)options;
 
+- (UIInterfaceOrientationMask)application:(UIApplication *)application
+  supportedInterfaceOrientationsForWindow:(UIWindow *)window;
+
 #pragma mark - Utility methods
 
 /**

ios/sdk/src/JitsiMeet.m

@@ -16,6 +16,7 @@
 
 #import <Intents/Intents.h>
 #import <WebRTC/RTCLogging.h>
+#import "Orientation.h"
 
 #import "JitsiMeet+Private.h"
 #import "JitsiMeetConferenceOptions+Private.h"
@@ -127,6 +128,10 @@
     return true;
 }
 
+- (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window {
+    return [Orientation getOrientation];
+}
+
 #pragma mark - Utility methods
 
 - (void)instantiateReactNativeBridge {

ios/sdk/src/JitsiMeetRenderingView.m

@@ -1,83 +0,0 @@
-/*
- * Copyright @ 2022-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <mach/mach_time.h>
-
-#import "JitsiMeetRenderingView.h"
-#import "ReactUtils.h"
-#import "RNRootView.h"
-#import "JitsiMeet+Private.h"
-
-/**
- * Backwards compatibility: turn the boolean prop into a feature flag.
- */
-static NSString *const PiPEnabledFeatureFlag = @"pip.enabled";
-
-@interface JitsiMeetRenderingView ()
-@end
-
-@implementation JitsiMeetRenderingView {
-    /**
-     * React Native view where the entire content will be rendered.
-     */
-    RNRootView *rootView;
-}
-
-/**
- * Passes the given props to the React Native application. The props which we pass
- * are a combination of 3 different sources:
- *
- * - JitsiMeet.defaultConferenceOptions
- * - This function's parameters
- * - Some extras which are added by this function
- */
-- (void)setProps:(NSDictionary *_Nonnull)newProps {
-    NSMutableDictionary *props = mergeProps([[JitsiMeet sharedInstance] getDefaultProps], newProps);
-
-    // Set the PiP flag if it wasn't manually set.
-    NSMutableDictionary *featureFlags = props[@"flags"];
-    // TODO: temporary implementation
-    if (featureFlags[PiPEnabledFeatureFlag] == nil) {
-        featureFlags[PiPEnabledFeatureFlag] = @(self.isPiPEnabled);
-    }
-
-    // This method is supposed to be imperative i.e. a second
-    // invocation with one and the same URL is expected to join the respective
-    // conference again if the first invocation was followed 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 imperativeness
-    // in React Component props by defining a unique value per invocation.
-    props[@"timestamp"] = @(mach_absolute_time());
-
-    if (rootView) {
-        // Update props with the new URL.
-        rootView.appProperties = props;
-    } else {
-        RCTBridge *bridge = [[JitsiMeet sharedInstance] getReactBridge];
-        rootView = [[RNRootView alloc] initWithBridge:bridge
-                                           moduleName:@"App"
-                                    initialProperties:props];
-        rootView.backgroundColor = self.backgroundColor;
-
-        // Add rootView as a subview which completely covers this one.
-        [rootView setFrame:[self bounds]];
-        rootView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-        [self addSubview:rootView];
-    }
-}
-
-@end

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/JitsiMeetSDK.h

@@ -22,3 +22,5 @@
 #import <JitsiMeetSDK/JitsiMeetBaseLogHandler.h>
 #import <JitsiMeetSDK/JitsiAudioSession.h>
 #import <JitsiMeetSDK/InfoPlistUtil.h>
+#import <JitsiMeetSDK/JMCallKitListener.h>
+#import <JitsiMeetSDK/JMCallKitProxy.h>

ios/sdk/src/JitsiMeetView.m

@@ -20,22 +20,23 @@
 #import "ExternalAPI.h"
 #import "JitsiMeet+Private.h"
 #import "JitsiMeetConferenceOptions+Private.h"
-#import "JitsiMeetView.h"
-#import "JitsiMeetViewController.h"
+#import "JitsiMeetView+Private.h"
 #import "ReactUtils.h"
 #import "RNRootView.h"
 
-@interface JitsiMeetView ()
 
-@property (nonatomic, strong) JitsiMeetViewController *jitsiMeetViewController;
-@property (nonatomic, strong) UINavigationController *navController;
-@property (nonatomic, readonly) BOOL isPiPEnabled;
+/**
+ * Backwards compatibility: turn the boolean prop into a feature flag.
+ */
+static NSString *const PiPEnabledFeatureFlag = @"pip.enabled";
 
-@end
 
-@implementation JitsiMeetView
-
-@dynamic isPiPEnabled;
+@implementation JitsiMeetView {
+    /**
+     * React Native view where the entire content will be rendered.
+     */
+    RNRootView *rootView;
+}
 
 #pragma mark Initializers
 
@@ -66,10 +67,6 @@
     return self;
 }
 
-- (void)dealloc {
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
 /**
  * Internal initialization:
  *
@@ -77,57 +74,72 @@
  * - initializes the external API scope
  */
 - (void)initWithXXX {
-    self.jitsiMeetViewController = [[JitsiMeetViewController alloc] init];
-    self.jitsiMeetViewController.view.frame = [self bounds];
-    [self addSubview:self.jitsiMeetViewController.view];
+    // Set a background color which is in accord with the JavaScript and Android
+    // parts of the application and causes less perceived visual flicker than
+    // the default background color.
+    self.backgroundColor
+        = [UIColor colorWithRed:.07f green:.07f blue:.07f alpha:1];
     
     [self registerObservers];
 }
 
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 #pragma mark API
 
 - (void)join:(JitsiMeetConferenceOptions *)options {
-    [self.jitsiMeetViewController join:options withPiP:self.isPiPEnabled];
+    [self setProps:options == nil ? @{} : [options asProps]];
 }
 
 - (void)leave {
-    [self.jitsiMeetViewController leave];
+    [self setProps:@{}];
 }
 
 - (void)hangUp {
-    [self.jitsiMeetViewController hangUp];
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI sendHangUp];
 }
 
 - (void)setAudioMuted:(BOOL)muted {
-    [self.jitsiMeetViewController setAudioMuted:muted];
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI sendSetAudioMuted:muted];
 }
 
 - (void)sendEndpointTextMessage:(NSString * _Nonnull)message :(NSString * _Nullable)to {
-    [self.jitsiMeetViewController sendEndpointTextMessage:message :to];
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI sendEndpointTextMessage:message :to];
 }
 
 - (void)toggleScreenShare:(BOOL)enabled {
-    [self.jitsiMeetViewController toggleScreenShare:enabled];
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI toggleScreenShare:enabled];
 }
 
 - (void)retrieveParticipantsInfo:(void (^ _Nonnull)(NSArray * _Nullable))completionHandler {
-    [self.jitsiMeetViewController retrieveParticipantsInfo:completionHandler];
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI retrieveParticipantsInfo:completionHandler];
 }
 
 - (void)openChat:(NSString*)to  {
-    [self.jitsiMeetViewController openChat:to];
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI openChat:to];
 }
 
 - (void)closeChat  {
-    [self.jitsiMeetViewController closeChat];
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI closeChat];
 }
 
 - (void)sendChatMessage:(NSString * _Nonnull)message :(NSString * _Nullable)to {
-    [self.jitsiMeetViewController sendChatMessage:message :to];
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI sendChatMessage:message :to];
 }
 
 - (void)setVideoMuted:(BOOL)muted {
-    [self.jitsiMeetViewController setVideoMuted:muted];
+    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
+    [externalAPI sendSetVideoMuted:muted];
 }
 
 - (void)setClosedCaptionsEnabled:(BOOL)enabled {
@@ -135,47 +147,97 @@
     [externalAPI sendSetClosedCaptionsEnabled:enabled];
 }
 
-#pragma mark Private
-
-- (BOOL)isPiPEnabled {
-    return self.delegate && [self.delegate respondsToSelector:@selector(enterPictureInPicture:)];
-}
+#pragma mark Private methods
 
 - (void)registerObservers {
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleUpdateViewPropsNotification:) name:updateViewPropsNotificationName object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleSendEventNotification:) name:sendEventNotificationName object:nil];
+ }
+
+- (void)handleUpdateViewPropsNotification:(NSNotification *)notification {
+    NSDictionary *props = [notification.userInfo objectForKey:@"props"];
+    [self setProps:props];
 }
 
 - (void)handleSendEventNotification:(NSNotification *)notification {
     NSString *eventName = notification.userInfo[@"name"];
     NSString *eventData = notification.userInfo[@"data"];
-    
-    SEL sel = NSSelectorFromString([self methodNameFromEventName:eventName]);
 
+    SEL sel = NSSelectorFromString([self methodNameFromEventName:eventName]);
     if (sel && [self.delegate respondsToSelector:sel]) {
         [self.delegate performSelector:sel withObject:eventData];
     }
 }
 
 /**
- * Converts a specific event name i.e. redux action type description to a
- * method name.
+  * Converts a specific event name i.e. redux action type description to a
+  * method name.
+  *
+  * @param eventName The event name to convert to a method name.
+  * @return A method name constructed from the specified `eventName`.
+  */
+ - (NSString *)methodNameFromEventName:(NSString *)eventName {
+    NSMutableString *methodName
+        = [NSMutableString stringWithCapacity:eventName.length];
+
+    for (NSString *c in [eventName componentsSeparatedByString:@"_"]) {
+        if (c.length) {
+            [methodName appendString:
+                methodName.length ? c.capitalizedString : c.lowercaseString];
+        }
+    }
+    [methodName appendString:@":"];
+
+    return methodName;
+ }
+
+/**
+ * Passes the given props to the React Native application. The props which we pass
+ * are a combination of 3 different sources:
  *
- * @param eventName The event name to convert to a method name.
- * @return A method name constructed from the specified `eventName`.
+ * - JitsiMeet.defaultConferenceOptions
+ * - This function's parameters
+ * - Some extras which are added by this function
  */
-- (NSString *)methodNameFromEventName:(NSString *)eventName {
-   NSMutableString *methodName
-       = [NSMutableString stringWithCapacity:eventName.length];
+- (void)setProps:(NSDictionary *_Nonnull)newProps {
+    NSMutableDictionary *props = mergeProps([[JitsiMeet sharedInstance] getDefaultProps], newProps);
 
-   for (NSString *c in [eventName componentsSeparatedByString:@"_"]) {
-       if (c.length) {
-           [methodName appendString:
-               methodName.length ? c.capitalizedString : c.lowercaseString];
-       }
-   }
-   [methodName appendString:@":"];
+    // Set the PiP flag if it wasn't manually set.
+    NSMutableDictionary *featureFlags = props[@"flags"];
+    if (featureFlags[PiPEnabledFeatureFlag] == nil) {
+        featureFlags[PiPEnabledFeatureFlag]
+            = [NSNumber numberWithBool:
+               self.delegate && [self.delegate respondsToSelector:@selector(enterPictureInPicture:)]];
+    }
 
-   return methodName;
+    // This method is supposed to be imperative i.e. a second
+    // invocation with one and the same URL is expected to join the respective
+    // conference again if the first invocation was followed 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 imperativeness
+    // in React Component props by defining a unique value per invocation.
+    props[@"timestamp"] = @(mach_absolute_time());
+
+    if (rootView) {
+        // Update props with the new URL.
+        rootView.appProperties = props;
+    } else {
+        RCTBridge *bridge = [[JitsiMeet sharedInstance] getReactBridge];
+        rootView
+            = [[RNRootView alloc] initWithBridge:bridge
+                                      moduleName:@"App"
+                               initialProperties:props];
+        rootView.backgroundColor = self.backgroundColor;
+
+        // Add rootView as a subview which completely covers this one.
+        [rootView setFrame:[self bounds]];
+        rootView.autoresizingMask
+            = UIViewAutoresizingFlexibleWidth
+                | UIViewAutoresizingFlexibleHeight;
+        [self addSubview:rootView];
+    }
 }
 
 @end

ios/sdk/src/JitsiMeetViewController.h

@@ -1,38 +0,0 @@
-/*
- * Copyright @ 2022-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <UIKit/UIKit.h>
-#import "JitsiMeetConferenceOptions.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface JitsiMeetViewController : UIViewController
-
-- (void)join:(JitsiMeetConferenceOptions *)options withPiP:(BOOL)enablePiP;
-- (void)leave;
-- (void)hangUp;
-- (void)setAudioMuted:(BOOL)muted;
-- (void)sendEndpointTextMessage:(NSString * _Nonnull)message :(NSString * _Nullable)to;
-- (void)toggleScreenShare:(BOOL)enabled;
-- (void)retrieveParticipantsInfo:(void (^ _Nonnull)(NSArray * _Nullable))completionHandler;
-- (void)openChat:(NSString*)to;
-- (void)closeChat;
-- (void)sendChatMessage:(NSString * _Nonnull)message :(NSString * _Nullable)to;
-- (void)setVideoMuted:(BOOL)muted;
-
-@end
-
-NS_ASSUME_NONNULL_END

ios/sdk/src/JitsiMeetViewController.m

@@ -1,127 +0,0 @@
-/*
- * Copyright @ 2022-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import "JitsiMeetViewController.h"
-#import "JitsiMeet+Private.h"
-#import "JitsiMeetConferenceOptions+Private.h"
-#import "JitsiMeetRenderingView.h"
-#import "JitsiMeetView+Private.h"
-
-@interface JitsiMeetViewController ()
-
-@property (strong, nonatomic) JitsiMeetRenderingView *view;
-
-@end
-
-@implementation JitsiMeetViewController
-
-@dynamic view;
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        [self registerObservers];
-    }
-    
-    return self;
-}
-
-- (void)dealloc {
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-- (void)loadView {
-    [super loadView];
-    
-    self.view = [[JitsiMeetRenderingView alloc] init];
-    self.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-
-    // Set a background color which is in accord with the JavaScript and Android
-    // parts of the application and causes less perceived visual flicker than
-    // the default background color.
-    self.view.backgroundColor = [UIColor colorWithRed:.07f green:.07f blue:.07f alpha:1];
-}
-
-- (void)join:(JitsiMeetConferenceOptions *)options withPiP:(BOOL)enablePiP {
-    self.view.isPiPEnabled = enablePiP;
-    [self.view setProps:options == nil ? @{} : [options asProps]];
-}
-
-- (void)leave {
-    [self.view setProps:@{}];
-}
-
-- (void)hangUp {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI sendHangUp];
-}
-
-- (void)setAudioMuted:(BOOL)muted {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI sendSetAudioMuted:muted];
-}
-
-- (void)sendEndpointTextMessage:(NSString * _Nonnull)message :(NSString * _Nullable)to {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI sendEndpointTextMessage:message :to];
-}
-
-- (void)toggleScreenShare:(BOOL)enabled {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI toggleScreenShare:enabled];
-}
-
-- (void)retrieveParticipantsInfo:(void (^ _Nonnull)(NSArray * _Nullable))completionHandler {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI retrieveParticipantsInfo:completionHandler];
-}
-
-- (void)openChat:(NSString*)to  {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI openChat:to];
-}
-
-- (void)closeChat  {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI closeChat];
-}
-
-- (void)sendChatMessage:(NSString * _Nonnull)message :(NSString * _Nullable)to {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI sendChatMessage:message :to];
-}
-
-- (void)setVideoMuted:(BOOL)muted {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI sendSetVideoMuted:muted];
-}
-
-#pragma mark Private
-
-- (void)registerObservers {
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleUpdateViewPropsNotification:) name:updateViewPropsNotificationName object:nil];
-}
-
-- (void)handleUpdateViewPropsNotification:(NSNotification *)notification {
-    NSDictionary *props = [notification.userInfo objectForKey:@"props"];
-    [self.view setProps:props];
-}
-
-@end

ios/sdk/src/callkit/CallKit.m

@@ -30,7 +30,7 @@
 #import <WebRTC/WebRTC.h>
 
 #import "../JitsiAudioSession.h"
-#import "../JitsiMeetSDK-Swift.h"
+#import "JMCallKitProxy.h"
 
 
 // The events emitted/supported by RNCallKit:

ios/sdk/src/callkit/JMCallKitEmitter.h

@@ -1,5 +1,6 @@
 /*
  * Copyright @ 2022-present 8x8, Inc.
+ * Copyright @ 2018-present Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,20 @@
  * limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
-#import "JitsiMeetViewDelegate.h"
+#import <CallKit/CallKit.h>
+#import <Foundation/Foundation.h>
+#import "JMCallKitListener.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface JitsiMeetRenderingView : UIView
+@interface JMCallKitEmitter : NSObject <CXProviderDelegate>
 
-@property (nonatomic, assign) BOOL isPiPEnabled;
+#pragma mark Add/Remove listeners
+- (void)addListener:(id<JMCallKitListener>)listener;
+- (void)removeListener:(id<JMCallKitListener>)listener;
 
-- (void)setProps:(NSDictionary *_Nonnull)newProps;
+#pragma mark Add mute action
+- (void)addMuteAction:(NSUUID *)actionUUID;
 
 @end
 

ios/sdk/src/callkit/JMCallKitEmitter.m

@@ -0,0 +1,117 @@
+/*
+ * Copyright @ 2022-present 8x8, Inc.
+ * Copyright @ 2018-present Atlassian Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import "JMCallKitEmitter.h"
+
+@interface JMCallKitEmitter()
+
+@property(nonatomic, strong) NSMutableArray<id<JMCallKitListener>> *listeners;
+@property(nonatomic, strong) NSMutableSet<NSUUID *> *pendingMuteActions;
+
+@end
+
+@implementation JMCallKitEmitter
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.listeners = [[NSMutableArray alloc] init];
+        self.pendingMuteActions = [[NSMutableSet alloc] init];
+    }
+    return self;
+}
+
+#pragma mark Add/Remove listeners
+
+- (void)addListener:(id<JMCallKitListener>)listener {
+    if (![self.listeners containsObject:listener]) {
+        [self.listeners addObject:listener];
+    }
+}
+
+- (void)removeListener:(id<JMCallKitListener>)listener {
+    [self.listeners removeObject:listener];
+}
+
+#pragma mark Add mute action
+
+- (void)addMuteAction:(NSUUID *)actionUUID {
+    [self.pendingMuteActions addObject:actionUUID];
+}
+
+#pragma mark CXProviderDelegate
+
+- (void)providerDidReset:(CXProvider *)provider {
+    for (id listener in self.listeners) {
+        [listener providerDidReset];
+    }
+    [self.pendingMuteActions removeAllObjects];
+}
+
+- (void)provider:(CXProvider *)provider performAnswerCallAction:(CXAnswerCallAction *)action {
+    for (id listener in self.listeners) {
+        [listener performAnswerCallWithUUID:action.callUUID];
+    }
+    [action fulfill];
+}
+
+- (void)provider:(CXProvider *)provider performEndCallAction:(CXEndCallAction *)action {
+    for (id listener in self.listeners) {
+        [listener performEndCallWithUUID:action.callUUID];
+    }
+    [action fulfill];
+}
+
+- (void)provider:(CXProvider *)provider performSetMutedCallAction:(CXSetMutedCallAction *)action {
+    NSUUID *uuid = ([self.pendingMuteActions containsObject:action.UUID]) ? action.UUID : nil;
+    [self.pendingMuteActions removeObject:action.UUID];
+    
+    // Avoid mute actions ping-pong: if the mute action was caused by
+    // the JS side (we requested a transaction) don't call the delegate
+    // method. If it was called by the provider itself (when the user presses
+    // the mute button in the CallKit view) then call the delegate method.
+    //
+    // NOTE: don't try to be clever and remove this. Been there, done that.
+    // Won't work.
+    if (uuid == nil) {
+        for (id listener in self.listeners) {
+            [listener performSetMutedCallWithUUID:action.callUUID isMuted:action.isMuted];
+        }
+    }
+    [action fulfill];
+}
+
+- (void)provider:(CXProvider *)provider performStartCallAction:(CXStartCallAction *)action {
+    for (id listener in self.listeners) {
+        [listener performStartCallWithUUID:action.callUUID isVideo:action.isVideo];
+    }
+    [action fulfill];
+}
+
+- (void)provider:(CXProvider *)provider didActivateAudioSession:(AVAudioSession *)audioSession {
+    for (id listener in self.listeners) {
+        [listener providerDidActivateAudioSessionWithSession:audioSession];
+    }
+}
+
+- (void)provider:(CXProvider *)provider didDeactivateAudioSession:(AVAudioSession *)audioSession {
+    for (id listener in self.listeners) {
+        [listener providerDidDeactivateAudioSessionWithSession:audioSession];
+    }
+}
+
+@end

ios/sdk/src/callkit/JMCallKitEmitter.swift

@@ -1,118 +0,0 @@
-/*
- * Copyright @ 2018-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import AVKit
-import CallKit
-import Foundation
-
-internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
-
-    private let listeners = NSMutableArray()
-    private var pendingMuteActions = Set<UUID>()
-
-    internal override init() {}
-
-    // MARK: - Add/remove listeners
-
-    func addListener(_ listener: JMCallKitListener) {
-        if (!listeners.contains(listener)) {
-            listeners.add(listener)
-        }
-    }
-
-    func removeListener(_ listener: JMCallKitListener) {
-        listeners.remove(listener)
-    }
-
-    // MARK: - Add mute action
-
-    func addMuteAction(_ actionUUID: UUID) {
-        pendingMuteActions.insert(actionUUID)
-    }
-
-    // MARK: - CXProviderDelegate
-
-    func providerDidReset(_ provider: CXProvider) {
-        listeners.forEach {
-            let listener = $0 as! JMCallKitListener
-            listener.providerDidReset?()
-        }
-        pendingMuteActions.removeAll()
-    }
-
-    func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
-        listeners.forEach {
-            let listener = $0 as! JMCallKitListener
-            listener.performAnswerCall?(UUID: action.callUUID)
-        }
-
-        action.fulfill()
-    }
-
-    func provider(_ provider: CXProvider, perform action: CXEndCallAction) {
-        listeners.forEach {
-            let listener = $0 as! JMCallKitListener
-            listener.performEndCall?(UUID: action.callUUID)
-        }
-
-        action.fulfill()
-    }
-
-    func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) {
-        let uuid = pendingMuteActions.remove(action.uuid)
-
-        // Avoid mute actions ping-pong: if the mute action was caused by
-        // the JS side (we requested a transaction) don't call the delegate
-        // method. If it was called by the provider itself (when the user presses
-        // the mute button in the CallKit view) then call the delegate method.
-        //
-        // NOTE: don't try to be clever and remove this. Been there, done that.
-        // Won't work.
-        if (uuid == nil) {
-            listeners.forEach {
-                let listener = $0 as! JMCallKitListener
-                listener.performSetMutedCall?(UUID: action.callUUID, isMuted: action.isMuted)
-            }
-        }
-
-        action.fulfill()
-    }
-
-    func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
-        listeners.forEach {
-            let listener = $0 as! JMCallKitListener
-            listener.performStartCall?(UUID: action.callUUID, isVideo: action.isVideo)
-        }
-
-        action.fulfill()
-    }
-
-    func provider(_ provider: CXProvider,
-                  didActivate audioSession: AVAudioSession) {
-        listeners.forEach {
-            let listener = $0 as! JMCallKitListener
-            listener.providerDidActivateAudioSession?(session: audioSession)
-        }
-    }
-
-    func provider(_ provider: CXProvider,
-                  didDeactivate audioSession: AVAudioSession) {
-        listeners.forEach {
-            let listener = $0 as! JMCallKitListener
-            listener.providerDidDeactivateAudioSession?(session: audioSession)
-        }
-    }
-}

ios/sdk/src/callkit/JMCallKitListener.h

@@ -0,0 +1,34 @@
+/*
+ * Copyright @ 2022-present 8x8, Inc.
+ * Copyright @ 2018-present Atlassian Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <AVKit/AVKit.h>
+#import <CallKit/CallKit.h>
+#import <Foundation/Foundation.h>
+
+@protocol JMCallKitListener <NSObject>
+
+@optional
+- (void)providerDidReset;
+- (void)performAnswerCallWithUUID:(nonnull NSUUID *)UUID;
+- (void)performEndCallWithUUID:(nonnull NSUUID *)UUID;
+- (void)performSetMutedCallWithUUID:(nonnull NSUUID *)UUID isMuted:(BOOL)isMuted;
+- (void)performStartCallWithUUID:(nonnull NSUUID *)UUID isVideo:(BOOL)isVideo;
+- (void)providerDidActivateAudioSessionWithSession:(nonnull AVAudioSession *)session;
+- (void)providerDidDeactivateAudioSessionWithSession:(nonnull AVAudioSession *)session;
+- (void)providerTimedOutPerformingActionWithAction:(nonnull CXAction *)action;
+
+@end

ios/sdk/src/callkit/JMCallKitListener.swift

@@ -1,38 +0,0 @@
-/*
- * Copyright @ 2018-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import AVKit
-import CallKit
-import Foundation
-
-@objc public protocol JMCallKitListener: NSObjectProtocol {
-
-    @objc optional func providerDidReset()
-
-    @objc optional func performAnswerCall(UUID: UUID)
-
-    @objc optional func performEndCall(UUID: UUID)
-
-    @objc optional func performSetMutedCall(UUID: UUID, isMuted: Bool)
-
-    @objc optional func performStartCall(UUID: UUID, isVideo: Bool)
-
-    @objc optional func providerDidActivateAudioSession(session: AVAudioSession)
-
-    @objc optional func providerDidDeactivateAudioSession(session: AVAudioSession)
-
-    @objc optional func providerTimedOutPerformingAction(action: CXAction)
-}

ios/sdk/src/callkit/JMCallKitProxy.h

@@ -0,0 +1,87 @@
+/*
+ * Copyright @ 2022-present 8x8, Inc.
+ * Copyright @ 2018-present Atlassian Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <CallKit/CallKit.h>
+#import <Foundation/Foundation.h>
+#import "JMCallKitListener.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol CXProviderProtocol <NSObject>
+
+@property (nonatomic, readwrite, copy) CXProviderConfiguration* configuration;
+
+- (void)setDelegate:(nullable id<CXProviderDelegate>)delegate queue:(nullable dispatch_queue_t)queue;
+- (void)reportNewIncomingCallWithUUID:(NSUUID *)uuid update:(CXCallUpdate *)update completion:(void (^)(NSError *))completion;
+- (void)reportCallWithUUID:(NSUUID *)uuid updated:(CXCallUpdate *)update;
+- (void)reportCallWithUUID:(NSUUID *)uuid endedAtDate:(NSDate *)dateEnded reason:(CXCallEndedReason)endedReason;
+- (void)reportOutgoingCallWithUUID:(NSUUID *)uuid startedConnectingAtDate:(NSDate *)dateStartedConnecting;
+- (void)reportOutgoingCallWithUUID:(NSUUID *)uuid connectedAtDate:(NSDate *)dateConnected;
+- (void)invalidate;
+
+@end
+
+#pragma mark -
+@protocol CXCallControllerProtocol <NSObject>
+
+@property (nonatomic, readonly) NSArray<CXCall*> *calls;
+
+- (void)requestTransaction:(CXTransaction *)transaction completion:(void (^)(NSError *_Nullable))completion;
+
+@end
+
+#pragma mark -
+
+/// JitsiMeet CallKit proxy
+// NOTE: The methods this class exposes are meant to be called in the UI thread.
+// All delegate methods called by JMCallKitEmitter will be called in the UI thread.
+@interface JMCallKitProxy : NSObject
+
+/// Enables the proxy in between CallKit and the consumers of the SDK.
+/// Defaults to disabled. Set to true when you want to use CallKit.
+@property (class) BOOL enabled;
+@property (class) id<CXProviderProtocol> callKitProvider;
+@property (class) id<CXCallControllerProtocol> callKitCallController;
+
++ (void)configureProviderWithLocalizedName:(nonnull NSString *)localizedName
+                             ringtoneSound:(nullable NSString *)ringtoneSound
+                    iconTemplateImageData:(nullable NSData*)imageData
+NS_SWIFT_NAME(configureProvider(localizedName:ringtoneSound:iconTemplateImageData:));
++ (BOOL)isProviderConfigured;
++ (void)addListener:(nonnull id<JMCallKitListener>)listener NS_SWIFT_NAME(addListener(_:));
++ (void)removeListener:(nonnull id<JMCallKitListener>)listener NS_SWIFT_NAME(removeListener(_:));
++ (BOOL)hasActiveCallForUUID:(nonnull NSString *)callUUID NS_SWIFT_NAME(hasActiveCallForUUID(_:));
++ (void)reportNewIncomingCallWithUUID:(nonnull NSUUID *)uuid
+                               handle:(nullable NSString*)handle
+                          displayName:(nullable NSString*)displayName
+                             hasVideo:(BOOL)hasVideo
+                           completion:(nonnull void (^)(NSError *_Nullable))completion
+NS_SWIFT_NAME(reportNewIncomingCall(UUID:handle:displayName:hasVideo:completion:));
++ (void)reportCallUpdateWith:(nonnull NSUUID *)uuid
+                      handle:(nullable NSString *)handle
+                 displayName:(nullable NSString *)displayName
+                    hasVideo:(BOOL)hasVideo;
++ (void)reportCallWith:(nonnull NSUUID *)uuid
+               endedAt:(nullable NSDate *)dateEnded
+                reason:(CXCallEndedReason)endedReason;
++ (void)reportOutgoingCallWith:(nonnull NSUUID *)uuid startedConnectingAt:(nullable NSDate *)dateStartedConnecting;
++ (void)reportOutgoingCallWith:(nonnull NSUUID *)uuid connectedAt:(nullable NSDate *)dateConnected;
++ (void)request:(nonnull CXTransaction *)transaction completion:(nonnull void (^)(NSError *_Nullable))completion;
+
+@end
+
+NS_ASSUME_NONNULL_END

ios/sdk/src/callkit/JMCallKitProxy.m

@@ -0,0 +1,284 @@
+/*
+ * Copyright @ 2022-present 8x8, Inc.
+ * Copyright @ 2018-present Atlassian Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import "JMCallKitProxy.h"
+#import "JMCallKitEmitter.h"
+
+#pragma mark -
+@interface CXProvider(CXProviderProtocol) <CXProviderProtocol>
+@end
+
+@implementation CXProvider(CXProviderProtocol)
+@end
+
+#pragma mark -
+@interface CXCallController(CXCallControllerProtocol) <CXCallControllerProtocol>
+
+@property (nonatomic, readonly) NSArray<CXCall*> *calls;
+
+@end
+
+@implementation CXCallController(CXCallControllerProtocol)
+
+@dynamic calls;
+
+- (NSArray<CXCall*> *)calls {
+    return self.callObserver.calls;
+}
+
+@end
+
+#pragma mark -
+@interface JMCallKitProxy ()
+    
+@property (class) CXProvider *defaultProvider;
+@property (class) CXProviderConfiguration *providerConfiguration;
+
+@end
+
+@interface JMCallKitProxy (Helpers)
+
++ (CXCallUpdate *)makeCXUpdateWithHandle:(nullable NSString *)handle displayName:(nullable NSString *)displayName hasVideo:(BOOL)hasVideo;
+
+@end
+
+@implementation JMCallKitProxy
+
+@dynamic callKitProvider, callKitCallController, enabled;
+@dynamic defaultProvider, providerConfiguration;
+
+static id<CXProviderProtocol> _callKitProvider = nil;
+static id<CXCallControllerProtocol> _callKitCallController = nil;
+static BOOL _enabled = false;
+static CXProvider *_defaultProvider = nil;
+static CXProviderConfiguration *_providerConfiguration = nil;
+
+#pragma mark CallJit proxy
+
++ (id<CXProviderProtocol>)callKitProvider {
+    return _callKitProvider;
+}
+
++ (void)setCallKitProvider:(id<CXProviderProtocol>)callKitProvider {
+    if (_callKitProvider != callKitProvider) {
+        _callKitProvider = callKitProvider;
+    }
+}
+
++ (id<CXCallControllerProtocol>)callKitCallController {
+    return  _callKitCallController;
+}
+
++ (void)setCallKitCallController:(id<CXCallControllerProtocol>)callKitCallController {
+    if (_callKitCallController != callKitCallController) {
+        _callKitCallController = callKitCallController;
+    }
+}
+
++ (BOOL)enabled {
+    return _enabled;
+}
+
++ (void)setEnabled:(BOOL)enabled {
+    _enabled = enabled ;
+    
+    if (!self.callKitProvider) {
+        [self.provider invalidate];
+    }
+    
+    if (enabled) {
+        CXProviderConfiguration *configuration = self.providerConfiguration? self.providerConfiguration : [[CXProviderConfiguration alloc] initWithLocalizedName:@""];
+        if (!self.callKitProvider) {
+            self.defaultProvider = [[CXProvider alloc] initWithConfiguration: configuration];
+        }
+        
+        [self.provider setDelegate:self.emitter queue:nil];
+    } else {
+        [self.provider setDelegate:nil queue:nil];
+    }
+}
+
++ (CXProvider *)defaultProvider {
+    return _defaultProvider;
+}
+
++ (void)setDefaultProvider:(CXProvider *)defaultProvider {
+    if (_defaultProvider != defaultProvider) {
+        _defaultProvider = defaultProvider;
+    }
+}
+
++ (id<CXProviderProtocol>)provider {
+    return self.callKitProvider != nil ? self.callKitProvider : self.defaultProvider;
+}
+
++ (id<CXCallControllerProtocol>)callController {
+    return self.callKitCallController != nil ? self.callKitCallController : self.defaultCallController;
+}
+
++ (CXProviderConfiguration *)providerConfiguration {
+    return _providerConfiguration;
+}
+
++ (void)setProviderConfiguration:(CXProviderConfiguration *)providerConfiguration {
+    if (_providerConfiguration != providerConfiguration) {
+        _providerConfiguration = providerConfiguration;
+        
+        if (providerConfiguration) {
+            self.provider.configuration = providerConfiguration;
+            [self.provider setDelegate:self.emitter queue:nil];
+        }
+    }
+}
+
++ (CXCallController *)defaultCallController {
+    static dispatch_once_t once;
+    static CXCallController *defaultCallController;
+    dispatch_once(&once, ^{
+        defaultCallController = [[CXCallController alloc] init];
+    });
+    
+    return defaultCallController;
+}
+
++ (JMCallKitEmitter *)emitter {
+    static dispatch_once_t once;
+    static JMCallKitEmitter *emitter;
+    dispatch_once(&once, ^{
+        emitter = [[JMCallKitEmitter alloc] init];
+    });
+    
+    return emitter;
+}
+
++ (void)configureProviderWithLocalizedName:(nonnull NSString *)localizedName
+                             ringtoneSound:(nullable NSString *)ringtoneSound
+                    iconTemplateImageData:(nullable NSData*)imageData {
+    if (!self.enabled) {
+        return;
+    }
+    
+    CXProviderConfiguration *configuration = [[CXProviderConfiguration alloc] initWithLocalizedName:localizedName];
+    configuration.iconTemplateImageData = imageData;
+    configuration.maximumCallGroups = 1;
+    configuration.maximumCallsPerCallGroup = 1;
+    configuration.ringtoneSound = ringtoneSound;
+    configuration.supportedHandleTypes = [NSSet setWithArray:@[@(CXHandleTypeGeneric)]];
+    configuration.supportsVideo = true;
+    
+    self.providerConfiguration = configuration;
+}
+
++ (BOOL)isProviderConfigured {
+    return self.providerConfiguration != nil;
+}
+
++ (void)addListener:(nonnull id<JMCallKitListener>)listener {
+    [self.emitter addListener:listener];
+}
+
++ (void)removeListener:(nonnull id<JMCallKitListener>)listener {
+    [self.emitter removeListener:listener];
+}
+
++ (BOOL)hasActiveCallForUUID:(nonnull NSString *)callUUID {
+    CXCall *activeCallForUUID = [[self.callController calls] filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(CXCall *evaluatedObject, NSDictionary<NSString *,id> *bindings) {
+        return evaluatedObject.UUID.UUIDString == callUUID;
+    }]].firstObject;
+    
+    if (!activeCallForUUID) {
+        return false;
+    }
+    return true;
+}
+
++ (void)reportNewIncomingCallWithUUID:(nonnull NSUUID *)uuid
+                               handle:(nullable NSString*)handle
+                          displayName:(nullable NSString*)displayName
+                             hasVideo:(BOOL)hasVideo
+                           completion:(nonnull void (^)(NSError *_Nullable))completion {
+    if (!self.enabled) {
+        return;
+    }
+    
+    CXCallUpdate *callUpdate = [self makeCXUpdateWithHandle:handle displayName:displayName hasVideo:hasVideo];
+    [self.provider reportNewIncomingCallWithUUID:uuid update:callUpdate completion:completion];
+}
+
++ (void)reportCallUpdateWith:(nonnull NSUUID *)uuid
+                      handle:(nullable NSString *)handle
+                 displayName:(nullable NSString *)displayName
+                    hasVideo:(BOOL)hasVideo {
+    if (!self.enabled) {
+        return;
+    }
+    
+    CXCallUpdate *callUpdate = [self makeCXUpdateWithHandle:handle displayName:displayName hasVideo:hasVideo];
+    [self.provider reportCallWithUUID:uuid updated:callUpdate];
+}
+
++ (void)reportCallWith:(nonnull NSUUID *)uuid
+               endedAt:(nullable NSDate *)dateEnded
+                reason:(CXCallEndedReason)endedReason {
+    [self.provider reportCallWithUUID:uuid endedAtDate:dateEnded reason:endedReason];
+}
+
++ (void)reportOutgoingCallWith:(nonnull NSUUID *)uuid startedConnectingAt:(nullable NSDate *)dateStartedConnecting {
+    [self.provider reportOutgoingCallWithUUID:uuid startedConnectingAtDate:dateStartedConnecting];
+}
+
++ (void)reportOutgoingCallWith:(nonnull NSUUID *)uuid connectedAt:(nullable NSDate *)dateConnected {
+    [self.provider reportOutgoingCallWithUUID:uuid connectedAtDate:dateConnected];
+}
+
++ (void)request:(nonnull CXTransaction *)transaction completion:(nonnull void (^)(NSError *_Nullable))completion {
+    if (!self.enabled) {
+        return;
+    }
+    
+    // XXX keep track of muted actions to avoid "ping-pong"ing. See
+    // JMCallKitEmitter for details on the CXSetMutedCallAction handling.
+    for (CXAction *action in transaction.actions) {
+        if ([action isKindOfClass:[CXSetMutedCallAction class]]) {
+            [self.emitter addMuteAction:action.UUID];
+        }
+    }
+    
+    [self.callController requestTransaction:transaction completion:completion];
+}
+
+@end
+
+@implementation JMCallKitProxy (Helpers)
+
++ (CXCallUpdate *)makeCXUpdateWithHandle:(nullable NSString *)handle displayName:(nullable NSString *)displayName hasVideo:(BOOL)hasVideo {
+    CXCallUpdate *update = [[CXCallUpdate alloc] init];
+    update.supportsDTMF = false;
+    update.supportsHolding = false;
+    update.supportsGrouping = false;
+    update.supportsUngrouping = false;
+    update.hasVideo = hasVideo;
+    update.localizedCallerName = displayName;
+    
+    if (handle) {
+        update.remoteHandle = [[CXHandle alloc] initWithType:CXHandleTypeGeneric value:handle];
+    }
+    
+    return update;
+}
+
+@end

ios/sdk/src/callkit/JMCallKitProxy.swift

@@ -1,231 +0,0 @@
-/*
- * Copyright @ 2018-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import CallKit
-import Foundation
-
-public protocol CXProviderProtocol: AnyObject {
-    var configuration: CXProviderConfiguration { get set }
-    func setDelegate(_ delegate: CXProviderDelegate?, queue: DispatchQueue?)
-    func reportNewIncomingCall(with UUID: UUID, update: CXCallUpdate, completion: @escaping (Error?) -> Void)
-    func reportCall(with UUID: UUID, updated update: CXCallUpdate)
-    func reportCall(with UUID: UUID, endedAt dateEnded: Date?, reason endedReason: CXCallEndedReason)
-    func reportOutgoingCall(with UUID: UUID, startedConnectingAt dateStartedConnecting: Date?)
-    func reportOutgoingCall(with UUID: UUID, connectedAt dateConnected: Date?)
-    func invalidate()
-}
-
-public protocol CXCallControllerProtocol: AnyObject {
-    var calls: [CXCall] { get }
-    func request(_ transaction: CXTransaction, completion: @escaping (Error?) -> Swift.Void)
-}
-
-extension CXProvider: CXProviderProtocol {}
-extension CXCallController: CXCallControllerProtocol {
-    public var calls: [CXCall] {
-        return callObserver.calls
-    }
-}
-
-/// JitsiMeet CallKit proxy
-// NOTE: The methods this class exposes are meant to be called in the UI thread.
-// All delegate methods called by JMCallKitEmitter will be called in the UI thread.
-@objc public final class JMCallKitProxy: NSObject {
-
-    private override init() {}
-
-    // MARK: - CallKit proxy
-    
-    public static var callKitProvider: CXProviderProtocol?
-    public static var callKitCallController: CXCallControllerProtocol?
-
-    private static var defaultProvider: CXProvider?
-
-    private static var provider: CXProviderProtocol? {
-        callKitProvider ?? defaultProvider
-    }
-    
-    private static var callController: CXCallControllerProtocol {
-        callKitCallController ?? defaultCallController
-    }
-
-    private static var providerConfiguration: CXProviderConfiguration? {
-        didSet {
-            guard let configuration = providerConfiguration else { return }
-            provider?.configuration = configuration
-            provider?.setDelegate(emitter, queue: nil)
-        }
-    }
-    
-    private static let defaultCallController: CXCallController = {
-        return CXCallController()
-    }()
-    
-    private static let emitter: JMCallKitEmitter = {
-        return JMCallKitEmitter()
-    }()
-
-    /// Enables the proxy in between CallKit and the consumers of the SDK.
-    /// Defaults to disabled. Set to true when you want to use CallKit.
-    @objc public static var enabled: Bool = false {
-        didSet {
-            if callKitProvider == nil {
-                provider?.invalidate()
-            }
-            
-            if enabled {
-                let configuration = providerConfiguration ?? CXProviderConfiguration(localizedName: "")
-                if callKitProvider == nil {
-                    defaultProvider = CXProvider(configuration: configuration)
-                }
-                
-                provider?.setDelegate(emitter, queue: nil)
-            } else {
-                provider?.setDelegate(nil, queue: nil)
-            }
-        }
-    }
-
-    @objc public static func configureProvider(localizedName: String,
-                                               ringtoneSound: String?,
-                                               iconTemplateImageData: Data?) {
-        guard enabled else { return }
-
-        let configuration = CXProviderConfiguration(localizedName: localizedName)
-        configuration.iconTemplateImageData = iconTemplateImageData
-        configuration.maximumCallGroups = 1
-        configuration.maximumCallsPerCallGroup = 1
-        configuration.ringtoneSound = ringtoneSound
-        configuration.supportedHandleTypes = [CXHandle.HandleType.generic]
-        configuration.supportsVideo = true
-
-        providerConfiguration = configuration
-    }
-
-    @objc public static func isProviderConfigured() -> Bool {
-        return providerConfiguration != nil
-    }
-
-    @objc public static func addListener(_ listener: JMCallKitListener) {
-        emitter.addListener(listener)
-    }
-
-    @objc public static func removeListener(_ listener: JMCallKitListener) {
-        emitter.removeListener(listener)
-    }
-
-    @objc public static func hasActiveCallForUUID(_ callUUID: String) -> Bool {
-        let activeCallForUUID = callController.calls.first {
-            $0.uuid == UUID(uuidString: callUUID)
-        }
-        guard activeCallForUUID != nil else { return false }
-        return true
-    }
-
-    @objc public static func reportNewIncomingCall(UUID: UUID,
-                                                   handle: String?,
-                                                   displayName: String?,
-                                                   hasVideo: Bool,
-                                                   completion: @escaping (Error?) -> Void) {
-        guard enabled else { return }
-
-        let callUpdate = makeCXUpdate(handle: handle,
-                                      displayName: displayName,
-                                      hasVideo: hasVideo)
-        provider?.reportNewIncomingCall(with: UUID,
-                                        update: callUpdate,
-                                        completion: completion)
-    }
-
-    @objc public static func reportCallUpdate(with UUID: UUID,
-                                              handle: String?,
-                                              displayName: String?,
-                                              hasVideo: Bool) {
-        guard enabled else { return }
-
-        let callUpdate = makeCXUpdate(handle: handle,
-                                      displayName: displayName,
-                                      hasVideo: hasVideo)
-        provider?.reportCall(with: UUID, updated: callUpdate)
-    }
-
-    @objc public static func reportCall(
-            with UUID: UUID,
-            endedAt dateEnded: Date?,
-            reason endedReason: CXCallEndedReason) {
-        guard enabled else { return }
-        provider?.reportCall(with: UUID,
-                             endedAt: dateEnded,
-                             reason: endedReason)
-    }
-
-    @objc public static func reportOutgoingCall(
-            with UUID: UUID,
-            startedConnectingAt dateStartedConnecting: Date?) {
-        guard enabled else { return }
-        provider?.reportOutgoingCall(with: UUID,
-                                     startedConnectingAt: dateStartedConnecting)
-    }
-
-    @objc public static func reportOutgoingCall(
-            with UUID: UUID,
-            connectedAt dateConnected: Date?) {
-        guard enabled else { return }
-
-        provider?.reportOutgoingCall(with: UUID, connectedAt: dateConnected)
-    }
-
-    @objc public static func request(
-            _ transaction: CXTransaction,
-            completion: @escaping (Error?) -> Swift.Void) {
-        guard enabled else { return }
-
-        // XXX keep track of muted actions to avoid "ping-pong"ing. See
-        // JMCallKitEmitter for details on the CXSetMutedCallAction handling.
-        for action in transaction.actions {
-            if (action as? CXSetMutedCallAction) != nil {
-                emitter.addMuteAction(action.uuid)
-            }
-        }
-
-        callController.request(transaction, completion: completion)
-    }
-
-    // MARK: - Callkit Proxy helpers
-
-    private static func makeCXUpdate(handle: String?,
-                                     displayName: String?,
-                                     hasVideo: Bool) -> CXCallUpdate {
-        let update = CXCallUpdate()
-        update.supportsDTMF = false
-        update.supportsHolding = false
-        update.supportsGrouping = false
-        update.supportsUngrouping = false
-        update.hasVideo = hasVideo
-
-        if let handle = handle {
-            update.remoteHandle = CXHandle(type: .generic,
-                                           value: handle)
-        }
-
-        if let displayName = displayName {
-            update.localizedCallerName = displayName
-        }
-
-        return update
-    }
-}
-

lang/languages-af.json

@@ -1,6 +1,5 @@
 {
     "af": "",
-    "az": "Azerbeidjans",
     "bg": "Bulgaars",
     "cs": "Tsjeggies",
     "de": "Duits",

lang/languages-ar.json

@@ -38,7 +38,6 @@
     "sk": "السلوفاكية",
     "sl": "السلوفينية",
     "sv": "السويدية",
-    "th": "التايلندية",
     "tr": "التركية",
     "uk": "الأوكرانية",
     "vi": "الفيتنامية",

lang/languages-ca.json

@@ -46,7 +46,6 @@
     "sr": "Serbi",
     "sv": "Suec",
     "te": "Telugu",
-    "th": "tailandès",
     "tr": "Turc",
     "uk": "Ucraïnès",
     "vi": "Vietnamita",

lang/languages-cs.json

@@ -1,7 +1,6 @@
 {
     "af": "Afrikánština",
     "ar": "Arabština",
-    "az": "Ázerbájdžánština",
     "bg": "Bulharština",
     "ca": "Katalánština",
     "cs": "Čeština",
@@ -41,7 +40,6 @@
     "sl": "Slovinština",
     "sr": "Srbština",
     "sv": "Švédština",
-    "th": "Thajština",
     "tr": "Turečtina",
     "uk": "Ukrajinština",
     "vi": "Vietnamština",

lang/languages-de.json

@@ -1,6 +1,5 @@
 {
     "af": "Afrikaans",
-    "az": "Aserbaidschanisch",
     "bg": "Bulgarisch",
     "ca": "Katalanisch",
     "cs": "Tschechisch",

lang/languages-el.json

@@ -33,7 +33,6 @@
     "sc": "Σαρδηνικά",
     "sk": "Σλοβακικά",
     "sv": "Σουηδικά",
-    "th": "Ταϊλανδικά",
     "tr": "Τουρκικά",
     "uk": "Ουκρανικά",
     "vi": "Βιετναμέζικα",

lang/languages-enGB.json

@@ -1,6 +1,5 @@
 {
     "af": "Afrikaans",
-    "az": "",
     "bg": "Bulgarian",
     "ca": "Catalan",
     "cs": "Czech",

lang/languages-eo.json

@@ -1,6 +1,5 @@
 {
     "af": "Afrikansa",
-    "az": "Azera",
     "bg": "Bulgara",
     "cs": "Ĉeĥa",
     "de": "Germana",

lang/languages-fa.json

@@ -42,7 +42,6 @@
     "sl": "اسلوونیایی",
     "sr": "صربی",
     "sv": "سوئدی",
-    "th": "تایلندی",
     "tr": "ترکی",
     "uk": "اوکراینی",
     "vi": "ویتنامی",

lang/languages-fi.json

@@ -1,6 +1,5 @@
 {
     "af": "afrikaans",
-    "az": "",
     "bg": "bulgaria",
     "ca": "katalaani",
     "cs": "tšekki",

lang/languages-fy.json

@@ -1,34 +0,0 @@
-{
-    "af": "",
-    "bg": "",
-    "ca": "",
-    "cs": "",
-    "da": "",
-    "de": "",
-    "el": "",
-    "en": "",
-    "enGB": "",
-    "eo": "",
-    "es": "",
-    "esUS": "",
-    "et": "",
-    "fi": "",
-    "fr": "",
-    "frCA": "",
-    "hr": "",
-    "hu": "",
-    "hy": "",
-    "it": "",
-    "ja": "",
-    "ko": "",
-    "nl": "",
-    "oc": "",
-    "pl": "",
-    "ptBR": "",
-    "ru": "",
-    "sv": "",
-    "tr": "",
-    "vi": "",
-    "zhCN": "",
-    "zhTW": ""
-}

lang/languages-gl.json

@@ -41,7 +41,6 @@
     "sl": "Esloveno",
     "sr": "Serbio",
     "sv": "Sueco",
-    "th": "Tailandés",
     "tr": "Turco",
     "uk": "Ucraíno",
     "vi": "Vietnamita",

lang/languages-hi.json

@@ -44,7 +44,6 @@
     "sl": "Slovenian",
     "sr": "Serbian",
     "sv": "Swedish",
-    "th": "Thailand",
     "tr": "Turkish",
     "uk": "Ukrainian",
     "vi": "Vietnamese",

lang/languages-hr.json

@@ -47,7 +47,6 @@
     "sr": "Srpski",
     "sv": "Švedski",
     "te": "Teluški",
-    "th": "Tajski",
     "tr": "Turski",
     "uk": "Ukrajinski",
     "vi": "Vijetnamski",

lang/languages-hy.json

@@ -1,6 +1,5 @@
 {
     "af": "",
-    "az": "",
     "bg": "Բուլղարերեն",
     "cs": "",
     "de": "Գերմաներեն ",

lang/languages-it.json

@@ -1,6 +1,5 @@
 {
     "af": "Afrikaans",
-    "az": "Azero",
     "bg": "Bulgaro",
     "ca": "Catalano",
     "cs": "Ceco",
@@ -41,7 +40,6 @@
     "sl": "Sloveno",
     "sr": "Serbo",
     "sv": "Svedese",
-    "th": "Tailandese",
     "tr": "Turco",
     "uk": "Ucraino",
     "vi": "Vietnamita",

lang/languages-ja.json

@@ -46,7 +46,6 @@
     "sr": "セルビア語",
     "sv": "スウェーデン語",
     "te": "テルグ語",
-    "th": "タイ語",
     "tr": "トルコ語",
     "uk": "ウクライナ語",
     "vi": "ベトナム語",

lang/languages-ka.json

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

lang/languages-kab.json

@@ -1,7 +1,6 @@
 {
     "af": "Tafrikant",
     "ar": "Taɛrabt",
-    "az": "Tazirit",
     "bg": "Tabulgarit",
     "ca": "Takaṭalant",
     "cs": "Taččikit",
@@ -48,7 +47,6 @@
     "sr": "Taserbit",
     "sv": "Taswidit",
     "te": "Tatelugut",
-    "th": "Tayland",
     "tr": "Taṭurkit",
     "uk": "Tukranit",
     "vi": "Tavyitnamit",

lang/languages-km.json

@@ -1,27 +0,0 @@
-{
-    "af": "អាហ្វ្រិច",
-    "az": "Azerbaijani",
-    "bg": "ប៊ុលហ្គារី",
-    "cs": "ឆេក",
-    "de": "អាល្លឺម៉ង់",
-    "el": "ក្រិក",
-    "en": "អង់គ្លេស",
-    "eo": "Esperanto",
-    "es": "អេស្ប៉ាញ",
-    "fr": "បារាំង",
-    "hy": "ភាសាអាមេនី",
-    "it": "អ៊ីតាលី",
-    "ja": "ជប៉ុន",
-    "ko": "កូរ៉េ",
-    "nb": "ន័រវេបាំម៉ាល",
-    "oc": "អុកស៊ីត",
-    "pl": "ប៉ូឡូញ",
-    "ptBR": "ព័រទុយហ្គាល់",
-    "ru": "រុស្ស៊ី",
-    "sk": "ស្លូវ៉ាគី",
-    "sl": "ស្លូវ៉ានី",
-    "sv": "ស៊ុយអែត",
-    "tr": "ទួរគី",
-    "vi": "វៀតណាម",
-    "zhCN": "ចិន (ចិន)"
-}

lang/languages-ko.json

@@ -1,7 +1,6 @@
 {
     "af": "아프리칸스어",
     "ar": "아랍어",
-    "az": "아제르바이잔어",
     "bg": "불가리어",
     "ca": "카탈루냐어",
     "cs": "체코어",
@@ -43,7 +42,6 @@
     "sl": "슬로베니아어",
     "sr": "세르비아어",
     "sv": "스웨덴어",
-    "th": "태국어",
     "tr": "터키어",
     "uk": "우크라이나어",
     "vi": "베트남어",

lang/languages-mr.json

@@ -1,6 +1,5 @@
 {
     "af": "Afrikaans",
-    "az": "",
     "bg": "Bulgarian",
     "ca": "Catalan",
     "cs": "Czech",

lang/languages-nb.json

@@ -1,6 +1,5 @@
 {
     "af": "",
-    "az": "",
     "bg": "",
     "cs": "Tsjekkisk",
     "da": "Dansk",

lang/languages-nl.json

@@ -1,6 +1,5 @@
 {
     "af": "Afrikaans",
-    "az": "Azerbeidzjaans",
     "bg": "Bulgaars",
     "ca": "Catalaans",
     "cs": "Tsjechisch",

lang/languages-oc.json

@@ -46,7 +46,6 @@
     "sr": "Sèrbe",
     "sv": "Suedés",
     "te": "Telugu",
-    "th": "Tai",
     "tr": "Turc",
     "uk": "Ucraïnian",
     "vi": "Vietnamian",

lang/languages-pl.json

@@ -46,7 +46,6 @@
     "sr": "serbski",
     "sv": "szwedzki",
     "te": "telugu",
-    "th": "tajski",
     "tr": "turecki",
     "uk": "ukraiński",
     "vi": "wietnamski",

lang/languages-pt.json

@@ -46,7 +46,6 @@
     "sr": "Sérvio",
     "sv": "Sueco",
     "te": "Telugu",
-    "th": "Tailandês",
     "tr": "Turco",
     "uk": "Ucraniano",
     "vi": "Vietnamita",

lang/languages-ro.json

@@ -36,7 +36,6 @@
     "sk": "Slovacă",
     "sl": "Slovenă",
     "sv": "Suedeză",
-    "th": "Thailandeză",
     "tr": "Turcă",
     "uk": "Ucraineană",
     "vi": "Vietnameză",

lang/languages-sl.json

@@ -1,6 +1,5 @@
 {
     "af": "Afrikanščina",
-    "az": "Azerbajdanščina",
     "bg": "Bolgarščina",
     "cs": "Češčina",
     "de": "Nemščina",

lang/languages-sq.json

@@ -46,7 +46,6 @@
     "sr": "Serbisht",
     "sv": "Suedisht",
     "te": "Telugu",
-    "th": "Tajlandisht",
     "tr": "Turqisht",
     "uk": "Ukrainisht",
     "vi": "Vietnamisht",

lang/languages-sr.json

@@ -1,6 +1,5 @@
 {
     "af": "Африкански",
-    "az": "Азербејџански",
     "bg": "Бугарски",
     "ca": "Каталонски",
     "cs": "Чешки",