RU-T42 PR#214 fixes

Author: ucswift

electron/main.js

@@ -184,8 +184,9 @@ app.whenReady().then(() => {
 
   protocol.handle('app', (request) => {
     const url = new URL(request.url);
-    // Decode the pathname and resolve to a file in dist/
-    const resolvedPath = path.resolve(distPath, decodeURIComponent(url.pathname));
+    // Decode the pathname, join with base path, then canonicalize to prevent directory traversal
+    const joinedPath = path.join(distPath, decodeURIComponent(url.pathname));
+    const resolvedPath = path.resolve(joinedPath);
 
     // Security check: ensure resolved path is within distPath to prevent directory traversal
     let filePath;

src/app/(app)/index.tsx

@@ -218,7 +218,7 @@ function MapContent() {
   // which creates continuous requestAnimationFrame overhead. Web uses CSS animation instead.
   useEffect(() => {
     if (Platform.OS !== 'web') {
-      Animated.loop(
+      const loopAnim = Animated.loop(
         Animated.sequence([
           Animated.timing(pulseAnim, {
             toValue: 1.2,
@@ -231,7 +231,12 @@ function MapContent() {
             useNativeDriver: true,
           }),
         ])
-      ).start();
+      );
+      loopAnim.start();
+
+      return () => {
+        loopAnim.stop();
+      };
     }
   }, [pulseAnim]);
 

src/components/settings/bluetooth-device-selection-bottom-sheet.tsx

@@ -277,8 +277,8 @@ export function BluetoothDeviceSelectionBottomSheet({ isOpen, onClose }: Bluetoo
               <HStack className="items-center">
                 <BluetoothIcon size={16} className="mr-2 text-primary-600" />
                 <VStack>
-                  <Text className={`font-medium ${preferredDevice?.id === 'system-audio' ? 'text-primary-700 dark:text-primary-300' : 'text-neutral-900 dark:text-neutral-100'}`}>System Audio</Text>
-                  <Text className="text-xs text-neutral-500">AirPods, Car, Wired Headset</Text>
+                  <Text className={`font-medium ${preferredDevice?.id === 'system-audio' ? 'text-primary-700 dark:text-primary-300' : 'text-neutral-900 dark:text-neutral-100'}`}>{t('bluetooth.systemAudio')}</Text>
+                  <Text className="text-xs text-neutral-500">{t('bluetooth.systemAudioDescription')}</Text>
                 </VStack>
               </HStack>
               {preferredDevice?.id === 'system-audio' && (

src/services/location.ts

@@ -1,16 +1,16 @@
 import * as Location from 'expo-location';
 import * as TaskManager from 'expo-task-manager';
-import { AppState, type AppStateStatus, Platform } from 'react-native';
+import { AppState, type AppStateStatus } from 'react-native';
 
 import { setUnitLocation } from '@/api/units/unitLocation';
 import { registerLocationServiceUpdater } from '@/lib/hooks/use-background-geolocation';
 import { logger } from '@/lib/logging';
+import { isWeb } from '@/lib/platform';
 import { loadBackgroundGeolocationState } from '@/lib/storage/background-geolocation';
 import { SaveUnitLocationInput } from '@/models/v4/unitLocation/saveUnitLocationInput';
 import { useCoreStore } from '@/stores/app/core-store';
 import { useLocationStore } from '@/stores/app/location-store';
 
-const isWeb = Platform.OS === 'web';
 const LOCATION_TASK_NAME = 'location-updates';
 
 // Helper function to send location to API
@@ -155,7 +155,12 @@ class LocationService {
   async startLocationUpdates(): Promise<void> {
     // On web, use a lightweight browser geolocation watcher instead of expo-location/TaskManager
     if (isWeb) {
-      if (!this.locationSubscription && 'geolocation' in navigator) {
+      if (!('geolocation' in navigator)) {
+        logger.warn({ message: 'Geolocation API not available in this browser' });
+        return;
+      }
+
+      if (!this.locationSubscription) {
         const watchId = navigator.geolocation.watchPosition(
           (pos) => {
             const loc: Location.LocationObject = {
@@ -180,6 +185,7 @@ class LocationService {
         );
         // Store a compatible subscription object
         this.locationSubscription = { remove: () => navigator.geolocation.clearWatch(watchId) } as unknown as Location.LocationSubscription;
+        logger.info({ message: 'Foreground location updates started' });
       }
       return;
     }