@qusaieilouti99/call-manager 0.1.73 → 0.1.75

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

@@ -10,10 +10,16 @@ import android.util.Log
 import android.view.WindowManager
 import android.widget.Button
 import android.widget.TextView
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.IntentFilter
 
 class CallActivity : Activity() {
 
-    private enum class FinishReason { ANSWER, DECLINE, TIMEOUT, MANUAL_DISMISS }
+    private enum class FinishReason {
+        ANSWER, DECLINE, TIMEOUT, MANUAL_DISMISS, EXTERNAL_END
+    }
+
     private var finishReason: FinishReason? = null
     private var callId: String = ""
     private var callType: String = "Audio"
@@ -26,6 +32,18 @@ class CallActivity : Activity() {
         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, "Received close broadcast for $callId")
+                finishReason = FinishReason.EXTERNAL_END
+                finishCallActivity()
+            }
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Log.d(TAG, "CallActivity onCreate")
@@ -62,8 +80,6 @@ class CallActivity : Activity() {
         answerBtn.setOnClickListener {
             Log.d(TAG, "CallActivity: Answer button clicked for callId: $callId")
             finishReason = FinishReason.ANSWER
-
-            // FIXED: Use single source of truth - this will handle all cleanup
             CallEngine.answerCall(callId)
             finishCallActivity()
         }
@@ -75,6 +91,14 @@ class CallActivity : Activity() {
             finishCallActivity()
         }
 
+        // NEW: Register broadcast receiver
+        val filter = IntentFilter("com.qusaieilouti99.callmanager.CLOSE_CALL_ACTIVITY")
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(closeReceiver, filter, Context.RECEIVER_NOT_EXPORTED)
+        } else {
+            registerReceiver(closeReceiver, filter)
+        }
+
         timeoutHandler.postDelayed(timeoutRunnable, 60_000)
     }
 
@@ -83,6 +107,13 @@ class CallActivity : Activity() {
         Log.d(TAG, "CallActivity onDestroy for callId: $callId. Reason: $finishReason")
         timeoutHandler.removeCallbacks(timeoutRunnable)
 
+        // NEW: Unregister broadcast receiver
+        try {
+            unregisterReceiver(closeReceiver)
+        } catch (e: Exception) {
+            Log.w(TAG, "Receiver already unregistered: ${e.message}")
+        }
+
         // FIXED: Ensure cleanup happens regardless of how activity ends
         CallEngine.stopRingtone()
         CallEngine.cancelIncomingCallUI()

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

@@ -602,6 +602,17 @@ object CallEngine {
             currentCallId = activeCalls.filter { it.value.state != CallState.ENDED }.keys.firstOrNull()
         }
 
+        // NEW: Send broadcast to close CallActivity
+        val context = requireContext()
+        val closeActivityIntent = Intent("com.qusaieilouti99.callmanager.CLOSE_CALL_ACTIVITY")
+        closeActivityIntent.putExtra("callId", callId)
+        try {
+            context.sendBroadcast(closeActivityIntent)
+            Log.d(TAG, "Sent close broadcast for CallActivity: $callId")
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to send close broadcast: ${e.message}")
+        }
+
         val connection = telecomConnections[callId]
         if (connection != null) {
             connection.setDisconnected(DisconnectCause(DisconnectCause.LOCAL))
@@ -950,9 +961,7 @@ object CallEngine {
 
         notificationManager.notify(NOTIF_ID, notification)
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-            playRingtone()
-        }
+        playRingtone()
 
         setInitialAudioRoute(callType)
     }

package/package.json

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