chore(rn,versions) bump app and SDK versions

Fixes: https://github.com/jitsi/jitsi-meet/issues/11563

android/gradle.properties

@@ -26,5 +26,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false
 
-appVersion=22.2.0
-sdkVersion=5.1.0
+appVersion=22.2.1
+sdkVersion=5.1.1

ios/app/broadcast-extension/Info.plist

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

ios/sdk/src/AudioMode.m

@@ -248,6 +248,8 @@ RCT_EXPORT_METHOD(updateDeviceList) {
 - (void)audioSessionDidChangeRoute:(RTCAudioSession *)session
                             reason:(AVAudioSessionRouteChangeReason)reason
                      previousRoute:(AVAudioSessionRouteDescription *)previousRoute {
+    DDLogInfo(@"[AudioMode] Route changed, reason: %lu", (unsigned long)reason);
+
     // Update JS about the changes.
     [self notifyDevicesChanged];
 
@@ -259,16 +261,12 @@ RCT_EXPORT_METHOD(updateDeviceList) {
                 self->forceSpeaker = NO;
                 self->forceEarpiece = NO;
                 break;
-            case AVAudioSessionRouteChangeReasonCategoryChange: {
-                // The category has changed. Check if it's the one we want and adjust as
-                // needed.
-                RTCAudioSessionConfiguration *currentConfig = [self configForMode:self->activeMode];
-                if ([session.category isEqualToString:currentConfig.category]) {
-                    // We are in the desired category, nothing to do here.
-                    return;
-                }
+            case AVAudioSessionRouteChangeReasonCategoryChange:
+                // The category has changed, re-apply our config.
+                // NB: It's tempting to doa  category check here and skip the processing,
+                // but that won't work. If the config changes but the category remains
+                // the same we'll still find ourselves here.
                 break;
-            }
             default:
                 return;
         }

ios/sdk/src/Info.plist

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

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

@@ -6,7 +6,7 @@ import React, { useEffect } from 'react';
 import { translate } from '../../../base/i18n';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import { connect } from '../../../base/redux';
-import { closeChat, openChat } from '../../actions.native';
+import { closeChat } from '../../actions.any';
 import AbstractChat, {
     _mapStateToProps,
     type Props as AbstractProps
@@ -69,26 +69,21 @@ class Chat extends AbstractChat<Props> {
 export default translate(connect(_mapStateToProps)(props => {
     const {
         _nbUnreadMessages,
-        dispatch,
         navigation,
-        route,
         t
     } = props;
     const isChatScreenFocused = useIsFocused();
-    const privateMessageRecipient = route.params?.privateMessageRecipient;
 
     const nrUnreadMessages
         = !isChatScreenFocused && _nbUnreadMessages > 0
             ? `(${_nbUnreadMessages})` : '';
 
     useEffect(() => {
-        dispatch(openChat(privateMessageRecipient));
-
         navigation.setOptions({
             tabBarLabel: `${t('chat.tabs.chat')} ${nrUnreadMessages}`
         });
 
-        return () => dispatch(closeChat());
+        return () => props.dispatch(closeChat());
     }, [ nrUnreadMessages ]);
 
     return (

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

@@ -6,10 +6,11 @@ import { IconMessage, IconReply } from '../../../base/icons';
 import { getParticipantById } from '../../../base/participants';
 import { connect } from '../../../base/redux';
 import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
-import { handleLobbyChatInitialized } from '../../../chat/actions.any';
+import { handleLobbyChatInitialized, openChat } from '../../../chat/actions';
 import { navigate } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
 
+
 export type Props = AbstractButtonProps & {
 
     /**
@@ -58,7 +59,7 @@ class PrivateMessageButton extends AbstractButton<Props, any> {
     toggledIcon = IconReply;
 
     /**
-     * Handles clicking / pressing the button, and kicks the participant.
+     * Handles clicking / pressing the button.
      *
      * @private
      * @returns {void}
@@ -67,6 +68,9 @@ class PrivateMessageButton extends AbstractButton<Props, any> {
         if (this.props._isLobbyMessage) {
             this.props.dispatch(handleLobbyChatInitialized(this.props.participantID));
         }
+
+        this.props.dispatch(openChat(this.props._participant));
+
         this.props._isPollsDisabled
             ? navigate(screen.conference.chat, {
                 privateMessageRecipient: this.props._participant
@@ -102,11 +106,11 @@ class PrivateMessageButton extends AbstractButton<Props, any> {
 export function _mapStateToProps(state: Object, ownProps: Props): $Shape<Props> {
     const enabled = getFeatureFlag(state, CHAT_ENABLED, true);
     const { disablePolls } = state['features/base/config'];
-    const { visible = enabled, isLobbyMessage } = ownProps;
+    const { visible = enabled, isLobbyMessage, participantID } = ownProps;
 
     return {
         _isPollsDisabled: disablePolls,
-        _participant: getParticipantById(state, ownProps.participantID),
+        _participant: getParticipantById(state, participantID),
         _isLobbyMessage: isLobbyMessage,
         visible
     };

react/features/mobile/navigation/screenOptions.js

@@ -21,7 +21,7 @@ import { screenHeaderCloseButton } from './functions';
  */
 export const navigationContainerTheme = {
     colors: {
-        background: BaseTheme.palette.ui12
+        background: BaseTheme.palette.uiBackground
     }
 };
 

react/features/video-menu/components/native/ConnectionStatusComponent.js

@@ -14,6 +14,7 @@ import { getParticipantDisplayName } from '../../../base/participants';
 import { BaseIndicator } from '../../../base/react';
 import { connect } from '../../../base/redux';
 import { StyleType } from '../../../base/styles';
+import { getSourceNameByParticipantId } from '../../../base/tracks';
 import statsEmitter from '../../../connection-indicator/statsEmitter';
 
 import styles from './styles';