feat(android) bump minimum API level to 24

Some of our dependencies (most notably WebRTC) have dropped it and we
can no longer claim to support API level 23).

android/gradle.properties

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

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

@@ -45,12 +45,6 @@ class AudioDeviceHandlerGeneric implements
      */
     private AudioModeModule module;
 
-    /**
-     * Constant defining a Hearing Aid. Only available on API level >= 28.
-     * The value of: AudioDeviceInfo.TYPE_HEARING_AID
-     */
-    private static final int TYPE_HEARING_AID = 23;
-
     /**
      * Constant defining a USB headset. Only available on API level >= 26.
      * The value of: AudioDeviceInfo.TYPE_USB_HEADSET
@@ -91,7 +85,6 @@ class AudioDeviceHandlerGeneric implements
                         break;
                     case AudioDeviceInfo.TYPE_WIRED_HEADPHONES:
                     case AudioDeviceInfo.TYPE_WIRED_HEADSET:
-                    case TYPE_HEARING_AID:
                     case TYPE_USB_HEADSET:
                         devices.add(AudioModeModule.DEVICE_HEADPHONES);
                         break;

css/_chat.scss

@@ -74,6 +74,10 @@
     a:active {
         color: black;
     }
+
+    &::-webkit-scrollbar-corner {
+        background: #3a3a3a;
+    }
 }
 
 

css/_videolayout_default.scss

@@ -108,6 +108,10 @@
 #largeVideoContainer {
     height: 100%;
     width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    margin: 0 !important;
 }
 
 #largeVideoWrapper {

ios/Podfile.lock

@@ -134,7 +134,7 @@ PODS:
     - AppAuth/Core (~> 1.6)
     - GTMSessionFetcher/Core (< 3.0, >= 1.5)
   - GTMSessionFetcher/Core (2.3.0)
-  - JitsiWebRTC (111.0.2)
+  - JitsiWebRTC (111.0.1)
   - libwebp (1.2.4):
     - libwebp/demux (= 1.2.4)
     - libwebp/mux (= 1.2.4)
@@ -725,7 +725,7 @@ SPEC CHECKSUMS:
   GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
   GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd
   GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2
-  JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b
+  JitsiWebRTC: 9619c1f71cc16eeca76df68aa2d213c6d63274a8
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   ObjectiveDropboxOfficial: fe206ce8c0bc49976c249d472db7fdbc53ebbd53

ios/app/broadcast-extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>23.1.2</string>
+	<string>99.0.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>23.1.2</string>
+	<string>99.0.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>23.1.2</string>
+	<string>99.0.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>23.1.2</string>
+	<string>99.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/fastlane/Fastfile

@@ -98,6 +98,7 @@ platform :ios do
       demo_account_required: false,
       distribute_external: true,
       groups: ENV["JITSI_BETA_TESTING_GROUPS"],
+      reject_build_waiting_for_review: true,
       uses_non_exempt_encryption: false
     )
 

ios/sdk/src/Info.plist

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

ios/sdk/src/Lite-Info.plist

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

modules/UI/UI.js

@@ -11,11 +11,11 @@ import { setColorAlpha } from '../../react/features/base/util/helpers';
 import { setDocumentUrl } from '../../react/features/etherpad/actions';
 import { setFilmstripVisible } from '../../react/features/filmstrip/actions.any';
 import {
-    joinLeaveNotificationsDisabled,
     setNotificationsEnabled,
     showNotification
 } from '../../react/features/notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../../react/features/notifications/constants';
+import { joinLeaveNotificationsDisabled } from '../../react/features/notifications/functions';
 import {
     dockToolbox,
     setToolboxEnabled,

react/features/base/react/components/web/MultiSelectAutocomplete.tsx

@@ -163,7 +163,7 @@ class MultiSelectAutocomplete extends Component<IProps, IState> {
         const autoFocus = this.props.shouldFocus || false;
         const disabled = this.props.isDisabled || false;
         const placeholder = this.props.placeholder || '';
-        const noMatchesFound = this.props.noMatchesFound || '';
+        const noMatchesFound = this.state.loading ? this.props.loadingMessage : this.props.noMatchesFound || '';
         const errorDialog = this._renderError();
 
         return (
@@ -200,7 +200,7 @@ class MultiSelectAutocomplete extends Component<IProps, IState> {
             error: this.state.error && Boolean(filterValue),
             filterValue,
             isOpen: Boolean(this.state.items.length) && Boolean(filterValue),
-            items: filterValue ? this.state.items : [],
+            items: [],
             loading: Boolean(filterValue)
         });
         if (filterValue) {

react/features/base/ui/components/web/MultiSelect.tsx

@@ -24,6 +24,8 @@ interface IProps {
     selectedItems?: MultiSelectItem[];
 }
 
+const MULTI_SELECT_HEIGHT = 200;
+
 const useStyles = makeStyles()(theme => {
     return {
         container: {
@@ -41,7 +43,7 @@ const useStyles = makeStyles()(theme => {
             borderRadius: `${Number(theme.shape.borderRadius)}px`,
             ...withPixelLineHeight(theme.typography.bodyShortRegular),
             zIndex: 2,
-            maxHeight: '400px',
+            maxHeight: `${MULTI_SELECT_HEIGHT}px`,
             overflowY: 'auto',
             padding: '0'
         },
@@ -128,7 +130,7 @@ const MultiSelect = ({
                             </div>
                         </div>
                     ))
-                    : <div>{noMatchesText}</div>
+                    : <div className = { classes.listItem }>{noMatchesText}</div>
             }
         </div>
     ), [ items ]);

react/features/chat/components/web/ChatInput.tsx

@@ -90,6 +90,8 @@ class ChatInput extends Component<IProps, IState> {
         if (isMobileBrowser()) {
             // Ensure textarea is not focused when opening chat on mobile browser.
             this._textArea?.current && this._textArea.current.blur();
+        } else {
+            this._focus();
         }
     }
 

react/features/chat/components/web/ChatMessage.tsx

@@ -29,9 +29,9 @@ const styles = (theme: Theme) => {
         chatMessage: {
             display: 'inline-flex',
             padding: '12px',
+            marginRight: '12px',
             backgroundColor: theme.palette.ui02,
             borderRadius: '4px 12px 12px 12px',
-            boxSizing: 'border-box' as const,
             maxWidth: '100%',
             marginTop: '4px',
 

react/features/conference/middleware.ts

@@ -18,6 +18,8 @@ import { getURLWithoutParamsNormalized } from '../base/connection/utils';
 import { hideDialog } from '../base/dialog/actions';
 import { isDialogOpen } from '../base/dialog/functions';
 import { getLocalizedDateFormatter } from '../base/i18n/dateUtil';
+import { translateToHTML } from '../base/i18n/functions';
+import i18next from '../base/i18n/i18next';
 import { browser } from '../base/lib-jitsi-meet';
 import { pinParticipant } from '../base/participants/actions';
 import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
@@ -31,7 +33,7 @@ import { isCalendarEnabled } from '../calendar-sync/functions';
 import FeedbackDialog from '../feedback/components/FeedbackDialog';
 import { setFilmstripEnabled } from '../filmstrip/actions.any';
 import { isVpaasMeeting } from '../jaas/functions';
-import { hideNotification, showNotification } from '../notifications/actions';
+import { hideNotification, showNotification, showWarningNotification } from '../notifications/actions';
 import {
     CALENDAR_NOTIFICATION_ID,
     NOTIFICATION_ICON,
@@ -190,9 +192,14 @@ function _checkIframe(state: IReduxState, dispatch: IStore['dispatch']) {
     if (inIframe() && state['features/base/config'].disableIframeAPI && !browser.isElectron()
         && !isVpaasMeeting(state) && !allowIframe) {
         // show sticky notification and redirect in 5 minutes
-        dispatch(showNotification({
-            descriptionKey: 'notify.disabledIframe',
-            descriptionArguments: { timeout: IFRAME_DISABLED_TIMEOUT_MINUTES }
+        dispatch(showWarningNotification({
+            description: translateToHTML(
+                i18next.t.bind(i18next),
+                'notify.disabledIframe',
+                {
+                    timeout: IFRAME_DISABLED_TIMEOUT_MINUTES
+                }
+            )
         }, NOTIFICATION_TIMEOUT_TYPE.STICKY));
 
         setTimeout(() => {

react/features/settings/components/web/video/VideoSettingsContent.tsx

@@ -13,6 +13,7 @@ import Checkbox from '../../../../base/ui/components/web/Checkbox';
 import ContextMenu from '../../../../base/ui/components/web/ContextMenu';
 import ContextMenuItem from '../../../../base/ui/components/web/ContextMenuItem';
 import ContextMenuItemGroup from '../../../../base/ui/components/web/ContextMenuItemGroup';
+import { checkBlurSupport } from '../../../../virtual-background/functions';
 import { openSettingsDialog } from '../../../actions';
 import { SETTINGS_TABS } from '../../../constants';
 import { createLocalVideoTracks } from '../../../functions.web';
@@ -286,6 +287,8 @@ const VideoSettingsContent = ({
         }
     }, [ videoDeviceIds ]);
 
+    const virtualBackgroundSupported = checkBlurSupport();
+
     return (
         <ContextMenu
             aria-labelledby = 'video-settings-button'
@@ -298,11 +301,11 @@ const VideoSettingsContent = ({
                 {trackData.map((data, i) => _renderPreviewEntry(data, i))}
             </ContextMenuItemGroup>
             <ContextMenuItemGroup>
-                <ContextMenuItem
+                { virtualBackgroundSupported && <ContextMenuItem
                     accessibilityLabel = 'virtualBackground.title'
                     icon = { IconImage }
                     onClick = { selectBackground }
-                    text = { t('virtualBackground.title') } />
+                    text = { t('virtualBackground.title') } /> }
                 <div
                     className = { classes.checkboxContainer }
                     onClick = { stopPropagation }>

resources/prosody-plugins/mod_measure_message_count.lua

@@ -0,0 +1,157 @@
+-- Measure the number of messages used in a meeting. Sends amplitude event.
+-- Needs to be activated under the muc component where the limit needs to be applied (main muc and breakout muc)
+-- Copyright (C) 2023-present 8x8, Inc.
+
+local jid = require 'util.jid';
+local http = require 'net.http';
+local cjson_safe  = require 'cjson.safe'
+
+local amplitude_endpoint = module:get_option_string('amplitude_endpoint', 'https://api2.amplitude.com/2/httpapi');
+local amplitude_api_key = module:get_option_string('amplitude_api_key');
+
+if not amplitude_api_key then
+    module:log("warn", "No 'amplitude_api_key' option set, disabling amplitude reporting");
+    return
+end
+
+local muc_domain_base = module:get_option_string('muc_mapper_domain_base');
+local isBreakoutRoom = module.host == 'breakout.' .. muc_domain_base;
+
+local util = module:require 'util';
+local is_healthcheck_room = util.is_healthcheck_room;
+local extract_subdomain = util.extract_subdomain;
+
+module:log('info', 'Loading measure message count');
+
+local shard_name = module:context(muc_domain_base):get_option_string('shard_name');
+local region_name = module:context(muc_domain_base):get_option_string('region_name');
+local release_number = module:context(muc_domain_base):get_option_string('release_number');
+local http_headers = {
+    ['User-Agent'] = 'Prosody ('..prosody.version..'; '..prosody.platform..')',
+    ['Content-Type'] = 'application/json'
+};
+
+local inspect = require "inspect"
+
+function table.clone(t)
+  return {table.unpack(t)}
+end
+
+local function event_cb(content_, code_, response_, request_)
+    if code_ == 200 or code_ == 204 then
+        module:log('debug', 'URL Callback: Code %s, Content %s, Request (host %s, path %s, body %s), Response: %s',
+                code_, content_, request_.host, request_.path, inspect(request_.body), inspect(response_));
+    else
+        module:log('warn', 'URL Callback non successful: Code %s, Content %s, Request (%s), Response: %s',
+                code_, content_, inspect(request_), inspect(response_));
+    end
+end
+
+function send_event(room)
+    local user_properties = {
+        shard_name = shard_name;
+        region_name = region_name;
+        release_number = release_number;
+    };
+
+    local node = jid.split(room.jid);
+    local subdomain, room_name = extract_subdomain(node);
+    user_properties.tenant = subdomain or '/';
+    user_properties.conference_name = room_name or node;
+
+    local event_properties = {
+        messages_count = room._muc_messages_count or 0;
+        polls_count = room._muc_polls_count or 0;
+    };
+
+    if room.created_timestamp then
+        event_properties.duration = (os.time() * 1000 - room.created_timestamp) / 1000;
+    end
+
+    local event = {
+        api_key = amplitude_api_key;
+        events = {
+            {
+                user_id = room._data.meetingId;
+                device_id = room._data.meetingId;
+                event_type = 'conference_ended';
+                event_properties = event_properties;
+                user_properties = user_properties;
+            }
+        };
+    };
+
+    local request = http.request(amplitude_endpoint, {
+            headers = http_headers,
+            method = "POST",
+            body = cjson_safe.encode(event)
+        }, event_cb);
+end
+
+function on_message(event)
+    local stanza = event.stanza;
+    local body = stanza:get_child('body');
+
+    if not body then
+        -- we ignore messages without body - lobby, polls ...
+        return;
+    end
+
+    local session = event.origin;
+    if not session or not session.jitsi_web_query_room then
+        return false;
+    end
+
+    -- get room name with tenant and find room.
+    local room = get_room_by_name_and_subdomain(session.jitsi_web_query_room, session.jitsi_web_query_prefix);
+    if not room then
+        module:log('warn', 'No room found found for %s/%s',
+            session.jitsi_web_query_prefix, session.jitsi_web_query_room);
+        return false;
+    end
+
+    if not room._muc_messages_count then
+        room._muc_messages_count = 0;
+    end
+
+    room._muc_messages_count = room._muc_messages_count + 1;
+end
+
+-- Conference ended, send stats
+function room_destroyed(event)
+    local room, session = event.room, event.origin;
+
+    if is_healthcheck_room(room.jid) then
+        return;
+    end
+
+    if isBreakoutRoom then
+        return;
+    end
+    send_event(room);
+end
+
+function poll_created(event)
+    local session = event.event.origin;
+
+    -- get room name with tenant and find room.
+    local room = get_room_by_name_and_subdomain(session.jitsi_web_query_room, session.jitsi_web_query_prefix);
+    if not room then
+        module:log('warn', 'No room found found for %s/%s',
+            session.jitsi_web_query_prefix, session.jitsi_web_query_room);
+        return false;
+    end
+
+    if not room._muc_polls_count then
+        room._muc_polls_count = 0;
+    end
+
+    room._muc_polls_count = room._muc_polls_count + 1;
+end
+
+module:hook('message/full', on_message); -- private messages
+module:hook('message/bare', on_message); -- room messages
+
+module:hook('muc-room-destroyed', room_destroyed, -1);
+
+module:hook('poll-created', poll_created);