RU-T42 Working on fix PTT issues.

Author: ucswift

app.config.ts

@@ -80,6 +80,9 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
       'android.permission.FOREGROUND_SERVICE_MICROPHONE',
       'android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE',
       'android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK',
+      'android.permission.READ_PHONE_STATE',
+      'android.permission.READ_PHONE_NUMBERS',
+      'android.permission.MANAGE_OWN_CALLS',
     ],
   },
   web: {

expo-env.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="expo/types" />
 
-// NOTE: This file should not be edited and should be in your git ignore
+// NOTE: This file should not be edited and should be in your git ignore

package.json

@@ -110,7 +110,7 @@
     "axios": "~1.12.0",
     "babel-plugin-module-resolver": "^5.0.2",
     "buffer": "^6.0.3",
-    "countly-sdk-react-native-bridge": "^25.4.0",
+    "countly-sdk-react-native-bridge": "25.4.1",
     "date-fns": "^4.1.0",
     "expo": "~53.0.23",
     "expo-application": "~6.1.5",
@@ -148,6 +148,7 @@
     "mapbox-gl": "3.18.1",
     "moti": "~0.29.0",
     "nativewind": "~4.1.21",
+    "promise": "8.3.0",
     "react": "19.0.0",
     "react-dom": "19.0.0",
     "react-error-boundary": "~4.0.13",
@@ -167,6 +168,7 @@
     "react-native-restart": "0.0.27",
     "react-native-safe-area-context": "5.4.0",
     "react-native-screens": "~4.11.1",
+    "react-native-sound": "^0.13.0",
     "react-native-svg": "15.11.2",
     "react-native-web": "^0.20.0",
     "react-native-webview": "~13.13.1",
@@ -258,6 +260,7 @@
     "initVersion": "7.0.4"
   },
   "resolutions": {
-    "form-data": "4.0.4"
+    "form-data": "4.0.4",
+    "promise": "8.3.0"
   }
 }

src/components/livekit/__tests__/livekit-bottom-sheet.test.tsx

@@ -85,6 +85,19 @@ jest.mock('i18next', () => ({
   },
 }));
 
+// Mock Actionsheet
+jest.mock('../../ui/actionsheet', () => {
+  const React = require('react');
+  const { View } = require('react-native');
+  return {
+    Actionsheet: ({ children, isOpen }: any) => isOpen ? <View testID="mock-actionsheet">{children}</View> : null,
+    ActionsheetBackdrop: () => null,
+    ActionsheetContent: ({ children }: any) => <View testID="mock-actionsheet-content">{children}</View>,
+    ActionsheetDragIndicatorWrapper: ({ children }: any) => <View>{children}</View>,
+    ActionsheetDragIndicator: () => null,
+  };
+});
+
 // Import after mocks to avoid the React Native CSS Interop issue
 import { useBluetoothAudioStore } from '@/stores/app/bluetooth-audio-store';
 import { useLiveKitStore } from '@/stores/app/livekit-store';
@@ -451,6 +464,63 @@ describe('LiveKitBottomSheet', () => {
       await audioService.playDisconnectionSound();
       expect(audioService.playDisconnectionSound).toHaveBeenCalledTimes(1);
     });
+
+    it('should return to room select when back is pressed from audio settings if entered from room select', () => {
+      const { fireEvent } = require('@testing-library/react-native');
+
+      mockUseLiveKitStore.mockReturnValue({
+        ...defaultLiveKitState,
+        isBottomSheetVisible: true,
+        availableRooms: mockAvailableRooms,
+      });
+
+      const component = render(<LiveKitBottomSheet />);
+
+      // Navigate to audio settings
+      const settingsButton = component.getByTestId('header-audio-settings-button');
+      fireEvent.press(settingsButton);
+
+      // Verify we are in audio settings
+      expect(component.getByTestId('audio-settings-view')).toBeTruthy();
+
+      // Press back
+      const backButton = component.getByTestId('back-button');
+      fireEvent.press(backButton);
+
+      // Verify we are back in room select (by checking for join buttons)
+      expect(component.getByTestId('room-list')).toBeTruthy();
+    });
+
+    it('should return to connected view when back is pressed from audio settings if entered from connected view', async () => {
+      const { fireEvent } = require('@testing-library/react-native');
+
+      mockUseLiveKitStore.mockReturnValue({
+        ...defaultLiveKitState,
+        isBottomSheetVisible: true,
+        isConnected: true,
+        currentRoomInfo: mockCurrentRoomInfo,
+        currentRoom: mockRoom,
+      });
+
+      const component = render(<LiveKitBottomSheet />);
+
+      // Verify we are in connected view
+      await expect(component.findByTestId('connected-view')).resolves.toBeTruthy();
+
+      // Navigate to audio settings
+      const settingsButton = component.getByTestId('audio-settings-button');
+      fireEvent.press(settingsButton);
+
+      // Verify we are in audio settings
+      expect(component.getByTestId('audio-settings-view')).toBeTruthy();
+
+      // Press back
+      const backButton = component.getByTestId('back-button');
+      fireEvent.press(backButton);
+
+      // Verify we are back in connected view
+      expect(component.getByTestId('connected-view')).toBeTruthy();
+    });
   });
 
   describe('Analytics', () => {

src/components/livekit/livekit-bottom-sheet.tsx

@@ -1,5 +1,4 @@
 import { t } from 'i18next';
-import { Audio, InterruptionModeIOS } from 'expo-av';
 import { Headphones, Mic, MicOff, PhoneOff, Settings } from 'lucide-react-native';
 import { useColorScheme } from 'nativewind';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
@@ -12,7 +11,7 @@ import { useBluetoothAudioStore } from '@/stores/app/bluetooth-audio-store';
 
 import { Card } from '../../components/ui/card';
 import { Text } from '../../components/ui/text';
-import { useLiveKitStore } from '../../stores/app/livekit-store';
+import { applyAudioRouting, useLiveKitStore } from '../../stores/app/livekit-store';
 import { AudioDeviceSelection } from '../settings/audio-device-selection';
 import { Actionsheet, ActionsheetBackdrop, ActionsheetContent, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper } from '../ui/actionsheet';
 import { HStack } from '../ui/hstack';
@@ -33,6 +32,7 @@ export const LiveKitBottomSheet = () => {
   const { trackEvent } = useAnalytics();
 
   const [currentView, setCurrentView] = useState<BottomSheetView>(BottomSheetView.ROOM_SELECT);
+  const [previousView, setPreviousView] = useState<BottomSheetView | null>(null);
   const [isMuted, setIsMuted] = useState(true); // Default to muted
   const [permissionsRequested, setPermissionsRequested] = useState(false);
 
@@ -156,28 +156,17 @@ export const LiveKitBottomSheet = () => {
         const speaker = selectedAudioDevices.speaker;
         console.log('Updating audio routing for:', speaker.type);
 
+        let targetType: 'bluetooth' | 'speaker' | 'earpiece' | 'default' = 'default';
+
         if (speaker.type === 'speaker') {
-          // Force Speakerphone
-          await Audio.setAudioModeAsync({
-            allowsRecordingIOS: true,
-            staysActiveInBackground: true,
-            playsInSilentModeIOS: true,
-            shouldDuckAndroid: true,
-            playThroughEarpieceAndroid: false, // This forces speaker on Android
-            interruptionModeIOS: InterruptionModeIOS.DoNotMix,
-          });
+          targetType = 'speaker';
+        } else if (speaker.type === 'bluetooth') {
+          targetType = 'bluetooth';
         } else {
-          // Default (Earpiece) or Bluetooth
-          // For Bluetooth to work, we usually just need to NOT force speaker.
-          await Audio.setAudioModeAsync({
-            allowsRecordingIOS: true,
-            staysActiveInBackground: true,
-            playsInSilentModeIOS: true,
-            shouldDuckAndroid: true,
-            playThroughEarpieceAndroid: true, // This allows earpiece/bluetooth
-            interruptionModeIOS: InterruptionModeIOS.DoNotMix,
-          });
+          targetType = 'earpiece';
         }
+
+        await applyAudioRouting(targetType);
       } catch (error) {
         console.error('Failed to update audio routing:', error);
       }
@@ -221,12 +210,18 @@ export const LiveKitBottomSheet = () => {
   }, [disconnectFromRoom]);
 
   const handleShowAudioSettings = useCallback(() => {
+    setPreviousView(currentView);
     setCurrentView(BottomSheetView.AUDIO_SETTINGS);
-  }, []);
+  }, [currentView]);
 
   const handleBackFromAudioSettings = useCallback(() => {
-    setCurrentView(BottomSheetView.CONNECTED);
-  }, []);
+    if (previousView) {
+      setCurrentView(previousView);
+      setPreviousView(null);
+    } else {
+      setCurrentView(isConnected && currentRoomInfo ? BottomSheetView.CONNECTED : BottomSheetView.ROOM_SELECT);
+    }
+  }, [previousView, isConnected, currentRoomInfo]);
 
   const renderRoomSelect = () => (
     <View style={styles.content}>

src/components/settings/audio-device-selection.tsx

@@ -70,13 +70,9 @@ export const AudioDeviceSelection: React.FC<AudioDeviceSelectionProps> = ({ show
     );
   };
 
-  const availableMicrophones = availableAudioDevices.filter(
-    (device) => device.isAvailable && (device.type === 'default' || device.type === 'microphone' || device.type === 'bluetooth' || device.type === 'wired')
-  );
+  const availableMicrophones = availableAudioDevices.filter((device) => device.isAvailable && (device.type === 'default' || device.type === 'microphone' || device.type === 'bluetooth' || device.type === 'wired'));
 
-  const availableSpeakers = availableAudioDevices.filter(
-    (device) => device.isAvailable && (device.type === 'default' || device.type === 'speaker' || device.type === 'bluetooth' || device.type === 'wired')
-  );
+  const availableSpeakers = availableAudioDevices.filter((device) => device.isAvailable && (device.type === 'default' || device.type === 'speaker' || device.type === 'bluetooth' || device.type === 'wired'));
 
   return (
     <ScrollView className="flex-1">