@qusaieilouti99/call-manager 0.1.59 → 0.1.61

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

@@ -365,47 +365,51 @@ object CallEngine {
         }
 
         val isVideoCall = callType == "Video"
-
         if (!canMakeMultipleCalls && activeCalls.isNotEmpty()) {
-            activeCalls.values.forEach {
-                if (it.state == CallState.ACTIVE) {
-                    holdCallInternal(it.callId, heldBySystem = false)
-                }
-            }
+            activeCalls.values.filter { it.state == CallState.ACTIVE }
+                .forEach { holdCallInternal(it.callId, heldBySystem = false) }
         }
 
+        // Track dialing state
         activeCalls[callId] = CallInfo(callId, callType, targetName, null, CallState.DIALING)
         currentCallId = callId
-        Log.d(TAG, "Call $callId added to activeCalls. State: DIALING, callType: $callType")
+        Log.d(TAG, "Call $callId added to activeCalls. State: DIALING")
 
         registerPhoneAccount()
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle()
         val addressUri = Uri.fromParts(PhoneAccount.SCHEME_TEL, targetName, null)
 
-        val extras = Bundle().apply {
-            putParcelable(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle)
+        // 1) build a bundle of ONLY your own keys
+        val outgoingExtras = Bundle().apply {
             putString(MyConnectionService.EXTRA_CALL_ID, callId)
             putString(MyConnectionService.EXTRA_CALL_TYPE, callType)
             putString(MyConnectionService.EXTRA_DISPLAY_NAME, targetName)
             putBoolean(MyConnectionService.EXTRA_IS_VIDEO_CALL_BOOLEAN, isVideoCall)
+            metadata?.let { putString("metadata", it) }
+        }
+
+        // 2) wrap under the single Telecom‐honored key
+        val extras = Bundle().apply {
+            putParcelable(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle)
+            putBundle(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS, outgoingExtras)
             putBoolean(TelecomManager.EXTRA_START_CALL_WITH_SPEAKERPHONE, isVideoCall)
         }
 
         try {
             telecomManager.placeCall(addressUri, extras)
-            startForegroundService() // Fixed: Always start foreground service
+            startForegroundService()
             requestAudioFocus()
             startRingback()
             bringAppToForeground()
             keepScreenAwake(true)
             setInitialAudioRoute(callType)
-            Log.d(TAG, "Successfully reported outgoing call to TelecomManager via placeCall for $callId")
+            Log.d(TAG, "Successfully reported outgoing call to TelecomManager")
         } catch (e: SecurityException) {
-            Log.e(TAG, "SecurityException: Failed to start outgoing call via placeCall. Check MANAGE_OWN_CALLS permission: ${e.message}", e)
+            Log.e(TAG, "SecurityException placing outgoing call: ${e.message}", e)
             endCallInternal(callId)
         } catch (e: Exception) {
-            Log.e(TAG, "Failed to start outgoing call via placeCall: ${e.message}", e)
+            Log.e(TAG, "Failed to start outgoing call: ${e.message}", e)
             endCallInternal(callId)
         }
 

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

@@ -171,11 +171,23 @@ class CallForegroundService : Service() {
     }
 
     override fun onTaskRemoved(rootIntent: Intent?) {
-        Log.d(TAG, "onTaskRemoved: User swiped app from recents. Ending all calls.")
+        // Figure out which Activity’s task was just removed:
+        val removed = rootIntent?.component?.className
+        Log.d(TAG, "onTaskRemoved: removedActivity=$removed")
+
+        // If it was our lock-screen CallActivity, ignore —
+        // we only want to clean up when the MAIN app task is swiped away.
+        if (removed == CallActivity::class.java.name) {
+          Log.d(TAG, "CallActivity was removed; keeping call alive.")
+          return
+        }
+
+        // Otherwise (e.g. MainActivity removed), tear everything down:
+        Log.d(TAG, "Main task removed; ending all calls.")
         CallEngine.onApplicationTerminate()
-        super.onTaskRemoved(rootIntent)
         stopSelf()
-    }
+        super.onTaskRemoved(rootIntent)
+      }
 
     override fun onDestroy() {
         super.onDestroy()

package/package.json

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