@qusaieilouti99/call-manager 0.1.46 → 0.1.48

package/android/src/main/AndroidManifest.xml

@@ -1,67 +1,22 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.margelo.nitro.qusaieilouti99.callmanager">
 
-    <!-- REQUIRED FOR TELECOM API (Self-managed connections) -->
+    <!-- Essential permissions that the library requires -->
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
-    <!-- Required for recording audio in calls -->
+    <uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <!-- Required for changing audio routes like speakerphone -->
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <!-- For keeping screen awake during calls -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <!-- For vibrating the device (e.g., incoming call) -->
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
 
-    <!-- Bluetooth permissions for audio routing -->
-    <!-- For Android 11 (API 30) and lower -->
+    <!-- Bluetooth permissions -->
     <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
-    <!-- For Android 12 (API 31) and higher -->
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
-    <!-- Required for foreground service on older devices (< Android P) -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <!-- Required for foreground service with phoneCall type on Android 12 (API 31) and higher -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
-
-    <application>
-        <!-- Your CallActivity for full-screen incoming call UI -->
-        <activity
-                android:name=".CallActivity"
-                android:exported="true"
-                android:showOnLockScreen="true"
-                android:turnScreenOn="true"
-                android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
-                android:screenOrientation="portrait"
-                android:launchMode="singleTop"
-                android:excludeFromRecents="true"
-                android:taskAffinity=""
-                android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
-
-        <!-- The ConnectionService, crucial for Telecom API integration -->
-        <service
-                android:name=".MyConnectionService"
-                android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
-                android:exported="true">
-            <intent-filter>
-                <action android:name="android.telecom.ConnectionService" />
-            </intent-filter>
-        </service>
-
-        <!-- The foreground service to keep the call alive in the background -->
-        <service
-                android:name=".CallForegroundService"
-                android:enabled="true"
-                android:exported="false"
-                android:foregroundServiceType="phoneCall" />
-
-        <!-- Receiver for notification actions (Answer/Decline) -->
-        <receiver
-                android:name=".CallNotificationActionReceiver"
-                android:exported="false" />
-    </application>
+    <!-- No components needed here - they're declared in app manifest -->
 </manifest>

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,6 +307,8 @@ object CallEngine {
         keepScreenAwake(context, true)
         resetAudioMode(context)
 
+        updateLockScreenBypass()
+
         // Emit event
         emitEvent(CallEventType.CALL_ANSWERED, JSONObject().put("callId", callId))
         notifyCallStateChanged(context)
@@ -279,9 +318,11 @@ object CallEngine {
 
     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)
     }
 
@@ -291,6 +332,7 @@ object CallEngine {
         val connection = telecomConnections[callId]
         connection?.setActive()
         emitEvent(CallEventType.CALL_UNHELD, JSONObject().put("callId", callId))
+        updateLockScreenBypass()
         notifyCallStateChanged(context)
     }
 
@@ -332,6 +374,7 @@ object CallEngine {
 
         // Final cleanup
         finalCleanup(context)
+        updateLockScreenBypass()
         notifyCallStateChanged(context)
     }
 
@@ -369,6 +412,7 @@ object CallEngine {
             finalCleanup(context)
         }
 
+        updateLockScreenBypass()
         emitEvent(CallEventType.CALL_ENDED, JSONObject().put("callId", callId))
         notifyCallStateChanged(context)
     }
@@ -380,30 +424,6 @@ object CallEngine {
         stopForegroundService(context)
         keepScreenAwake(context, false)
         resetAudioMode(context)
-
-        // FIXED: Clear lock screen bypass when calls end
-        clearLockScreenBypass(context)
-    }
-
-    // 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()
@@ -491,25 +511,34 @@ object CallEngine {
         context.stopService(intent)
     }
 
+    // FIXED: Corrected bringAppToForeground method
     fun bringAppToForeground(context: Context) {
         val packageName = context.packageName
         val launchIntent = context.packageManager.getLaunchIntentForPackage(packageName)
-        launchIntent?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        launchIntent?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
 
         // Handle lock screen bypass for active calls
         if (isCallActive()) {
-            // Only set lock screen bypass when bringing to foreground during active calls
             launchIntent?.putExtra("BYPASS_LOCK_SCREEN", true)
-            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")
         }
 
-        context.startActivity(launchIntent)
-    }
+        try {
+            context.startActivity(launchIntent)
+
+            // Small delay to ensure activity is created before updating bypass
+            android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
+                updateLockScreenBypass()
+            }, 100)
 
-    // Rest of the methods remain the same...
-    // (getAudioDevices, setAudioRoute, keepScreenAwake, etc. - keeping them unchanged for brevity)
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to bring app to foreground: ${e.message}")
+        }
+    }
 
     // --- Audio Device Management ---
     fun getAudioDevices(): AudioRoutesInfo {

package/package.json

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