@qusaieilouti99/call-manager 0.1.77 → 0.1.79

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

@@ -1,7 +1,7 @@
+// File: CallActivity.kt
 package com.margelo.nitro.qusaieilouti99.callmanager
 
 import android.app.Activity
-import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -10,168 +10,136 @@ 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, EXTERNAL_END
+/**
+ * Full‐screen incoming‐call UI.  Implements CallEndListener
+ * so it always auto‐finishes when the engine ends the call.
+ */
+class CallActivity : Activity(), CallEngine.CallEndListener {
+
+  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"
+
+  private val timeoutHandler = Handler(Looper.getMainLooper())
+  private val timeoutRunnable = Runnable {
+    Log.d(TAG, "CallActivity timeout triggered for callId: $callId")
+    finishReason = FinishReason.TIMEOUT
+    CallEngine.stopRingtone()
+    CallEngine.cancelIncomingCallUI()
+    CallEngine.endCall(callId)
+    finishCallActivity()
+  }
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    Log.d(TAG, "CallActivity onCreate")
+
+    // Lock‐screen bypass
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+      setShowWhenLocked(true)
+      setTurnScreenOn(true)
+    } else {
+      window.addFlags(
+        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+        WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
+        WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+      )
     }
 
-    private var finishReason: FinishReason? = null
-    private var callId: String = ""
-    private var callType: String = "Audio"
-
-    private val timeoutHandler = Handler(Looper.getMainLooper())
-    private val timeoutRunnable = Runnable {
-        Log.d(TAG, "CallActivity timeout triggered for callId: $callId")
-        finishReason = FinishReason.TIMEOUT
-        CallEngine.stopRingtone()
-        CallEngine.cancelIncomingCallUI()
-        CallEngine.endCall(callId)
-        finishCallActivity()
-    }
+    setContentView(R.layout.activity_call)
 
-    private val closeReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            val receivedCallId = intent?.getStringExtra("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
-
-                // Ensure we're on main thread and activity isn't finishing
-                runOnUiThread {
-                    if (!isFinishing) {
-                        finishCallActivity()
-                    }
-                }
-            }
-        }
-    }
+    // Read incoming‐call params
+    callId = intent.getStringExtra("callId") ?: ""
+    callType = intent.getStringExtra("callType") ?: "Audio"
+    Log.d(TAG, "CallActivity received callId: $callId, callType: $callType")
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Log.d(TAG, "CallActivity onCreate")
-
-        // 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")
-
-        // 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)
-        val answerBtn = findViewById<Button>(R.id.answer_btn)
-        val declineBtn = findViewById<Button>(R.id.decline_btn)
-
-        nameView.text = callerName
-
-        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()
-        }
-
-        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()
-        }
-
-        // 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")
-    }
+    // Register for call‐end callbacks BEFORE timeout or user can dismiss
+    CallEngine.registerCallEndListener(this)
+
+    // Bind UI
+    val callerName = intent.getStringExtra("callerName") ?: "Unknown"
+    findViewById<TextView>(R.id.caller_name).text = callerName
 
-    override fun onDestroy() {
-        super.onDestroy()
-        Log.d(TAG, "CallActivity onDestroy for callId: $callId. Reason: $finishReason")
-
-        // Clean up timeout handler
-        timeoutHandler.removeCallbacks(timeoutRunnable)
-
-        // 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.e(TAG, "Error unregistering receiver: ${e.message}", e)
-        }
-
-        // Clean up ringtone and notification if call wasn't answered
-        if (finishReason != FinishReason.ANSWER) {
-            CallEngine.stopRingtone()
-            CallEngine.cancelIncomingCallUI()
-        }
+    findViewById<Button>(R.id.answer_btn).setOnClickListener {
+      Log.d(TAG, "Answer clicked for callId: $callId")
+      finishReason = FinishReason.ANSWER
+      CallEngine.stopRingtone()
+      CallEngine.cancelIncomingCallUI()
+      CallEngine.answerCall(callId)
+      finishCallActivity()
     }
 
-    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()
+    findViewById<Button>(R.id.decline_btn).setOnClickListener {
+      Log.d(TAG, "Decline clicked for callId: $callId")
+      finishReason = FinishReason.DECLINE
+      CallEngine.stopRingtone()
+      CallEngine.cancelIncomingCallUI()
+      CallEngine.endCall(callId)
+      finishCallActivity()
     }
 
-    private fun finishCallActivity() {
-        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 {
-            finish()
-        }
+    // Start auto‐timeout
+    timeoutHandler.postDelayed(timeoutRunnable, 60_000)
+    Log.d(TAG, "CallActivity setup complete")
+  }
+
+  override fun onDestroy() {
+    super.onDestroy()
+    Log.d(TAG, "CallActivity onDestroy for callId: $callId. Reason: $finishReason")
+
+    // Unregister listener
+    CallEngine.unregisterCallEndListener(this)
+
+    // Cancel timeout
+    timeoutHandler.removeCallbacks(timeoutRunnable)
+
+    // If user never answered, clean up ringtone/UI
+    if (finishReason != FinishReason.ANSWER) {
+      CallEngine.stopRingtone()
+      CallEngine.cancelIncomingCallUI()
     }
+  }
+
+  override fun onBackPressed() {
+    Log.d(TAG, "onBackPressed for callId: $callId → treat as decline")
+    finishReason = FinishReason.MANUAL_DISMISS
+    CallEngine.stopRingtone()
+    CallEngine.cancelIncomingCallUI()
+    CallEngine.endCall(callId)
+    finishCallActivity()
+  }
+
+  /**
+   * Called by CallEngine whenever ANY call ends.
+   * We only care about our own callId.
+   */
+  override fun onCallEnded(endedCallId: String) {
+    if (endedCallId == callId && !isFinishing) {
+      Log.d(TAG, "CallActivity onCallEnded callback for callId: $callId")
+      finishReason = FinishReason.EXTERNAL_END
+      runOnUiThread { finishCallActivity() }
+    }
+  }
 
-    companion object {
-        private const val TAG = "CallActivity"
+  private fun finishCallActivity() {
+    if (isFinishing) {
+      Log.d(TAG, "Already finishing, skip.")
+      return
+    }
+    Log.d(TAG, "Finishing CallActivity for callId: $callId")
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      finishAndRemoveTask()
+    } else {
+      finish()
     }
+  }
+
+  companion object {
+    private const val TAG = "CallActivity"
+  }
 }