@qusaieilouti99/call-manager 0.1.44 → 0.1.46

package/android/src/main/AndroidManifest.xml

@@ -1,22 +1,67 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.margelo.nitro.qusaieilouti99.callmanager">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Essential permissions that the library requires -->
+    <!-- REQUIRED FOR TELECOM API (Self-managed connections) -->
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
-    <uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE" />
+    <!-- Required for recording audio in calls -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <!-- Required for changing audio routes like speakerphone -->
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <!-- For keeping screen awake during calls -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <!-- For vibrating the device (e.g., incoming call) -->
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
 
-    <!-- Bluetooth permissions -->
+    <!-- Bluetooth permissions for audio routing -->
+    <!-- For Android 11 (API 30) and lower -->
     <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
+    <!-- For Android 12 (API 31) and higher -->
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
-    <!-- No components needed here - they're declared in app manifest -->
+    <!-- Required for foreground service on older devices (< Android P) -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <!-- Required for foreground service with phoneCall type on Android 12 (API 31) and higher -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
+
+    <application>
+        <!-- Your CallActivity for full-screen incoming call UI -->
+        <activity
+                android:name=".CallActivity"
+                android:exported="true"
+                android:showOnLockScreen="true"
+                android:turnScreenOn="true"
+                android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
+                android:screenOrientation="portrait"
+                android:launchMode="singleTop"
+                android:excludeFromRecents="true"
+                android:taskAffinity=""
+                android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- The ConnectionService, crucial for Telecom API integration -->
+        <service
+                android:name=".MyConnectionService"
+                android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+                android:exported="true">
+            <intent-filter>
+                <action android:name="android.telecom.ConnectionService" />
+            </intent-filter>
+        </service>
+
+        <!-- The foreground service to keep the call alive in the background -->
+        <service
+                android:name=".CallForegroundService"
+                android:enabled="true"
+                android:exported="false"
+                android:foregroundServiceType="phoneCall" />
+
+        <!-- Receiver for notification actions (Answer/Decline) -->
+        <receiver
+                android:name=".CallNotificationActionReceiver"
+                android:exported="false" />
+    </application>
 </manifest>

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

@@ -49,8 +49,8 @@ class CallActivity : Activity() {
         callType = intent.getStringExtra("callType") ?: "Audio"
         Log.d(TAG, "CallActivity received callId: $callId, callType: $callType")
 
-        // Cancel incoming call UI immediately when CallActivity shows
-        // This is handled in the core answer function now
+        // FIXED: Immediate cleanup of notifications when CallActivity is shown
+        CallEngine.cancelIncomingCallUI(this)
 
         val callerName = intent.getStringExtra("callerName") ?: "Unknown"
         val nameView = findViewById<TextView>(R.id.caller_name)
@@ -63,7 +63,7 @@ class CallActivity : Activity() {
             Log.d(TAG, "CallActivity: Answer button clicked for callId: $callId")
             finishReason = FinishReason.ANSWER
 
-            // Use the single core answer function
+            // FIXED: Use single source of truth - this will handle all cleanup
             CallEngine.answerCall(this, callId)
             finishCallActivity()
         }
@@ -82,7 +82,10 @@ class CallActivity : Activity() {
         super.onDestroy()
         Log.d(TAG, "CallActivity onDestroy for callId: $callId. Reason: $finishReason")
         timeoutHandler.removeCallbacks(timeoutRunnable)
-        // Don't stop ringtone here - it's handled in the core functions
+
+        // FIXED: Ensure cleanup happens regardless of how activity ends
+        CallEngine.stopRingtone()
+        CallEngine.cancelIncomingCallUI(this)
     }
 
     override fun onBackPressed() {

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

@@ -28,7 +28,6 @@ import org.json.JSONArray
 import org.json.JSONObject
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
-import android.view.WindowManager
 
 object CallEngine {
     private const val TAG = "CallEngine"
@@ -106,7 +105,6 @@ object CallEngine {
     }
 
     // --- Public API ---
-
     fun setCanMakeMultipleCalls(allow: Boolean) {
         canMakeMultipleCalls = allow
         Log.d(TAG, "canMakeMultipleCalls set to: $allow")
@@ -165,6 +163,7 @@ object CallEngine {
             telecomManager.addNewIncomingCall(phoneAccountHandle, extras)
             startForegroundService(context)
             Log.d(TAG, "Successfully reported incoming call to TelecomManager for $callId")
+            // REMOVED: Don't bring app to foreground for incoming calls - only when answered
         } catch (e: SecurityException) {
             Log.e(TAG, "SecurityException: Failed to report incoming call. Check MANAGE_OWN_CALLS permission: ${e.message}", e)
             endCall(context, callId)
@@ -218,7 +217,8 @@ object CallEngine {
             startForegroundService(context)
             Log.d(TAG, "Successfully reported outgoing call to TelecomManager via placeCall for $callId")
             startRingback()
-            // Don't bring app to foreground here - wait for answer
+            // CHANGED: Bring app to foreground for outgoing calls
+            bringAppToForeground(context)
             keepScreenAwake(context, true)
             if (parsedCallType == "Video") {
                 setAudioRoute(context, "Speaker")
@@ -235,11 +235,23 @@ object CallEngine {
         notifyCallStateChanged(context)
     }
 
-    // *** SINGLE SOURCE OF TRUTH: Core Answer Function ***
-    private fun coreAnswerCall(context: Context, callId: String, isLocalAnswer: Boolean) {
-        Log.d(TAG, "coreAnswerCall: $callId, isLocalAnswer: $isLocalAnswer")
+    // SINGLE SOURCE OF TRUTH: Core function for handling when remote party answers
+    fun callAnsweredFromJS(context: Context, callId: String) {
+        Log.d(TAG, "callAnsweredFromJS: $callId - remote party answered")
+        coreCallAnswered(context, callId, isLocalAnswer = false)
+    }
+
+    // SINGLE SOURCE OF TRUTH: Core function for handling local answer (user answering)
+    fun answerCall(context: Context, callId: String) {
+        Log.d(TAG, "answerCall: $callId - local party answering")
+        coreCallAnswered(context, callId, isLocalAnswer = true)
+    }
 
-        // Stop all notification sounds and UI immediately
+    // SINGLE SOURCE OF TRUTH: Core function that handles ALL call answering logic
+    private fun coreCallAnswered(context: Context, callId: String, isLocalAnswer: Boolean) {
+        Log.d(TAG, "coreCallAnswered: $callId, isLocalAnswer: $isLocalAnswer")
+
+        // Stop all ringtones and notifications immediately
         stopRingtone()
         stopRingback()
         cancelIncomingCallUI(context)
@@ -248,41 +260,21 @@ object CallEngine {
         activeCalls[callId]?.state = CallState.ACTIVE
         currentCallId = callId
 
-        // Handle multi-call scenario
         if (!canMakeMultipleCalls) {
             activeCalls.filter { it.key != callId }.values.forEach { it.state = CallState.HELD }
         }
 
-        // Emit event
-        emitEvent(CallEventType.CALL_ANSWERED, JSONObject().put("callId", callId))
-
-        // Start foreground service if not already started
+        // Bring app to foreground only when call is answered
+        bringAppToForeground(context)
         startForegroundService(context)
-
-        // Wake up screen and clear lock screen if needed
         keepScreenAwake(context, true)
-
-        // Bring app to foreground NOW (not earlier)
-        bringAppToForeground(context)
-
-        // Reset audio mode
         resetAudioMode(context)
 
-        // Notify state change
+        // Emit event
+        emitEvent(CallEventType.CALL_ANSWERED, JSONObject().put("callId", callId))
         notifyCallStateChanged(context)
 
-        Log.d(TAG, "coreAnswerCall completed for $callId")
-    }
-
-    // Public answer methods that delegate to the core function
-    fun callAnsweredFromJS(context: Context, callId: String) {
-        Log.d(TAG, "callAnsweredFromJS: $callId - remote party answered")
-        coreAnswerCall(context, callId, false)
-    }
-
-    fun answerCall(context: Context, callId: String) {
-        Log.d(TAG, "answerCall: $callId - local party answering")
-        coreAnswerCall(context, callId, true)
+        Log.d(TAG, "Call $callId successfully answered and UI cleaned up")
     }
 
     fun holdCall(context: Context, callId: String) {
@@ -316,103 +308,113 @@ object CallEngine {
         emitEvent(CallEventType.CALL_UNMUTED, JSONObject().put("callId", callId))
     }
 
+    // SINGLE SOURCE OF TRUTH: Core function that handles ALL call ending logic
     fun endCall(context: Context, callId: String) {
         appContext = context.applicationContext
         Log.d(TAG, "endCall: $callId")
+
+        // Core cleanup logic
+        coreEndCall(context, callId)
+    }
+
+    fun endAllCalls(context: Context) {
+        Log.d(TAG, "endAllCalls: Ending all active calls.")
+        if (activeCalls.isEmpty()) {
+            Log.d(TAG, "No active calls, nothing to do.")
+            return
+        }
+        activeCalls.keys.toList().forEach { callId ->
+            coreEndCall(context, callId)
+        }
+        activeCalls.clear()
+        telecomConnections.clear()
+        currentCallId = null
+
+        // Final cleanup
+        finalCleanup(context)
+        notifyCallStateChanged(context)
+    }
+
+    // SINGLE SOURCE OF TRUTH: Core function that handles ending a single call
+    private fun coreEndCall(context: Context, callId: String) {
+        Log.d(TAG, "coreEndCall: $callId")
+
+        // Update call state
         activeCalls[callId]?.state = CallState.ENDED
         activeCalls.remove(callId)
         Log.d(TAG, "Call $callId removed from activeCalls. Remaining: ${activeCalls.size}")
 
+        // Stop ringtones and notifications
         stopRingback()
         stopRingtone()
+        cancelIncomingCallUI(context)
 
+        // Update current call
         if (currentCallId == callId) {
             currentCallId = activeCalls.filter { it.value.state != CallState.ENDED }.keys.firstOrNull()
             Log.d(TAG, "Current call was $callId. New currentCallId: $currentCallId")
         }
 
-        cancelIncomingCallUI(context)
-
+        // Handle telecom connection
         val connection = telecomConnections[callId]
         if (connection != null) {
             connection.setDisconnected(DisconnectCause(DisconnectCause.LOCAL))
             connection.destroy()
             removeTelecomConnection(callId)
             Log.d(TAG, "Telecom Connection for $callId disconnected and destroyed.")
-        } else {
-            Log.d(TAG, "No Telecom Connection found for callId=$callId. Likely an outgoing call not initially handled by Telecom.")
         }
 
+        // If no more calls, do final cleanup
         if (activeCalls.isEmpty()) {
-            Log.d(TAG, "No active calls remaining. Stopping foreground service and releasing resources.")
-            stopForegroundService(context)
-            keepScreenAwake(context, false)
-            resetAudioMode(context)
-            clearLockScreenBypass(context) // Clear lock screen bypass when all calls end
-        } else {
-            Log.d(TAG, "Other calls still active. Foreground service remains.")
+            finalCleanup(context)
         }
 
         emitEvent(CallEventType.CALL_ENDED, JSONObject().put("callId", callId))
         notifyCallStateChanged(context)
     }
 
-    fun endAllCalls(context: Context) {
-        Log.d(TAG, "endAllCalls: Ending all active calls.")
-        if (activeCalls.isEmpty()) {
-            Log.d(TAG, "No active calls, nothing to do.")
-            return
-        }
-        activeCalls.keys.toList().forEach { callId ->
-            endCall(context, callId)
-        }
-        activeCalls.clear()
-        telecomConnections.clear()
-        currentCallId = null
-        cancelIncomingCallUI(context)
+    // SINGLE SOURCE OF TRUTH: Final cleanup when all calls are ended
+    private fun finalCleanup(context: Context) {
+        Log.d(TAG, "Performing final cleanup - no active calls remaining")
+
         stopForegroundService(context)
-        stopRingtone()
-        stopRingback()
         keepScreenAwake(context, false)
         resetAudioMode(context)
-        clearLockScreenBypass(context) // Clear lock screen bypass
-        notifyCallStateChanged(context)
-    }
 
-    fun getActiveCalls(): List<CallInfo> = activeCalls.values.toList()
-    fun getCurrentCallId(): String? = currentCallId
-    fun isCallActive(): Boolean = activeCalls.any { it.value.state == CallState.ACTIVE || it.value.state == CallState.INCOMING || it.value.state == CallState.DIALING }
+        // FIXED: Clear lock screen bypass when calls end
+        clearLockScreenBypass(context)
+    }
 
-    // --- Clear Lock Screen Bypass ---
+    // NEW: Function to clear lock screen bypass
     private fun clearLockScreenBypass(context: Context) {
-        Log.d(TAG, "Clearing lock screen bypass for all activities.")
-
-        // Send broadcast to MainActivity to clear flags if it's active
-        val intent = Intent("com.pingme2022.CLEAR_LOCK_SCREEN_BYPASS")
-        context.sendBroadcast(intent)
-
-        // Also try to clear on the app context activities
         try {
             if (context is Activity) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                    (context as Activity).setShowWhenLocked(false)
-                    (context as Activity).setTurnScreenOn(false)
+                    context.setShowWhenLocked(false)
+                    context.setTurnScreenOn(false)
                 } else {
                     context.window.clearFlags(
-                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-                        WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
-                        WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+                        android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+                        android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
+                        android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
                     )
                 }
-                Log.d(TAG, "Cleared lock screen bypass flags from activity context.")
+                Log.d(TAG, "Lock screen bypass flags cleared for Activity")
             }
         } catch (e: Exception) {
-            Log.w(TAG, "Could not clear lock screen bypass from activity context: ${e.message}")
+            Log.w(TAG, "Could not clear lock screen bypass flags: ${e.message}")
         }
     }
 
-    // --- Notification/UI/Foreground ---
+    fun getActiveCalls(): List<CallInfo> = activeCalls.values.toList()
+    fun getCurrentCallId(): String? = currentCallId
+    fun isCallActive(): Boolean = activeCalls.any {
+        it.value.state == CallState.ACTIVE ||
+        it.value.state == CallState.INCOMING ||
+        it.value.state == CallState.DIALING
+    }
 
+    // Enhanced incoming call UI with better cleanup
     fun showIncomingCallUI(context: Context, callId: String, callerName: String, callType: String) {
         Log.d(TAG, "Showing incoming call UI for $callId, caller: $callerName, callType: $callType")
         createNotificationChannel(context)
@@ -494,17 +496,20 @@ object CallEngine {
         val launchIntent = context.packageManager.getLaunchIntentForPackage(packageName)
         launchIntent?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
 
+        // Handle lock screen bypass for active calls
         if (isCallActive()) {
-            Log.d(TAG, "App brought to foreground due to active call")
+            // Only set lock screen bypass when bringing to foreground during active calls
+            launchIntent?.putExtra("BYPASS_LOCK_SCREEN", true)
+            Log.d(TAG, "App brought to foreground with lock screen bypass for active call")
         } else {
-            Log.d(TAG, "App brought to foreground via normal launchIntent")
+            Log.d(TAG, "App brought to foreground without lock screen bypass")
         }
 
         context.startActivity(launchIntent)
     }
 
     // Rest of the methods remain the same...
-    // [Audio Device Management, Screen Awake Management, etc. - keeping existing implementations]
+    // (getAudioDevices, setAudioRoute, keepScreenAwake, etc. - keeping them unchanged for brevity)
 
     // --- Audio Device Management ---
     fun getAudioDevices(): AudioRoutesInfo {
@@ -640,9 +645,7 @@ object CallEngine {
         }
     }
 
-    // Continue with rest of existing methods...
-    // [Audio Device Change Listener, Call State Change Notification, etc.]
-
+    // --- Audio Device Change Listener ---
     private val audioDeviceCallback = object : AudioDeviceCallback() {
         override fun onAudioDevicesAdded(addedDevices: Array<out AudioDeviceInfo>?) {
             Log.d(TAG, "Audio devices added. Emitting AUDIO_DEVICES_CHANGED.")
@@ -680,6 +683,7 @@ object CallEngine {
         emitEvent(CallEventType.AUDIO_DEVICES_CHANGED, jsonPayload)
     }
 
+    // --- Call State Change Notification ---
     private fun notifyCallStateChanged(context: Context) {
         val calls = getActiveCalls()
         val jsonArray = JSONArray()
@@ -725,6 +729,7 @@ object CallEngine {
         }
     }
 
+    // PhoneAccount registration is used for both INCOMING and OUTGOING calls when interacting with Telecom
     private fun registerPhoneAccount(context: Context) {
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle(context)
@@ -752,6 +757,7 @@ object CallEngine {
         )
     }
 
+    // --- Ringtone Management (for incoming calls, pre-Android S) ---
     fun playRingtone(context: Context) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             Log.d(TAG, "playRingtone: Android S+ detected, system will handle ringtone via Telecom.")
@@ -783,6 +789,7 @@ object CallEngine {
         ringtone = null
     }
 
+    // --- Ringback Tone Management (for outgoing calls) ---
     private fun startRingback() {
         if (ringbackPlayer != null && ringbackPlayer!!.isPlaying) {
             Log.d(TAG, "Ringback tone already playing.")

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

@@ -15,13 +15,21 @@ class CallNotificationActionReceiver : BroadcastReceiver() {
 
         when (intent.action) {
             "com.qusaieilouti99.callmanager.ANSWER_CALL" -> {
-                Log.d(TAG, "Answer action received for callId: $callId. Using single core answer function.")
+                Log.d(TAG, "Answer action received for callId: $callId")
 
-                // Use the single core answer function instead of multiple pathways
-                CallEngine.answerCall(context, callId)
+                // FIXED: Use single source of truth for answering
+                val connection = CallEngine.getTelecomConnection(callId)
+                if (connection != null) {
+                    connection.onAnswer() // This will trigger MyConnection.onAnswer()
+                    Log.d(TAG, "Call answered via Telecom connection for callId: $callId")
+                } else {
+                    Log.e(TAG, "No Telecom connection found for callId: $callId. Using direct answer.")
+                    CallEngine.answerCall(context, callId)
+                }
+                // NOTE: Don't call bringAppToForeground here - it's handled in coreCallAnswered
             }
             "com.qusaieilouti99.callmanager.DECLINE_CALL" -> {
-                Log.d(TAG, "Decline action received for callId: $callId. Ending call.")
+                Log.d(TAG, "Decline action received for callId: $callId")
                 CallEngine.endCall(context, callId)
             }
             else -> {

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

@@ -32,7 +32,6 @@ class MyConnection(
             JSONObject(callDataJson).optString("callType", "Audio")
         } catch (e: Exception) { "Audio" }
 
-        // Set connection properties and capabilities
         connectionProperties = Connection.PROPERTY_SELF_MANAGED
         connectionCapabilities = Connection.CAPABILITY_SUPPORT_HOLD or Connection.CAPABILITY_MUTE
 
@@ -52,7 +51,7 @@ class MyConnection(
         Log.d(TAG, "Call answered via Telecom for callId: $callId")
         setActive()
 
-        // Use the single core answer function
+        // FIXED: Use single source of truth for answering
         CallEngine.answerCall(context, callId)
     }
 
@@ -84,7 +83,7 @@ class MyConnection(
 
     override fun onCallAudioStateChanged(state: CallAudioState) {
         super.onCallAudioStateChanged(state)
-        Log.d(TAG, "Audio state changed for callId: $callId. muted=${state.isMuted}, route=${state.route}, supportedRoutes=${state.supportedRouteMask}")
+        Log.d(TAG, "Audio state changed for callId: $callId. muted=${state.isMuted}, route=${state.route}")
 
         if (state.isMuted) {
             CallEngine.muteCall(context, callId)
@@ -99,7 +98,6 @@ class MyConnection(
             CallAudioState.ROUTE_WIRED_HEADSET -> "Headset"
             else -> "Unknown"
         }
-        Log.d(TAG, "CallAudioState changed, new route detected: $routeName")
         CallEngine.emitEvent(
             CallEventType.AUDIO_ROUTE_CHANGED,
             JSONObject().put("callId", callId).put("route", routeName)
@@ -122,8 +120,8 @@ class MyConnection(
 
     override fun onShowIncomingCallUi() {
         super.onShowIncomingCallUi()
-        Log.d(TAG, "onShowIncomingCallUi for callId: $callId. Showing CallActivity, not bringing MainActivity to foreground yet.")
-        // Don't bring MainActivity to foreground here - only show CallActivity
-        // MainActivity will be brought to foreground when the call is answered
+        Log.d(TAG, "onShowIncomingCallUi for callId: $callId")
+        // REMOVED: Don't bring app to foreground for incoming calls
+        // CallEngine.bringAppToForeground(context)
     }
 }

package/package.json

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