@qusaieilouti99/call-manager 0.1.146 → 0.1.147

package/android/src/main/java/com/margelo/nitro/qusaieilouti99/callmanager/CallEngine.kt

@@ -44,7 +44,6 @@ object CallEngine {
         fun onCallEnded(callId: String)
     }
 
-    // --- NEW: Restored LockScreenBypassCallback interface ---
     interface LockScreenBypassCallback {
         fun onLockScreenBypassChanged(shouldBypass: Boolean)
     }
@@ -80,11 +79,9 @@ object CallEngine {
     private var eventHandler: ((CallEventType, String) -> Unit)? = null
     private val cachedEvents = mutableListOf<Pair<CallEventType, String>>()
 
-    // --- Modern Audio Management State ---
     private var userSelectedAudioRoute: String? = null
     private val audioStateLock = Any()
 
-    // --- NEW: Restored Lock Screen Bypass State ---
     private var lockScreenBypassActive = false
     private val lockScreenBypassCallbacks = mutableSetOf<LockScreenBypassCallback>()
 
@@ -93,7 +90,7 @@ object CallEngine {
             if (isInitialized.compareAndSet(false, true)) {
                 appContext = context.applicationContext
                 audioManager = appContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
-                registerAudioDeviceCallback() // Register callback on init
+                registerAudioDeviceCallback()
                 Log.d(TAG, "CallEngine initialized successfully")
             }
         }
@@ -144,7 +141,6 @@ object CallEngine {
         stopRingtone()
     }
 
-    // --- NEW: Restored Lock Screen Bypass Functions ---
     fun registerLockScreenBypassCallback(callback: LockScreenBypassCallback) {
         lockScreenBypassCallbacks.add(callback)
     }
@@ -341,11 +337,9 @@ object CallEngine {
         startForegroundService()
         keepScreenAwake(true)
 
-        // Set initial audio route using the new robust system
         synchronized(audioStateLock) {
-            userSelectedAudioRoute = null // Reset any previous user selection
+            userSelectedAudioRoute = null
         }
-        // Give the audio system a moment to initialize after the call becomes active
         mainHandler.postDelayed({
             updateAndApplyAudioRoute()
         }, 300)
@@ -466,10 +460,6 @@ object CallEngine {
                 it.value.state == CallState.HELD
     }
 
-    /**
-     * Sets the user's desired audio route. This will be respected until a
-     * higher-priority device connects or this route becomes unavailable.
-     */
     fun setAudioRoute(route: String) {
         synchronized(audioStateLock) {
             Log.d(TAG, "User requested audio route: $route")
@@ -478,12 +468,16 @@ object CallEngine {
         updateAndApplyAudioRoute()
     }
 
-    /**
-     * Central function to determine and apply the correct audio route.
-     * This is the single source of truth for audio routing decisions.
-     */
     private fun updateAndApplyAudioRoute() {
-        val call = activeCalls[currentCallId]
+        // *** CRITICAL FIX ***
+        // Check for null currentCallId *before* using it as a key.
+        val callId = currentCallId
+        if (callId == null) {
+            Log.d(TAG, "Skipping audio route update: currentCallId is null.")
+            return
+        }
+
+        val call = activeCalls[callId]
         if (call == null || call.state != CallState.ACTIVE) {
             Log.d(TAG, "Skipping audio route update: No active call.")
             return
@@ -493,11 +487,9 @@ object CallEngine {
             val am = audioManager ?: return
             val availableDevices = getAvailableAudioDevices()
 
-            // Determine the target route based on priority
             val targetRoute = if (userSelectedAudioRoute != null && availableDevices.contains(userSelectedAudioRoute)) {
-                userSelectedAudioRoute!! // Respect user's choice if available
+                userSelectedAudioRoute!!
             } else {
-                // Auto-select based on priority
                 when {
                     availableDevices.contains("Bluetooth") -> "Bluetooth"
                     availableDevices.contains("Headset") -> "Headset"
@@ -508,7 +500,6 @@ object CallEngine {
 
             Log.d(TAG, "Updating audio route. Available: $availableDevices, User Pref: $userSelectedAudioRoute, Target: $targetRoute")
 
-            // Apply the target route
             am.mode = AudioManager.MODE_IN_COMMUNICATION
 
             when (targetRoute) {
@@ -534,7 +525,6 @@ object CallEngine {
                 }
             }
 
-            // After applying, emit the result
             mainHandler.postDelayed({ emitAudioRouteChanged() }, 100)
         }
     }
@@ -542,8 +532,8 @@ object CallEngine {
     private fun getAvailableAudioDevices(): Set<String> {
         val am = audioManager ?: return emptySet()
         val devices = mutableSetOf<String>()
-        devices.add("Earpiece") // Always available
-        devices.add("Speaker")  // Always available
+        devices.add("Earpiece")
+        devices.add("Speaker")
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             val audioDevices = am.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
@@ -591,7 +581,6 @@ object CallEngine {
     private val audioDeviceCallback = object : AudioDeviceCallback() {
         override fun onAudioDevicesAdded(addedDevices: Array<out AudioDeviceInfo>) {
             Log.d(TAG, "Audio devices added. Triggering audio route update.")
-            // A new device was added, reset user preference to allow auto-switch to higher priority device
             synchronized(audioStateLock) {
                 userSelectedAudioRoute = null
             }
@@ -599,7 +588,6 @@ object CallEngine {
         }
         override fun onAudioDevicesRemoved(removedDevices: Array<out AudioDeviceInfo>) {
             Log.d(TAG, "Audio devices removed. Triggering audio route update.")
-            // A device was removed, if it was the user's selection, clear it
             synchronized(audioStateLock) {
                 val removedDeviceTypes = removedDevices.map {
                     when(it.type) {
@@ -624,7 +612,6 @@ object CallEngine {
         Log.d(TAG, "Performing cleanup")
         stopForegroundService()
         keepScreenAwake(false)
-        // Reset audio state
         synchronized(audioStateLock) {
             userSelectedAudioRoute = null
         }
@@ -644,7 +631,6 @@ object CallEngine {
                 description = "Notifications for incoming calls"
                 setBypassDnd(true)
                 lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-                // **CRITICAL FIX**: Set sound to null. We will manage the ringtone manually.
                 setSound(null, null)
             }
             val manager = context.getSystemService(NotificationManager::class.java)
@@ -655,7 +641,7 @@ object CallEngine {
     private fun showIncomingCallUI(callId: String, callerName: String, callType: String, callerPicUrl: String?) {
         val context = requireContext()
         Log.d(TAG, "Showing incoming call UI for $callId")
-        createNotificationChannel() // Ensure channel is created with correct settings
+        createNotificationChannel()
 
         showCallActivityOverlay(context, callId, callerName, callType, callerPicUrl)
         showStandardNotification(context, callId, callerName, callType, callerPicUrl)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qusaieilouti99/call-manager",
-  "version": "0.1.146",
+  "version": "0.1.147",
   "description": "Call manager",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",