@qusaieilouti99/call-manager 0.1.92 → 0.1.94

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

@@ -37,7 +37,7 @@ import org.json.JSONObject
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.atomic.AtomicBoolean
-
+import android.app.KeyguardManager
 /**
  * Core call‐management engine.  Manages self-managed telecom calls,
  * audio routing, UI notifications, etc.
@@ -916,47 +916,89 @@ 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")
-    createNotificationChannel()
-    val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-    // **CRITICAL**: Use Android's SYSTEM overlay approach for Samsung
+    // **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 or
-        Intent.FLAG_ACTIVITY_MULTIPLE_TASK
+        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
     }
 
-    // **SAMSUNG SPECIFIC**: Launch immediately via system overlay
     try {
-      // First, wake up the screen using PowerManager
+      // 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:IncomingCallWake"
+        "CallEngine:LockScreenWake"
       )
-      wakeLock.acquire(5000) // 5 seconds
+      wakeLock.acquire(5000)
 
-      // Then launch the activity
+      // Launch the activity overlay
       context.startActivity(overlayIntent)
-      Log.d(TAG, "Successfully launched CallActivity with screen wake")
+      Log.d(TAG, "Successfully launched CallActivity overlay for locked device")
+
+      // **NO NOTIFICATION** when using overlay
+
     } catch (e: Exception) {
-      Log.e(TAG, "Failed to launch CallActivity: ${e.message}")
+      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 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
     }
 
-    // Create notification as backup
     val fullScreenPendingIntent = PendingIntent.getActivity(
-      context, callId.hashCode(), overlayIntent,
+      context, callId.hashCode(), fullScreenIntent,
       PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
     )
 
@@ -1016,8 +1058,6 @@ object CallEngine {
     }
 
     notificationManager.notify(NOTIF_ID, notification)
-    playRingtone()
-    setInitialAudioRoute(callType)
   }
 
   fun cancelIncomingCallUI() {

package/package.json

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