@qusaieilouti99/call-manager 0.1.61 → 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,33 +1,40 @@
 package com.margelo.nitro.qusaieilouti99.callmanager
 
-import com.facebook.proguard.annotations.DoNotStrip
 import android.util.Log
+import com.facebook.proguard.annotations.DoNotStrip
 
 @DoNotStrip
 class CallManager : HybridCallManagerSpec() {
 
     private val TAG = "CallManager"
 
-    // Remove problematic initialization - will rely on lazy initialization
+    // 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()) {
-            Log.w(TAG, "CallEngine not yet initialized - this should be handled by the first call requiring context")
+            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."
+            )
         }
     }
 
-    override fun endCall(callId: String) {
+    // --- All methods must call ensureInitialized() first ---
+
+    override fun endCall(callId: String): Unit {
         Log.d(TAG, "endCall requested for callId: $callId")
         ensureInitialized()
         CallEngine.endCall(callId)
     }
 
-    override fun endAllCalls() {
+    override fun endAllCalls(): Unit {
         Log.d(TAG, "endAllCalls requested")
         ensureInitialized()
         CallEngine.endAllCalls()
     }
 
-    override fun silenceRingtone() {
+    override fun silenceRingtone(): Unit {
         Log.d(TAG, "silenceRingtone requested.")
         ensureInitialized()
         CallEngine.stopRingtone()
@@ -39,22 +46,20 @@ class CallManager : HybridCallManagerSpec() {
         return CallEngine.getAudioDevices()
     }
 
-    override fun setAudioRoute(route: String) {
+    override fun setAudioRoute(route: String): Unit {
         Log.d(TAG, "setAudioRoute requested for route: $route")
         ensureInitialized()
         CallEngine.setAudioRoute(route)
     }
 
-    override fun keepScreenAwake(keepAwake: Boolean) {
+    override fun keepScreenAwake(keepAwake: Boolean): Unit {
         Log.d(TAG, "keepScreenAwake requested: $keepAwake")
         ensureInitialized()
         CallEngine.keepScreenAwake(keepAwake)
     }
 
-    override fun addListener(
-        listener: (event: CallEventType, payload: String) -> Unit
-    ): () -> Unit {
-        Log.d(TAG, "addListener called with listener: $listener")
+    override fun addListener(listener: (event: CallEventType, payload: String) -> Unit): () -> Unit {
+        Log.d(TAG, "addListener called")
         ensureInitialized()
         CallEngine.setEventHandler(listener)
         return {
@@ -63,31 +68,31 @@ class CallManager : HybridCallManagerSpec() {
         }
     }
 
-    override fun startOutgoingCall(callId: String, callType: String, targetName: String, metadata: String?) {
+    override fun startOutgoingCall(callId: String, callType: String, targetName: String, metadata: String?): Unit {
         Log.d(TAG, "startOutgoingCall requested: callId=$callId, callType=$callType, targetName=$targetName")
         ensureInitialized()
         CallEngine.startOutgoingCall(callId, callType, targetName, metadata)
     }
 
-    override fun startCall(callId: String, callType: String, targetName: String, metadata: String?) {
+    override fun startCall(callId: String, callType: String, targetName: String, metadata: String?): Unit {
         Log.d(TAG, "startCall requested: callId=$callId, callType=$callType, targetName=$targetName")
         ensureInitialized()
         CallEngine.startCall(callId, callType, targetName, metadata)
     }
 
-    override fun callAnswered(callId: String) {
+    override fun callAnswered(callId: String): Unit {
         Log.d(TAG, "callAnswered (from JS) requested for callId: $callId")
         ensureInitialized()
         CallEngine.callAnsweredFromJS(callId)
     }
 
-    override fun setOnHold(callId: String, onHold: Boolean) {
+    override fun setOnHold(callId: String, onHold: Boolean): Unit {
         Log.d(TAG, "setOnHold requested for callId: $callId, onHold: $onHold")
         ensureInitialized()
         CallEngine.setOnHold(callId, onHold)
     }
 
-    override fun setMuted(callId: String, muted: Boolean) {
+    override fun setMuted(callId: String, muted: Boolean): Unit {
         Log.d(TAG, "setMuted requested for callId: $callId, muted: $muted")
         ensureInitialized()
         CallEngine.setMuted(callId, muted)

package/package.json

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