@qusaieilouti99/call-manager 0.1.62 → 0.1.63

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

@@ -48,8 +48,12 @@ object CallEngine {
     private const val FOREGROUND_NOTIF_ID = 1001
 
     // Core context - initialized once and maintained
+    // Improved context management with thread safety
+    @Volatile
     private var appContext: Context? = null
-    private var isInitialized = AtomicBoolean(false)
+    private val isInitialized = AtomicBoolean(false)
+    private val initializationLock = Any()
+
 
     // Audio & Media
     private var ringtone: android.media.Ringtone? = null
@@ -83,16 +87,25 @@ object CallEngine {
         fun onLockScreenBypassChanged(shouldBypass: Boolean)
     }
 
-    // --- INITIALIZATION - Fix for context management ---
+    // --- INITIALIZATION with better error handling ---
     fun initialize(context: Context) {
-        if (isInitialized.compareAndSet(false, true)) {
-            appContext = context.applicationContext
-            audioManager = appContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
-            Log.d(TAG, "CallEngine initialized with context")
-
-            // Initialize foreground service if needed
-            if (isCallActive()) {
-                startForegroundService()
+        synchronized(initializationLock) {
+            if (isInitialized.compareAndSet(false, true)) {
+                appContext = context.applicationContext
+                audioManager = appContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
+                Log.d(TAG, "CallEngine initialized successfully with context: ${context.javaClass.simpleName}")
+
+                // Verify critical services are available
+                if (audioManager == null) {
+                    Log.w(TAG, "AudioManager is null after initialization")
+                }
+
+                // Initialize foreground service if needed
+                if (isCallActive()) {
+                    startForegroundService()
+                }
+            } else {
+                Log.d(TAG, "CallEngine already initialized, skipping")
             }
         }
     }
@@ -100,7 +113,9 @@ object CallEngine {
     fun isInitialized(): Boolean = isInitialized.get()
 
     private fun requireContext(): Context {
-        return appContext ?: throw IllegalStateException("CallEngine not initialized. Call initialize() first.")
+        return appContext ?: throw IllegalStateException(
+            "CallEngine not initialized. Ensure CallEngine.initialize(context) is called in Application.onCreate() before any module usage."
+        )
     }
 
     // --- Event System ---

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

@@ -1,48 +1,26 @@
 package com.margelo.nitro.qusaieilouti99.callmanager
 
 import android.util.Log
-import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.proguard.annotations.DoNotStrip
 
 @DoNotStrip
-class CallManager : HybridCallManagerSpec() { // Match the parameterless constructor
+class CallManager : HybridCallManagerSpec() {
 
     private val TAG = "CallManager"
 
-    // This method ensures CallEngine has a valid context.
-    // It primarily relies on MainApplication.onCreate, but provides a fallback.
+    // Simplified approach - rely on proper Application.onCreate() initialization
+    // Remove all fallback context access attempts that don't work with Nitro modules
     private fun ensureInitialized() {
         if (!CallEngine.isInitialized()) {
-            // This log should ideally NOT be seen frequently in production.
-            // If it appears, it means CallEngine wasn't initialized by MainApplication.
-            Log.e(TAG, "CallEngine not initialized! Attempting late initialization from CallManager.")
-            try {
-                // For React Native modules (including JSI/Nitro ones),
-                // ReactApplicationContext.getCurrentApplicationContext() provides the
-                // ReactApplicationContext once the bridge is set up. From there, we get the Application context.
-                val reactContext = ReactApplicationContext.getCurrentApplicationContext()
-
-                if (reactContext != null) {
-                    val appContext = reactContext.applicationContext
-                    if (appContext != null) {
-                        CallEngine.initialize(appContext)
-                        Log.d(TAG, "CallEngine successfully (late) initialized via ReactApplicationContext.")
-                    } else {
-                        Log.e(TAG, "Error: reactContext.applicationContext is null. Cannot late-initialize CallEngine.")
-                        throw IllegalStateException("CallEngine initialization failed: Application context is null.")
-                    }
-                } else {
-                    Log.e(TAG, "Error: ReactApplicationContext.getCurrentApplicationContext() returned null. Cannot late-initialize CallEngine.")
-                    throw IllegalStateException("CallEngine initialization failed: ReactApplicationContext not available.")
-                }
-            } catch (e: Exception) {
-                Log.e(TAG, "Exception during CallEngine late initialization: ${e.message}", e)
-                throw IllegalStateException("CallEngine fatal error during initialization: ${e.message}", e)
-            }
+            Log.e(TAG, "CallEngine not initialized! This should not happen if Application.onCreate() was called properly.")
+            throw IllegalStateException(
+                "CallEngine must be initialized in Application.onCreate(). " +
+                "Make sure MainApplication.onCreate() calls CallEngine.initialize(this) before any native calls."
+            )
         }
     }
 
-    // --- All your overridden methods must call ensureInitialized() first ---
+    // --- All methods must call ensureInitialized() first ---
 
     override fun endCall(callId: String): Unit {
         Log.d(TAG, "endCall requested for callId: $callId")
@@ -81,7 +59,7 @@ class CallManager : HybridCallManagerSpec() { // Match the parameterless constru
     }
 
     override fun addListener(listener: (event: CallEventType, payload: String) -> Unit): () -> Unit {
-        Log.d(TAG, "addListener called with listener: $listener")
+        Log.d(TAG, "addListener called")
         ensureInitialized()
         CallEngine.setEventHandler(listener)
         return {
@@ -93,7 +71,6 @@ class CallManager : HybridCallManagerSpec() { // Match the parameterless constru
     override fun startOutgoingCall(callId: String, callType: String, targetName: String, metadata: String?): Unit {
         Log.d(TAG, "startOutgoingCall requested: callId=$callId, callType=$callType, targetName=$targetName")
         ensureInitialized()
-        // IMPORTANT: The Bundle wrapping fix for TelecomManager must still be in CallEngine.startOutgoingCall
         CallEngine.startOutgoingCall(callId, callType, targetName, metadata)
     }
 

package/package.json

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