@qusaieilouti99/call-manager 0.1.76 → 0.1.77

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

@@ -28,18 +28,27 @@ class CallActivity : Activity() {
     private val timeoutRunnable = Runnable {
         Log.d(TAG, "CallActivity timeout triggered for callId: $callId")
         finishReason = FinishReason.TIMEOUT
+        CallEngine.stopRingtone()
+        CallEngine.cancelIncomingCallUI()
         CallEngine.endCall(callId)
         finishCallActivity()
     }
 
-    // NEW: Broadcast receiver to listen for close events
     private val closeReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent?) {
             val receivedCallId = intent?.getStringExtra("callId")
-            if (receivedCallId == callId) {
+            Log.d(TAG, "Broadcast received for callId: $receivedCallId, current callId: $callId")
+
+            if (receivedCallId == callId || receivedCallId.isNullOrEmpty()) {
                 Log.d(TAG, "Received close broadcast for $callId")
                 finishReason = FinishReason.EXTERNAL_END
-                finishCallActivity()
+
+                // Ensure we're on main thread and activity isn't finishing
+                runOnUiThread {
+                    if (!isFinishing) {
+                        finishCallActivity()
+                    }
+                }
             }
         }
     }
@@ -67,8 +76,8 @@ class CallActivity : Activity() {
         callType = intent.getStringExtra("callType") ?: "Audio"
         Log.d(TAG, "CallActivity received callId: $callId, callType: $callType")
 
-        // FIXED: Immediate cleanup of notifications when CallActivity is shown
-        CallEngine.cancelIncomingCallUI()
+        // FIXED: Don't immediately cancel ringtone and notification - let them play
+        // CallEngine.cancelIncomingCallUI() // REMOVED
 
         val callerName = intent.getStringExtra("callerName") ?: "Unknown"
         val nameView = findViewById<TextView>(R.id.caller_name)
@@ -80,6 +89,9 @@ class CallActivity : Activity() {
         answerBtn.setOnClickListener {
             Log.d(TAG, "CallActivity: Answer button clicked for callId: $callId")
             finishReason = FinishReason.ANSWER
+            // Stop ringtone and notification when user answers
+            CallEngine.stopRingtone()
+            CallEngine.cancelIncomingCallUI()
             CallEngine.answerCall(callId)
             finishCallActivity()
         }
@@ -87,54 +99,71 @@ class CallActivity : Activity() {
         declineBtn.setOnClickListener {
             Log.d(TAG, "CallActivity: Decline button clicked for callId: $callId")
             finishReason = FinishReason.DECLINE
+            // Stop ringtone and notification when user declines
+            CallEngine.stopRingtone()
+            CallEngine.cancelIncomingCallUI()
             CallEngine.endCall(callId)
             finishCallActivity()
         }
 
-        // NEW: Register broadcast receiver
-       val filter = IntentFilter("com.qusaieilouti99.callmanager.CLOSE_CALL_ACTIVITY")
-       try {
-           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-               registerReceiver(closeReceiver, filter, Context.RECEIVER_NOT_EXPORTED)
-               Log.d(TAG, "Broadcast receiver registered successfully (API 33+)")
-           } else {
-               registerReceiver(closeReceiver, filter)
-               Log.d(TAG, "Broadcast receiver registered successfully (API < 33)")
-           }
-       } catch (e: Exception) {
-           Log.e(TAG, "Failed to register broadcast receiver: ${e.message}", e)
-       }
-
-       timeoutHandler.postDelayed(timeoutRunnable, 60_000)
-       Log.d(TAG, "CallActivity onCreate - END")
+        // Enhanced broadcast receiver registration
+        val filter = IntentFilter("com.qusaieilouti99.callmanager.CLOSE_CALL_ACTIVITY")
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                registerReceiver(closeReceiver, filter, Context.RECEIVER_NOT_EXPORTED)
+            } else {
+                registerReceiver(closeReceiver, filter)
+            }
+            Log.d(TAG, "Broadcast receiver registered successfully for callId: $callId")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to register broadcast receiver: ${e.message}", e)
+        }
+
+        // Set timeout for incoming call
+        timeoutHandler.postDelayed(timeoutRunnable, 60_000)
+        Log.d(TAG, "CallActivity onCreate - END")
     }
 
     override fun onDestroy() {
         super.onDestroy()
         Log.d(TAG, "CallActivity onDestroy for callId: $callId. Reason: $finishReason")
+
+        // Clean up timeout handler
         timeoutHandler.removeCallbacks(timeoutRunnable)
 
-        // NEW: Unregister broadcast receiver
+        // Unregister broadcast receiver with better error handling
         try {
             unregisterReceiver(closeReceiver)
+            Log.d(TAG, "Broadcast receiver unregistered for callId: $callId")
+        } catch (e: IllegalArgumentException) {
+            Log.w(TAG, "Receiver was not registered: ${e.message}")
         } catch (e: Exception) {
-            Log.w(TAG, "Receiver already unregistered: ${e.message}")
+            Log.e(TAG, "Error unregistering receiver: ${e.message}", e)
         }
 
-        // FIXED: Ensure cleanup happens regardless of how activity ends
-        CallEngine.stopRingtone()
-        CallEngine.cancelIncomingCallUI()
+        // Clean up ringtone and notification if call wasn't answered
+        if (finishReason != FinishReason.ANSWER) {
+            CallEngine.stopRingtone()
+            CallEngine.cancelIncomingCallUI()
+        }
     }
 
     override fun onBackPressed() {
         Log.d(TAG, "CallActivity onBackPressed for callId: $callId. Treating as decline/dismiss.")
         finishReason = FinishReason.MANUAL_DISMISS
+        CallEngine.stopRingtone()
+        CallEngine.cancelIncomingCallUI()
         CallEngine.endCall(callId)
         finishCallActivity()
     }
 
     private fun finishCallActivity() {
-        Log.d(TAG, "Finishing CallActivity.")
+        if (isFinishing) {
+            Log.d(TAG, "Activity is already finishing, skipping finishCallActivity")
+            return
+        }
+
+        Log.d(TAG, "Finishing CallActivity for callId: $callId")
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             finishAndRemoveTask()
         } else {

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

@@ -602,13 +602,35 @@ object CallEngine {
             currentCallId = activeCalls.filter { it.value.state != CallState.ENDED }.keys.firstOrNull()
         }
 
-        // NEW: Send broadcast to close CallActivity
+        // ENHANCED: Multiple broadcast attempts with delays for better reliability
         val context = requireContext()
         val closeActivityIntent = Intent("com.qusaieilouti99.callmanager.CLOSE_CALL_ACTIVITY")
         closeActivityIntent.putExtra("callId", callId)
+
         try {
+            // Send immediate broadcast
             context.sendBroadcast(closeActivityIntent)
             Log.d(TAG, "Sent close broadcast for CallActivity: $callId")
+
+            // Send additional broadcasts with delays to handle timing issues
+            Handler(Looper.getMainLooper()).postDelayed({
+                try {
+                    context.sendBroadcast(closeActivityIntent)
+                    Log.d(TAG, "Sent delayed close broadcast (100ms) for CallActivity: $callId")
+                } catch (e: Exception) {
+                    Log.w(TAG, "Failed to send delayed close broadcast (100ms): ${e.message}")
+                }
+            }, 100L)
+
+            Handler(Looper.getMainLooper()).postDelayed({
+                try {
+                    context.sendBroadcast(closeActivityIntent)
+                    Log.d(TAG, "Sent delayed close broadcast (500ms) for CallActivity: $callId")
+                } catch (e: Exception) {
+                    Log.w(TAG, "Failed to send delayed close broadcast (500ms): ${e.message}")
+                }
+            }, 500L)
+
         } catch (e: Exception) {
             Log.w(TAG, "Failed to send close broadcast: ${e.message}")
         }
@@ -1091,7 +1113,7 @@ object CallEngine {
         )
     }
 
-    // --- Media Management ---
+    // --- Media Management (SIMPLIFIED - NO AUDIO FOCUS) ---
     private fun playRingtone() {
         val context = requireContext()
         Log.d(TAG, "playRingtone() called")
@@ -1103,7 +1125,7 @@ object CallEngine {
             ringtone = RingtoneManager.getRingtone(context, uri)
             if (ringtone != null) {
                 ringtone?.play()
-                Log.d(TAG, "Ringtone started playing successfully")
+                Log.d(TAG, "Ringtone started playing successfully (system handles audio focus)")
             } else {
                 Log.w(TAG, "Ringtone is null, cannot play")
             }
@@ -1115,6 +1137,7 @@ object CallEngine {
     fun stopRingtone() {
         try {
             ringtone?.stop()
+            Log.d(TAG, "Ringtone stopped")
         } catch (e: Exception) {
             Log.e(TAG, "Error stopping ringtone: ${e.message}")
         }

package/package.json

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