RU-T46 PR#199 fixes

Author: ucswift

env.js

@@ -88,7 +88,6 @@ const client = z.object({
   LOGGING_KEY: z.string(),
   APP_KEY: z.string(),
   UNIT_MAPBOX_PUBKEY: z.string(),
-  UNIT_MAPBOX_DLKEY: z.string(),
   IS_MOBILE_APP: z.boolean(),
   SENTRY_DSN: z.string(),
   COUNTLY_APP_KEY: z.string(),
@@ -123,7 +122,6 @@ const _clientEnv = {
   APP_KEY: process.env.UNIT_APP_KEY || '',
   IS_MOBILE_APP: true, // or whatever default you want
   UNIT_MAPBOX_PUBKEY: process.env.UNIT_MAPBOX_PUBKEY || '',
-  UNIT_MAPBOX_DLKEY: process.env.UNIT_MAPBOX_DLKEY || '',
   SENTRY_DSN: process.env.UNIT_SENTRY_DSN || '',
   COUNTLY_APP_KEY: process.env.UNIT_COUNTLY_APP_KEY || '',
   COUNTLY_SERVER_URL: process.env.UNIT_COUNTLY_SERVER_URL || '',

plugins/withMediaButtonModule.js

@@ -155,12 +155,17 @@ import android.content.IntentFilter
 import android.media.session.MediaSession
 import android.media.session.PlaybackState
 import android.os.Build
+import android.util.Log
 import android.view.KeyEvent
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 
 class MediaButtonModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext), LifecycleEventListener {
 
+    companion object {
+        private const val TAG = "MediaButtonModule"
+    }
+
     private var mediaSession: MediaSession? = null
     private var isListening = false
     private var mediaButtonReceiver: BroadcastReceiver? = null
@@ -300,7 +305,7 @@ class MediaButtonModule(reactContext: ReactApplicationContext) : ReactContextBas
             try {
                 reactApplicationContext.unregisterReceiver(it)
             } catch (e: Exception) {
-                // Receiver may not be registered
+                Log.d(TAG, "Failed to unregister media button receiver: \${e.message}")
             }
         }
         mediaButtonReceiver = null
@@ -482,13 +487,8 @@ const withMediaButtonModule = (config) => {
       const packagesMatch = mainApplication.contents.match(packagesPattern);
 
       if (packagesMatch) {
-        if (packagesMatch[1]) {
-          // Already has toMutableList()
-          mainApplication.contents = mainApplication.contents.replace(packagesPattern, `val packages = PackageList(this).packages.toMutableList()\n            packages.add(MediaButtonPackage())`);
-        } else {
-          // Need to add toMutableList()
-          mainApplication.contents = mainApplication.contents.replace(packagesPattern, `val packages = PackageList(this).packages.toMutableList()\n            packages.add(MediaButtonPackage())`);
-        }
+        // Replace the packages declaration, ensuring toMutableList() is present so we can add our package
+        mainApplication.contents = mainApplication.contents.replace(packagesPattern, `val packages = PackageList(this).packages.toMutableList()\n            packages.add(MediaButtonPackage())`);
         console.log('[withMediaButtonModule] Registered MediaButtonPackage in MainApplication.kt');
       }
     }

src/services/media-button.service.ts

@@ -3,6 +3,14 @@ import { DeviceEventEmitter, NativeEventEmitter, NativeModules, Platform } from
 import { logger } from '@/lib/logging';
 import { audioService } from '@/services/audio.service';
 import { type AudioButtonEvent, useBluetoothAudioStore } from '@/stores/app/bluetooth-audio-store';
+import {
+  createDefaultPTTSettings,
+  type MediaButtonPTTSettings,
+  type PTTMode,
+} from '@/types/ptt';
+
+// Re-export PTT types for backwards compatibility
+export { type MediaButtonPTTSettings, type PTTMode };
 
 // Lazy import to break dependency cycle with livekit-store
 const getLiveKitStore = () => require('@/stores/app/livekit-store').useLiveKitStore;
@@ -16,37 +24,14 @@ export interface MediaButtonEvent {
   source?: 'airpods' | 'bluetooth_earbuds' | 'wired_headset' | 'unknown';
 }
 
-// PTT mode configuration
-export type PTTMode = 'toggle' | 'push_to_talk';
-
-// Settings for media button PTT functionality
-export interface MediaButtonPTTSettings {
-  enabled: boolean;
-  pttMode: PTTMode;
-  // For toggle mode: single press toggles mute state
-  // For push_to_talk mode: press to unmute, release to mute (requires double-tap for this)
-  usePlayPauseForPTT: boolean;
-  // Double tap behavior
-  doubleTapAction: 'none' | 'toggle_mute';
-  doubleTapTimeoutMs: number;
-}
-
-const DEFAULT_PTT_SETTINGS: MediaButtonPTTSettings = {
-  enabled: true,
-  pttMode: 'toggle',
-  usePlayPauseForPTT: true,
-  doubleTapAction: 'toggle_mute',
-  doubleTapTimeoutMs: 400,
-};
-
 // Try to get the native module (will be null if not installed)
 const { MediaButtonModule } = NativeModules;
 
 class MediaButtonService {
   private static instance: MediaButtonService;
   private isInitialized = false;
   private eventListeners: { remove: () => void }[] = [];
-  private settings: MediaButtonPTTSettings = DEFAULT_PTT_SETTINGS;
+  private settings: MediaButtonPTTSettings = createDefaultPTTSettings();
   private lastPressTimestamp: number = 0;
   private doubleTapTimer: ReturnType<typeof setTimeout> | null = null;
   private pendingSingleTap: boolean = false;

src/stores/app/bluetooth-audio-store.ts

@@ -1,24 +1,19 @@
 import { type Peripheral } from 'react-native-ble-manager';
 import { create } from 'zustand';
 
+import {
+  createDefaultPTTSettings,
+  DEFAULT_MEDIA_BUTTON_PTT_SETTINGS,
+  type MediaButtonPTTSettings,
+  type PTTMode,
+} from '@/types/ptt';
+
+// Re-export PTT types for backwards compatibility
+export { DEFAULT_MEDIA_BUTTON_PTT_SETTINGS, type MediaButtonPTTSettings, type PTTMode };
+
 // Re-export Peripheral as Device for compatibility
 export type Device = Peripheral;
 
-// PTT mode configuration for media buttons (AirPods/earbuds)
-export type PTTMode = 'toggle' | 'push_to_talk';
-
-// Settings for media button PTT functionality
-export interface MediaButtonPTTSettings {
-  enabled: boolean;
-  pttMode: PTTMode;
-  // For toggle mode: single press toggles mute state
-  // For push_to_talk mode: press to unmute, release to mute
-  usePlayPauseForPTT: boolean;
-  // Double tap behavior
-  doubleTapAction: 'none' | 'toggle_mute';
-  doubleTapTimeoutMs: number;
-}
-
 // Bluetooth state enum to match react-native-ble-plx API
 export enum State {
   Unknown = 'unknown',
@@ -62,15 +57,6 @@ export interface AudioDeviceSelection {
   speaker: AudioDeviceInfo | null;
 }
 
-// Default media button PTT settings
-export const DEFAULT_MEDIA_BUTTON_PTT_SETTINGS: MediaButtonPTTSettings = {
-  enabled: true,
-  pttMode: 'toggle',
-  usePlayPauseForPTT: true,
-  doubleTapAction: 'toggle_mute',
-  doubleTapTimeoutMs: 400,
-};
-
 interface BluetoothAudioState {
   // Bluetooth state
   bluetoothState: State;
@@ -153,7 +139,7 @@ export const useBluetoothAudioStore = create<BluetoothAudioState>((set, get) =>
   isAudioRoutingActive: false,
   buttonEvents: [],
   lastButtonAction: null,
-  mediaButtonPTTSettings: DEFAULT_MEDIA_BUTTON_PTT_SETTINGS,
+  mediaButtonPTTSettings: createDefaultPTTSettings(),
 
   // Bluetooth state actions
   setBluetoothState: (state) => set({ bluetoothState: state }),

src/types/ptt.ts

@@ -0,0 +1,51 @@
+/**
+ * PTT (Push-to-Talk) types and settings for media button functionality.
+ * Used by bluetooth-audio-store and media-button.service.
+ */
+
+/**
+ * PTT mode configuration for media buttons (AirPods/earbuds)
+ * - 'toggle': Single press toggles mute state on/off
+ * - 'push_to_talk': Press and hold to unmute, release to mute
+ */
+export type PTTMode = 'toggle' | 'push_to_talk';
+
+/**
+ * Settings for media button PTT functionality
+ */
+export interface MediaButtonPTTSettings {
+  /** Whether media button PTT functionality is enabled */
+  enabled: boolean;
+  /** The PTT mode to use */
+  pttMode: PTTMode;
+  /**
+   * Whether to use play/pause button for PTT
+   * - For toggle mode: single press toggles mute state
+   * - For push_to_talk mode: press to unmute, release to mute
+   */
+  usePlayPauseForPTT: boolean;
+  /** Double tap action behavior */
+  doubleTapAction: 'none' | 'toggle_mute';
+  /** Timeout in milliseconds to detect double tap */
+  doubleTapTimeoutMs: number;
+}
+
+/**
+ * Default media button PTT settings.
+ * This object is frozen to prevent accidental mutations.
+ */
+export const DEFAULT_MEDIA_BUTTON_PTT_SETTINGS: Readonly<MediaButtonPTTSettings> = Object.freeze({
+  enabled: true,
+  pttMode: 'toggle',
+  usePlayPauseForPTT: true,
+  doubleTapAction: 'toggle_mute',
+  doubleTapTimeoutMs: 400,
+});
+
+/**
+ * Creates a mutable copy of the default PTT settings.
+ * Use this when initializing state that needs to be modified.
+ */
+export const createDefaultPTTSettings = (): MediaButtonPTTSettings => ({
+  ...DEFAULT_MEDIA_BUTTON_PTT_SETTINGS,
+});