@qusaieilouti99/call-manager 0.1.88 → 0.1.90

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

@@ -14,7 +14,9 @@ import android.widget.Button
 import android.widget.TextView
 
 /**
- * Enhanced CallActivity with better lock screen bypass for Samsung devices
+ * Full‐screen incoming‐call UI.  Implements CallEndListener
+ * so it always auto‐finishes when the engine ends the call.
+ * **SAMSUNG FIX**: Enhanced lock screen bypass for Samsung devices
  */
 class CallActivity : Activity(), CallEngine.CallEndListener {
 
@@ -40,57 +42,21 @@ class CallActivity : Activity(), CallEngine.CallEndListener {
     super.onCreate(savedInstanceState)
     Log.d(TAG, "CallActivity onCreate")
 
-    // Enhanced lock screen bypass for Samsung devices
-    setupLockScreenBypass()
+    // **SAMSUNG FIX**: Enhanced lock screen bypass
+    val isSamsungLockScreenBypass = intent.getBooleanExtra("SAMSUNG_LOCK_SCREEN_BYPASS", false)
+    setupLockScreenBypass(isSamsungLockScreenBypass)
 
     setContentView(R.layout.activity_call)
 
-    // Read incoming call params
+    // 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
+    // Register for call‐end callbacks BEFORE timeout or user can dismiss
     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 or
-        WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-      )
-    }
-
-    // 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
-    )
-  }
-
-  private fun setupUI() {
     val callerName = intent.getStringExtra("callerName") ?: "Unknown"
     findViewById<TextView>(R.id.caller_name).text = callerName
 
@@ -111,15 +77,64 @@ class CallActivity : Activity(), CallEngine.CallEndListener {
       CallEngine.endCall(callId)
       finishCallActivity()
     }
+
+    // Start auto‐timeout
+    timeoutHandler.postDelayed(timeoutRunnable, 60_000)
+    Log.d(TAG, "CallActivity setup complete")
+  }
+
+  // **SAMSUNG FIX**: Enhanced lock screen bypass method
+  private fun setupLockScreenBypass(isSamsungSpecific: Boolean) {
+    // Standard 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
+      )
+    }
+
+    // **SAMSUNG SPECIFIC**: Additional fixes for Samsung One UI 7
+    if (isSamsungSpecific) {
+      Log.d(TAG, "Applying Samsung-specific lock screen bypass")
+
+      // **CRITICAL**: Samsung requires BOTH new and old methods
+      window.addFlags(
+        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+        WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
+        WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
+        WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+      )
+
+      // **SAMSUNG SPECIFIC**: Request keyguard dismissal
+      val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        keyguardManager.requestDismissKeyguard(this, object : KeyguardManager.KeyguardDismissCallback() {
+          override fun onDismissSucceeded() {
+            Log.d(TAG, "Samsung keyguard dismissed successfully")
+          }
+          override fun onDismissError() {
+            Log.w(TAG, "Samsung keyguard dismissal failed")
+          }
+        })
+      }
+    }
   }
 
   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()
@@ -135,6 +150,10 @@ 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

@@ -880,6 +880,7 @@ object CallEngine {
   }
 
   // --- Notification Management ---
+  // **SAMSUNG FIX**: Enhanced notification channel creation
   private fun createNotificationChannel() {
     val context = requireContext()
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -893,6 +894,10 @@ object CallEngine {
       channel.lightColor = Color.GREEN
       channel.enableVibration(true)
 
+      // **SAMSUNG FIX**: Set bypass DND and lock screen visibility
+      channel.setBypassDnd(true)
+      channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+
       if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
         channel.setSound(
           RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE),
@@ -911,6 +916,7 @@ object CallEngine {
     }
   }
 
+  // **SAMSUNG FIX**: Enhanced showIncomingCallUI method
   private fun showIncomingCallUI(callId: String, callerName: String, callType: String) {
     val context = requireContext()
     Log.d(TAG, "Showing incoming call UI for $callId")
@@ -918,34 +924,12 @@ 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, callId.hashCode() + 1, answerIntent,
+      context, 0, answerIntent,
       PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
     )
 
@@ -954,10 +938,25 @@ object CallEngine {
       putExtra("callId", callId)
     }
     val declinePendingIntent = PendingIntent.getBroadcast(
-      context, callId.hashCode() + 2, declineIntent,
+      context, 1, declineIntent,
       PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
     )
 
+    // **SAMSUNG FIX**: Enhanced full-screen intent
+    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)
+      // **SAMSUNG SPECIFIC**: Add Samsung lock screen bypass flag
+      putExtra("SAMSUNG_LOCK_SCREEN_BYPASS", true)
+    }
+    val fullScreenPendingIntent = PendingIntent.getActivity(
+      context, 2, fullScreenIntent,
+      PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+    )
+
+    // **SAMSUNG FIX**: Enhanced notification
     val notification = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
       val person = android.app.Person.Builder()
         .setName(callerName)
@@ -977,19 +976,24 @@ object CallEngine {
         .setAutoCancel(false)
         .setCategory(Notification.CATEGORY_CALL)
         .setPriority(Notification.PRIORITY_MAX)
+        // **SAMSUNG SPECIFIC**: Add lock screen visibility
+        .setVisibility(Notification.VISIBILITY_PUBLIC)
+        .setPublicVersion(null)
         .build()
     } else {
       Notification.Builder(context, NOTIF_CHANNEL_ID)
         .setSmallIcon(android.R.drawable.sym_call_incoming)
         .setContentTitle("Incoming Call")
         .setContentText(callerName)
-        .setPriority(Notification.PRIORITY_MAX)
+        .setPriority(Notification.PRIORITY_HIGH)
         .setCategory(Notification.CATEGORY_CALL)
         .setFullScreenIntent(fullScreenPendingIntent, true)
         .addAction(android.R.drawable.sym_action_call, "Answer", answerPendingIntent)
         .addAction(android.R.drawable.ic_menu_close_clear_cancel, "Decline", declinePendingIntent)
         .setOngoing(true)
         .setAutoCancel(false)
+        // **SAMSUNG SPECIFIC**: Add lock screen visibility
+        .setVisibility(Notification.VISIBILITY_PUBLIC)
         .build()
     }
 

package/package.json

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