feat(android): list post notifications permission (#14657)

* feat(android): list post notifications permission

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
   "image": "mcr.microsoft.com/devcontainers/universal:2",
   "features": {
     "ghcr.io/devcontainers/features/node:1": {
-      "version": "20"
+      "version": "16"
     }
   },
   "hostRequirements": {

.github/ISSUE_TEMPLATE/1-bug-report.md

@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+<!--
+
+This issue tracker is only for reporting bugs and tracking issues related to the source code.
+
+Before posting, please make sure to check if the same or similar bugs have already been discussed: https://github.com/jitsi/jitsi-meet/issues
+
+General questions regarding usage, installation, etc. should be posted at https://community.jitsi.org. They will be closed if posted here.
+
+-->
+
+### Description:
+
+<!-- Please describe the bug clearly and concisely. -->
+
+### Steps to reproduce:
+
+1. <!-- Open '...' -->
+2. <!-- Click on '...' -->
+3. <!-- and so on... -->
+
+### Expected behavior:
+
+<!-- Please describe what should happen. -->
+
+### Actual behavior:
+
+<!-- Please describe what actually happens. -->
+<!-- Please attach screenshot if possible. -->
+
+### Server information:
+
+- Jitsi Meet version:
+- Operating System:
+
+### Client information:
+
+- Browser / app version:
+- Operating System:
+
+### Additional information:
+
+<!-- Please provide additional information about the bug, if any. -->

.github/ISSUE_TEMPLATE/1-bug.yml

@@ -1,55 +0,0 @@
-name: Bug report
-description: File a bug report and help us improve
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This issue tracker is only for reporting bugs and tracking issues related to the source code.
-
-        **Before posting, please make sure to check if the same or similar bugs have already been reported.**
-
-        ⚠️ General questions regarding usage, installation, etc. should be posted in our [community forum](https://community.jitsi.org).
-  - type: textarea
-    attributes:
-      label: What happened?
-      description: Please describe the problem. Be as detailed as possible.
-    validations:
-      required: true
-  - type: checkboxes
-    attributes:
-      label: Platform
-      description: On what platforms can you reproduce the problem?
-      options:
-        - label: Chrome (or Chromium based)
-        - label: Firefox
-        - label: Safari
-        - label: Other desktop browser
-        - label: Android browser
-        - label: iOS browser
-        - label: Electron app
-        - label: Android mobile app
-        - label: iOS mobile app
-        - label: Custom app using a mobile SDK
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Browser / app / sdk version
-      description: Please provice the version of the browser / app / sdk where the problem manifests.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. The browser console JS logs (if applicable) is a good start. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-  - type: checkboxes
-    attributes:
-      label: Reproducibility
-      description: Does the problem reproduce on meet.jit.si using Chrome, Firefox or the official mobile apps?
-      options:
-        - label: The problem is reproducible on meet.jit.si
-  - type: textarea
-    attributes:
-      label: More details?
-      description: Please provide more details in case they apply (such as the Jitsi Meet version you are running, if you are hosting your own server).

.github/ISSUE_TEMPLATE/2-feature-request.md

@@ -0,0 +1,25 @@
+---
+name: "Feature request"
+about: Suggest an idea for this project
+title: ''
+labels: 'feature-request'
+assignees: ''
+---
+
+<!--
+Thank you for suggesting an idea to make Jitsi Meet better.
+
+Please fill in as much of the template below as you're able.
+
+Note that the ultimate decision for implementing features lies on the Jitsi team, not all feature requests shall be accepted.
+-->
+
+**Is your feature request related to a problem you are facing?**
+Please describe the problem you are trying to solve.
+
+**Describe the solution you'd like**
+Please describe the desired behavior.
+
+**Describe alternatives you've considered**
+Please describe alternative solutions or features you have considered.
+

.github/ISSUE_TEMPLATE/2-feature.yml

@@ -1,22 +0,0 @@
-name: Feature request
-description: Suggest an idea for Jitsi Meet
-labels: ["feature-request"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for suggesting an idea to make Jitsi Meet better.
-
-        **Note**: the ultimate decision for implementing features lies on the Jitsi team, not all feature requests shall be accepted.
-  - type: textarea
-    attributes:
-      label: What problem are you trying to solve?
-      description: Tell us what problem your feature request would solve.
-  - type: textarea
-    attributes:
-      label: What solution would you like to see?
-      description: Please describe the desired behavior or feature.
-  - type: textarea
-    attributes:
-      label: Is there an alternative?
-      description: Please describe alternative solutions or features you have considered.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Need help with your Jitsi Meet installation?
+  - name: Need help with Jitsi Meet?
     url: https://community.jitsi.org
-    about: Please ask it in our community forum.
+    about: Please ask it in our community.

.github/workflows/ci-lua.yml

@@ -7,7 +7,7 @@ jobs:
     name: Luacheck
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
 
     - name: Install luarocks
       run: sudo apt-get --install-recommends -y install luarocks

.github/workflows/ci.yml

@@ -7,15 +7,11 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version-file: '.nvmrc'
+        node-version: 16
         cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
     - name: Get changed files
       id: changed-files
       uses: tj-actions/changed-files@v41
@@ -38,25 +34,21 @@ jobs:
     name: Build Frontend (Linux)
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version-file: '.nvmrc'
+        node-version: 16
         cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
     - run: npm install
     - run: make
   macos-ci:
     name: Build Frontend (macOS)
     runs-on: macOS-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version: 20
+        node-version: 16
         cache: 'npm'
     - run: npm install
     - run: make
@@ -64,41 +56,23 @@ jobs:
     name: Build mobile bundle (Android)
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version-file: '.nvmrc'
+        node-version: 16
         cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
     - run: npm install
     - run: npx react-native bundle --entry-file react/index.native.js --platform android --bundle-output /tmp/android.bundle --reset-cache
   ios-build:
     name: Build mobile bundle (iOS)
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-13, macos-14]
+    runs-on: macOS-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version-file: '.nvmrc'
+        node-version: 16
         cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
     - run: npm install
-    - name: setup Xcode
-      run: |
-        uname -a
-        xcode-select -p
-        sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
-        xcodebuild -version
     - name: setup-cocoapods
       uses: maxim-lobanov/setup-cocoapods@v1
       with:
@@ -115,15 +89,11 @@ jobs:
     name: Test Debian packages build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version-file: '.nvmrc'
+        node-version: 16
         cache: 'npm'
-    - name: Check Node / npm versions
-      run: |
-        node -v
-        npm -v
     - run: npm install
     - run: make
     - run: sudo apt-get install -y debhelper

.nvmrc

@@ -1 +1 @@
-20
+16

android/app/src/main/java/org/jitsi/meet/MainActivity.java

@@ -37,6 +37,7 @@ import org.jitsi.meet.sdk.JitsiMeetConferenceOptions;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.Collection;
+import java.util.HashMap;
 
 /**
  * The one and only Activity that the Jitsi Meet app needs. The
@@ -73,6 +74,7 @@ public class MainActivity extends JitsiMeetActivity {
      */
     private String defaultURL;
 
+
     // JitsiMeetActivity overrides
     //
 
@@ -144,12 +146,12 @@ public class MainActivity extends JitsiMeetActivity {
     }
 
     private void setJitsiMeetConferenceDefaultOptions() {
-
         // Set default options
         JitsiMeetConferenceOptions defaultOptions
             = new JitsiMeetConferenceOptions.Builder()
             .setServerURL(buildURL(defaultURL))
             .setFeatureFlag("welcomepage.enabled", true)
+            .setFeatureFlag("resolution", 360)
             .setFeatureFlag("server-url-change.enabled", !configurationByRestrictions)
             .build();
         JitsiMeet.setDefaultConferenceOptions(defaultOptions);

android/gradle.properties

@@ -11,7 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx1024m -XX:MaxPermSize=256m
 
-org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -26,5 +26,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false
 
-appVersion=99.0.0
-sdkVersion=99.0.0
+appVersion=24.2.2
+sdkVersion=9.2.2

android/sdk/src/main/AndroidManifest.xml

@@ -12,7 +12,6 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
@@ -51,7 +50,7 @@
 
         <service
             android:name="org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService"
-            android:foregroundServiceType="mediaPlayback|microphone" />
+            android:foregroundServiceType="mediaPlayback" />
 
         <provider
             android:name="com.reactnativecommunity.webview.RNCWebViewFileProvider"

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

@@ -21,7 +21,6 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import java.net.URL;
-import java.util.ArrayList;
 
 
 /**
@@ -230,12 +229,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
             return this;
         }
 
-        public Builder setConfigOverride(String config, ArrayList<Bundle> arrayList) {
-            this.config.putParcelableArrayList(config, arrayList);
-
-            return this;
-        }
-
         /**
          * Builds the immutable {@link JitsiMeetConferenceOptions} object with the configuration
          * that this {@link Builder} instance specified.

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

@@ -133,7 +133,7 @@ public class JitsiMeetOngoingConferenceService extends Service
             JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
         } else {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK | ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
+                startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);
             } else {
                 startForeground(NOTIFICATION_ID, notification);
             }

conference.js

@@ -2,8 +2,10 @@
 
 import { jitsiLocalStorage } from '@jitsi/js-utils';
 import Logger from '@jitsi/logger';
+import EventEmitter from 'events';
 
 import { ENDPOINT_TEXT_MESSAGE_NAME } from './modules/API/constants';
+import { AUDIO_ONLY_SCREEN_SHARE_NO_TRACK } from './modules/UI/UIErrors';
 import mediaDeviceHelper from './modules/devices/mediaDeviceHelper';
 import Recorder from './modules/recorder/Recorder';
 import { createTaskQueue } from './modules/util/helpers';
@@ -16,6 +18,7 @@ import {
 import { sendAnalytics } from './react/features/analytics/functions';
 import {
     maybeRedirectToWelcomePage,
+    redirectToStaticPage,
     reloadWithStoredParams
 } from './react/features/app/actions';
 import { showModeratedNotification } from './react/features/av-moderation/actions';
@@ -53,7 +56,7 @@ import {
     getConferenceOptions,
     sendLocalParticipant
 } from './react/features/base/conference/functions';
-import { getReplaceParticipant, getSsrcRewritingFeatureFlag } from './react/features/base/config/functions';
+import { getReplaceParticipant } from './react/features/base/config/functions';
 import { connect } from './react/features/base/connection/actions.web';
 import {
     checkAndNotifyForNewDevice,
@@ -75,6 +78,7 @@ import {
     JitsiConferenceEvents,
     JitsiE2ePingEvents,
     JitsiMediaDevicesEvents,
+    JitsiTrackErrors,
     JitsiTrackEvents,
     browser
 } from './react/features/base/lib-jitsi-meet';
@@ -115,11 +119,8 @@ import {
 import { updateSettings } from './react/features/base/settings/actions';
 import {
     addLocalTrack,
-    createInitialAVTracks,
     destroyLocalTracks,
-    displayErrorsForCreateInitialLocalTracks,
     replaceLocalTrack,
-    setGUMPendingStateOnFailedTracks,
     toggleScreensharing as toggleScreensharingA,
     trackAdded,
     trackRemoved
@@ -164,8 +165,12 @@ import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/Au
 import { createRnnoiseProcessor } from './react/features/stream-effects/rnnoise';
 import { handleToggleVideoMuted } from './react/features/toolbox/actions.any';
 import { muteLocal } from './react/features/video-menu/actions.any';
+import UIEvents from './service/UI/UIEvents';
 
 const logger = Logger.getLogger(__filename);
+
+const eventEmitter = new EventEmitter();
+
 let room;
 
 /*
@@ -275,6 +280,12 @@ class ConferenceConnector {
 
         switch (err) {
 
+        case JitsiConferenceErrors.NOT_ALLOWED_ERROR: {
+            // let's show some auth not allowed page
+            APP.store.dispatch(redirectToStaticPage('static/authError.html'));
+            break;
+        }
+
         case JitsiConferenceErrors.RESERVATION_ERROR: {
             const [ code, msg ] = params;
 
@@ -384,6 +395,27 @@ function disconnect() {
     return APP.connection.disconnect().then(onDisconnected, onDisconnected);
 }
 
+/**
+ * Sets the GUM pending state for the tracks that have failed.
+ *
+ * NOTE: Some of the track that we will be setting to GUM pending state NONE may not have failed but they may have
+ * been requested. This won't be a problem because their current GUM pending state will be NONE anyway.
+ * @param {JitsiLocalTrack} tracks - The tracks that have been created.
+ * @returns {void}
+ */
+function setGUMPendingStateOnFailedTracks(tracks) {
+    const tracksTypes = tracks.map(track => {
+        if (track.getVideoType() === VIDEO_TYPE.DESKTOP) {
+            return MEDIA_TYPE.SCREENSHARE;
+        }
+
+        return track.getType();
+    });
+    const nonPendingTracks = [ MEDIA_TYPE.AUDIO, MEDIA_TYPE.VIDEO ].filter(type => !tracksTypes.includes(type));
+
+    APP.store.dispatch(gumPending(nonPendingTracks, IGUMPendingState.NONE));
+}
+
 export default {
     /**
      * Flag used to delay modification of the muted status of local media tracks
@@ -482,12 +514,57 @@ export default {
                     return [];
                 });
         } else if (requestedAudio || requestedVideo) {
-            tryCreateLocalTracks = APP.store.dispatch(createInitialAVTracks({
+            APP.store.dispatch(gumPending(initialDevices, IGUMPendingState.PENDING_UNMUTE));
+            tryCreateLocalTracks = createLocalTracksF({
                 devices: initialDevices,
                 timeout,
                 firePermissionPromptIsShownEvent: true
-            })).then(({ tracks, errors: pErrors }) => {
-                Object.assign(errors, pErrors);
+            })
+            .catch(async error => {
+                if (error.name === JitsiTrackErrors.TIMEOUT && !browser.isElectron()) {
+                    errors.audioAndVideoError = error;
+
+                    return [];
+                }
+
+                // Retry with separate gUM calls.
+                const gUMPromises = [];
+                const tracks = [];
+
+                if (requestedAudio) {
+                    gUMPromises.push(createLocalTracksF(audioOptions));
+                }
+
+                if (requestedVideo) {
+                    gUMPromises.push(createLocalTracksF({
+                        devices: [ MEDIA_TYPE.VIDEO ],
+                        timeout,
+                        firePermissionPromptIsShownEvent: true
+                    }));
+                }
+
+                const results = await Promise.allSettled(gUMPromises);
+                let errorMsg;
+
+                results.forEach((result, idx) => {
+                    if (result.status === 'fulfilled') {
+                        tracks.push(result.value[0]);
+                    } else {
+                        errorMsg = result.reason;
+                        const isAudio = idx === 0;
+
+                        logger.error(`${isAudio ? 'Audio' : 'Video'} track creation failed with error ${errorMsg}`);
+                        if (isAudio) {
+                            errors.audioOnlyError = errorMsg;
+                        } else {
+                            errors.videoOnlyError = errorMsg;
+                        }
+                    }
+                });
+
+                if (errors.audioOnlyError && errors.videoOnlyError) {
+                    errors.audioAndVideoError = errorMsg;
+                }
 
                 return tracks;
             });
@@ -508,6 +585,42 @@ export default {
         };
     },
 
+    /**
+     * Displays error notifications according to the state carried by {@code errors} object returned
+     * by {@link createInitialLocalTracks}.
+     * @param {Object} errors - the errors (if any) returned by {@link createInitialLocalTracks}.
+     *
+     * @returns {void}
+     * @private
+     */
+    _displayErrorsForCreateInitialLocalTracks(errors) {
+        const {
+            audioAndVideoError,
+            audioOnlyError,
+            screenSharingError,
+            videoOnlyError
+        } = errors;
+
+        // FIXME If there will be microphone error it will cover any screensharing dialog, but it's still better than in
+        // the reverse order where the screensharing dialog will sometimes be closing the microphone alert
+        // ($.prompt.close(); is called). Need to figure out dialogs chaining to fix that.
+        if (screenSharingError) {
+            this._handleScreenSharingError(screenSharingError);
+        }
+        if (audioAndVideoError || audioOnlyError) {
+            if (audioOnlyError || videoOnlyError) {
+                // If both requests for 'audio' + 'video' and 'audio' only failed, we assume that there are some
+                // problems with user's microphone and show corresponding dialog.
+                APP.store.dispatch(notifyMicError(audioOnlyError));
+                APP.store.dispatch(notifyCameraError(videoOnlyError));
+            } else {
+                // If request for 'audio' + 'video' failed, but request for 'audio' only was OK, we assume that we had
+                // problems with camera and show corresponding dialog.
+                APP.store.dispatch(notifyCameraError(audioAndVideoError));
+            }
+        }
+    },
+
     startConference(tracks) {
         tracks.forEach(track => {
             if ((track.isAudioTrack() && this.isLocalAudioMuted())
@@ -623,11 +736,11 @@ export default {
 
             logger.debug('Prejoin screen no longer displayed at the time when tracks were created');
 
-            APP.store.dispatch(displayErrorsForCreateInitialLocalTracks(errors));
+            this._displayErrorsForCreateInitialLocalTracks(errors);
 
             const tracks = handleInitialTracks(initialOptions, localTracks);
 
-            setGUMPendingStateOnFailedTracks(tracks, APP.store.dispatch);
+            setGUMPendingStateOnFailedTracks(tracks);
 
             return this._setLocalAudioVideoStreams(tracks);
         }
@@ -636,7 +749,7 @@ export default {
 
         return Promise.all([
             tryCreateLocalTracks.then(tr => {
-                APP.store.dispatch(displayErrorsForCreateInitialLocalTracks(errors));
+                this._displayErrorsForCreateInitialLocalTracks(errors);
 
                 return tr;
             }).then(tr => {
@@ -644,7 +757,7 @@ export default {
 
                 const filteredTracks = handleInitialTracks(initialOptions, tr);
 
-                setGUMPendingStateOnFailedTracks(filteredTracks, APP.store.dispatch);
+                setGUMPendingStateOnFailedTracks(filteredTracks);
 
                 return filteredTracks;
             }),
@@ -1125,7 +1238,7 @@ export default {
         const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(options);
         const localTracks = await tryCreateLocalTracks;
 
-        APP.store.dispatch(displayErrorsForCreateInitialLocalTracks(errors));
+        this._displayErrorsForCreateInitialLocalTracks(errors);
         localTracks.forEach(track => {
             if ((track.isAudioTrack() && this.isLocalAudioMuted())
                 || (track.isVideoTrack() && this.isLocalVideoMuted())) {
@@ -1465,6 +1578,50 @@ export default {
         });
     },
 
+    /**
+     * Handles {@link JitsiTrackError} returned by the lib-jitsi-meet when
+     * trying to create screensharing track. It will either do nothing if
+     * the dialog was canceled on user's request or display an error if
+     * screensharing couldn't be started.
+     * @param {JitsiTrackError} error - The error returned by
+     * {@link _createDesktopTrack} Promise.
+     * @private
+     */
+    _handleScreenSharingError(error) {
+        if (error.name === JitsiTrackErrors.SCREENSHARING_USER_CANCELED) {
+            return;
+        }
+
+        logger.error('failed to share local desktop', error);
+
+        // Handling:
+        // JitsiTrackErrors.CONSTRAINT_FAILED
+        // JitsiTrackErrors.PERMISSION_DENIED
+        // JitsiTrackErrors.SCREENSHARING_GENERIC_ERROR
+        // and any other
+        let descriptionKey;
+        let titleKey;
+
+        if (error.name === JitsiTrackErrors.PERMISSION_DENIED) {
+            descriptionKey = 'dialog.screenSharingPermissionDeniedError';
+            titleKey = 'dialog.screenSharingFailedTitle';
+        } else if (error.name === JitsiTrackErrors.CONSTRAINT_FAILED) {
+            descriptionKey = 'dialog.cameraConstraintFailedError';
+            titleKey = 'deviceError.cameraError';
+        } else if (error.name === JitsiTrackErrors.SCREENSHARING_GENERIC_ERROR) {
+            descriptionKey = 'dialog.screenSharingFailed';
+            titleKey = 'dialog.screenSharingFailedTitle';
+        } else if (error === AUDIO_ONLY_SCREEN_SHARE_NO_TRACK) {
+            descriptionKey = 'notify.screenShareNoAudio';
+            titleKey = 'notify.screenShareNoAudioTitle';
+        }
+
+        APP.store.dispatch(showErrorNotification({
+            descriptionKey,
+            titleKey
+        }, NOTIFICATION_TIMEOUT_TYPE.LONG));
+    },
+
     /**
      * Setup interaction between conference and UI.
      */
@@ -1637,11 +1794,7 @@ export default {
 
         room.on(
             JitsiConferenceEvents.CONFERENCE_CREATED_TIMESTAMP,
-            conferenceTimestamp => {
-                APP.store.dispatch(conferenceTimestampChanged(conferenceTimestamp));
-                APP.API.notifyConferenceCreatedTimestamp(conferenceTimestamp);
-            }
-        );
+            conferenceTimestamp => APP.store.dispatch(conferenceTimestampChanged(conferenceTimestamp)));
 
         room.on(
             JitsiConferenceEvents.DISPLAY_NAME_CHANGED,
@@ -1763,12 +1916,21 @@ export default {
             JitsiE2ePingEvents.E2E_RTT_CHANGED,
             (...args) => APP.store.dispatch(e2eRttChanged(...args)));
 
+        APP.UI.addListener(UIEvents.AUDIO_MUTED, muted => {
+            this.muteAudio(muted);
+        });
+        APP.UI.addListener(UIEvents.VIDEO_MUTED, (muted, showUI = false) => {
+            this.muteVideo(muted, showUI);
+        });
+
         room.addCommandListener(this.commands.defaults.ETHERPAD,
             ({ value }) => {
                 APP.UI.initEtherpad(value);
             }
         );
 
+        APP.UI.addListener(UIEvents.EMAIL_CHANGED,
+            this.changeLocalEmail.bind(this));
         room.addCommandListener(this.commands.defaults.EMAIL, (data, from) => {
             APP.store.dispatch(participantUpdated({
                 conference: room,
@@ -1788,6 +1950,9 @@ export default {
                     }));
             });
 
+        APP.UI.addListener(UIEvents.NICKNAME_CHANGED,
+            this.changeLocalDisplayName.bind(this));
+
         room.on(
             JitsiConferenceEvents.START_MUTED_POLICY_CHANGED,
             ({ audio, video }) => {
@@ -1834,146 +1999,123 @@ export default {
 
         room.on(
             JitsiConferenceEvents.DATA_CHANNEL_CLOSED, ev => {
-                const state = APP.store.getState();
-                const { dataChannelOpen } = state['features/base/conference'];
-                const timeout = typeof dataChannelOpen === 'undefined' ? 15000 : 60000;
-
-                // Show the notification only when the data channel connection doesn't get re-established in 60 secs if
-                // it was already established at the beginning of the call, show it sooner otherwise. This notification
-                // can be confusing and alarming to users even when there is no significant impact to user experience
-                // if the the reconnect happens immediately.
-                setTimeout(() => {
-                    const { dataChannelOpen: open } = APP.store.getState()['features/base/conference'];
-
-                    if (!open) {
-                        const descriptionKey = getSsrcRewritingFeatureFlag(state)
-                            ? 'notify.dataChannelClosedDescriptionWithAudio' : 'notify.dataChannelClosedDescription';
-                        const titleKey = getSsrcRewritingFeatureFlag(state)
-                            ? 'notify.dataChannelClosedWithAudio' : 'notify.dataChannelClosed';
-
-                        APP.store.dispatch(dataChannelClosed(ev.code, ev.reason));
-                        APP.store.dispatch(showWarningNotification({
-                            descriptionKey,
-                            titleKey,
-                            uid: DATA_CHANNEL_CLOSED_NOTIFICATION_ID
-                        }, NOTIFICATION_TIMEOUT_TYPE.STICKY));
-                    }
-                }, timeout);
+                APP.store.dispatch(dataChannelClosed(ev.code, ev.reason));
+                APP.store.dispatch(showWarningNotification({
+                    descriptionKey: 'notify.dataChannelClosedDescription',
+                    titleKey: 'notify.dataChannelClosed',
+                    uid: DATA_CHANNEL_CLOSED_NOTIFICATION_ID
+                }, NOTIFICATION_TIMEOUT_TYPE.STICKY));
             }
         );
-    },
 
-    /**
-     * Handles audio device changes.
-     *
-     * @param {string} cameraDeviceId - The new device id.
-     * @returns {Promise}
-     */
-    async onAudioDeviceChanged(micDeviceId) {
-        const audioWasMuted = this.isLocalAudioMuted();
-
-        // Disable noise suppression if it was enabled on the previous track.
-        await APP.store.dispatch(setNoiseSuppressionEnabled(false));
-
-        // When the 'default' mic needs to be selected, we need to pass the real device id to gUM instead of
-        // 'default' in order to get the correct MediaStreamTrack from chrome because of the following bug.
-        // https://bugs.chromium.org/p/chromium/issues/detail?id=997689.
-        const isDefaultMicSelected = micDeviceId === 'default';
-        const selectedDeviceId = isDefaultMicSelected
-            ? getDefaultDeviceId(APP.store.getState(), 'audioInput')
-            : micDeviceId;
-
-        logger.info(`Switching audio input device to ${selectedDeviceId}`);
-        sendAnalytics(createDeviceChangedEvent('audio', 'input'));
-        createLocalTracksF({
-            devices: [ 'audio' ],
-            micDeviceId: selectedDeviceId
-        })
-        .then(([ stream ]) => {
-            // if audio was muted before changing the device, mute
-            // with the new device
-            if (audioWasMuted) {
-                return stream.mute()
-                    .then(() => stream);
-            }
-
-            return stream;
-        })
-        .then(async stream => {
-            await this._maybeApplyAudioMixerEffect(stream);
-
-            return this.useAudioStream(stream);
-        })
-        .then(() => {
-            const localAudio = getLocalJitsiAudioTrack(APP.store.getState());
-
-            if (localAudio && isDefaultMicSelected) {
-                // workaround for the default device to be shown as selected in the
-                // settings even when the real device id was passed to gUM because of the
-                // above mentioned chrome bug.
-                localAudio._realDeviceId = localAudio.deviceId = 'default';
-            }
-        })
-        .catch(err => {
-            logger.error(`Failed to switch to selected audio input device ${selectedDeviceId}, error=${err}`);
-            APP.store.dispatch(notifyMicError(err));
+        // call hangup
+        APP.UI.addListener(UIEvents.HANGUP, () => {
+            this.hangup(true);
         });
-    },
 
-    /**
-     * Handles video device changes.
-     *
-     * @param {string} cameraDeviceId - The new device id.
-     * @returns {void}
-     */
-    onVideoDeviceChanged(cameraDeviceId) {
-        const videoWasMuted = this.isLocalVideoMuted();
-        const localVideoTrack = getLocalJitsiVideoTrack(APP.store.getState());
+        APP.UI.addListener(
+            UIEvents.VIDEO_DEVICE_CHANGED,
+            cameraDeviceId => {
+                const videoWasMuted = this.isLocalVideoMuted();
+                const localVideoTrack = getLocalJitsiVideoTrack(APP.store.getState());
 
-        if (localVideoTrack?.getDeviceId() === cameraDeviceId) {
-            return;
-        }
+                if (localVideoTrack?.getDeviceId() === cameraDeviceId) {
+                    return;
+                }
 
-        sendAnalytics(createDeviceChangedEvent('video', 'input'));
+                sendAnalytics(createDeviceChangedEvent('video', 'input'));
 
-        createLocalTracksF({
-            devices: [ 'video' ],
-            cameraDeviceId
-        })
-        .then(([ stream ]) => {
-            // if we are in audio only mode or video was muted before
-            // changing device, then mute
-            if (this.isAudioOnly() || videoWasMuted) {
-                return stream.mute()
-                    .then(() => stream);
+                createLocalTracksF({
+                    devices: [ 'video' ],
+                    cameraDeviceId
+                })
+                .then(([ stream ]) => {
+                    // if we are in audio only mode or video was muted before
+                    // changing device, then mute
+                    if (this.isAudioOnly() || videoWasMuted) {
+                        return stream.mute()
+                            .then(() => stream);
+                    }
+
+                    return stream;
+                })
+                .then(stream => {
+                    logger.info(`Switching the local video device to ${cameraDeviceId}.`);
+
+                    return this.useVideoStream(stream);
+                })
+                .catch(error => {
+                    logger.error(`Failed to switch to selected camera:${cameraDeviceId}, error:${error}`);
+
+                    return APP.store.dispatch(notifyCameraError(error));
+                });
             }
+        );
 
-            return stream;
-        })
-        .then(stream => {
-            logger.info(`Switching the local video device to ${cameraDeviceId}.`);
+        APP.UI.addListener(
+            UIEvents.AUDIO_DEVICE_CHANGED,
+            async micDeviceId => {
+                const audioWasMuted = this.isLocalAudioMuted();
 
-            return this.useVideoStream(stream);
-        })
-        .catch(error => {
-            logger.error(`Failed to switch to selected camera:${cameraDeviceId}, error:${error}`);
+                // Disable noise suppression if it was enabled on the previous track.
+                await APP.store.dispatch(setNoiseSuppressionEnabled(false));
 
-            return APP.store.dispatch(notifyCameraError(error));
+                // When the 'default' mic needs to be selected, we need to pass the real device id to gUM instead of
+                // 'default' in order to get the correct MediaStreamTrack from chrome because of the following bug.
+                // https://bugs.chromium.org/p/chromium/issues/detail?id=997689.
+                const isDefaultMicSelected = micDeviceId === 'default';
+                const selectedDeviceId = isDefaultMicSelected
+                    ? getDefaultDeviceId(APP.store.getState(), 'audioInput')
+                    : micDeviceId;
+
+                logger.info(`Switching audio input device to ${selectedDeviceId}`);
+                sendAnalytics(createDeviceChangedEvent('audio', 'input'));
+                createLocalTracksF({
+                    devices: [ 'audio' ],
+                    micDeviceId: selectedDeviceId
+                })
+                .then(([ stream ]) => {
+                    // if audio was muted before changing the device, mute
+                    // with the new device
+                    if (audioWasMuted) {
+                        return stream.mute()
+                            .then(() => stream);
+                    }
+
+                    return stream;
+                })
+                .then(async stream => {
+                    await this._maybeApplyAudioMixerEffect(stream);
+
+                    return this.useAudioStream(stream);
+                })
+                .then(() => {
+                    const localAudio = getLocalJitsiAudioTrack(APP.store.getState());
+
+                    if (localAudio && isDefaultMicSelected) {
+                        // workaround for the default device to be shown as selected in the
+                        // settings even when the real device id was passed to gUM because of the
+                        // above mentioned chrome bug.
+                        localAudio._realDeviceId = localAudio.deviceId = 'default';
+                    }
+                })
+                .catch(err => {
+                    logger.error(`Failed to switch to selected audio input device ${selectedDeviceId}, error=${err}`);
+                    APP.store.dispatch(notifyMicError(err));
+                });
+            }
+        );
+
+        APP.UI.addListener(UIEvents.TOGGLE_AUDIO_ONLY, () => {
+            // Immediately update the UI by having remote videos and the large video update themselves.
+            const displayedUserId = APP.UI.getLargeVideoID();
+
+            if (displayedUserId) {
+                APP.UI.updateLargeVideo(displayedUserId, true);
+            }
         });
     },
 
-    /**
-     * Handles audio only changes.
-     */
-    onToggleAudioOnly() {
-        // Immediately update the UI by having remote videos and the large video update themselves.
-        const displayedUserId = APP.UI.getLargeVideoID();
-
-        if (displayedUserId) {
-            APP.UI.updateLargeVideo(displayedUserId, true);
-        }
-    },
-
     /**
      * Cleanups local conference on suspend.
      */
@@ -2266,6 +2408,8 @@ export default {
                 this.deviceChangeListener);
         }
 
+        APP.UI.removeAllListeners();
+
         let feedbackResultPromise = Promise.resolve({});
 
         if (requestFeedback) {
@@ -2372,6 +2516,37 @@ export default {
         room.sendEndpointMessage(to, payload);
     },
 
+    /**
+     * Adds new listener.
+     * @param {String} eventName the name of the event
+     * @param {Function} listener the listener.
+     */
+    addListener(eventName, listener) {
+        eventEmitter.addListener(eventName, listener);
+    },
+
+    /**
+     * Removes listener.
+     * @param {String} eventName the name of the event that triggers the
+     * listener
+     * @param {Function} listener the listener.
+     */
+    removeListener(eventName, listener) {
+        eventEmitter.removeListener(eventName, listener);
+    },
+
+    /**
+     * Changes the display name for the local user
+     * @param nickname {string} the new display name
+     */
+    changeLocalDisplayName(nickname = '') {
+        const formattedNickname = getNormalizedDisplayName(nickname);
+
+        APP.store.dispatch(updateSettings({
+            displayName: formattedNickname
+        }));
+    },
+
     /**
      * Callback invoked by the external api create or update a direct connection
      * from the local client to an external client.

config.js

@@ -91,6 +91,9 @@ var config = {
         // Enables supports for AV1 codec.
         // enableAv1Support: false,
 
+        // Enables XMPP WebSocket (as opposed to BOSH) for the given amount of users.
+        // mobileXmppWsThreshold: 10, // enable XMPP WebSockets on mobile for 10% of the users
+
         // P2P test mode disables automatic switching to P2P when there are 2
         // participants in the conference.
         // p2pTestMode: false,
@@ -464,8 +467,6 @@ var config = {
     //          low: 100000,
     //          standard: 300000,
     //          high: 1000000,
-    //          fullHd: 2000000,
-    //          ultraHd: 4000000,
     //          ssHigh: 2500000
     //      },
     //      scalabilityModeEnabled: true,
@@ -477,8 +478,6 @@ var config = {
     //          low: 200000,
     //          standard: 500000,
     //          high: 1500000,
-    //          fullHd: 3000000,
-    //          ultraHd: 6000000,
     //          ssHigh: 2500000
     //      },
     //      scalabilityModeEnabled: true
@@ -488,8 +487,6 @@ var config = {
     //          low: 200000,
     //          standard: 500000,
     //          high: 1500000,
-    //          fullHd: 3000000,
-    //          ultraHd: 6000000,
     //          ssHigh: 2500000
     //      },
     //      scalabilityModeEnabled: false
@@ -499,8 +496,6 @@ var config = {
     //          low: 100000,
     //          standard: 300000,
     //          high: 1200000,
-    //          fullHd: 2500000,
-    //          ultraHd: 5000000,
     //          ssHigh: 2500000
     //      },
     //      scalabilityModeEnabled: true,
@@ -845,22 +840,6 @@ var config = {
     //     autoHideWhileChatIsOpen: false,
     // },
 
-    // Overrides the buttons displayed in the main toolbar. Depending on the screen size the number of displayed
-    // buttons varies from 2 buttons to 8 buttons. Every array in the mainToolbarButtons array will replace the
-    // corresponding default buttons configuration matched by the number of buttons specified in the array. Arrays with
-    // more than 8 buttons or less then 2 buttons will be ignored. When there there isn't an override for a cerain
-    // configuration (for example when 3 buttons are displayed) the default jitsi-meet configuration will be used.
-    // The order of the buttons in the array is preserved.
-    // mainToolbarButtons: [
-    //     [ 'microphone', 'camera', 'desktop', 'chat', 'raisehand', 'reactions', 'participants-pane', 'tileview' ],
-    //     [ 'microphone', 'camera', 'desktop', 'chat', 'raisehand', 'participants-pane', 'tileview' ],
-    //     [ 'microphone', 'camera', 'desktop', 'chat', 'raisehand', 'participants-pane' ],
-    //     [ 'microphone', 'camera', 'desktop', 'chat', 'participants-pane' ],
-    //     [ 'microphone', 'camera', 'chat', 'participants-pane' ],
-    //     [ 'microphone', 'camera', 'chat' ],
-    //     [ 'microphone', 'camera' ]
-    // ],
-
     // Toolbar buttons which have their click/tap event exposed through the API on
     // `toolbarButtonClicked`. Passing a string for the button key will
     // prevent execution of the click/tap routine; passing an object with `key` and
@@ -1803,9 +1782,6 @@ var config = {
     //         collectionInterval?: number;
     //         logGetStats?: boolean;
     // },
-
-    // Hide login button on auth dialog, you may want to enable this if you are using JWT tokens to authenticate users
-    // hideLoginButton: true,
 };
 
 // Temporary backwards compatibility with old mobile clients.

debian/control

@@ -3,7 +3,7 @@ Section: net
 Priority: extra
 Maintainer: Jitsi Team <dev@jitsi.org>
 Uploaders: Emil Ivov <emcho@jitsi.org>, Damian Minkov <damencho@jitsi.org>
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 8.0.0), nodejs
 Standards-Version: 3.9.6
 Homepage: https://jitsi.org/meet
 

debian/jitsi-meet-prosody.postinst

@@ -138,8 +138,10 @@ case "$1" in
             PROSODY_CONFIG_PRESENT="false"
         fi
 
-        # creates the user if it does not exist
-        echo -e "$JVB_SECRET\n$JVB_SECRET" | prosodyctl adduser jvb@$JICOFO_AUTH_DOMAIN > /dev/null || true
+        USER_EXISTS_CHECK=`prosodyctl adduser jvb@$JICOFO_AUTH_DOMAIN < /dev/null || true`
+        if [ ! "$USER_EXISTS_CHECK" = "That user already exists" ]; then
+            prosodyctl register jvb $JICOFO_AUTH_DOMAIN $JVB_SECRET || true
+        fi
 
         # Check whether prosody config has the internal muc, if not add it,
         # as we are migrating configs

ios/Podfile.lock

@@ -14,14 +14,14 @@ PODS:
     - CocoaLumberjack/Core (= 3.7.2)
   - CocoaLumberjack/Core (3.7.2)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.72.14)
-  - FBReactNativeSpec (0.72.14):
+  - FBLazyVector (0.72.9)
+  - FBReactNativeSpec (0.72.9):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTRequired (= 0.72.14)
-    - RCTTypeSafety (= 0.72.14)
-    - React-Core (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - ReactCommon/turbomodule/core (= 0.72.14)
+    - RCTRequired (= 0.72.9)
+    - RCTTypeSafety (= 0.72.9)
+    - React-Core (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - ReactCommon/turbomodule/core (= 0.72.9)
   - Firebase/Analytics (8.15.0):
     - Firebase/Core
   - Firebase/Core (8.15.0):
@@ -134,7 +134,7 @@ PODS:
     - AppAuth/Core (~> 1.6)
     - GTMSessionFetcher/Core (< 4.0, >= 1.5)
   - GTMSessionFetcher/Core (3.2.0)
-  - JitsiWebRTC (124.0.0)
+  - JitsiWebRTC (118.0.0)
   - libwebp (1.3.2):
     - libwebp/demux (= 1.3.2)
     - libwebp/mux (= 1.3.2)
@@ -167,26 +167,26 @@ PODS:
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
-  - RCTRequired (0.72.14)
-  - RCTTypeSafety (0.72.14):
-    - FBLazyVector (= 0.72.14)
-    - RCTRequired (= 0.72.14)
-    - React-Core (= 0.72.14)
-  - React (0.72.14):
-    - React-Core (= 0.72.14)
-    - React-Core/DevSupport (= 0.72.14)
-    - React-Core/RCTWebSocket (= 0.72.14)
-    - React-RCTActionSheet (= 0.72.14)
-    - React-RCTAnimation (= 0.72.14)
-    - React-RCTBlob (= 0.72.14)
-    - React-RCTImage (= 0.72.14)
-    - React-RCTLinking (= 0.72.14)
-    - React-RCTNetwork (= 0.72.14)
-    - React-RCTSettings (= 0.72.14)
-    - React-RCTText (= 0.72.14)
-    - React-RCTVibration (= 0.72.14)
-  - React-callinvoker (0.72.14)
-  - React-Codegen (0.72.14):
+  - RCTRequired (0.72.9)
+  - RCTTypeSafety (0.72.9):
+    - FBLazyVector (= 0.72.9)
+    - RCTRequired (= 0.72.9)
+    - React-Core (= 0.72.9)
+  - React (0.72.9):
+    - React-Core (= 0.72.9)
+    - React-Core/DevSupport (= 0.72.9)
+    - React-Core/RCTWebSocket (= 0.72.9)
+    - React-RCTActionSheet (= 0.72.9)
+    - React-RCTAnimation (= 0.72.9)
+    - React-RCTBlob (= 0.72.9)
+    - React-RCTImage (= 0.72.9)
+    - React-RCTLinking (= 0.72.9)
+    - React-RCTNetwork (= 0.72.9)
+    - React-RCTSettings (= 0.72.9)
+    - React-RCTText (= 0.72.9)
+    - React-RCTVibration (= 0.72.9)
+  - React-callinvoker (0.72.9)
+  - React-Codegen (0.72.9):
     - DoubleConversion
     - FBReactNativeSpec
     - glog
@@ -201,10 +201,10 @@ PODS:
     - React-rncore
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-  - React-Core (0.72.14):
+  - React-Core (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.72.14)
+    - React-Core/Default (= 0.72.9)
     - React-cxxreact
     - React-jsc
     - React-jsi
@@ -214,7 +214,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.72.14):
+  - React-Core/CoreModulesHeaders (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
@@ -227,7 +227,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/Default (0.72.14):
+  - React-Core/Default (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-cxxreact
@@ -239,22 +239,22 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/DevSupport (0.72.14):
+  - React-Core/DevSupport (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.72.14)
-    - React-Core/RCTWebSocket (= 0.72.14)
+    - React-Core/Default (= 0.72.9)
+    - React-Core/RCTWebSocket (= 0.72.9)
     - React-cxxreact
     - React-jsc
     - React-jsi
     - React-jsiexecutor
-    - React-jsinspector (= 0.72.14)
+    - React-jsinspector (= 0.72.9)
     - React-perflogger
     - React-runtimeexecutor
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.72.14):
+  - React-Core/RCTActionSheetHeaders (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
@@ -267,7 +267,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.72.14):
+  - React-Core/RCTAnimationHeaders (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
@@ -280,7 +280,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.72.14):
+  - React-Core/RCTBlobHeaders (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
@@ -293,7 +293,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTImageHeaders (0.72.14):
+  - React-Core/RCTImageHeaders (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
@@ -306,7 +306,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.72.14):
+  - React-Core/RCTLinkingHeaders (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
@@ -319,7 +319,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.72.14):
+  - React-Core/RCTNetworkHeaders (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
@@ -332,7 +332,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.72.14):
+  - React-Core/RCTSettingsHeaders (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
@@ -345,7 +345,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTTextHeaders (0.72.14):
+  - React-Core/RCTTextHeaders (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
@@ -358,7 +358,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.72.14):
+  - React-Core/RCTVibrationHeaders (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
@@ -371,10 +371,10 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTWebSocket (0.72.14):
+  - React-Core/RCTWebSocket (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.72.14)
+    - React-Core/Default (= 0.72.9)
     - React-cxxreact
     - React-jsc
     - React-jsi
@@ -384,48 +384,48 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-CoreModules (0.72.14):
+  - React-CoreModules (0.72.9):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.14)
-    - React-Codegen (= 0.72.14)
-    - React-Core/CoreModulesHeaders (= 0.72.14)
-    - React-jsi (= 0.72.14)
+    - RCTTypeSafety (= 0.72.9)
+    - React-Codegen (= 0.72.9)
+    - React-Core/CoreModulesHeaders (= 0.72.9)
+    - React-jsi (= 0.72.9)
     - React-RCTBlob
-    - React-RCTImage (= 0.72.14)
-    - ReactCommon/turbomodule/core (= 0.72.14)
+    - React-RCTImage (= 0.72.9)
+    - ReactCommon/turbomodule/core (= 0.72.9)
     - SocketRocket (= 0.6.1)
-  - React-cxxreact (0.72.14):
+  - React-cxxreact (0.72.9):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.72.14)
-    - React-debug (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - React-jsinspector (= 0.72.14)
-    - React-logger (= 0.72.14)
-    - React-perflogger (= 0.72.14)
-    - React-runtimeexecutor (= 0.72.14)
-  - React-debug (0.72.14)
-  - React-jsc (0.72.14):
-    - React-jsc/Fabric (= 0.72.14)
-    - React-jsi (= 0.72.14)
-  - React-jsc/Fabric (0.72.14):
-    - React-jsi (= 0.72.14)
-  - React-jsi (0.72.14):
+    - React-callinvoker (= 0.72.9)
+    - React-debug (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - React-jsinspector (= 0.72.9)
+    - React-logger (= 0.72.9)
+    - React-perflogger (= 0.72.9)
+    - React-runtimeexecutor (= 0.72.9)
+  - React-debug (0.72.9)
+  - React-jsc (0.72.9):
+    - React-jsc/Fabric (= 0.72.9)
+    - React-jsi (= 0.72.9)
+  - React-jsc/Fabric (0.72.9):
+    - React-jsi (= 0.72.9)
+  - React-jsi (0.72.9):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.07.22.00)
-  - React-jsiexecutor (0.72.14):
+  - React-jsiexecutor (0.72.9):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - React-perflogger (= 0.72.14)
-  - React-jsinspector (0.72.14)
-  - React-logger (0.72.14):
+    - React-cxxreact (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - React-perflogger (= 0.72.9)
+  - React-jsinspector (0.72.9)
+  - React-logger (0.72.9):
     - glog
   - react-native-background-timer (2.4.1):
     - React-Core
@@ -453,13 +453,12 @@ PODS:
   - react-native-video/Video (6.0.0-alpha.11):
     - PromisesSwift
     - React-Core
-  - react-native-webrtc (124.0.0):
-    - JitsiWebRTC (~> 124.0.0)
+  - react-native-webrtc (118.0.7):
+    - JitsiWebRTC (~> 118.0.0)
     - React-Core
-  - react-native-webview (13.8.7):
-    - RCT-Folly (= 2021.07.22.00)
+  - react-native-webview (13.5.1):
     - React-Core
-  - React-NativeModulesApple (0.72.14):
+  - React-NativeModulesApple (0.72.9):
     - React-callinvoker
     - React-Core
     - React-cxxreact
@@ -467,17 +466,17 @@ PODS:
     - React-runtimeexecutor
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-  - React-perflogger (0.72.14)
-  - React-RCTActionSheet (0.72.14):
-    - React-Core/RCTActionSheetHeaders (= 0.72.14)
-  - React-RCTAnimation (0.72.14):
+  - React-perflogger (0.72.9)
+  - React-RCTActionSheet (0.72.9):
+    - React-Core/RCTActionSheetHeaders (= 0.72.9)
+  - React-RCTAnimation (0.72.9):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.14)
-    - React-Codegen (= 0.72.14)
-    - React-Core/RCTAnimationHeaders (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - ReactCommon/turbomodule/core (= 0.72.14)
-  - React-RCTAppDelegate (0.72.14):
+    - RCTTypeSafety (= 0.72.9)
+    - React-Codegen (= 0.72.9)
+    - React-Core/RCTAnimationHeaders (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - ReactCommon/turbomodule/core (= 0.72.9)
+  - React-RCTAppDelegate (0.72.9):
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
@@ -489,81 +488,81 @@ PODS:
     - React-RCTNetwork
     - React-runtimescheduler
     - ReactCommon/turbomodule/core
-  - React-RCTBlob (0.72.14):
+  - React-RCTBlob (0.72.9):
     - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.72.14)
-    - React-Core/RCTBlobHeaders (= 0.72.14)
-    - React-Core/RCTWebSocket (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - React-RCTNetwork (= 0.72.14)
-    - ReactCommon/turbomodule/core (= 0.72.14)
-  - React-RCTImage (0.72.14):
+    - React-Codegen (= 0.72.9)
+    - React-Core/RCTBlobHeaders (= 0.72.9)
+    - React-Core/RCTWebSocket (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - React-RCTNetwork (= 0.72.9)
+    - ReactCommon/turbomodule/core (= 0.72.9)
+  - React-RCTImage (0.72.9):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.14)
-    - React-Codegen (= 0.72.14)
-    - React-Core/RCTImageHeaders (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - React-RCTNetwork (= 0.72.14)
-    - ReactCommon/turbomodule/core (= 0.72.14)
-  - React-RCTLinking (0.72.14):
-    - React-Codegen (= 0.72.14)
-    - React-Core/RCTLinkingHeaders (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - ReactCommon/turbomodule/core (= 0.72.14)
-  - React-RCTNetwork (0.72.14):
+    - RCTTypeSafety (= 0.72.9)
+    - React-Codegen (= 0.72.9)
+    - React-Core/RCTImageHeaders (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - React-RCTNetwork (= 0.72.9)
+    - ReactCommon/turbomodule/core (= 0.72.9)
+  - React-RCTLinking (0.72.9):
+    - React-Codegen (= 0.72.9)
+    - React-Core/RCTLinkingHeaders (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - ReactCommon/turbomodule/core (= 0.72.9)
+  - React-RCTNetwork (0.72.9):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.14)
-    - React-Codegen (= 0.72.14)
-    - React-Core/RCTNetworkHeaders (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - ReactCommon/turbomodule/core (= 0.72.14)
-  - React-RCTSettings (0.72.14):
+    - RCTTypeSafety (= 0.72.9)
+    - React-Codegen (= 0.72.9)
+    - React-Core/RCTNetworkHeaders (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - ReactCommon/turbomodule/core (= 0.72.9)
+  - React-RCTSettings (0.72.9):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.14)
-    - React-Codegen (= 0.72.14)
-    - React-Core/RCTSettingsHeaders (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - ReactCommon/turbomodule/core (= 0.72.14)
-  - React-RCTText (0.72.14):
-    - React-Core/RCTTextHeaders (= 0.72.14)
-  - React-RCTVibration (0.72.14):
+    - RCTTypeSafety (= 0.72.9)
+    - React-Codegen (= 0.72.9)
+    - React-Core/RCTSettingsHeaders (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - ReactCommon/turbomodule/core (= 0.72.9)
+  - React-RCTText (0.72.9):
+    - React-Core/RCTTextHeaders (= 0.72.9)
+  - React-RCTVibration (0.72.9):
     - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.72.14)
-    - React-Core/RCTVibrationHeaders (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - ReactCommon/turbomodule/core (= 0.72.14)
-  - React-rncore (0.72.14)
-  - React-runtimeexecutor (0.72.14):
-    - React-jsi (= 0.72.14)
-  - React-runtimescheduler (0.72.14):
+    - React-Codegen (= 0.72.9)
+    - React-Core/RCTVibrationHeaders (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - ReactCommon/turbomodule/core (= 0.72.9)
+  - React-rncore (0.72.9)
+  - React-runtimeexecutor (0.72.9):
+    - React-jsi (= 0.72.9)
+  - React-runtimescheduler (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-callinvoker
     - React-debug
     - React-jsi
     - React-runtimeexecutor
-  - React-utils (0.72.14):
+  - React-utils (0.72.9):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-debug
-  - ReactCommon/turbomodule/bridging (0.72.14):
+  - ReactCommon/turbomodule/bridging (0.72.9):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.72.14)
-    - React-cxxreact (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - React-logger (= 0.72.14)
-    - React-perflogger (= 0.72.14)
-  - ReactCommon/turbomodule/core (0.72.14):
+    - React-callinvoker (= 0.72.9)
+    - React-cxxreact (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - React-logger (= 0.72.9)
+    - React-perflogger (= 0.72.9)
+  - ReactCommon/turbomodule/core (0.72.9):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.72.14)
-    - React-cxxreact (= 0.72.14)
-    - React-jsi (= 0.72.14)
-    - React-logger (= 0.72.14)
-    - React-perflogger (= 0.72.14)
+    - React-callinvoker (= 0.72.9)
+    - React-cxxreact (= 0.72.9)
+    - React-jsi (= 0.72.9)
+    - React-logger (= 0.72.9)
+    - React-perflogger (= 0.72.9)
   - RNCalendarEvents (2.2.0):
     - React
   - RNCAsyncStorage (1.19.4):
@@ -831,8 +830,8 @@ SPEC CHECKSUMS:
   boost: 7dcd2de282d72e344012f7d6564d024930a6a440
   CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  FBLazyVector: d98eefb42c5a64cb28ef966bd9096c76770d8f24
-  FBReactNativeSpec: 53d4eb00e8e1b6e987a3dd5906d2afe131cc54c8
+  FBLazyVector: dc178b8748748c036ef9493a5d59d6d1f91a36ce
+  FBReactNativeSpec: d0aaae78e93c89dc2d691d8052a4d2aeb1b461ee
   Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
   FirebaseAnalytics: 7761cbadb00a717d8d0939363eb46041526474fa
   FirebaseCore: 5743c5785c074a794d35f2fff7ecc254a91e08b1
@@ -850,27 +849,27 @@ SPEC CHECKSUMS:
   GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
   GTMAppAuth: 99fb010047ba3973b7026e45393f51f27ab965ae
   GTMSessionFetcher: 41b9ef0b4c08a6db4b7eb51a21ae5183ec99a2c8
-  JitsiWebRTC: 37fb2fb70d42cac58c06948527a5f9e1b3f50812
+  JitsiWebRTC: 3a41671ef65a51d7204323814b055a2690b921c7
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   ObjectiveDropboxOfficial: fe206ce8c0bc49976c249d472db7fdbc53ebbd53
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
   PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265
   RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
-  RCTRequired: 264adaca1d8b1a9c078761891898d4142df05313
-  RCTTypeSafety: 279a89da7058a69899778a127be73fab38b84499
-  React: 725b4e11f6ffb43d6f9b14e82879073623db4071
-  React-callinvoker: c2ba5e7e1187d0f37705b9dcaaf9bbf24d3fe9dc
-  React-Codegen: ca5bc760044f8472bf2a78053937307fd2021820
-  React-Core: d0796eb91058542db9e67fa9b1b11c66092de1ac
-  React-CoreModules: 57ea4ca8627be90b1a29916e0640d879e5684305
-  React-cxxreact: bbd34bad63b639dbb2c162cce518e8dba33cef57
-  React-debug: d360c17c84e514b9143e78217072183d4fcfb9c0
-  React-jsc: 6e1aae704b76f5626c00c87439fe405f34a6446e
-  React-jsi: 5fe75c2ff9eea1e90ed5437fcbafb64032383d52
-  React-jsiexecutor: a05da2c08edb1314cc51671c795fd4ed8440c335
-  React-jsinspector: 275d9f80210f15f0af9a4b7fd5683fab9738e28e
-  React-logger: 8da4802de77a0eb62512396ad6bb1769904c2f0e
+  RCTRequired: f30c3213569b1dc43659ecc549a6536e1e11139e
+  RCTTypeSafety: e1ed3137728804fa98bce30b70e3da0b8e23054e
+  React: 54070abee263d5773486987f1cf3a3616710ed52
+  React-callinvoker: 794ea19cc4d8ce25921893141e131b9d6b7d02eb
+  React-Codegen: d5dc2cae27c93b0fab4241816343c586c58965c1
+  React-Core: f82477baba3526cf8a4f70055a22a8e878e3ef9c
+  React-CoreModules: 87cc386c2200862672b76bb02c4574b4b1d11b3c
+  React-cxxreact: c7163706a8391f373cd513348a8ebbd5a4444626
+  React-debug: 4dca41301a67ab2916b2c99bef60344a7b653ac5
+  React-jsc: 44ec1ce4171f4b6776810618da8e3da45899ea77
+  React-jsi: 799e7004db36b0b6da2d0969ce07bf3a96df8d19
+  React-jsiexecutor: bb34b280cfad63aedb266571a305b6365affb875
+  React-jsinspector: 54205b269da20c51417e0fc02c4cde9f29a4bf1a
+  React-logger: f42d2f2bc4cbb5d19d7c0ce84b8741b1e54e88c8
   react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
   react-native-get-random-values: dee677497c6a740b71e5612e8dbd83e7539ed5bb
   react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
@@ -882,25 +881,25 @@ SPEC CHECKSUMS:
   react-native-slider: 1cdd6ba29675df21f30544253bf7351d3c2d68c4
   react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
   react-native-video: 472b7c366eaaaa0207e546d9a50410df89790bcf
-  react-native-webrtc: ae5f9793fc58138ecb5bdf0afe7cfdb3f09888ed
-  react-native-webview: 95464c1249cae28186d3b7c6f494c6a124b16160
-  React-NativeModulesApple: 9b58b8f5c1d8ea68d0a63f569a9e786d01281ea6
-  React-perflogger: daabc494c6328efc1784a4b49b8b74fca305d11c
-  React-RCTActionSheet: 0e0e64a7cf6c07f1de73d1f0a92d26a70262b256
-  React-RCTAnimation: faef65b19e73029c4828167985b0a7c01c62756d
-  React-RCTAppDelegate: 1c4c94324d5dee57c79f4b68dc709b1c290068c1
-  React-RCTBlob: df6a165ecd97eb5a92d659aa91866ee9ee50bd5e
-  React-RCTImage: 15e211cbb629210ab9c1fa37e07e7100362b12ed
-  React-RCTLinking: 50d5faf19b02541cefb78ee5d505029283c8ef95
-  React-RCTNetwork: dfa9fb4ad2ae459b9193a14204b1d9da907d15a7
-  React-RCTSettings: 37611fa97d44a9c5a7ea844cfb953d3513f7ace0
-  React-RCTText: 39ed334f64484d07b85a8159cf117814ff069ff6
-  React-RCTVibration: 62462803b5fe0842e0be6d9ef86dd74e0df4a614
-  React-rncore: 25ad3a3c1e0f4edf77913b9af3af9f497b7f99a5
-  React-runtimeexecutor: e5c2f0a1493d72c61b97465ccfedc339157b3179
-  React-runtimescheduler: 5b3b73748021c7349f06fcd24181df17860b8fb6
-  React-utils: 22a77b05da25ce49c744faa82e73856dcae1734e
-  ReactCommon: 07937a01c967f2023d6f2d07114315f099b4b436
+  react-native-webrtc: 8b024c7bb9a005d2b9efeba4c691172dbd00268d
+  react-native-webview: 8baa0f5c6d336d6ba488e942bcadea5bf51f050a
+  React-NativeModulesApple: 4225ac31a26696c02c54b471052b3e85e74a9a0c
+  React-perflogger: cb433f318c6667060fc1f62e26eb58d6eb30a627
+  React-RCTActionSheet: 0af3f8ac067e8a1dde902810b7ad169d0a0ec31e
+  React-RCTAnimation: 453a88e76ba6cb49819686acd8b21ce4d9ee4232
+  React-RCTAppDelegate: 009ede96d00f79460a75ab5071eadb4aaa1e5012
+  React-RCTBlob: a64134435f331c7cc716dcea6944a1443af49d32
+  React-RCTImage: 8e059fbdfab18b86127424dc3742532aab960760
+  React-RCTLinking: 05ae2aa525b21a7f1c5069c14330700f470efd97
+  React-RCTNetwork: 7ed9d99d028c53e9a23e318f65937f499ba8a6fd
+  React-RCTSettings: 8b12ebf04d4baa0e259017fcef6cf7abd7d8ac51
+  React-RCTText: a062ade9ff1591c46bcb6c5055fd4f96c154b8aa
+  React-RCTVibration: 87c490b6f01746ab8f9b4e555f514cc030c06731
+  React-rncore: 140bc11b316da7003bf039844aef39e1c242d7ad
+  React-runtimeexecutor: 226ebef5f625878d3028b196cbecbbdeb6f208e4
+  React-runtimescheduler: 75f2210cd7a50c4565dfd218e320479013b82f70
+  React-utils: a3ffbc321572ee91911d7bc30965abe9aa4e16af
+  ReactCommon: d3522e54560e4d940554aa074a0206bf4d39ae5e
   RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3
   RNCAsyncStorage: 3a8f7145d17cdd9f88e7b77666c94a09e4f759c8
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
@@ -913,8 +912,8 @@ SPEC CHECKSUMS:
   RNSVG: ed492aaf3af9ca01bc945f7a149d76d62e73ec82
   RNWatch: fd30ca40a5b5ef58dcbc195638e68219bc455236
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
-  Yoga: c32e0be1a17f8f1f0e633a3122f7666441f52c82
+  Yoga: eddf2bbe4a896454c248a8f23b4355891eb720a6
 
 PODFILE CHECKSUM: ec00682c7062a323dff24a3c3643ca0bbb420d01
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.14.3

ios/PrivacyInfo.xcprivacy

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>NSPrivacyAccessedAPITypes</key>
-	<array>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>C617.1</string>
-			</array>
-		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>CA92.1</string>
-			</array>
-		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>35F9.1</string>
-			</array>
-		</dict>
-	</array>
-	<key>NSPrivacyCollectedDataTypes</key>
-	<array/>
-	<key>NSPrivacyTracking</key>
-	<false/>
-</dict>
-</plist>

ios/app/app.xcodeproj/project.pbxproj

@@ -151,7 +151,6 @@
 		4EB0603A260E09D000F524C5 /* DarwinNotificationCenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DarwinNotificationCenter.swift; sourceTree = "<group>"; };
 		4EB0603B260E09D000F524C5 /* SampleUploader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SampleUploader.swift; sourceTree = "<group>"; };
 		4EC49B8625BED71300E76218 /* ReplayKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReplayKit.framework; path = System/Library/Frameworks/ReplayKit.framework; sourceTree = SDKROOT; };
-		6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = ../PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
 		B3B083EB1D4955FF0069CEE7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = app.entitlements; sourceTree = "<group>"; };
 		D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -294,7 +293,6 @@
 				0BEA5C351F7B8F73000D0AB4 /* WatchKit extension */,
 				4EB06025260E026600F524C5 /* JitsiMeetBroadcast Extension */,
 				CDD71F5E1157E9F283DF92A8 /* Pods */,
-				6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -369,12 +367,13 @@
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				0B26BE701EC5BC3C00EEFB41 /* Embed Frameworks */,
+				0BB7DA181EC9E695007AAE98 /* Adjust ATS */,
+				DEF4813D224925A2002AD03A /* Copy Google Plist file */,
+				DE11877A21EE09640078D059 /* Setup Google reverse URL handler */,
+				DE4F6D6E22005C0400DE699E /* Setup Dropbox */,
+				4E81688528A408E600F8FA9E /* Update App Entitlements */,
 				0BEA5C491F7B8F73000D0AB4 /* Embed Watch Content */,
 				4EC49B9025BED71300E76218 /* Embed App Extensions */,
-				4E81688528A408E600F8FA9E /* Update App Entitlements */,
-				DE11877A21EE09640078D059 /* Setup Google reverse URL handler */,
-				0BB7DA181EC9E695007AAE98 /* Adjust ATS */,
-				DE4F6D6E22005C0400DE699E /* Setup Dropbox */,
 			);
 			buildRules = (
 			);
@@ -412,7 +411,7 @@
 			attributes = {
 				LastSwiftUpdateCheck = 1240;
 				LastUpgradeCheck = 1020;
-				ORGANIZATIONNAME = Jitsi;
+				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					0BEA5C241F7B8F73000D0AB4 = {
 						CreatedOnToolsVersion = 9.0;
@@ -500,12 +499,10 @@
 /* Begin PBXShellScriptBuildPhase section */
 		0BB7DA181EC9E695007AAE98 /* Adjust ATS */ = {
 			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH",
 			);
 			name = "Adjust ATS";
 			outputPaths = (
@@ -516,7 +513,6 @@
 		};
 		0BBA83C41EC9F7600075A103 /* Run React packager */ = {
 			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -531,14 +527,12 @@
 		};
 		4E81688528A408E600F8FA9E /* Update App Entitlements */ = {
 			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"$PROJECT_DIR/app.entitlements",
 			);
 			name = "Update App Entitlements";
 			outputFileListPaths = (
@@ -573,14 +567,12 @@
 		};
 		DE11877A21EE09640078D059 /* Setup Google reverse URL handler */ = {
 			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH",
 			);
 			name = "Setup Google reverse URL handler";
 			outputFileListPaths = (
@@ -589,18 +581,16 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "GOOGLE_PLIST_NAME=\"GoogleService-Info.plist\"\nGOOGLE_PLIST=\"$PROJECT_DIR/$GOOGLE_PLIST_NAME\"\nBUILD_APP_DIR=\"$BUILT_PRODUCTS_DIR/$PRODUCT_NAME.app\"\nINFO_PLIST=\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"\n\nif [[ -f $GOOGLE_PLIST ]]; then\n    cp $GOOGLE_PLIST \"$BUILD_APP_DIR/$GOOGLE_PLIST_NAME\"\n    REVERSED_CLIENT_ID=$(/usr/libexec/PlistBuddy -c \"Print :REVERSED_CLIENT_ID:\" $GOOGLE_PLIST)\n    /usr/libexec/PlistBuddy -c \"Set :CFBundleURLTypes:1:CFBundleURLSchemes:0 $REVERSED_CLIENT_ID\" $INFO_PLIST\nfi\n";
+			shellScript = "INFO_PLIST=\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"\nGOOGLE_PLIST=\"$PROJECT_DIR/GoogleService-Info.plist\"\n\nif [[ -f $GOOGLE_PLIST ]]; then\n    REVERSED_CLIENT_ID=$(/usr/libexec/PlistBuddy -c \"Print :REVERSED_CLIENT_ID:\" $GOOGLE_PLIST)\n    /usr/libexec/PlistBuddy -c \"Set :CFBundleURLTypes:1:CFBundleURLSchemes:0 $REVERSED_CLIENT_ID\" $INFO_PLIST\nfi\n";
 		};
 		DE4F6D6E22005C0400DE699E /* Setup Dropbox */ = {
 			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH",
 			);
 			name = "Setup Dropbox";
 			outputFileListPaths = (
@@ -611,6 +601,24 @@
 			shellPath = /bin/sh;
 			shellScript = "INFO_PLIST=\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"\nDROPBOX_KEY_FILE=\"$PROJECT_DIR/dropbox.key\"\n\nif [[ -f $DROPBOX_KEY_FILE ]]; then\n    /usr/libexec/PlistBuddy -c \"Delete :LSApplicationQueriesSchemes\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes array\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes:0 string 'dbapi-2'\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes:1 string 'dbapi-8-emm'\" $INFO_PLIST\n\n    DROPBOX_KEY=$(head -n 1 $DROPBOX_KEY_FILE)\n    /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLName string dropbox\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLSchemes array\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLSchemes:0 string $DROPBOX_KEY\" $INFO_PLIST\nfi\n";
 		};
+		DEF4813D224925A2002AD03A /* Copy Google Plist file */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Google Plist file";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "GOOGLE_PLIST_NAME=\"GoogleService-Info.plist\"\nGOOGLE_PLIST=\"$PROJECT_DIR/$GOOGLE_PLIST_NAME\"\nBUILD_APP_DIR=\"$BUILT_PRODUCTS_DIR/$PRODUCT_NAME.app\"\n\nif [[ -f $GOOGLE_PLIST ]]; then\n    cp $GOOGLE_PLIST \"$BUILD_APP_DIR/$GOOGLE_PLIST_NAME\"\nfi\n";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1021,7 +1029,10 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1081,7 +1092,10 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;

ios/app/broadcast-extension/Info.plist

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

ios/app/src/AppDelegate.m

@@ -35,6 +35,7 @@
 
     jitsiMeet.defaultConferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
         [builder setFeatureFlag:@"welcomepage.enabled" withBoolean:YES];
+        [builder setFeatureFlag:@"resolution" withValue:@(360)];
         [builder setFeatureFlag:@"ios.screensharing.enabled" withBoolean:YES];
         [builder setFeatureFlag:@"ios.recording.enabled" withBoolean:YES];
     }];

ios/app/src/Info.plist

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

ios/app/watchos/app/Info.plist

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

ios/app/watchos/extension/Info.plist

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

ios/fastlane/Fastfile

@@ -79,8 +79,7 @@ platform :ios do
     build_app(
         scheme: "JitsiMeet",
         include_symbols: true,
-        export_xcargs: "-allowProvisioningUpdates",
-        xcodebuild_formatter: ""
+        export_xcargs: "-allowProvisioningUpdates"
     )
 
     # Upload the build to TestFlight

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -145,7 +145,6 @@
 		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>"; };
-		6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = ../PrivacyInfo.xcprivacy; 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>"; };
@@ -231,7 +230,6 @@
 				0BD906E61EC0C00300C8C18E /* Products */,
 				0BCA49681EC4BBE500B793EE /* Resources */,
 				0BD906E71EC0C00300C8C18E /* src */,
-				6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */,
 			);
 			sourceTree = "<group>";
 		};
@@ -781,7 +779,10 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -844,7 +845,10 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;

ios/sdk/src/Info.plist

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

ios/sdk/src/JitsiMeet.m

@@ -62,7 +62,7 @@
 
         // Initialize the one and only bridge for interfacing with React Native.
         _bridgeWrapper = [[RCTBridgeWrapper alloc] init];
-
+        
         // Initialize the listener for handling start/stop screensharing notifications.
         _screenshareEventEmiter = [[ScheenshareEventEmiter alloc] init];
 
@@ -141,7 +141,7 @@
     if (_bridgeWrapper != nil) {
         return;
     };
-
+    
     _bridgeWrapper = [[RCTBridgeWrapper alloc] init];
 }
 
@@ -231,7 +231,7 @@
 }
 
 - (void)setDefaultConferenceOptions:(JitsiMeetConferenceOptions *)defaultConferenceOptions {
-    if (defaultConferenceOptions != nil && defaultConferenceOptions.room != nil) {
+    if (defaultConferenceOptions != nil && _defaultConferenceOptions.room != nil) {
         @throw [NSException exceptionWithName:@"RuntimeError"
                                        reason:@"'room' must be null in the default conference options"
                                      userInfo:nil];

ios/sdk/src/Lite-Info.plist

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

lang/main-de.json

@@ -128,7 +128,6 @@
         "privateNotice": "Private Nachricht an {{recipient}}",
         "sendButton": "Senden",
         "smileysPanel": "Emoji-Auswahl",
-        "systemDisplayName": "System",
         "tabs": {
             "chat": "Chatten",
             "polls": "Umfragen"
@@ -264,7 +263,6 @@
         "Share": "Teilen",
         "Submit": "OK",
         "WaitForHostMsg": "Die Konferenz wurde noch nicht gestartet. Falls Sie die Konferenz leiten, authentifizieren Sie sich bitte. Warten Sie andernfalls, bis die Konferenz gestartet wird.",
-        "WaitForHostNoAuthMsg": "Die Konferenz wurde noch nicht gestartet. Bitte warten Sie, bis die Konferenz gestartet wird.",
         "WaitingForHostButton": "Auf Moderation warten",
         "WaitingForHostTitle": "Warten auf den Beginn der Konferenz …",
         "Yes": "Ja",
@@ -307,8 +305,6 @@
         "contactSupport": "Support kontaktieren",
         "copied": "Kopiert",
         "copy": "Kopieren",
-        "demoteParticipantDialog": "Sind Sie sicher, dass Sie diese Person zu den Gästen verschieben möchten?",
-        "demoteParticipantTitle": "Zu Gästen verschieben",
         "dismiss": "OK",
         "displayNameRequired": "Hallo! Wie ist Ihr Name?",
         "done": "Fertig",
@@ -320,7 +316,6 @@
         "embedMeeting": "Besprechung einbetten",
         "enterDisplayName": "Bitte geben Sie hier Ihren Namen ein",
         "error": "Fehler",
-        "errorRoomCreationRestriction": "Sie haben versucht, zu schnell beizutreten, bitte versuchen Sie es gleich noch einmal.",
         "gracefulShutdown": "Der Dienst steht momentan wegen Wartungsarbeiten nicht zur Verfügung. Bitte versuchen Sie es später noch einmal.",
         "grantModeratorDialog": "Möchten Sie wirklich Moderationsrechte an diese Person vergeben?",
         "grantModeratorTitle": "Moderationsrechte vergeben",
@@ -565,7 +560,6 @@
         "noNumbers": "Keine Telefonnummern verfügbar.",
         "noPassword": "Kein Passwort benötigt",
         "noRoom": "Keine Konferenz für die Einwahlinformationen angegeben.",
-        "noWhiteboard": "Whiteboard konnte nicht geladen werden.",
         "numbers": "Einwahlnummern",
         "password": "$t(lockRoomPasswordUppercase):",
         "reachedLimit": "Sie haben die Grenzen Ihres Tarifs erreicht.",
@@ -573,8 +567,7 @@
         "sipAudioOnly": "SIP-Adresse (nur Ton)",
         "title": "Teilen",
         "tooltip": "Freigabe-Link und Einwahlinformationen für dieses Meeting",
-        "upgradeOptions": "Bitte prüfen Sie Ihre Upgrade-Optionen auf",
-        "whiteboardError": "Whiteboard konnte nicht geladen werden. Bitte versuchen Sie es später erneut."
+        "upgradeOptions": "Bitte prüfen Sie Ihre Upgrade-Optionen auf"
     },
     "inlineDialogFailure": {
         "msg": "Es ist ein Fehler aufgetreten.",
@@ -738,8 +731,6 @@
         "connectedTwoMembers": "{{first}} und {{second}} nehmen am Meeting teil",
         "dataChannelClosed": "Schlechte Videoqualität",
         "dataChannelClosedDescription": "Die Steuerungsverbindung (Bridge Channel) wurde unterbrochen, daher ist die Videoqulität auf die schlechteste Stufe limitiert.",
-        "dataChannelClosedDescriptionWithAudio": "Die Steuerungsverbindung (Bridge Channel) wurde unterbrochen, daher können Video- und Tonprobleme auftreten.",
-        "dataChannelClosedWithAudio": "Ton- und Videoqualität können beeinträchtigt sein",
         "disabledIframe": "Die Einbettung ist nur für Demo-Zwecke vorgesehen. Diese Konferenz wird in {{timeout}} Minuten beendet.",
         "disabledIframeSecondary": "Die Einbettung von {{domain}} ist nur für Demo-Zwecke vorgesehen. Diese Konferenz wird in {{timeout}} Minuten beendet. Bitte nutzen Sie <a href='{{jaasDomain}}' rel='noopener noreferrer' target='_blank'>Jitsi as a Service</a> für produktive Zwecke!",
         "disconnected": "getrennt",
@@ -811,16 +802,12 @@
         "startSilentTitle": "Sie sind ohne Audioausgabe beigetreten!",
         "suboptimalBrowserWarning": "Tut uns leid, aber die Konferenz wird mit {{appName}} kein großartiges Erlebnis. Wir versuchen immer die Situation zu verbessern, bis dahin empfehlen wir aber die Verwendung einer der <a href=\"{{recommendedBrowserPageLink}}\" target=\"_blank\">vollständig unterstützen Browser</a>.",
         "suboptimalExperienceTitle": "Browserwarnung",
-        "suggestRecordingAction": "Starten",
-        "suggestRecordingDescription": "Möchten Sie eine Aufzeichnung starten?",
-        "suggestRecordingTitle": "Konferenz aufzeichnen",
         "unmute": "Stummschaltung aufheben",
         "videoMutedRemotelyDescription": "Sie können sie jederzeit wieder einschalten.",
         "videoMutedRemotelyTitle": "Ihre Kamera wurde von {{participantDisplayName}} ausgeschaltet!",
         "videoUnmuteBlockedDescription": "Die Kamera und Bildschirmfreigabe kann aus Überlastungsschutzgründen temporär nicht eingeschaltet werden.",
         "videoUnmuteBlockedTitle": "Kamera und Bildschirmfreigabe kann nicht aktiviert werden!",
         "viewLobby": "Lobby ansehen",
-        "viewVisitors": "Gäste anzeigen",
         "waitingParticipants": "{{waitingParticipants}} Personen",
         "whiteboardLimitDescription": "Bitte speichern Sie Ihre Inhalte, da das Nutzungslimit bald erreicht wird und dann Ihr Whiteboard geschlossen wird.",
         "whiteboardLimitTitle": "Whiteboard-Nutzung"
@@ -950,7 +937,6 @@
         "or": "oder",
         "premeeting": "Vorschau",
         "proceedAnyway": "Trotzdem fortsetzen",
-        "recordingWarning": "Diese Konferenz wird möglicherweise von anderen Personen aufgezeichnet",
         "screenSharingError": "Fehler bei Bildschirmfreigabe:",
         "showScreen": "Konferenzvorschau aktivieren",
         "startWithPhone": "Mit Telefonaudio starten",
@@ -1017,6 +1003,7 @@
         "limitNotificationDescriptionNative": "Wegen hoher Nachfrage ist Ihre Aufnahme auf {{limit}} Min. begrenzt. Für unlimitierte Aufnahmen nutzen Sie bitte <3>{{app}}</3>.",
         "limitNotificationDescriptionWeb": "Wegen hoher Nachfrage ist Ihre Aufnahme auf {{limit}} Min. begrenzt. Für unlimitierte Aufnahmen nutzen Sie bitte <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
         "linkGenerated": "Link zur Aufzeichnung wurde generiert.",
+        "live": "LIVE",
         "localRecordingNoNotificationWarning": "Die Aufzeichnung wird anderen Anwesenden nicht mitgeteilt. Sie müssen diese selbst darauf hinweisen, dass die Konferenz aufgezeichnet wird.",
         "localRecordingNoVideo": "Videos werden nicht aufgenommen",
         "localRecordingStartWarning": "Bitte beenden Sie die Aufzeichnung vor dem Verlassen der Konferenz, um die Aufzeichnung zu speichern.",
@@ -1033,6 +1020,7 @@
         "onBy": "{{name}} startete die Aufnahme",
         "onlyRecordSelf": "Nur eigenes Kamerabild und Ton aufzeichnen",
         "pending": "Aufzeichnung des Meetings wird vorbereitet…",
+        "rec": "AUFZ",
         "recordAudioAndVideo": "Kamera und Ton aufzeichnen",
         "recordTranscription": "Transkription aufzeichnen",
         "saveLocalRecording": "Aufzeichnung lokal abspeichern",
@@ -1189,7 +1177,7 @@
             "audioOnly": "„Nur Audio“ ein-/ausschalten",
             "audioRoute": "Audiogerät auswählen",
             "boo": "Buhen",
-            "breakoutRooms": "Breakout-Räume",
+            "breakoutRoom": "Breakout-Räume betreten/verlassen",
             "callQuality": "Qualitätseinstellungen",
             "carmode": "Automodus",
             "cc": "Untertitel ein-/ausschalten",
@@ -1372,9 +1360,13 @@
     },
     "transcribing": {
         "ccButtonTooltip": "Untertitel ein-/ausschalten",
+        "error": "Die Aufzeichnung ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
         "expandedLabel": "Transkribieren ist derzeit eingeschaltet",
         "failedToStart": "Transkribieren konnte nicht gestartet werden",
         "labelToolTip": "Das Meeting wird transkribiert",
+        "off": "Transkribieren gestoppt",
+        "on": "Transkribieren gestartet",
+        "pending": "Transkribieren des Meetings wird vorbereitet…",
         "sourceLanguageDesc": "Aktuell ist die Sprache der Konferenz auf <b>{{sourceLanguage}}</b> eingestellt. <br/> Sie könne dies hier ",
         "sourceLanguageHere": "ändern",
         "start": "Anzeige der Untertitel starten",
@@ -1430,7 +1422,6 @@
     },
     "videothumbnail": {
         "connectionInfo": "Verbindungsinformationen",
-        "demote": "Zu Gästen verschieben",
         "domute": "Stummschalten",
         "domuteOthers": "Alle anderen stummschalten",
         "domuteVideo": "Kamera ausschalten",
@@ -1485,12 +1476,7 @@
         "chatIndicator": "(Gast)",
         "labelTooltip": "Anzahl Gäste: {{count}}",
         "notification": {
-            "demoteDescription": "Hierhin verschoben von {{actor}}, bitte melden Sie sich um teilzunehmen",
             "description": "Bitte melden Sie sich um teilzunehmen",
-            "noMainParticipantsDescription": "Eine Person muss die Konferenz starten. Bitte versuchen Sie es gleich noch einmal.",
-            "noMainParticipantsTitle": "Diese Konferenz wurde noch nicht gestartet.",
-            "noVisitorLobby": "Sie können nicht teilnehmen, solange die Lobby für diese Konferenz aktiviert ist.",
-            "notAllowedPromotion": "Eine Person muss Ihre Anfrage erst erlauben.",
             "title": "Sie sind Gast in der Konferenz"
         }
     },
@@ -1550,7 +1536,6 @@
     "whiteboard": {
         "accessibilityLabel": {
             "heading": "Whiteboard"
-        },
-        "screenTitle": "Whiteboard"
+        }
     }
 }

lang/main-fr.json

@@ -74,7 +74,7 @@
         "mainRoom": "Salle principale",
         "notifications": {
             "joined": "Entrée en salle annexe \"{{name}}\"",
-            "joinedMainRoom": "Retour à la salle principale",
+            "joinedMainRoom": "Retour à la salle principalem",
             "joinedTitle": "Salles annexes"
         },
         "showParticipantList": "Afficher la liste des participants",
@@ -82,7 +82,7 @@
     },
     "calendarSync": {
         "addMeetingURL": "Ajouter un lien de conférence",
-        "confirmAddLink": "Voulez-vous ajouter un lien Jitsi à cet événement?",
+        "confirmAddLink": "Voulez-vous ajouter un lien Jitsi à cet événement ?",
         "error": {
             "appConfiguration": "L'intégration du calendrier n'est pas correctement configurée.",
             "generic": "Une erreur s'est produite. Veuillez vérifier les paramètres de votre calendrier ou tenter de l'actualiser.",
@@ -138,7 +138,7 @@
     },
     "chromeExtensionBanner": {
         "buttonText": "Installer l'extension Chrome",
-        "buttonTextEdge": "Installer l'extension Edge",
+        "buttonTextEdge": "Installer l’extension Edge",
         "close": "Fermer",
         "dontShowAgain": "Ne plus m'afficher ceci",
         "installExtensionText": "Installer l'extension pour l'intégration de Google Calendar et Office 365"
@@ -424,7 +424,7 @@
         "shareAudioAltText": "Pour partager le contenu voulu, naviguer vers \"Onglet du Navigateur\", sélectionner le contenu, activer le bouton \"partager l’audio\" et enfin cliquer sur le bouton \"partager\"",
         "shareAudioTitle": "Comment partager le son",
         "shareAudioWarningD1": "vous devez cesser le partage d'écran avant de partager votre son.",
-        "shareAudioWarningD2": "vous devez partager votre écran à nouveau et cocher l'option \"Partager l'audio\".",
+        "shareAudioWarningD2": "viys devez partager votre écran à nouveau et cocher l'ootion \"Partager l'audio\".",
         "shareAudioWarningH1": "Si vous voulez partager uniquement de l'audio:",
         "shareAudioWarningTitle": "Vous devez cesser de partager l'écran avant de partager l'audio",
         "shareMediaWarningGenericH2": "Si vous voulez partager votre écran et l'audio",
@@ -1169,7 +1169,7 @@
     "toolbar": {
         "Settings": "Paramètres",
         "accessibilityLabel": {
-            "Settings": "Ouvrir le menu des paramètres",
+            "Settings": "Afficher / Masquer le menu des paramètres",
             "audioOnly": "Activer / Désactiver le mode voix uniquement",
             "audioRoute": "Sélectionner la source audio",
             "boo": "Hou",
@@ -1215,7 +1215,7 @@
             "moreActions": "Activer / Désactiver le menu d'actions supplémentaires",
             "moreActionsMenu": "Menu d'actions supplémentaires",
             "moreOptions": "Voir plus d'options",
-            "mute": "Couper votre micro",
+            "mute": "Activer / Désactiver l'audio",
             "muteEveryone": "Couper le micro de tout le monde",
             "muteEveryoneElse": "Couper le micro de tous les autres",
             "muteEveryoneElsesVideoStream": "Couper la caméra de tous les autres",
@@ -1251,11 +1251,11 @@
             "tileView": "Activer / Désactiver la vue mosaïque",
             "toggleCamera": "Changer de caméra",
             "toggleFilmstrip": "Afficher ou masquer les vignettes vidéo",
-            "unmute": "Activer votre micro",
+            "unmute": "Rétablir le son",
             "videoblur": "Activer / désactiver le floutage",
-            "videomute": "Couper votre vidéo",
+            "videomute": "Activer / Couper la vidéo",
             "videomuteGUMPending": "Connexion de votre caméra",
-            "videounmute": "Activer votre vidéo"
+            "videounmute": "Démarrer la vidéo"
         },
         "addPeople": "Ajouter des personnes à votre appel",
         "audioOnlyOff": "Désactiver le mode bande passante réduite",

lang/main-hu.json

@@ -184,7 +184,6 @@
         "Share": "Megosztás",
         "Submit": "Elküldés",
         "WaitForHostMsg": "A konferencia még nem kezdődött meg. Ha Ön a házigazda, akkor hitelesítse magát. Ellenkező esetben, kérjük várjon a házigazda érkezésére.",
-        "WaitForHostNoAuthMsg": "A konferencia még nem kezdődött el, mert nincs elérhető moderátor. Kérlek várj.",
         "WaitingForHost": "Várakozás a házigazdára…",
         "Yes": "Igen",
         "accessibilityLabel": {

lang/main-lv.json

@@ -128,7 +128,6 @@
         "privateNotice": "Privāta ziņa adresātam {{recipient}}",
         "sendButton": "Nosūtīt",
         "smileysPanel": "Emociju panelis",
-        "systemDisplayName": "Sistēma",
         "tabs": {
             "chat": "Tērzēšana",
             "polls": "Aptaujas"
@@ -319,7 +318,6 @@
         "embedMeeting": "Iegult sapulci",
         "enterDisplayName": "Ievadiet savu vārdu",
         "error": "Kļūda",
-        "errorRoomCreationRestriction": "Jūs mēģinājāt pievienoties pārāk ātri. Lūdzu, atgriezieties vēlāk.",
         "gracefulShutdown": "Mūsu serviss pašlaik nedarbojas apkopes dēļ. Lūdzu, pamēģiniet vēlreiz vēlāk.",
         "grantModeratorDialog": "Vai tiešām vēlaties piešķirt moderatora tiesības dalībniekam {{participantName}}?",
         "grantModeratorTitle": "Piešķirt moderatora tiesības",
@@ -355,28 +353,28 @@
         "micPermissionDeniedError": "Nav piekļuves mikrofonam. Jūs varat piedalīties sapulcē, bet citi jūs nedzirdēs. Lai to novērstu, izmantojiet kameras ikonu pārlūkprogrammas adrešu joslā.",
         "micTimeoutError": "Nevarēja palaist audio avotu. Iestājās noildze!",
         "micUnknownError": "Nevar izmantot mikrofonu nezināma iemesla dēļ.",
-        "moderationAudioLabel": "Atļaut dalībniekiem ieslēgt savu mikrofonu",
-        "moderationVideoLabel": "Atļaut dalībniekiem ieslēgt savu kameru",
-        "muteEveryoneDialog": "Dalībnieki paši var ieslēgt savu mikrofonu.",
-        "muteEveryoneDialogModerationOn": "Dalībnieki var nosūtīt pieprasījumu ieslēgt savu mikrofonu.",
-        "muteEveryoneElseDialog": "Kad skaņa būs izslēgta, jūs nevarēsiet to ieslēgt atpakaļ, taču dalībnieki to varēs izdarīt paši.",
+        "moderationAudioLabel": "Ļaujiet dalībniekiem ieslēgt savu mikrofonu",
+        "moderationVideoLabel": "Ļaujiet dalībniekiem ieslēgt savu kameru",
+        "muteEveryoneDialog": "Dalībnieki jebkurā laikā var ieslēgt savu mikrofonu.",
+        "muteEveryoneDialogModerationOn": "Dalībnieki jebkurā laikā var nosūtīt pieprasījumu runāt.",
+        "muteEveryoneElseDialog": "Kad skaņa būs izslēgta, jūs nevarēsit to ieslēgt atpakaļ, taču dalībnieki jebkurā laikā to varēs izdarīt paši.",
         "muteEveryoneElseTitle": "Vai izslēgt skaņu visiem, izņemot {{whom}}?",
-        "muteEveryoneElsesVideoDialog": "Kad video būs izslēgts, jūs nevarēsiet to ieslēgt atpakaļ, taču dalībnieki to varēs izdarīt paši.",
+        "muteEveryoneElsesVideoDialog": "Kad video būs izslēgts, jūs nevarēsit to ieslēgt atpakaļ, taču dalībnieki jebkurā laikā to varēs izdarīt paši.",
         "muteEveryoneElsesVideoTitle": "Vai izslēgt video visiem, izņemot {{whom}}?",
         "muteEveryoneSelf": "jūs",
         "muteEveryoneStartMuted": "No šī brīža visi jauni dalībnieki pieslēdzas ar izslēgt skaņu",
         "muteEveryoneTitle": "Vai izslēgt skaņu visiem?",
-        "muteEveryonesVideoDialog": "Dalībnieki var ieslēgt savu video.",
-        "muteEveryonesVideoDialogModerationOn": "Dalībnieki var nosūtīt pieprasījumu ieslēgt viņu video.",
+        "muteEveryonesVideoDialog": "Dalībnieki var jebkurā laikā ieslēgt savu video.",
+        "muteEveryonesVideoDialogModerationOn": "Dalībnieki jebkurā laikā var nosūtīt pieprasījumu ieslēgt viņu video.",
         "muteEveryonesVideoDialogOk": "Atspējot",
         "muteEveryonesVideoTitle": "Vai apturēt ikviena video?",
-        "muteParticipantBody": "Jūs nevariet viņiem ieslēgt skaņu, bet viņi paši to var izdarīt jebkurā laikā.",
+        "muteParticipantBody": "Jūs nevarat viņiem ieslēgt skaņu, bet viņi paši to var izdarīt jebkurā laikā.",
         "muteParticipantButton": "Izslēgt skaņu",
-        "muteParticipantsVideoBody": "Jūs nevarēsiet kameru ieslēgt atpakaļ, taču viņi paši to varēs izdarīt jebkurā laikā.",
-        "muteParticipantsVideoBodyModerationOn": "Ne Jūs, ne dalībnieki nevarēsiet ieslēgt kameru atpakaļ.",
+        "muteParticipantsVideoBody": "Jūs nevarēsiet atkal ieslēgt kameru, taču viņi var to jebkurā laikā atkal ieslēgt.",
+        "muteParticipantsVideoBodyModerationOn": "Jūs nevarēsiet atkal ieslēgt kameru, un viņi arī nevarēs.",
         "muteParticipantsVideoButton": "Pārtraukt video",
-        "muteParticipantsVideoDialog": "Vai tiešām vēlaties izslēgt šī dalībnieka kameru? Jūs nevarēsiet to ieslēgt atpakaļ, taču dalībnieks pats to varēs izdarīt jebkurā laikā.",
-        "muteParticipantsVideoDialogModerationOn": "Vai tiešām vēlaties izslēgt šī dalībnieka kameru? Ne Jūs, ne dalībnieks nevarēsiet to ieslēgt atpakaļ.",
+        "muteParticipantsVideoDialog": "Vai tiešām vēlaties izslēgt šī dalībnieka kameru? Jūs nevarēsiet atkal ieslēgt kameru, taču viņi var to jebkurā laikā atkal ieslēgt.",
+        "muteParticipantsVideoDialogModerationOn": "Vai tiešām vēlaties izslēgt šī dalībnieka kameru? Jūs nevarēsiet atkal ieslēgt kameru, un viņi arī nevarēs.",
         "muteParticipantsVideoTitle": "Vai izslēgt šī dalībnieka video?",
         "noDropboxToken": "Nav derīga Dropbox tokena",
         "password": "Parole",
@@ -735,10 +733,8 @@
         "connectedOneMember": "{{name}} ir pievienojies sapulcei",
         "connectedThreePlusMembers": "{{name}} un {{count}} citi ir pievienojušies sapulcei",
         "connectedTwoMembers": "{{first}} un {{second}} ir pievienojušies sapulcei",
-        "dataChannelClosed": "Video kvalitāte var būt traucēta",
-        "dataChannelClosedDescription": "Savienojuma kanāls nedarbojas, tāpēc video kvalitāte var būt ierobežota līdz zemākajam iestatījumam.",
-        "dataChannelClosedDescriptionWithAudio": "Savienojuma kanāls nedarbojas, tāpēc var rasties audio un video traucējumi.",
-        "dataChannelClosedWithAudio": "Audio un video kvalitāte var būt traucēta",
+        "dataChannelClosed": "Video kvalitāte ir traucēta",
+        "dataChannelClosedDescription": "Savienojuma kanāls ir atvienots, un tādējādi video kvalitāte ir ierobežota līdz zemākajam iestatījumam.",
         "disabledIframe": "Iegulšana ir paredzēta tikai demonstrācijas nolūkiem, tāpēc šis zvans tiks atvienots pēc {{timeout}} minūtēm.",
         "disabledIframeSecondary": "{{domain}} iegulšana ir paredzēta tikai demonstrācijas nolūkiem, tāpēc šis zvans tiks atvienots pēc {{timeout}} minūtēm. Lūdzu, izmantojiet <a href='{{jaasDomain}}' rel='noopener noreferrer' target='_blank'>Jitsi kā Pakalpojums</a> produkcijas iegulšanai!",
         "disconnected": "savienojums pārtraukts",
@@ -836,7 +832,7 @@
             "breakoutRooms": "Grupu istabas",
             "invite": "Uzaicināt",
             "moreModerationActions": "Vairāk moderēšanas iespēju",
-            "moreModerationControls": "Vairāk moderēšanas iespēju",
+            "moreModerationControls": "Vairāk moderēšanas kontroļu",
             "moreParticipantOptions": "Vairāk dalībnieku iespēju",
             "mute": "Apklusināt",
             "muteAll": "Apklusināt visus",
@@ -1486,10 +1482,6 @@
         "notification": {
             "demoteDescription": "{{actor}} pārveidoja par apmeklētāju, paceliet roku, lai piedalītos",
             "description": "Paceliet roku, lai piedalītos",
-            "noMainParticipantsDescription": "Dalībniekam ir jāsāk sapulce. Lūdzu, pēc brīža mēģiniet vēlreiz.",
-            "noMainParticipantsTitle": "Šī sapulce vēl nav sākusies.",
-            "noVisitorLobby": "Jūs nevarat pievienoties, kamēr sapulcei ir iespējots vestibils.",
-            "notAllowedPromotion": "Dalībniekam vispirms ir jāatļauj jūsu pieprasījums.",
             "title": "Jūs esat sapulces apmeklētājs"
         }
     },

lang/main-ru.json

@@ -822,8 +822,8 @@
     },
     "participantsPane": {
         "actions": {
-            "admit": "Разрешить",
-            "admitAll": "Разрешить всем",
+            "admit": "Признать",
+            "admitAll": "Признать все",
             "allow": "Разрешить",
             "allowVideo": "Разрешить видео",
             "askUnmute": "Попросить разрешение включить микрофон",
@@ -837,7 +837,7 @@
             "mute": "Выключить звук",
             "muteAll": "Выключить звук у всех",
             "muteEveryoneElse": "Выключить микрофон у остальных",
-            "reject": "Отклонить",
+            "reject": "Отказать",
             "stopEveryonesVideo": "Выключить у всех камеру",
             "stopVideo": "Остановить видео",
             "unblockEveryoneMicCamera": "Разблокировать у всех микрофон и камеру",

lang/main-tr.json

@@ -128,7 +128,6 @@
         "privateNotice": "{{recipient}} için özel mesaj",
         "sendButton": "Gönder",
         "smileysPanel": "Emoji paneli",
-        "systemDisplayName": "Sistem",
         "tabs": {
             "chat": "Sohbet",
             "polls": "Anket"
@@ -736,8 +735,6 @@
         "connectedTwoMembers": "{{first}} ve {{second}} toplantıya katıldı",
         "dataChannelClosed": "Video kalitesi bozuldu",
         "dataChannelClosedDescription": "Köprü kanalının bağlantısı kesildi ve bu nedenle video kalitesi en düşük ayarla sınırlandı.",
-        "dataChannelClosedDescriptionWithAudio": "Köprü kanalı kapalı olduğu için ses ve video kesintileri yaşanabilir.",
-        "dataChannelClosedWithAudio": "Ses ve video kalitesi etkilenebilir.",
         "disabledIframe": "Yerleştirme yalnızca demo amaçlı olduğundan bu çağrının bağlantısı {{timeout}} dakika içinde kesilecek.",
         "disabledIframeSecondary": "{{domain}} alanının yerleştirilmesi yalnızca demo amaçlı olduğundan bu çağrının bağlantısı {{timeout}} dakika içinde kesilecektir. Üretim yerleştirme için lütfen <a href='{{jaasDomain}}' rel='noopener noreferrer' target='_blank'>Hizmet olarak Jitsi</a>'yi kullanın!",
         "disconnected": "bağlantı kesildi",

lang/main-vi.json

@@ -263,7 +263,6 @@
         "Share": "Chia sẻ",
         "Submit": "Đăng ký",
         "WaitForHostMsg": "Cuộc họp chưa được bắt đầu. Nếu bạn là quản trị viên vui lòng xác thực. Nếu không, vui lòng đợi quản trị viên.",
-        "WaitingForHost": "Đang đợi quản trị viên...",
         "WaitingForHostButton": "Chờ người điều hành",
         "WaitingForHostTitle": "Chờ người điều hành ...",
         "Yes": "Có",

lang/main.json

@@ -264,7 +264,6 @@
         "Share": "Share",
         "Submit": "Submit",
         "WaitForHostMsg": "The conference has not yet started because no moderators have yet arrived. If you'd like to become a moderator please log-in. Otherwise, please wait.",
-        "WaitForHostNoAuthMsg": "The conference has not yet started because no moderators have yet arrived. Please wait.",
         "WaitingForHostButton": "Wait for moderator",
         "WaitingForHostTitle": "Waiting for a moderator...",
         "Yes": "Yes",
@@ -320,7 +319,6 @@
         "embedMeeting": "Embed meeting",
         "enterDisplayName": "Enter your name",
         "error": "Error",
-        "errorRoomCreationRestriction": "You tried to join too quickly, please come back in a bit.",
         "gracefulShutdown": "Our service is currently down for maintenance. Please try again later.",
         "grantModeratorDialog": "Are you sure you want to grant moderator rights to {{participantName}}?",
         "grantModeratorTitle": "Grant moderator rights",
@@ -736,10 +734,8 @@
         "connectedOneMember": "{{name}} joined the meeting",
         "connectedThreePlusMembers": "{{name}} and many others joined the meeting",
         "connectedTwoMembers": "{{first}} and {{second}} joined the meeting",
-        "dataChannelClosed": "Video quality may be impaired",
-        "dataChannelClosedDescription": "The bridge channel is down and thus video quality may be limited to its lowest setting.",
-        "dataChannelClosedDescriptionWithAudio": "The bridge channel is down and thus disruptions to audio and video may occur.",
-        "dataChannelClosedWithAudio": "Audio and video quality may be impaired",
+        "dataChannelClosed": "Video quality impaired",
+        "dataChannelClosedDescription": "The bridge channel has been disconnected and thus video quality is limited to its lowest setting.",
         "disabledIframe": "Embedding is only meant for demo purposes, so this call will disconnect in {{timeout}} minutes.",
         "disabledIframeSecondary": "Embedding {{domain}} is only meant for demo purposes, so this call will disconnect in {{timeout}} minutes. Please use <a href='{{jaasDomain}}' rel='noopener noreferrer' target='_blank'>Jitsi as a Service</a> for production embedding!",
         "disconnected": "disconnected",
@@ -865,8 +861,6 @@
     "pinnedParticipant": "The participant is pinned",
     "polls": {
         "answer": {
-            "edit": "Edit",
-            "send": "Send",
             "skip": "Skip",
             "submit": "Submit"
         },
@@ -880,7 +874,6 @@
             "pollQuestion": "Poll Question",
             "questionPlaceholder": "Ask a question",
             "removeOption": "Remove option",
-            "save": "Save",
             "send": "Send"
         },
         "errors": {
@@ -1490,10 +1483,6 @@
         "notification": {
             "demoteDescription": "Sent here by {{actor}}, raise your hand to participate",
             "description": "To participate raise your hand",
-            "noMainParticipantsDescription": "A participant needs to start the meeting. Please try again in a bit.",
-            "noMainParticipantsTitle": "This meeting hasn’t started yet.",
-            "noVisitorLobby": "You cannot join while there is a lobby enabled for the meeting.",
-            "notAllowedPromotion": "A participant needs to allow your request first.",
             "title": "You are a visitor in the meeting"
         }
     },

lang/translation-languages.json

@@ -34,7 +34,6 @@
     "hi": "Hindi",
     "hmn": "Hmong",
     "hr": "Croatian",
-    "hsb": "Upper Sorbian",
     "ht": "Haitian Creole",
     "hu": "Hungarian",
     "hy": "Armenian",

metadata/ru/full_description.txt

@@ -1,10 +0,0 @@
-Jitsi Meet позволяет вам оставаться на связи со всеми вашими командами, будь то семья, друзья или коллеги. Мгновенные видеоконференции, эффективно адаптируемые к вашим нуждам.
-
-* Неограниченные пользователи: нет искусственных ограничений на количество пользователей или участников конференции. Мощность сервера и пропускная способность являются единственными ограничивающими факторами.
-* Учетная запись не требуется.
-* Закрытые комнаты: управляйте доступом к вашим конференциям с помощью пароля.
-* Зашифровано по умолчанию.
-* Высокое качество: аудио и видео доставляются с чёткостью и возможностями кодеков Opus и VP8.
-* Работает в веб браузере: вашим друзьям не требуются загрузка чтобы присоединиться к разговору. Jitsi Meet работает непосредственно в их браузерах. Чтобы начать просто поделитесь своей ссылкой на конференцию с другими.
-* 100% открытый исходный код: поддерживается удивительными сообществами со всего мира. И вашими друзьями из 8x8.
-* Приглашение по красивому адресу ссылки: вы можете встретиться с легко запоминаемым https://MySite.com/OurConf по своему выбору вместо случайных цифр.

metadata/ru/short_description.txt

@@ -1 +0,0 @@
-Защищённые, простые и масштабируемые видеоконференции с качественным видео

modules/API/API.js

@@ -41,7 +41,6 @@ import {
 import { LOCAL_PARTICIPANT_DEFAULT_ID } from '../../react/features/base/participants/constants';
 import {
     getLocalParticipant,
-    getNormalizedDisplayName,
     getParticipantById,
     getScreenshareParticipantIds,
     getVirtualScreenshareParticipantByOwnerId,
@@ -77,7 +76,6 @@ import { setMediaEncryptionKey, toggleE2EE } from '../../react/features/e2ee/act
 import {
     addStageParticipant,
     resizeFilmStrip,
-    setFilmstripVisible,
     setVolume,
     togglePinStageParticipant
 } from '../../react/features/filmstrip/actions.web';
@@ -201,7 +199,7 @@ function initCommands() {
         },
         'display-name': displayName => {
             sendAnalytics(createApiEvent('display.name.changed'));
-            APP.store.dispatch(updateSettings({ displayName: getNormalizedDisplayName(displayName) }));
+            APP.conference.changeLocalDisplayName(displayName);
         },
         'local-subject': localSubject => {
             sendAnalytics(createApiEvent('local.subject.changed'));
@@ -378,9 +376,7 @@ function initCommands() {
         },
         'toggle-film-strip': () => {
             sendAnalytics(createApiEvent('film.strip.toggled'));
-            const { visible } = APP.store.getState()['features/filmstrip'];
-
-            APP.store.dispatch(setFilmstripVisible(!visible));
+            APP.UI.toggleFilmstrip();
         },
 
         /*
@@ -2138,21 +2134,6 @@ class API {
     }
 
 
-    /**
-     * Notify external application (if API is enabled) the conference
-     * start time.
-     *
-     * @param {number} timestamp - Timestamp conference was created.
-     * @returns {void}
-     */
-    notifyConferenceCreatedTimestamp(timestamp) {
-        this._sendEvent({
-            name: 'conference-created-timestamp',
-            timestamp
-        });
-    }
-
-
     /**
      * Notify the external application (if API is enabled) if the connection type changed.
      *

modules/API/external/external_api.js

@@ -108,7 +108,6 @@ const events = {
     'camera-error': 'cameraError',
     'chat-updated': 'chatUpdated',
     'compute-pressure-changed': 'computePressureChanged',
-    'conference-created-timestamp': 'conferenceCreatedTimestamp',
     'content-sharing-participants-changed': 'contentSharingParticipantsChanged',
     'data-channel-closed': 'dataChannelClosed',
     'data-channel-opened': 'dataChannelOpened',

modules/UI/UI.js

@@ -4,6 +4,7 @@
 const UI = {};
 
 import Logger from '@jitsi/logger';
+import EventEmitter from 'events';
 
 import {
     conferenceWillInit
@@ -12,6 +13,7 @@ import { isMobileBrowser } from '../../react/features/base/environment/utils';
 import { setColorAlpha } from '../../react/features/base/util/helpers';
 import { sanitizeUrl } from '../../react/features/base/util/uri';
 import { setDocumentUrl } from '../../react/features/etherpad/actions';
+import { setFilmstripVisible } from '../../react/features/filmstrip/actions.any';
 import {
     setNotificationsEnabled,
     showNotification
@@ -23,6 +25,7 @@ import {
     setToolboxEnabled,
     showToolbox
 } from '../../react/features/toolbox/actions.web';
+import UIEvents from '../../service/UI/UIEvents';
 
 import EtherpadManager from './etherpad/Etherpad';
 import UIUtil from './util/UIUtil';
@@ -30,8 +33,22 @@ import VideoLayout from './videolayout/VideoLayout';
 
 const logger = Logger.getLogger(__filename);
 
+const eventEmitter = new EventEmitter();
+
+UI.eventEmitter = eventEmitter;
+
 let etherpadManager;
 
+const UIListeners = new Map([
+    [
+        UIEvents.ETHERPAD_CLICKED,
+        () => etherpadManager && etherpadManager.toggleEtherpad()
+    ], [
+        UIEvents.TOGGLE_FILMSTRIP,
+        () => UI.toggleFilmstrip()
+    ]
+]);
+
 /**
  * Indicates if we're currently in full screen mode.
  *
@@ -79,11 +96,10 @@ UI.start = function() {
 };
 
 /**
- * Handles etherpad click.
+ * Setup some UI event listeners.
  */
-UI.onEtherpadClicked = function() {
-    etherpadManager && etherpadManager.toggleEtherpad();
-};
+UI.registerListeners
+    = () => UIListeners.forEach((value, key) => UI.addListener(key, value));
 
 /**
  *
@@ -127,7 +143,7 @@ UI.initEtherpad = name => {
     }
     logger.log('Etherpad is enabled');
 
-    etherpadManager = new EtherpadManager();
+    etherpadManager = new EtherpadManager(eventEmitter);
 
     const url = new URL(name, etherpadBaseUrl);
 
@@ -181,6 +197,15 @@ UI.updateUserStatus = (user, status) => {
     }, NOTIFICATION_TIMEOUT_TYPE.SHORT));
 };
 
+/**
+ * Toggles filmstrip.
+ */
+UI.toggleFilmstrip = function() {
+    const { visible } = APP.store.getState()['features/filmstrip'];
+
+    APP.store.dispatch(setFilmstripVisible(!visible));
+};
+
 /**
  * Sets muted video state for participant
  */
@@ -194,6 +219,33 @@ UI.setVideoMuted = function(id) {
 
 UI.updateLargeVideo = (id, forceUpdate) => VideoLayout.updateLargeVideo(id, forceUpdate);
 
+/**
+ * Adds a listener that would be notified on the given type of event.
+ *
+ * @param type the type of the event we're listening for
+ * @param listener a function that would be called when notified
+ */
+UI.addListener = function(type, listener) {
+    eventEmitter.on(type, listener);
+};
+
+/**
+ * Removes the all listeners for all events.
+ *
+ * @returns {void}
+ */
+UI.removeAllListeners = function() {
+    eventEmitter.removeAllListeners();
+};
+
+/**
+ * Emits the event of given type by specifying the parameters in options.
+ *
+ * @param type the type of the event we're emitting
+ * @param options the parameters for the event
+ */
+UI.emitEvent = (type, ...options) => eventEmitter.emit(type, ...options);
+
 // Used by torture.
 UI.showToolbar = timeout => APP.store.dispatch(showToolbox(timeout));
 

modules/UI/etherpad/Etherpad.js

@@ -138,7 +138,8 @@ export default class EtherpadManager {
     /**
      *
      */
-    constructor() {
+    constructor(eventEmitter) {
+        this.eventEmitter = eventEmitter;
         this.etherpad = null;
     }
 

modules/UI/videolayout/LargeVideoManager.js

@@ -11,7 +11,6 @@ import { createScreenSharingIssueEvent } from '../../../react/features/analytics
 import { sendAnalytics } from '../../../react/features/analytics/functions';
 import Avatar from '../../../react/features/base/avatar/components/Avatar';
 import theme from '../../../react/features/base/components/themes/participantsPaneTheme.json';
-import { getSsrcRewritingFeatureFlag } from '../../../react/features/base/config/functions.any';
 import i18next from '../../../react/features/base/i18n/i18next';
 import { JitsiTrackEvents } from '../../../react/features/base/lib-jitsi-meet';
 import { VIDEO_TYPE } from '../../../react/features/base/media/constants';
@@ -222,10 +221,10 @@ export default class LargeVideoManager {
 
         this.updateInProcess = true;
 
-        // Include hide()/fadeOut if we're switching between users or between different sources of the same user.
+        // Include hide()/fadeOut only if we're switching between users
+        // eslint-disable-next-line eqeqeq
         const container = this.getCurrentContainer();
-        const isUserSwitch = container.id !== this.newStreamData.id
-            || container.stream?.getSourceName() !== this.newStreamData.stream?.getSourceName();
+        const isUserSwitch = this.newStreamData.id !== container.id;
         const preUpdate = isUserSwitch ? container.hide() : Promise.resolve();
 
         preUpdate.then(() => {

modules/UI/videolayout/VideoContainer.js

@@ -501,7 +501,8 @@ export class VideoContainer extends LargeContainer {
      * @param {string} videoType video type
      */
     setStream(userID, stream, videoType) {
-        if (this.userId === userID && this.stream === stream && !stream?.forceStreamToReattach) {
+        this.userId = userID;
+        if (this.stream === stream && !stream?.forceStreamToReattach) {
             logger.debug(`SetStream on the large video for user ${userID} ignored: the stream is not changed!`);
 
             // Handles the use case for the remote participants when the
@@ -515,8 +516,6 @@ export class VideoContainer extends LargeContainer {
             return;
         }
 
-        this.userId = userID;
-
         if (stream?.forceStreamToReattach) {
             delete stream.forceStreamToReattach;
         }
@@ -541,8 +540,9 @@ export class VideoContainer extends LargeContainer {
                 logger.error(`Attaching the remote track ${stream} to large video has failed with `, error);
             });
 
-            // Ensure large video gets play() called on it when a new stream is attached to it.
-            this._play();
+            // Ensure large video gets play() called on it when a new stream is attached to it. This is necessary in the
+            // case of Safari as autoplay doesn't kick-in automatically on Safari 15 and newer versions.
+            browser.isWebKitBased() && this._play();
 
             const flipX = stream.isLocal() && this.localFlipX && !this.isScreenSharing();
 

package.json

@@ -23,7 +23,7 @@
     "@giphy/js-fetch-api": "4.7.1",
     "@giphy/react-components": "6.8.1",
     "@giphy/react-native-sdk": "2.3.0",
-    "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.19/jitsi-excalidraw-0.0.19.tgz",
+    "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.17/jitsi-excalidraw-0.0.17.tgz",
     "@jitsi/js-utils": "2.2.1",
     "@jitsi/logger": "2.0.2",
     "@jitsi/rnnoise-wasm": "0.1.0",
@@ -36,6 +36,7 @@
     "@react-native-community/netinfo": "11.1.0",
     "@react-native-community/slider": "4.4.3",
     "@react-native-google-signin/google-signin": "10.1.0",
+    "@react-native/metro-config": "0.72.9",
     "@react-navigation/bottom-tabs": "6.5.8",
     "@react-navigation/elements": "1.3.18",
     "@react-navigation/material-top-tabs": "6.6.3",
@@ -66,7 +67,7 @@
     "js-md5": "0.6.1",
     "js-sha512": "0.8.0",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1830.0.0+5a14bd43/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1812.0.0+2eddb859/lib-jitsi-meet.tgz",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "moment-duration-format": "2.2.2",
@@ -81,7 +82,7 @@
     "react-focus-on": "3.8.1",
     "react-i18next": "10.11.4",
     "react-linkify": "1.0.0-alpha",
-    "react-native": "0.72.14",
+    "react-native": "0.72.9",
     "react-native-background-timer": "2.4.1",
     "react-native-calendar-events": "2.2.0",
     "react-native-default-preference": "1.4.4",
@@ -105,8 +106,8 @@
     "react-native-url-polyfill": "2.0.0",
     "react-native-video": "6.0.0-alpha.11",
     "react-native-watch-connectivity": "1.1.0",
-    "react-native-webrtc": "124.0.0",
-    "react-native-webview": "13.8.7",
+    "react-native-webrtc": "118.0.7",
+    "react-native-webview": "13.5.1",
     "react-native-youtube-iframe": "2.3.0",
     "react-redux": "7.2.9",
     "react-textarea-autosize": "8.3.0",
@@ -132,7 +133,6 @@
     "@babel/preset-env": "7.21.5",
     "@babel/preset-react": "7.16.0",
     "@jitsi/eslint-config": "4.1.10",
-    "@react-native/metro-config": "0.72.12",
     "@types/amplitude-js": "8.16.5",
     "@types/audioworklet": "0.0.29",
     "@types/dom-screen-wake-lock": "1.0.1",
@@ -181,14 +181,14 @@
     "webpack": "5.76.0",
     "webpack-bundle-analyzer": "4.4.2",
     "webpack-cli": "4.9.0",
-    "webpack-dev-server": "4.15.2"
+    "webpack-dev-server": "4.7.3"
   },
   "overrides": {
     "@xmldom/xmldom": "0.8.7"
   },
   "engines": {
-    "node": ">=20.0.0",
-    "npm": ">=10.0.0"
+    "node": ">=14.0.0",
+    "npm": ">=7.0.0"
   },
   "license": "Apache-2.0",
   "scripts": {

react-native-sdk/README.md

@@ -95,7 +95,7 @@ https://github.com/jitsi/jitsi-meet-sdk-samples/tree/master/react-native
 
 
 ## Using JWT tokens
-- If you are planning to use tokens or another domain, you can do that by updating the following props, as shown below.
+- If you are planning to use tokens or another domain you can do that by updating the following props, as shown below.
 - For example:
 ```javascript
   <JitsiMeeting
@@ -105,7 +105,7 @@ https://github.com/jitsi/jitsi-meet-sdk-samples/tree/master/react-native
 ```
 
 ## Using custom overflow menu buttons
-- If you are planning to add custom overflow menu buttons, you can do that by updating the ```config``` prop, as shown below.
+- If you are planning to use tokens or another domain you can do that by updating the following props, as shown below.
 - For example:
 ```javascript
   <JitsiMeeting

react-native-sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jitsi/react-native-sdk",
-    "version": "0.0.0",
+    "version": "2.2.1",
     "description": "React Native SDK for Jitsi Meet.",
     "main": "index.tsx",
     "license": "Apache-2.0",
@@ -11,83 +11,83 @@
         "url": "git+https://github.com/jitsi/jitsi-meet.git"
     },
     "dependencies": {
-        "@jitsi/js-utils": "0.0.0",
-        "@jitsi/logger": "0.0.0",
-        "@jitsi/rtcstats": "0.0.0",
-        "@react-navigation/bottom-tabs": "0.0.0",
-        "@react-navigation/elements": "0.0.0",
-        "@react-navigation/material-top-tabs": "0.0.0",
-        "@react-navigation/native": "0.0.0",
-        "@react-navigation/stack": "0.0.0",
-        "@xmldom/xmldom": "0.0.0",
-        "base64-js": "0.0.0",
-        "grapheme-splitter": "0.0.0",
-        "i18n-iso-countries": "0.0.0",
-        "i18next": "0.0.0",
-        "js-md5": "0.0.0",
-        "i18next-http-backend": "0.0.0",
-        "js-sha512": "0.0.0",
-        "jwt-decode": "0.0.0",
-        "lib-jitsi-meet": "0.0.0",
-        "lodash": "0.0.0",
-        "moment": "0.0.0",
-        "moment-duration-format": "0.0.0",
-        "optional-require": "0.0.0",
-        "promise.allsettled": "0.0.0",
-        "punycode": "0.0.0",
-        "react-emoji-render": "0.0.0",
-        "react-i18next": "0.0.0",
-        "react-linkify": "0.0.0",
-        "react-native-dialog": "0.0.0",
-        "react-native-svg-transformer": "0.0.0",
-        "react-native-tab-view": "0.0.0",
-        "react-native-url-polyfill": "0.0.0",
-        "react-native-youtube-iframe": "0.0.0",
-        "react-redux": "0.0.0",
-        "redux": "0.0.0",
-        "redux-thunk": "0.0.0",
-        "unorm": "0.0.0",
-        "util": "0.0.0",
-        "uuid": "0.0.0",
-        "zxcvbn": "0.0.0"
+        "@jitsi/js-utils": "2.2.1",
+        "@jitsi/logger": "2.0.2",
+        "@jitsi/rtcstats": "9.5.1",
+        "@react-navigation/bottom-tabs": "6.5.8",
+        "@react-navigation/elements": "1.3.18",
+        "@react-navigation/material-top-tabs": "6.6.3",
+        "@react-navigation/native": "6.1.7",
+        "@react-navigation/stack": "6.3.17",
+        "@xmldom/xmldom": "0.8.7",
+        "base64-js": "1.5.1",
+        "grapheme-splitter": "1.0.4",
+        "i18n-iso-countries": "6.8.0",
+        "i18next": "17.0.6",
+        "js-md5": "0.6.1",
+        "i18next-http-backend": "2.2.1",
+        "js-sha512": "0.8.0",
+        "jwt-decode": "2.2.0",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1811.0.0+86e2fb2b/lib-jitsi-meet.tgz",
+        "lodash": "4.17.21",
+        "moment": "2.29.4",
+        "moment-duration-format": "2.2.2",
+        "optional-require": "1.0.3",
+        "promise.allsettled": "1.0.4",
+        "punycode": "2.3.0",
+        "react-emoji-render": "1.2.4",
+        "react-i18next": "10.11.4",
+        "react-linkify": "1.0.0-alpha",
+        "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz",
+        "react-native-svg-transformer": "1.1.0",
+        "react-native-tab-view": "3.5.2",
+        "react-native-url-polyfill": "2.0.0",
+        "react-native-youtube-iframe": "2.3.0",
+        "react-redux": "7.2.9",
+        "redux": "4.0.4",
+        "redux-thunk": "2.4.1",
+        "unorm": "1.6.0",
+        "util": "0.12.1",
+        "uuid": "8.3.2",
+        "zxcvbn": "4.4.2"
     },
     "peerDependencies": {
-        "@amplitude/react-native": "0.0.0",
-        "@braintree/sanitize-url": "0.0.0",
-        "@giphy/react-native-sdk": "0.0.0",
-        "@react-native/metro-config": "*",
-        "@react-native-async-storage/async-storage": "0.0.0",
-        "@react-native-community/clipboard": "0.0.0",
-        "@react-native-community/netinfo": "0.0.0",
-        "@react-native-community/slider": "0.0.0",
-        "@react-native-google-signin/google-signin": "0.0.0",
+        "@amplitude/react-native": "2.7.0",
+        "@braintree/sanitize-url": "7.0.0",
+        "@giphy/react-native-sdk": "2.3.0",
+        "@react-native/metro-config": "0.72.9",
+        "@react-native-async-storage/async-storage": "1.19.4",
+        "@react-native-community/clipboard": "1.5.1",
+        "@react-native-community/netinfo": "11.1.0",
+        "@react-native-community/slider": "4.4.3",
+        "@react-native-google-signin/google-signin": "10.1.0",
         "react-native": "*",
         "react": "*",
-        "react-native-background-timer": "0.0.0",
-        "react-native-calendar-events": "0.0.0",
-        "react-native-default-preference": "0.0.0",
-        "react-native-device-info": "0.0.0",
-        "react-native-get-random-values": "0.0.0",
-        "react-native-gesture-handler": "0.0.0",
-        "react-native-immersive-mode": "0.0.0",
-        "react-native-keep-awake": "0.0.0",
-        "react-native-pager-view": "0.0.0",
-        "react-native-paper": "0.0.0",
-        "react-native-performance": "0.0.0",
-        "react-native-orientation-locker": "0.0.0",
-        "react-native-safe-area-context": "0.0.0",
-        "react-native-screens": "0.0.0",
-        "react-native-sound": "0.0.0",
-        "react-native-splash-screen": "0.0.0",
-        "react-native-svg": "0.0.0",
-        "react-native-video": "0.0.0",
-        "react-native-watch-connectivity": "0.0.0",
-        "react-native-webrtc": "0.0.0",
-        "react-native-webview": "0.0.0",
-        "text-encoding": "0.0.0"
+        "react-native-background-timer": "2.4.1",
+        "react-native-calendar-events": "2.2.0",
+        "react-native-default-preference": "1.4.4",
+        "react-native-device-info": "10.9.0",
+        "react-native-get-random-values": "1.9.0",
+        "react-native-gesture-handler": "2.9.0",
+        "react-native-immersive-mode": "2.0.1",
+        "react-native-keep-awake": "4.0.0",
+        "react-native-pager-view": "6.2.0",
+        "react-native-paper": "5.10.3",
+        "react-native-performance": "5.0.0",
+        "react-native-orientation-locker": "1.6.0",
+        "react-native-safe-area-context": "4.7.1",
+        "react-native-screens": "3.24.0",
+        "react-native-sound": "0.11.2",
+        "react-native-splash-screen": "3.3.0",
+        "react-native-svg": "13.13.0",
+        "react-native-video": "6.0.0-alpha.11",
+        "react-native-watch-connectivity": "1.1.0",
+        "react-native-webrtc": "118.0.6",
+        "react-native-webview": "13.5.1",
+        "text-encoding": "0.7.0"
     },
     "overrides": {
-        "@xmldom/xmldom": "0.0.0"
+        "@xmldom/xmldom": "0.8.7"
     },
     "scripts": {
         "postinstall": "node sdk_instructions.js",

react-native-sdk/prepare_sdk.js

@@ -114,6 +114,10 @@ copyFolderRecursiveSync(
     '../react',
     '.'
 );
+copyFolderRecursiveSync(
+    '../service',
+    '.'
+);
 copyFolderRecursiveSync(
     '../ios/sdk/sdk.xcodeproj',
     './ios'

react-native-sdk/update_dependencies.js

@@ -21,11 +21,6 @@ function updateDependencies() {
 
     for (const key in RNSDKpackageJSON.peerDependencies) {
         if (!packageJSON.dependencies.hasOwnProperty(key)) {
-
-            if (packageJSON.devDependencies.hasOwnProperty('@react-native/metro-config')) {
-                continue;
-            }
-
             packageJSON.dependencies[key] = RNSDKpackageJSON.peerDependencies[key];
             updated = true;
         }

react/features/analytics/AnalyticsEvents.ts

@@ -331,17 +331,15 @@ export function createNetworkInfoEvent({ isOnline, networkType, details }:
 /**
  * Creates a "not allowed error" event.
  *
- * @param {string} type - The type of the error.
  * @param {string} reason - The reason for the error.
  * @returns {Object} The event in a format suitable for sending via
  * sendAnalytics.
  */
-export function createNotAllowedErrorEvent(type: string, reason: string) {
+export function createNotAllowedErrorEvent(reason: string) {
     return {
         action: 'not.allowed.error',
         attributes: {
-            reason,
-            type
+            reason
         }
     };
 }

react/features/authentication/components/web/WaitForOwnerDialog.tsx

@@ -17,11 +17,6 @@ interface IProps extends WithTranslation {
      */
     _alternativeCancelText?: boolean;
 
-    /**
-     * Whether to hide the login button.
-     */
-    _hideLoginButton?: boolean;
-
     /**
      * Redux store dispatch method.
      */
@@ -85,13 +80,12 @@ class WaitForOwnerDialog extends PureComponent<IProps> {
                         this.props._alternativeCancelText ? 'dialog.WaitingForHostButton' : 'dialog.Cancel' }}
                 disableBackdropClose = { true }
                 hideCloseButton = { true }
-                ok = { this.props._hideLoginButton ? { hidden: true,
-                    disabled: true } : { translationKey: 'dialog.IamHost' } }
+                ok = {{ translationKey: 'dialog.IamHost' }}
                 onCancel = { this._onCancelWaitForOwner }
                 onSubmit = { this._onIAmHost }
                 titleKey = { t('dialog.WaitingForHostTitle') }>
                 <span>
-                    { this.props._hideLoginButton ? t('dialog.WaitForHostNoAuthMsg') : t('dialog.WaitForHostMsg') }
+                    { t('dialog.WaitForHostMsg') }
                 </span>
             </Dialog>
         );
@@ -108,11 +102,9 @@ class WaitForOwnerDialog extends PureComponent<IProps> {
  */
 function mapStateToProps(state: IReduxState) {
     const { membersOnly, lobbyWaitingForHost } = state['features/base/conference'];
-    const { hideLoginButton } = state['features/base/config'];
 
     return {
-        _alternativeCancelText: membersOnly && lobbyWaitingForHost,
-        _hideLoginButton: hideLoginButton
+        _alternativeCancelText: membersOnly && lobbyWaitingForHost
     };
 }
 

react/features/authentication/functions.any.ts

@@ -72,7 +72,8 @@ export const _getTokenAuthState = (
         // @ts-ignore
         state['config.startWithVideoMuted'] = true;
     }
-    const params = parseURLParams(locationURL);
+
+    const params = parseURLParams(locationURL, true);
 
     for (const key of Object.keys(params)) {
         // we allow only config and interfaceConfig overrides in the state

react/features/base/audio-only/actions.ts

@@ -1,3 +1,5 @@
+// @ts-expect-error
+import UIEvents from '../../../../service/UI/UIEvents';
 import { createAudioOnlyChangedEvent } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';
 import { IStore } from '../../app/types';
@@ -31,7 +33,7 @@ export function setAudioOnly(audioOnly: boolean) {
             if (typeof APP !== 'undefined') {
                 // TODO This should be a temporary solution that lasts only until video
                 // tracks and all ui is moved into react/redux on the web.
-                APP.conference.onToggleAudioOnly();
+                APP.UI.emitEvent(UIEvents.TOGGLE_AUDIO_ONLY, audioOnly);
             }
         }
     };

react/features/base/conference/actions.native.ts

@@ -1,29 +0,0 @@
-import { IStore } from '../../app/types';
-import { setAudioMuted, setVideoMuted } from '../media/actions';
-import { MEDIA_TYPE, MediaType, VIDEO_MUTISM_AUTHORITY } from '../media/constants';
-
-export * from './actions.any';
-
-/**
- * Starts audio and/or video for the visitor.
- *
- * @param {Array<MediaType>} mediaTypes - The media types that need to be started.
- * @returns {Function}
- */
-export function setupVisitorStartupMedia(mediaTypes: Array<MediaType>) {
-    return (dispatch: IStore['dispatch']) => {
-        if (!mediaTypes || !Array.isArray(mediaTypes)) {
-            return;
-        }
-
-        mediaTypes.forEach(mediaType => {
-            switch (mediaType) {
-            case MEDIA_TYPE.AUDIO:
-                dispatch(setAudioMuted(false, true));
-                break;
-            case MEDIA_TYPE.VIDEO:
-                dispatch(setVideoMuted(false, VIDEO_MUTISM_AUTHORITY.USER, true));
-            }
-        });
-    };
-}

react/features/base/conference/actions.ts

@@ -1,3 +1,5 @@
+// @ts-expect-error
+import UIEvents from '../../../../service/UI/UIEvents';
 import { createStartMutedConfigurationEvent } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';
 import { IReduxState, IStore } from '../../app/types';
@@ -10,12 +12,14 @@ import { JITSI_CONNECTION_CONFERENCE_KEY } from '../connection/constants';
 import { hasAvailableDevices } from '../devices/functions.any';
 import { JitsiConferenceEvents, JitsiE2ePingEvents } from '../lib-jitsi-meet';
 import {
+    gumPending,
     setAudioMuted,
     setAudioUnmutePermissions,
     setVideoMuted,
     setVideoUnmutePermissions
 } from '../media/actions';
-import { MEDIA_TYPE, MediaType } from '../media/constants';
+import { MEDIA_TYPE, VIDEO_MUTISM_AUTHORITY } from '../media/constants';
+import { IGUMPendingState } from '../media/types';
 import {
     dominantSpeakerChanged,
     participantKicked,
@@ -70,7 +74,6 @@ import {
     SET_START_REACTIONS_MUTED,
     UPDATE_CONFERENCE_METADATA
 } from './actionTypes';
-import { setupVisitorStartupMedia } from './actions';
 import {
     AVATAR_URL_COMMAND,
     EMAIL_COMMAND,
@@ -1059,37 +1062,47 @@ export function redirect(vnode: string, focusJid: string, username: string) {
             .then(() => dispatch(conferenceWillInit()))
             .then(() => dispatch(connect()))
             .then(() => {
-                const media: Array<MediaType> = [];
+                // Clear the gum pending state in case we have set it to pending since we are starting the
+                // conference without tracks.
+                dispatch(gumPending([ MEDIA_TYPE.AUDIO, MEDIA_TYPE.VIDEO ], IGUMPendingState.NONE));
 
-                if (!vnode) {
-                    const state = getState();
-                    const { enableMediaOnPromote = {} } = state['features/base/config'].visitors ?? {};
-                    const { audio = false, video = false } = enableMediaOnPromote;
+                // FIXME: Workaround for the web version. To be removed once we get rid of conference.js
+                if (typeof APP !== 'undefined') {
+                    if (!vnode) {
+                        const state = getState();
+                        const { enableMediaOnPromote = {} } = state['features/base/config'].visitors ?? {};
+                        const { audio = false, video = false } = enableMediaOnPromote;
 
-                    if (audio) {
-                        const { available, muted, unmuteBlocked } = state['features/base/media'].audio;
-                        const { startSilent } = state['features/base/config'];
+                        if (audio) {
+                            const { available, muted, unmuteBlocked } = state['features/base/media'].audio;
+                            const { startSilent } = state['features/base/config'];
 
-                        // do not unmute the user if he was muted before (on the prejoin, the config
-                        // or URL param, etc.)
-                        if (!unmuteBlocked && !muted && !startSilent && available) {
-                            media.push(MEDIA_TYPE.AUDIO);
+                            // do not unmute the user if he was muted before (on the prejoin, the config
+                            // or URL param, etc.)
+                            if (!unmuteBlocked && !muted && !startSilent && available) {
+                                dispatch(setAudioMuted(false, true));
+
+                                // // FIXME: The old conference logic still relies on this event being emitted.
+                                typeof APP === 'undefined' || APP.UI.emitEvent(UIEvents.AUDIO_MUTED, false);
+                            }
+                        }
+
+                        if (video) {
+                            const { muted, unmuteBlocked } = state['features/base/media'].video;
+
+                            // do not unmute the user if he was muted before (on the prejoin, the config, URL param or
+                            // audo only, etc)
+                            if (!unmuteBlocked && !muted && hasAvailableDevices(state, 'videoInput')) {
+                                dispatch(setVideoMuted(false, VIDEO_MUTISM_AUTHORITY.USER, true));
+
+                                // // FIXME: The old conference logic still relies on this event being emitted.
+                                typeof APP === 'undefined' || APP.UI.emitEvent(UIEvents.VIDEO_MUTED, false);
+                            }
                         }
                     }
 
-                    if (video) {
-                        const { muted, unmuteBlocked } = state['features/base/media'].video;
-
-                        // do not unmute the user if he was muted before (on the prejoin, the config, URL param or
-                        // audo only, etc)
-                        if (!unmuteBlocked && !muted && hasAvailableDevices(state, 'videoInput')) {
-                            media.push(MEDIA_TYPE.VIDEO);
-                        }
-                    }
+                    APP.conference.startConference([]);
                 }
-
-                dispatch(setupVisitorStartupMedia(media));
             });
     };
 }
-

react/features/base/conference/actions.web.ts

@@ -1,31 +0,0 @@
-import { IStore } from '../../app/types';
-import { gumPending } from '../media/actions';
-import { MEDIA_TYPE, MediaType } from '../media/constants';
-import { IGUMPendingState } from '../media/types';
-import { createAndAddInitialAVTracks } from '../tracks/actions.web';
-
-export * from './actions.any';
-
-/**
- * Starts audio and/or video for the visitor.
- *
- * @param {Array<MediaType>} media - The media types that need to be started.
- * @returns {Function}
- */
-export function setupVisitorStartupMedia(media: Array<MediaType>) {
-    return (dispatch: IStore['dispatch']) => {
-        // Clear the gum pending state in case we have set it to pending since we are starting the
-        // conference without tracks.
-        dispatch(gumPending([ MEDIA_TYPE.AUDIO, MEDIA_TYPE.VIDEO ], IGUMPendingState.NONE));
-
-        if (media && Array.isArray(media) && media.length > 0) {
-            dispatch(createAndAddInitialAVTracks(media));
-        }
-
-        // FIXME: The name of the function doesn't fit the startConference execution but another PR will removes
-        // this and calls startConference based on the connection status. This will stay here temporary.
-        if (typeof APP !== 'undefined') {
-            APP.conference.startConference([]);
-        }
-    };
-}

react/features/base/conference/middleware.any.ts

@@ -165,10 +165,6 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
     const result = next(action);
     const { enableForcedReload } = getState()['features/base/config'];
 
-    if (LocalRecordingManager.isRecordingLocally()) {
-        dispatch(stopLocalVideoRecording());
-    }
-
     // Handle specific failure reasons.
     switch (error.name) {
     case JitsiConferenceErrors.CONFERENCE_RESTARTED: {
@@ -224,30 +220,9 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
         break;
     }
     case JitsiConferenceErrors.NOT_ALLOWED_ERROR: {
-        const [ type, msg ] = error.params;
-
-        let descriptionKey;
-        let titleKey = 'dialog.tokenAuthFailed';
-
-        if (type === JitsiConferenceErrors.AUTH_ERROR_TYPES.NO_MAIN_PARTICIPANTS) {
-            descriptionKey = 'visitors.notification.noMainParticipantsDescription';
-            titleKey = 'visitors.notification.noMainParticipantsTitle';
-        } else if (type === JitsiConferenceErrors.AUTH_ERROR_TYPES.NO_VISITORS_LOBBY) {
-            descriptionKey = 'visitors.notification.noVisitorLobby';
-        } else if (type === JitsiConferenceErrors.AUTH_ERROR_TYPES.PROMOTION_NOT_ALLOWED) {
-            descriptionKey = 'visitors.notification.notAllowedPromotion';
-        } else if (type === JitsiConferenceErrors.AUTH_ERROR_TYPES.ROOM_CREATION_RESTRICTION) {
-            descriptionKey = 'dialog.errorRoomCreationRestriction';
-        }
-
-        dispatch(showErrorNotification({
-            descriptionKey,
-            hideErrorSupportLink: true,
-            titleKey
-        }, NOTIFICATION_TIMEOUT_TYPE.STICKY));
-
-        sendAnalytics(createNotAllowedErrorEvent(type, msg));
+        const [ msg ] = error.params;
 
+        sendAnalytics(createNotAllowedErrorEvent(msg));
         break;
     }
     case JitsiConferenceErrors.OFFER_ANSWER_FAILED:

react/features/base/conference/reducer.ts

@@ -18,8 +18,6 @@ import {
     CONFERENCE_TIMESTAMP_CHANGED,
     CONFERENCE_WILL_JOIN,
     CONFERENCE_WILL_LEAVE,
-    DATA_CHANNEL_CLOSED,
-    DATA_CHANNEL_OPENED,
     LOCK_STATE_CHANGED,
     P2P_STATUS_CHANGED,
     SET_ASSUMED_BANDWIDTH_BPS,
@@ -37,7 +35,6 @@ import { isRoomValid } from './functions';
 const DEFAULT_STATE = {
     assumedBandwidthBps: undefined,
     conference: undefined,
-    dataChannelOpen: undefined,
     e2eeSupported: undefined,
     joining: undefined,
     leaving: undefined,
@@ -149,7 +146,6 @@ export interface IConferenceState {
     authRequired?: IJitsiConference;
     conference?: IJitsiConference;
     conferenceTimestamp?: number;
-    dataChannelOpen?: boolean;
     e2eeSupported?: boolean;
     error?: Error;
     followMeEnabled?: boolean;
@@ -223,12 +219,6 @@ ReducerRegistry.register<IConferenceState>('features/base/conference',
         case CONNECTION_WILL_CONNECT:
             return set(state, 'authRequired', undefined);
 
-        case DATA_CHANNEL_CLOSED:
-            return set(state, 'dataChannelOpen', false);
-
-        case DATA_CHANNEL_OPENED:
-            return set(state, 'dataChannelOpen', true);
-
         case LOCK_STATE_CHANGED:
             return _lockStateChanged(state, action);
 

react/features/base/config/configType.ts

@@ -396,7 +396,6 @@ export interface IConfig {
     hideDominantSpeakerBadge?: boolean;
     hideEmailInSettings?: boolean;
     hideLobbyButton?: boolean;
-    hideLoginButton?: boolean;
     hideParticipantsStats?: boolean;
     hideRecordingLabel?: boolean;
     hosts?: {
@@ -441,7 +440,6 @@ export interface IConfig {
     };
     localSubject?: string;
     locationURL?: URL;
-    mainToolbarButtons?: Array<Array<string>>;
     maxFullResolutionParticipants?: number;
     microsoftApiApplicationClientID?: string;
     moderatedRoomServiceUrl?: string;
@@ -544,6 +542,7 @@ export interface IConfig {
         assumeBandwidth?: boolean;
         disableE2EE?: boolean;
         dumpTranscript?: boolean;
+        mobileXmppWsThreshold?: number;
         noAutoPlayVideo?: boolean;
         p2pTestMode?: boolean;
         skipInterimTranscriptions?: boolean;

react/features/base/config/configWhitelist.ts

@@ -81,7 +81,6 @@ export default [
     'debug',
     'debugAudioLevels',
     'deeplinking.disabled',
-    'deeplinking.desktop.enabled',
     'defaultLocalDisplayName',
     'defaultRemoteDisplayName',
     'deploymentUrls',
@@ -185,7 +184,6 @@ export default [
     'localRecording',
     'localSubject',
     'logging',
-    'mainToolbarButtons',
     'maxFullResolutionParticipants',
     'mouseMoveCallbackInterval',
     'notifications',

react/features/base/connection/actions.any.ts

@@ -126,6 +126,13 @@ export function constructOptions(state: IReduxState) {
     const { bosh, preferBosh, flags } = options;
     let { websocket } = options;
 
+    // TESTING: Only enable WebSocket for some percentage of users.
+    if (websocket && navigator.product === 'ReactNative') {
+        if ((Math.random() * 100) >= (options?.testing?.mobileXmppWsThreshold ?? 0)) {
+            websocket = undefined;
+        }
+    }
+
     if (preferBosh) {
         websocket = undefined;
     }

react/features/base/devices/middleware.web.ts

@@ -1,5 +1,7 @@
 import { AnyAction } from 'redux';
 
+// @ts-expect-error
+import UIEvents from '../../../../service/UI/UIEvents';
 import { IStore } from '../../app/types';
 import { processExternalDeviceRequest } from '../../device-selection/functions';
 import { showNotification, showWarningNotification } from '../../notifications/actions';
@@ -159,7 +161,7 @@ MiddlewareRegistry.register(store => next => action => {
         if (isPrejoinPageVisible(store.getState())) {
             store.dispatch(replaceAudioTrackById(action.deviceId));
         } else {
-            APP.conference.onAudioDeviceChanged(action.deviceId);
+            APP.UI.emitEvent(UIEvents.AUDIO_DEVICE_CHANGED, action.deviceId);
         }
         break;
     case SET_VIDEO_INPUT_DEVICE: {
@@ -172,7 +174,7 @@ MiddlewareRegistry.register(store => next => action => {
         if (isPrejoinPageVisible(store.getState())) {
             store.dispatch(replaceVideoTrackById(action.deviceId));
         } else {
-            APP.conference.onVideoDeviceChanged(action.deviceId);
+            APP.UI.emitEvent(UIEvents.VIDEO_DEVICE_CHANGED, action.deviceId);
         }
         break;
     }

react/features/base/jwt/functions.ts

@@ -3,7 +3,6 @@ import jwtDecode from 'jwt-decode';
 
 import { IReduxState } from '../../app/types';
 import { getLocalParticipant } from '../participants/functions';
-import { IParticipantFeatures } from '../participants/types';
 import { parseURLParams } from '../util/parseURLParams';
 
 import { JWT_VALIDATION_ERRORS, MEET_FEATURES } from './constants';
@@ -20,11 +19,7 @@ import logger from './logger';
  */
 export function parseJWTFromURLParams(url: URL | typeof window.location = window.location) {
     // @ts-ignore
-    const jwt = parseURLParams(url, false, 'hash').jwt;
-
-    // TODO: eventually remove the search param and only pull from the hash
-    // @ts-ignore
-    return jwt ? jwt : parseURLParams(url, true, 'search').jwt;
+    return parseURLParams(url, true, 'search').jwt;
 }
 
 /**
@@ -50,46 +45,13 @@ export function getJwtName(state: IReduxState) {
  */
 export function isJwtFeatureEnabled(state: IReduxState, feature: string, ifNoToken = false, ifNotInFeatures = false) {
     const { jwt } = state['features/base/jwt'];
-    const { features } = getLocalParticipant(state) || {};
 
-    return isJwtFeatureEnabledStateless({
-        jwt,
-        localParticipantFeatures: features,
-        feature,
-        ifNoToken,
-        ifNotInFeatures
-    });
-}
-
-interface IIsJwtFeatureEnabledStatelessParams {
-    feature: string;
-    ifNoToken?: boolean;
-    ifNotInFeatures?: boolean;
-    jwt?: string;
-    localParticipantFeatures?: IParticipantFeatures;
-}
-
-/**
- * Check if the given JWT feature is enabled.
- *
- * @param {string | undefined} jwt - The jwt token.
- * @param {ILocalParticipant} localParticipantFeatures - The features of the local participant.
- * @param {string} feature - The feature we want to check.
- * @param {boolean} ifNoToken - Default value if there is no token.
- * @param {boolean} ifNotInFeatures - Default value if features prop exists but does not have the {@code feature}.
- * @returns {bolean}
- */
-export function isJwtFeatureEnabledStateless({
-    jwt,
-    localParticipantFeatures: features,
-    feature,
-    ifNoToken = false,
-    ifNotInFeatures = false
-}: IIsJwtFeatureEnabledStatelessParams) {
     if (!jwt) {
         return ifNoToken;
     }
 
+    const { features } = getLocalParticipant(state) || {};
+
     // If `features` is undefined, act as if everything is enabled.
     if (typeof features === 'undefined') {
         return true;

react/features/base/participants/actionTypes.ts

@@ -43,6 +43,18 @@ export const KICK_PARTICIPANT = 'KICK_PARTICIPANT';
  */
 export const MUTE_REMOTE_PARTICIPANT = 'MUTE_REMOTE_PARTICIPANT';
 
+/**
+ * Create an action for when the local participant's display name is updated.
+ *
+ * {
+ *     type: PARTICIPANT_DISPLAY_NAME_CHANGED,
+ *     id: string,
+ *     name: string
+ * }
+ */
+export const PARTICIPANT_DISPLAY_NAME_CHANGED
+    = 'PARTICIPANT_DISPLAY_NAME_CHANGED';
+
 /**
  * Action to signal that ID of participant has changed. This happens when
  * local participant joins a new conference or quits one.

react/features/base/participants/functions.ts

@@ -12,9 +12,9 @@ import { getCurrentConference } from '../conference/functions';
 import { ADD_PEOPLE_ENABLED } from '../flags/constants';
 import { getFeatureFlag } from '../flags/functions';
 import i18next from '../i18n/i18next';
-import { MEDIA_TYPE, MediaType, VIDEO_TYPE } from '../media/constants';
+import { MEDIA_TYPE, VIDEO_TYPE } from '../media/constants';
 import { toState } from '../redux/functions';
-import { getScreenShareTrack, isLocalTrackMuted } from '../tracks/functions.any';
+import { getScreenShareTrack } from '../tracks/functions.any';
 import { createDeferred } from '../util/helpers';
 
 import {
@@ -362,42 +362,6 @@ export function getRemoteParticipantCountWithFake(stateful: IStateful) {
     return participantsState.remote.size;
 }
 
-/**
- * Returns the muted state of the given media source for a given participant.
- *
- * @param {(Function|Object)} stateful - The (whole) redux state, or redux's.
- * @param {IParticipant} participant - The participant entity.
- * @param {MediaType} mediaType - The media type.
- * @returns {boolean} - True its muted, false otherwise.
- */
-export function getMutedStateByParticipantAndMediaType(
-        stateful: IStateful,
-        participant: IParticipant,
-        mediaType: MediaType): boolean {
-    const type = mediaType === MEDIA_TYPE.SCREENSHARE ? 'video' : mediaType;
-
-    if (participant.local) {
-        const state = toState(stateful);
-        const tracks = state['features/base/tracks'];
-
-        return isLocalTrackMuted(tracks, mediaType);
-    }
-
-    const sources = participant.sources?.get(type);
-
-    if (!sources) {
-        return true;
-    }
-
-    if (mediaType === MEDIA_TYPE.AUDIO) {
-        return Array.from(sources.values())[0].muted;
-    }
-    const videoType = mediaType === MEDIA_TYPE.VIDEO ? VIDEO_TYPE.CAMERA : VIDEO_TYPE.SCREENSHARE;
-    const source = Array.from(sources.values()).find(src => src.videoType === videoType);
-
-    return source?.muted ?? true;
-}
-
 /**
  * Returns a count of the known participants in the passed in redux state,
  * including fake participants.
@@ -504,28 +468,28 @@ export function getScreenshareParticipantIds(stateful: IStateful): Array<string>
 }
 
 /**
- * Returns a list of source names associated with a given remote participant and for the given media type.
+ * Returns a list source name associated with a given remote participant and for the given media type.
  *
  * @param {(Function|Object)} stateful - The (whole) redux state, or redux's {@code getState} function to be used to
  * retrieve the state.
  * @param {string} id - The id of the participant whose source names are to be retrieved.
  * @param {string} mediaType - The type of source, audio or video.
- * @returns {Array<string>}
+ * @returns {Array<string>|undefined}
  */
-export function getSourceNamesByMediaTypeAndParticipant(
+export function getSourceNamesByMediaType(
         stateful: IStateful,
         id: string,
-        mediaType: string): Array<string> {
+        mediaType: string): Array<string> | undefined {
     const participant: IParticipant | undefined = getParticipantById(stateful, id);
 
     if (!participant) {
-        return [];
+        return;
     }
 
     const sources = participant.sources;
 
     if (!sources) {
-        return [];
+        return;
     }
 
     return Array.from(sources.get(mediaType) ?? new Map())
@@ -533,37 +497,6 @@ export function getSourceNamesByMediaTypeAndParticipant(
         .map(s => s[0]);
 }
 
-/**
- * Returns a list of source names associated with a given remote participant and for the given video type (only for
- * video sources).
- *
- * @param {(Function|Object)} stateful - The (whole) redux state, or redux's {@code getState} function to be used to
- * retrieve the state.
- * @param {string} id - The id of the participant whose source names are to be retrieved.
- * @param {string} videoType - The type of video, camera or desktop.
- * @returns {Array<string>}
- */
-export function getSourceNamesByVideoTypeAndParticipant(
-        stateful: IStateful,
-        id: string,
-        videoType: string): Array<string> {
-    const participant: IParticipant | undefined = getParticipantById(stateful, id);
-
-    if (!participant) {
-        return [];
-    }
-
-    const sources = participant.sources;
-
-    if (!sources) {
-        return [];
-    }
-
-    return Array.from(sources.get(MEDIA_TYPE.VIDEO) ?? new Map())
-        .filter(source => source[1].videoType === videoType && (videoType === VIDEO_TYPE.CAMERA || !source[1].muted))
-        .map(s => s[0]);
-}
-
 /**
  * Returns the presence status of a participant associated with the passed id.
  *

react/features/base/participants/middleware.ts

@@ -2,6 +2,8 @@ import i18n from 'i18next';
 import { batch } from 'react-redux';
 import { AnyAction } from 'redux';
 
+// @ts-expect-error
+import UIEvents from '../../../../service/UI/UIEvents';
 import { IStore } from '../../app/types';
 import { approveParticipant } from '../../av-moderation/actions';
 import { UPDATE_BREAKOUT_ROOMS } from '../../breakout-rooms/actionTypes';
@@ -39,6 +41,7 @@ import {
     MUTE_REMOTE_PARTICIPANT,
     OVERWRITE_PARTICIPANTS_NAMES,
     OVERWRITE_PARTICIPANT_NAME,
+    PARTICIPANT_DISPLAY_NAME_CHANGED,
     PARTICIPANT_JOINED,
     PARTICIPANT_LEFT,
     PARTICIPANT_UPDATED,
@@ -231,6 +234,20 @@ MiddlewareRegistry.register(store => next => action => {
         break;
     }
 
+    // TODO Remove this middleware when the local display name update flow is
+    // fully brought into redux.
+    case PARTICIPANT_DISPLAY_NAME_CHANGED: {
+        if (typeof APP !== 'undefined') {
+            const participant = getLocalParticipant(store.getState());
+
+            if (participant && participant.id === action.id) {
+                APP.UI.emitEvent(UIEvents.NICKNAME_CHANGED, action.name);
+            }
+        }
+
+        break;
+    }
+
     case RAISE_HAND_UPDATED: {
         const { participant } = action;
         let queue = getRaiseHandsQueue(store.getState());

react/features/base/participants/types.ts

@@ -19,7 +19,9 @@ export interface IParticipant {
     e2eeVerified?: boolean;
     email?: string;
     fakeParticipant?: FakeParticipant;
-    features?: IParticipantFeatures;
+    features?: {
+        'screen-sharing'?: boolean | string;
+    };
     getId?: Function;
     id: string;
     isJigasi?: boolean;
@@ -52,23 +54,6 @@ export interface ILocalParticipant extends IParticipant {
     userSelectedMicDeviceLabel?: string;
 }
 
-export interface IParticipantFeatures {
-    'branding'?: boolean | string;
-    'calendar'?: boolean | string;
-    'flip'?: boolean | string;
-    'inbound-call'?: boolean | string;
-    'livestreaming'?: boolean | string;
-    'lobby'?: boolean | string;
-    'moderation'?: boolean | string;
-    'outbound-call'?: boolean | string;
-    'recording'?: boolean | string;
-    'room'?: boolean | string;
-    'screen-sharing'?: boolean | string;
-    'sip-inbound-call'?: boolean | string;
-    'sip-outbound-call'?: boolean | string;
-    'transcription'?: boolean | string;
-}
-
 export interface ISourceInfo {
     muted: boolean;
     videoType: string;

react/features/base/tracks/actionTypes.ts

@@ -66,6 +66,16 @@ export const TRACK_MUTE_UNMUTE_FAILED = 'TRACK_MUTE_UNMUTE_FAILED';
  */
 export const TRACK_NO_DATA_FROM_SOURCE = 'TRACK_NO_DATA_FROM_SOURCE';
 
+/**
+ * The type of redux action dispatched when the owner of a track changes due to ssrc remapping.
+ *
+ * {
+ *     type: TRACK_OWNER_CHANGED,
+ *     track: Track
+ * }
+ */
+export const TRACK_OWNER_CHANGED = 'TRACK_OWNER_CHANGED';
+
 /**
  * The type of redux action dispatched when a track has been (locally or
  * remotely) removed from the conference.

react/features/base/tracks/actions.any.ts

@@ -26,6 +26,7 @@ import {
     TRACK_CREATE_ERROR,
     TRACK_MUTE_UNMUTE_FAILED,
     TRACK_NO_DATA_FROM_SOURCE,
+    TRACK_OWNER_CHANGED,
     TRACK_REMOVED,
     TRACK_STOPPED,
     TRACK_UPDATED,
@@ -380,6 +381,9 @@ export function trackAdded(track: any) {
         track.on(
             JitsiTrackEvents.TRACK_VIDEOTYPE_CHANGED,
             (type: VideoType) => dispatch(trackVideoTypeChanged(track, type)));
+        track.on(
+            JitsiTrackEvents.TRACK_OWNER_CHANGED,
+            (owner: string) => dispatch(trackOwnerChanged(track, owner)));
         const local = track.isLocal();
         const mediaType = track.getVideoType() === VIDEO_TYPE.DESKTOP
             ? MEDIA_TYPE.SCREENSHARE
@@ -621,6 +625,32 @@ export function trackStreamingStatusChanged(track: any, streamingStatus: string)
     };
 }
 
+/**
+ * Create an action for when the owner of the track changes due to ssrc remapping.
+ *
+ * @param {(JitsiRemoteTrack)} track - JitsiTrack instance.
+ * @param {string} participantId - New owner's participant ID.
+ * @returns {{
+ *     type: TRACK_OWNER_CHANGED,
+ *     track: Track
+ * }}
+ */
+export function trackOwnerChanged(track: any, participantId: string): {
+    track: {
+        jitsiTrack: any;
+        participantId: string;
+    };
+    type: 'TRACK_OWNER_CHANGED';
+} {
+    return {
+        type: TRACK_OWNER_CHANGED,
+        track: {
+            jitsiTrack: track,
+            participantId
+        }
+    };
+}
+
 /**
  * Signals passed tracks to be added.
  *

react/features/base/tracks/actions.web.ts

@@ -4,7 +4,7 @@ import { IReduxState, IStore } from '../../app/types';
 import { showModeratedNotification } from '../../av-moderation/actions';
 import { shouldShowModeratedNotification } from '../../av-moderation/functions';
 import { setNoiseSuppressionEnabled } from '../../noise-suppression/actions';
-import { showErrorNotification, showNotification } from '../../notifications/actions';
+import { showNotification } from '../../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
 import { stopReceiver } from '../../remote-control/actions';
 import { setScreenAudioShareState, setScreenshareAudioTrack } from '../../screen-share/actions';
@@ -13,12 +13,10 @@ import { toggleScreenshotCaptureSummary } from '../../screenshot-capture/actions
 import { isScreenshotCaptureEnabled } from '../../screenshot-capture/functions';
 import { AudioMixerEffect } from '../../stream-effects/audio-mixer/AudioMixerEffect';
 import { getCurrentConference } from '../conference/functions';
-import { notifyCameraError, notifyMicError } from '../devices/actions.web';
 import { openDialog } from '../dialog/actions';
-import { JitsiTrackErrors, JitsiTrackEvents, browser } from '../lib-jitsi-meet';
-import { gumPending, setScreenshareMuted } from '../media/actions';
-import { MEDIA_TYPE, MediaType, VIDEO_TYPE } from '../media/constants';
-import { IGUMPendingState } from '../media/types';
+import { JitsiTrackErrors, JitsiTrackEvents } from '../lib-jitsi-meet';
+import { setScreenshareMuted } from '../media/actions';
+import { MEDIA_TYPE, VIDEO_TYPE } from '../media/constants';
 
 import {
     addLocalTrack,
@@ -33,8 +31,7 @@ import {
     getLocalVideoTrack,
     isToggleCameraEnabled
 } from './functions';
-import logger from './logger';
-import { ICreateInitialTracksOptions, IInitialTracksErrors, IShareOptions, IToggleScreenSharingOptions } from './types';
+import { IShareOptions, IToggleScreenSharingOptions } from './types';
 
 export * from './actions.any';
 
@@ -77,6 +74,33 @@ export function toggleScreensharing(
  * @param {Object} store - The redux store.
  * @returns {void}
  */
+function _handleScreensharingError(
+        error: Error | AUDIO_ONLY_SCREEN_SHARE_NO_TRACK,
+        { dispatch }: IStore): void {
+    if (error.name === JitsiTrackErrors.SCREENSHARING_USER_CANCELED) {
+        return;
+    }
+    let descriptionKey, titleKey;
+
+    if (error.name === JitsiTrackErrors.PERMISSION_DENIED) {
+        descriptionKey = 'dialog.screenSharingPermissionDeniedError';
+        titleKey = 'dialog.screenSharingFailedTitle';
+    } else if (error.name === JitsiTrackErrors.CONSTRAINT_FAILED) {
+        descriptionKey = 'dialog.cameraConstraintFailedError';
+        titleKey = 'deviceError.cameraError';
+    } else if (error.name === JitsiTrackErrors.SCREENSHARING_GENERIC_ERROR) {
+        descriptionKey = 'dialog.screenSharingFailed';
+        titleKey = 'dialog.screenSharingFailedTitle';
+    } else if (error === AUDIO_ONLY_SCREEN_SHARE_NO_TRACK) {
+        descriptionKey = 'notify.screenShareNoAudio';
+        titleKey = 'notify.screenShareNoAudioTitle';
+    }
+
+    dispatch(showNotification({
+        titleKey,
+        descriptionKey
+    }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
+}
 
 
 /**
@@ -104,6 +128,7 @@ async function _maybeApplyAudioMixerEffect(desktopAudioTrack: any, state: IRedux
     }
 }
 
+
 /**
  * Toggles screen sharing.
  *
@@ -157,7 +182,7 @@ async function _toggleScreenSharing(
             try {
                 tracks = await createLocalTracksF(options) as any[];
             } catch (error) {
-                dispatch(handleScreenSharingError(error, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
+                _handleScreensharingError(error as any, store);
 
                 throw error;
             }
@@ -171,7 +196,7 @@ async function _toggleScreenSharing(
             desktopVideoTrack.dispose();
 
             if (!desktopAudioTrack) {
-                dispatch(handleScreenSharingError(AUDIO_ONLY_SCREEN_SHARE_NO_TRACK, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
+                _handleScreensharingError(AUDIO_ONLY_SCREEN_SHARE_NO_TRACK, store);
 
                 throw new Error(AUDIO_ONLY_SCREEN_SHARE_NO_TRACK);
             }
@@ -292,224 +317,3 @@ export function openAllowToggleCameraDialog(onAllow: Function, initiatorId: stri
         initiatorId
     });
 }
-
-/**
- * Sets the GUM pending state for the tracks that have failed.
- *
- * NOTE: Some of the track that we will be setting to GUM pending state NONE may not have failed but they may have
- * been requested. This won't be a problem because their current GUM pending state will be NONE anyway.
- *
- * @param {JitsiLocalTrack} tracks - The tracks that have been created.
- * @param {Function} dispatch - The redux dispatch function.
- * @returns {void}
- */
-export function setGUMPendingStateOnFailedTracks(tracks: Array<any>, dispatch: IStore['dispatch']) {
-    const tracksTypes = tracks.map(track => {
-        if (track.getVideoType() === VIDEO_TYPE.DESKTOP) {
-            return MEDIA_TYPE.SCREENSHARE;
-        }
-
-        return track.getType();
-    });
-    const nonPendingTracks = [ MEDIA_TYPE.AUDIO, MEDIA_TYPE.VIDEO ].filter(type => !tracksTypes.includes(type));
-
-    dispatch(gumPending(nonPendingTracks, IGUMPendingState.NONE));
-}
-
-/**
- * Creates and adds to the conference the initial audio/video tracks.
- *
- * @param {Array<MediaType>} devices - Array with devices (audio/video) that will be used.
- * @returns {Function}
- */
-export function createAndAddInitialAVTracks(devices: Array<MediaType>) {
-    return async (dispatch: IStore['dispatch']) => {
-        dispatch(gumPending(devices, IGUMPendingState.PENDING_UNMUTE));
-
-        const { tracks, errors } = await dispatch(createInitialAVTracks({ devices }));
-
-        setGUMPendingStateOnFailedTracks(tracks, dispatch);
-        dispatch(displayErrorsForCreateInitialLocalTracks(errors));
-
-        await Promise.allSettled(tracks.map((track: any) => {
-            const legacyConferenceObject = APP.conference;
-
-            if (track.isAudioTrack()) {
-                return legacyConferenceObject.useAudioStream(track);
-            }
-            if (track.isVideoTrack()) {
-                return legacyConferenceObject.useVideoStream(track);
-            }
-
-            return Promise.resolve();
-        }));
-
-        dispatch(gumPending(devices, IGUMPendingState.NONE));
-    };
-}
-
-/**
- * Creates the initial audio/video tracks.
- *
- * @param {ICreateInitialTracksOptions} options - Options for creating the audio/video tracks.
- * @returns {Function}
- */
-export function createInitialAVTracks(options: ICreateInitialTracksOptions) {
-    return (dispatch: IStore['dispatch'], _getState: IStore['getState']) => {
-        const {
-            devices,
-            timeout,
-            firePermissionPromptIsShownEvent
-        } = options;
-
-        dispatch(gumPending(devices, IGUMPendingState.PENDING_UNMUTE));
-
-        return createLocalTracksF(options).then(tracks => {
-            return {
-                errors: {} as IInitialTracksErrors,
-                tracks
-            };
-        })
-        .catch(async error => {
-            const errors = {} as IInitialTracksErrors;
-
-            if (error.name === JitsiTrackErrors.TIMEOUT && !browser.isElectron()) {
-                if (devices.includes(MEDIA_TYPE.AUDIO)) {
-                    errors.audioOnlyError = error;
-                }
-
-                if (devices.includes(MEDIA_TYPE.VIDEO)) {
-                    errors.videoOnlyError = error;
-                }
-
-                if (errors.audioOnlyError && errors.videoOnlyError) {
-                    errors.audioAndVideoError = error;
-                }
-
-                return {
-                    errors,
-                    tracks: []
-                };
-            }
-
-            // Retry with separate gUM calls.
-            const gUMPromises = [];
-            const tracks: any[] | PromiseLike<any[]> = [];
-
-            if (devices.includes(MEDIA_TYPE.AUDIO)) {
-                gUMPromises.push(createLocalTracksF({
-                    devices: [ MEDIA_TYPE.AUDIO ],
-                    timeout,
-                    firePermissionPromptIsShownEvent
-                }));
-            }
-
-            if (devices.includes(MEDIA_TYPE.VIDEO)) {
-                gUMPromises.push(createLocalTracksF({
-                    devices: [ MEDIA_TYPE.VIDEO ],
-                    timeout,
-                    firePermissionPromptIsShownEvent
-                }));
-            }
-
-            const results = await Promise.allSettled(gUMPromises);
-            let errorMsg;
-
-            results.forEach((result, idx) => {
-                if (result.status === 'fulfilled') {
-                    tracks.push(result.value[0]);
-                } else {
-                    errorMsg = result.reason;
-                    const isAudio = idx === 0;
-
-                    logger.error(`${isAudio ? 'Audio' : 'Video'} track creation failed with error ${errorMsg}`);
-                    if (isAudio) {
-                        errors.audioOnlyError = errorMsg;
-                    } else {
-                        errors.videoOnlyError = errorMsg;
-                    }
-                }
-            });
-
-            if (errors.audioOnlyError && errors.videoOnlyError) {
-                errors.audioAndVideoError = errorMsg;
-            }
-
-            return {
-                tracks,
-                errors
-            };
-        });
-    };
-}
-
-/**
- * Displays error notifications according to the state carried by the passed {@code errors} object.
- *
- * @param {InitialTracksErrors} errors - The errors (if any).
- * @returns {Function}
- * @private
- */
-export function displayErrorsForCreateInitialLocalTracks(errors: IInitialTracksErrors) {
-    return (dispatch: IStore['dispatch']) => {
-        const {
-            audioOnlyError,
-            screenSharingError,
-            videoOnlyError
-        } = errors;
-
-        if (screenSharingError) {
-            dispatch(handleScreenSharingError(screenSharingError, NOTIFICATION_TIMEOUT_TYPE.LONG));
-        }
-        if (audioOnlyError || videoOnlyError) {
-            if (audioOnlyError) {
-                dispatch(notifyMicError(audioOnlyError));
-            }
-
-            if (videoOnlyError) {
-                dispatch(notifyCameraError(videoOnlyError));
-            }
-        }
-    };
-}
-
-/**
- * Displays a UI notification for screensharing failure based on the error passed.
- *
- * @private
- * @param {Error | AUDIO_ONLY_SCREEN_SHARE_NO_TRACK} error - The error.
- * @param {NOTIFICATION_TIMEOUT_TYPE} timeout - The time for showing the notification.
- * @returns {Function}
- */
-export function handleScreenSharingError(
-        error: Error | AUDIO_ONLY_SCREEN_SHARE_NO_TRACK,
-        timeout: NOTIFICATION_TIMEOUT_TYPE) {
-    return (dispatch: IStore['dispatch']) => {
-        logger.error('failed to share local desktop', error);
-
-        let descriptionKey;
-        let titleKey;
-
-        if (error.name === JitsiTrackErrors.PERMISSION_DENIED) {
-            descriptionKey = 'dialog.screenSharingPermissionDeniedError';
-            titleKey = 'dialog.screenSharingFailedTitle';
-        } else if (error.name === JitsiTrackErrors.CONSTRAINT_FAILED) {
-            descriptionKey = 'dialog.cameraConstraintFailedError';
-            titleKey = 'deviceError.cameraError';
-        } else if (error.name === JitsiTrackErrors.SCREENSHARING_GENERIC_ERROR) {
-            descriptionKey = 'dialog.screenSharingFailed';
-            titleKey = 'dialog.screenSharingFailedTitle';
-        } else if (error === AUDIO_ONLY_SCREEN_SHARE_NO_TRACK) {
-            descriptionKey = 'notify.screenShareNoAudio';
-            titleKey = 'notify.screenShareNoAudioTitle';
-        } else { // safeguard for not showing notification with empty text. This will also include
-            // error.name === JitsiTrackErrors.SCREENSHARING_USER_CANCELED
-            return;
-        }
-
-        dispatch(showErrorNotification({
-            descriptionKey,
-            titleKey
-        }, timeout));
-    };
-}

react/features/base/tracks/middleware.web.ts

@@ -15,6 +15,7 @@ import {
     TRACK_ADDED,
     TRACK_MUTE_UNMUTE_FAILED,
     TRACK_NO_DATA_FROM_SOURCE,
+    TRACK_OWNER_CHANGED,
     TRACK_REMOVED,
     TRACK_STOPPED,
     TRACK_UPDATED
@@ -81,6 +82,23 @@ MiddlewareRegistry.register(store => next => action => {
         return result;
     }
 
+    case TRACK_OWNER_CHANGED: {
+        const oldTrack = getTrackByJitsiTrack(store.getState()['features/base/tracks'], action.track?.jitsiTrack);
+        const oldOwner = oldTrack?.participantId;
+        const result = next(action);
+        const newOwner = action.track?.participantId;
+
+        if (oldOwner) {
+            logTracksForParticipant(store.getState()['features/base/tracks'], oldOwner, 'Owner changed');
+        }
+
+        if (newOwner) {
+            logTracksForParticipant(store.getState()['features/base/tracks'], newOwner, 'Owner changed');
+        }
+
+        return result;
+    }
+
     case TRACK_MUTE_UNMUTE_FAILED: {
         const { jitsiTrack } = action.track;
         const muted = action.wasMuted;

react/features/base/tracks/reducer.ts

@@ -10,6 +10,7 @@ import {
     TRACK_CREATE_CANCELED,
     TRACK_CREATE_ERROR,
     TRACK_NO_DATA_FROM_SOURCE,
+    TRACK_OWNER_CHANGED,
     TRACK_REMOVED,
     TRACK_UPDATED,
     TRACK_WILL_CREATE
@@ -42,6 +43,18 @@ function track(state: ITrack, action: AnyAction) {
         }
         break;
 
+    case TRACK_OWNER_CHANGED: {
+        const t = action.track;
+
+        if (state.jitsiTrack === t.jitsiTrack) {
+            return {
+                ...state,
+                participantId: t.participantId
+            };
+        }
+        break;
+    }
+
     case TRACK_UPDATED: {
         const t = action.track;
 
@@ -91,6 +104,7 @@ ReducerRegistry.register<ITracksState>('features/base/tracks', (state = [], acti
     switch (action.type) {
     case PARTICIPANT_ID_CHANGED:
     case TRACK_NO_DATA_FROM_SOURCE:
+    case TRACK_OWNER_CHANGED:
     case TRACK_UPDATED:
         return state.map((t: ITrack) => track(t, action));
     case TRACK_ADDED: {

react/features/base/tracks/types.ts

@@ -72,16 +72,3 @@ export interface IShareOptions {
     desktopSharingSources?: string[];
     desktopStream?: any;
 }
-
-export interface ICreateInitialTracksOptions {
-    devices: Array<MediaType>;
-    firePermissionPromptIsShownEvent?: boolean;
-    timeout?: number;
-}
-
-export interface IInitialTracksErrors {
-    audioAndVideoError?: Error;
-    audioOnlyError: Error;
-    screenSharingError: Error;
-    videoOnlyError: Error;
-}

react/features/base/ui/components/native/Input.tsx

@@ -1,16 +1,13 @@
 import React, { forwardRef, useCallback, useState } from 'react';
 import {
     KeyboardTypeOptions,
-    NativeSyntheticEvent,
-    ReturnKeyTypeOptions,
+    NativeSyntheticEvent, ReturnKeyTypeOptions,
     StyleProp,
     Text,
     TextInput,
     TextInputChangeEventData,
-    TextInputFocusEventData,
-    TextInputKeyPressEventData,
+    TextInputFocusEventData, TextInputKeyPressEventData,
     TextInputSubmitEditingEventData,
-    TextStyle,
     TouchableOpacity,
     View,
     ViewStyle
@@ -28,16 +25,8 @@ interface IProps extends IInputProps {
     autoCapitalize?: 'none' | 'sentences' | 'words' | 'characters' | undefined;
     autoFocus?: boolean;
     blurOnSubmit?: boolean | undefined;
-    bottomLabel?: string;
     customStyles?: ICustomStyles;
     editable?: boolean | undefined;
-
-    /**
-     * The id to set on the input element.
-     * This is required because we need it internally to tie the input to its
-     * info (label, error) so that screen reader users don't get lost.
-     */
-    id?: string;
     keyboardType?: KeyboardTypeOptions;
     maxLength?: number | undefined;
     minHeight?: number | string | undefined;
@@ -63,13 +52,11 @@ const Input = forwardRef<TextInput, IProps>(({
     autoCapitalize,
     autoFocus,
     blurOnSubmit,
-    bottomLabel,
     clearable,
     customStyles,
     disabled,
     error,
     icon,
-    id,
     keyboardType,
     label,
     maxLength,
@@ -119,7 +106,7 @@ const Input = forwardRef<TextInput, IProps>(({
         onSubmitEditing?.(text);
     }, [ onSubmitEditing ]);
 
-    return (<View style = { [ styles.inputContainer, customStyles?.container ] as StyleProp<ViewStyle> }>
+    return (<View style = { [ styles.inputContainer, customStyles?.container ] }>
         {label && <Text style = { styles.label }>{ label }</Text>}
         <View style = { styles.fieldContainer as StyleProp<ViewStyle> }>
             {icon && <Icon
@@ -134,7 +121,6 @@ const Input = forwardRef<TextInput, IProps>(({
                 autoFocus = { autoFocus }
                 blurOnSubmit = { blurOnSubmit }
                 editable = { !disabled }
-                id = { id }
                 keyboardType = { keyboardType }
                 maxLength = { maxLength }
 
@@ -159,11 +145,11 @@ const Input = forwardRef<TextInput, IProps>(({
                     clearable && styles.clearableInput,
                     customStyles?.input,
                     disabled && styles.inputDisabled,
-                    icon && styles.iconInput,
-                    multiline && styles.inputMultiline,
+                    error && styles.inputError,
                     focused && styles.inputFocused,
-                    error && styles.inputError
-                ] as StyleProp<TextStyle> }
+                    icon && styles.iconInput,
+                    multiline && styles.inputMultiline
+                ] }
                 textContentType = { textContentType }
                 value = { typeof value === 'number' ? `${value}` : value } />
             { clearable && !disabled && value !== '' && (
@@ -177,20 +163,6 @@ const Input = forwardRef<TextInput, IProps>(({
                 </TouchableOpacity>
             )}
         </View>
-        {
-            bottomLabel && (
-                <View>
-                    <Text
-                        id = { `${id}-description` }
-                        style = { [
-                            styles.bottomLabel,
-                            error && styles.bottomLabelError
-                        ] }>
-                        { bottomLabel }
-                    </Text>
-                </View>
-            )
-        }
     </View>);
 });
 

react/features/base/ui/components/native/inputStyles.ts

@@ -73,15 +73,5 @@ export default {
 
     clearIcon: {
         color: BaseTheme.palette.icon01
-    },
-
-    bottomLabel: {
-        ...BaseTheme.typography.labelRegular,
-        color: BaseTheme.palette.text02,
-        marginTop: BaseTheme.spacing[2]
-    },
-
-    bottomLabelError: {
-        color: BaseTheme.palette.textError
     }
 };

react/features/base/util/uri.ts

@@ -537,7 +537,6 @@ export function urlObjectToString(o: { [key: string]: any; }): string | undefine
 
     const search = new URLSearchParams(url.search);
 
-    // TODO: once all available versions are updated to support the jwt in the hash, remove this
     if (jwt) {
         search.set('jwt', jwt);
     }
@@ -562,14 +561,6 @@ export function urlObjectToString(o: { [key: string]: any; }): string | undefine
 
     let { hash } = url;
 
-    if (jwt) {
-        if (hash.length) {
-            hash = `${hash}&jwt=${JSON.stringify(jwt)}`;
-        } else {
-            hash = `#jwt=${JSON.stringify(jwt)}`;
-        }
-    }
-
     for (const urlPrefix of [ 'config', 'iceServers', 'interfaceConfig', 'devices', 'userInfo', 'appData' ]) {
         const urlParamsArray
             = _objectToURLParamsArray(

react/features/chat/middleware.ts

@@ -116,7 +116,7 @@ MiddlewareRegistry.register(store => next => action => {
         const state = store.getState();
 
         if (!isReactionsEnabled(state)) {
-            return next(action);
+            return;
         }
 
         const { participant, data } = action;

react/features/conference/components/web/Conference.tsx

@@ -368,6 +368,8 @@ class Conference extends AbstractConference<IProps, any> {
      */
     _start() {
         APP.UI.start();
+
+        APP.UI.registerListeners();
         APP.UI.bindEvents();
 
         FULL_SCREEN_EVENTS.forEach(name =>

react/features/conference/middleware.any.ts

@@ -314,7 +314,6 @@ function _calendarNotification({ dispatch, getState }: IStore, eventToShow: any)
         customActionType,
         description,
         icon,
-        maxLines: 1,
         title,
         uid
     }, NOTIFICATION_TIMEOUT_TYPE.STICKY));

react/features/etherpad/middleware.ts

@@ -1,3 +1,5 @@
+// @ts-expect-error
+import UIEvents from '../../../service/UI/UIEvents';
 import { CONFERENCE_JOIN_IN_PROGRESS } from '../base/conference/actionTypes';
 import { getCurrentConference } from '../base/conference/functions';
 import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
@@ -39,7 +41,7 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
     }
     case TOGGLE_DOCUMENT_EDITING: {
         if (typeof APP !== 'undefined') {
-            APP.UI.onEtherpadClicked();
+            APP.UI.emitEvent(UIEvents.ETHERPAD_CLICKED);
         }
         break;
     }

react/features/invite/functions.ts

@@ -427,20 +427,17 @@ export function invitePeopleAndChatRooms(
         return Promise.resolve();
     }
 
-    const headers = {
-        ...jwt ? { 'Authorization': `Bearer ${jwt}` } : {},
-        'Content-Type': 'application/json'
-    };
-
     return fetch(
-        `${inviteServiceUrl}`,
+        `${inviteServiceUrl}?token=${jwt}`,
         {
             body: JSON.stringify({
                 'invited': inviteItems,
                 'url': inviteUrl
             }),
             method: 'POST',
-            headers
+            headers: {
+                'Content-Type': 'application/json'
+            }
         }
     );
 }
@@ -547,16 +544,8 @@ export function searchDirectory( // eslint-disable-line max-params
     const query = encodeURIComponent(text);
     const queryTypesString = encodeURIComponent(JSON.stringify(queryTypes));
 
-    const headers = {
-        ...jwt ? { 'Authorization': `Bearer ${jwt}` } : {}
-    };
-
     return fetch(`${serviceUrl}?query=${query}&queryTypes=${
-        queryTypesString}`,
-            {
-                method: 'GET',
-                headers
-            })
+        queryTypesString}&jwt=${jwt}`)
             .then(response => {
                 const jsonify = response.json();
 

react/features/notifications/components/native/Notification.tsx

@@ -152,16 +152,15 @@ const Notification = ({
         if (descriptionArray?.length) {
             return (
                 <>
-                    <Text
-                        style = { styles.contentTextTitle as TextStyle }>
-                        { titleText }
+                    <Text style = { styles.contentTextTitle as TextStyle }>
+                        {titleText}
                     </Text>
                     {
                         descriptionArray.map((line, index) => (
                             <Text
                                 key = { index }
                                 style = { styles.contentText }>
-                                { replaceNonUnicodeEmojis(line) }
+                                {replaceNonUnicodeEmojis(line)}
                             </Text>
                         ))
                     }
@@ -171,7 +170,7 @@ const Notification = ({
 
         return (
             <Text style = { styles.contentTextTitle as TextStyle }>
-                { titleText }
+                {titleText}
             </Text>
         );
     };
@@ -200,10 +199,10 @@ const Notification = ({
                 <View
                     pointerEvents = 'box-none'
                     style = { styles.contentContainer }>
-                    { _renderContent() }
+                    {_renderContent()}
                 </View>
                 <View style = { styles.btnContainer as ViewStyle }>
-                    { mapAppearanceToButtons() }
+                    {mapAppearanceToButtons()}
                 </View>
             </View>
             <IconButton

react/features/notifications/components/native/styles.ts

@@ -7,12 +7,13 @@ const contentColumn = {
 };
 
 const notification = {
+    display: 'flex',
     backgroundColor: BaseTheme.palette.ui10,
     borderRadius: BaseTheme.shape.borderRadius,
     borderLeftColor: BaseTheme.palette.link01Active,
-    borderLeftWidth: BaseTheme.spacing[1],
-    display: 'flex',
+    borderLeftWidth: 4,
     flexDirection: 'row',
+    maxHeight: 120,
     height: 'auto',
     marginBottom: BaseTheme.spacing[2],
     marginHorizontal: BaseTheme.spacing[2],
@@ -42,20 +43,20 @@ export default {
      */
 
     contentContainer: {
-        marginHorizontal: BaseTheme.spacing[2]
+        marginTop: BaseTheme.spacing[2]
     },
 
     contentText: {
         color: BaseTheme.palette.text04,
-        marginLeft: BaseTheme.spacing[4],
+        marginLeft: BaseTheme.spacing[6],
         marginTop: BaseTheme.spacing[1]
     },
 
     contentTextTitle: {
         color: BaseTheme.palette.text04,
+        marginLeft: BaseTheme.spacing[6],
         fontWeight: 'bold',
-        marginLeft: BaseTheme.spacing[4],
-        marginTop: BaseTheme.spacing[2]
+        marginTop: BaseTheme.spacing[1]
     },
 
     /**
@@ -89,8 +90,9 @@ export default {
     },
 
     iconContainer: {
+        left: BaseTheme.spacing[1],
         position: 'absolute',
-        top: 12
+        top: BaseTheme.spacing[2]
     },
 
     btn: {
@@ -100,7 +102,7 @@ export default {
     btnContainer: {
         display: 'flex',
         flexDirection: 'row',
-        marginLeft: BaseTheme.spacing[3]
+        marginLeft: BaseTheme.spacing[1]
     },
 
     withToolbox: {

react/features/notifications/constants.ts

@@ -11,12 +11,12 @@ export const NOTIFICATION_TIMEOUT = {
 /**
  * Notification timeout type.
  */
-export enum NOTIFICATION_TIMEOUT_TYPE {
-    LONG = 'long',
-    MEDIUM = 'medium',
-    SHORT = 'short',
-    STICKY = 'sticky'
-}
+export const NOTIFICATION_TIMEOUT_TYPE = {
+    SHORT: 'short',
+    MEDIUM: 'medium',
+    LONG: 'long',
+    STICKY: 'sticky'
+};
 
 /**
  * The set of possible notification types.

react/features/participants-pane/components/native/MeetingParticipantItem.tsx

@@ -2,12 +2,9 @@ import React, { PureComponent } from 'react';
 import { connect } from 'react-redux';
 
 import { IReduxState, IStore } from '../../../app/types';
-import { getSsrcRewritingFeatureFlag } from '../../../base/config/functions.any';
 import { translate } from '../../../base/i18n/functions';
-import { MEDIA_TYPE } from '../../../base/media/constants';
 import {
     getLocalParticipant,
-    getMutedStateByParticipantAndMediaType,
     getParticipantById,
     getParticipantDisplayName,
     hasRaisedHand,
@@ -169,12 +166,8 @@ function mapStateToProps(state: IReduxState, ownProps: any) {
     const { participant } = ownProps;
     const { ownerId } = state['features/shared-video'];
     const localParticipantId = getLocalParticipant(state)?.id;
-    const _isAudioMuted = getSsrcRewritingFeatureFlag(state)
-        ? Boolean(participant && getMutedStateByParticipantAndMediaType(state, participant, MEDIA_TYPE.AUDIO))
-        : Boolean(participant && isParticipantAudioMuted(participant, state));
-    const _isVideoMuted = getSsrcRewritingFeatureFlag(state)
-        ? Boolean(participant && getMutedStateByParticipantAndMediaType(state, participant, MEDIA_TYPE.VIDEO))
-        : isParticipantVideoMuted(participant, state);
+    const _isAudioMuted = Boolean(participant && isParticipantAudioMuted(participant, state));
+    const _isVideoMuted = isParticipantVideoMuted(participant, state);
     const audioMediaState = getParticipantAudioMediaState(participant, _isAudioMuted, state);
     const videoMediaState = getParticipantVideoMediaState(participant, _isVideoMuted, state);
     const { disableModeratorIndicator } = state['features/base/config'];

react/features/participants-pane/components/web/MeetingParticipantItem.tsx

@@ -2,12 +2,10 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { connect } from 'react-redux';
 
 import { IReduxState } from '../../../app/types';
-import { getSsrcRewritingFeatureFlag } from '../../../base/config/functions.any';
 import { JitsiTrackEvents } from '../../../base/lib-jitsi-meet';
 import { MEDIA_TYPE } from '../../../base/media/constants';
 import {
     getLocalParticipant,
-    getMutedStateByParticipantAndMediaType,
     getParticipantByIdOrUndefined,
     getParticipantDisplayName,
     hasRaisedHand,
@@ -301,15 +299,15 @@ function _mapStateToProps(state: IReduxState, ownProps: any) {
     const { participantID, searchString } = ownProps;
     const { ownerId } = state['features/shared-video'];
     const localParticipantId = getLocalParticipant(state)?.id;
+
     const participant = getParticipantByIdOrUndefined(state, participantID);
+
     const _displayName = getParticipantDisplayName(state, participant?.id ?? '');
+
     const _matchesSearch = participantMatchesSearch(participant, searchString);
-    const _isAudioMuted = getSsrcRewritingFeatureFlag(state)
-        ? Boolean(participant && getMutedStateByParticipantAndMediaType(state, participant, MEDIA_TYPE.AUDIO))
-        : Boolean(participant && isParticipantAudioMuted(participant, state));
-    const _isVideoMuted = getSsrcRewritingFeatureFlag(state)
-        ? Boolean(participant && getMutedStateByParticipantAndMediaType(state, participant, MEDIA_TYPE.VIDEO))
-        : isParticipantVideoMuted(participant, state);
+
+    const _isAudioMuted = Boolean(participant && isParticipantAudioMuted(participant, state));
+    const _isVideoMuted = isParticipantVideoMuted(participant, state);
     const _audioMediaState = getParticipantAudioMediaState(participant, _isAudioMuted, state);
     const _videoMediaState = getParticipantVideoMediaState(participant, _isVideoMuted, state);
     const _quickActionButtonType = getQuickActionButtonType(participant, _isAudioMuted, _isVideoMuted, state);

react/features/participants-pane/components/web/ParticipantsPaneButton.tsx

@@ -9,7 +9,6 @@ import {
     close as closeParticipantsPane,
     open as openParticipantsPane
 } from '../../../participants-pane/actions.web';
-import { closeOverflowMenuIfOpen } from '../../../toolbox/actions.web';
 import { isParticipantsPaneEnabled } from '../../functions';
 
 import ParticipantsCounter from './ParticipantsCounter';
@@ -62,7 +61,6 @@ class ParticipantsPaneButton extends AbstractButton<IProps> {
     _handleClick() {
         const { dispatch, _isOpen } = this.props;
 
-        dispatch(closeOverflowMenuIfOpen());
         if (_isOpen) {
             dispatch(closeParticipantsPane());
         } else {

react/features/polls/actionTypes.ts

@@ -18,17 +18,6 @@ export const CHANGE_VOTE = 'CHANGE_VOTE';
  */
 export const CLEAR_POLLS = 'CLEAR_POLLS';
 
-/**
- * The type of the action triggered when the poll is editing.
- *
- * {
- *     type: EDIT_POLL,
- *     pollId: string,
- *     editing: boolean
- * }
- */
-export const EDIT_POLL = 'EDIT_POLL';
-
 /**
  * The type of the action which signals that a new Poll was received.
  *
@@ -82,15 +71,3 @@ export const RETRACT_VOTE = 'RETRACT_VOTE';
  * }
  */
 export const RESET_NB_UNREAD_POLLS = 'RESET_NB_UNREAD_POLLS';
-
-/**
- * The type of the action triggered when the poll is saved.
- *
- * {
- *     type: SAVE_POLL,
- *     poll: Poll,
- *     pollId: string,
- *     saved: boolean
- * }
- */
-export const SAVE_POLL = 'SAVE_POLL';

react/features/polls/actions.ts

@@ -1,13 +1,11 @@
 import {
     CHANGE_VOTE,
     CLEAR_POLLS,
-    EDIT_POLL,
     RECEIVE_ANSWER,
     RECEIVE_POLL,
     REGISTER_VOTE,
     RESET_NB_UNREAD_POLLS,
-    RETRACT_VOTE,
-    SAVE_POLL
+    RETRACT_VOTE
 } from './actionTypes';
 import { IAnswer, IPoll } from './types';
 
@@ -130,46 +128,3 @@ export function resetNbUnreadPollsMessages() {
         type: RESET_NB_UNREAD_POLLS
     };
 }
-
-/**
- * Action to signal saving a poll.
- *
- * @param {string} pollId - The id of the poll that gets to be saved.
- * @param {IPoll} poll - The Poll object that gets to be saved.
- * @param {boolean} saved - Whether the poll is saved or not.
- * @returns {{
- *     type: RECEIVE_POLL,
- *     poll: IPoll,
- *     pollId: string,
- *     saved: boolean
- * }}
- */
-export function savePoll(pollId: string, poll: IPoll, saved: boolean) {
-    return {
-        type: SAVE_POLL,
-        pollId,
-        poll: {
-            ...poll,
-            saved
-        }
-    };
-}
-
-/**
- * Action to signal editing a poll.
- *
- * @param {string} pollId - The id of the poll that gets to be edited.
- * @param {boolean} editing - Whether the poll is in edit mode or not.
- * @returns {{
- *     type: RECEIVE_POLL,
- *     pollId: string,
- *     editing: boolean
- * }}
- */
-export function editPoll(pollId: string, editing: boolean) {
-    return {
-        type: EDIT_POLL,
-        pollId,
-        editing
-    };
-}

react/features/polls/components/AbstractPollAnswer.tsx

@@ -7,8 +7,8 @@ import { sendAnalytics } from '../../analytics/functions';
 import { IReduxState } from '../../app/types';
 import { getParticipantDisplayName } from '../../base/participants/functions';
 import { useBoundSelector } from '../../base/util/hooks';
-import { editPoll, registerVote, setVoteChanging } from '../actions';
-import { COMMAND_ANSWER_POLL, COMMAND_NEW_POLL } from '../constants';
+import { registerVote, setVoteChanging } from '../actions';
+import { COMMAND_ANSWER_POLL } from '../constants';
 import { IPoll } from '../types';
 
 /**
@@ -16,7 +16,6 @@ import { IPoll } from '../types';
  */
 type InputProps = {
     pollId: string;
-    setCreateMode: (mode: boolean) => void;
 };
 
 /*
@@ -27,10 +26,7 @@ export type AbstractProps = {
     checkBoxStates: boolean[];
     creatorName: string;
     poll: IPoll;
-    pollId: string;
-    sendPoll: () => void;
     setCheckbox: Function;
-    setCreateMode: (mode: boolean) => void;
     skipAnswer: () => void;
     skipChangeVote: () => void;
     submitAnswer: () => void;
@@ -46,23 +42,21 @@ export type AbstractProps = {
  */
 const AbstractPollAnswer = (Component: ComponentType<AbstractProps>) => (props: InputProps) => {
 
-    const { pollId, setCreateMode } = props;
+    const { pollId } = props;
 
     const conference: any = useSelector((state: IReduxState) => state['features/base/conference'].conference);
 
     const poll: IPoll = useSelector((state: IReduxState) => state['features/polls'].polls[pollId]);
 
-    const { answers, lastVote, question, senderId } = poll;
-
     const [ checkBoxStates, setCheckBoxState ] = useState(() => {
-        if (lastVote !== null) {
-            return [ ...lastVote ];
+        if (poll.lastVote !== null) {
+            return [ ...poll.lastVote ];
         }
 
-        return new Array(answers.length).fill(false);
+        return new Array(poll.answers.length).fill(false);
     });
 
-    const participantName = useBoundSelector(getParticipantDisplayName, senderId);
+    const participantName = useBoundSelector(getParticipantDisplayName, poll.senderId);
 
     const setCheckbox = useCallback((index, state) => {
         const newCheckBoxStates = [ ...checkBoxStates ];
@@ -87,21 +81,10 @@ const AbstractPollAnswer = (Component: ComponentType<AbstractProps>) => (props:
         return false;
     }, [ pollId, checkBoxStates, conference ]);
 
-    const sendPoll = useCallback(() => {
-        conference?.sendMessage({
-            type: COMMAND_NEW_POLL,
-            pollId,
-            question,
-            answers: answers.map(answer => answer.name)
-        });
-
-        dispatch(editPoll(pollId, false));
-
-    }, [ conference, question, answers ]);
-
     const skipAnswer = useCallback(() => {
         dispatch(registerVote(pollId, null));
         sendAnalytics(createPollEvent('vote.skipped'));
+
     }, [ pollId ]);
 
     const skipChangeVote = useCallback(() => {
@@ -114,10 +97,7 @@ const AbstractPollAnswer = (Component: ComponentType<AbstractProps>) => (props:
         checkBoxStates = { checkBoxStates }
         creatorName = { participantName }
         poll = { poll }
-        pollId = { pollId }
-        sendPoll = { sendPoll }
         setCheckbox = { setCheckbox }
-        setCreateMode = { setCreateMode }
         skipAnswer = { skipAnswer }
         skipChangeVote = { skipChangeVote }
         submitAnswer = { submitAnswer }

react/features/polls/components/AbstractPollCreate.tsx

@@ -1,16 +1,12 @@
-/* eslint-disable arrow-body-style */
-
-import React, { ComponentType, FormEvent, useCallback, useMemo, useState } from 'react';
+import React, { ComponentType, FormEvent, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
 
 import { createPollEvent } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';
 import { IReduxState } from '../../app/types';
-import { getLocalParticipant } from '../../base/participants/functions';
-import { savePoll } from '../actions';
+import { COMMAND_NEW_POLL } from '../constants';
 import { hasIdenticalAnswers } from '../functions';
-import { IAnswerData, IPoll } from '../types';
 
 /**
  * The type of the React {@code Component} props of inheriting component.
@@ -25,14 +21,12 @@ type InputProps = {
  **/
 export type AbstractProps = InputProps & {
     addAnswer: (index?: number) => void;
-    answers: Array<IAnswerData>;
-    editingPoll: IPoll | undefined;
-    editingPollId: string | undefined;
+    answers: Array<string>;
     isSubmitDisabled: boolean;
     onSubmit: (event?: FormEvent<HTMLFormElement>) => void;
     question: string;
     removeAnswer: (index: number) => void;
-    setAnswer: (index: number, value: IAnswerData) => void;
+    setAnswer: (index: number, value: string) => void;
     setQuestion: (question: string) => void;
     t: Function;
 };
@@ -50,45 +44,11 @@ const AbstractPollCreate = (Component: ComponentType<AbstractProps>) => (props:
 
     const { setCreateMode } = props;
 
-    const pollState = useSelector((state: IReduxState) => state['features/polls'].polls);
+    const [ question, setQuestion ] = useState('');
 
-    const editingPoll: [ string, IPoll ] | null = useMemo(() => {
-        if (!pollState) {
-            return null;
-        }
+    const [ answers, setAnswers ] = useState([ '', '' ]);
 
-        for (const key in pollState) {
-            if (pollState.hasOwnProperty(key) && pollState[key].editing) {
-                return [ key, pollState[key] ];
-            }
-        }
-
-        return null;
-    }, [ pollState ]);
-
-    const answerResults = useMemo(() => {
-        return editingPoll
-            ? editingPoll[1].answers
-            : [
-                {
-                    name: '',
-                    voters: []
-                },
-                {
-                    name: '',
-                    voters: []
-                } ];
-    }, [ editingPoll ]);
-
-    const questionResult = useMemo(() => {
-        return editingPoll ? editingPoll[1].question : '';
-    }, [ editingPoll ]);
-
-    const [ question, setQuestion ] = useState(questionResult);
-
-    const [ answers, setAnswers ] = useState(answerResults);
-
-    const setAnswer = useCallback((i: number, answer: IAnswerData) => {
+    const setAnswer = useCallback((i, answer) => {
         setAnswers(currentAnswers => {
             const newAnswers = [ ...currentAnswers ];
 
@@ -99,14 +59,10 @@ const AbstractPollCreate = (Component: ComponentType<AbstractProps>) => (props:
     }, [ answers ]);
 
     const addAnswer = useCallback((i?: number) => {
-        const newAnswers: Array<IAnswerData> = [ ...answers ];
+        const newAnswers = [ ...answers ];
 
         sendAnalytics(createPollEvent('option.added'));
-        newAnswers.splice(typeof i === 'number'
-            ? i : answers.length, 0, {
-            name: '',
-            voters: []
-        });
+        newAnswers.splice(typeof i === 'number' ? i : answers.length, 0, '');
         setAnswers(newAnswers);
     }, [ answers ]);
 
@@ -123,40 +79,23 @@ const AbstractPollCreate = (Component: ComponentType<AbstractProps>) => (props:
 
     const conference = useSelector((state: IReduxState) => state['features/base/conference'].conference);
 
-    const dispatch = useDispatch();
-
-    const pollId = Math.floor(Math.random() * Number.MAX_SAFE_INTEGER).toString(36);
-
-    const localParticipant = useSelector(getLocalParticipant);
-
     const onSubmit = useCallback(ev => {
         if (ev) {
             ev.preventDefault();
         }
 
-        const filteredAnswers = answers.filter(answer => answer.name.trim().length > 0);
+        const filteredAnswers = answers.filter(answer => answer.trim().length > 0);
 
         if (filteredAnswers.length < 2) {
             return;
         }
 
-        const poll = {
-            changingVote: false,
-            senderId: localParticipant?.id,
-            showResults: false,
-            lastVote: null,
+        conference?.sendMessage({
+            type: COMMAND_NEW_POLL,
+            pollId: Math.floor(Math.random() * Number.MAX_SAFE_INTEGER).toString(36),
             question,
-            answers: filteredAnswers,
-            saved: false,
-            editing: false
-        };
-
-        if (editingPoll) {
-            dispatch(savePoll(editingPoll[0], poll, true));
-        } else {
-            dispatch(savePoll(pollId, poll, true));
-        }
-
+            answers: filteredAnswers
+        });
         sendAnalytics(createPollEvent('created'));
 
         setCreateMode(false);
@@ -166,7 +105,7 @@ const AbstractPollCreate = (Component: ComponentType<AbstractProps>) => (props:
     // Check if the poll create form can be submitted i.e. if the send button should be disabled.
     const isSubmitDisabled
         = question.trim().length <= 0 // If no question is provided
-        || answers.filter(answer => answer.name.trim().length > 0).length < 2 // If not enough options are provided
+        || answers.filter(answer => answer.trim().length > 0).length < 2 // If not enough options are provided
         || hasIdenticalAnswers(answers); // If duplicate options are provided
 
     const { t } = useTranslation();
@@ -174,8 +113,6 @@ const AbstractPollCreate = (Component: ComponentType<AbstractProps>) => (props:
     return (<Component
         addAnswer = { addAnswer }
         answers = { answers }
-        editingPoll = { editingPoll?.[1] }
-        editingPollId = { editingPoll?.[0] }
         isSubmitDisabled = { isSubmitDisabled }
         onSubmit = { onSubmit }
         question = { question }

react/features/polls/components/AbstractPollResults.tsx

@@ -69,9 +69,9 @@ const AbstractPollResults = (Component: ComponentType<AbstractProps>) => (props:
         // Getting every voters ID that participates to the poll
         for (const answer of pollDetails.answers) {
             // checking if the voters is an array for supporting old structure model
-            const voters: string[] = answer.voters.length ? answer.voters : Object.keys(answer.voters);
+            const voters = answer.voters?.length ? answer.voters : Object.keys(answer.voters);
 
-            voters.forEach((voter: string) => allVoters.add(voter));
+            voters.forEach(voter => allVoters.add(voter));
         }
 
         return pollDetails.answers.map(answer => {