@qusaieilouti99/call-manager 0.1.91 → 0.1.93

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

@@ -916,13 +916,91 @@ 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")
+
+    // **SIMPLE LOGIC**: If locked -> overlay, if unlocked -> notification
+    if (isDeviceLocked(context)) {
+      Log.d(TAG, "Device is locked - using overlay approach")
+      showCallActivityOverlay(context, callId, callerName, callType)
+    } else {
+      Log.d(TAG, "Device is unlocked - using standard notification")
+      showStandardNotification(context, callId, callerName, callType)
+    }
+
+    playRingtone()
+    setInitialAudioRoute(callType)
+  }
+
+  /**
+   * Simple check if device is locked
+   */
+  private fun isDeviceLocked(context: Context): Boolean {
+    val keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+    val isLocked = keyguardManager.isKeyguardLocked
+    Log.d(TAG, "Device locked status: $isLocked")
+    return isLocked
+  }
+
+  /**
+   * Shows the call activity directly as overlay (when device is locked)
+   */
+  private fun showCallActivityOverlay(context: Context, callId: String, callerName: String, callType: String) {
+    val overlayIntent = Intent(context, CallActivity::class.java).apply {
+      addFlags(
+        Intent.FLAG_ACTIVITY_NEW_TASK or
+        Intent.FLAG_ACTIVITY_CLEAR_TASK or
+        Intent.FLAG_ACTIVITY_NO_ANIMATION or
+        Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+      )
+      putExtra("callId", callId)
+      putExtra("callerName", callerName)
+      putExtra("callType", callType)
+      putExtra("LOCK_SCREEN_MODE", true) // Flag to identify lock screen mode
+    }
+
+    try {
+      // Wake the screen when device is locked
+      val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
+      val wakeLock = powerManager.newWakeLock(
+        PowerManager.SCREEN_BRIGHT_WAKE_LOCK or PowerManager.ACQUIRE_CAUSES_WAKEUP,
+        "CallEngine:LockScreenWake"
+      )
+      wakeLock.acquire(5000)
+
+      // Launch the activity overlay
+      context.startActivity(overlayIntent)
+      Log.d(TAG, "Successfully launched CallActivity overlay for locked device")
+
+      // **NO NOTIFICATION** when using overlay
+
+    } catch (e: Exception) {
+      Log.e(TAG, "Overlay failed, falling back to notification: ${e.message}")
+      // If overlay fails, fall back to notification
+      showStandardNotification(context, callId, callerName, callType)
+    }
+  }
+
+  /**
+   * Shows standard notification with full-screen intent (when device is unlocked)
+   */
+  private fun showStandardNotification(context: Context, callId: String, callerName: String, callType: String) {
     createNotificationChannel()
-    val notificationManager =
-      context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+    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)
+      // No lock screen flag - standard notification mode
+    }
+
+    val fullScreenPendingIntent = PendingIntent.getActivity(
+      context, callId.hashCode(), fullScreenIntent,
+      PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+    )
 
     val answerIntent = Intent(context, CallNotificationActionReceiver::class.java).apply {
       action = "com.qusaieilouti99.callmanager.ANSWER_CALL"
@@ -942,29 +1020,6 @@ object CallEngine {
       PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
     )
 
-    // **SAMSUNG FIX**: Enhanced full-screen intent
-
-     // First, wake up the screen using PowerManager
-     val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
-     val wakeLock = powerManager.newWakeLock(
-       PowerManager.SCREEN_BRIGHT_WAKE_LOCK or PowerManager.ACQUIRE_CAUSES_WAKEUP,
-       "CallEngine:IncomingCallWake"
-     )
-     wakeLock.acquire(5000) // 5 sec
-    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)
@@ -984,30 +1039,25 @@ 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_HIGH)
+        .setPriority(Notification.PRIORITY_MAX)
         .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()
     }
 
     notificationManager.notify(NOTIF_ID, notification)
-    playRingtone()
-    setInitialAudioRoute(callType)
   }
 
   fun cancelIncomingCallUI() {

package/package.json

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