@qusaieilouti99/call-manager 0.1.86 → 0.1.87

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

@@ -2,6 +2,8 @@
 package com.margelo.nitro.qusaieilouti99.callmanager
 
 import android.app.Activity
+import android.app.KeyguardManager
+import android.content.Context
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -12,8 +14,7 @@ import android.widget.Button
 import android.widget.TextView
 
 /**
- * Full‐screen incoming‐call UI.  Implements CallEndListener
- * so it always auto‐finishes when the engine ends the call.
+ * Enhanced CallActivity with better lock screen bypass for Samsung devices
  */
 class CallActivity : Activity(), CallEngine.CallEndListener {
 
@@ -39,29 +40,57 @@ class CallActivity : Activity(), CallEngine.CallEndListener {
     super.onCreate(savedInstanceState)
     Log.d(TAG, "CallActivity onCreate")
 
-    // Lock‐screen bypass
+    // Enhanced lock screen bypass for Samsung devices
+    setupLockScreenBypass()
+
+    setContentView(R.layout.activity_call)
+
+    // Read incoming call params
+    callId = intent.getStringExtra("callId") ?: ""
+    callType = intent.getStringExtra("callType") ?: "Audio"
+    Log.d(TAG, "CallActivity received callId: $callId, callType: $callType")
+
+    // Register for call-end callbacks
+    CallEngine.registerCallEndListener(this)
+
+    // Bind UI
+    setupUI()
+
+    // Start auto-timeout
+    timeoutHandler.postDelayed(timeoutRunnable, 60_000)
+    Log.d(TAG, "CallActivity setup complete")
+  }
+
+  private fun setupLockScreenBypass() {
+    // For Android O_MR1 and above
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
       setShowWhenLocked(true)
       setTurnScreenOn(true)
+
+      // Additional Samsung-specific setup
+      val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        keyguardManager.requestDismissKeyguard(this, null)
+      }
     } else {
+      // For older versions
       window.addFlags(
         WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
         WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
-        WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+        WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
+        WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
       )
     }
 
-    setContentView(R.layout.activity_call)
-
-    // Read incoming‐call params
-    callId = intent.getStringExtra("callId") ?: ""
-    callType = intent.getStringExtra("callType") ?: "Audio"
-    Log.d(TAG, "CallActivity received callId: $callId, callType: $callType")
-
-    // Register for call‐end callbacks BEFORE timeout or user can dismiss
-    CallEngine.registerCallEndListener(this)
+    // Additional flags for better compatibility
+    window.addFlags(
+      WindowManager.LayoutParams.FLAG_FULLSCREEN or
+      WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or
+      WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
+    )
+  }
 
-    // Bind UI
+  private fun setupUI() {
     val callerName = intent.getStringExtra("callerName") ?: "Unknown"
     findViewById<TextView>(R.id.caller_name).text = callerName
 
@@ -82,23 +111,15 @@ class CallActivity : Activity(), CallEngine.CallEndListener {
       CallEngine.endCall(callId)
       finishCallActivity()
     }
-
-    // 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()
@@ -114,10 +135,6 @@ class CallActivity : Activity(), CallEngine.CallEndListener {
     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")

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

@@ -918,12 +918,34 @@ object CallEngine {
     val notificationManager =
       context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
+    // Enhanced full screen intent
+    val fullScreenIntent = Intent(context, CallActivity::class.java).apply {
+      addFlags(
+        Intent.FLAG_ACTIVITY_NEW_TASK or
+        Intent.FLAG_ACTIVITY_CLEAR_TASK or
+        Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS or
+        Intent.FLAG_ACTIVITY_NO_ANIMATION or
+        Intent.FLAG_ACTIVITY_SINGLE_TOP
+      )
+      putExtra("callId", callId)
+      putExtra("callerName", callerName)
+      putExtra("callType", callType)
+    }
+
+    val fullScreenPendingIntent = PendingIntent.getActivity(
+      context,
+      callId.hashCode(), // Use unique request code
+      fullScreenIntent,
+      PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+    )
+
+    // Answer and decline intents
     val answerIntent = Intent(context, CallNotificationActionReceiver::class.java).apply {
       action = "com.qusaieilouti99.callmanager.ANSWER_CALL"
       putExtra("callId", callId)
     }
     val answerPendingIntent = PendingIntent.getBroadcast(
-      context, 0, answerIntent,
+      context, callId.hashCode() + 1, answerIntent,
       PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
     )
 
@@ -932,18 +954,7 @@ object CallEngine {
       putExtra("callId", callId)
     }
     val declinePendingIntent = PendingIntent.getBroadcast(
-      context, 1, declineIntent,
-      PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-    )
-
-    val fullScreenIntent = Intent(context, CallActivity::class.java).apply {
-      addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-      putExtra("callId", callId)
-      putExtra("callerName", callerName)
-      putExtra("callType", callType)
-    }
-    val fullScreenPendingIntent = PendingIntent.getActivity(
-      context, 2, fullScreenIntent,
+      context, callId.hashCode() + 2, declineIntent,
       PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
     )
 
@@ -964,13 +975,15 @@ object CallEngine {
         .setFullScreenIntent(fullScreenPendingIntent, true)
         .setOngoing(true)
         .setAutoCancel(false)
+        .setCategory(Notification.CATEGORY_CALL)
+        .setPriority(Notification.PRIORITY_MAX)
         .build()
     } else {
       Notification.Builder(context, NOTIF_CHANNEL_ID)
         .setSmallIcon(android.R.drawable.sym_call_incoming)
         .setContentTitle("Incoming Call")
         .setContentText(callerName)
-        .setPriority(Notification.PRIORITY_HIGH)
+        .setPriority(Notification.PRIORITY_MAX)
         .setCategory(Notification.CATEGORY_CALL)
         .setFullScreenIntent(fullScreenPendingIntent, true)
         .addAction(android.R.drawable.sym_action_call, "Answer", answerPendingIntent)
@@ -981,6 +994,14 @@ object CallEngine {
     }
 
     notificationManager.notify(NOTIF_ID, notification)
+
+    // Also try to launch the activity directly as a backup
+    try {
+      context.startActivity(fullScreenIntent)
+    } catch (e: Exception) {
+      Log.w(TAG, "Could not start activity directly: ${e.message}")
+    }
+
     playRingtone()
     setInitialAudioRoute(callType)
   }

package/package.json

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