@qusaieilouti99/call-manager 0.1.47 → 0.1.48

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

@@ -24,6 +24,7 @@ import android.telecom.VideoProfile
 import android.util.Log
 import android.graphics.Color
 import android.app.Person
+import android.view.WindowManager
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.UUID
@@ -49,6 +50,14 @@ object CallEngine {
     private var currentCallId: String? = null
     private var canMakeMultipleCalls: Boolean = true
 
+    // --- Lock Screen Bypass State Management ---
+    private var lockScreenBypassActive = false
+    private val lockScreenBypassCallbacks = mutableSetOf<LockScreenBypassCallback>()
+
+    interface LockScreenBypassCallback {
+        fun onLockScreenBypassChanged(shouldBypass: Boolean)
+    }
+
     data class CallInfo(
         val callId: String,
         val callData: String,
@@ -89,6 +98,34 @@ object CallEngine {
 
     fun getAppContext(): Context? = appContext
 
+    // --- Lock Screen Bypass Management (Single Source of Truth) ---
+    fun registerLockScreenBypassCallback(callback: LockScreenBypassCallback) {
+        lockScreenBypassCallbacks.add(callback)
+    }
+
+    fun unregisterLockScreenBypassCallback(callback: LockScreenBypassCallback) {
+        lockScreenBypassCallbacks.remove(callback)
+    }
+
+    private fun updateLockScreenBypass() {
+        val shouldBypass = isCallActive()
+        if (lockScreenBypassActive != shouldBypass) {
+            lockScreenBypassActive = shouldBypass
+            Log.d(TAG, "Lock screen bypass state changed: $lockScreenBypassActive")
+
+            // Notify all registered callbacks
+            lockScreenBypassCallbacks.forEach { callback ->
+                try {
+                    callback.onLockScreenBypassChanged(shouldBypass)
+                } catch (e: Exception) {
+                    Log.w(TAG, "Error notifying lock screen bypass callback", e)
+                }
+            }
+        }
+    }
+
+    fun isLockScreenBypassActive(): Boolean = lockScreenBypassActive
+
     // --- Telecom Connection Management ---
     fun addTelecomConnection(callId: String, connection: Connection) {
         telecomConnections[callId] = connection
@@ -163,7 +200,6 @@ object CallEngine {
             telecomManager.addNewIncomingCall(phoneAccountHandle, extras)
             startForegroundService(context)
             Log.d(TAG, "Successfully reported incoming call to TelecomManager for $callId")
-            // REMOVED: Don't bring app to foreground for incoming calls - only when answered
         } catch (e: SecurityException) {
             Log.e(TAG, "SecurityException: Failed to report incoming call. Check MANAGE_OWN_CALLS permission: ${e.message}", e)
             endCall(context, callId)
@@ -171,6 +207,7 @@ object CallEngine {
             Log.e(TAG, "Failed to report incoming call: ${e.message}", e)
             endCall(context, callId)
         }
+        updateLockScreenBypass()
         notifyCallStateChanged(context)
     }
 
@@ -217,7 +254,6 @@ object CallEngine {
             startForegroundService(context)
             Log.d(TAG, "Successfully reported outgoing call to TelecomManager via placeCall for $callId")
             startRingback()
-            // CHANGED: Bring app to foreground for outgoing calls
             bringAppToForeground(context)
             keepScreenAwake(context, true)
             if (parsedCallType == "Video") {
@@ -232,6 +268,7 @@ object CallEngine {
             Log.e(TAG, "Failed to start outgoing call via placeCall: ${e.message}", e)
             endCall(context, callId)
         }
+        updateLockScreenBypass()
         notifyCallStateChanged(context)
     }
 
@@ -270,8 +307,7 @@ object CallEngine {
         keepScreenAwake(context, true)
         resetAudioMode(context)
 
-        // ADDED: Ensure MainActivity shows above lock screen during call
-        updateMainActivityLockScreenBypass()
+        updateLockScreenBypass()
 
         // Emit event
         emitEvent(CallEventType.CALL_ANSWERED, JSONObject().put("callId", callId))
@@ -280,31 +316,13 @@ object CallEngine {
         Log.d(TAG, "Call $callId successfully answered and UI cleaned up")
     }
 
-    // NEW: Method to update MainActivity lock screen bypass state
-    private fun updateMainActivityLockScreenBypass() {
-        try {
-            // Try to get MainActivity instance through reflection or static reference
-            val mainActivityClass = Class.forName("com.pingme2022.MainActivity")
-            val getCurrentInstanceMethod = mainActivityClass.getMethod("getCurrentInstance")
-            val mainActivityInstance = getCurrentInstanceMethod.invoke(null)
-
-            if (mainActivityInstance != null) {
-                val updateMethod = mainActivityClass.getMethod("updateLockScreenBypass")
-                updateMethod.invoke(mainActivityInstance)
-                Log.d(TAG, "Updated MainActivity lock screen bypass state")
-            } else {
-                Log.d(TAG, "MainActivity instance not available for lock screen bypass update")
-            }
-        } catch (e: Exception) {
-            Log.w(TAG, "Could not update MainActivity lock screen bypass: ${e.message}")
-        }
-    }
-
     fun holdCall(context: Context, callId: String) {
         Log.d(TAG, "holdCall: $callId")
+        activeCalls[callId]?.state = CallState.HELD
         val connection = telecomConnections[callId]
         connection?.setOnHold()
         emitEvent(CallEventType.CALL_HELD, JSONObject().put("callId", callId))
+        updateLockScreenBypass()
         notifyCallStateChanged(context)
     }
 
@@ -314,6 +332,7 @@ object CallEngine {
         val connection = telecomConnections[callId]
         connection?.setActive()
         emitEvent(CallEventType.CALL_UNHELD, JSONObject().put("callId", callId))
+        updateLockScreenBypass()
         notifyCallStateChanged(context)
     }
 
@@ -355,6 +374,7 @@ object CallEngine {
 
         // Final cleanup
         finalCleanup(context)
+        updateLockScreenBypass()
         notifyCallStateChanged(context)
     }
 
@@ -392,6 +412,7 @@ object CallEngine {
             finalCleanup(context)
         }
 
+        updateLockScreenBypass()
         emitEvent(CallEventType.CALL_ENDED, JSONObject().put("callId", callId))
         notifyCallStateChanged(context)
     }
@@ -403,29 +424,6 @@ object CallEngine {
         stopForegroundService(context)
         keepScreenAwake(context, false)
         resetAudioMode(context)
-
-        // ENHANCED: Clear lock screen bypass when calls end
-        updateMainActivityLockScreenBypass()
-    }
-    // NEW: Function to clear lock screen bypass
-    private fun clearLockScreenBypass(context: Context) {
-        try {
-            if (context is Activity) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                    context.setShowWhenLocked(false)
-                    context.setTurnScreenOn(false)
-                } else {
-                    context.window.clearFlags(
-                        android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-                        android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
-                        android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
-                    )
-                }
-                Log.d(TAG, "Lock screen bypass flags cleared for Activity")
-            }
-        } catch (e: Exception) {
-            Log.w(TAG, "Could not clear lock screen bypass flags: ${e.message}")
-        }
     }
 
     fun getActiveCalls(): List<CallInfo> = activeCalls.values.toList()
@@ -513,7 +511,7 @@ object CallEngine {
         context.stopService(intent)
     }
 
-    // Enhanced bringAppToForeground with better lock screen handling
+    // FIXED: Corrected bringAppToForeground method
     fun bringAppToForeground(context: Context) {
         val packageName = context.packageName
         val launchIntent = context.packageManager.getLaunchIntentForPackage(packageName)
@@ -521,21 +519,9 @@ object CallEngine {
 
         // Handle lock screen bypass for active calls
         if (isCallActive()) {
-            // ENHANCED: Add multiple flags for better lock screen bypass
             launchIntent?.putExtra("BYPASS_LOCK_SCREEN", true)
-
-            // Add lock screen bypass flags directly to the intent
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                launchIntent?.addFlags(Intent.FLAG_ACTIVITY_SHOW_WHEN_LOCKED or Intent.FLAG_ACTIVITY_TURN_SCREEN_ON)
-            } else {
-                launchIntent?.addFlags(
-                    Intent.FLAG_ACTIVITY_SHOW_WHEN_LOCKED or
-                    Intent.FLAG_ACTIVITY_TURN_SCREEN_ON or
-                    Intent.FLAG_ACTIVITY_CLEAR_TASK
-                )
-            }
-
-            Log.d(TAG, "App brought to foreground with lock screen bypass for active call")
+            launchIntent?.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
+            Log.d(TAG, "App brought to foreground with lock screen bypass request for active call")
         } else {
             launchIntent?.removeExtra("BYPASS_LOCK_SCREEN")
             Log.d(TAG, "App brought to foreground without lock screen bypass")
@@ -544,9 +530,9 @@ object CallEngine {
         try {
             context.startActivity(launchIntent)
 
-            // ADDED: Small delay to ensure activity is created before updating bypass
+            // Small delay to ensure activity is created before updating bypass
             android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-                updateMainActivityLockScreenBypass()
+                updateLockScreenBypass()
             }, 100)
 
         } catch (e: Exception) {
@@ -554,9 +540,6 @@ object CallEngine {
         }
     }
 
-    // Rest of the methods remain the same...
-    // (getAudioDevices, setAudioRoute, keepScreenAwake, etc. - keeping them unchanged for brevity)
-
     // --- Audio Device Management ---
     fun getAudioDevices(): AudioRoutesInfo {
         audioManager = appContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: run {

package/package.json

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