feat(security) enable CodeQL Analysis

Fixes issue #9435

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '45 20 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java', 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    #- name: Autobuild
+    #  uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

android/gradle.properties

@@ -25,5 +25,5 @@ android.enableDexingArtifactTransform.desugaring=false
 android.useAndroidX=true
 android.enableJetifier=true
 
-appVersion=21.2.0
-sdkVersion=3.7.0
+appVersion=21.3.0
+sdkVersion=3.8.0

android/sdk/build.gradle

@@ -70,11 +70,13 @@ dependencies {
     implementation project(':react-native-default-preference')
     implementation project(':react-native-immersive')
     implementation project(':react-native-keep-awake')
+    implementation project(':react-native-slider')
     implementation project(':react-native-sound')
+    implementation project(':react-native-splash-screen')
     implementation project(':react-native-svg')
+    implementation project(':react-native-video')
     implementation project(':react-native-webrtc')
     implementation project(':react-native-webview')
-    implementation project(':react-native-splash-screen')
 
     testImplementation 'junit:junit:4.12'
 }

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

@@ -40,10 +40,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
      * Room name.
      */
     private String room;
-    /**
-     * Conference subject.
-     */
-    private String subject;
     /**
      * JWT token used for authentication.
      */
@@ -54,19 +50,16 @@ public class JitsiMeetConferenceOptions implements Parcelable {
      */
     private Bundle colorScheme;
 
+    /**
+     * Config. See: https://github.com/jitsi/jitsi-meet/blob/master/config.js
+     */
+    private Bundle config;
+
     /**
      * Feature flags. See: https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/flags/constants.js
      */
     private Bundle featureFlags;
 
-    /**
-     * Set to {@code true} to join the conference with audio / video muted or to start in audio
-     * only mode respectively.
-     */
-    private Boolean audioMuted;
-    private Boolean audioOnly;
-    private Boolean videoMuted;
-
     /**
      * USer information, to be used when no token is specified.
      */
@@ -80,10 +73,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
         return room;
     }
 
-    public String getSubject() {
-        return subject;
-    }
-
     public String getToken() {
         return token;
     }
@@ -96,18 +85,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
         return featureFlags;
     }
 
-    public boolean getAudioMuted() {
-        return audioMuted;
-    }
-
-    public boolean getAudioOnly() {
-        return audioOnly;
-    }
-
-    public boolean getVideoMuted() {
-        return videoMuted;
-    }
-
     public JitsiMeetUserInfo getUserInfo() {
         return userInfo;
     }
@@ -118,19 +95,16 @@ public class JitsiMeetConferenceOptions implements Parcelable {
     public static class Builder {
         private URL serverURL;
         private String room;
-        private String subject;
         private String token;
 
         private Bundle colorScheme;
+        private Bundle config;
         private Bundle featureFlags;
 
-        private Boolean audioMuted;
-        private Boolean audioOnly;
-        private Boolean videoMuted;
-
         private JitsiMeetUserInfo userInfo;
 
         public Builder() {
+            config = new Bundle();
             featureFlags = new Bundle();
         }
 
@@ -162,7 +136,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
          * @return - The {@link Builder} object itself so the method calls can be chained.
          */
         public Builder setSubject(String subject) {
-            this.subject = subject;
+            setConfigOverride("subject", subject);
 
             return this;
         }
@@ -193,11 +167,11 @@ public class JitsiMeetConferenceOptions implements Parcelable {
 
         /**
          * Indicates the conference will be joined with the microphone muted.
-         * @param muted - Muted indication.
+         * @param audioMuted - Muted indication.
          * @return - The {@link Builder} object itself so the method calls can be chained.
          */
-        public Builder setAudioMuted(boolean muted) {
-            this.audioMuted = muted;
+        public Builder setAudioMuted(boolean audioMuted) {
+            setConfigOverride("startWithAudioMuted", audioMuted);
 
             return this;
         }
@@ -209,7 +183,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
          * @return - The {@link Builder} object itself so the method calls can be chained.
          */
         public Builder setAudioOnly(boolean audioOnly) {
-            this.audioOnly = audioOnly;
+            setConfigOverride("startAudioOnly", audioOnly);
 
             return this;
         }
@@ -219,7 +193,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
          * @return - The {@link Builder} object itself so the method calls can be chained.
          */
         public Builder setVideoMuted(boolean videoMuted) {
-            this.videoMuted = videoMuted;
+            setConfigOverride("startWithVideoMuted", videoMuted);
 
             return this;
         }
@@ -261,6 +235,36 @@ public class JitsiMeetConferenceOptions implements Parcelable {
             return this;
         }
 
+        public Builder setConfigOverride(String config, String value) {
+            this.config.putString(config, value);
+
+            return this;
+        }
+
+        public Builder setConfigOverride(String config, int value) {
+            this.config.putInt(config, value);
+
+            return this;
+        }
+
+        public Builder setConfigOverride(String config, boolean value) {
+            this.config.putBoolean(config, value);
+
+            return this;
+        }
+
+        public Builder setConfigOverride(String config, Bundle bundle) {
+            this.config.putBundle(config, bundle);
+
+            return this;
+        }
+
+        public Builder setConfigOverride(String config, String[] list) {
+            this.config.putStringArray(config, list);
+
+            return this;
+        }
+
         /**
          * Builds the immutable {@link JitsiMeetConferenceOptions} object with the configuration
          * that this {@link Builder} instance specified.
@@ -271,13 +275,10 @@ public class JitsiMeetConferenceOptions implements Parcelable {
 
             options.serverURL = this.serverURL;
             options.room = this.room;
-            options.subject = this.subject;
             options.token = this.token;
             options.colorScheme = this.colorScheme;
+            options.config = this.config;
             options.featureFlags = this.featureFlags;
-            options.audioMuted = this.audioMuted;
-            options.audioOnly = this.audioOnly;
-            options.videoMuted = this.videoMuted;
             options.userInfo = this.userInfo;
 
             return options;
@@ -290,17 +291,12 @@ public class JitsiMeetConferenceOptions implements Parcelable {
     private JitsiMeetConferenceOptions(Parcel in) {
         serverURL = (URL) in.readSerializable();
         room = in.readString();
-        subject = in.readString();
         token = in.readString();
         colorScheme = in.readBundle();
+        config = in.readBundle();
         featureFlags = in.readBundle();
         userInfo = new JitsiMeetUserInfo(in.readBundle());
         byte tmpAudioMuted = in.readByte();
-        audioMuted = tmpAudioMuted == 0 ? null : tmpAudioMuted == 1;
-        byte tmpAudioOnly = in.readByte();
-        audioOnly = tmpAudioOnly == 0 ? null : tmpAudioOnly == 1;
-        byte tmpVideoMuted = in.readByte();
-        videoMuted = tmpVideoMuted == 0 ? null : tmpVideoMuted == 1;
     }
 
     Bundle asProps() {
@@ -317,21 +313,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
             props.putBundle("colorScheme", colorScheme);
         }
 
-        Bundle config = new Bundle();
-
-        if (audioMuted != null) {
-            config.putBoolean("startWithAudioMuted", audioMuted);
-        }
-        if (audioOnly != null) {
-            config.putBoolean("startAudioOnly", audioOnly);
-        }
-        if (videoMuted != null) {
-            config.putBoolean("startWithVideoMuted", videoMuted);
-        }
-        if (subject != null) {
-            config.putString("subject", subject);
-        }
-
         Bundle urlProps = new Bundle();
 
         // The room is fully qualified
@@ -379,14 +360,11 @@ public class JitsiMeetConferenceOptions implements Parcelable {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeSerializable(serverURL);
         dest.writeString(room);
-        dest.writeString(subject);
         dest.writeString(token);
         dest.writeBundle(colorScheme);
+        dest.writeBundle(config);
         dest.writeBundle(featureFlags);
         dest.writeBundle(userInfo != null ? userInfo.asBundle() : new Bundle());
-        dest.writeByte((byte) (audioMuted == null ? 0 : audioMuted ? 1 : 2));
-        dest.writeByte((byte) (audioOnly == null ? 0 : audioOnly ? 1 : 2));
-        dest.writeByte((byte) (videoMuted == null ? 0 : videoMuted ? 1 : 2));
     }
 
     @Override

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

@@ -187,9 +187,11 @@ class ReactInstanceManagerHolder {
                 new com.ocetnik.timer.BackgroundTimerPackage(),
                 new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
                 new com.reactnativecommunity.netinfo.NetInfoPackage(),
+                new com.reactnativecommunity.slider.ReactSliderPackage(),
                 new com.reactnativecommunity.webview.RNCWebViewPackage(),
                 new com.rnimmersive.RNImmersivePackage(),
                 new com.zmxv.RNSound.RNSoundPackage(),
+                new com.brentvatne.react.ReactVideoPackage(),
                 new ReactPackageAdapter() {
                     @Override
                     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {

android/settings.gradle

@@ -19,13 +19,17 @@ include ':react-native-immersive'
 project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
 include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
+include ':react-native-slider'
+project(':react-native-slider').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/slider/android')
 include ':react-native-sound'
 project(':react-native-sound').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sound/android')
 include ':react-native-splash-screen'
 project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
 include ':react-native-svg'
 project(':react-native-svg').projectDir = new File(rootProject.projectDir, 	'../node_modules/react-native-svg/android')
+include ':react-native-video'
+project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android')
 include ':react-native-webrtc'
 project(':react-native-webrtc').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webrtc/android')
 include ':react-native-webview'
-project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
+project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')

conference.js

@@ -39,6 +39,7 @@ import {
     conferenceWillJoin,
     conferenceWillLeave,
     dataChannelOpened,
+    getConferenceOptions,
     kickedOut,
     lockStateChanged,
     onStartMutedPolicyChanged,
@@ -111,7 +112,6 @@ import {
     trackRemoved
 } from './react/features/base/tracks';
 import { downloadJSON } from './react/features/base/util/downloadJSON';
-import { getConferenceOptions } from './react/features/conference/functions';
 import { showDesktopPicker } from './react/features/desktop-picker';
 import { appendSuffix } from './react/features/display-name';
 import {
@@ -132,6 +132,7 @@ import { setScreenAudioShareState, isScreenAudioShared } from './react/features/
 import { toggleScreenshotCaptureEffect } from './react/features/screenshot-capture';
 import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/AudioMixerEffect';
 import { createPresenterEffect } from './react/features/stream-effects/presenter';
+import { createRnnoiseProcessor } from './react/features/stream-effects/rnnoise';
 import { endpointMessageReceived } from './react/features/subtitles';
 import UIEvents from './service/UI/UIEvents';
 
@@ -1357,7 +1358,11 @@ export default {
     },
 
     _getConferenceOptions() {
-        return getConferenceOptions(APP.store.getState());
+        const options = getConferenceOptions(APP.store.getState());
+
+        options.createVADProcessor = createRnnoiseProcessor;
+
+        return options;
     },
 
     /**

config.js

@@ -71,7 +71,10 @@ var config = {
     },
 
     // Enables reactions feature.
-    enableReactions: false,
+    // enableReactions: false,
+
+    // Disables polls feature.
+    // disablePolls: false,
 
     // Disables ICE/UDP by filtering out local and remote UDP candidates in
     // signalling.
@@ -144,6 +147,9 @@ var config = {
     // Sets the preferred resolution (height) for local video. Defaults to 720.
     // resolution: 720,
 
+    // Specifies whether there will be a search field in speaker stats or not
+    // disableSpeakerStatsSearch: false,
+
     // How many participants while in the tile view mode, before the receiving video quality is reduced from HD to SD.
     // Use -1 to disable.
     // maxFullResolutionParticipants: 2,
@@ -230,6 +236,17 @@ var config = {
     // subtitles and buttons can be configured)
     // transcribingEnabled: false,
 
+    // If true transcriber will use the application language.
+    // The application language is either explicitly set by participants in their settings or automatically
+    // detected based on the environment, e.g. if the app is opened in a chrome instance which is using french as its
+    // default language then transcriptions for that participant will be in french.
+    // Defaults to true.
+    // transcribeWithAppLanguage: true,
+
+    // Transcriber language. This settings will only work if "transcribeWithAppLanguage" is explicitly set to false.
+    // Available languages can be found in lang/language.json.
+    // preferredTranscribeLanguage: 'en',
+
     // Enables automatic turning on captions when recording is started
     // autoCaptionOnRecord: false,
 
@@ -462,11 +479,38 @@ var config = {
     // - 'desktop' controls the "Share your screen" button
     // - if `toolbarButtons` is undefined, we fallback to enabling all buttons on the UI
     // toolbarButtons: [
-    //    'microphone', 'camera', 'closedcaptions', 'desktop', 'embedmeeting', 'fullscreen',
-    //    'fodeviceselection', 'hangup', 'profile', 'participants-pane', 'chat', 'recording',
-    //    'livestreaming', 'etherpad', 'sharedvideo', 'shareaudio', 'settings', 'raisehand',
-    //    'videoquality', 'filmstrip', 'invite', 'feedback', 'stats', 'shortcuts',
-    //    'tileview', 'select-background', 'download', 'help', 'mute-everyone', 'mute-video-everyone', 'security'
+    //    'camera',
+    //    'chat',
+    //    'closedcaptions',
+    //    'desktop',
+    //    'download',
+    //    'embedmeeting',
+    //    'etherpad',
+    //    'feedback',
+    //    'filmstrip',
+    //    'fullscreen',
+    //    'hangup',
+    //    'help',
+    //    'invite',
+    //    'livestreaming',
+    //    'microphone',
+    //    'mute-everyone',
+    //    'mute-video-everyone',
+    //    'participants-pane',
+    //    'profile',
+    //    'raisehand',
+    //    'recording',
+    //    'security',
+    //    'select-background',
+    //    'settings',
+    //    'shareaudio',
+    //    'sharedvideo',
+    //    'shortcuts',
+    //    'stats',
+    //    'tileview',
+    //    'toggle-camera',
+    //    'videoquality',
+    //    '__end'
     // ],
 
     // Stats
@@ -486,6 +530,28 @@ var config = {
     // callStatsID: '',
     // callStatsSecret: '',
 
+    // The callstats initialize config params as described in the API:
+    // https://docs.callstats.io/docs/javascript#callstatsinitialize-with-app-secret
+    // callStatsConfigParams: {
+    //     disableBeforeUnloadHandler: true, // disables callstats.js's window.onbeforeunload parameter.
+    //     applicationVersion: "app_version", // Application version specified by the developer.
+    //     disablePrecalltest: true, // disables the pre-call test, it is enabled by default.
+    //     siteID: "siteID", // The name/ID of the site/campus from where the call/pre-call test is made.
+    //     additionalIDs: { // additionalIDs object, contains application related IDs.
+    //         customerID: "Customer Identifier. Example, walmart.",
+    //         tenantID: "Tenant Identifier. Example, monster.",
+    //         productName: "Product Name. Example, Jitsi.",
+    //         meetingsName: "Meeting Name. Example, Jitsi loves callstats.",
+    //         serverName: "Server/MiddleBox Name. Example, jvb-prod-us-east-mlkncws12.",
+    //         pbxID: "PBX Identifier. Example, walmart.",
+    //         pbxExtensionID: "PBX Extension Identifier. Example, 5625.",
+    //         fqExtensionID: "Fully qualified Extension Identifier. Example, +71 (US) +5625.",
+    //         sessionID: "Session Identifier. Example, session-12-34"
+    //     },
+    //     collectLegacyStats: true, //enables the collection of legacy stats in chrome browser
+    //     collectIP: true //enables the collection localIP address
+    // },
+
     // Enables sending participants' display names to callstats
     // enableDisplayNameInStats: false,
 
@@ -556,6 +622,9 @@ var config = {
     },
 
     analytics: {
+        // True if the analytics should be disabled
+        // disabled: false,
+
         // The Google Analytics Tracking ID:
         // googleAnalyticsTrackingId: 'your-tracking-id-UA-123456-1'
 

css/_chat.scss

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

css/_polls.scss

@@ -0,0 +1,448 @@
+.poll-dialog {
+    font-size: 1rem;
+
+    h1, span, li, strong {
+        color: #bce;
+    }
+    ol {
+        margin: 0;
+    }
+}
+
+.poll-question-field {
+    padding: 8px 16px;
+    padding-bottom: 24px;
+    border-bottom: 1px solid #525252;
+}
+
+.poll-header {
+    padding: 8px 16px;
+}
+
+.poll-answer-container{
+    padding: 8px;
+    background: #3D3D3D;
+    border-radius: 3px;
+    margin-bottom: 8px;
+}
+
+.poll-answer-field-list, .poll-answer-list, .poll-result-list {
+    list-style-type: none;
+    padding: 0 16px;
+    margin: 0;
+}
+
+ol.poll-result-list {
+    margin-bottom: 1.5em;
+}
+
+.poll-result-list > li {
+    margin-bottom: 8px;
+}
+
+.poll-answer-field {
+    flex-direction: column;
+    align-items: stretch;
+    margin-bottom: 16;
+
+}
+
+.poll-answer-field:last-child {
+    margin-bottom: 0;
+}
+
+.poll-create-option-row {
+    display: 'flex';
+    margin-bottom: 4;
+}
+
+// Needeed to override atlaskit default blue color
+.poll-create-container .jsYMHu {
+    background: #292929;
+    border-color: #808090;
+    color: white // #808090
+}
+
+.poll-add-button {
+    display: flex;
+    justify-content: center;
+    padding: 8px 16px;
+}
+
+.poll-remove-option-button {
+    background: 0 0;
+    border: none;
+    color: #8B8B8B;
+    padding-left: 0;
+}
+
+.poll-create-add-option {
+    border: none;
+    background-color: #292929;
+    padding: 3px;
+    width: 100%;
+}
+
+.poll-icon-button, .poll-drag-handle {
+    .jitsi-icon svg {
+        fill: #bce;
+    }
+}
+
+.poll-drag-handle {
+    background-color: transparent;
+    border: none;
+    cursor: grab;
+    padding-left: 8;
+    display: flex;
+}
+
+.poll-dragged {
+    opacity: 0.5;
+    * {
+        cursor: grabbing !important;
+    }
+}
+
+.poll-question {
+    font-size: 1.2em;
+    font-weight: 600;
+    margin-bottom: 0.5em;
+}
+
+.poll-answer-voters {
+    font-size: 1em;
+    font-weight: lighter;
+    list-style-type: none;
+    border: #616161 solid 1px;
+    border-radius: 3px;
+    padding: 2px 6px;
+    margin: 4px 0px 12px;
+    background-color: #616161;
+}
+
+.poll-answer-header {
+    display: flex;
+    justify-content: space-between;
+}
+
+.poll-answer-vote-name {
+    flex-shrink: 1;
+    overflow-wrap: anywhere
+}
+
+.poll-answer-vote-count-container{
+    display: flex;
+}
+
+.poll-answer-vote-count {
+    margin-left: 10px;
+    white-space: nowrap;
+    flex: 1;
+    text-align: right;
+}
+
+.poll-answer-short-results{
+    display: flex;
+    min-width: 10em;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.poll-bar-container, .poll-bar {
+    border-radius: 3px;
+    height: 6px;
+}
+
+.poll-bar-container {
+    background-color: #616161;
+    max-width: 160px;
+    margin-top: 3px;
+    flex: 1;
+}
+
+.poll-bar {
+    background-color: #246FE5;
+}
+
+.poll-message-footer {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 12px;
+    margin-top: 5px;
+}
+
+.poll-notice {
+    font-weight: 100;
+    margin-right: 10px;
+}
+
+.poll-show-details {
+    background-color: transparent;
+    border: none;
+
+    &:hover {
+        text-decoration: underline;
+    }
+}
+
+.poll-result-links {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
+a.poll-detail-link, a.poll-change-vote-link {
+    color: #246FE5;
+    cursor: pointer;
+    text-decoration: none;
+}
+
+.polls-pane-content {
+    display: flex;
+    flex-direction: column;
+    font-weight: 600;
+    height: 85%;
+    align-items: stretch;
+}
+
+.pane-content{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100%;
+}
+
+.empty-pane-icon {
+    width: 50%;
+    padding: 24px;
+}
+
+.empty-pane-icon svg {
+    fill: #3D3D3D;
+    width: 100%;
+    height: auto;
+}
+
+.empty-pane-message {
+    text-align: center;
+}
+
+.poll-results {
+    color: white;
+}
+
+.poll-answer {
+    h1, strong ,span {
+        color: white;
+    }
+}
+
+.poll-results, .poll-answer {
+    margin-bottom: 16px;
+    background: #292929;
+    border-radius: 8px;
+    padding: 12px 8px;
+    border-width: thin;
+    border-style: solid;
+    border-color: #616161;
+}
+
+.poll-create-label {
+    color: white;
+    margin-bottom: 4;
+    display: flex;
+}
+
+.expandable-input{
+    resize: none;
+    width: 100%;
+    height: 40px;
+    box-sizing: border-box;
+    overflow: hidden;
+    border: 1px solid #666666;
+    background-color: #141414;
+    color: #FFF;
+    border-radius: 6px;
+    padding: 10px 16px;
+}
+
+.poll-container {
+    box-sizing: border-box;
+    flex: 1;
+    overflow-y: auto;
+    position: relative;
+    padding: 16px;
+
+    & > * + *:not(.ignore-child) {
+        margin-top: 16px;
+    }
+
+    &::-webkit-scrollbar {
+        display: none;
+    }
+}
+
+.poll-create-header {
+    font-size: 20px;
+    margin: 20px 16px;
+    font-weight: 600;
+}
+
+.poll-create-container {
+    padding: 8px 0;
+}
+
+.poll-footer {
+    display: flex;
+    justify-content: flex-end;
+    padding: 8px 16px;
+    height: 40px;
+    align-items: stretch;
+
+    & > *:not(:last-child) {
+        margin-right: 16px;
+    }
+}
+
+.poll-primary-button {
+    align-items: center;
+    background-color: #0056E0;
+    border: 0;
+    border-radius: 6px;
+    display: flex;
+    font-weight: unset;
+    justify-content: center;
+    font-size: 15px;
+    flex: 1;
+
+    &:hover {
+        background-color: #246FE5;
+    }
+
+    &:active {
+        background-color: #0045B3;
+    }
+
+    &:focus {
+        background-color: #0045B3;
+        border: 3px solid #99BBF3;
+    }
+
+    &:disabled {
+        background-color: #00225A;
+        color: #858585;
+    }
+
+    & > *:not(:last-child) {
+        margin-right: 8px;
+    }
+}
+
+.poll-secondary-button {
+    align-items: center;
+    background-color: #3D3D3D;
+    border: 0;
+    border-radius: 6px;
+    display: flex;
+    font-weight: unset;
+    justify-content: center;
+    font-size: 15px;
+    height: 40px;
+    width: 100%;
+
+    &:hover {
+        background-color: #525252;
+    }
+
+    &:active {
+        background-color: #292929;
+    }
+
+    &:focus {
+        background-color: #292929;
+        border: 3px solid #858585;
+    }
+
+    &:disabled {
+        background-color: #141414;
+        color: #858585;
+    }
+
+    & > *:not(:last-child) {
+        margin-right: 8px;
+    }
+}
+
+.poll-small-primary-button {
+    align-items: center;
+    background-color: #0056E0;
+    border: 0;
+    border-radius: 6px;
+    display: flex;
+    font-weight: unset;
+    justify-content: center;
+    font-size: 15px;
+    height: 40px;
+    width: 50%;
+
+    &:hover {
+        background-color: #246FE5;
+    }
+
+    &:active {
+        background-color: #0045B3;
+    }
+
+    &:focus {
+        background-color: #0045B3;
+        border: 3px solid #99BBF3;
+    }
+
+    &:disabled {
+        background-color: #00225A;
+        color: #858585;
+    }
+
+    & > *:not(:last-child) {
+        margin-right: 8px;
+    }
+}
+
+.poll-small-secondary-button {
+    align-items: center;
+    background-color: #3D3D3D;
+    border: 0;
+    border-radius: 6px;
+    display: flex;
+    font-weight: unset;
+    justify-content: center;
+    font-size: 15px;
+    height: 40px;
+    width: 50%;
+
+    &:hover {
+        background-color: #525252;
+    }
+
+    &:active {
+        background-color: #292929;
+    }
+
+    &:focus {
+        background-color: #292929;
+        border: 3px solid #858585;
+    }
+
+    &:disabled {
+        background-color: #141414;
+        color: #858585;
+    }
+
+    & > *:not(:last-child) {
+        margin-right: 8px;
+    }
+}

css/main.scss

@@ -108,5 +108,6 @@ $flagsImagePath: "../images/";
 @import 'participants-pane';
 @import 'reactions-menu';
 @import 'plan-limit';
+@import 'polls';
 
 /* Modules END */

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

@@ -14,11 +14,7 @@
     .virtual-background-none:hover {
         opacity: 0.5;
         border: 2px solid #99bbf3;
-        @media (min-width: 432px) and (min-width: 432px) and (max-width: 632px) {
-            height: 60px;
-            width: 60px;
-        }
-        @media (max-width: 432px) {
+        @media (max-width: 632px) {
             height: 60px;
             width: 60px;
         }
@@ -87,7 +83,7 @@
         padding: 0 10px;
     }
 
-    @media (min-width: 432px) and (max-width: 632px) {
+    @media (max-width: 632px) {
         font-size: 1.5vw;
         .desktop-share,
         .virtual-background-none,
@@ -106,29 +102,8 @@
             width: 60px;
         }
     }
-    @media (max-width: 432px) {
+    @media (max-width: 360px) {
         grid-template-columns: auto auto auto;
-        font-size: 1.5vw;
-        .desktop-share,
-        .virtual-background-none,
-        .thumbnail,
-        .blur,
-        .slight-blur {
-            height: 60px;
-            width: 60px;
-        }
-        .desktop-share-selected,
-        .thumbnail-selected,
-        .none-selected,
-        .blur-selected,
-        .slight-blur-selected {
-            height: 60px;
-            width: 60px;
-        }
-    }
-    @media (max-width: 320px) {
-        grid-template-columns: auto auto auto;
-        font-size: 1.5vw;
     }
 }
 
@@ -163,7 +138,7 @@
     display: none;
     left: 96;
     bottom: 51;
-    @media (min-width: 432px) and (max-width: 632px) {
+    @media (max-width: 632px) {
         left: 51px;
     }
 }
@@ -196,10 +171,7 @@
     width: 570px;
     margin-bottom: 8px;
     z-index: 2;
-    @media (min-width: 432px) and (max-width: 632px) {
-        max-width: 336;
-    }
-    @media (max-width: 432px) {
+    @media (max-width: 632px) {
         max-width: 336;
     }
 }

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

@@ -65,6 +65,7 @@ Component "conference.jitmeet.example.com" "muc"
     modules_enabled = {
         "muc_meeting_id";
         "muc_domain_mapper";
+        "polls";
         --"token_verification";
     }
     admins = { "focusUser@auth.jitmeet.example.com" }

interface_config.js

@@ -208,13 +208,7 @@ var interfaceConfig = {
      * DEPRECATED!
      * This config was moved to config.js as `toolbarButtons`.
      */
-    // TOOLBAR_BUTTONS: [
-    //     'microphone', 'camera', 'closedcaptions', 'desktop', 'embedmeeting', 'fullscreen',
-    //     'fodeviceselection', 'hangup', 'profile', 'chat', 'recording',
-    //     'livestreaming', 'etherpad', 'sharedvideo', 'settings', 'raisehand',
-    //     'videoquality', 'filmstrip', 'invite', 'feedback', 'stats', 'shortcuts',
-    //     'tileview', 'select-background', 'download', 'help', 'mute-everyone', 'mute-video-everyone', 'security'
-    // ],
+    // TOOLBAR_BUTTONS: [],
 
     TOOLBAR_TIMEOUT: 4000,
 

ios/Podfile

@@ -60,6 +60,7 @@ target 'JitsiMeetSDK' do
   pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
   pod 'react-native-slider', :path => '../node_modules/@react-native-community/slider'
   pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
+  pod 'react-native-video', :path => '../node_modules/react-native-video/react-native-video.podspec'
   pod 'react-native-webview', :path => '../node_modules/react-native-webview'
   pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
   pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-async-storage/async-storage'

ios/Podfile.lock

@@ -288,7 +288,12 @@ PODS:
     - React
   - react-native-splash-screen (3.2.0):
     - React
-  - react-native-webrtc (1.89.1):
+  - react-native-video (5.1.1):
+    - React-Core
+    - react-native-video/Video (= 5.1.1)
+  - react-native-video/Video (5.1.1):
+    - React-Core
+  - react-native-webrtc (1.92.0):
     - React-Core
   - react-native-webview (11.0.2):
     - React-Core
@@ -346,8 +351,8 @@ PODS:
     - React-jsi (= 0.61.5-jitsi.2)
     - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
     - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
-  - RNCAsyncStorage (1.13.2):
-    - React
+  - RNCAsyncStorage (1.15.5):
+    - React-Core
   - RNDefaultPreference (1.4.2):
     - React
   - RNDeviceInfo (8.0.0):
@@ -394,6 +399,7 @@ DEPENDENCIES:
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
   - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
+  - react-native-video (from `../node_modules/react-native-video/react-native-video.podspec`)
   - react-native-webrtc (from `../node_modules/react-native-webrtc`)
   - react-native-webview (from `../node_modules/react-native-webview`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -478,6 +484,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/slider"
   react-native-splash-screen:
     :path: "../node_modules/react-native-splash-screen"
+  react-native-video:
+    :path: "../node_modules/react-native-video/react-native-video.podspec"
   react-native-webrtc:
     :path: "../node_modules/react-native-webrtc"
   react-native-webview:
@@ -559,7 +567,8 @@ SPEC CHECKSUMS:
   react-native-netinfo: 8d8db463bcc5db66a8ac5c48a7d86beb3b92f61a
   react-native-slider: b733e17fdd31186707146debf1f04b5d94aa1a93
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-webrtc: ccb0c21eb4fb04326648fbdb4a5d49977e2cf274
+  react-native-video: 1574074179ecaf6a9dd067116c8f31bf9fec15c8
+  react-native-webrtc: bbb644859dcc37ccb7edaec860ca62ed47bf996c
   react-native-webview: b2542d6fd424bcc3e3b2ec5f854f0abb4ec86c87
   React-RCTActionSheet: bcbc311dc3b47bc8efb2737ff0940239a45789a9
   React-RCTAnimation: 65f61080ce632f6dea23d52e354ffac9948396c6
@@ -571,7 +580,7 @@ SPEC CHECKSUMS:
   React-RCTText: 4f1b99f228278d2a5e9008eced8dc9c974c4a270
   React-RCTVibration: c1041024893fdfdb8371e7c720c437751b711676
   ReactCommon: 18014e1d98dbeb9141e935cfe35fc93bd511ffb6
-  RNCAsyncStorage: bc2f81cc1df90c267ce9ed30bb2dbc93b945a8ee
+  RNCAsyncStorage: 8324611026e8dc3706f829953aa6e3899f581589
   RNDefaultPreference: 56a405ce61033ac77b95004dccd7ac54c2eb50d1
   RNDeviceInfo: 72ded653ce636b3f03571e90bed99309a714944e
   RNGoogleSignin: 39336070b35fc4cea6a98cf111e00480317be0ae
@@ -580,6 +589,6 @@ SPEC CHECKSUMS:
   RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
   Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
 
-PODFILE CHECKSUM: 1fa5a1e259f145d32c1ca968b26dac65cff34b49
+PODFILE CHECKSUM: f4db44d934caeae7212dbaa33abe62ed164363e8
 
 COCOAPODS: 1.10.1

ios/app/broadcast-extension/Info.plist

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

ios/app/src/Info.plist

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

ios/app/watchos/app/Info.plist

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

ios/app/watchos/extension/Info.plist

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

ios/sdk/src/Info.plist

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

ios/sdk/src/JitsiMeet.h

@@ -59,6 +59,16 @@
 
 #pragma mark - Utility methods
 
+/**
+ * Once  the react native bridge is destroyed you are responsible for reinstantiating it back. Use this method to do so.
+ */
+- (void)instantiateReactNativeBridge;
+
+/**
+ * Helper method to destroy the react native bridge, cleaning up resources in the process. Once the react native bridge is destroyed you are responsible for reinstantiating it back using `instantiateReactNativeBridge` method.
+ */
+- (void)destroyReactNativeBridge;
+
 - (JitsiMeetConferenceOptions *_Nonnull)getInitialConferenceOptions;
 
 - (BOOL)isCrashReportingDisabled;

ios/sdk/src/JitsiMeet.m

@@ -28,7 +28,6 @@
 #import <RNGoogleSignin/RNGoogleSignin.h>
 #import <WebRTC/RTCLogging.h>
 
-
 @implementation JitsiMeet {
     RCTBridgeWrapper *_bridgeWrapper;
     NSDictionary *_launchOptions;
@@ -50,7 +49,7 @@
 
 - (instancetype)init {
     if (self = [super init]) {
-        // Initialize the on and only bridge for interfacing with React Native.
+        // Initialize the one and only bridge for interfacing with React Native.
         _bridgeWrapper = [[RCTBridgeWrapper alloc] init];
         
         // Initialize the listener for handling start/stop screensharing notifications.
@@ -119,6 +118,18 @@
 
 #pragma mark - Utility methods
 
+- (void)instantiateReactNativeBridge {
+    if (_bridgeWrapper != nil) {
+        return;
+    };
+    
+    _bridgeWrapper = [[RCTBridgeWrapper alloc] init];
+}
+
+- (void)destroyReactNativeBridge {
+    _bridgeWrapper = nil;
+}
+
 - (JitsiMeetConferenceOptions *)getInitialConferenceOptions {
     if (_launchOptions[UIApplicationLaunchOptionsURLKey]) {
         NSURL *url = _launchOptions[UIApplicationLaunchOptionsURLKey];

ios/sdk/src/JitsiMeetConferenceOptions.h

@@ -29,10 +29,6 @@
  * Room name.
  */
 @property (nonatomic, copy, nullable) NSString *room;
-/**
- * Conference subject.
- */
-@property (nonatomic, copy, nullable) NSString *subject;
 /**
  * JWT token used for authentication.
  */
@@ -49,13 +45,7 @@
  */
 @property (nonatomic, readonly, nonnull) NSDictionary *featureFlags;
 
-/**
- * Set to YES to join the conference with audio / video muted or to start in audio
- * only mode respectively.
- */
-@property (nonatomic) BOOL audioOnly;
-@property (nonatomic) BOOL audioMuted;
-@property (nonatomic) BOOL videoMuted;
+@property (nonatomic, readonly, nonnull) NSDictionary *config;
 
 /**
  * Set to YES to enable the welcome page. Typically SDK users won't need this enabled
@@ -71,15 +61,17 @@
 - (void)setFeatureFlag:(NSString *_Nonnull)flag withBoolean:(BOOL)value;
 - (void)setFeatureFlag:(NSString *_Nonnull)flag withValue:(id _Nonnull)value;
 
-/**
- * CallKit call handle, to be used when implementing incoming calls.
- */
-@property (nonatomic, copy, nullable) NSString *callHandle;
+- (void)setConfigOverride:(NSString *_Nonnull)config withBoolean:(BOOL)value;
+- (void)setConfigOverride:(NSString *_Nonnull)config withValue:(id _Nonnull)value;
+- (void)setConfigOverride:(NSString *_Nonnull)config withDictionary:(NSDictionary * _Nonnull)dictionary;
+- (void)setConfigOverride:(NSString *_Nonnull)config withArray:( NSArray * _Nonnull)array;
 
-/**
- * CallKit call UUID, to be used when implementing incoming calls.
- */
-@property (nonatomic, copy, nullable) NSUUID *callUUID;
+- (void)setAudioOnly:(BOOL)audioOnly;
+- (void)setAudioMuted:(BOOL)audioMuted;
+- (void)setVideoMuted:(BOOL)videoMuted;
+- (void)setCallHandle:(NSString *_Nonnull)callHandle;
+- (void)setCallUUID:(NSUUID *_Nonnull)callUUID;
+- (void)setSubject:(NSString *_Nonnull)subject;
 
 @end
 
@@ -88,23 +80,15 @@
 @property (nonatomic, copy, nullable, readonly) NSURL *serverURL;
 
 @property (nonatomic, copy, nullable, readonly) NSString *room;
-@property (nonatomic, copy, nullable, readonly) NSString *subject;
 @property (nonatomic, copy, nullable, readonly) NSString *token;
 
 @property (nonatomic, copy, nullable) NSDictionary *colorScheme;
 @property (nonatomic, readonly, nonnull) NSDictionary *featureFlags;
 
-@property (nonatomic, readonly) BOOL audioOnly;
-@property (nonatomic, readonly) BOOL audioMuted;
-@property (nonatomic, readonly) BOOL videoMuted;
-
 @property (nonatomic, readonly) BOOL welcomePageEnabled;
 
 @property (nonatomic, nullable) JitsiMeetUserInfo *userInfo;
 
-@property (nonatomic, copy, nullable, readonly) NSString *callHandle;
-@property (nonatomic, copy, nullable, readonly) NSUUID *callUUID;
-
 + (instancetype _Nonnull)fromBuilder:(void (^_Nonnull)(JitsiMeetConferenceOptionsBuilder *_Nonnull))initBlock;
 - (instancetype _Nonnull)init NS_UNAVAILABLE;
 

ios/sdk/src/JitsiMeetConferenceOptions.m

@@ -26,35 +26,23 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
 
 
 @implementation JitsiMeetConferenceOptionsBuilder {
-    NSNumber *_audioOnly;
-    NSNumber *_audioMuted;
-    NSNumber *_videoMuted;
     NSMutableDictionary *_featureFlags;
+    NSMutableDictionary *_config;
 }
 
-@dynamic audioOnly;
-@dynamic audioMuted;
-@dynamic videoMuted;
 @dynamic welcomePageEnabled;
 
 - (instancetype)init {
     if (self = [super init]) {
         _serverURL = nil;
         _room = nil;
-        _subject = nil;
         _token = nil;
 
         _colorScheme = nil;
+        _config = [[NSMutableDictionary alloc] init];
         _featureFlags = [[NSMutableDictionary alloc] init];
 
-        _audioOnly = nil;
-        _audioMuted = nil;
-        _videoMuted = nil;
-
         _userInfo = nil;
-
-        _callHandle = nil;
-        _callUUID = nil;
     }
     
     return self;
@@ -68,32 +56,48 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
     _featureFlags[flag] = value;
 }
 
-#pragma mark - Dynamic properties
-
 - (void)setAudioOnly:(BOOL)audioOnly {
-    _audioOnly = [NSNumber numberWithBool:audioOnly];
-}
-
-- (BOOL)audioOnly {
-    return _audioOnly && [_audioOnly boolValue];
+    [self setConfigOverride:@"startAudioOnly" withBoolean:audioOnly];
 }
 
 - (void)setAudioMuted:(BOOL)audioMuted {
-    _audioMuted = [NSNumber numberWithBool:audioMuted];
-}
-
-- (BOOL)audioMuted {
-    return _audioMuted && [_audioMuted boolValue];
+    [self setConfigOverride:@"startWithAudioMuted" withBoolean:audioMuted];
 }
 
 - (void)setVideoMuted:(BOOL)videoMuted {
-    _videoMuted = [NSNumber numberWithBool:videoMuted];
+    [self setConfigOverride:@"startWithVideoMuted" withBoolean:videoMuted];
 }
 
-- (BOOL)videoMuted {
-    return _videoMuted && [_videoMuted boolValue];
+- (void)setCallHandle:(NSString *_Nonnull)callHandle {
+    [self setConfigOverride:@"callHandle" withValue:callHandle];
 }
 
+- (void)setCallUUID:(NSUUID *_Nonnull)callUUID {
+    [self setConfigOverride:@"callUUID" withValue:[callUUID UUIDString]];
+}
+
+- (void)setSubject:(NSString *_Nonnull)subject {
+    [self setConfigOverride:@"subject" withValue:subject];
+}
+
+- (void)setConfigOverride:(NSString *_Nonnull)config withBoolean:(BOOL)value {
+    [self setConfigOverride:config withValue:[NSNumber numberWithBool:value]];
+}
+
+- (void)setConfigOverride:(NSString *_Nonnull)config withDictionary:(NSDictionary*)dictionary {
+    _config[config] = dictionary;
+}
+
+- (void)setConfigOverride:(NSString *_Nonnull)config withArray:( NSArray * _Nonnull)array {
+    _config[config] = array;
+}
+
+- (void)setConfigOverride:(NSString *_Nonnull)config withValue:(id _Nonnull)value {
+    _config[config] = value;
+}
+
+#pragma mark - Dynamic properties
+
 - (void)setWelcomePageEnabled:(BOOL)welcomePageEnabled {
     [self setFeatureFlag:WelcomePageEnabledFeatureFlag
                withBoolean:welcomePageEnabled];
@@ -105,48 +109,17 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
     return n != nil ? [n boolValue] : NO;
 }
 
-#pragma mark - Private API
-
-- (NSNumber *)getAudioOnly {
-    return _audioOnly;
-}
-
-- (NSNumber *)getAudioMuted {
-    return _audioMuted;
-}
-
-- (NSNumber *)getVideoMuted {
-    return _videoMuted;
-}
-
 @end
 
 @implementation JitsiMeetConferenceOptions {
-    NSNumber *_audioOnly;
-    NSNumber *_audioMuted;
-    NSNumber *_videoMuted;
     NSDictionary *_featureFlags;
+    NSDictionary *_config;
 }
 
-@dynamic audioOnly;
-@dynamic audioMuted;
-@dynamic videoMuted;
 @dynamic welcomePageEnabled;
 
 #pragma mark - Dynamic properties
 
-- (BOOL)audioOnly {
-    return _audioOnly && [_audioOnly boolValue];
-}
-
-- (BOOL)audioMuted {
-    return _audioMuted && [_audioMuted boolValue];
-}
-
-- (BOOL)videoMuted {
-    return _videoMuted && [_videoMuted boolValue];
-}
-
 - (BOOL)welcomePageEnabled {
     NSNumber *n = _featureFlags[WelcomePageEnabledFeatureFlag];
 
@@ -159,21 +132,15 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
     if (self = [super init]) {
         _serverURL = builder.serverURL;
         _room = builder.room;
-        _subject = builder.subject;
         _token = builder.token;
 
         _colorScheme = builder.colorScheme;
 
-        _audioOnly = [builder getAudioOnly];
-        _audioMuted = [builder getAudioMuted];
-        _videoMuted = [builder getVideoMuted];
+        _config = builder.config;
 
         _featureFlags = [NSDictionary dictionaryWithDictionary:builder.featureFlags];
 
         _userInfo = builder.userInfo;
-
-        _callHandle = builder.callHandle;
-        _callUUID = builder.callUUID;
     }
 
     return self;
@@ -198,26 +165,6 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
         props[@"colorScheme"] = self.colorScheme;
     }
 
-    NSMutableDictionary *config = [[NSMutableDictionary alloc] init];
-    if (_audioOnly != nil) {
-        config[@"startAudioOnly"] = @(self.audioOnly);
-    }
-    if (_audioMuted != nil) {
-        config[@"startWithAudioMuted"] = @(self.audioMuted);
-    }
-    if (_videoMuted != nil) {
-        config[@"startWithVideoMuted"] = @(self.videoMuted);
-    }
-    if (_subject != nil) {
-        config[@"subject"] = self.subject;
-    }
-    if (_callHandle != nil) {
-        config[@"callHandle"] = self.callHandle;
-    }
-    if (_callUUID != nil) {
-        config[@"callUUID"] = [self.callUUID UUIDString];
-    }
-
     NSMutableDictionary *urlProps = [[NSMutableDictionary alloc] init];
 
     // The room is fully qualified.
@@ -241,7 +188,7 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
         props[@"userInfo"] = [self.userInfo asDict];
     }
 
-    urlProps[@"config"] = config;
+    urlProps[@"config"] = _config;
     props[@"url"] = urlProps;
 
     return props;

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

@@ -144,7 +144,6 @@ public class PiPViewCoordinator {
     /// screen size changes
     public func resetBounds(bounds: CGRect) {
         currentBounds = bounds
-        exitPictureInPicture()
     }
 
     /// Stop the dragging gesture of the root view

lang/main-bg.json

@@ -586,6 +586,7 @@
     },
     "speaker": "Говорещ",
     "speakerStats": {
+        "search": "Търсене",
         "hours": "{{count}}ч",
         "minutes": "{{count}}мин",
         "name": "Име",

lang/main-de.json

@@ -24,7 +24,7 @@
         "shareInvite": "Einladung zur Versammlung teilen",
         "shareLink": "Teilen Sie den Konferenzlink, um andere einzuladen",
         "shareStream": "Den Livestreaminglink freigeben",
-        "sip": "SIP: {{address}}",
+        "sipAddresses": "SIP-Adressen",
         "telephone": "Telefon: {{number}}",
         "title": "Personen zu dieser Konferenz einladen",
         "yahooEmail": "Yahoo-E-Mail"
@@ -215,6 +215,7 @@
         "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",
+        "hideShareAudioHelper": "Diese Meldung nicht mehr anzeigen",
         "IamHost": "Ich leite das Meeting",
         "incorrectRoomLockPassword": "Falsches Passwort",
         "incorrectPassword": "Name oder Passwort ungültig",
@@ -257,16 +258,21 @@
         "muteParticipantBody": "Sie können die Stummschaltung anderer Personen nicht aufheben, aber eine Person kann ihre eigene Stummschaltung jederzeit beenden.",
         "muteParticipantButton": "Stummschalten",
         "muteParticipantDialog": "Wollen Sie diese Person wirklich stummschalten? Sie können die Stummschaltung nicht wieder aufheben, die Person kann dies aber jederzeit selbst tun.",
+        "muteParticipantsVideoDialog": "Wollen Sie die Kamera dieser Person wirklich deaktivieren? Sie können die Kamera nicht wieder aktivieren, die Person kann dies aber jederzeit selbst tun.",
         "muteParticipantTitle": "Person stummschalten?",
         "muteParticipantsVideoButton": "Kamera ausschalten",
         "muteParticipantsVideoTitle": "Die Kamera von dieser Person ausschalten?",
         "muteParticipantsVideoBody": "Sie können die Kamera nicht wieder aktivieren, die Teilnehmer können dies aber jederzeit wieder ändern.",
+        "noDropboxToken": "Kein gültiges Dropbox-Token",
         "Ok": "OK",
         "password": "Passwort",
         "passwordLabel": "Dieses Meeting wurde gesichert. Bitte geben Sie das $t(lockRoomPasswordUppercase) ein, um dem Meeting beizutreten.",
         "passwordNotSupported": "Das Festlegen eines Konferenzpassworts wird nicht unterstützt.",
         "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) nicht unterstützt",
         "passwordRequired": "$t(lockRoomPasswordUppercase) erforderlich",
+        "permissionErrorTitle": "Berechtigung benötigt",
+        "permissionCameraRequiredError": "Der Zugriff auf die Kamera wird benötigt, um in Videokonferenzen teilzunehmen. Bitte in den Einstellungen zulassen",
+        "permissionMicRequiredError": "Der Zugriff auf das Mikrofon wird benötigt, um an Konferenzen mit Ton teilzunehmen. Bitte in den Einstellungen zulassen",
         "popupError": "Ihr Browser blockiert Pop-ups von dieser Website. Bitte aktivieren Sie Pop-ups in den Sicherheitseinstellungen des Browsers und versuchen Sie es erneut.",
         "popupErrorTitle": "Pop-up blockiert",
         "readMore": "mehr",
@@ -300,6 +306,13 @@
         "sessTerminated": "Konferenz beendet",
         "sessionRestarted": "Konferenz neugestartet",
         "Share": "Teilen",
+        "shareAudio": "Fortfahren",
+        "shareAudioTitle" : "Wie kann Audio geteilt werden",
+        "shareAudioWarningTitle": "Sie müssen die Bildschirmfreigabe ausschalten, bevor Sie Audio teilen können",
+        "shareAudioWarningH1": "Wenn Sie Ihr Audio teilen wollen:",
+        "shareAudioWarningD1": "müssen Sie Ihre Bildschirmfreigabe stoppen, bevor Sie Audio teilen können.",
+        "shareAudioWarningD2": "müssen Sie Ihre Bildschirmfreigabe neustarten und die Option \"Audio freigeben\" auswählen.",
+        "shareMediaWarningGenericH2": "Wenn Sie Ihren Bildschirm und Audio teilen wollen",
         "shareVideoLinkError": "Bitte einen gültigen YouTube-Link angeben.",
         "shareVideoTitle": "Video teilen",
         "shareYourScreen": "Bildschirmfreigabe ein-/ausschalten",
@@ -307,6 +320,10 @@
         "startLiveStreaming": "Livestream starten",
         "startRecording": "Aufnahme starten",
         "startRemoteControlErrorMessage": "Beim Versuch, die Fernsteuerung zu starten, ist ein Fehler aufgetreten!",
+        "shareScreenWarningTitle": "Sie müssen die Audiofreigabe beenden, bevor Sie den Bildschirm freigeben können",
+        "shareScreenWarningH1": "Wenn Sie Ihren Bildschirm freigeben wollen:",
+        "shareScreenWarningD1": "müssen Sie Ihre Audiofreigabe stoppen, bevor Sie ihren Bildschirm freigeben.",
+        "shareScreenWarningD2": "müssen Sie Ihre Audiofreigabe stoppen und dann die Bildschirmfreigabe mit der Option \"Audio freigeben\" starten.",
         "stopLiveStreaming": "Livestream stoppen",
         "stopRecording": "Aufnahme stoppen",
         "stopRecordingWarning": "Sind Sie sicher, dass Sie die Aufnahme stoppen möchten?",
@@ -323,6 +340,9 @@
         "userIdentifier": "Benutzername",
         "userPassword": "Passwort",
         "videoLink": "Video-Link",
+        "viewUpgradeOptions": "Upgradeoptionen anzeigen",
+        "viewUpgradeOptionsContent": "Sie müssen Ihren Tarif erweitern, um Premium-Features wie Aufnahme, Transkription, RTMP-Streaming und mehr zu nutzen.",
+        "viewUpgradeOptionsTitle": "Sie haben ein Premium-Feature entdeckt!",
         "WaitForHostMsg": "Die Konferenz <b>{{room}}</b> wurde noch nicht gestartet. Falls Sie die Konferenz leiten, authentifizieren Sie sich bitte. Warten Sie andernfalls, bis die Konferenz gestartet wird.",
         "WaitForHostMsgWOk": "Die Konferenz <b>{{room}}</b> wurde noch nicht gestartet. Falls Sie die Konferenz leiten, authentifizieren Sie sich bitte. Warten Sie andernfalls, bis die Konferenz gestartet wird.",
         "WaitingForHostTitle": "Warten auf den Beginn der Konferenz …",
@@ -349,7 +369,6 @@
         "blur": "Hintergrund unscharf",
         "slightBlur": "Hintergrund leicht unscharf",
         "removeBackground": "Hintergrund entfernen",
-        "uploadImage": "Bild hochladen",
         "addBackground": "Hintergrund hinzufügen",
         "pleaseWait": "Bitte warten...",
         "none": "keiner",
@@ -363,7 +382,8 @@
         "image6" : "Wald",
         "image7" : "Sonnenaufgang",
         "desktopShareError": "Desktop konnte nicht freigegeben werden",
-        "desktopShare":"Desktopfreigabe"
+        "desktopShare": "Desktopfreigabe",
+        "webAssemblyWarning": "WebAssembly wird nicht unterstützt"
     },
     "feedback": {
         "average": "Durchschnittlich",
@@ -400,6 +420,10 @@
         "invitePhone": "Wenn Sie stattdessen per Telefon beitreten möchten, wählen sie: {{number}},,{{conferenceID}}#\n",
         "invitePhoneAlternatives": "Suchen Sie nach einer anderen Einwahlnummer ?\nEinwahlnummern der Konferenz anzeigen: {{url}}\n\n\nWenn Sie sich auch über ein Raumtelefon einwählen, nehmen Sie teil, ohne sich mit dem Ton zu verbinden: {{silentUrl}}",
         "inviteSipEndpoint": "Um mit SIP teilzunehmen, folgende Adresse nutzen: {{sipUri}}",
+        "inviteTextiOSPersonal": "{{name}} lädt Sie zu einem Meeting ein.",
+        "inviteTextiOSJoinSilent": "Wenn Sie über ein Konferenztelefon teilnehmen, können Sie diesen Link nutzen um ohne Ton an der Konferenz teilzunehmen: {{silentUrl}}.",
+        "inviteTextiOSInviteUrl": "Am Meeting teilnehmen: {{inviteUrl}}.",
+        "inviteTextiOSPhone": "Nutzen Sie folgende Nummer um via Telefon teilzunehmen: {{number}},,{{conferenceID}}#. Wenn Sie nach einer anderen Einwahlnummer suchen, finden Sie die vollständige Liste hier: {{didUrl}}.",
         "inviteURLFirstPartGeneral": "Sie wurden zur Teilnahme an einem Meeting eingeladen.",
         "inviteURLFirstPartPersonal": "{{name}} lädt Sie zu einem Meeting ein.\n",
         "inviteURLSecondPart": "\nAm Meeting teilnehmen:\n{{url}}\n",
@@ -410,6 +434,7 @@
         "noRoom": "Keine Konferenz für die Einwahlinformationen angegeben.",
         "numbers": "Einwahlnummern",
         "password": "$t(lockRoomPasswordUppercase):",
+        "sip": "SIP-Adresse",
         "title": "Teilen",
         "tooltip": "Freigabe-Link und Einwahlinformationen für dieses Meeting",
         "label": "Einwahlinformationen"
@@ -520,6 +545,7 @@
         "focus": "Konferenzleitung",
         "focusFail": "{{component}} ist im Moment nicht verfügbar – wiederholen in {{ms}} Sekunden",
         "grantedTo": "Moderationsrechte an {{to}} vergeben!",
+        "hostAskedUnmute": "Die Moderation bittet Sie, das Mikrofon zu aktivieren",
         "invitedOneMember": "{{name}} wurde eingeladen",
         "invitedThreePlusMembers": "{{name}} und {{count}} andere wurden eingeladen",
         "invitedTwoMembers": "{{first}} und {{second}} wurden eingeladen",
@@ -535,7 +561,7 @@
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) von einer anderen Person entfernt",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) von einer anderen Person gesetzt",
         "raisedHand": "{{name}} möchte sprechen.",
-        "screenShareNoAudio": " Share audio box was not checked in the window selection screen.",
+        "screenShareNoAudio": "Die Option \"Audio freigeben\" wurde bei der Auswahl des Fensters nicht ausgewählt.",
         "screenShareNoAudioTitle": "Share audio was not checked",
         "somebody": "Jemand",
         "startSilentTitle": "Sie sind ohne Audioausgabe beigetreten!",
@@ -550,28 +576,40 @@
         "oldElectronClientDescription1": "Sie scheinen eine alte Version des Jitsi-Meet-Clients zu nutzen. Diese hat bekannte Schwachstellen. Bitte aktualisieren Sie auf unsere ",
         "oldElectronClientDescription2": "aktuelle Version",
         "oldElectronClientDescription3": "!",
+        "moderationInEffectDescription": "Bitte melden um zu sprechen",
+        "moderationInEffectCSDescription": "Bitte melden um ein Video zu teilen",
+        "moderationInEffectVideoDescription": "Bitte melden um die Kamera zu starten",
+        "moderationInEffectTitle": "Das Mikrofon ist von der Moderation gesperrt",
+        "moderationInEffectCSTitle": "Die Videofreigabe ist von der Moderation gesperrt",
+        "moderationInEffectVideoTitle": "Die Kamera ist von der Moderation gesperrt",
+        "moderationRequestFromModerator": "Die Moderation bittet Sie, das Mikrofon zu aktivieren",
+        "moderationRequestFromParticipant": "möchte sprechen",
+        "moderationStartedTitle": "Moderation gestartet",
+        "moderationStoppedTitle": "Moderation gestoppt",
+        "moderationToggleDescription": "von {{participantDisplayName}}",
+        "raiseHandAction": "Melden",
         "groupTitle": "Benachrichtigungen"
     },
     "participantsPane": {
         "close": "Schließen",
+        "header": "Anwesende",
         "headings": {
             "lobby": "Lobby ({{count}})",
-            "participantsList": "Teilnehmer ({{count}})"
-        },
-        "actions": {
-            "muteAll": "Alle stummschalten",
-            "stopVideo": "Video stoppen"
-        }
-    },
-    "participantsPane": {
-        "headings": {
-            "lobby": "Lobby ({{count}})",
-            "participantsList": "Anwesende ({{count}})"
+            "participantsList": "Anwesende ({{count}})",
+            "waitingLobby": "In der Lobby ({{count}})"
         },
         "actions": {
+            "allow": "Anwesenden erlauben:",
+            "blockEveryoneMicCamera": "Kamera und Mikrofon von allen sperren",
             "invite": "Person einladen",
+            "askUnmute": "Anfragen, Stummschaltung aufzuheben",
+            "mute": "Stummschalten",
             "muteAll": "Alle stummschalten",
-            "stopVideo": "Kamera ausschalten"
+            "muteEveryoneElse": "Alle anderen stummschalten",
+            "startModeration": "Stummschaltung aufheben oder Kamera aktivieren",
+            "stopEveryonesVideo": "Alle Kameras ausschalten",
+            "stopVideo": "Kamera ausschalten",
+            "unblockEveryoneMicCamera": "Kamera und Mikrofon von allen entsperren"
         }
     },
     "passwordSetRemotely": "von einer anderen Person gesetzt",
@@ -626,9 +664,9 @@
         "linkCopied": "Link in die Zwischenablage kopiert",
         "lookGood": "Ihr Mikrofon scheint zu funktionieren.",
         "or": "oder",
-        "keyboardShortcuts" : "Tastaturkurzbefehle aktivieren",
         "premeeting": "Vorschau",
         "showScreen": "Konferenzvorschau aktivieren",
+        "keyboardShortcuts" : "Tastaturkurzbefehle aktivieren",
         "startWithPhone": "Mit Telefonaudio starten",
         "screenSharingError": "Fehler bei Bildschirmfreigabe:",
         "videoOnlyError": "Videofehler:",
@@ -665,12 +703,15 @@
         "beta": "BETA",
         "busy": "Es werden Ressourcen für eine Aufnahme bereitgestellt. Bitte in ein paar Minuten erneut versuchen.",
         "busyTitle": "Alle Aufnahme-Instanzen sind in Gebrauch",
+        "copyLink": "Link kopieren",
         "error": "Die Aufzeichnung ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
+        "errorFetchingLink": "Der Link zur Aufzeichnung konnte nicht geladen werden.",
         "expandedOff": "Aufzeichnung wurde gestoppt",
         "expandedOn": "Das Meeting wird momentan aufgezeichnet.",
         "expandedPending": "Aufzeichnung wird gestartet…",
         "failedToStart": "Die Aufnahme konnte nicht gestartet werden",
         "fileSharingdescription": "Aufzeichnung mit den Personen der Konferenz teilen",
+        "linkGenerated": "Link zur Aufzeichnung wurde generiert.",
         "live": "LIVE",
         "loggedIn": "Als {{userName}} angemeldet",
         "off": "Aufnahme gestoppt",
@@ -685,7 +726,8 @@
         "signIn": "Anmelden",
         "signOut": "Abmelden",
         "unavailable": "Oh! Der {{serviceName}} ist aktuell nicht verfügbar. Wir arbeiten an der Behebung des Problems. Bitte versuchen Sie es später noch einmal.",
-        "unavailableTitle": "Aufnahme nicht verfügbar"
+        "unavailableTitle": "Aufnahme nicht verfügbar",
+        "uploadToCloud": "In die Cloud hochladen"
     },
     "sectionList": {
         "pullToRefresh": "Ziehen, um zu aktualisieren"
@@ -704,8 +746,13 @@
             "signedIn": "Momentan wird auf Kalendertermine von {{email}} zugegriffen. Klicken Sie auf die folgende Schaltfläche „Trennen“, um den Zugriff auf die Kalendertermine zu stoppen.",
             "title": "Kalender"
         },
+        "desktopShareFramerate": "Framerate für Bildschirmfreigabe",
+        "desktopShareWarning": "Sie müssen die Bildschirmfreigabe neustarten, damit die Einstellung übernommen wird.",
+        "desktopShareHighFpsWarning": "Eine höhere Framerate könnte sich auf Ihre Datenrate auswirken. Sie müssen die Bildschirmfreigabe neustarten, damit die Einstellung übernommen wird.",
         "devices": "Geräte",
         "followMe": "Follow-me für alle Personen",
+        "framesPerSecond": "FPS",
+        "incomingMessage": "Eingehende Nachricht",
         "language": "Sprache",
         "loggedIn": "Als {{name}} angemeldet",
         "microphones": "Mikrofon",
@@ -713,12 +760,18 @@
         "more": "Mehr",
         "name": "Name",
         "noDevice": "Kein",
+        "participantJoined": "Neue Person nimmt teil",
+        "participantLeft": "Person verlässt die Konferenz",
+        "playSounds": "Hinweistöne aktiviert",
+        "sameAsSystem": "Wie System ({{label}})",
         "selectAudioOutput": "Audioausgabe",
         "selectCamera": "Kamera",
         "selectMic": "Mikrofon",
+        "sounds": "Hinweistöne",
         "speakers": "Lautsprecher",
-        "startAudioMuted": "Alle Personen treten stumm geschaltet bei",
+        "startAudioMuted": "Alle Personen treten stummgeschaltet bei",
         "startVideoMuted": "Alle Personen treten ohne Video bei",
+        "talkWhileMuted": "Wenn bei Stummschaltung gesprochen wird",
         "title": "Einstellungen"
     },
     "settingsView": {
@@ -749,6 +802,7 @@
     },
     "speaker": "Sprecher/-in",
     "speakerStats": {
+        "search": "Suche",
         "hours": "{{count}} Std. ",
         "minutes": "{{count}} Min. ",
         "name": "Name",
@@ -767,12 +821,14 @@
         "title": "Die Konferenz wurde unterbrochen, weil der Standby-Modus aktiviert wurde."
     },
     "toolbar": {
-            "accessibilityLabel": {
+        "accessibilityLabel": {
             "audioOnly": "„Nur Audio“ ein-/ausschalten",
             "audioRoute": "Audiogerät auswählen",
+            "boo": "Buhen",
             "callQuality": "Qualitätseinstellungen",
             "cc": "Untertitel ein-/ausschalten",
             "chat": "Chatfenster öffnen / schließen",
+            "clap": "Klatschen",
             "document": "Geteiltes Dokument schließen",
             "download": "Unsere Apps herunterladen",
             "embedMeeting": "Konferenz einbetten",
@@ -783,6 +839,8 @@
             "help": "Hilfe",
             "invite": "Person einladen",
             "kick": "Person entfernen",
+            "laugh": "Lachen",
+            "like": "Daumen nach oben",
             "lobbyButton": "Lobbymodus ein-/ausschalten",
             "localRecording": "Lokale Aufzeichnungssteuerelemente ein-/ausschalten",
             "lockRoom": "Konferenzpasswort ein-/ausschalten",
@@ -795,10 +853,12 @@
             "muteEveryonesVideo": "Alle Kameras ausschalten",
             "muteEveryoneElsesVideo": "Alle anderen Kameras ausschalten",
             "participants": "Anwesende",
+            "party": "Konfetti",
             "pip": "Bild-in-Bild-Modus ein-/ausschalten",
             "privateMessage": "Private Nachricht senden",
             "profile": "Profil bearbeiten",
             "raiseHand": "Hand erheben / senken",
+            "reactionsMenu": "Interaktionsmenü öffnen / schließen",
             "recording": "Aufzeichnung ein-/ausschalten",
             "remoteMute": "Personen stummschalten",
             "remoteVideoMute": "Kamera von dieser Person ausschalten",
@@ -811,23 +871,29 @@
             "shortcuts": "Tastenkombinationen ein-/ausblenden",
             "show": "Im Vordergrund anzeigen",
             "speakerStats": "Sprechstatistik ein-/ausblenden",
+            "surprised": "Überrascht",
             "tileView": "Kachelansicht ein-/ausschalten",
             "toggleCamera": "Kamera wechseln",
             "toggleFilmstrip": "Miniaturansichten ein-/ausschalten",
             "videomute": "„Video stummschalten“ ein-/ausschalten",
+            "videoblur": "Unscharfer Hintergrund ein-/ausschalten",
             "selectBackground": "Hintergrund auswählen",
             "expand": "Ausklappen",
             "collapse": "Einklappen"
         },
         "addPeople": "Personen zur Konferenz hinzufügen",
         "audioSettings": "Ton-Einstellungen",
+        "videoSettings": "Kameraeinstellungen",
         "audioOnlyOff": "Modus „Nur Audio“ deaktivieren",
         "audioOnlyOn": "Modus „Nur Audio“ aktivieren",
         "audioRoute": "Audiogerät auswählen",
         "authenticate": "Anmelden",
+        "boo": "Buhen",
         "callQuality": "Qualitätseinstellungen",
         "chat": "Chat öffnen / schließen",
+        "clap": "Klatschen",
         "closeChat": "Chat schließen",
+        "closeReactionsMenu": "Interationsmenü schließen",
         "documentClose": "Geteiltes Dokument schließen",
         "documentOpen": "Geteiltes Dokument öffnen",
         "download": "Unsere Apps herunterladen",
@@ -841,6 +907,8 @@
         "hangup": "Konferenz verlassen",
         "help": "Hilfe",
         "invite": "Personen einladen",
+        "laugh": "Lachen",
+        "like": "Daumen hoch",
         "lobbyButtonDisable": "Lobbymodus deaktivieren",
         "lobbyButtonEnable": "Lobbymodus aktivieren",
         "login": "Anmelden",
@@ -859,12 +927,20 @@
         "noisyAudioInputTitle": "Ihr Mikrofon scheint lärmintensiv zu sein!",
         "noisyAudioInputDesc": "Es klingt, als ob Ihr Mikrofon Störgeräusche verursacht. Bitte überlegen Sie, ob Sie das Gerät stummschalten oder austauschen wollen.",
         "openChat": "Chat öffnen",
+        "openReactionsMenu": "Interationsmenü öffnen",
         "participants": "Anwesende",
+        "party": "Konfetti",
         "pip": "Bild-in-Bild-Modus einschalten",
         "privateMessage": "Private Nachricht senden",
         "profile": "Profil bearbeiten",
         "raiseHand": "Hand erheben / senken",
         "raiseYourHand": "Melden",
+        "reactionBoo": "Buhen senden",
+        "reactionClap": "Klatschen senden",
+        "reactionLaugh": "Lachen senden",
+        "reactionLike": "Daumen hoch senden",
+        "reactionParty": "Konfetti senden",
+        "reactionSurprised": "Überrascht senden",
         "security": "Sicherheitsoptionen",
         "Settings": "Einstellungen",
         "shareaudio": "Audio teilen",
@@ -874,14 +950,15 @@
         "speakerStats": "Sprechstatistik",
         "startScreenSharing": "Bildschirmfreigabe starten",
         "startSubtitles": "Untertitel einschalten",
+        "stopAudioSharing": "Audiofreigabe stoppen",
         "stopScreenSharing": "Bildschirmfreigabe stoppen",
         "stopSubtitles": "Untertitel ausschalten",
         "stopSharedVideo": "YouTube-Video stoppen",
+        "surprised": "Überrascht",
         "talkWhileMutedPopup": "Versuchen Sie zu sprechen? Ihr Mikrofon ist stummgeschaltet.",
         "tileViewToggle": "Kachelansicht ein-/ausschalten",
         "toggleCamera": "Kamera wechseln",
         "videomute": "Kamera starten / stoppen",
-        "videoSettings": "Video-Einstellungen",
         "selectBackground": "Hintergrund auswählen"
     },
     "transcribing": {
@@ -975,10 +1052,10 @@
         "info": "Einwahlinformationen",
         "join": "ERSTELLEN / BEITRETEN",
         "jitsiOnMobile": "Jitsi unterwegs – einfach unsere Apps herunterladen und Meetings von überall starten",
-        "moderatedMessage": "Oder <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">reservieren Sie sich eine Konferenz-URL</a>, die nur Sie moderieren.",
         "mobileDownLoadLinkIos": "iOS App Download",
         "mobileDownLoadLinkAndroid": "Android App Download",
         "mobileDownLoadLinkFDroid": "F-Droid App Download",
+        "moderatedMessage": "Oder <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">reservieren Sie sich eine Konferenz-URL</a>, die nur Sie moderieren.",
         "privacy": "Datenschutz",
         "recentList": "Verlauf",
         "recentListDelete": "Eintrag löschen",
@@ -1009,6 +1086,7 @@
     },
     "lobby": {
         "admit": "Zulassen",
+        "admitAll": "Alle zulassen",
         "knockingParticipantList": "Liste anklopfender Personen",
         "allow": "Annehmen",
         "backToKnockModeButton": "Kein Passwort, stattdessen Beitritt anfragen",
@@ -1039,6 +1117,7 @@
         "passwordField": "Konferenzpasswort eingeben",
         "passwordJoinButton": "Beitreten",
         "reject": "Ablehnen",
+        "rejectAll": "Alle ablehnen",
         "toggleLabel": "Lobby aktivieren"
     }
 }

lang/main-es.json

@@ -206,6 +206,7 @@
         "e2eeDescription": "El cifrado de extremo a extremo es actualmente EXPERIMENTAL. Tenga en cuenta que activarlo puede deshabilitar servicios como: grabación, transmisión en vivo y participación telefónica. Además, esta reunión solo funcionará con personas que se unan con un navegador.",
         "e2eeWarning": "ADVERTENCIA: No todos los participantes de esta reunión soportan el cifrado de extremo a extremo. Si usted habilita esta opción, ellos no podrán verlo ni oírlo.",
         "enterDisplayName": "Por favor ingresa tu nombre aquí",
+        "enterDisplayNameToJoin": "Por favor ingresa tu nombre para unirte",
         "error": "Error",
         "externalInstallationMsg": "Necesita instalar nuestra extensión para compartir pantalla.",
         "externalInstallationTitle": "Extensión requerida",
@@ -952,4 +953,4 @@
         "reject": "Rechazar",
         "toggleLabel": "Activar sala de espera"
     }
-}
+}

lang/main-fr.json

@@ -58,7 +58,7 @@
     "today": "Aujourd'hui"
   },
   "chat": {
-    "enter": "Entrez dans le salon de chat",
+    "enter": "Entrez dans le salon",
     "error": "Erreur : votre message n'a pas été envoyé. Raison : {{error}}",
     "fieldPlaceHolder": "Tapez votre message ici",
     "messagebox": "Saisissez un message",
@@ -66,15 +66,19 @@
     "noMessagesMessage": "Il n'y a pas encore de messages dans cette réunion. Démarrez une conversation ici !",
     "nickname": {
       "popover": "Choisissez un pseudonyme",
-      "title": "Entrez un pseudonyme pour utiliser le chat"
+      "title": "Entrez un pseudonyme pour utiliser le chat et les sondages"
     },
     "privateNotice": "Message privé à {{recipient}}",
-    "title": "Chat",
-    "you": "vous",
     "message": "Message",
     "messageAccessibleTitle": "{{user}} dit: ",
     "messageAccessibleTitleMe": "Je dis: ",
-    "smileysPanel": "Panneaux des Émojis"
+    "smileysPanel": "Panneaux des Émojis",
+    "tabs": {
+            "chat": "Chat",
+            "polls": "Sondages"
+        },
+        "title": "Chat et Sondages",
+        "you": "vous"
   },
   "chromeExtensionBanner": {
     "installExtensionText": "Installer l'extension pour l'intégration de Google Calendar et Office 365",
@@ -568,6 +572,34 @@
   },
   "passwordSetRemotely": "défini par un autre participant",
   "passwordDigitsOnly": "Jusqu'à {{number}} chiffres",
+  "polls": {
+    "create": {
+      "addOption": "Ajouter une option",
+      "answerPlaceholder": "Option {{index}}",
+      "create": "Créer un sondage",
+      "cancel": "Annuler",
+      "pollOption" : "Option {{index}}",
+      "pollQuestion" : "Question du sondage",
+      "questionPlaceholder": "Poser une question",
+      "removeOption": "Supprimer l'option",
+      "send": "Envoyer"
+    },
+    "answer": {
+      "skip": "Passer",
+      "submit": "Envoyer"
+    },
+    "results": {
+      "vote": "Voter",
+      "changeVote": "Changer le vote",
+      "empty": "Il n'y a pas encore de sondages dans cette réunion. Démarrez un sondage ici !",
+      "hideDetailedResults": "Cacher les détails",
+      "showDetailedResults": "Montrer les détails"
+    },
+    "notification": {
+      "title": "Un nouveau sondage a été ajouté à la réunion",
+      "description": "Ouvrez l'onget des sondages pour voter"
+    }
+  },
   "poweredby": "produit par",
   "prejoin": {
     "audioAndVideoError": "Erreur audio et video:",

lang/main-pt.json

@@ -1,22 +1,33 @@
 {
     "addPeople": {
         "add": "Convidar",
-        "countryNotSupported": "Ainda não suportamos este destino.",
-        "countryReminder": "Está a ligar de fora dos EUA? Por favor, certifique-se de começar com o código do país!",
-        "disabled": "Você não pode convidar pessoas.",
+        "addContacts": "Convidar os seus contactos",
+        "copyInvite": "Cópia do convite para reunião",
+        "copyLink": "Cópia do link da reunião",
+        "copyStream": "Copiar do link de transmissão em direto",
+        "contacts": "contactos",
+        "countryNotSupported": "Ainda não temos suporte para este destino.",
+        "countryReminder": "Está a telefonar para fora dos EUA? Por favor, certifique-se de que começa com o código do país!",
+        "defaultEmail": "O seu e-mail predefinido",
+        "disabled": "Não pode convidar outras pessoas.",
         "failedToAdd": "Falha ao adicionar participantes",
-        "footerText": "Digitação está desativada.",
-        "inviteMorePrompt": "Convide mais pessoas",
-        "loading": "A procurar por pessoas e números de telefone",
-        "loadingNumber": "A validar o número de telefone",
-        "loadingPeople": "A procurar pessoas para convidar",
-        "noResults": "Nenhum resultado de busca correspondente",
-        "noValidNumbers": "Por favor, digite um número de telefone",
-        "searchNumbers": "Adicionar números de telefone",
-        "searchPeople": "Pesquisar pessoas",
-        "searchPeopleAndNumbers": "Pesquisar por pessoas ou adicionar os seus números de telefone",
+        "footerText": "A marcação está desactivada.",
+        "googleEmail": "E-mail do Google",
+        "inviteMoreHeader": "Você é o único na reunião",
+        "inviteMoreMailSubject": "Participar na reunião {{appName}}",
+        "inviteMorePrompt": "Convidar mais pessoas",
+        "linkCopied": "Link copiado para a área de transferência",
+        "noResults": "Sem resultados de pesquisa correspondentes",
+        "outlookEmail": "E-mail do Outlook",
+        "phoneNumbers": "números de telefone",
+        "searching": "A pesquisar...",
+        "shareInvite": "Partilhar convite de reunião",
+        "shareLink": "Partilhar o link da reunião para convidar outras pessoas",
+        "shareStream": "Partilhar o link de transmissão em direto",
+        "sipAddresses": "endereços SIP",
         "telephone": "Telefone: {{number}}",
-        "title": "Convide pessoas para sua reunião"
+        "title": "Convidar pessoas para esta reunião",
+        "yahooEmail": "E-mail do Yahoo"
     },
     "audioDevices": {
         "bluetooth": "Bluetooth",
@@ -114,9 +125,11 @@
         "appNotInstalled": "Precisa da aplicação móvel {{app}} para participar na reunião com o seu telefone.",
         "description": "Não acontece nada? Estamos a tentar iniciar a sua reunião na aplicação desktop {{app}}. Tente novamente ou inicie na aplicação web {{app}}.",
         "descriptionWithoutWeb": "Não aconteceu nada? Tentamos iniciar a sua reunião na aplicação desktop {{app}}.",
-        "downloadApp": "Transfira a Aplicação",
+        "downloadApp": "Transfira a aplicação",
+        "ifDoNotHaveApp": "Se ainda não tem a aplicação:",
+        "ifHaveApp": "Se já tem a aplicação:",
+        "joinInApp": "Participe nesta reunião utilizando a aplicação",
         "launchWebButton": "Iniciar na web",
-        "openApp": "Continue na aplicação",
         "title": "A iniciar a sua reunião na {{app}}...",
         "tryAgainButton": "Tente novamente no desktop"
     },
@@ -477,6 +490,28 @@
         "newDeviceAudioTitle": "Novo dispositivo de áudio detectado",
         "newDeviceAction": "Usar"
     },
+    "participantsPane": {
+        "close": "Fechar",
+        "header": "Participantes",
+        "headings": {
+            "lobby": "Sala de espera ({{count}})",
+            "participantsList": "Participantes da reunião ({{count}})",
+            "waitingLobby": "Aguardam na sala de espera ({{count}})"
+        },
+        "actions": {
+            "allow": "Permitir aos participantes:",
+            "blockEveryoneMicCamera": "Bloquear o microfone e a câmara de todos",
+            "invite": "Convidar alguém",
+            "askUnmute": "Pedir para ligar o microfone",
+            "mute": "Silenciar",
+            "muteAll": "Silenciar todos",
+            "muteEveryoneElse": "Silenciar todos os outros",
+            "startModeration": "Ligar o microfone ou a câmara.",
+            "stopEveryonesVideo": "Desligar a câmara de todos",
+            "stopVideo": "Desligar a câmara",
+            "unblockEveryoneMicCamera": "Desbloquear o microfone e a câmara de todos"
+        }
+    },
     "passwordSetRemotely": "Definido por outro participante",
     "passwordDigitsOnly": "Até {{number}} dígitos",
     "poweredby": "distribuído por",
@@ -589,28 +624,47 @@
     "sectionList": {
         "pullToRefresh": "Puxe para atualizar"
     },
+    "security": {
+        "about": "Pode adicionar uma $t(lockRoomPassword) à sua reunião. Os participantes terão de fornecer a $t(lockRoomPassword) antes de serem autorizados a participar na reunião.",
+        "aboutReadOnly": "Os participantes moderadores podem acrescentar uma $t(lockRoomPassword) à reunião. Os participantes terão de fornecer a $t(lockRoomPassword) antes de serem autorizados a participar na reunião.",
+        "insecureRoomNameWarning": "O nome da sala é inseguro. Participantes indesejados podem juntar-se à sua conferência. Considere proteger a sua reunião utilizando o botão de segurança.",
+        "securityOptions": "Opções de segurança"
+    },
     "settings": {
         "calendar": {
-            "about": "A integração do calendário {{appName}} é usada para acessar com segurança o seu calendário para que ele possa ler os próximos eventos.",
-            "disconnect": "Desconectar",
-            "microsoftSignIn": "Entrar com Microsoft",
-            "signedIn": "Atualmente acessando eventos do calendário para {{email}}. Clique no botão Desconectar abaixo para parar de acessar os eventos da agenda.",
+            "about": "A integração do calendário {{appName}} é utilizada para aceder com segurança ao seu calendário para que este possa ler os próximos eventos.",
+            "disconnect": "Desligar",
+            "microsoftSignIn": "Iniciar sessão com a Microsoft",
+            "signedIn": "Atualmente a aceder a eventos de calendário por {{email}}. Clique no botão Desconectar abaixo para parar de aceder a eventos de calendário.",
             "title": "Calendário"
         },
+        "desktopShareFramerate": "Taxa de fotogramas para partilha do ambiente de trabalho",
+        "desktopShareWarning": "É necessário reiniciar a partilha do ecrã para que as novas definições entrem em vigor.",
+        "desktopShareHighFpsWarning": "Uma taxa de fotogramas mais elevada para a partilha do ambiente de trabalho pode afectar a sua largura de banda. É necessário reiniciar a partilha de ecrã para que as novas definições entrem em vigor.",
         "devices": "Dispositivos",
         "followMe": "Todos me seguem",
+        "framesPerSecond": "fotogramas-por-segundo",
+        "incomingMessage": "Receber mensagem",
         "language": "Idioma",
-        "loggedIn": "Conectado como {{name}}",
+        "loggedIn": "Sessão iniciada como {{name}}",
+        "microphones": "Microfones",
         "moderator": "Moderador",
         "more": "Mais",
         "name": "Nome",
         "noDevice": "Nenhum",
+        "participantJoined": "Entrar participante",
+        "participantLeft": "Sair participante",
+        "playSounds": "Reproduzir som quando",
+        "sameAsSystem": "O mesmo que o sistema ({{label}})",
         "selectAudioOutput": "Saída de áudio",
-        "selectCamera": "Câmera",
+        "selectCamera": "Câmara",
         "selectMic": "Microfone",
-        "startAudioMuted": "Todos iniciam mudos",
-        "startVideoMuted": "Todos iniciam ocultos",
-        "title": "Configurações"
+        "sounds": "Sons",
+        "speakers": "Participantes",
+        "startAudioMuted": "Todos começam com microfone desligado",
+        "startVideoMuted": "Todos começam com câmara desligada",
+        "talkWhileMuted": "Se fala e está com microfone desligado",
+        "title": "Definições"
     },
     "settingsView": {
         "advanced": "",
@@ -703,7 +757,7 @@
         "toggleFilmstrip": "Mudar para película de filme",
         "videomute": "Iniciar / Parar câmara",
         "videoblur": "Mudar o desfoque de vídeo",
-        "selectBackground": "Selecionar o fundo",
+        "selectBackground": "Selecionar plano de fundo",
         "expand": "Expandir",
         "collapse": "Colapsar"
     },
@@ -770,7 +824,7 @@
     "tileViewToggle": "Mudar para vista em quadrícula",
     "toggleCamera": "Mudar a câmara",
     "videomute": "Iniciar / Parar câmara",
-    "selectBackground": "Selecionar o fundo"
+    "selectBackground": "Selecionar plano de fundo"
     },
     "transcribing": {
         "ccButtonTooltip": "Iniciar/parar legendas",
@@ -864,5 +918,41 @@
         "sendFeedback": "Enviar comentários",
         "terms": "Termos",
         "title": "Videoconferências mais seguras, flexíveis e totalmente gratuitas"
+    },
+    "lobby": {
+        "admit": "Aceitar",
+        "admitAll": "Aceitar todos",
+        "knockingParticipantList": "Lista de participantes a expulsar",
+        "allow": "Permitir",
+        "backToKnockModeButton": "Sem senha, peça para aderir em vez disso",
+        "dialogTitle": "Modo sala de espera",
+        "disableDialogContent": "O modo sala de espera está actualmente activada. Esta característica assegura que os participantes indesejados não possam juntar-se à sua reunião. Quer desativá-la?",
+        "disableDialogSubmit": "Desativar",
+        "emailField": "Introduza o seu endereço de e-mail",
+        "enableDialogPasswordField": "Definir senha (opcional)",
+        "enableDialogSubmit": "Habilitar",
+        "enableDialogText": "O modo sala de espera permite-lhe proteger a sua reunião apenas permitindo a entrada de pessoas após uma aprovação formal por um moderador.",
+        "enterPasswordButton": "Introduza a senha da reunião",
+        "enterPasswordTitle": "Introduzir a senha para participar na reunião",
+        "invalidPassword": "Senha inválida",
+        "joiningMessage": "Participará na reunião assim que alguém aceitar o seu pedido",
+        "joinWithPasswordMessage": "Tentando aderir com senha, por favor aguarde...",
+        "joinRejectedMessage": "O seu pedido de adesão foi rejeitado por um moderador.",
+        "joinTitle": "Junte-se à reunião",
+        "joiningTitle": "Pedir para participar na reunião...",
+        "joiningWithPasswordTitle": "Participando com senha...",
+        "knockButton": "Pedir para participar",
+        "knockTitle": "Alguém quer juntar-se à reunião",
+        "nameField": "Introduza o seu nome",
+        "notificationLobbyAccessDenied": "{{targetParticipantName}} foi recusada a adesão por {{originParticipantName}}",
+        "notificationLobbyAccessGranted": "{{targetParticipantName}} foi autorizado a aderir por {{originParticipantName}}",
+        "notificationLobbyDisabled": "A sala de espera foi desactivada por {{originParticipantName}}",
+        "notificationLobbyEnabled": "A sala de espera foi activada por {{originParticipantName}}",
+        "notificationTitle": "Sala de espera",
+        "passwordField": "Introduza a senha da reunião",
+        "passwordJoinButton": "Solicitar",
+        "reject": "Rejeitar",
+        "rejectAll": "Rejeitar todos",
+        "toggleLabel": "Ativar sala de espera"
     }
 }

lang/main-ptBR.json

@@ -5,6 +5,7 @@
         "copyInvite": "Copiar convite da reunião",
         "copyLink": "Copiar link da reunião",
         "copyStream": "Copiar link da transmissão ao vivo",
+        "contacts": "contatos",
         "countryNotSupported": "Ainda não suportamos este destino.",
         "countryReminder": "Ligando de fora dos EUA? Por favor, certifique-se de começar com o código do país!",
         "defaultEmail": "Seu email padrão",
@@ -16,18 +17,14 @@
         "inviteMoreMailSubject": "Entre na reunião {{appName}}",
         "inviteMorePrompt": "Convide mais pessoas",
         "linkCopied": "Link copiado para a área de transferência",
-        "loading": "Procurando por pessoas e números de telefone",
-        "loadingNumber": "Validando o número de telefone",
-        "loadingPeople": "Procurando por pessoas para convidar",
         "noResults": "Nenhum resultado de busca correspondente",
-        "noValidNumbers": "Por favor, digite um número de telefone",
         "outlookEmail": "E-mail Outlook ",
-        "searchNumbers": "Adicionar números de telefone",
-        "searchPeople": "Pesquisar pessoas",
-        "searchPeopleAndNumbers": "Pesquisar por pessoas ou adicionar seus números de telefone",
+        "phoneNumbers": "números de telefone",
+        "searching": "Procurando...",
         "shareInvite": "Compartilhar convite da reunião",
         "shareLink": "Compartilhando o link da reunião",
         "shareStream": "Compartilhar o link da transmissão ao vivo",
+        "sipAddresses": "endereços SIP",
         "telephone": "Telefone: {{number}}",
         "title": "Convide pessoas para sua reunião",
         "yahooEmail": "E-mail Yahoo"
@@ -61,6 +58,7 @@
         "today": "Hoje"
     },
     "chat": {
+        "enter": "Entrar no bate-papo",
         "error": "Erro: sua mensagem não foi enviada. Motivo: {{error}}",
         "fieldPlaceHolder": "Digite sua mensagem aqui",
         "messagebox": "Digite uma mensagem",
@@ -72,12 +70,17 @@
         },
         "privateNotice": "Mensagem privada para {{recipient}}",
         "title": "Bate-papo",
-        "you": "você"
+        "you": "você",
+        "message": "Mensagem",
+        "messageAccessibleTitle": "{{user}} disse:",
+        "messageAccessibleTitleMe": "Você disse:",
+        "smileysPanel": "Painel de Emojis"
     },
     "chromeExtensionBanner": {
         "installExtensionText": "Instale a extensão para integrar com Google Calendar e Office 365",
         "buttonText": "Instalar extensão do Chrome",
-        "dontShowAgain": "Não me mostre isso de novo"
+        "dontShowAgain": "Não me mostre isso de novo",
+        "close": "Fechar"
     },
     "connectingOverlay": {
         "joiningRoom": "Conectando você à reunião…"
@@ -174,12 +177,14 @@
         "alreadySharedVideoMsg": "Outro participante já está compartilhando um vídeo. Esta conferência permite apenas um vídeo compartilhado por vez.",
         "alreadySharedVideoTitle": "Somente um vídeo compartilhado é permitido por vez",
         "applicationWindow": "Janela de aplicativo",
+        "authenticationRequired": "Autenticação requerida",
         "Back": "Voltar",
         "cameraConstraintFailedError": "Sua câmera não satisfaz algumas condições necessárias.",
         "cameraNotFoundError": "A câmera não foi encontrada.",
         "cameraNotSendingData": "Estamos incapazes de acessar sua câmera. Verifique se outra aplicação está usando este dispositivo, selecione outro dispositivo do menu de configurações ou recarregue a aplicação.",
         "cameraNotSendingDataTitle": "Incapaz de acessar a câmera",
         "cameraPermissionDeniedError": "Não foi permitido acessar a sua câmera. Você ainda pode entrar na conferência, mas sem exibir o seu vídeo. Clique no botão da câmera para tentar reparar.",
+        "cameraTimeoutError": "Não foi possível iniciar fonte de vídeo. Tempo esgotado!",
         "cameraUnknownError": "Não pode usar a câmera por uma razão desconhecida.",
         "cameraUnsupportedResolutionError": "Sua câmera não suporta a resolução de vídeo requerida.",
         "Cancel": "Cancelar",
@@ -194,7 +199,7 @@
         "connectError": "Oops! Alguma coisa está errada e nós não pudemos conectar à conferência.",
         "connectErrorWithMsg": "Oops! Alguma coisa está errada e não podemos conectar à conferência: {{msg}}",
         "connecting": "Conectando",
-        "contactSupport": "Contate o suporte",
+        "contactSupport": "Entrar em contato com o suporte",
         "copied": "Copiado",
         "copy": "Copiar",
         "dismiss": "Dispensar",
@@ -204,28 +209,31 @@
         "e2eeLabel": "Enable End-to-End Encryption",
         "e2eeWarning": "WARNING: Not all participants in this meeting seem to have support for End-to-End encryption. If you enable it they won't be able to see nor hear you.",
         "enterDisplayName": "Digite seu nome aqui",
+        "enterDisplayNameToJoin": "Digite seu nome para participar",
+        "embedMeeting": "Reunião em formato compacto",
         "error": "Erro",
         "gracefulShutdown": "Nosso serviço está em manutenção. Tente novamente mais tarde.",
         "grantModeratorDialog": "Tem certeza que quer participar como moderador da reunião?",
         "grantModeratorTitle": "Permitir moderador",
+        "hideShareAudioHelper": "Não mostre este diálogo novamente",
         "IamHost": "Eu sou o anfitrião",
         "incorrectRoomLockPassword": "Senha incorreta",
         "incorrectPassword": "Usuário ou senha incorretos",
         "internalError": "Oops! Alguma coisa está errada. O seguinte erro ocorreu: {{error}}",
         "internalErrorTitle": "Erro interno",
-        "kickMessage": "Você pode contatar com {{participantDisplayName}} para obter mais detalhes.",
+        "kickMessage": "Você pode entrar em contato com {{participantDisplayName}} para obter mais detalhes.",
         "kickParticipantButton": "Remover",
         "kickParticipantDialog": "Tem certeza de que deseja remover este participante?",
-        "kickParticipantTitle": "Chutar este participante?",
-        "kickTitle": "Ai! {{participantDisplayName}} expulsou você da reunião",
+        "kickParticipantTitle": "Remover este participante?",
+        "kickTitle": "{{participantDisplayName}} removeu você da reunião",
         "liveStreaming": "Transmissão ao Vivo",
         "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Não é possível transmitir enquanto a gravação está ativa",
-        "liveStreamingDisabledForGuestTooltip": "Visitantes não podem iniciar transmissão ao vivo.",
         "liveStreamingDisabledTooltip": "Iniciar transmissão ao vivo desativada.",
-        "lockMessage": "Falha ao travar a conferência.",
+        "lockMessage": "Falha ao bloquear a conferência.",
         "lockRoom": "Adicionar reunião $t(lockRoomPasswordUppercase)",
         "lockTitle": "Bloqueio falhou",
         "logoutQuestion": "Deseja encerrar a sessão e finalizar a conferência?",
+        "login": "Entrar",
         "logoutTitle": "Encerrar sessão",
         "maxUsersLimitReached": "O limite para o número máximo de participantes foi atingido. A conferência está cheia. Entre em contato com o proprietário da reunião ou tente novamente mais tarde!",
         "maxUsersLimitReachedTitle": "Limite máximo de participantes atingido",
@@ -234,28 +242,42 @@
         "micNotSendingData": "Vá para as configurações do seu computador para ativar o som do microfone e ajustar seu nível",
         "micNotSendingDataTitle": "Seu microfone está mudo pelas configurações do sistema",
         "micPermissionDeniedError": "Não foi permitido acessar o seu microfone. Você ainda pode entrar na conferência, mas sem enviar áudio. Clique no botão do microfone para tentar reparar.",
+        "micTimeoutError": "Não foi possível iniciar fonte de áudio. Tempo esgotado!",
         "micUnknownError": "Não pode usar o microfone por uma razão desconhecida.",
         "muteEveryoneElseDialog": "Uma vez silenciados, você não poderá reativar o som deles, mas eles poderão reativar o som a qualquer momento.",
         "muteEveryoneElseTitle": "Silenciar todo mundo exceto {{whom}}?",
         "muteEveryoneDialog": "Tem certeza que deseja silenciar todos? Você não poderá ativar o som deles, mas eles podem ativar o som eles mesmo a qualquer momento.",
         "muteEveryoneTitle": "Silenciar todos?",
+        "muteEveryoneElsesVideoDialog": "Você não poderá reativar posteriormente, mas cada participante pode ativar sua própria câmera a qualquer momento.",
+        "muteEveryoneElsesVideoTitle": "Desativar a câmera de todos exceto {{whom}}?",
+        "muteEveryonesVideoDialog": "Tem certeza que deseja desativar a câmera de todos? Você não poderá reativar posteriormente, mas cada participante pode ativar sua própria câmera a qualquer momento.",
+        "muteEveryonesVideoDialogOk": "Desabilitar",
+        "muteEveryonesVideoTitle": "Desativar a câmera de todos?",
         "muteEveryoneSelf": "a si próprio",
         "muteEveryoneStartMuted": "Todos iniciam silenciados daqui para frente",
         "muteParticipantBody": "Você não está habilitado para tirar o mudo deles, mas eles podem tirar o mudo deles mesmos a qualquer tempo.",
         "muteParticipantButton": "Mudo",
         "muteParticipantDialog": "Tem certeza de que deseja silenciar este participante? Você não poderá desfazer isso, mas o participante pode reabilitar o áudio a qualquer momento.",
+        "muteParticipantsVideoDialog": "Tem certeza de que deseja desativar a câmera deste participante? Você não poderá reativar posteriormente, mas o participante pode ativar sua própria câmera a qualquer momento.",
         "muteParticipantTitle": "Deixar mudo este participante?",
-        "Ok": "Ok",
-        "passwordLabel": "A reunião foi travada por um participante. Por favor, insira a $t(lockRoomPassword) para entrar.",
+        "muteParticipantsVideoButton": "Desativar a câmera",
+        "muteParticipantsVideoTitle": "Desativar a câmera deste participante?",
+        "muteParticipantsVideoBody": "Você não poderá reativar posteriormente, mas o participante pode ativar sua própria câmera a qualquer momento.",
+        "noDropboxToken": "Nenhum token do Dropbox válido",
+        "Ok": "OK",
+        "password": "Senha",
+        "passwordLabel": "A reunião foi bloqueada por um participante. Por favor, insira a $t(lockRoomPassword) para entrar.",
         "passwordNotSupported": "A configuração de uma reunião $t(lockRoomPassword) não é suportada.",
         "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) não suportado",
         "passwordRequired": "$t(lockRoomPasswordUppercase) requerido",
+        "permissionErrorTitle": "Permissão necessária",
+        "permissionCameraRequiredError": "É necessário permitir acesso à câmera para participar de reuniões com vídeo. Ative a permissão nas configurações",
+        "permissionMicRequiredError": "É necessário permitir acesso ao microfone para participar de reuniões com áudio. Ative a permissão nas configurações",
         "popupError": "Seu navegador está bloqueando janelas popup deste site. Habilite os popups nas configurações de segurança no seu navegador e tente novamente.",
         "popupErrorTitle": "Popup bloqueado",
         "readMore": "mais...",
         "recording": "Gravando",
         "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Não é possível transmitir enquanto a gravação está ativa",
-        "recordingDisabledForGuestTooltip": "Visitantes não podem iniciar gravações.",
         "recordingDisabledTooltip": "Iniciar gravação desativada.",
         "rejoinNow": "Reconectar agora",
         "remoteControlAllowedMessage": "{{user}} aceitou sua requisição de controle remoto!",
@@ -272,7 +294,7 @@
         "reservationError": "Erro de sistema de reserva",
         "reservationErrorMsg": "Código do erro: {{code}}, mensagem: {{msg}}",
         "retry": "Tentar novamente",
-        "screenSharingAudio": "Compartilha áudio",
+        "screenSharingAudio": "Compartilhar áudio",
         "screenSharingFailed": "Oops! Alguma coisa de errado aconteceu, não é possível habilitar o compartilhamento de tela!",
         "screenSharingFailedTitle": "Falha ao compartilhar a tela!",
         "screenSharingPermissionDeniedError": "Oops! Alguma coisa está errada com suas permissões de compartilhamento de tela. Recarregue e tente de novo.",
@@ -282,15 +304,26 @@
         "sendPrivateMessageTitle": "Enviar em privado?",
         "serviceUnavailable": "Serviço indisponível",
         "sessTerminated": "Chamada terminada",
+        "sessionRestarted": "Chamada reiniciada pelo bridge",
         "Share": "Compartilhar",
+        "shareAudio": "Continuar",
+        "shareAudioTitle": "Como compartilhar áudio",
+        "shareAudioWarningTitle": "Você precisa parar o compartilhamento de tela antes de compartilhar seu áudio",
+        "shareAudioWarningH1": "Se você quiser compartilhar apenas seu áudio:",
+        "shareAudioWarningD1": "você precisa parar o compartilhamento de tela antes de compartilhar seu áudio.",
+        "shareAudioWarningD2": "você precisa reiniciar o compartilhamento de tela e selecionar a opção \"compartilhar áudio\".",
+        "shareMediaWarningGenericH2": "Se você quiser compartilhar sua tela e seu áudio",
         "shareVideoLinkError": "Por favor, forneça um link do youtube correto.",
         "shareVideoTitle": "Compartilhar um vídeo",
         "shareYourScreen": "Compartilhar sua tela",
         "shareYourScreenDisabled": "Compartilhamento de tela desativada.",
-        "shareYourScreenDisabledForGuest": "Visitantes não podem compartilhar tela.",
         "startLiveStreaming": "Iniciar transmissão ao vivo",
         "startRecording": "Iniciar gravação",
         "startRemoteControlErrorMessage": "Um erro ocorreu enquanto tentava iniciar uma sessão de controle remoto!",
+        "shareScreenWarningTitle": "Você precisa parar o compartilhamento de áudio antes de compartilhar sua tela",
+        "shareScreenWarningH1": "Se você quiser compartilhar apenas sua tela:",
+        "shareScreenWarningD1": "você precisa parar o compartilhamento de áudio antes de compartilhar sua tela.",
+        "shareScreenWarningD2": "você precisa parar o compartilhamento de áudio, iniciar o compartilhamento de tela e selecionar a opção \"compartilhar áudio\".",
         "stopLiveStreaming": "Parar transmissão ao vivo",
         "stopRecording": "Parar a gravação",
         "stopRecordingWarning": "Tem certeza que deseja parar a gravação?",
@@ -303,13 +336,20 @@
         "tokenAuthFailedTitle": "Falha de autenticação",
         "transcribing": "Transcrevendo",
         "unlockRoom": "Remove a reunião $t(lockRoomPassword)",
+        "user": "Usuário",
+        "userIdentifier": "identificação do usuário",
         "userPassword": "senha do usuário",
         "videoLink": "Link do vídeo",
+        "viewUpgradeOptions": "Ver opções de atualização",
+        "viewUpgradeOptionsContent": "Para obter acesso ilimitado a recursos premium tais como gravação, transcrição, streaming RTMP e muito mais, você precisa atualizar seu plano.",
+        "viewUpgradeOptionsTitle": "Você descobriu um recurso premium!",
         "WaitForHostMsg": "A conferência <b>{{room}}</b> ainda não começou. Se você é o anfitrião, faça a autenticação. Do contrário, aguarde a chegada do anfitrião.",
-        "WaitForHostMsgWOk": "A conferência <b>{{room}}</b> ainda não começou. Se você é o anfitrião, pressione Ok para autenticar. Do contrário, aguarde a chegada do anfitrião.",
-        "WaitingForHost": "Esperando o anfitrião...",
+        "WaitForHostMsgWOk": "A conferência <b>{{room}}</b> ainda não começou. Se você é o anfitrião, pressione OK para autenticar. Do contrário, aguarde a chegada do anfitrião.",
+        "WaitingForHostTitle": "Esperando o anfitrião...",
         "Yes": "Sim",
-        "yourEntireScreen": "Toda sua tela"
+        "yourEntireScreen": "Toda sua tela",
+        "remoteUserControls": "Controles de usuários remotos de {{username}}",
+        "localUserControls": "Controles de usuários locais"
     },
     "dialOut": {
         "statusMessage": "está agora {{status}}"
@@ -323,27 +363,27 @@
     "embedMeeting": {
         "title": "Reunião em formato compacto"
     },
-        "virtualBackground": {
-            "apply": "Aplicar",
-            "title": "Fundos virtuais",
-            "blur": "Desfoque",
-            "slightBlur": "Desfoque suave",
-            "removeBackground": "Remover fundo",
-            "addBackground": "Adicionar novo fundo",
-            "pleaseWait": "Aguarde...",
-            "none": "Nenhum",
-            "uploadedImage": "Imagem enviada {{index}}",
-            "deleteImage": "Excluir imagem",
-            "image1" : "Praia",
-            "image2" : "Parede branca neutra",
-            "image3" : "Quarto branco vazio",
-            "image4" : "Luminária preta",
-            "image5" : "Montanha",
-            "image6" : "Floresta",
-            "image7" : "Alvorada",
-            "desktopShareError": "Não foi possível compartilhar o desktop",
-            "desktopShare":"Compartilhar desktop",
-            "webAssemblyWarning": "Não há suporte para WebAssembly"
+    "virtualBackground": {
+        "apply": "Aplicar",
+        "title": "Fundos virtuais",
+        "blur": "Desfoque",
+        "slightBlur": "Desfoque suave",
+        "removeBackground": "Remover fundo",
+        "addBackground": "Adicionar novo fundo",
+        "pleaseWait": "Aguarde...",
+        "none": "Nenhum",
+        "uploadedImage": "Imagem enviada {{index}}",
+        "deleteImage": "Excluir imagem",
+        "image1": "Praia",
+        "image2": "Parede branca neutra",
+        "image3": "Quarto branco vazio",
+        "image4": "Luminária preta",
+        "image5": "Montanha",
+        "image6": "Floresta",
+        "image7": "Alvorada",
+        "desktopShareError": "Não foi possível compartilhar o desktop",
+        "desktopShare": "Compartilhar desktop",
+        "webAssemblyWarning": "Não há suporte para WebAssembly"
     },
     "feedback": {
         "average": "Média",
@@ -352,7 +392,8 @@
         "good": "Boa",
         "rateExperience": "Avalie sua experiência na reunião",
         "veryBad": "Muito ruim",
-        "veryGood": "Muito boa"
+        "veryGood": "Muito boa",
+        "star": "Estrela"
     },
     "incomingCall": {
         "answer": "Responder",
@@ -369,6 +410,7 @@
         "country": "País",
         "dialANumber": "Para entrar na reunião, disque um desses números e depois insira o PIN.",
         "dialInConferenceID": "PIN:",
+        "copyNumber": "Copiar número",
         "dialInNotSupported": "Desculpe, a discagem não é atualmente suportada.",
         "dialInNumber": "Discar:",
         "dialInSummaryError": "Ocorreu um erro ao buscar a informação de discagem. Tente novamente mais tarde.",
@@ -377,6 +419,11 @@
         "inviteLiveStream": "Para ver a transmissão ao vivo da reunião, clique no link: {{url}}",
         "invitePhone": "Para participar por telefone, toque aqui: {{number}},,{{conferenceID}}#\n",
         "invitePhoneAlternatives": "Procurando um número de discagem diferente?\nVeja os números de discagem da reunião: {{url}} \n\n\nSe você também estiver discando através de um telefone da sala, participe sem conectar-se ao áudio: {{silentUrl}}",
+        "inviteSipEndpoint": "Para participar usando o endereço SIP, insira isto: {{sipUri}}",
+        "inviteTextiOSPersonal": "{{name}} está convidando você para uma reunião.",
+        "inviteTextiOSJoinSilent": "Se você estiver discando através de um telefone da sala, use este link para participar sem conectar-se ao áudio: {{silentUrl}}.",
+        "inviteTextiOSInviteUrl": "Clique no seguinte link para entrar: {{inviteUrl}}.",
+        "inviteTextiOSPhone": "Para participar por telefone, use este número: {{number}},,{{conferenceID}}#. Se você estiver procurando um número diferente, esta é a lista completa: {{didUrl}}.",
         "inviteURLFirstPartGeneral": "Você foi convidado para uma reunião.",
         "inviteURLFirstPartPersonal": "{{name}} está convidando você para uma reunião.\n",
         "inviteURLSecondPart": "\nEntre na reunião:\n{{url}}\n",
@@ -387,6 +434,7 @@
         "noRoom": "Nenhuma sala foi especificada para entrar.",
         "numbers": "Números de discagem",
         "password": "$t(lockRoomPasswordUppercase):",
+        "sip": "endereço SIP",
         "title": "Compartilhar",
         "tooltip": "Compartilhar link e discagem para esta reunião",
         "label": "Informações da reunião"
@@ -405,6 +453,7 @@
         "support": "Suporte",
         "supportMsg": "Se isso continuar acontecendo, chegar a"
     },
+    "jitsiHome": "Logo de {{logo}} (direciona para página inicial)",
     "keyboardShortcuts": {
         "focusLocal": "Focar no seu vídeo",
         "focusRemote": "Focar no vídeo de outro participante",
@@ -417,10 +466,10 @@
         "showSpeakerStats": "Exibir estatísticas do alto falante",
         "toggleChat": "Abrir ou fechar o painel de bate-papo",
         "toggleFilmstrip": "Mostrar ou ocultar miniaturas de vídeo",
+        "toggleParticipantsPane": "Exibir ou ocultar o quadro de participantes",
         "toggleScreensharing": "Trocar entre câmera e compartilhamento de tela",
         "toggleShortcuts": "Mostrar ou ocultar atalhos de teclado",
-        "videoMute": "Iniciar ou parar sua câmera",
-        "videoQuality": "Gerenciar qualidade da chamada"
+        "videoMute": "Iniciar ou parar sua câmera"
     },
     "liveStreaming": {
         "limitNotificationDescriptionWeb": "Devido a alta demanda sua transmissão será limitada a {{limit}} minutos. Para transmissão ilimitada tente <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
@@ -496,19 +545,24 @@
         "focus": "Foco da conferência",
         "focusFail": "{{component}} não disponível - tente em {{ms}} seg",
         "grantedTo": "Direitos de moderador concedido para {{to}}!",
+        "hostAskedUnmute": "O anfitrião deseja que você ative o som",
         "invitedOneMember": "{{name}} foi convidado(a)",
         "invitedThreePlusMembers": "{{name}} e {{count}} outros foram convidados",
         "invitedTwoMembers": "{{first}} e {{second}} foram convidados",
-        "kickParticipant": "{{kicked}} foi chutado por {{kicker}}",
+        "kickParticipant": "{{kicked}} foi removido por {{kicker}}",
         "me": "Eu",
         "moderator": "Direitos de moderador concedidos!",
         "muted": "Você iniciou uma conversa em mudo.",
         "mutedTitle": "Você está mudo!",
         "mutedRemotelyTitle": "Você foi silenciado por {{participantDisplayName}}!",
         "mutedRemotelyDescription": "Você sempre pode ativar o som quando estiver pronto para falar. Retire o som quando terminar para manter o ruído longe da reunião.",
+        "videoMutedRemotelyTitle": "Sua câmera foi desativada por {{participantDisplayName}}!",
+        "videoMutedRemotelyDescription": "Você pode ativar sua câmera a qualquer momento.",
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) removido por outro participante",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) definido por outro participante",
         "raisedHand": "{{name}} gostaria de falar.",
+        "screenShareNoAudio": "O compartilhamento de áudio não foi selecionado na tela de escolha de janela.",
+        "screenShareNoAudioTitle": "Compartilhamento de áudio não selecionado",
         "somebody": "Alguém",
         "startSilentTitle": "Você entrou sem saída de áudio!",
         "startSilentDescription": "Volte à reunião para habilitar o áudio",
@@ -521,18 +575,41 @@
         "OldElectronAPPTitle": "Vulnerabilidade de segurança!",
         "oldElectronClientDescription1": "Você está usando um versão antiga do cliente Jitsi Meet que possui uma conhecida vulnerabilidade de segurança. Por favor tenha certeza de atulizar para a nossa ",
         "oldElectronClientDescription2": "última versão",
-        "oldElectronClientDescription3": " agora!"
+        "oldElectronClientDescription3": " agora!",
+        "moderationInEffectDescription": "Levante a mão se quiser falar",
+        "moderationInEffectCSDescription": "Levante a mão se quiser compartilhar seu vídeo",
+        "moderationInEffectVideoDescription": "Levante a mão se quiser que seu vídeo fique visível",
+        "moderationInEffectTitle": "O microfone foi silenciado pelo moderador",
+        "moderationInEffectCSTitle": "O compartilhamento de conteúdo foi desativado pelo moderador",
+        "moderationInEffectVideoTitle": "O vídeo foi desativado pelo moderador",
+        "moderationRequestFromModerator": "O anfitrião deseja que você ative o som",
+        "moderationRequestFromParticipant": "Quer falar",
+        "moderationStartedTitle": "Moderação iniciada",
+        "moderationStoppedTitle": "Moderação encerrada",
+        "moderationToggleDescription": "por {{participantDisplayName}}",
+        "raiseHandAction": "Levantar a mão",
+        "groupTitle": "Notificações"
     },
-        "participantsPane": {
-            "close": "Fechar",
-            "headings": {
-                "lobby": "Sala de espera ({{count}})",
-                "participantsList": "Participantes da reunião ({{count}})"
-            },
-            "actions": {
-                "invite": "Convidar alguém",
-                "muteAll": "Silenciar todos",
-                "stopVideo": "Parar vídeo"
+    "participantsPane": {
+        "close": "Fechar",
+        "header": "Participantes",
+        "headings": {
+            "lobby": "Sala de espera ({{count}})",
+            "participantsList": "Participantes da reunião ({{count}})",
+            "waitingLobby": "Aguardando na sala de espera ({{count}})"
+        },
+        "actions": {
+            "allow": "Permitir aos participantes:",
+            "blockEveryoneMicCamera": "Bloquear microfone e câmera de todos",
+            "invite": "Convidar alguém",
+            "askUnmute": "Pedir para ativar som",
+            "mute": "Silenciar",
+            "muteAll": "Silenciar todos",
+            "muteEveryoneElse": "Silenciar todos os demais",
+            "startModeration": "Ativar som eles mesmos ou iniciar vídeo",
+            "stopEveryonesVideo": "Parar vídeo de todos",
+            "stopVideo": "Parar vídeo",
+            "unblockEveryoneMicCamera": "Desbloquear microfone e câmera de todos"
         }
     },
     "passwordSetRemotely": "Definido por outro participante",
@@ -588,7 +665,8 @@
         "lookGood": "Seu microfone está funcionando corretamente",
         "or": "ou",
         "premeeting": "Pré-reunião",
-        "showScreen": "Habiltar tela pré-reunião",
+        "showScreen": "Habilitar tela pré-reunião",
+        "keyboardShortcuts": "Habilitar atalhos de teclado",
         "startWithPhone": "Iniciar com o áudio da ligação",
         "screenSharingError": "Erro de compartilhamento de tela:",
         "videoOnlyError": "Erro de vídeo:",
@@ -610,6 +688,7 @@
         "ringing": "Tocando..."
     },
     "profile": {
+        "avatar": "avatar",
         "setDisplayNameLabel": "Definir seu nome de exibição",
         "setEmailInput": "Digite e-mail",
         "setEmailLabel": "Definir seu e-mail de Gravatar",
@@ -624,12 +703,15 @@
         "beta": "BETA",
         "busy": "Estamos trabalhando para liberar recursos de gravação. Tente novamente em alguns minutos.",
         "busyTitle": "Todas as gravações estão atualmente ocupadas",
+        "copyLink": "Copiar Link",
         "error": "A gravação falhou. Tente novamente.",
+        "errorFetchingLink": "Erro ao buscar link da gravação.",
         "expandedOff": "Gravação finalizada",
         "expandedOn": "A reunião está sendo gravada.",
         "expandedPending": "Iniciando gravação...",
         "failedToStart": "Falha ao iniciar a gravação",
         "fileSharingdescription": "Compartilhar gravação com participantes da reunião",
+        "linkGenerated": "Geramos um link para sua gravação.",
         "live": "AOVIVO",
         "loggedIn": "Conectado como {{userName}}",
         "off": "Gravação parada",
@@ -639,11 +721,13 @@
         "pending": "Preparando para gravar a reunião...",
         "rec": "REC",
         "serviceDescription": "Sua gravação será salva pelo serviço de gravação",
+        "serviceDescriptionCloud": "Gravação na nuvem",
         "serviceName": "Serviço de gravação",
         "signIn": "Entrar",
         "signOut": "Sair",
         "unavailable": "Oops! O {{serviceName}} está indisponível. Estamos trabalhando para resolver o problema. Por favor, tente mais tarde.",
-        "unavailableTitle": "Gravação indisponível"
+        "unavailableTitle": "Gravação indisponível",
+        "uploadToCloud": "Enviar para a nuvem"
     },
     "sectionList": {
         "pullToRefresh": "Puxe para atualizar"
@@ -662,8 +746,13 @@
             "signedIn": "Atualmente acessando eventos do calendário para {{email}}. Clique no botão Desconectar abaixo para parar de acessar os eventos da agenda.",
             "title": "Calendário"
         },
+        "desktopShareFramerate": "Taxa de quadros do compartilhamento de desktop",
+        "desktopShareWarning": "Você precisa reiniciar o compartilhamento de tela para que as novas configurações tenham efeito.",
+        "desktopShareHighFpsWarning": "Uma taxa de quadros mais alta para compartilhamento de desktop pode afetar sua largura de banda. Você precisa reiniciar o compartilhamento de tela para que as novas configurações tenham efeito.",
         "devices": "Dispositivos",
         "followMe": "Todos me seguem",
+        "framesPerSecond": "quadros por segundo",
+        "incomingMessage": "Mensagem recebida",
         "language": "Idioma",
         "loggedIn": "Conectado como {{name}}",
         "microphones": "Microfones",
@@ -671,12 +760,18 @@
         "more": "Mais",
         "name": "Nome",
         "noDevice": "Nenhum",
+        "participantJoined": "Participante Entrou",
+        "participantLeft": "Participante Saiu",
+        "playSounds": "Tocar sons",
+        "sameAsSystem": "Igual ao sistema ({{label}})",
         "selectAudioOutput": "Saída de áudio",
         "selectCamera": "Câmera",
         "selectMic": "Microfone",
+        "sounds": "Sons",
         "speakers": "Alto-faltantes",
         "startAudioMuted": "Todos iniciam mudos",
         "startVideoMuted": "Todos iniciam ocultos",
+        "talkWhileMuted": "Falar mesmo silenciado",
         "title": "Configurações"
     },
     "settingsView": {
@@ -716,6 +811,7 @@
     },
     "startupoverlay": {
         "policyText": " ",
+        "genericTitle": "A reunião precisa usar seu microfone e câmera.",
         "title": "O {{app}} precisa usar seu microfone e câmera."
     },
     "suspendedoverlay": {
@@ -727,12 +823,14 @@
         "accessibilityLabel": {
             "audioOnly": "Alternar para apenas áudio",
             "audioRoute": "Selecionar o dispositivo de som",
+            "boo": "Vaia",
             "callQuality": "Gerenciar qualidade do vídeo",
             "cc": "Alternar legendas",
             "chat": "Alternar para janela de chat",
+            "clap": "Aplauso",
             "document": "Alternar para documento compartilhado",
             "download": "Baixe nossos aplicativos",
-            "embedMeeting": "Reunião em modo compacto",
+            "embedMeeting": "Reunião em formato compacto",
             "feedback": "Deixar feedback",
             "fullScreen": "Alternar para tela cheia",
             "grantModerator": "Atribuir Moderador",
@@ -740,6 +838,8 @@
             "help": "Ajuda",
             "invite": "Convidar pessoas",
             "kick": "Remover participante",
+            "laugh": "Risada",
+            "like": "Gostei",
             "lobbyButton": "Habilitar/desabilitar sala de espera",
             "localRecording": "Alternar controles de gravação local",
             "lockRoom": "Ativar/desativar senha de reunião",
@@ -748,36 +848,51 @@
             "moreOptions": "Mostrar mais opções",
             "mute": "Alternar mudo do áudio",
             "muteEveryone": "Silenciar todos",
+            "muteEveryoneElse": "Silenciar todos os demais",
             "muteEveryonesVideo": "Desativar a câmera de todos",
+            "muteEveryoneElsesVideo": "Desativar a câmera de todos os demais",
             "participants": "Participantes",
+            "party": "Festa",
             "pip": "Alternar modo Picture-in-Picture",
             "privateMessage": "Enviar mensagem privada",
             "profile": "Editar seu perfil",
             "raiseHand": "Alternar levantar a mão",
+            "reactionsMenu": "Abrir / fechar menu de reações",
             "recording": "Alternar gravação",
             "remoteMute": "Silenciar participante",
+            "remoteVideoMute": "Desativar a câmera do participante",
             "security": "Opções de segurança",
             "Settings": "Alternar configurações",
+            "shareaudio": "Compartilhar áudio",
             "sharedvideo": "Alternar compartilhamento de vídeo do YouTube",
             "shareRoom": "Convidar alguém",
             "shareYourScreen": "Alternar compartilhamento de tela",
             "shortcuts": "Alternar atalhos",
             "show": "Mostrar no palco",
             "speakerStats": "Alternar estatísticas do apresentador",
+            "surprised": "Surpresa",
             "tileView": "Alternar visualização em blocos",
             "toggleCamera": "Alternar câmera",
             "toggleFilmstrip": "Alterar tira de filme",
             "videomute": "Alternar mudo do vídeo",
-            "videoblur": "Alternar desfoque de vídeo"
+            "videoblur": "Alternar desfoque de vídeo",
+            "selectBackground": "Selecionar Fundo",
+            "expand": "Expandir",
+            "collapse": "Recolher"
         },
         "addPeople": "Adicionar pessoas à sua chamada",
+        "audioSettings": "Configurações de áudio",
+        "videoSettings": "Configurações de vídeo",
         "audioOnlyOff": "Desabilitar modo de largura de banda baixa",
         "audioOnlyOn": "Habilitar modo de largura de banda baixa",
         "audioRoute": "Selecionar o dispositivo de som",
         "authenticate": "Autenticar",
+        "boo": "Vaia",
         "callQuality": "Gerenciar qualidade do vídeo",
         "chat": "Abrir ou fechar o bate-papo",
+        "clap": "Aplauso",
         "closeChat": "Fechar chat",
+        "closeReactionsMenu": "Fechar menu de reações",
         "documentClose": "Fechar documento compartilhado",
         "documentOpen": "Abrir documento compartilhado",
         "download": "Baixe nossos aplicativos",
@@ -791,6 +906,8 @@
         "hangup": "Sair",
         "help": "Ajuda",
         "invite": "Convidar pessoas",
+        "laugh": "Risada",
+        "like": "Gostei",
         "lobbyButtonDisable": "Desabilitar sala de espera",
         "lobbyButtonEnable": "Habilitar sala de espera",
         "login": "Iniciar sessão",
@@ -800,6 +917,7 @@
         "moreOptions": "Mais opções",
         "mute": "Mudo / Não mudo",
         "muteEveryone": "Silenciar todos",
+        "muteEveryonesVideo": "Desativar a câmera de todos",
         "noAudioSignalTitle": "Não há entrada de áudio vindo do seu microfone!",
         "noAudioSignalDesc": "Se você não o desativou propositalmente das configurações do sistema ou do hardware, considere trocar o dispositivo.",
         "noAudioSignalDescSuggestion": "Se você não o desativou propositalmente das configurações do sistema ou do hardware, considere trocar para o dispositivo sugerido.",
@@ -808,28 +926,38 @@
         "noisyAudioInputTitle": "O seu microfone parece estar barulhento!",
         "noisyAudioInputDesc": "Parece que o microfone está fazendo barulho, considere silenciar ou alterar o dispositivo.",
         "openChat": "Abrir chat",
+        "openReactionsMenu": "Abrir menu de reações",
+        "participants": "Participantes",
+        "party": "Festa",
         "pip": "Entrar em modo Quadro-a-Quadro",
         "privateMessage": "Enviar mensagem privada",
         "profile": "Editar seu perfil",
         "raiseHand": "Erguer / Baixar sua mão",
         "raiseYourHand": "Levantar a mão",
+        "reactionBoo": "Enviar reação de vaia",
+        "reactionClap": "Enviar reação de aplauso",
+        "reactionLaugh": "Enviar reação de risada",
+        "reactionLike": "Enviar reação de gostei",
+        "reactionParty": "Enviar reação de festa",
+        "reactionSurprised": "Enviar reação de surpresa",
         "security": "Opções de segurança",
         "Settings": "Configurações",
+        "shareaudio": "Compartilhar áudio",
         "sharedvideo": "Compartilhar um vídeo do YouTube",
         "shareRoom": "Convidar alguém",
         "shortcuts": "Ver atalhos",
         "speakerStats": "Estatísticas do Apresentador",
         "startScreenSharing": "Iniciar compart. de tela",
         "startSubtitles": "Iniciar legendas",
+        "stopAudioSharing": "Parar compart. de áudio",
         "stopScreenSharing": "Parar compart. de tela",
         "stopSubtitles": "Parar legendas",
         "stopSharedVideo": "Parar vídeo do YouTube",
+        "surprised": "Surpresa",
         "talkWhileMutedPopup": "Tentando falar? Você está em mudo.",
         "tileViewToggle": "Alternar visualização em blocos",
         "toggleCamera": "Alternar câmera",
         "videomute": "Iniciar ou parar a câmera",
-        "startvideoblur": "Desfocar meu plano de fundo",
-        "stopvideoblur": "Desativar desfoque de fundo",
         "selectBackground": "Selecionar fundo"
     },
     "transcribing": {
@@ -856,6 +984,7 @@
         "react-nativeGrantPermissions": "Selecione <b><i>Permitir</i></b> quando seu navegador perguntar pelas permissões.",
         "safariGrantPermissions": "Selecione <b><i>OK</i></b> quando seu navegador perguntar pelas permissões."
     },
+    "volumeSlider": "Controle de volume",
     "videoSIPGW": {
         "busy": "Estamos trabalhando para liberar recursos. Por favor, tente novamente em alguns minutos.",
         "busyTitle": "O serviço da sala está ocupado",
@@ -878,26 +1007,29 @@
         "ld": "LD",
         "ldTooltip": "Ver vídeo em baixa definição",
         "lowDefinition": "Baixa definição (LD)",
-        "onlyAudioAvailable": "Somente áudio disponível",
-        "onlyAudioSupported": "Suportamos somente áudio neste navegador.",
         "sd": "SD",
         "sdTooltip": "Ver vídeo em definição padrão",
         "standardDefinition": "Definição padrão"
     },
     "videothumbnail": {
+        "connectionInfo": "Informações da Conexão",
         "domute": "Mudo",
+        "domuteVideo": "Desativar a câmera",
         "domuteOthers": "Silenciar todos os demais",
+        "domuteVideoOfOthers": "Desativar a câmera de todos os demais",
         "flip": "Inverter",
         "grantModerator": "Atribuir Moderador",
-        "kick": "Expulsar",
+        "kick": "Remover",
         "moderator": "Moderador",
         "mute": "Participante está mudo",
         "muted": "Mudo",
+        "videoMuted": "Câmera desativada",
         "remoteControl": "Controle remoto",
         "show": "Mostrar no palco",
         "videomute": "O participante parou a câmera"
     },
     "welcomepage": {
+        "addMeetingName": "Adicionar nome da reunião",
         "accessibilityLabel": {
             "join": "Toque para entrar",
             "roomname": "Digite o nome da sala"
@@ -914,8 +1046,14 @@
         "getHelp": "Obter ajuda",
         "go": "IR",
         "goSmall": "IR",
-        "join": "CRIAR / ENTRAR",
+        "headerTitle": "Jitsi Meet",
+        "headerSubtitle": "Reuniões com segurança e alta qualidade",
         "info": "Informações",
+        "join": "CRIAR / ENTRAR",
+        "jitsiOnMobile": "Jitsi em dispositivos móveis – baixe nossos aplicativos e inicie uma reunião em qualquer lugar",
+        "mobileDownLoadLinkIos": "Baixar aplicativo móvel para iOS",
+        "mobileDownLoadLinkAndroid": "Baixar aplicativo móvel para Android",
+        "mobileDownLoadLinkFDroid": "Baixar aplicativo móvel para F-Droid",
         "moderatedMessage": "Ou <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">agende uma URL de reunião</a> antes, onde você é o único moderador.",
         "privacy": "Política de Privacidade",
         "recentList": "Recente",
@@ -926,27 +1064,38 @@
         "roomname": "Digite o nome da sala",
         "roomnameHint": "Digite o nome ou a URL da sala que você deseja entrar. Você pode digitar um nome, e apenas deixe para as pessoas que você quer se reunir digitem o mesmo nome.",
         "sendFeedback": "Enviar comentários",
+        "startMeeting": "Iniciar reunião",
         "terms": "Termos",
-        "title": "Videoconferências mais seguras, flexíveis e totalmente gratuitas"
+        "title": "Videoconferências mais seguras, flexíveis e totalmente gratuitas",
+        "logo": {
+            "calendar": "Logo do Calendário",
+            "microsoftLogo": "Logo da Microsoft",
+            "logoDeepLinking": "Logo do Jitsi Meet",
+            "desktopPreviewThumbnail": "Miniatura de Visualização do Desktop",
+            "googleLogo": "Logo do Google",
+            "policyLogo": "Logo da Política de Privacidade"
+        }
     },
     "lonelyMeetingExperience": {
-        "youAreAlone": "Você é o único na reunião",
-        "button": "Convidar outros"
+        "button": "Convidar outros",
+        "youAreAlone": "Você é o único na reunião"
     },
     "helpView": {
         "header": "Centro de ajuda"
     },
     "lobby": {
+        "admit": "Aceitar",
+        "admitAll": "Aceitar todos",
         "knockingParticipantList": "Remover lista de participantes",
         "allow": "Permitir",
         "backToKnockModeButton": "Sem senha, peça para se juntar",
-        "dialogTitle": "modo Lobby",
-        "disableDialogContent": "O modo Lobby está habilitado. Este recurso evita que particpantes não convidados juntem-se à sua conferência. Deseja desabilitar?",
+        "dialogTitle": "Modo sala de espera",
+        "disableDialogContent": "O modo sala de espera está habilitado. Este recurso evita que particpantes não convidados juntem-se à sua conferência. Deseja desabilitar?",
         "disableDialogSubmit": "Desabilitar",
         "emailField": "Informe seu email",
         "enableDialogPasswordField": "Definir senha (opcional)",
         "enableDialogSubmit": "Habilitar",
-        "enableDialogText": "O modo Lobby protege a sua conferência, permitindo a entrada de participantes apenas após a aprovação formal do moderador.",
+        "enableDialogText": "O modo sala de espera protege a sua conferência, permitindo a entrada de participantes apenas após a aprovação formal do moderador.",
         "enterPasswordButton": "Informe a senha da conferência",
         "enterPasswordTitle": "Informe a senha para se juntar à conferência",
         "invalidPassword": "Senha inválida",
@@ -961,12 +1110,13 @@
         "nameField": "Informe seu nome",
         "notificationLobbyAccessDenied": "{{targetParticipantName}} foi rejeitado por {{originParticipantName}}",
         "notificationLobbyAccessGranted": "{{targetParticipantName}} foi aceito por {{originParticipantName}}",
-        "notificationLobbyDisabled": "Sala de Espera foi desabilitada por {{originParticipantName}}",
-        "notificationLobbyEnabled": "Sala de Espera foi habilitada por {{originParticipantName}}",
+        "notificationLobbyDisabled": "Sala de espera foi desabilitada por {{originParticipantName}}",
+        "notificationLobbyEnabled": "Sala de espera foi habilitada por {{originParticipantName}}",
         "notificationTitle": "Sala de espera",
         "passwordField": "Informe a senha da conferência",
         "passwordJoinButton": "Solicitar",
         "reject": "Rejeitar",
-        "toggleLabel": "Habilitar lobby"
+        "rejectAll": "Rejeitar todos",
+        "toggleLabel": "Habilitar sala de espera"
     }
 }

lang/main.json

@@ -58,7 +58,7 @@
         "today": "Today"
     },
     "chat": {
-        "enter": "Enter chat room",
+        "enter": "Enter room",
         "error": "Error: your message was not sent. Reason: {{error}}",
         "fieldPlaceHolder": "Type your message here",
         "messagebox": "Type a message",
@@ -66,15 +66,19 @@
         "noMessagesMessage": "There are no messages in the meeting yet. Start a conversation here!",
         "nickname": {
             "popover": "Choose a nickname",
-            "title": "Enter a nickname to use chat"
+            "title": "Enter a nickname to use chat and polls"
         },
         "privateNotice": "Private message to {{recipient}}",
-        "title": "Chat",
-        "you": "you",
         "message": "Message",
         "messageAccessibleTitle": "{{user}} says:",
         "messageAccessibleTitleMe": "me says:",
-        "smileysPanel": "Emoji panel"
+        "smileysPanel": "Emoji panel",
+        "tabs": {
+            "chat": "Chat",
+            "polls": "Polls"
+        },
+        "title": "Chat and Polls",
+        "you": "you"
     },
     "chromeExtensionBanner": {
         "installExtensionText": "Install the extension for Google Calendar and Office 365 integration",
@@ -263,6 +267,7 @@
         "muteParticipantsVideoButton": "Disable camera",
         "muteParticipantsVideoTitle": "Disable camera of this participant?",
         "muteParticipantsVideoBody": "You won't be able to turn the camera back on, but they can turn it back on at any time.",
+        "noDropboxToken": "No valid Dropbox token",
         "Ok": "OK",
         "password": "Password",
         "passwordLabel": "The meeting has been locked by a participant. Please enter the $t(lockRoomPassword) to join.",
@@ -591,6 +596,7 @@
     },
     "participantsPane": {
         "close": "Close",
+        "header": "Participants",
         "headings": {
             "lobby": "Lobby ({{count}})",
             "participantsList": "Meeting participants ({{count}})",
@@ -612,6 +618,34 @@
     },
     "passwordSetRemotely": "Set by another participant",
     "passwordDigitsOnly": "Up to {{number}} digits",
+    "polls": {
+        "create": {
+            "addOption": "Add option",
+            "answerPlaceholder": "Option {{index}}",
+            "create": "Create a poll",
+            "cancel": "Cancel",
+            "pollOption" : "Poll option {{index}}",
+            "pollQuestion" : "Poll Question",
+            "questionPlaceholder": "Ask a question",
+            "removeOption": "Remove option",
+            "send": "Send"
+        },
+        "answer": {
+            "skip": "Skip",
+            "submit": "Submit"
+        },
+        "results": {
+            "vote": "Vote",
+            "changeVote": "Change vote",
+            "empty": "There are no polls in the meeting yet. Start a poll here!",
+            "hideDetailedResults": "Hide details",
+            "showDetailedResults": "Show details"
+        },
+        "notification": {
+            "title": "A new poll was added to this meeting",
+            "description": "Open polls tab to vote"
+        }
+    },
     "poweredby": "powered by",
     "prejoin": {
         "audioAndVideoError": "Audio and video error:",
@@ -800,6 +834,7 @@
     },
     "speaker": "Speaker",
     "speakerStats": {
+        "search": "Search",
         "hours": "{{count}}h",
         "minutes": "{{count}}m",
         "name": "Name",

modules/API/external/external_api.js

@@ -170,7 +170,7 @@ function parseArguments(args) {
 
     switch (typeof firstArg) {
     case 'string': // old arguments format
-    case undefined: {
+    case 'undefined': {
         // Not sure which format but we are trying to parse the old
         // format because if the new format is used everything will be undefined
         // anyway.

package-lock.json

@@ -2913,9 +2913,9 @@
       "integrity": "sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw=="
     },
     "@react-native-async-storage/async-storage": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.13.2.tgz",
-      "integrity": "sha512-isTDvUApRJPVWFxV15yrQSOGqarX7cIedq/y4N5yWSnotf68D9qvDEv1I7rCXhkBDi0u4OJt6GA9dksUT0D3wg==",
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.15.5.tgz",
+      "integrity": "sha512-4AYehLH39B9a8UXCMf3ieOK+G61wGMP72ikx6/XSMA0DUnvx0PgaeaT2Wyt06kTrDTy8edewKnbrbeqwaM50TQ==",
       "requires": {
         "deep-assign": "^3.0.0"
       }
@@ -7539,6 +7539,11 @@
         }
       }
     },
+    "eme-encryption-scheme-polyfill": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.0.3.tgz",
+      "integrity": "sha512-44CNFMsqzHdKHrzWxlS7xZ8KUHn5XutBqpmCuWzNIynmAyFInHrrD3ozv/RvK9ZhgV6QY6Easx8EWAmxteNodg=="
+    },
     "emoji-regex": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.5.1.tgz",
@@ -8244,7 +8249,8 @@
     "events": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
-      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg=="
+      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
+      "dev": true
     },
     "eventsource": {
       "version": "1.0.7",
@@ -11016,6 +11022,11 @@
       "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz",
       "integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk="
     },
+    "keymirror": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/keymirror/-/keymirror-0.1.1.tgz",
+      "integrity": "sha1-kYiJ6hP40KQufFVyUO7nE63JXDU="
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -11076,8 +11087,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "github:jitsi/lib-jitsi-meet#b815157a22cec219a26457143b6d6cb2f430e01b",
-      "from": "github:jitsi/lib-jitsi-meet#b815157a22cec219a26457143b6d6cb2f430e01b",
+      "version": "github:jitsi/lib-jitsi-meet#c23abfa2bcd2b04710e4180f9b878bacba33ba16",
+      "from": "github:jitsi/lib-jitsi-meet#c23abfa2bcd2b04710e4180f9b878bacba33ba16",
       "requires": {
         "@jitsi/js-utils": "1.0.2",
         "@jitsi/sdp-interop": "github:jitsi/sdp-interop#5fc4af6dcf8a6e6af9fedbcd654412fd47b1b4ae",
@@ -15143,14 +15154,25 @@
         "whatwg-url-without-unicode": "8.0.0-3"
       }
     },
+    "react-native-video": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-5.1.1.tgz",
+      "integrity": "sha512-zee8gRUrjPWRoZSEBiMebClqu1iAuCQNLjzqpmXFrRWEoJj7azM3BPqLQWJgsnfLiYUYGySeApC/G60THM5+tw==",
+      "requires": {
+        "keymirror": "^0.1.1",
+        "prop-types": "^15.7.2",
+        "shaka-player": "^2.5.9"
+      }
+    },
     "react-native-watch-connectivity": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/react-native-watch-connectivity/-/react-native-watch-connectivity-0.4.3.tgz",
       "integrity": "sha512-iqdJ1KpZbR4XGahgVmaeibB7kDhyMT7wrylINgJaYBY38IAiI0LF32VX1umO4pko6n21YF5I/kSeNQ+OXGqqow=="
     },
     "react-native-webrtc": {
-      "version": "github:react-native-webrtc/react-native-webrtc#510d20dd62c1768885a98f36fde83f9e48a723fa",
-      "from": "github:react-native-webrtc/react-native-webrtc#510d20dd62c1768885a98f36fde83f9e48a723fa",
+      "version": "1.92.0",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.92.0.tgz",
+      "integrity": "sha512-nztKQ/SmO1DgA3QWCDHHK8ZVDf+5rLbmH42Ukoqnld7ut8/ehmFZXc17aSV/BN0H60jPigGqAMYopt/LZak7Sg==",
       "requires": {
         "base64-js": "^1.1.2",
         "cross-os": "^1.3.0",
@@ -15191,11 +15213,18 @@
       }
     },
     "react-native-youtube-iframe": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/react-native-youtube-iframe/-/react-native-youtube-iframe-1.2.3.tgz",
-      "integrity": "sha512-3O8OFJyohGNlYX4D97aWfLLlhEHhlLHDCLgXM+SsQBwP9r1oLnKgXWoy1gce+Vr8qgrqeQgmx1ki+10AAd4KWQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/react-native-youtube-iframe/-/react-native-youtube-iframe-2.1.1.tgz",
+      "integrity": "sha512-vnLzA5zcnMwa1gMqGfvkjaE82NW1Nd2Up4Q1OUz6IKm69xSG/9/m4APZ5fCN8UMhy6lH95iagd497J7jwEwz3w==",
       "requires": {
-        "events": "^3.0.0"
+        "events": "^3.2.0"
+      },
+      "dependencies": {
+        "events": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+          "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
+        }
       }
     },
     "react-node-resolver": {
@@ -16069,6 +16098,14 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "shaka-player": {
+      "version": "2.5.22",
+      "resolved": "https://registry.npmjs.org/shaka-player/-/shaka-player-2.5.22.tgz",
+      "integrity": "sha512-PAoeNLUQ/hT/9dY7QvNFgIiDtXSqbYVFuXXtLHh7ytVVqTvI/p4HLwfYShiR+sE/sbsDOr9D5l9D/ztLPhxgtw==",
+      "requires": {
+        "eme-encryption-scheme-polyfill": "^2.0.1"
+      }
+    },
     "shallow-clone": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",

package.json

@@ -36,7 +36,7 @@
     "@jitsi/js-utils": "1.0.6",
     "@material-ui/core": "4.11.3",
     "@microsoft/microsoft-graph-client": "1.1.0",
-    "@react-native-async-storage/async-storage": "1.13.2",
+    "@react-native-async-storage/async-storage": "1.15.5",
     "@react-native-community/google-signin": "3.0.1",
     "@react-native-community/netinfo": "4.1.5",
     "@react-native-community/slider": "3.0.3",
@@ -56,7 +56,7 @@
     "jquery-i18next": "1.2.1",
     "js-md5": "0.6.1",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#b815157a22cec219a26457143b6d6cb2f430e01b",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#c23abfa2bcd2b04710e4180f9b878bacba33ba16",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.21",
     "moment": "2.29.1",
@@ -87,10 +87,11 @@
     "react-native-svg": "12.1.0",
     "react-native-svg-transformer": "0.14.3",
     "react-native-url-polyfill": "1.2.0",
+    "react-native-video": "5.1.1",
     "react-native-watch-connectivity": "0.4.3",
-    "react-native-webrtc": "github:react-native-webrtc/react-native-webrtc#510d20dd62c1768885a98f36fde83f9e48a723fa",
+    "react-native-webrtc": "1.92.0",
     "react-native-webview": "11.0.2",
-    "react-native-youtube-iframe": "1.2.3",
+    "react-native-youtube-iframe": "2.1.1",
     "react-redux": "7.1.0",
     "react-textarea-autosize": "8.3.0",
     "react-transition-group": "2.4.0",

react/features/app/middlewares.any.js

@@ -34,6 +34,8 @@ import '../large-video/middleware';
 import '../lobby/middleware';
 import '../notifications/middleware';
 import '../overlay/middleware';
+import '../polls/middleware';
+import '../polls/subscriber';
 import '../reactions/middleware';
 import '../recent-list/middleware';
 import '../recording/middleware';

react/features/app/reducers.any.js

@@ -41,6 +41,7 @@ import '../lobby/reducer';
 import '../notifications/reducer';
 import '../overlay/reducer';
 import '../participants-pane/reducer';
+import '../polls/reducer';
 import '../reactions/reducer';
 import '../recent-list/reducer';
 import '../recording/reducer';

react/features/av-moderation/actions.js

@@ -53,20 +53,20 @@ export const disableModeration = (mediaType: MediaType, actor: Object) => {
  * @returns {Object}
  */
 export function dismissPendingAudioParticipant(participant: Object) {
-    return dismissPendingParticipant(participant, MEDIA_TYPE.AUDIO);
+    return dismissPendingParticipant(participant.id, MEDIA_TYPE.AUDIO);
 }
 
 /**
  * Hides the notification with the participant that asked to unmute.
  *
- * @param {Object} participant - The participant for which the notification to be hidden.
+ * @param {string} id - The participant id for which the notification to be hidden.
  * @param {MediaType} mediaType - The media type.
  * @returns {Object}
  */
-export function dismissPendingParticipant(participant: Object, mediaType: MediaType) {
+export function dismissPendingParticipant(id: string, mediaType: MediaType) {
     return {
         type: DISMISS_PENDING_PARTICIPANT,
-        participant,
+        id,
         mediaType
     };
 }

react/features/av-moderation/reducer.js

@@ -135,7 +135,7 @@ ReducerRegistry.register('features/av-moderation', (state = initialState, action
         }
 
         if (videoModerationEnabled) {
-            hasStateChanged = _updatePendingParticipant(MEDIA_TYPE.VIDEO, participant, state);
+            hasStateChanged = hasStateChanged || _updatePendingParticipant(MEDIA_TYPE.VIDEO, participant, state);
         }
 
         // If the state has changed we need to return a new object reference in order to trigger subscriber updates.
@@ -183,19 +183,19 @@ ReducerRegistry.register('features/av-moderation', (state = initialState, action
     }
 
     case DISMISS_PENDING_PARTICIPANT: {
-        const { participant, mediaType } = action;
+        const { id, mediaType } = action;
 
         if (mediaType === MEDIA_TYPE.AUDIO) {
             return {
                 ...state,
-                pendingAudio: state.pendingAudio.filter(pending => pending.id !== participant.id)
+                pendingAudio: state.pendingAudio.filter(pending => pending.id !== id)
             };
         }
 
         if (mediaType === MEDIA_TYPE.VIDEO) {
             return {
                 ...state,
-                pendingVideo: state.pendingVideo.filter(pending => pending.id !== participant.id)
+                pendingVideo: state.pendingVideo.filter(pending => pending.id !== id)
             };
         }
 

react/features/base/conference/actions.js

@@ -6,7 +6,6 @@ import {
     createStartMutedConfigurationEvent,
     sendAnalytics
 } from '../../analytics';
-import { getName } from '../../app/functions';
 import { endpointMessageReceived } from '../../subtitles';
 import { getReplaceParticipant } from '../config/functions';
 import { JITSI_CONNECTION_CONFERENCE_KEY } from '../connection';
@@ -14,7 +13,6 @@ import { JitsiConferenceEvents } from '../lib-jitsi-meet';
 import { MEDIA_TYPE, setAudioMuted, setVideoMuted } from '../media';
 import {
     dominantSpeakerChanged,
-    getLocalParticipant,
     getNormalizedDisplayName,
     participantConnectionStatusChanged,
     participantKicked,
@@ -24,11 +22,7 @@ import {
     participantUpdated
 } from '../participants';
 import { getLocalTracks, replaceLocalTrack, trackAdded, trackRemoved } from '../tracks';
-import {
-    getBackendSafePath,
-    getBackendSafeRoomName,
-    getJitsiMeetGlobalNS
-} from '../util';
+import { getBackendSafeRoomName } from '../util';
 
 import {
     AUTH_STATUS_CHANGED,
@@ -61,6 +55,7 @@ import {
     _addLocalTracksToConference,
     commonUserJoinedHandling,
     commonUserLeftHandling,
+    getConferenceOptions,
     getCurrentConference,
     sendLocalParticipant
 } from './functions';
@@ -434,22 +429,7 @@ export function createConference() {
             throw new Error('Cannot join a conference without a room name!');
         }
 
-        const config = state['features/base/config'];
-        const { tenant } = state['features/base/jwt'];
-        const { email, name: nick } = getLocalParticipant(state);
-
-        const conference
-            = connection.initJitsiConference(
-
-                getBackendSafeRoomName(room), {
-                    ...config,
-                    applicationName: getName(),
-                    getWiFiStatsMethod: getJitsiMeetGlobalNS().getWiFiStats,
-                    confID: `${locationURL.host}${getBackendSafePath(locationURL.pathname)}`,
-                    siteID: tenant,
-                    statisticsDisplayName: config.enableDisplayNameInStats ? nick : undefined,
-                    statisticsId: config.enableEmailInStats ? email : undefined
-                });
+        const conference = connection.initJitsiConference(getBackendSafeRoomName(room), getConferenceOptions(state));
 
         connection[JITSI_CONNECTION_CONFERENCE_KEY] = conference;
 

react/features/base/conference/functions.js

@@ -2,6 +2,8 @@
 
 import _ from 'lodash';
 
+import { getName } from '../../app/functions';
+import { determineTranscriptionLanguage } from '../../transcribing/functions';
 import { JitsiTrackErrors } from '../lib-jitsi-meet';
 import {
     getLocalParticipant,
@@ -11,7 +13,7 @@ import {
     participantLeft
 } from '../participants';
 import { toState } from '../redux';
-import { safeDecodeURIComponent } from '../util';
+import { getBackendSafePath, getJitsiMeetGlobalNS, safeDecodeURIComponent } from '../util';
 
 import {
     AVATAR_URL_COMMAND,
@@ -198,6 +200,54 @@ export function getConferenceNameForTitle(stateful: Function | Object) {
     return safeStartCase(safeDecodeURIComponent(getConferenceState(toState(stateful)).room));
 }
 
+/**
+ * Returns an object aggregating the conference options.
+ *
+ * @param {Object|Function} stateful - The redux store state.
+ * @returns {Object} - Options object.
+ */
+export function getConferenceOptions(stateful: Function | Object) {
+    const state = toState(stateful);
+
+    const config = state['features/base/config'];
+    const { locationURL } = state['features/base/connection'];
+    const { tenant } = state['features/base/jwt'];
+    const { email, name: nick } = getLocalParticipant(state);
+    const options = { ...config };
+
+    if (tenant) {
+        options.siteID = tenant;
+    }
+
+    if (options.enableDisplayNameInStats && nick) {
+        options.statisticsDisplayName = nick;
+    }
+
+    if (options.enableEmailInStats && email) {
+        options.statisticsId = email;
+    }
+
+    if (locationURL) {
+        options.confID = `${locationURL.host}${getBackendSafePath(locationURL.pathname)}`;
+    }
+
+    options.applicationName = getName();
+    options.transcriptionLanguage = determineTranscriptionLanguage(options);
+
+    // Disable analytics, if requessted.
+    if (options.disableThirdPartyRequests) {
+        delete config.analytics.scriptURLs;
+        delete config.analytics.amplitudeAPPKey;
+        delete config.analytics.googleAnalyticsTrackingId;
+        delete options.callStatsID;
+        delete options.callStatsSecret;
+    } else {
+        options.getWiFiStatsMethod = getWiFiStatsMethod;
+    }
+
+    return options;
+}
+
 /**
 * Returns the UTC timestamp when the first participant joined the conference.
 *
@@ -244,6 +294,21 @@ export function getRoomName(state: Object): string {
     return getConferenceState(state).room;
 }
 
+/**
+ * Returns the result of getWiFiStats from the global NS or does nothing
+ * (returns empty result).
+ * Fixes a concurrency problem where we need to pass a function when creating
+ * a JitsiConference, but that method is added to the context later.
+ *
+ * @returns {Promise}
+ * @private
+ */
+function getWiFiStatsMethod() {
+    const gloabalNS = getJitsiMeetGlobalNS();
+
+    return gloabalNS.getWiFiStats ? gloabalNS.getWiFiStats() : Promise.resolve('{}');
+}
+
 /**
  * Handle an error thrown by the backend (i.e. {@code lib-jitsi-meet}) while
  * manipulating a conference participant (e.g. Pin or select participant).

react/features/base/config/configWhitelist.js

@@ -50,6 +50,7 @@ export default [
      */
     'callHandle',
     'callStatsConfIDNamespace',
+    'callStatsConfigParams',
     'callStatsID',
     'callStatsSecret',
 
@@ -91,6 +92,7 @@ export default [
     'disableJoinLeaveSounds',
     'disableLocalVideoFlip',
     'disableNS',
+    'disablePolls',
     'disableProfile',
     'disableRemoteControl',
     'disableRemoteMute',
@@ -98,6 +100,7 @@ export default [
     'disableRtx',
     'disableShortcuts',
     'disableShowMoreStats',
+    'disableSpeakerStatsSearch',
     'disableSimulcast',
     'disableThirdPartyRequests',
     'disableTileView',

react/features/base/config/constants.js

@@ -14,10 +14,35 @@ export const _CONFIG_STORE_PREFIX = 'config.js';
  * @type Array<string>
  */
 export const TOOLBAR_BUTTONS = [
-    'microphone', 'camera', 'closedcaptions', 'desktop', 'embedmeeting', 'fullscreen',
-    'fodeviceselection', 'hangup', 'profile', 'chat', 'recording',
-    'livestreaming', 'etherpad', 'sharedvideo', 'shareaudio', 'settings', 'raisehand',
-    'videoquality', 'filmstrip', 'participants-pane', 'feedback', 'stats', 'shortcuts',
-    'tileview', 'toggle-camera', 'select-background', 'download', 'help', 'mute-everyone', 'mute-video-everyone',
-    'security'
+    'camera',
+    'chat',
+    'closedcaptions',
+    'desktop',
+    'download',
+    'embedmeeting',
+    'etherpad',
+    'feedback',
+    'filmstrip',
+    'fullscreen',
+    'hangup',
+    'help',
+    'invite',
+    'livestreaming',
+    'microphone',
+    'mute-everyone',
+    'mute-video-everyone',
+    'participants-pane',
+    'profile',
+    'raisehand',
+    'recording',
+    'security',
+    'select-background',
+    'settings',
+    'shareaudio',
+    'sharedvideo',
+    'shortcuts',
+    'stats',
+    'tileview',
+    'toggle-camera',
+    'videoquality'
 ];

react/features/base/dialog/components/native/BaseDialog.js

@@ -50,7 +50,7 @@ class BaseDialog<P: Props, S: State> extends AbstractDialog<P, S> {
      * @returns {ReactElement}
      */
     render() {
-        const { _dialogStyles, style } = this.props;
+        const { _dialogStyles, style, t, titleKey } = this.props;
 
         return (
             <TouchableWithoutFeedback>
@@ -65,13 +65,18 @@ class BaseDialog<P: Props, S: State> extends AbstractDialog<P, S> {
                             _dialogStyles.dialog,
                             style
                         ] }>
-                        <TouchableOpacity
-                            onPress = { this._onCancel }
-                            style = { styles.closeWrapper }>
-                            <Icon
-                                src = { IconClose }
-                                style = { _dialogStyles.closeStyle } />
-                        </TouchableOpacity>
+                        <View style = { styles.headerWrapper }>
+                            <Text style = { styles.dialogTitle }>
+                                { titleKey ? t(titleKey) : ' ' }
+                            </Text>
+                            <TouchableOpacity
+                                onPress = { this._onCancel }
+                                style = { styles.closeWrapper }>
+                                <Icon
+                                    src = { IconClose }
+                                    style = { _dialogStyles.closeStyle } />
+                            </TouchableOpacity>
+                        </View>
                         { this._renderContent() }
                     </View>
                 </KeyboardAvoidingView>

react/features/base/dialog/components/native/BottomSheet.js

@@ -142,7 +142,9 @@ class BottomSheet extends PureComponent<Props> {
                     <SafeAreaView
                         style = { [
                             styles.sheetItemContainer,
-                            _styles.sheet,
+                            renderHeader
+                                ? _styles.sheetHeader
+                                : _styles.sheet,
                             style,
                             {
                                 maxHeight: _height - 100

react/features/base/dialog/components/native/ConfirmDialog.js

@@ -28,6 +28,12 @@ type Props = BaseProps & {
      */
     contentKey: string | { key: string, params: Object},
 
+    /**
+     * The handler for the event when clicking the 'confirmNo' button.
+     * Defaults to onCancel if absent.
+     */
+    onDecline?: Function,
+
     t: Function
 }
 
@@ -55,11 +61,11 @@ class ConfirmDialog extends BaseSubmitDialog<Props, *> {
      * @inheritdoc
      */
     _renderAdditionalButtons() {
-        const { _dialogStyles, cancelKey, t } = this.props;
+        const { _dialogStyles, cancelKey, onDecline, t } = this.props;
 
         return (
             <TouchableOpacity
-                onPress = { this._onCancel }
+                onPress = { onDecline || this._onCancel }
                 style = { [
                     _dialogStyles.button,
                     brandedDialog.buttonFarLeft,

react/features/base/dialog/components/native/styles.js

@@ -2,6 +2,7 @@
 
 import { StyleSheet } from 'react-native';
 
+import BaseTheme from '../../../../base/ui/components/BaseTheme.native';
 import { ColorSchemeRegistry, schemeColor } from '../../../color-scheme';
 import { BoxModel, ColorPalette } from '../../../styles';
 import { PREFERRED_DIALOG_SIZE } from '../../constants';
@@ -80,10 +81,20 @@ export const brandedDialog = {
     },
 
     closeWrapper: {
-        alignSelf: 'flex-end',
         padding: BoxModel.padding
     },
 
+    dialogTitle: {
+        fontWeight: 'bold',
+        paddingLeft: BoxModel.padding * 2
+    },
+
+    headerWrapper: {
+        alignItems: 'center',
+        flexDirection: 'row',
+        justifyContent: 'space-between'
+    },
+
     mainWrapper: {
         alignSelf: 'stretch',
         padding: BoxModel.padding * 2,
@@ -171,7 +182,7 @@ ColorSchemeRegistry.register('BottomSheet', {
          */
         labelStyle: {
             ...brandedDialogLabelStyle,
-            marginLeft: 32
+            marginLeft: 16
         },
 
         /**
@@ -179,7 +190,6 @@ ColorSchemeRegistry.register('BottomSheet', {
          */
         style: {
             ...brandedDialogItemContainerStyle,
-            backgroundColor: ColorPalette.darkBackground,
             paddingHorizontal: MD_ITEM_MARGIN_PADDING
         },
 
@@ -193,9 +203,16 @@ ColorSchemeRegistry.register('BottomSheet', {
      * Bottom sheet's base style.
      */
     sheet: {
-        backgroundColor: ColorPalette.black,
+        backgroundColor: BaseTheme.palette.ui02,
         borderTopLeftRadius: 16,
         borderTopRightRadius: 16
+    },
+
+    /**
+     * Bottom sheet's base style with header.
+     */
+    sheetHeader: {
+        backgroundColor: BaseTheme.palette.ui02
     }
 });
 

react/features/base/dialog/components/web/StatelessDialog.js

@@ -71,6 +71,12 @@ type Props = {
      */
     isModal: boolean,
 
+    /**
+     * The handler for the event when clicking the 'confirmNo' button.
+     * Defaults to onCancel if absent.
+     */
+    onDecline?: Function,
+
     /**
      * Disables rendering of the submit button.
      */
@@ -268,7 +274,8 @@ class StatelessDialog extends Component<Props> {
         }
 
         const {
-            t /* The following fixes a flow error: */ = _.identity
+            t /* The following fixes a flow error: */ = _.identity,
+            onDecline
         } = this.props;
 
         return (
@@ -276,7 +283,7 @@ class StatelessDialog extends Component<Props> {
                 appearance = 'subtle'
                 id = { CANCEL_BUTTON_ID }
                 key = 'cancel'
-                onClick = { this._onCancel }
+                onClick = { onDecline || this._onCancel }
                 type = 'button'>
                 { t(this.props.cancelKey || 'dialog.Cancel') }
             </Button>

react/features/base/flags/constants.js

@@ -92,6 +92,12 @@ export const IOS_RECORDING_ENABLED = 'ios.recording.enabled';
  */
 export const IOS_SCREENSHARING_ENABLED = 'ios.screensharing.enabled';
 
+/**
+ * Flag indicating if screen sharing should be enabled in android.
+ * Default: enabled (true).
+ */
+export const ANDROID_SCREENSHARING_ENABLED = 'android.screensharing.enabled';
+
 /**
  * Flag indicating if kickout is enabled.
  * Default: enabled (true).

react/features/base/participants/components/ParticipantView.native.js

@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { Text, View } from 'react-native';
 
-import { YoutubeLargeVideo } from '../../../shared-video/components';
+import { SharedVideo } from '../../../shared-video/components/native';
 import { Avatar } from '../../avatar';
 import { translate } from '../../i18n';
 import { JitsiParticipantConnectionStatus } from '../../lib-jitsi-meet';
@@ -208,11 +208,11 @@ class ParticipantView extends Component<Props> {
                 ? this.props.testHintId
                 : `org.jitsi.meet.Participant#${this.props.participantId}`;
 
-        const renderYoutubeLargeVideo = _isFakeParticipant && !disableVideo;
+        const renderSharedVideo = _isFakeParticipant && !disableVideo;
 
         return (
             <Container
-                onClick = { renderVideo || renderYoutubeLargeVideo ? undefined : onPress }
+                onClick = { renderVideo || renderSharedVideo ? undefined : onPress }
                 style = {{
                     ...styles.participantView,
                     ...this.props.style
@@ -221,10 +221,10 @@ class ParticipantView extends Component<Props> {
 
                 <TestHint
                     id = { testHintId }
-                    onPress = { renderYoutubeLargeVideo ? undefined : onPress }
+                    onPress = { renderSharedVideo ? undefined : onPress }
                     value = '' />
 
-                { renderYoutubeLargeVideo && <YoutubeLargeVideo youtubeId = { this.props.participantId } /> }
+                { renderSharedVideo && <SharedVideo /> }
 
                 { !_isFakeParticipant && renderVideo
                     && <VideoTrack
@@ -234,7 +234,7 @@ class ParticipantView extends Component<Props> {
                         zOrder = { this.props.zOrder }
                         zoomEnabled = { this.props.zoomEnabled } /> }
 
-                { !renderYoutubeLargeVideo && !renderVideo
+                { !renderSharedVideo && !renderVideo
                     && <View style = { styles.avatarContainer }>
                         <Avatar
                             participantId = { this.props.participantId }

react/features/base/tracks/actions.js

@@ -227,7 +227,7 @@ export function noDataFromSource(track) {
  * @returns {Function}
  */
 export function showNoDataFromSourceVideoError(jitsiTrack) {
-    return (dispatch, getState) => {
+    return async (dispatch, getState) => {
         let notificationInfo;
 
         const track = getTrackByJitsiTrack(getState()['features/base/tracks'], jitsiTrack);
@@ -239,12 +239,11 @@ export function showNoDataFromSourceVideoError(jitsiTrack) {
         if (track.isReceivingData) {
             notificationInfo = undefined;
         } else {
-            const notificationAction = showErrorNotification({
+            const notificationAction = await dispatch(showErrorNotification({
                 descriptionKey: 'dialog.cameraNotSendingData',
                 titleKey: 'dialog.cameraNotSendingDataTitle'
-            });
+            }));
 
-            dispatch(notificationAction);
             notificationInfo = {
                 uid: notificationAction.uid
             };
@@ -362,7 +361,7 @@ function replaceStoredTracks(oldTrack, newTrack) {
  * @returns {{ type: TRACK_ADDED, track: Track }}
  */
 export function trackAdded(track) {
-    return (dispatch, getState) => {
+    return async (dispatch, getState) => {
         track.on(
             JitsiTrackEvents.TRACK_MUTE_CHANGED,
             () => dispatch(trackMutedChanged(track)));
@@ -389,12 +388,10 @@ export function trackAdded(track) {
             track.on(JitsiTrackEvents.NO_DATA_FROM_SOURCE, () => dispatch(noDataFromSource({ jitsiTrack: track })));
             if (!isReceivingData) {
                 if (mediaType === MEDIA_TYPE.AUDIO) {
-                    const notificationAction = showNotification({
+                    const notificationAction = await dispatch(showNotification({
                         descriptionKey: 'dialog.micNotSendingData',
                         titleKey: 'dialog.micNotSendingDataTitle'
-                    });
-
-                    dispatch(notificationAction);
+                    }));
 
                     // Set the notification ID so that other parts of the application know that this was
                     // displayed in the context of the current device.

react/features/base/ui/Tokens.js

@@ -18,6 +18,7 @@ export const colors = {
     primary08: '#99BBF3',
     primary09: '#CCDDF9',
 
+    surface00: '#111111',
     surface01: '#040404',
     surface02: '#141414',
     surface03: '#292929',
@@ -29,6 +30,7 @@ export const colors = {
     surface09: '#C2C2C2',
     surface10: '#E0E0E0',
     surface11: '#FFF',
+    surface12: '#AAAAAA',
 
     success04: '#189B55',
     success05: '#1EC26A',
@@ -109,6 +111,9 @@ export const colorMap = {
     // Disabled state for danger buttons
     actionDangerDisabled: 'error03',
 
+    // Bottom sheet background
+    bottomSheet: 'surface00',
+
     // Primary text – default color for body copy & headers
     text01: 'surface11',
 
@@ -118,6 +123,9 @@ export const colorMap = {
     // Tertiary text with low contrast – placeholders, disabled actions, label for disabled buttons
     text03: 'surface07',
 
+    // Text for bottom sheet items
+    text04: 'surface12',
+
     // error messages
     textError: 'error06',
 
@@ -149,6 +157,9 @@ export const colorMap = {
     // Background for high-contrast input fields
     field02: 'surface11',
 
+    // Color for the section divider
+    dividerColor: 'surface12',
+
     // Background for high-contrast input fields on hover
     field02Hover: 'primary09',
 

react/features/chat/actionTypes.js

@@ -64,3 +64,13 @@ export const SEND_MESSAGE = 'SEND_MESSAGE';
  * }
  */
 export const SET_PRIVATE_MESSAGE_RECIPIENT = 'SET_PRIVATE_MESSAGE_RECIPIENT';
+
+/**
+ * The type of action which signals the update a _isPollsTabFocused.
+ *
+ * {
+ *     isPollsTabFocused: boolean,
+ *     type: SET_PRIVATE_MESSAGE_RECIPIENT
+ * }
+ */
+export const SET_IS_POLL_TAB_FOCUSED = 'SET_IS_POLL_TAB_FOCUSED';

react/features/chat/actions.any.js

@@ -5,7 +5,8 @@ import {
     CLEAR_MESSAGES,
     CLOSE_CHAT,
     SEND_MESSAGE,
-    SET_PRIVATE_MESSAGE_RECIPIENT
+    SET_PRIVATE_MESSAGE_RECIPIENT,
+    SET_IS_POLL_TAB_FOCUSED
 } from './actionTypes';
 
 /**
@@ -97,3 +98,16 @@ export function setPrivateMessageRecipient(participant: Object) {
         type: SET_PRIVATE_MESSAGE_RECIPIENT
     };
 }
+
+/**
+ * Set the value of _isPollsTabFocused.
+ *
+ * @param {boolean} isPollsTabFocused - The new value for _isPollsTabFocused.
+ * @returns {Function}
+ */
+export function setIsPollsTabFocused(isPollsTabFocused: boolean) {
+    return {
+        isPollsTabFocused,
+        type: SET_IS_POLL_TAB_FOCUSED
+    };
+}

react/features/chat/components/AbstractChat.js

@@ -4,7 +4,7 @@ import { Component } from 'react';
 import type { Dispatch } from 'redux';
 
 import { getLocalParticipant } from '../../base/participants';
-import { sendMessage } from '../actions';
+import { sendMessage, setIsPollsTabFocused } from '../actions';
 import { SMALL_WIDTH_THRESHOLD } from '../constants';
 
 /**
@@ -22,11 +22,31 @@ export type Props = {
      */
     _isOpen: boolean,
 
+    /**
+     * True if the polls feature is enabled.
+     */
+    _isPollsEnabled: boolean,
+
+    /**
+     * Whether the poll tab is focused or not.
+     */
+    _isPollsTabFocused: boolean,
+
     /**
      * All the chat messages in the conference.
      */
     _messages: Array<Object>,
 
+    /**
+     * Number of unread chat messages.
+     */
+    _nbUnreadMessages: number,
+
+    /**
+     * Number of unread poll messages.
+     */
+    _nbUnreadPolls: number,
+
     /**
      * Function to send a text message.
      *
@@ -34,6 +54,20 @@ export type Props = {
      */
     _onSendMessage: Function,
 
+    /**
+     * Function to display the chat tab.
+     *
+     * @protected
+     */
+    _onToggleChatTab: Function,
+
+    /**
+     * Function to display the polls tab.
+     *
+     * @protected
+     */
+    _onTogglePollsTab: Function,
+
     /**
      * Function to toggle the chat window.
      */
@@ -52,7 +86,7 @@ export type Props = {
     /**
      * Function to be used to translate i18n labels.
      */
-    t: Function
+    t: Function,
 };
 
 /**
@@ -71,6 +105,8 @@ export default class AbstractChat<P: Props> extends Component<P> {
 
         // Bind event handlers so they are only bound once per instance.
         this._onSendMessage = this._onSendMessage.bind(this);
+        this._onToggleChatTab = this._onToggleChatTab.bind(this);
+        this._onTogglePollsTab = this._onTogglePollsTab.bind(this);
     }
 
     _onSendMessage: (string) => void;
@@ -86,6 +122,30 @@ export default class AbstractChat<P: Props> extends Component<P> {
     _onSendMessage(text: string) {
         this.props.dispatch(sendMessage(text));
     }
+
+    _onToggleChatTab: () => void;
+
+    /**
+     * Display the Chat tab.
+     *
+     * @private
+     * @returns {void}
+     */
+    _onToggleChatTab() {
+        this.props.dispatch(setIsPollsTabFocused(false));
+    }
+
+    _onTogglePollsTab: () => void;
+
+    /**
+     * Display the Polls tab.
+     *
+     * @private
+     * @returns {void}
+     */
+    _onTogglePollsTab() {
+        this.props.dispatch(setIsPollsTabFocused(true));
+    }
 }
 
 /**
@@ -101,13 +161,19 @@ export default class AbstractChat<P: Props> extends Component<P> {
  * }}
  */
 export function _mapStateToProps(state: Object) {
-    const { isOpen, messages } = state['features/chat'];
+    const { isOpen, isPollsTabFocused, messages, nbUnreadMessages } = state['features/chat'];
+    const { nbUnreadPolls } = state['features/polls'];
     const _localParticipant = getLocalParticipant(state);
+    const { disablePolls } = state['features/base/config'];
 
     return {
         _isModal: window.innerWidth <= SMALL_WIDTH_THRESHOLD,
         _isOpen: isOpen,
+        _isPollsEnabled: !disablePolls,
+        _isPollsTabFocused: isPollsTabFocused,
         _messages: messages,
+        _nbUnreadMessages: nbUnreadMessages,
+        _nbUnreadPolls: nbUnreadPolls,
         _showNamePrompt: !_localParticipant?.name
     };
 }

react/features/chat/components/native/Chat.js

@@ -1,12 +1,15 @@
 // @flow
 
 import React from 'react';
+import { View } from 'react-native';
+import { Button } from 'react-native-paper';
 
 import { translate } from '../../../base/i18n';
 import { JitsiModal } from '../../../base/modal';
 import { connect } from '../../../base/redux';
+import { PollsPane } from '../../../polls/components';
 import { closeChat } from '../../actions.any';
-import { CHAT_VIEW_MODAL_ID } from '../../constants';
+import { BUTTON_MODES, CHAT_VIEW_MODAL_ID } from '../../constants';
 import AbstractChat, {
     _mapStateToProps,
     type Props
@@ -15,6 +18,7 @@ import AbstractChat, {
 import ChatInputBar from './ChatInputBar';
 import MessageContainer from './MessageContainer';
 import MessageRecipient from './MessageRecipient';
+import styles from './styles';
 
 /**
  * Implements a React native component that renders the chat window (modal) of
@@ -45,10 +49,49 @@ class Chat extends AbstractChat<Props> {
                 }}
                 modalId = { CHAT_VIEW_MODAL_ID }
                 onClose = { this._onClose }>
-
-                <MessageContainer messages = { this.props._messages } />
-                <MessageRecipient />
-                <ChatInputBar onSend = { this._onSendMessage } />
+                {this.props._isPollsEnabled && <View style = { styles.tabContainer }>
+                    <Button
+                        color = '#17a0db'
+                        mode = {
+                            this.props._isPollsTabFocused
+                                ? BUTTON_MODES.CONTAINED
+                                : BUTTON_MODES.TEXT
+                        }
+                        onPress = { this._onToggleChatTab }
+                        style = { styles.tabLeftButton }
+                        uppercase = { false }>
+                        {`${this.props.t('chat.tabs.chat')}${this.props._isPollsTabFocused
+                                && this.props._nbUnreadMessages > 0
+                            ? `(${this.props._nbUnreadMessages})`
+                            : ''
+                        }`}
+                    </Button>
+                    <Button
+                        color = '#17a0db'
+                        mode = {
+                            this.props._isPollsTabFocused
+                                ? BUTTON_MODES.TEXT
+                                : BUTTON_MODES.CONTAINED
+                        }
+                        onPress = { this._onTogglePollsTab }
+                        style = { styles.tabRightButton }
+                        uppercase = { false }>
+                        {`${this.props.t('chat.tabs.polls')}${!this.props._isPollsTabFocused
+                                && this.props._nbUnreadPolls > 0
+                            ? `(${this.props._nbUnreadPolls})`
+                            : ''
+                        }`}
+                    </Button>
+                </View>}
+                {this.props._isPollsTabFocused
+                    ? <PollsPane />
+                    : (
+                    <>
+                        <MessageContainer messages = { this.props._messages } />
+                        <MessageRecipient />
+                        <ChatInputBar onSend = { this._onSendMessage } />
+                    </>
+                    )}
             </JitsiModal>
         );
     }
@@ -57,6 +100,9 @@ class Chat extends AbstractChat<Props> {
 
     _onClose: () => boolean
 
+    _onTogglePollsTab: () => void;
+    _onToggleChatTab: () => void;
+
     /**
      * Closes the modal.
      *

react/features/chat/components/native/styles.js

@@ -124,6 +124,25 @@ export default {
     timeText: {
         color: 'rgb(164, 184, 209)',
         fontSize: 13
+    },
+
+    tabContainer: {
+        flexDirection: 'row',
+        justifyContent: 'center'
+    },
+
+    tabLeftButton: {
+        flex: 1,
+        borderTopLeftRadius: 0,
+        borderTopRightRadius: 0,
+        borderBottomLeftRadius: 0
+    },
+
+    tabRightButton: {
+        flex: 1,
+        borderTopLeftRadius: 0,
+        borderTopRightRadius: 0,
+        borderBottomRightRadius: 0
     }
 };
 

react/features/chat/components/web/Chat.js

@@ -4,6 +4,7 @@ import React from 'react';
 
 import { translate } from '../../../base/i18n';
 import { connect } from '../../../base/redux';
+import { PollsPane } from '../../../polls/components';
 import { toggleChat } from '../../actions.web';
 import AbstractChat, {
     _mapStateToProps,
@@ -128,8 +129,20 @@ class Chat extends AbstractChat<Props> {
      * @returns {ReactElement}
      */
     _renderChat() {
+
+        if (this.props._isPollsTabFocused) {
+            return (
+                <>
+                    { this.props._isPollsEnabled && this._renderTabs()}
+                    <PollsPane />
+                    <KeyboardAvoider />
+                </>
+            );
+        }
+
         return (
             <>
+                {this.props._isPollsEnabled && this._renderTabs()}
                 <TouchmoveHack isModal = { this.props._isModal }>
                     <MessageContainer
                         messages = { this.props._messages }
@@ -144,6 +157,50 @@ class Chat extends AbstractChat<Props> {
         );
     }
 
+    /**
+     * Returns a React Element showing the Chat and Polls tab.
+     *
+     * @private
+     * @returns {ReactElement}
+     */
+    _renderTabs() {
+
+        return (
+            <div className = { 'chat-tabs-container' }>
+                <div
+                    className = { `chat-tab ${
+                        this.props._isPollsTabFocused ? '' : 'chat-tab-focus'
+                    }` }
+                    onClick = { this._onToggleChatTab }>
+                    <span className = { 'chat-tab-title' }>
+                        {this.props.t('chat.tabs.chat')}
+                    </span>
+                    {this.props._isPollsTabFocused
+                        && this.props._nbUnreadMessages > 0 && (
+                        <span className = { 'chat-tab-badge' }>
+                            {this.props._nbUnreadMessages}
+                        </span>
+                    )}
+                </div>
+                <div
+                    className = { `chat-tab ${
+                        this.props._isPollsTabFocused ? 'chat-tab-focus' : ''
+                    }` }
+                    onClick = { this._onTogglePollsTab }>
+                    <span className = { 'chat-tab-title' }>
+                        {this.props.t('chat.tabs.polls')}
+                    </span>
+                    {!this.props._isPollsTabFocused
+                        && this.props._nbUnreadPolls > 0 && (
+                        <span className = { 'chat-tab-badge' }>
+                            {this.props._nbUnreadPolls}
+                        </span>
+                    )}
+                </div>
+            </div>
+        );
+    }
+
     /**
      * Instantiates a React Element to display at the top of {@code Chat} to
      * close {@code Chat}.
@@ -233,6 +290,8 @@ class Chat extends AbstractChat<Props> {
     _onToggleChat() {
         this.props.dispatch(toggleChat());
     }
+    _onTogglePollsTab: () => void;
+    _onToggleChatTab: () => void;
 
 }
 

react/features/chat/components/web/ChatCounter.js

@@ -3,6 +3,7 @@
 import React, { Component } from 'react';
 
 import { connect } from '../../../base/redux';
+import { getUnreadPollCount } from '../../../polls/functions';
 import { getUnreadCount } from '../../functions';
 
 /**
@@ -64,8 +65,10 @@ function _mapStateToProps(state) {
     const { isOpen } = state['features/chat'];
 
     return {
-        _count: getUnreadCount(state),
+
+        _count: getUnreadCount(state) + getUnreadPollCount(state),
         _isOpen: isOpen
+
     };
 }
 

react/features/chat/constants.js

@@ -31,3 +31,11 @@ export const MESSAGE_TYPE_LOCAL = 'local';
 export const MESSAGE_TYPE_REMOTE = 'remote';
 
 export const SMALL_WIDTH_THRESHOLD = 580;
+
+/**
+ * The modes of the buttons of the chat and polls tabs.
+ */
+export const BUTTON_MODES = {
+    CONTAINED: 'contained',
+    TEXT: 'text'
+};

react/features/chat/functions.js

@@ -78,3 +78,15 @@ export function getUnreadCount(state: Object) {
 
     return messagesCount - (lastReadIndex + 1);
 }
+
+/**
+ * Selector for calculating the number of unread chat messages.
+ *
+ * @param {Object} state - The redux state.
+ * @returns {number} The number of unread messages.
+ */
+export function getUnreadMessagesCount(state: Object) {
+    const { nbUnreadMessages } = state['features/chat'];
+
+    return nbUnreadMessages;
+}

react/features/chat/middleware.js

@@ -22,6 +22,7 @@ import {
 import { MiddlewareRegistry, StateListenerRegistry } from '../base/redux';
 import { playSound, registerSound, unregisterSound } from '../base/sounds';
 import { openDisplayNamePrompt } from '../display-name';
+import { resetNbUnreadPollsMessages } from '../polls/actions';
 import { ADD_REACTION_MESSAGE } from '../reactions/actionTypes';
 import { pushReactions } from '../reactions/actions.any';
 import { getReactionMessageFromBuffer } from '../reactions/functions.any';
@@ -33,7 +34,7 @@ import {
     setToolboxVisible
 } from '../toolbox/actions.web';
 
-import { ADD_MESSAGE, SEND_MESSAGE, OPEN_CHAT, CLOSE_CHAT } from './actionTypes';
+import { ADD_MESSAGE, SEND_MESSAGE, OPEN_CHAT, CLOSE_CHAT, SET_IS_POLL_TAB_FOCUSED } from './actionTypes';
 import { addMessage, clearMessages } from './actions';
 import { closeChat } from './actions.any';
 import { ChatPrivacyDialog } from './components';
@@ -112,15 +113,27 @@ MiddlewareRegistry.register(store => next => action => {
         }
         break;
 
-    case CLOSE_CHAT:
+    case CLOSE_CHAT: {
+        const isPollTabOpen = getState()['features/chat'].isPollsTabFocused;
+
         unreadCount = 0;
 
         if (typeof APP !== 'undefined') {
             APP.API.notifyChatUpdated(unreadCount, false);
         }
 
+        if (isPollTabOpen) {
+            dispatch(resetNbUnreadPollsMessages());
+        }
+
         dispatch(setActiveModalId());
         break;
+    }
+
+    case SET_IS_POLL_TAB_FOCUSED: {
+        dispatch(resetNbUnreadPollsMessages());
+        break;
+    }
 
     case SEND_MESSAGE: {
         const state = store.getState();

react/features/chat/reducer.js

@@ -7,13 +7,17 @@ import {
     CLEAR_MESSAGES,
     CLOSE_CHAT,
     OPEN_CHAT,
-    SET_PRIVATE_MESSAGE_RECIPIENT
+    SET_PRIVATE_MESSAGE_RECIPIENT,
+    SET_IS_POLL_TAB_FOCUSED
 } from './actionTypes';
 
 const DEFAULT_STATE = {
     isOpen: false,
+    isPollsTabFocused: false,
     lastReadMessage: undefined,
+    lastReadPoll: undefined,
     messages: [],
+    nbUnreadMessages: 0,
     privateMessageRecipient: undefined
 };
 
@@ -46,6 +50,7 @@ ReducerRegistry.register('features/chat', (state = DEFAULT_STATE, action) => {
             ...state,
             lastReadMessage:
                 action.hasRead ? newMessage : state.lastReadMessage,
+            nbUnreadMessages: state.isPollsTabFocused ? state.nbUnreadMessages + 1 : state.nbUnreadMessages,
             messages
         };
     }
@@ -78,6 +83,13 @@ ReducerRegistry.register('features/chat', (state = DEFAULT_STATE, action) => {
                 navigator.product === 'ReactNative' ? 0 : state.messages.length - 1],
             privateMessageRecipient: action.participant
         };
+
+    case SET_IS_POLL_TAB_FOCUSED: {
+        return {
+            ...state,
+            isPollsTabFocused: action.isPollsTabFocused,
+            nbUnreadMessages: 0
+        }; }
     }
 
     return state;

react/features/conference/components/web/ConferenceInfo.js

@@ -120,6 +120,13 @@ function ConferenceInfo(props: Props) {
                     }
                     { _showParticipantCount && <ParticipantsCount /> }
                     <E2EELabel />
+                    {_hideRecordingLabel && (
+                        <>
+                            <RecordingLabel mode = { JitsiRecordingConstants.mode.FILE } />
+                            <RecordingLabel mode = { JitsiRecordingConstants.mode.STREAM } />
+                            <LocalRecordingLabel />
+                        </>
+                    )}
                     <TranscribingLabel />
                     <VideoQualityLabel />
                     <InsecureRoomNameLabel />
@@ -148,10 +155,12 @@ function _mapStateToProps(state) {
         hideConferenceTimer,
         hideConferenceSubject,
         hideParticipantsStats,
-        hideRecordingLabel
+        hideRecordingLabel,
+        iAmRecorder
     } = state['features/base/config'];
     const { clientWidth } = state['features/base/responsive-ui'];
 
+    const shouldHideRecordingLabel = hideRecordingLabel || iAmRecorder;
     const fileRecordingStatus = getSessionStatusToShow(state, JitsiRecordingConstants.mode.FILE);
     const streamRecordingStatus = getSessionStatusToShow(state, JitsiRecordingConstants.mode.STREAM);
     const isFileRecording = fileRecordingStatus ? fileRecordingStatus !== JitsiRecordingConstants.status.OFF : false;
@@ -162,12 +171,12 @@ function _mapStateToProps(state) {
     return {
         _hideConferenceNameAndTimer: clientWidth < 300,
         _hideConferenceTimer: Boolean(hideConferenceTimer),
-        _hideRecordingLabel: hideRecordingLabel,
+        _hideRecordingLabel: shouldHideRecordingLabel,
         _fullWidth: state['features/video-layout'].tileViewEnabled,
         _showParticipantCount: participantCount > 2 && !hideParticipantsStats,
         _subject: hideConferenceSubject ? '' : getConferenceName(state),
         _visible: isToolboxVisible(state),
-        _recordingLabel: (isFileRecording || isStreamRecording || isEngaged) && !hideRecordingLabel
+        _recordingLabel: (isFileRecording || isStreamRecording || isEngaged) && !shouldHideRecordingLabel
     };
 }
 

react/features/conference/functions.web.js

@@ -1,29 +1,9 @@
-import { getName } from '../app/functions.web';
 import { isSuboptimalBrowser } from '../base/environment';
 import { translateToHTML } from '../base/i18n';
-import { getLocalParticipant } from '../base/participants';
-import { toState } from '../base/redux';
-import { getBackendSafePath, getJitsiMeetGlobalNS } from '../base/util';
 import { showWarningNotification } from '../notifications';
-import { createRnnoiseProcessor } from '../stream-effects/rnnoise';
 
 export * from './functions.any';
 
-/**
- * Returns the result of getWiFiStats from the global NS or does nothing
-(returns empty result).
- * Fixes a concurrency problem where we need to pass a function when creating
- * a JitsiConference, but that method is added to the context later.
- *
- * @returns {Promise}
- * @private
- */
-const getWiFiStatsMethod = () => {
-    const gloabalNS = getJitsiMeetGlobalNS();
-
-    return gloabalNS.getWiFiStats ? gloabalNS.getWiFiStats() : Promise.resolve('{}');
-};
-
 /**
  * Shows the suboptimal experience notification if needed.
  *
@@ -49,48 +29,3 @@ export function maybeShowSuboptimalExperienceNotification(dispatch, t) {
         );
     }
 }
-
-/**
- * Returns an object aggregating the conference options.
- *
- * @param {Object|Function} stateful - The redux store state.
- * @returns {Object} - Options object.
- */
-export function getConferenceOptions(stateful) {
-    const state = toState(stateful);
-
-    const options = state['features/base/config'];
-    const { locationURL } = state['features/base/connection'];
-    const { tenant } = state['features/base/jwt'];
-
-    const { email, name: nick } = getLocalParticipant(state);
-
-    if (tenant) {
-        options.siteID = tenant;
-    }
-
-    if (options.enableDisplayNameInStats && nick) {
-        options.statisticsDisplayName = nick;
-    }
-
-    if (options.enableEmailInStats && email) {
-        options.statisticsId = email;
-    }
-
-    if (locationURL) {
-        options.confID = `${locationURL.host}${getBackendSafePath(locationURL.pathname)}`;
-    }
-
-    options.applicationName = getName();
-    options.getWiFiStatsMethod = getWiFiStatsMethod;
-    options.createVADProcessor = createRnnoiseProcessor;
-
-    // Disable CallStats, if requessted.
-    if (options.disableThirdPartyRequests) {
-        delete options.callStatsID;
-        delete options.callStatsSecret;
-        delete options.getWiFiStatsMethod;
-    }
-
-    return options;
-}

react/features/device-selection/functions.js

@@ -10,7 +10,7 @@ import {
     getDeviceIdByLabel,
     groupDevicesByKind,
     setAudioInputDeviceAndUpdateSettings,
-    setAudioOutputDeviceId,
+    setAudioOutputDevice,
     setVideoInputDeviceAndUpdateSettings
 } from '../base/devices';
 import { isIosMobileBrowser } from '../base/environment/utils';
@@ -189,12 +189,11 @@ export function processExternalDeviceRequest( // eslint-disable-line max-params
 
         if (deviceId) {
             switch (device.kind) {
-            case 'audioinput': {
+            case 'audioinput':
                 dispatch(setAudioInputDeviceAndUpdateSettings(deviceId));
                 break;
-            }
             case 'audiooutput':
-                setAudioOutputDeviceId(deviceId, dispatch);
+                dispatch(setAudioOutputDevice(deviceId));
                 break;
             case 'videoinput':
                 dispatch(setVideoInputDeviceAndUpdateSettings(deviceId));

react/features/filmstrip/components/native/Filmstrip.js

@@ -6,12 +6,15 @@ import { SafeAreaView, ScrollView } from 'react-native';
 import { Platform } from '../../../base/react';
 import { connect } from '../../../base/redux';
 import { ASPECT_RATIO_NARROW } from '../../../base/responsive-ui/constants';
-import { isFilmstripVisible } from '../../functions';
+import { isFilmstripVisible, shouldRemoteVideosBeVisible } from '../../functions';
 
 import LocalThumbnail from './LocalThumbnail';
 import Thumbnail from './Thumbnail';
 import styles from './styles';
 
+// Immutable reference to avoid re-renders.
+const NO_REMOTE_VIDEOS = [];
+
 /**
  * Filmstrip component's property types.
  */
@@ -167,10 +170,11 @@ class Filmstrip extends Component<Props> {
  */
 function _mapStateToProps(state) {
     const { enabled, remoteParticipants } = state['features/filmstrip'];
+    const showRemoteVideos = shouldRemoteVideosBeVisible(state);
 
     return {
         _aspectRatio: state['features/base/responsive-ui'].aspectRatio,
-        _participants: remoteParticipants,
+        _participants: showRemoteVideos ? remoteParticipants : NO_REMOTE_VIDEOS,
         _visible: enabled && isFilmstripVisible(state)
     };
 }

react/features/filmstrip/components/native/Thumbnail.js

@@ -13,7 +13,8 @@ import {
     getParticipantCount,
     isEveryoneModerator,
     pinParticipant,
-    getParticipantByIdOrUndefined
+    getParticipantByIdOrUndefined,
+    getLocalParticipant
 } from '../../../base/participants';
 import { Container } from '../../../base/react';
 import { connect } from '../../../base/redux';
@@ -24,6 +25,8 @@ import { DisplayNameLabel } from '../../../display-name';
 import { toggleToolboxVisible } from '../../../toolbox/actions.native';
 import { RemoteVideoMenu } from '../../../video-menu';
 import ConnectionStatusComponent from '../../../video-menu/components/native/ConnectionStatusComponent';
+import SharedVideoMenu
+    from '../../../video-menu/components/native/SharedVideoMenu';
 
 import AudioMutedIndicator from './AudioMutedIndicator';
 import DominantSpeakerIndicator from './DominantSpeakerIndicator';
@@ -48,6 +51,11 @@ type Props = {
      */
     _largeVideo: Object,
 
+    /**
+     * Shared video local participant owner.
+     */
+    _localVideoOwner: boolean,
+
     /**
      * The Redux representation of the participant to display.
      */
@@ -116,6 +124,7 @@ function Thumbnail(props: Props) {
     const {
         _audioMuted: audioMuted,
         _largeVideo: largeVideo,
+        _localVideoOwner,
         _renderDominantSpeakerIndicator: renderDominantSpeakerIndicator,
         _renderModeratorIndicator: renderModeratorIndicator,
         _participant: participant,
@@ -144,6 +153,12 @@ function Thumbnail(props: Props) {
             dispatch(openDialog(ConnectionStatusComponent, {
                 participantID: participant.id
             }));
+        } else if (participant.isFakeParticipant) {
+            if (_localVideoOwner) {
+                dispatch(openDialog(SharedVideoMenu, {
+                    participant
+                }));
+            }
         } else {
             dispatch(openDialog(RemoteVideoMenu, {
                 participant
@@ -223,9 +238,11 @@ function _mapStateToProps(state, ownProps) {
     // filmstrip doesn't render the video of the participant who is rendered on
     // the stage i.e. as a large video.
     const largeVideo = state['features/large-video'];
+    const { ownerId } = state['features/shared-video'];
     const tracks = state['features/base/tracks'];
     const { participantID } = ownProps;
     const participant = getParticipantByIdOrUndefined(state, participantID);
+    const localParticipantId = getLocalParticipant(state).id;
     const id = participant?.id;
     const audioTrack
         = getTrackByMediaTypeAndParticipant(tracks, MEDIA_TYPE.AUDIO, id);
@@ -240,6 +257,7 @@ function _mapStateToProps(state, ownProps) {
     return {
         _audioMuted: audioTrack?.muted ?? true,
         _largeVideo: largeVideo,
+        _localVideoOwner: Boolean(ownerId === localParticipantId),
         _participant: participant,
         _renderDominantSpeakerIndicator: renderDominantSpeakerIndicator,
         _renderModeratorIndicator: renderModeratorIndicator,

react/features/filmstrip/components/web/Filmstrip.js

@@ -284,10 +284,10 @@ class Filmstrip extends PureComponent <Props> {
      * @param {Object} data - Information about the rendered items.
      * @returns {void}
      */
-    _onListItemsRendered({ overscanStartIndex, overscanStopIndex }) {
+    _onListItemsRendered({ visibleStartIndex, visibleStopIndex }) {
         const { dispatch } = this.props;
 
-        dispatch(setVisibleRemoteParticipants(overscanStartIndex, overscanStopIndex));
+        dispatch(setVisibleRemoteParticipants(visibleStartIndex, visibleStopIndex));
     }
 
     _onGridItemsRendered: Object => void;
@@ -299,14 +299,14 @@ class Filmstrip extends PureComponent <Props> {
      * @returns {void}
      */
     _onGridItemsRendered({
-        overscanColumnStartIndex,
-        overscanColumnStopIndex,
-        overscanRowStartIndex,
-        overscanRowStopIndex
+        visibleColumnStartIndex,
+        visibleColumnStopIndex,
+        visibleRowStartIndex,
+        visibleRowStopIndex
     }) {
         const { _columns, dispatch } = this.props;
-        const startIndex = (overscanRowStartIndex * _columns) + overscanColumnStartIndex;
-        const endIndex = (overscanRowStopIndex * _columns) + overscanColumnStopIndex;
+        const startIndex = (visibleRowStartIndex * _columns) + visibleColumnStartIndex;
+        const endIndex = (visibleRowStopIndex * _columns) + visibleColumnStopIndex;
 
         dispatch(setVisibleRemoteParticipants(startIndex, endIndex));
     }
@@ -345,6 +345,7 @@ class Filmstrip extends PureComponent <Props> {
                     initialScrollTop = { 0 }
                     itemKey = { this._gridItemKey }
                     onItemsRendered = { this._onGridItemsRendered }
+                    overscanRowCount = { 1 }
                     rowCount = { _rows }
                     rowHeight = { _thumbnailHeight + TILE_VERTICAL_MARGIN }
                     width = { _filmstripWidth }>
@@ -363,6 +364,7 @@ class Filmstrip extends PureComponent <Props> {
             itemKey: this._listItemKey,
             itemSize: 0,
             onItemsRendered: this._onListItemsRendered,
+            overscanCount: 1,
             width: _filmstripWidth,
             style: {
                 willChange: 'auto'

react/features/filmstrip/components/web/Thumbnail.js

@@ -671,6 +671,10 @@ class Thumbnail extends Component<Props, State> {
             statsPopoverPosition = 'left-start';
             tooltipPosition = 'left';
             break;
+        case LAYOUTS.HORIZONTAL_FILMSTRIP_VIEW:
+            statsPopoverPosition = 'top';
+            tooltipPosition = 'top';
+            break;
         default:
             statsPopoverPosition = 'auto';
             tooltipPosition = 'top';

react/features/filmstrip/functions.native.js

@@ -1,7 +1,7 @@
 // @flow
 
 import { getFeatureFlag, FILMSTRIP_ENABLED } from '../base/flags';
-import { getParticipantCountWithFake } from '../base/participants';
+import { getParticipantCountWithFake, getPinnedParticipant } from '../base/participants';
 import { toState } from '../base/redux';
 
 /**
@@ -26,3 +26,34 @@ export function isFilmstripVisible(stateful: Object | Function) {
     return getParticipantCountWithFake(state) > 1;
 }
 
+/**
+ * Determines whether the remote video thumbnails should be displayed/visible in
+ * the filmstrip.
+ *
+ * @param {Object} state - The full redux state.
+ * @returns {boolean} - If remote video thumbnails should be displayed/visible
+ * in the filmstrip, then {@code true}; otherwise, {@code false}.
+ */
+export function shouldRemoteVideosBeVisible(state: Object) {
+    if (state['features/invite'].calleeInfoVisible) {
+        return false;
+    }
+
+    // Include fake participants to derive how many thumbnails are dispalyed,
+    // as it is assumed all participants, including fake, will be displayed
+    // in the filmstrip.
+    const participantCount = getParticipantCountWithFake(state);
+    const pinnedParticipant = getPinnedParticipant(state);
+    const { disable1On1Mode } = state['features/base/config'];
+
+    return Boolean(
+        participantCount > 2
+
+            // Always show the filmstrip when there is another participant to
+            // show and the local video is pinned. Note we are not taking the
+            // toolbar visibility into account here (unlike web) because
+            // showing / hiding views in quick succession on mobile is taxing.
+            || (participantCount > 1 && pinnedParticipant?.local)
+
+            || disable1On1Mode);
+}

react/features/mobile/polyfills/RTCPeerConnection.js

@@ -1,352 +1,21 @@
 // @flow
 
-import { NativeModules } from 'react-native';
-import { RTCPeerConnection, RTCSessionDescription } from 'react-native-webrtc';
+import { RTCPeerConnection as PC } from 'react-native-webrtc';
 
-/* eslint-disable no-unused-vars */
-
-// Address families.
-const AF_INET6 = 30; /* IPv6 */
-
-// Protocols (RFC 1700)
-const IPPROTO_TCP = 6; /* tcp */
-const IPPROTO_UDP = 17; /* user datagram protocol */
-
-// Protocol families, same as address families for now.
-const PF_INET6 = AF_INET6;
-
-const SOCK_DGRAM = 2; /* datagram socket */
-const SOCK_STREAM = 1; /* stream socket */
-
-/* eslint-enable no-unused-vars */
-
-// XXX At the time of this writing extending RTCPeerConnection using ES6 'class'
-// and 'extends' causes a runtime error related to the attempt to define the
-// onaddstream property setter. The error mentions that babelHelpers.set is
-// undefined which appears to be a thing inside React Native's packager. As a
-// workaround, extend using the pre-ES6 way.
+import { synthesizeIPv6Addresses } from './ipv6utils';
 
 /**
- * The RTCPeerConnection provided by react-native-webrtc fires onaddstream
- * before it remembers remotedescription (and thus makes it available to API
- * clients). Because that appears to be a problem for lib-jitsi-meet which has
- * been successfully running on Chrome, Firefox and others for a very long
- * time, attempt to meet its expectations (by extending RTCPPeerConnection).
- *
- * @class
+ * Override PeerConnection to synthesize IPv6 addresses.
  */
-export default function _RTCPeerConnection(...args: any[]) {
+export default class RTCPeerConnection extends PC {
 
-    /* eslint-disable indent, no-invalid-this */
-
-    RTCPeerConnection.apply(this, args);
-
-    this.onaddstream = (...args) => // eslint-disable-line no-shadow
-        (this._onaddstreamQueue
-                ? this._queueOnaddstream
-                : this._invokeOnaddstream)
-            .apply(this, args);
-
-    // Shadow RTCPeerConnection's onaddstream but after _RTCPeerConnection has
-    // assigned to the property in question. Defining the property on
-    // _RTCPeerConnection's prototype may (or may not, I don't know) work but I
-    // don't want to try because the following approach appears to work and I
-    // understand it.
-
-    // $FlowFixMe
-    Object.defineProperty(this, 'onaddstream', {
-        configurable: true,
-        enumerable: true,
-        get() {
-            return this._onaddstream;
-        },
-        set(value) {
-            this._onaddstream = value;
-        }
-    });
-
-    /* eslint-enable indent, no-invalid-this */
-}
-
-_RTCPeerConnection.prototype = Object.create(RTCPeerConnection.prototype);
-_RTCPeerConnection.prototype.constructor = _RTCPeerConnection;
-
-_RTCPeerConnection.prototype._invokeOnaddstream = function(...args) {
-    const onaddstream = this._onaddstream;
-
-    return onaddstream && onaddstream.apply(this, args);
-};
-
-_RTCPeerConnection.prototype._invokeQueuedOnaddstream = function(q) {
-    q && q.forEach(args => {
-        try {
-            this._invokeOnaddstream(...args);
-        } catch (e) {
-            // TODO Determine whether the combination of the standard
-            // setRemoteDescription and onaddstream results in a similar
-            // swallowing of errors.
-            console.error(e);
-        }
-    });
-};
-
-_RTCPeerConnection.prototype._queueOnaddstream = function(...args) {
-    this._onaddstreamQueue.push(Array.from(args));
-};
-
-_RTCPeerConnection.prototype.setRemoteDescription = function(description) {
-
-    return (
-        _synthesizeIPv6Addresses(description)
-            .catch(reason => {
-                reason && console.error(reason);
-
-                return description;
-            })
-            .then(value => _setRemoteDescription.bind(this)(value)));
-
-};
-
-/**
- * Adapts react-native-webrtc's {@link RTCPeerConnection#setRemoteDescription}
- * implementation which uses the deprecated, callback-based version to the
- * {@code Promise}-based version.
- *
- * @param {RTCSessionDescription} description - The RTCSessionDescription
- * which specifies the configuration of the remote end of the connection.
- * @private
- * @private
- * @returns {Promise}
- */
-function _setRemoteDescription(description) {
-    return new Promise((resolve, reject) => {
-
-        /* eslint-disable no-invalid-this */
-
-        // Ensure I'm not remembering onaddstream invocations from previous
-        // setRemoteDescription calls. I shouldn't be but... anyway.
-        this._onaddstreamQueue = [];
-
-        RTCPeerConnection.prototype.setRemoteDescription.call(this, description)
-            .then((...args) => {
-                let q;
-
-                try {
-                    resolve(...args);
-                } finally {
-                    q = this._onaddstreamQueue;
-                    this._onaddstreamQueue = undefined;
-                }
-
-                this._invokeQueuedOnaddstream(q);
-            }, (...args) => {
-                this._onaddstreamQueue = undefined;
-
-                reject(...args);
-            });
-
-        /* eslint-enable no-invalid-this */
-    });
-}
-
-// XXX The function _synthesizeIPv6FromIPv4Address is not placed relative to the
-// other functions in the file according to alphabetical sorting rule of the
-// coding style. But eslint wants constants to be defined before they are used.
-
-/**
- * Synthesizes an IPv6 address from a specific IPv4 address.
- *
- * @param {string} ipv4 - The IPv4 address from which an IPv6 address is to be
- * synthesized.
- * @returns {Promise<?string>} A {@code Promise} which gets resolved with the
- * IPv6 address synthesized from the specified {@code ipv4} or a falsy value to
- * be treated as inability to synthesize an IPv6 address from the specified
- * {@code ipv4}.
- */
-const _synthesizeIPv6FromIPv4Address: string => Promise<?string> = (function() {
-    // POSIX.getaddrinfo
-    const { POSIX } = NativeModules;
-
-    if (POSIX) {
-        const { getaddrinfo } = POSIX;
-
-        if (typeof getaddrinfo === 'function') {
-            return ipv4 =>
-                getaddrinfo(/* hostname */ ipv4, /* servname */ undefined)
-                    .then(([ { ai_addr: ipv6 } ]) => ipv6);
-        }
+    /**
+     * Synthesize IPv6 addresses before calling the underlying setRemoteDescription.
+     *
+     * @param {Object} description - SDP.
+     * @returns {Promise<undefined>} A promise which is resolved once the operation is complete.
+     */
+    async setRemoteDescription(description: Object) {
+        return super.setRemoteDescription(await synthesizeIPv6Addresses(description));
     }
-
-    // NAT64AddrInfo.getIPv6Address
-    const { NAT64AddrInfo } = NativeModules;
-
-    if (NAT64AddrInfo) {
-        const { getIPv6Address } = NAT64AddrInfo;
-
-        if (typeof getIPv6Address === 'function') {
-            return getIPv6Address;
-        }
-    }
-
-    // There's no POSIX.getaddrinfo or NAT64AddrInfo.getIPv6Address.
-    return () =>
-        Promise.reject(
-            'The impossible just happened! No POSIX.getaddrinfo or'
-                + ' NAT64AddrInfo.getIPv6Address!');
-})();
-
-/**
- * Synthesizes IPv6 addresses on iOS in order to support IPv6 NAT64 networks.
- *
- * @param {RTCSessionDescription} sdp - The RTCSessionDescription which
- * specifies the configuration of the remote end of the connection.
- * @private
- * @returns {Promise}
- */
-function _synthesizeIPv6Addresses(sdp) {
-    return (
-        new Promise(resolve => resolve(_synthesizeIPv6Addresses0(sdp)))
-            .then(({ ips, lines }) =>
-                Promise.all(Array.from(ips.values()))
-                    .then(() => _synthesizeIPv6Addresses1(sdp, ips, lines))
-            ));
-}
-
-/* eslint-disable max-depth */
-
-/**
- * Begins the asynchronous synthesis of IPv6 addresses.
- *
- * @param {RTCSessionDescription} sessionDescription - The RTCSessionDescription
- * for which IPv6 addresses will be synthesized.
- * @private
- * @returns {{
- *     ips: Map,
- *     lines: Array
- * }}
- */
-function _synthesizeIPv6Addresses0(sessionDescription) {
-    const sdp = sessionDescription.sdp;
-    let start = 0;
-    const lines = [];
-    const ips = new Map();
-
-    do {
-        const end = sdp.indexOf('\r\n', start);
-        let line;
-
-        if (end === -1) {
-            line = sdp.substring(start);
-
-            // Break out of the loop at the end of the iteration.
-            start = undefined;
-        } else {
-            line = sdp.substring(start, end);
-            start = end + 2;
-        }
-
-        if (line.startsWith('a=candidate:')) {
-            const candidate = line.split(' ');
-
-            if (candidate.length >= 10 && candidate[6] === 'typ') {
-                const ip4s = [ candidate[4] ];
-                let abort = false;
-
-                for (let i = 8; i < candidate.length; ++i) {
-                    if (candidate[i] === 'raddr') {
-                        ip4s.push(candidate[++i]);
-                        break;
-                    }
-                }
-
-                for (const ip of ip4s) {
-                    if (ip.indexOf(':') === -1) {
-                        ips.has(ip)
-                            || ips.set(ip, new Promise((resolve, reject) => {
-                                const v = ips.get(ip);
-
-                                if (v && typeof v === 'string') {
-                                    resolve(v);
-                                } else {
-                                    _synthesizeIPv6FromIPv4Address(ip).then(
-                                        value => {
-                                            if (!value
-                                                    || value.indexOf(':') === -1
-                                                    || value === ips.get(ip)) {
-                                                ips.delete(ip);
-                                            } else {
-                                                ips.set(ip, value);
-                                            }
-                                            resolve(value);
-                                        },
-                                        reject);
-                                }
-                            }));
-                    } else {
-                        abort = true;
-                        break;
-                    }
-                }
-                if (abort) {
-                    ips.clear();
-                    break;
-                }
-
-                line = candidate;
-            }
-        }
-
-        lines.push(line);
-    } while (start);
-
-    return {
-        ips,
-        lines
-    };
-}
-
-/* eslint-enable max-depth */
-
-/**
- * Completes the asynchronous synthesis of IPv6 addresses.
- *
- * @param {RTCSessionDescription} sessionDescription - The RTCSessionDescription
- * for which IPv6 addresses are being synthesized.
- * @param {Map} ips - A Map of IPv4 addresses found in the specified
- * sessionDescription to synthesized IPv6 addresses.
- * @param {Array} lines - The lines of the specified sessionDescription.
- * @private
- * @returns {RTCSessionDescription} A RTCSessionDescription that represents the
- * result of the synthesis of IPv6 addresses.
- */
-function _synthesizeIPv6Addresses1(sessionDescription, ips, lines) {
-    if (ips.size === 0) {
-        return sessionDescription;
-    }
-
-    for (let l = 0; l < lines.length; ++l) {
-        const candidate = lines[l];
-
-        if (typeof candidate !== 'string') {
-            let ip4 = candidate[4];
-            let ip6 = ips.get(ip4);
-
-            ip6 && (candidate[4] = ip6);
-
-            for (let i = 8; i < candidate.length; ++i) {
-                if (candidate[i] === 'raddr') {
-                    ip4 = candidate[++i];
-                    (ip6 = ips.get(ip4)) && (candidate[i] = ip6);
-                    break;
-                }
-            }
-
-            lines[l] = candidate.join(' ');
-        }
-    }
-
-    return new RTCSessionDescription({
-        sdp: lines.join('\r\n'),
-        type: sessionDescription.type
-    });
 }

react/features/mobile/polyfills/ipv6utils.js

@@ -0,0 +1,199 @@
+// @flow
+
+import { NativeModules } from 'react-native';
+import { RTCSessionDescription } from 'react-native-webrtc';
+
+/**
+ * Synthesizes IPv6 addresses on iOS in order to support IPv6 NAT64 networks.
+ *
+ * @param {RTCSessionDescription} sdp - The RTCSessionDescription which
+ * specifies the configuration of the remote end of the connection.
+ * @private
+ * @returns {Promise}
+ */
+export function synthesizeIPv6Addresses(sdp: RTCSessionDescription) {
+    return (
+        new Promise(resolve => resolve(_synthesizeIPv6Addresses0(sdp)))
+            .then(({ ips, lines }) =>
+                Promise.all(Array.from(ips.values()))
+                    .then(() => _synthesizeIPv6Addresses1(sdp, ips, lines))
+            ));
+}
+
+/* eslint-disable max-depth */
+
+/**
+ * Synthesizes an IPv6 address from a specific IPv4 address.
+ *
+ * @param {string} ipv4 - The IPv4 address from which an IPv6 address is to be
+ * synthesized.
+ * @returns {Promise<?string>} A {@code Promise} which gets resolved with the
+ * IPv6 address synthesized from the specified {@code ipv4} or a falsy value to
+ * be treated as inability to synthesize an IPv6 address from the specified
+ * {@code ipv4}.
+ */
+const _synthesizeIPv6FromIPv4Address: string => Promise<?string> = (function() {
+    // POSIX.getaddrinfo
+    const { POSIX } = NativeModules;
+
+    if (POSIX) {
+        const { getaddrinfo } = POSIX;
+
+        if (typeof getaddrinfo === 'function') {
+            return ipv4 =>
+                getaddrinfo(/* hostname */ ipv4, /* servname */ undefined)
+                    .then(([ { ai_addr: ipv6 } ]) => ipv6);
+        }
+    }
+
+    // NAT64AddrInfo.getIPv6Address
+    const { NAT64AddrInfo } = NativeModules;
+
+    if (NAT64AddrInfo) {
+        const { getIPv6Address } = NAT64AddrInfo;
+
+        if (typeof getIPv6Address === 'function') {
+            return getIPv6Address;
+        }
+    }
+
+    // There's no POSIX.getaddrinfo or NAT64AddrInfo.getIPv6Address.
+    return ip => Promise.resolve(ip);
+})();
+
+/**
+ * Begins the asynchronous synthesis of IPv6 addresses.
+ *
+ * @param {RTCSessionDescription} sessionDescription - The RTCSessionDescription
+ * for which IPv6 addresses will be synthesized.
+ * @private
+ * @returns {{
+ *     ips: Map,
+ *     lines: Array
+ * }}
+ */
+function _synthesizeIPv6Addresses0(sessionDescription) {
+    const sdp = sessionDescription.sdp;
+    let start = 0;
+    const lines = [];
+    const ips = new Map();
+
+    do {
+        const end = sdp.indexOf('\r\n', start);
+        let line;
+
+        if (end === -1) {
+            line = sdp.substring(start);
+
+            // Break out of the loop at the end of the iteration.
+            start = undefined;
+        } else {
+            line = sdp.substring(start, end);
+            start = end + 2;
+        }
+
+        if (line.startsWith('a=candidate:')) {
+            const candidate = line.split(' ');
+
+            if (candidate.length >= 10 && candidate[6] === 'typ') {
+                const ip4s = [ candidate[4] ];
+                let abort = false;
+
+                for (let i = 8; i < candidate.length; ++i) {
+                    if (candidate[i] === 'raddr') {
+                        ip4s.push(candidate[++i]);
+                        break;
+                    }
+                }
+
+                for (const ip of ip4s) {
+                    if (ip.indexOf(':') === -1) {
+                        ips.has(ip)
+                            || ips.set(ip, new Promise((resolve, reject) => {
+                                const v = ips.get(ip);
+
+                                if (v && typeof v === 'string') {
+                                    resolve(v);
+                                } else {
+                                    _synthesizeIPv6FromIPv4Address(ip).then(
+                                        value => {
+                                            if (!value
+                                                    || value.indexOf(':') === -1
+                                                    || value === ips.get(ip)) {
+                                                ips.delete(ip);
+                                            } else {
+                                                ips.set(ip, value);
+                                            }
+                                            resolve(value);
+                                        },
+                                        reject);
+                                }
+                            }));
+                    } else {
+                        abort = true;
+                        break;
+                    }
+                }
+                if (abort) {
+                    ips.clear();
+                    break;
+                }
+
+                line = candidate;
+            }
+        }
+
+        lines.push(line);
+    } while (start);
+
+    return {
+        ips,
+        lines
+    };
+}
+
+/* eslint-enable max-depth */
+
+/**
+ * Completes the asynchronous synthesis of IPv6 addresses.
+ *
+ * @param {RTCSessionDescription} sessionDescription - The RTCSessionDescription
+ * for which IPv6 addresses are being synthesized.
+ * @param {Map} ips - A Map of IPv4 addresses found in the specified
+ * sessionDescription to synthesized IPv6 addresses.
+ * @param {Array} lines - The lines of the specified sessionDescription.
+ * @private
+ * @returns {RTCSessionDescription} A RTCSessionDescription that represents the
+ * result of the synthesis of IPv6 addresses.
+ */
+function _synthesizeIPv6Addresses1(sessionDescription, ips, lines) {
+    if (ips.size === 0) {
+        return sessionDescription;
+    }
+
+    for (let l = 0; l < lines.length; ++l) {
+        const candidate = lines[l];
+
+        if (typeof candidate !== 'string') {
+            let ip4 = candidate[4];
+            let ip6 = ips.get(ip4);
+
+            ip6 && (candidate[4] = ip6);
+
+            for (let i = 8; i < candidate.length; ++i) {
+                if (candidate[i] === 'raddr') {
+                    ip4 = candidate[++i];
+                    (ip6 = ips.get(ip4)) && (candidate[i] = ip6);
+                    break;
+                }
+            }
+
+            lines[l] = candidate.join(' ');
+        }
+    }
+
+    return new RTCSessionDescription({
+        sdp: lines.join('\r\n'),
+        type: sessionDescription.type
+    });
+}

react/features/mobile/watchos/middleware.js

@@ -98,7 +98,7 @@ function _appWillMount({ dispatch, getState }) {
 
         switch (command) {
         case CMD_HANG_UP:
-            if (typeof getCurrentConferenceUrl(getState()) !== undefined) {
+            if (typeof getCurrentConferenceUrl(getState()) !== 'undefined') {
                 dispatch(appNavigate(undefined));
             }
             break;

react/features/notifications/components/web/NotificationButton.js

@@ -21,14 +21,19 @@ type Props = {
     className: string,
 
     /**
-     * The `data-testid` used for the button.
+     * CSS id of the button.
      */
-    testId: string,
+    id?: string,
 
     /**
      * The participant.
      */
-    participant: Object
+    participant: Object,
+
+    /**
+     * The `data-testid` used for the button.
+     */
+    testId: string
 }
 
 /**
@@ -36,7 +41,7 @@ type Props = {
  *
  * @returns {React$Element<'button'>}
  */
-export default function({ action, children, className, testId, participant }: Props) {
+export default function({ action, children, className, participant, id, testId }: Props) {
     const dispatch = useDispatch();
     const onClick = useCallback(() => dispatch(action(participant.id)), [ dispatch, participant ]);
 
@@ -44,6 +49,7 @@ export default function({ action, children, className, testId, participant }: Pr
         <button
             className = { className }
             data-testid = { testId }
+            id = { id }
             onClick = { onClick }
             type = 'button'>
             { children }

react/features/notifications/components/web/NotificationWithParticipants.js

@@ -80,6 +80,7 @@ export default function({
                     { <NotificationButton
                         action = { onApprove }
                         className = 'primary'
+                        id = 'unmute-button'
                         participant = { p }
                         testId = { `${testIdPrefix}.allow` }>
                         { approveButtonText }
@@ -87,6 +88,7 @@ export default function({
                     { <NotificationButton
                         action = { onReject }
                         className = 'borderLess'
+                        id = 'dismiss-button'
                         participant = { p }
                         testId = { `${testIdPrefix}.reject` }>
                         { rejectButtonText }

react/features/participants-pane/actions.native.js

@@ -1,10 +1,13 @@
 // @flow
 
 import { openDialog } from '../base/dialog';
+import { SharedVideoMenu } from '../video-menu';
+import ConnectionStatusComponent
+    from '../video-menu/components/native/ConnectionStatusComponent';
+import RemoteVideoMenu from '../video-menu/components/native/RemoteVideoMenu';
 
 import { SET_VOLUME } from './actionTypes';
 import {
-    ContextMenuMeetingParticipantDetails,
     ContextMenuLobbyParticipantReject
 } from './components/native';
 export * from './actions.any';
@@ -21,13 +24,33 @@ export function showContextMenuReject(participant: Object) {
 
 
 /**
- * Displays the context menu for the selected meeting participant.
+ * Displays the connection status for the local meeting participant.
  *
  * @param {string} participantID - The selected meeting participant id.
  * @returns {Function}
  */
-export function showContextMenuDetails(participantID: String) {
-    return openDialog(ContextMenuMeetingParticipantDetails, { participantID });
+export function showConnectionStatus(participantID: String) {
+    return openDialog(ConnectionStatusComponent, { participantID });
+}
+
+/**
+ * Displays the context menu for the selected meeting participant.
+ *
+ * @param {Object} participant - The selected meeting participant.
+ * @returns {Function}
+ */
+export function showContextMenuDetails(participant: Object) {
+    return openDialog(RemoteVideoMenu, { participant });
+}
+
+/**
+ * Displays the shared video menu.
+ *
+ * @param {Object} participant - The selected meeting participant.
+ * @returns {Function}
+ */
+export function showSharedVideoMenu(participant: Object) {
+    return openDialog(SharedVideoMenu, { participant });
 }
 
 /**

react/features/participants-pane/components/AskToUnmuteButton.js

@@ -15,9 +15,9 @@ type Props = {
     askUnmuteText: string,
 
     /**
-     * Participant id.
+     * Participant participantID.
      */
-    id: string
+    participantID: string,
 }
 
 /**
@@ -26,14 +26,15 @@ type Props = {
  * @param {Object} participant - Participant reference.
  * @returns {React$Element<'button'>}
  */
-export default function AskToUnmuteButton({ id, askUnmuteText }: Props) {
+export default function AskToUnmuteButton({ askUnmuteText, participantID }: Props) {
     const dispatch = useDispatch();
     const askToUnmute = useCallback(() => {
-        dispatch(approveParticipant(id));
-    }, [ dispatch, id ]);
+        dispatch(approveParticipant(participantID));
+    }, [ dispatch, participantID ]);
 
     return (
         <QuickActionButton
+            aria-label = { `unmute-${participantID}` }
             onClick = { askToUnmute }
             primary = { true }
             theme = {{

react/features/participants-pane/components/FooterContextMenu.js

@@ -90,7 +90,7 @@ export const FooterContextMenu = ({ onMouseLeave }: Props) => {
                     </div>
                     { isModerationEnabled ? (
                         <ContextMenuItem
-                            id = 'participants-pane-context-menu-start-moderation'
+                            id = 'participants-pane-context-menu-stop-moderation'
                             onClick = { disable }>
                             <span className = { classes.paddedAction }>
                                 { t('participantsPane.actions.startModeration') }
@@ -98,7 +98,7 @@ export const FooterContextMenu = ({ onMouseLeave }: Props) => {
                         </ContextMenuItem>
                     ) : (
                         <ContextMenuItem
-                            id = 'participants-pane-context-menu-stop-moderation'
+                            id = 'participants-pane-context-menu-start-moderation'
                             onClick = { enable }>
                             <Icon
                                 size = { 20 }

react/features/participants-pane/components/ParticipantQuickAction.js

@@ -9,6 +9,11 @@ import { QuickActionButton } from './web/styled';
 
 type Props = {
 
+    /**
+     * The translated ask unmute aria label.
+     */
+    ariaLabel?: boolean,
+
     /**
      * The translated "ask unmute" text.
      */
@@ -24,6 +29,9 @@ type Props = {
      */
     muteAudio: Function,
 
+    /**
+     * Label for mute participant button.
+     */
     muteParticipantButtonText: string,
 
     /**
@@ -59,7 +67,7 @@ export default function ParticipantQuickAction({
         return (
             <AskToUnmuteButton
                 askUnmuteText = { askUnmuteText }
-                id = { participantID } />
+                participantID = { participantID } />
         );
     }
     default: {

react/features/participants-pane/components/native/ContextMenuLobbyParticipantReject.js

@@ -3,7 +3,7 @@
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { TouchableOpacity, View } from 'react-native';
-import { Divider, Text } from 'react-native-paper';
+import { Text } from 'react-native-paper';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { Avatar } from '../../../base/avatar';
@@ -33,30 +33,33 @@ const ContextMenuLobbyParticipantReject = ({ participant: p }: Props) => {
     const reject = useCallback(() => dispatch(setKnockingParticipantApproval(p.id, false), [ dispatch ]));
     const { t } = useTranslation();
 
+    // eslint-disable-next-line react/no-multi-comp
+    const renderMenuHeader = () => (
+        <View
+            style = { styles.contextMenuItemSectionAvatar }>
+            <Avatar
+                className = 'participant-avatar'
+                participantId = { p.id }
+                size = { 24 } />
+            <Text style = { styles.contextMenuItemName }>
+                { displayName }
+            </Text>
+        </View>
+    );
+
     return (
         <BottomSheet
             addScrollViewPadding = { false }
             onCancel = { cancel }
+            /* eslint-disable-next-line react/jsx-no-bind */
+            renderHeader = { renderMenuHeader }
             showSlidingView = { Boolean(knockParticipantIsAvailable) }
             style = { styles.contextMenuMore }>
-            <View
-                style = { styles.contextMenuItemSectionAvatar }>
-                <Avatar
-                    className = 'participant-avatar'
-                    participantId = { p.id }
-                    size = { 20 } />
-                <View style = { styles.contextMenuItemAvatarText }>
-                    <Text style = { styles.contextMenuItemName }>
-                        { displayName }
-                    </Text>
-                </View>
-            </View>
-            <Divider style = { styles.divider } />
             <TouchableOpacity
                 onPress = { reject }
                 style = { styles.contextMenuItem }>
                 <Icon
-                    size = { 20 }
+                    size = { 24 }
                     src = { IconClose } />
                 <Text style = { styles.contextMenuItemText }>{ t('lobby.reject') }</Text>
             </TouchableOpacity>

react/features/participants-pane/components/native/ContextMenuMeetingParticipantDetails.js

@@ -1,264 +0,0 @@
-// @flow
-
-import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-import { TouchableOpacity, View } from 'react-native';
-import { Divider, Text } from 'react-native-paper';
-import { useDispatch } from 'react-redux';
-
-import { Avatar } from '../../../base/avatar';
-import { hideDialog, openDialog } from '../../../base/dialog/actions';
-import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
-import {
-    Icon, IconCloseCircle, IconMessage,
-    IconMicrophoneEmptySlash,
-    IconMuteEveryoneElse, IconVideoOff
-} from '../../../base/icons';
-import {
-    getLocalParticipant,
-    getParticipantByIdOrUndefined,
-    getParticipantDisplayName, getRemoteParticipants,
-    isLocalParticipantModerator
-} from '../../../base/participants/functions';
-import { connect } from '../../../base/redux';
-import {
-    isParticipantAudioMuted,
-    isParticipantVideoMuted
-} from '../../../base/tracks/functions';
-import { openChat } from '../../../chat/actions.native';
-import {
-    KickRemoteParticipantDialog,
-    MuteEveryoneDialog,
-    MuteRemoteParticipantDialog,
-    MuteRemoteParticipantsVideoDialog
-} from '../../../video-menu';
-import VolumeSlider from '../../../video-menu/components/native/VolumeSlider';
-
-import styles from './styles';
-
-type Props = {
-
-    /**
-     * The display name of the participant.
-     */
-    _displayName: string,
-
-    /**
-     * True if the local participant is moderator and false otherwise.
-     */
-    _isLocalModerator: boolean,
-
-    /**
-     * True if the participant is moderator and false otherwise.
-     */
-    _isParticipantModerator: boolean,
-
-    /**
-     * True if the participant is video muted and false otherwise.
-     */
-    _isParticipantVideoMuted: boolean,
-
-    /**
-     * True if the participant is audio muted and false otherwise.
-     */
-    _isParticipantAudioMuted: boolean,
-
-    /**
-     * Whether the participant is present in the room or not.
-     */
-    _isParticipantIDAvailable?: boolean,
-
-    /**
-     * Participant reference
-     */
-    _participant: Object,
-
-    /**
-     * The ID of the participant.
-     */
-    participantID: string,
-};
-
-const ContextMenuMeetingParticipantDetails = (
-        {
-            _displayName,
-            _isLocalModerator,
-            _isParticipantVideoMuted,
-            _isParticipantAudioMuted,
-            _participant,
-            _isParticipantIDAvailable,
-            participantID
-        }: Props) => {
-    const dispatch = useDispatch();
-    const cancel = useCallback(() => dispatch(hideDialog()), [ dispatch ]);
-    const kickRemoteParticipant = useCallback(() => {
-        dispatch(openDialog(KickRemoteParticipantDialog, {
-            participantID
-        }));
-    }, [ dispatch, participantID ]);
-    const muteAudio = useCallback(() => {
-        dispatch(openDialog(MuteRemoteParticipantDialog, {
-            participantID
-        }));
-    }, [ dispatch, participantID ]);
-    const muteEveryoneElse = useCallback(() => {
-        dispatch(openDialog(MuteEveryoneDialog, {
-            exclude: [ participantID ]
-        }));
-    }, [ dispatch, participantID ]);
-    const muteVideo = useCallback(() => {
-        dispatch(openDialog(MuteRemoteParticipantsVideoDialog, {
-            participantID
-        }));
-    }, [ dispatch, participantID ]);
-
-    const sendPrivateMessage = useCallback(() => {
-        dispatch(hideDialog());
-        dispatch(openChat(_participant));
-    }, [ dispatch, _participant ]);
-    const { t } = useTranslation();
-
-    return (
-        <BottomSheet
-            addScrollViewPadding = { false }
-            onCancel = { cancel }
-            showSlidingView = { _isParticipantIDAvailable }
-            style = { styles.contextMenuMeetingParticipantDetails }>
-            <View
-                style = { styles.contextMenuItemSectionAvatar }>
-                <Avatar
-                    className = 'participant-avatar'
-                    participantId = { participantID }
-                    size = { 20 } />
-                <View style = { styles.contextMenuItemAvatarText }>
-                    <Text style = { styles.contextMenuItemName }>
-                        { _displayName }
-                    </Text>
-                </View>
-            </View>
-            <Divider style = { styles.divider } />
-            {
-                _isLocalModerator && (
-                    <>
-                        {
-                            !_isParticipantAudioMuted
-                            && <TouchableOpacity
-                                onPress = { muteAudio }
-                                style = { styles.contextMenuItem }>
-                                <Icon
-                                    size = { 20 }
-                                    src = { IconMicrophoneEmptySlash } />
-                                <Text style = { styles.contextMenuItemText }>
-                                    { t('participantsPane.actions.mute') }
-                                </Text>
-                            </TouchableOpacity>
-                        }
-
-                        <TouchableOpacity
-                            onPress = { muteEveryoneElse }
-                            style = { styles.contextMenuItem }>
-                            <Icon
-                                size = { 20 }
-                                src = { IconMuteEveryoneElse } />
-                            <Text style = { styles.contextMenuItemText }>
-                                { t('participantsPane.actions.muteEveryoneElse') }
-                            </Text>
-                        </TouchableOpacity>
-                    </>
-                )
-            }
-            <Divider style = { styles.divider } />
-            {
-                _isLocalModerator && (
-                    <>
-                        {
-                            !_isParticipantVideoMuted
-                            && <TouchableOpacity
-                                onPress = { muteVideo }
-                                style = { styles.contextMenuItemSection }>
-                                <Icon
-                                    size = { 20 }
-                                    src = { IconVideoOff } />
-                                <Text style = { styles.contextMenuItemText }>
-                                    { t('participantsPane.actions.stopVideo') }
-                                </Text>
-                            </TouchableOpacity>
-                        }
-
-                        <TouchableOpacity
-                            onPress = { kickRemoteParticipant }
-                            style = { styles.contextMenuItem }>
-                            <Icon
-                                size = { 20 }
-                                src = { IconCloseCircle } />
-                            <Text style = { styles.contextMenuItemText }>
-                                { t('videothumbnail.kick') }
-                            </Text>
-                        </TouchableOpacity>
-                    </>
-                )
-            }
-            <TouchableOpacity
-                onPress = { sendPrivateMessage }
-                style = { styles.contextMenuItem }>
-                <Icon
-                    size = { 20 }
-                    src = { IconMessage } />
-                <Text style = { styles.contextMenuItemText }>
-                    { t('toolbar.accessibilityLabel.privateMessage') }
-                </Text>
-            </TouchableOpacity>
-            {/* We need design specs for this*/}
-            {/* <TouchableOpacity*/}
-            {/*    style = { styles.contextMenuItemSection }>*/}
-            {/*    <Icon*/}
-            {/*        size = { 20 }*/}
-            {/*        src = { IconConnectionActive }*/}
-            {/*        style = { styles.contextMenuItemIcon } />*/}
-            {/*    <Text style = { styles.contextMenuItemText }>{ t('participantsPane.actions.networkStats') }</Text>*/}
-            {/* </TouchableOpacity>*/}
-            <Divider style = { styles.divider } />
-            <VolumeSlider participantID = { participantID } />
-        </BottomSheet>
-    );
-};
-
-
-/**
- * Maps (parts of) the redux state to the associated props for this component.
- *
- * @param {Object} state - The Redux state.
- * @param {Object} ownProps - The own props of the component.
- * @private
- * @returns {Props}
- */
-function _mapStateToProps(state, ownProps): Object {
-    const { participantID } = ownProps;
-    const participantIDS = [];
-
-    const participant = getParticipantByIdOrUndefined(state, participantID);
-    const _isLocalModerator = isLocalParticipantModerator(state);
-    const _isParticipantVideoMuted = isParticipantVideoMuted(participant, state);
-    const _isParticipantAudioMuted = isParticipantAudioMuted(participant, state);
-    const localParticipant = getLocalParticipant(state);
-    const remoteParticipants = getRemoteParticipants(state);
-
-    localParticipant && participantIDS.push(localParticipant?.id);
-
-    remoteParticipants.forEach(p => {
-        participantIDS.push(p?.id);
-    });
-
-    const isParticipantIDAvailable = participantIDS.find(partID => partID === participantID);
-
-    return {
-        _displayName: getParticipantDisplayName(state, participantID),
-        _isLocalModerator,
-        _isParticipantAudioMuted,
-        _isParticipantIDAvailable: Boolean(isParticipantIDAvailable),
-        _isParticipantVideoMuted,
-        _participant: participant
-    };
-}
-
-export default connect(_mapStateToProps)(ContextMenuMeetingParticipantDetails);

react/features/participants-pane/components/native/ContextMenuMore.js

@@ -9,14 +9,13 @@ import { useDispatch, useSelector } from 'react-redux';
 import { openDialog, hideDialog } from '../../../base/dialog/actions';
 import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
 import {
-    Icon, IconMicDisabledHollow,
+    Icon,
     IconVideoOff
 } from '../../../base/icons';
 import {
     getLocalParticipant,
     getParticipantCount
 } from '../../../base/participants';
-import { BlockAudioVideoDialog } from '../../../video-menu';
 import MuteEveryonesVideoDialog
     from '../../../video-menu/components/native/MuteEveryonesVideoDialog';
 
@@ -24,7 +23,6 @@ import styles from './styles';
 
 export const ContextMenuMore = () => {
     const dispatch = useDispatch();
-    const blockAudioVideo = useCallback(() => dispatch(openDialog(BlockAudioVideoDialog)), [ dispatch ]);
     const cancel = useCallback(() => dispatch(hideDialog()), [ dispatch ]);
     const { id } = useSelector(getLocalParticipant);
     const participantsCount = useSelector(getParticipantCount);
@@ -45,21 +43,10 @@ export const ContextMenuMore = () => {
                 onPress = { muteAllVideo }
                 style = { styles.contextMenuItem }>
                 <Icon
-                    size = { 20 }
+                    size = { 24 }
                     src = { IconVideoOff } />
                 <Text style = { styles.contextMenuItemText }>{t('participantsPane.actions.stopEveryonesVideo')}</Text>
             </TouchableOpacity>
-            <TouchableOpacity
-                onPress = { blockAudioVideo }
-                style = { styles.contextMenuItem }>
-                <Icon
-                    size = { 20 }
-                    src = { IconMicDisabledHollow }
-                    style = { styles.contextMenuIcon } />
-                <Text style = { styles.contextMenuItemText }>
-                    {t('participantsPane.actions.blockEveryoneMicCamera')}
-                </Text>
-            </TouchableOpacity>
         </BottomSheet>
     );
 };

react/features/participants-pane/components/native/LobbyParticipantList.js

@@ -3,7 +3,7 @@
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Text, View } from 'react-native';
-import { Button } from 'react-native-paper';
+import { Button, withTheme } from 'react-native-paper';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { admitMultiple } from '../../../lobby/actions.native';
@@ -12,17 +12,25 @@ import { getLobbyState } from '../../../lobby/functions';
 import { LobbyParticipantItem } from './LobbyParticipantItem';
 import styles from './styles';
 
-export const LobbyParticipantList = () => {
+type Props = {
+
+    /**
+     * Theme used for styles.
+     */
+    theme: Object
+};
+
+const LobbyParticipantList = ({ theme }: Props) => {
     const {
         lobbyEnabled,
         knockingParticipants: participants
     } = useSelector(getLobbyState);
-
     const dispatch = useDispatch();
     const admitAll = useCallback(() =>
         dispatch(admitMultiple(participants)),
-        [ dispatch ]);
+        [ dispatch, participants ]);
     const { t } = useTranslation();
+    const { palette } = theme;
 
     if (!lobbyEnabled || !participants.length) {
         return null;
@@ -35,14 +43,17 @@ export const LobbyParticipantList = () => {
                     {t('participantsPane.headings.waitingLobby',
                         { count: participants.length })}
                 </Text>
-                <Button
-                    color = '#3D3D3D'
-                    labelStyle = { styles.admitAllParticipantsActionButtonLabel }
-                    mode = 'text'
-                    onPress = { admitAll }
-                    style = { styles.admitAllParticipantsActionButton }>
-                    {t('lobby.admitAll')}
-                </Button>
+                {
+                    participants.length > 1 && (
+                        <Button
+                            color = { palette.action02 }
+                            labelStyle = { styles.admitAllParticipantsActionButtonLabel }
+                            mode = 'text'
+                            onPress = { admitAll }>
+                            {t('lobby.admitAll')}
+                        </Button>
+                    )
+                }
             </View>
             {
                 participants.map(p => (
@@ -54,3 +65,5 @@ export const LobbyParticipantList = () => {
         </View>
     );
 };
+
+export default withTheme(LobbyParticipantList);

react/features/participants-pane/components/native/MeetingParticipantList.js

@@ -6,20 +6,34 @@ import { Text, View } from 'react-native';
 import { Button } from 'react-native-paper';
 import { useDispatch, useSelector } from 'react-redux';
 
+
 import { Icon, IconInviteMore } from '../../../base/icons';
 import {
     getLocalParticipant,
     getParticipantCountWithFake,
     getRemoteParticipants
 } from '../../../base/participants';
+import { connect } from '../../../base/redux';
 import { doInvitePeople } from '../../../invite/actions.native';
-import { showContextMenuDetails } from '../../actions.native';
+import {
+    showConnectionStatus,
+    showContextMenuDetails,
+    showSharedVideoMenu
+} from '../../actions.native';
 import { shouldRenderInviteButton } from '../../functions';
 
 import MeetingParticipantItem from './MeetingParticipantItem';
 import styles from './styles';
 
-export const MeetingParticipantList = () => {
+type Props = {
+
+    /**
+     * Shared video local participant owner.
+     */
+    _localVideoOwner: boolean
+}
+
+const MeetingParticipantList = ({ _localVideoOwner }: Props) => {
     const dispatch = useDispatch();
     const items = [];
     const localParticipant = useSelector(getLocalParticipant);
@@ -30,18 +44,39 @@ export const MeetingParticipantList = () => {
     const { t } = useTranslation();
 
     // eslint-disable-next-line react/no-multi-comp
-    const renderParticipant = id => (
-        <MeetingParticipantItem
-            key = { id }
-            /* eslint-disable-next-line react/jsx-no-bind */
-            onPress = { () => dispatch(showContextMenuDetails(id)) }
-            participantID = { id } />
-    );
+    const renderParticipant = p => {
+        if (p.isFakeParticipant) {
+            if (_localVideoOwner) {
+                return (
+                    <MeetingParticipantItem
+                        key = { p.id }
+                        /* eslint-disable-next-line react/jsx-no-bind,no-confusing-arrow */
+                        onPress = { () => dispatch(showSharedVideoMenu(p)) }
+                        participantID = { p.id } />
+                );
+            }
 
-    localParticipant && items.push(renderParticipant(localParticipant?.id));
+            return (
+                <MeetingParticipantItem
+                    key = { p.id }
+                    participantID = { p.id } />
+            );
+        }
+
+        return (
+            <MeetingParticipantItem
+                key = { p.id }
+                /* eslint-disable-next-line react/jsx-no-bind,no-confusing-arrow */
+                onPress = { () => p.local
+                    ? dispatch(showConnectionStatus(p.id)) : dispatch(showContextMenuDetails(p)) }
+                participantID = { p.id } />
+        );
+    };
+
+    items.push(renderParticipant(localParticipant));
 
     participants.forEach(p => {
-        items.push(renderParticipant(p?.id));
+        items.push(renderParticipant(p));
     });
 
     return (
@@ -70,3 +105,20 @@ export const MeetingParticipantList = () => {
     );
 };
 
+/**
+ * Maps (parts of) the redux state to the associated props for this component.
+ *
+ * @param {Object} state - The Redux state.
+ * @private
+ * @returns {Props}
+ */
+function _mapStateToProps(state): Object {
+    const { ownerId } = state['features/shared-video'];
+    const localParticipantId = getLocalParticipant(state).id;
+
+    return {
+        _localVideoOwner: Boolean(ownerId === localParticipantId)
+    };
+}
+
+export default connect(_mapStateToProps)(MeetingParticipantList);

react/features/participants-pane/components/native/ParticipantsPane.js

@@ -7,7 +7,7 @@ import { Button } from 'react-native-paper';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { openDialog } from '../../../base/dialog';
-import { Icon, IconClose, IconHorizontalPoints } from '../../../base/icons';
+import { Icon, IconHorizontalPoints } from '../../../base/icons';
 import { JitsiModal } from '../../../base/modal';
 import {
     getParticipantCount,
@@ -18,8 +18,8 @@ import MuteEveryoneDialog
 import { close } from '../../actions.native';
 
 import { ContextMenuMore } from './ContextMenuMore';
-import { LobbyParticipantList } from './LobbyParticipantList';
-import { MeetingParticipantList } from './MeetingParticipantList';
+import LobbyParticipantList from './LobbyParticipantList';
+import MeetingParticipantList from './MeetingParticipantList';
 import styles from './styles';
 
 /**
@@ -40,21 +40,11 @@ const ParticipantsPane = () => {
 
     return (
         <JitsiModal
-            hideHeaderWithNavigation = { true }
+            headerProps = {{
+                headerLabelKey: 'participantsPane.header'
+            }}
+            onClose = { closePane }
             style = { styles.participantsPane }>
-            <View style = { styles.header }>
-                <Button
-                    /* eslint-disable-next-line react/jsx-no-bind */
-                    icon = { () =>
-                        (<Icon
-                            size = { 20 }
-                            src = { IconClose } />)
-                    }
-                    labelStyle = { styles.closeIcon }
-                    mode = 'contained'
-                    onPress = { closePane }
-                    style = { styles.closeButton } />
-            </View>
             <ScrollView>
                 <LobbyParticipantList />
                 <MeetingParticipantList />

react/features/participants-pane/components/native/index.js

@@ -1,6 +1,6 @@
 // @flow
 
+export { default as MeetingParticipantList } from './MeetingParticipantList';
 export { default as ParticipantsPane } from './ParticipantsPane';
 export { default as ParticipantsPaneButton } from './ParticipantsPaneButton';
 export { default as ContextMenuLobbyParticipantReject } from './ContextMenuLobbyParticipantReject';
-export { default as ContextMenuMeetingParticipantDetails } from './ContextMenuMeetingParticipantDetails';

react/features/participants-pane/components/native/styles.js

@@ -116,10 +116,6 @@ export default {
         textTransform: 'capitalize'
     },
 
-    admitAllParticipantsActionButton: {
-        marginLeft: 'auto'
-    },
-
     participantContainer: {
         alignItems: 'center',
         borderBottomColor: BaseTheme.palette.field01Hover,
@@ -145,7 +141,7 @@ export default {
         display: 'flex',
         flexDirection: 'row',
         overflow: 'hidden',
-        paddingLeft: BaseTheme.spacing[2],
+        paddingLeft: BaseTheme.spacing[3],
         width: '63%'
     },
 
@@ -187,6 +183,7 @@ export default {
         ...flexContent,
         top: BaseTheme.spacing[1]
     },
+
     lobbyList: {
         position: 'relative'
     },
@@ -216,19 +213,6 @@ export default {
         marginLeft: BaseTheme.spacing[3]
     },
 
-    header: {
-        alignItems: 'center',
-        backgroundColor: BaseTheme.palette.ui01,
-        top: BaseTheme.spacing[0],
-        display: 'flex',
-        flexDirection: 'row',
-        height: BaseTheme.spacing[10],
-        paddingRight: BaseTheme.spacing[3],
-        position: 'relative',
-        right: BaseTheme.spacing[0],
-        left: BaseTheme.spacing[0]
-    },
-
     footer: {
         alignItems: 'center',
         backgroundColor: BaseTheme.palette.ui01,
@@ -243,17 +227,6 @@ export default {
         left: BaseTheme.spacing[0]
     },
 
-    closeButton: {
-        ...smallButton,
-        marginLeft: 'auto'
-    },
-
-    closeIcon: {
-        ...buttonContent,
-        height: BaseTheme.spacing[5],
-        marginLeft: 'auto'
-    },
-
     inviteButton: {
         backgroundColor: BaseTheme.palette.action01,
         marginTop: BaseTheme.spacing[2],
@@ -277,12 +250,7 @@ export default {
     },
 
     contextMenuMore: {
-        backgroundColor: BaseTheme.palette.action02,
-        borderRadius: BaseTheme.shape.borderRadius
-    },
-
-    contextMenuMeetingParticipantDetails: {
-        backgroundColor: BaseTheme.palette.action02,
+        backgroundColor: BaseTheme.palette.bottomSheet,
         borderRadius: BaseTheme.shape.borderRadius
     },
 
@@ -303,8 +271,6 @@ export default {
         marginHorizontal: BaseTheme.spacing[0],
         paddingTop: 12,
         paddingBottom: 12,
-        paddingRight: BaseTheme.spacing[3],
-        paddingLeft: BaseTheme.spacing[3],
         textTransform: 'capitalize',
         width: 94
     },
@@ -318,13 +284,15 @@ export default {
     },
 
     contextMenuItemSectionAvatar: {
-        ...contextMenuItem,
-        marginLeft: BaseTheme.spacing[3]
-    },
-
-    contextMenuItemAvatarText: {
-        ...contextMenuItemText,
-        marginLeft: BaseTheme.spacing[3]
+        alignItems: 'center',
+        backgroundColor: BaseTheme.palette.bottomSheet,
+        borderBottomColor: BaseTheme.palette.dividerColor,
+        borderBottomWidth: 1,
+        borderTopLeftRadius: BaseTheme.spacing[3],
+        borderTopRightRadius: BaseTheme.spacing[3],
+        flexDirection: 'row',
+        height: BaseTheme.spacing[7],
+        paddingLeft: BaseTheme.spacing[3]
     },
 
     contextMenuItemText: {
@@ -333,15 +301,14 @@ export default {
     },
 
     contextMenuItemName: {
-        ...BaseTheme.typography.bodyShortRegularLarge,
-        color: BaseTheme.palette.text01
-    },
-
-    contextMenuIcon: {
-        color: BaseTheme.palette.actionDanger
+        color: BaseTheme.palette.text04,
+        flexShrink: 1,
+        fontSize: BaseTheme.spacing[3],
+        marginLeft: BaseTheme.spacing[3],
+        opacity: 0.90
     },
 
     divider: {
-        backgroundColor: BaseTheme.palette.section01
+        backgroundColor: BaseTheme.palette.dividerColor
     }
 };

react/features/participants-pane/components/web/LobbyParticipantList.js

@@ -53,9 +53,13 @@ export const LobbyParticipantList = () => {
             <div className = { classes.heading }>
                 {t('participantsPane.headings.lobby', { count: participants.length })}
             </div>
-            <div
-                className = { classes.link }
-                onClick = { admitAll }>{t('lobby.admitAll')}</div>
+            {
+                participants.length > 1 && (
+                    <div
+                        className = { classes.link }
+                        onClick = { admitAll }>{t('lobby.admitAll')}</div>
+                )
+            }
         </div>
         <div>
             {participants.map(p => (

react/features/participants-pane/components/web/MeetingParticipantContextMenu.js

@@ -11,9 +11,11 @@ import {
     IconMessage,
     IconMicDisabled,
     IconMuteEveryoneElse,
+    IconShareVideo,
     IconVideoOff
 } from '../../../base/icons';
 import {
+    getLocalParticipant,
     getParticipantByIdOrUndefined,
     isLocalParticipantModerator,
     isParticipantModerator
@@ -21,6 +23,7 @@ import {
 import { connect } from '../../../base/redux';
 import { isParticipantAudioMuted, isParticipantVideoMuted } from '../../../base/tracks';
 import { openChat } from '../../../chat/actions';
+import { stopSharedVideo } from '../../../shared-video/actions.any';
 import { GrantModeratorDialog, KickRemoteParticipantDialog, MuteEveryoneDialog } from '../../../video-menu';
 import MuteRemoteParticipantsVideoDialog from '../../../video-menu/components/web/MuteRemoteParticipantsVideoDialog';
 import { getComputedOuterHeight } from '../../functions';
@@ -60,6 +63,11 @@ type Props = {
      */
     _isParticipantAudioMuted: boolean,
 
+    /**
+     * Shared video local participant owner.
+     */
+    _localVideoOwner: boolean,
+
     /**
      * Participant reference
      */
@@ -143,6 +151,7 @@ class MeetingParticipantContextMenu extends Component<Props, State> {
         this._onMuteEveryoneElse = this._onMuteEveryoneElse.bind(this);
         this._onMuteVideo = this._onMuteVideo.bind(this);
         this._onSendPrivateMessage = this._onSendPrivateMessage.bind(this);
+        this._onStopSharedVideo = this._onStopSharedVideo.bind(this);
         this._position = this._position.bind(this);
     }
 
@@ -176,6 +185,19 @@ class MeetingParticipantContextMenu extends Component<Props, State> {
         }));
     }
 
+    _onStopSharedVideo: () => void;
+
+    /**
+     * Stops shared video.
+     *
+     * @returns {void}
+     */
+    _onStopSharedVideo() {
+        const { dispatch } = this.props;
+
+        dispatch(stopSharedVideo());
+    }
+
     _onMuteEveryoneElse: () => void;
 
     /**
@@ -282,6 +304,7 @@ class MeetingParticipantContextMenu extends Component<Props, State> {
             _isParticipantModerator,
             _isParticipantVideoMuted,
             _isParticipantAudioMuted,
+            _localVideoOwner,
             _participant,
             onEnter,
             onLeave,
@@ -302,66 +325,81 @@ class MeetingParticipantContextMenu extends Component<Props, State> {
                 onClick = { onSelect }
                 onMouseEnter = { onEnter }
                 onMouseLeave = { onLeave }>
-                <ContextMenuItemGroup>
-                    {
-                        _isLocalModerator && (
-                            <>
+                {
+                    !_participant.isFakeParticipant && (
+                        <>
+                            <ContextMenuItemGroup>
                                 {
-                                    !_isParticipantAudioMuted
-                                        && <ContextMenuItem onClick = { muteAudio(_participant) }>
-                                            <ContextMenuIcon src = { IconMicDisabled } />
-                                            <span>{t('dialog.muteParticipantButton')}</span>
-                                        </ContextMenuItem>
+                                    _isLocalModerator && (
+                                        <>
+                                            {
+                                                !_isParticipantAudioMuted
+                                                && <ContextMenuItem onClick = { muteAudio(_participant) }>
+                                                    <ContextMenuIcon src = { IconMicDisabled } />
+                                                    <span>{t('dialog.muteParticipantButton')}</span>
+                                                </ContextMenuItem>
+                                            }
+
+                                            <ContextMenuItem onClick = { this._onMuteEveryoneElse }>
+                                                <ContextMenuIcon src = { IconMuteEveryoneElse } />
+                                                <span>{t('toolbar.accessibilityLabel.muteEveryoneElse')}</span>
+                                            </ContextMenuItem>
+                                        </>
+                                    )
                                 }
 
-                                <ContextMenuItem onClick = { this._onMuteEveryoneElse }>
-                                    <ContextMenuIcon src = { IconMuteEveryoneElse } />
-                                    <span>{t('toolbar.accessibilityLabel.muteEveryoneElse')}</span>
-                                </ContextMenuItem>
-                            </>
-                        )
-                    }
-
-                    {
-                        _isLocalModerator && (
-                            _isParticipantVideoMuted || (
-                                <ContextMenuItem onClick = { this._onMuteVideo }>
-                                    <ContextMenuIcon src = { IconVideoOff } />
-                                    <span>{t('participantsPane.actions.stopVideo')}</span>
-                                </ContextMenuItem>
-                            )
-                        )
-                    }
-                </ContextMenuItemGroup>
-
-                <ContextMenuItemGroup>
-                    {
-                        _isLocalModerator && (
-                            <>
                                 {
-                                    !_isParticipantModerator && (
-                                        <ContextMenuItem onClick = { this._onGrantModerator }>
-                                            <ContextMenuIcon src = { IconCrown } />
-                                            <span>{t('toolbar.accessibilityLabel.grantModerator')}</span>
+                                    _isLocalModerator && (
+                                        _isParticipantVideoMuted || (
+                                            <ContextMenuItem onClick = { this._onMuteVideo }>
+                                                <ContextMenuIcon src = { IconVideoOff } />
+                                                <span>{t('participantsPane.actions.stopVideo')}</span>
+                                            </ContextMenuItem>
+                                        )
+                                    )
+                                }
+                            </ContextMenuItemGroup>
+
+                            <ContextMenuItemGroup>
+                                {
+                                    _isLocalModerator && (
+                                        <>
+                                            {
+                                                !_isParticipantModerator && (
+                                                    <ContextMenuItem onClick = { this._onGrantModerator }>
+                                                        <ContextMenuIcon src = { IconCrown } />
+                                                        <span>{t('toolbar.accessibilityLabel.grantModerator')}</span>
+                                                    </ContextMenuItem>
+                                                )
+                                            }
+                                            <ContextMenuItem onClick = { this._onKick }>
+                                                <ContextMenuIcon src = { IconCloseCircle } />
+                                                <span>{ t('videothumbnail.kick') }</span>
+                                            </ContextMenuItem>
+                                        </>
+                                    )
+                                }
+                                {
+                                    _isChatButtonEnabled && (
+                                        <ContextMenuItem onClick = { this._onSendPrivateMessage }>
+                                            <ContextMenuIcon src = { IconMessage } />
+                                            <span>{t('toolbar.accessibilityLabel.privateMessage')}</span>
                                         </ContextMenuItem>
                                     )
                                 }
-                                <ContextMenuItem onClick = { this._onKick }>
-                                    <ContextMenuIcon src = { IconCloseCircle } />
-                                    <span>{ t('videothumbnail.kick') }</span>
-                                </ContextMenuItem>
-                            </>
-                        )
-                    }
-                    {
-                        _isChatButtonEnabled && (
-                            <ContextMenuItem onClick = { this._onSendPrivateMessage }>
-                                <ContextMenuIcon src = { IconMessage } />
-                                <span>{t('toolbar.accessibilityLabel.privateMessage')}</span>
-                            </ContextMenuItem>
-                        )
-                    }
-                </ContextMenuItemGroup>
+                            </ContextMenuItemGroup>
+                        </>
+                    )
+                }
+
+                {
+                    _participant.isFakeParticipant && _localVideoOwner && (
+                        <ContextMenuItem onClick = { this._onStopSharedVideo }>
+                            <ContextMenuIcon src = { IconShareVideo } />
+                            <span>{t('toolbar.stopSharedVideo')}</span>
+                        </ContextMenuItem>
+                    )
+                }
             </ContextMenu>
         );
     }
@@ -377,7 +415,8 @@ class MeetingParticipantContextMenu extends Component<Props, State> {
  */
 function _mapStateToProps(state, ownProps): Object {
     const { participantID } = ownProps;
-
+    const { ownerId } = state['features/shared-video'];
+    const localParticipantId = getLocalParticipant(state).id;
     const participant = getParticipantByIdOrUndefined(state, participantID);
 
     const _isLocalModerator = isLocalParticipantModerator(state);
@@ -392,6 +431,7 @@ function _mapStateToProps(state, ownProps): Object {
         _isParticipantModerator,
         _isParticipantVideoMuted,
         _isParticipantAudioMuted,
+        _localVideoOwner: Boolean(ownerId === localParticipantId),
         _participant: participant
     };
 }

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

@@ -2,7 +2,11 @@
 
 import React from 'react';
 
-import { getParticipantByIdOrUndefined, getParticipantDisplayName } from '../../../base/participants';
+import {
+    getLocalParticipant,
+    getParticipantByIdOrUndefined,
+    getParticipantDisplayName
+} from '../../../base/participants';
 import { connect } from '../../../base/redux';
 import { isParticipantAudioMuted, isParticipantVideoMuted } from '../../../base/tracks';
 import { ACTION_TRIGGER, MEDIA_STATE, type MediaState } from '../../constants';
@@ -34,6 +38,16 @@ type Props = {
      */
     _local: boolean,
 
+    /**
+     * Shared video local participant owner.
+     */
+    _localVideoOwner: boolean,
+
+    /**
+     * The participant.
+     */
+    _participant: Object,
+
     /**
      * The participant ID.
      *
@@ -108,7 +122,9 @@ function MeetingParticipantItem({
     _audioMediaState,
     _displayName,
     _isVideoMuted,
+    _localVideoOwner,
     _local,
+    _participant,
     _participantID,
     _quickActionButtonType,
     _raisedHand,
@@ -133,15 +149,28 @@ function MeetingParticipantItem({
             raisedHand = { _raisedHand }
             videoMuteState = { _isVideoMuted ? MEDIA_STATE.MUTED : MEDIA_STATE.UNMUTED }
             youText = { youText }>
-            <ParticipantQuickAction
-                askUnmuteText = { askUnmuteText }
-                buttonType = { _quickActionButtonType }
-                muteAudio = { muteAudio }
-                muteParticipantButtonText = { muteParticipantButtonText }
-                participantID = { _participantID } />
-            <ParticipantActionEllipsis
-                aria-label = { participantActionEllipsisLabel }
-                onClick = { onContextMenu } />
+            {
+                !_participant.isFakeParticipant && (
+                    <>
+                        <ParticipantQuickAction
+                            askUnmuteText = { askUnmuteText }
+                            buttonType = { _quickActionButtonType }
+                            muteAudio = { muteAudio }
+                            muteParticipantButtonText = { muteParticipantButtonText }
+                            participantID = { _participantID } />
+                        <ParticipantActionEllipsis
+                            aria-label = { participantActionEllipsisLabel }
+                            onClick = { onContextMenu } />
+                    </>
+                )
+            }
+            {
+                _participant.isFakeParticipant && _localVideoOwner && (
+                    <ParticipantActionEllipsis
+                        aria-label = { participantActionEllipsisLabel }
+                        onClick = { onContextMenu } />
+                )
+            }
         </ParticipantItem>
     );
 }
@@ -156,6 +185,8 @@ function MeetingParticipantItem({
  */
 function _mapStateToProps(state, ownProps): Object {
     const { participantID } = ownProps;
+    const { ownerId } = state['features/shared-video'];
+    const localParticipantId = getLocalParticipant(state).id;
 
     const participant = getParticipantByIdOrUndefined(state, participantID);
 
@@ -170,6 +201,8 @@ function _mapStateToProps(state, ownProps): Object {
         _isAudioMuted,
         _isVideoMuted,
         _local: Boolean(participant?.local),
+        _localVideoOwner: Boolean(ownerId === localParticipantId),
+        _participant: participant,
         _participantID: participant?.id,
         _quickActionButtonType,
         _raisedHand: Boolean(participant?.raisedHand)

react/features/participants-pane/components/web/ParticipantItem.js

@@ -161,6 +161,7 @@ export default function ParticipantItem({
 
     return (
         <ParticipantContainer
+            id = { `participant-item-${participantID}` }
             isHighlighted = { isHighlighted }
             onMouseLeave = { onLeave }
             trigger = { actionsTrigger }>

react/features/participants-pane/components/web/styled.js

@@ -235,7 +235,6 @@ export const ParticipantActionsHover = styled(ParticipantActions)`
     position: absolute;
     top: 0;
     transform: translateX(-100%);
-    width: 40px;
   }
 `;
 

react/features/polls/actionTypes.js

@@ -0,0 +1,55 @@
+// @flow
+
+/**
+ * The type of the action which signals that a new Poll was received.
+ *
+ * {
+ *     type: RECEIVE_POLL,
+ *     poll: Poll,
+ *     pollId: string,
+ *     notify: boolean
+ * }
+ *
+ */
+export const RECEIVE_POLL = 'RECEIVE_POLL';
+
+/**
+ * The type of the action which signals that a new Answer was received.
+ *
+ * {
+ *     type: RECEIVE_ANSWER,
+ *     answer: Answer,
+ *     pollId: string,
+ * }
+ */
+export const RECEIVE_ANSWER = 'RECEIVE_ANSWER';
+
+/**
+ * The type of the action which registers a vote.
+ *
+ * {
+ *     type: REGISTER_VOTE,
+ *     answers: Array<boolean> | null,
+ *     pollId: string
+ * }
+ */
+export const REGISTER_VOTE = 'REGISTER_VOTE';
+
+/**
+ * The type of the action which retracts a vote.
+ *
+ * {
+ *     type: RETRACT_VOTE,
+ *     pollId: string,
+ * }
+ */
+export const RETRACT_VOTE = 'RETRACT_VOTE';
+
+/**
+ * The type of the action triggered when the poll tab in chat pane is closed
+ *
+ * {
+ *     type: RESET_NB_UNREAD_POLLS,
+ * }
+ */
+export const RESET_NB_UNREAD_POLLS = 'RESET_NB_UNREAD_POLLS';

react/features/polls/actions.js

@@ -0,0 +1,99 @@
+// @flow
+
+import {
+    RESET_NB_UNREAD_POLLS,
+    RECEIVE_ANSWER,
+    RECEIVE_POLL,
+    REGISTER_VOTE,
+    RETRACT_VOTE
+} from './actionTypes';
+import type { Answer, Poll } from './types';
+
+/**
+ * Action to signal that a new poll was received.
+ *
+ * @param {string} pollId - The id of the incoming poll.
+ * @param {Poll} poll - The incoming Poll object.
+ * @param {boolean} notify - Whether to send or not a notification.
+ * @returns {{
+ *     type: RECEIVE_POLL,
+ *     poll: Poll,
+ *     pollId: string,
+ *     notify: boolean
+ * }}
+ */
+export const receivePoll = (pollId: string, poll: Poll, notify: boolean) => {
+    return {
+        type: RECEIVE_POLL,
+        poll,
+        pollId,
+        notify
+    };
+};
+
+/**
+ * Action to signal that a new answer was received.
+ *
+ * @param {string} pollId - The id of the incoming poll.
+ * @param {Answer} answer - The incoming Answer object.
+ * @returns {{
+ *     type: RECEIVE_ANSWER,
+ *     answer: Answer,
+ *     pollId: string
+ * }}
+ */
+export const receiveAnswer = (pollId: string, answer: Answer) => {
+    return {
+        type: RECEIVE_ANSWER,
+        answer,
+        pollId
+    };
+};
+
+/**
+ * Action to register a vote on a poll.
+ *
+ * @param {string} pollId - The id of the poll.
+ * @param {?Array<boolean>} answers - The new answers.
+ * @returns {{
+ *     type: REGISTER_VOTE,
+ *     answers: ?Array<boolean>,
+ *     pollId: string
+ * }}
+ */
+export const registerVote = (pollId: string, answers: Array<boolean> | null) => {
+    return {
+        type: REGISTER_VOTE,
+        answers,
+        pollId
+    };
+};
+
+/**
+ * Action to retract a vote on a poll.
+ *
+ * @param {string} pollId - The id of the poll.
+ * @returns {{
+ *     type: RETRACT_VOTE,
+ *     pollId: string
+ * }}
+ */
+export const retractVote = (pollId: string) => {
+    return {
+        type: RETRACT_VOTE,
+        pollId
+    };
+};
+
+/**
+ * Action to signal the closing of the polls tab.
+ *
+ * @returns {{
+ *     type: POLL_TAB_CLOSED
+ * }}
+ */
+export function resetNbUnreadPollsMessages() {
+    return {
+        type: RESET_NB_UNREAD_POLLS
+    };
+}

react/features/polls/components/AbstractPollAnswer.js

@@ -0,0 +1,101 @@
+// @flow
+
+import React, { useCallback, useState } from 'react';
+import type { AbstractComponent } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'react-redux';
+
+import { getLocalParticipant, getParticipantById } from '../../base/participants';
+import { registerVote } from '../actions';
+import { COMMAND_ANSWER_POLL } from '../constants';
+import type { Poll } from '../types';
+
+/**
+ * The type of the React {@code Component} props of inheriting component.
+ */
+type InputProps = {
+    pollId: string,
+};
+
+/*
+ * Props that will be passed by the AbstractPollAnswer to its
+ * concrete implementations (web/native).
+ **/
+export type AbstractProps = {
+    checkBoxStates: Function,
+    poll: Poll,
+    setCheckbox: Function,
+    skipAnswer: Function,
+    submitAnswer: Function,
+    t: Function,
+};
+
+/**
+ * Higher Order Component taking in a concrete PollAnswer component and
+ * augmenting it with state/behavior common to both web and native implementations.
+ *
+ * @param {React.AbstractComponent} Component - The concrete component.
+ * @returns {React.AbstractComponent}
+ */
+const AbstractPollAnswer = (Component: AbstractComponent<AbstractProps>) => (props: InputProps) => {
+
+    const { pollId } = props;
+
+    const conference: Object = useSelector(state => state['features/base/conference'].conference);
+
+    const poll: Poll = useSelector(state => state['features/polls'].polls[pollId]);
+
+    const { id: localId } = useSelector(getLocalParticipant);
+
+    const [ checkBoxStates, setCheckBoxState ] = useState(() => {
+        if (poll.lastVote !== null) {
+            return [ ...poll.lastVote ];
+        }
+
+        return new Array(poll.answers.length).fill(false);
+    });
+
+    const setCheckbox = useCallback((index, state) => {
+        const newCheckBoxStates = [ ...checkBoxStates ];
+
+        newCheckBoxStates[index] = state;
+        setCheckBoxState(newCheckBoxStates);
+    }, [ checkBoxStates ]);
+
+    const dispatch = useDispatch();
+
+    const localParticipant = useSelector(state => getParticipantById(state, localId));
+    const localName: string = localParticipant.name ? localParticipant.name : 'Fellow Jitster';
+
+    const submitAnswer = useCallback(() => {
+        conference.sendMessage({
+            type: COMMAND_ANSWER_POLL,
+            pollId,
+            voterId: localId,
+            voterName: localName,
+            answers: checkBoxStates
+        });
+
+        dispatch(registerVote(pollId, checkBoxStates));
+
+        return false;
+    }, [ pollId, localId, localName, checkBoxStates, conference ]);
+
+    const skipAnswer = useCallback(() => {
+        dispatch(registerVote(pollId, null));
+
+    }, [ pollId ]);
+
+    const { t } = useTranslation();
+
+    return (<Component
+        checkBoxStates = { checkBoxStates }
+        poll = { poll }
+        setCheckbox = { setCheckbox }
+        skipAnswer = { skipAnswer }
+        submitAnswer = { submitAnswer }
+        t = { t } />);
+
+};
+
+export default AbstractPollAnswer;

react/features/polls/components/AbstractPollCreate.js

@@ -0,0 +1,135 @@
+// @flow
+
+import React, { useCallback, useState } from 'react';
+import type { AbstractComponent } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useSelector } from 'react-redux';
+
+import { getParticipantDisplayName } from '../../base/participants';
+import { COMMAND_NEW_POLL } from '../constants';
+
+/**
+ * The type of the React {@code Component} props of inheriting component.
+ */
+type InputProps = {
+    setCreateMode: boolean => void,
+};
+
+/*
+ * Props that will be passed by the AbstractPollCreate to its
+ * concrete implementations (web/native).
+ **/
+export type AbstractProps = InputProps & {
+    answers: Array<string>,
+    question: string,
+    setQuestion: string => void,
+    setAnswer: (number, string) => void,
+    addAnswer: ?number => void,
+    moveAnswer: (number, number) => void,
+    removeAnswer: number => void,
+    onSubmit: Function,
+    isSubmitDisabled: boolean,
+    t: Function,
+};
+
+/**
+ * Higher Order Component taking in a concrete PollCreate component and
+ * augmenting it with state/behavior common to both web and native implementations.
+ *
+ * @param {React.AbstractComponent} Component - The concrete component.
+ * @returns {React.AbstractComponent}
+ */
+const AbstractPollCreate = (Component: AbstractComponent<AbstractProps>) => (props: InputProps) => {
+
+    const { setCreateMode } = props;
+
+    const [ question, setQuestion ] = useState('');
+
+    const [ answers, setAnswers ] = useState([ '', '' ]);
+
+    const setAnswer = useCallback((i, answer) => {
+        const newAnswers = [ ...answers ];
+
+        newAnswers[i] = answer;
+        setAnswers(newAnswers);
+    });
+
+    const addAnswer = useCallback((i: ?number) => {
+
+        const newAnswers = [ ...answers ];
+
+        newAnswers.splice(typeof i === 'number' ? i : answers.length, 0, '');
+        setAnswers(newAnswers);
+    });
+
+    const moveAnswer = useCallback((i, j) => {
+        const newAnswers = [ ...answers ];
+
+        const answer = answers[i];
+
+        newAnswers.splice(i, 1);
+        newAnswers.splice(j, 0, answer);
+        setAnswers(newAnswers);
+    });
+
+    const removeAnswer = useCallback(i => {
+        if (answers.length <= 2) {
+            return;
+        }
+        const newAnswers = [ ...answers ];
+
+        newAnswers.splice(i, 1);
+        setAnswers(newAnswers);
+    });
+
+    const conference = useSelector(state => state['features/base/conference'].conference);
+    const myId = conference.myUserId();
+    const myName = useSelector(state => getParticipantDisplayName(state, myId));
+
+    const onSubmit = useCallback(ev => {
+        if (ev) {
+            ev.preventDefault();
+        }
+
+        const filteredAnswers = answers.filter(answer => answer.trim().length > 0);
+
+        if (filteredAnswers.length < 2) {
+            return;
+        }
+
+        conference.sendMessage({
+            type: COMMAND_NEW_POLL,
+            pollId: Math.floor(Math.random() * Number.MAX_SAFE_INTEGER).toString(36),
+            senderId: myId,
+            senderName: myName,
+            question,
+            answers: filteredAnswers
+        });
+
+        setCreateMode(false);
+
+    }, [ conference, question, answers ]);
+
+    // 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.trim().length > 0).length < 2; // If not enough options are provided
+
+    const { t } = useTranslation();
+
+    return (<Component
+        addAnswer = { addAnswer }
+        answers = { answers }
+        isSubmitDisabled = { isSubmitDisabled }
+        moveAnswer = { moveAnswer }
+        onSubmit = { onSubmit }
+        question = { question }
+        removeAnswer = { removeAnswer }
+        setAnswer = { setAnswer }
+        setCreateMode = { setCreateMode }
+        setQuestion = { setQuestion }
+        t = { t } />);
+
+};
+
+export default AbstractPollCreate;

react/features/polls/components/AbstractPollResults.js

@@ -0,0 +1,124 @@
+// @flow
+
+import React, { useCallback, useMemo, useState } from 'react';
+import type { AbstractComponent } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'react-redux';
+
+import { getLocalParticipant, getParticipantById } from '../../base/participants/functions';
+import { retractVote } from '../actions';
+import { COMMAND_ANSWER_POLL } from '../constants';
+
+/**
+ * The type of the React {@code Component} props of inheriting component.
+ */
+type InputProps = {
+
+    /**
+     * ID of the poll to display
+     */
+    pollId: string,
+};
+
+export type AnswerInfo = {
+    name: string,
+    percentage: number,
+    voters?: Array<{ id: number, name: string }>,
+    voterCount: number
+};
+
+/**
+ * The type of the React {@code Component} props of {@link AbstractPollResults}.
+ */
+export type AbstractProps = {
+    answers: Array<AnswerInfo>,
+    changeVote: Function,
+    showDetails: boolean,
+    question: string,
+    t: Function,
+    toggleIsDetailed: Function,
+    haveVoted: boolean,
+};
+
+/**
+ * Higher Order Component taking in a concrete PollResult component and
+ * augmenting it with state/behavior common to both web and native implementations.
+ *
+ * @param {React.AbstractComponent} Component - The concrete component.
+ * @returns {React.AbstractComponent}
+ */
+const AbstractPollResults = (Component: AbstractComponent<AbstractProps>) => (props: InputProps) => {
+    const { pollId } = props;
+
+    const pollDetails = useSelector(state => state['features/polls'].polls[pollId]);
+
+    const [ showDetails, setShowDetails ] = useState(false);
+    const toggleIsDetailed = useCallback(() => {
+        setShowDetails(!showDetails);
+    });
+
+    const answers: Array<AnswerInfo> = useMemo(() => {
+        const voterSet = new Set();
+
+        // Getting every voters ID that participates to the poll
+        for (const answer of pollDetails.answers) {
+            for (const [ voterId ] of answer.voters) {
+                voterSet.add(voterId);
+            }
+        }
+
+        const totalVoters = voterSet.size;
+
+        return pollDetails.answers.map(answer => {
+            const percentage = totalVoters === 0 ? 0 : Math.round(answer.voters.size / totalVoters * 100);
+
+            let voters = null;
+
+            if (showDetails) {
+                voters = [ ...answer.voters ].map(([ id, name ]) => {
+                    return {
+                        id,
+                        name
+                    };
+                });
+            }
+
+            return {
+                name: answer.name,
+                percentage,
+                voters,
+                voterCount: answer.voters.size
+            };
+        });
+    }, [ pollDetails.answers, showDetails ]);
+
+    const dispatch = useDispatch();
+
+    const conference: Object = useSelector(state => state['features/base/conference'].conference);
+    const localId = useSelector(state => getLocalParticipant(state).id);
+    const localParticipant = useSelector(state => getParticipantById(state, localId));
+    const localName: string = localParticipant ? localParticipant.name : 'Fellow Jitster';
+    const changeVote = useCallback(() => {
+        conference.sendMessage({
+            type: COMMAND_ANSWER_POLL,
+            pollId,
+            voterId: localId,
+            voterName: localName,
+            answers: new Array(pollDetails.answers.length).fill(false)
+        });
+        dispatch(retractVote(pollId));
+    }, [ pollId, localId, localName, pollDetails ]);
+
+    const { t } = useTranslation();
+
+    return (<Component
+        answers = { answers }
+        changeVote = { changeVote }
+        haveVoted = { pollDetails.lastVote !== null }
+        question = { pollDetails.question }
+        showDetails = { showDetails }
+        t = { t }
+        toggleIsDetailed = { toggleIsDetailed } />);
+};
+
+export default AbstractPollResults;

react/features/polls/components/AbstractPollsPane.js

@@ -0,0 +1,44 @@
+// @flow
+
+import React, { useState } from 'react';
+import type { AbstractComponent } from 'react';
+import { useTranslation } from 'react-i18next';
+
+/*
+ * Props that will be passed by the AbstractPollsPane to its
+ * concrete implementations (web/native).
+ **/
+export type AbstractProps = {
+    createMode: boolean,
+    onCreate: void => void,
+    setCreateMode: boolean => void,
+    t: Function,
+};
+
+/**
+ * Higher Order Component taking in a concrete PollsPane component and
+ * augmenting it with state/behavior common to both web and native implementations.
+ *
+ * @param {React.AbstractComponent} Component - The concrete component.
+ * @returns {React.AbstractComponent}
+ */
+const AbstractPollsPane = (Component: AbstractComponent<AbstractProps>) => () => {
+
+    const [ createMode, setCreateMode ] = useState(false);
+
+    const onCreate = () => {
+        setCreateMode(true);
+    };
+
+    const { t } = useTranslation();
+
+    return (<Component
+        createMode = { createMode }
+        /* eslint-disable react/jsx-no-bind */
+        onCreate = { onCreate }
+        setCreateMode = { setCreateMode }
+        t = { t } />);
+
+};
+
+export default AbstractPollsPane;