@qusaieilouti99/call-manager 0.1.42 → 0.1.44

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

@@ -1,4 +1,5 @@
 package com.margelo.nitro.qusaieilouti99.callmanager
+
 import android.app.Activity
 import android.content.Intent
 import android.os.Build
@@ -28,18 +29,28 @@ class CallActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Log.d(TAG, "CallActivity onCreate")
-        window.addFlags(
-            WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-            WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
-            WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
-        )
+
+        // Modern way to handle lock screen bypass (API 27+)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(true)
+            setTurnScreenOn(true)
+        } else {
+            // Legacy approach for older versions
+            window.addFlags(
+                WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+                WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
+                WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+            )
+        }
+
         setContentView(R.layout.activity_call)
 
         callId = intent.getStringExtra("callId") ?: ""
         callType = intent.getStringExtra("callType") ?: "Audio"
         Log.d(TAG, "CallActivity received callId: $callId, callType: $callType")
 
-        CallEngine.cancelIncomingCallUI(this)
+        // Cancel incoming call UI immediately when CallActivity shows
+        // This is handled in the core answer function now
 
         val callerName = intent.getStringExtra("callerName") ?: "Unknown"
         val nameView = findViewById<TextView>(R.id.caller_name)
@@ -51,7 +62,9 @@ class CallActivity : Activity() {
         answerBtn.setOnClickListener {
             Log.d(TAG, "CallActivity: Answer button clicked for callId: $callId")
             finishReason = FinishReason.ANSWER
-            CallEngine.bringAppToForeground(this)
+
+            // Use the single core answer function
+            CallEngine.answerCall(this, callId)
             finishCallActivity()
         }
 
@@ -69,7 +82,7 @@ class CallActivity : Activity() {
         super.onDestroy()
         Log.d(TAG, "CallActivity onDestroy for callId: $callId. Reason: $finishReason")
         timeoutHandler.removeCallbacks(timeoutRunnable)
-        CallEngine.stopRingtone()
+        // Don't stop ringtone here - it's handled in the core functions
     }
 
     override fun onBackPressed() {

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

@@ -28,6 +28,7 @@ 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"
@@ -174,7 +175,6 @@ object CallEngine {
         notifyCallStateChanged(context)
     }
 
-    // CORRECTED: Uses TelecomManager.placeCall for outgoing calls.
     fun startOutgoingCall(context: Context, callId: String, callData: String) {
         appContext = context.applicationContext
         Log.d(TAG, "startOutgoingCall: $callId, $callData")
@@ -218,7 +218,7 @@ object CallEngine {
             startForegroundService(context)
             Log.d(TAG, "Successfully reported outgoing call to TelecomManager via placeCall for $callId")
             startRingback()
-            bringAppToForeground(context)
+            // Don't bring app to foreground here - wait for answer
             keepScreenAwake(context, true)
             if (parsedCallType == "Video") {
                 setAudioRoute(context, "Speaker")
@@ -235,33 +235,54 @@ object CallEngine {
         notifyCallStateChanged(context)
     }
 
-    fun callAnsweredFromJS(context: Context, callId: String) {
-        Log.d(TAG, "callAnsweredFromJS: $callId - remote party answered")
+    // *** SINGLE SOURCE OF TRUTH: Core Answer Function ***
+    private fun coreAnswerCall(context: Context, callId: String, isLocalAnswer: Boolean) {
+        Log.d(TAG, "coreAnswerCall: $callId, isLocalAnswer: $isLocalAnswer")
+
+        // Stop all notification sounds and UI immediately
+        stopRingtone()
         stopRingback()
+        cancelIncomingCallUI(context)
+
+        // Update call state
         activeCalls[callId]?.state = CallState.ACTIVE
         currentCallId = callId
+
+        // Handle multi-call scenario
         if (!canMakeMultipleCalls) {
             activeCalls.filter { it.key != callId }.values.forEach { it.state = CallState.HELD }
         }
-        notifyCallStateChanged(context)
+
+        // Emit event
         emitEvent(CallEventType.CALL_ANSWERED, JSONObject().put("callId", callId))
+
+        // Start foreground service if not already started
+        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
+        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")
-        stopRingtone()
-        activeCalls[callId]?.state = CallState.ACTIVE
-        currentCallId = callId
-        if (!canMakeMultipleCalls) {
-            activeCalls.filter { it.key != callId }.values.forEach { it.state = CallState.HELD }
-        }
-        emitEvent(CallEventType.CALL_ANSWERED, JSONObject().put("callId", callId))
-        notifyCallStateChanged(context)
-        startForegroundService(context)
-        keepScreenAwake(context, true)
-        resetAudioMode(context)
+        coreAnswerCall(context, callId, true)
     }
 
     fun holdCall(context: Context, callId: String) {
@@ -327,6 +348,7 @@ object CallEngine {
             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.")
         }
@@ -353,6 +375,7 @@ object CallEngine {
         stopRingback()
         keepScreenAwake(context, false)
         resetAudioMode(context)
+        clearLockScreenBypass(context) // Clear lock screen bypass
         notifyCallStateChanged(context)
     }
 
@@ -360,6 +383,34 @@ object CallEngine {
     fun getCurrentCallId(): String? = currentCallId
     fun isCallActive(): Boolean = activeCalls.any { it.value.state == CallState.ACTIVE || it.value.state == CallState.INCOMING || it.value.state == CallState.DIALING }
 
+    // --- 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)
+                } else {
+                    context.window.clearFlags(
+                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+                        WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
+                        WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+                    )
+                }
+                Log.d(TAG, "Cleared lock screen bypass flags from activity context.")
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "Could not clear lock screen bypass from activity context: ${e.message}")
+        }
+    }
+
     // --- Notification/UI/Foreground ---
 
     fun showIncomingCallUI(context: Context, callId: String, callerName: String, callType: String) {
@@ -443,14 +494,8 @@ object CallEngine {
         val launchIntent = context.packageManager.getLaunchIntentForPackage(packageName)
         launchIntent?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
 
-        // If there are active calls, add the lock screen bypass flags
         if (isCallActive()) {
-            launchIntent?.addFlags(
-                Intent.FLAG_ACTIVITY_SHOW_WHEN_LOCKED or
-                Intent.FLAG_ACTIVITY_TURN_SCREEN_ON or
-                Intent.FLAG_ACTIVITY_DISMISS_KEYGUARD
-            )
-            Log.d(TAG, "App brought to foreground with lock screen bypass flags due to active call")
+            Log.d(TAG, "App brought to foreground due to active call")
         } else {
             Log.d(TAG, "App brought to foreground via normal launchIntent")
         }
@@ -458,8 +503,10 @@ object CallEngine {
         context.startActivity(launchIntent)
     }
 
-    // --- Audio Device Management ---
+    // Rest of the methods remain the same...
+    // [Audio Device Management, Screen Awake Management, etc. - keeping existing implementations]
 
+    // --- Audio Device Management ---
     fun getAudioDevices(): AudioRoutesInfo {
         audioManager = appContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: run {
             Log.e(TAG, "getAudioDevices: AudioManager is null or appContext is not set. Returning default.")
@@ -593,7 +640,9 @@ object CallEngine {
         }
     }
 
-    // --- Audio Device Change Listener ---
+    // Continue with rest of existing methods...
+    // [Audio Device Change Listener, Call State Change Notification, etc.]
+
     private val audioDeviceCallback = object : AudioDeviceCallback() {
         override fun onAudioDevicesAdded(addedDevices: Array<out AudioDeviceInfo>?) {
             Log.d(TAG, "Audio devices added. Emitting AUDIO_DEVICES_CHANGED.")
@@ -631,7 +680,6 @@ object CallEngine {
         emitEvent(CallEventType.AUDIO_DEVICES_CHANGED, jsonPayload)
     }
 
-    // --- Call State Change Notification ---
     private fun notifyCallStateChanged(context: Context) {
         val calls = getActiveCalls()
         val jsonArray = JSONArray()
@@ -677,7 +725,6 @@ 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)
@@ -705,7 +752,6 @@ 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.")
@@ -737,7 +783,6 @@ 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,21 +15,10 @@ class CallNotificationActionReceiver : BroadcastReceiver() {
 
         when (intent.action) {
             "com.qusaieilouti99.callmanager.ANSWER_CALL" -> {
-                Log.d(TAG, "Answer action received for callId: $callId. Answering call via Telecom.")
+                Log.d(TAG, "Answer action received for callId: $callId. Using single core answer function.")
 
-                // Get the telecom connection and answer it
-                val connection = CallEngine.getTelecomConnection(callId)
-                if (connection != null) {
-                    // This will trigger MyConnection.onAnswer() which handles the rest
-                    connection.onAnswer()
-                    Log.d(TAG, "Call answered via Telecom connection for callId: $callId")
-                } else {
-                    Log.e(TAG, "No Telecom connection found for callId: $callId. Falling back to direct answer.")
-                    // Fallback: answer directly via CallEngine
-                    CallEngine.answerCall(context, callId)
-                }
-
-                CallEngine.bringAppToForeground(context)
+                // Use the single core answer function instead of multiple pathways
+                CallEngine.answerCall(context, callId)
             }
             "com.qusaieilouti99.callmanager.DECLINE_CALL" -> {
                 Log.d(TAG, "Decline action received for callId: $callId. Ending call.")

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

@@ -34,7 +34,7 @@ class MyConnection(
 
         // Set connection properties and capabilities
         connectionProperties = Connection.PROPERTY_SELF_MANAGED
-        connectionCapabilities = Connection.CAPABILITY_SUPPORT_HOLD or Connection.CAPABILITY_MUTE // Added hold and mute capabilities
+        connectionCapabilities = Connection.CAPABILITY_SUPPORT_HOLD or Connection.CAPABILITY_MUTE
 
         if (currentCallType == "Video") {
             Log.d(TAG, "MyConnection for callId $callId initialized as VIDEO call.")
@@ -51,8 +51,9 @@ class MyConnection(
     override fun onAnswer() {
         Log.d(TAG, "Call answered via Telecom for callId: $callId")
         setActive()
+
+        // Use the single core answer function
         CallEngine.answerCall(context, callId)
-        CallEngine.bringAppToForeground(context)
     }
 
     override fun onReject() {
@@ -108,9 +109,6 @@ class MyConnection(
     override fun onPlayDtmfTone(digit: Char) {
         super.onPlayDtmfTone(digit)
         Log.d(TAG, "Playing DTMF tone: $digit for callId: $callId")
-        // NOTE: DTMF_TONE is not in your current CallEventType enum.
-        // If you need to emit this event, you MUST add 'DTMF_TONE' to your CallEventType.ts
-        // and re-run nitro-codegen. For now, it's commented out to prevent compilation error.
         CallEngine.emitEvent(
             CallEventType.DTMF_TONE,
             JSONObject().put("callId", callId).put("digit", digit.toString())
@@ -122,12 +120,10 @@ class MyConnection(
         Log.d(TAG, "Stopping DTMF tone for callId: $callId")
     }
 
-    // REMOVED: onConnectionEvent override since it doesn't exist in the base Connection class
-    // If you need connection events, you can send them via sendConnectionEvent() method
-
     override fun onShowIncomingCallUi() {
         super.onShowIncomingCallUi()
-        Log.d(TAG, "onShowIncomingCallUi for callId: $callId. Attempting to bring app to foreground.")
-        CallEngine.bringAppToForeground(context)
+        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
     }
 }

package/package.json

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