@qusaieilouti99/call-manager 0.1.149 → 0.1.150

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

@@ -78,9 +78,6 @@ object CallEngine {
   private val telecomConnections = ConcurrentHashMap<String, Connection>()
   private val callMetadata = ConcurrentHashMap<String, String>()
 
-  // NEW: Track incoming calls to prevent duplicates
-  private val incomingCallIds = ConcurrentHashMap<String, Long>()
-
   private var currentCallId: String? = null
   private var canMakeMultipleCalls: Boolean = false
   private var lastAudioRoutesInfo: AudioRoutesInfo? = null
@@ -89,10 +86,6 @@ object CallEngine {
   private var eventHandler: ((CallEventType, String) -> Unit)? = null
   private val cachedEvents = mutableListOf<Pair<CallEventType, String>>()
 
-  // NEW: Track ringtone state to prevent double ringing
-  private var isCustomRingtoneActive = false
-  private val ringtoneStateLock = Any()
-
   interface LockScreenBypassCallback {
     fun onLockScreenBypassChanged(shouldBypass: Boolean)
   }
@@ -245,19 +238,6 @@ object CallEngine {
       initialize(context)
     }
 
-    // NEW: Guard against duplicate calls
-    val currentTime = System.currentTimeMillis()
-    val lastCallTime = incomingCallIds[callId]
-    if (lastCallTime != null && (currentTime - lastCallTime) < 5000) {
-      Log.w(TAG, "Ignoring duplicate incoming call for callId: $callId (last call ${currentTime - lastCallTime}ms ago)")
-      return
-    }
-    incomingCallIds[callId] = currentTime
-
-    // Clean up old entries (older than 30 seconds)
-    val cutoffTime = currentTime - 30000
-    incomingCallIds.entries.removeAll { it.value < cutoffTime }
-
     Log.d(TAG, "reportIncomingCall: callId=$callId, type=$callType, name=$displayName")
     metadata?.let { callMetadata[callId] = it }
 
@@ -421,7 +401,7 @@ object CallEngine {
 
     // NEW: Improved initial audio route setting with better timing
     mainHandler.postDelayed({
-      setInitialAudioRoute(callType, isCallStart = true)
+      setInitialAudioRoute(callType)
     }, 500L)
 
     updateLockScreenBypass()
@@ -468,21 +448,8 @@ object CallEngine {
     updateLockScreenBypass()
 
     setAudioMode()
-
-    // NEW: Improved initial audio route with longer delay and retry mechanism
     mainHandler.postDelayed({
-      setInitialAudioRoute(callInfo.callType, isCallStart = true)
-
-      // Retry after additional delay if needed for video calls
-      if (callInfo.callType == "Video") {
-        mainHandler.postDelayed({
-          val currentRoute = getCurrentAudioRoute()
-          if (currentRoute != "Speaker") {
-            Log.d(TAG, "Retrying audio route for video call - current: $currentRoute")
-            setAudioRoute("Speaker")
-          }
-        }, 1000L)
-      }
+      setInitialAudioRoute(callInfo.callType)
     }, 800L)
 
     if (isLocalAnswer) {
@@ -641,7 +608,6 @@ object CallEngine {
     activeCalls.clear()
     telecomConnections.clear()
     callMetadata.clear()
-    incomingCallIds.clear() // NEW: Clear duplicate tracking
     currentCallId = null
 
     cleanup()
@@ -658,7 +624,6 @@ object CallEngine {
 
     val metadata = callMetadata.remove(callId)
     activeCalls.remove(callId)
-    incomingCallIds.remove(callId) // NEW: Clean up duplicate tracking
 
     stopRingback()
     stopRingtone()
@@ -815,45 +780,18 @@ object CallEngine {
     }
   }
 
-  // NEW: Improved initial audio route setting
-  private fun setInitialAudioRoute(callType: String, isCallStart: Boolean = false) {
+  private fun setInitialAudioRoute(callType: String) {
     val avail = getAudioDevices()
     // Extract string values for comparison
     val deviceStrings = avail.devices.map { it.value }
-
     val defaultRoute = when {
       deviceStrings.contains("Bluetooth") -> "Bluetooth"
       deviceStrings.contains("Headset") -> "Headset"
       callType == "Video" -> "Speaker"
       else -> "Earpiece"
     }
-
-    Log.d(TAG, "Setting initial audio route: $defaultRoute for call type: $callType (isCallStart: $isCallStart)")
-
-    // For call start, ensure audio mode is properly set first
-    if (isCallStart) {
-      setAudioMode()
-
-      // Additional delay for audio system to be ready
-      if (callType == "Video") {
-        mainHandler.postDelayed({
-          setAudioRoute(defaultRoute)
-
-          // Force speaker for video calls with additional verification
-          mainHandler.postDelayed({
-            val currentRoute = getCurrentAudioRoute()
-            if (currentRoute != "Speaker" && !deviceStrings.contains("Bluetooth") && !deviceStrings.contains("Headset")) {
-              Log.d(TAG, "Forcing speaker for video call - current route was: $currentRoute")
-              setAudioRoute("Speaker")
-            }
-          }, 300L)
-        }, 200L)
-      } else {
-        setAudioRoute(defaultRoute)
-      }
-    } else {
-      setAudioRoute(defaultRoute)
-    }
+    Log.d(TAG, "Setting initial audio route: $defaultRoute for call type: $callType")
+    setAudioRoute(defaultRoute)
   }
 
   private fun setAudioMode() {
@@ -958,7 +896,6 @@ object CallEngine {
 
   private fun rejectIncomingCallCollision(callId: String, reason: String) {
     callMetadata.remove(callId)
-    incomingCallIds.remove(callId) // NEW: Clean up duplicate tracking
     emitEvent(CallEventType.CALL_REJECTED, JSONObject().apply {
       put("callId", callId)
       put("reason", reason)
@@ -1013,8 +950,6 @@ object CallEngine {
       Log.d(TAG, "Device is unlocked and supports CallStyle - using enhanced notification")
       showStandardNotification(context, callId, callerName, callType, callerPicUrl)
     }
-
-    // NEW: Improved ringtone handling to prevent double ringing
     playRingtone()
   }
 
@@ -1258,73 +1193,43 @@ object CallEngine {
     )
   }
 
-  // NEW: Improved ringtone handling to prevent double ringing
   private fun playRingtone() {
-    synchronized(ringtoneStateLock) {
-      if (isCustomRingtoneActive) {
-        Log.d(TAG, "Custom ringtone already active, skipping")
-        return
-      }
-
-      val context = requireContext()
-      audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-
-      // Only set ringtone mode if not already in communication mode
-      val currentMode = audioManager?.mode ?: AudioManager.MODE_NORMAL
-      if (currentMode != AudioManager.MODE_IN_COMMUNICATION) {
-        audioManager?.mode = AudioManager.MODE_RINGTONE
-      }
+    val context = requireContext()
+    audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+    audioManager?.mode = AudioManager.MODE_RINGTONE
 
-      vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
-      vibrator?.let { v ->
-        val pattern = longArrayOf(0L, 500L, 500L)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-          v.vibrate(VibrationEffect.createWaveform(pattern, 0))
-        } else {
-          @Suppress("DEPRECATION")
-          v.vibrate(pattern, 0)
-        }
+    vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
+    vibrator?.let { v ->
+      val pattern = longArrayOf(0L, 500L, 500L)
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        v.vibrate(VibrationEffect.createWaveform(pattern, 0))
+      } else {
+        @Suppress("DEPRECATION")
+        v.vibrate(pattern, 0)
       }
+    }
 
-      try {
-        // Check if system ringtone is already playing for this call (API 31+)
-        val shouldPlayCustomRingtone = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-          // For newer APIs, be more cautious about playing custom ringtone
-          // if CallStyle notification is being used
-          !supportsCallStyleNotifications()
-        } else {
-          true
-        }
-
-        if (shouldPlayCustomRingtone) {
-          val uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
-          ringtone = RingtoneManager.getRingtone(context, uri)
-          ringtone?.play()
-          isCustomRingtoneActive = true
-          Log.d(TAG, "Custom ringtone started playing")
-        } else {
-          Log.d(TAG, "Skipping custom ringtone - system should handle it")
-        }
-      } catch (e: Exception) {
-        Log.e(TAG, "Failed to play ringtone", e)
-      }
+    try {
+      val uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
+      ringtone = RingtoneManager.getRingtone(context, uri)
+      ringtone?.play()
+      Log.d(TAG, "Ringtone started playing")
+    } catch (e: Exception) {
+      Log.e(TAG, "Failed to play ringtone", e)
     }
   }
 
   fun stopRingtone() {
-    synchronized(ringtoneStateLock) {
-      try {
-        ringtone?.stop()
-        isCustomRingtoneActive = false
-        Log.d(TAG, "Ringtone stopped")
-      } catch (e: Exception) {
-        Log.e(TAG, "Error stopping ringtone", e)
-      }
-      ringtone = null
-
-      vibrator?.cancel()
-      vibrator = null
+    try {
+      ringtone?.stop()
+      Log.d(TAG, "Ringtone stopped")
+    } catch (e: Exception) {
+      Log.e(TAG, "Error stopping ringtone", e)
     }
+    ringtone = null
+
+    vibrator?.cancel()
+    vibrator = null
   }
 
   private fun startRingback() {
@@ -1360,9 +1265,6 @@ object CallEngine {
     stopForegroundService()
     keepScreenAwake(false)
     resetAudioMode()
-    synchronized(ringtoneStateLock) {
-      isCustomRingtoneActive = false
-    }
   }
 
   fun onApplicationTerminate() {
@@ -1376,7 +1278,6 @@ object CallEngine {
     activeCalls.clear()
     telecomConnections.clear()
     callMetadata.clear()
-    incomingCallIds.clear() // NEW: Clear duplicate tracking
     currentCallId = null
     cleanup()
     lockScreenBypassCallbacks.clear()

package/lib/module/CallManager.nitro.js.map

@@ -1 +1 @@
-{"version":3,"names":["NitroModules","CallManagerHybridObject","createHybridObject"],"sourceRoot":"../../src","sources":["CallManager.nitro.ts"],"mappings":";;AAAA;AACA,SAA4BA,YAAY,QAAQ,4BAA4B;;AAI5E;;AAKA;;AA2CA,OAAO,MAAMC,uBAAuB,GAClCD,YAAY,CAACE,kBAAkB,CAAc,aAAa,CAAC","ignoreList":[]}
+{"version":3,"names":["NitroModules","CallManagerHybridObject","createHybridObject"],"sourceRoot":"../../src","sources":["CallManager.nitro.ts"],"mappings":";;AAAA;AACA,SAA4BA,YAAY,QAAQ,4BAA4B;;AAG5E;;AAKA;;AAyDA,OAAO,MAAMC,uBAAuB,GAClCD,YAAY,CAACE,kBAAkB,CAAc,aAAa,CAAC","ignoreList":[]}

package/lib/typescript/src/CallManager.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CallManager.nitro.d.ts","sourceRoot":"","sources":["../../../src/CallManager.nitro.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAgB,MAAM,4BAA4B,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAY,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IAEpF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,IAAI,IAAI,CAAC;IACxB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAGnC,eAAe,IAAI,eAAe,CAAC;IACnC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,eAAe,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAE1C,WAAW,IAAI,IAAI,CAAC;IACpB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzF,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/C,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAGvE,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAGlG,WAAW,CAET,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GACxD,MAAM,IAAI,CAAC;IAEd,yBAAyB,CAEvB,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAClC,MAAM,IAAI,CAAC;IAGd,aAAa,IAAI,OAAO,CAAC;CAC1B;AAGD,eAAO,MAAM,uBAAuB,aACyB,CAAC"}
+{"version":3,"file":"CallManager.nitro.d.ts","sourceRoot":"","sources":["../../../src/CallManager.nitro.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAgB,MAAM,4BAA4B,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGrD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IAEzD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,IAAI,IAAI,CAAC;IACxB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAGnC,eAAe,IAAI,eAAe,CAAC;IACnC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,eAAe,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAE1C,WAAW,IAAI,IAAI,CAAC;IACpB,iBAAiB,CACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAAC;IACR,SAAS,CACP,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAAC;IACR,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/C,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAGvE,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAAC;IAGR,WAAW,CAET,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GACxD,MAAM,IAAI,CAAC;IAEd,yBAAyB,CAEvB,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAClC,MAAM,IAAI,CAAC;IAEd,aAAa,IAAI,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,uBAAuB,aACyB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qusaieilouti99/call-manager",
-  "version": "0.1.149",
+  "version": "0.1.150",
   "description": "Call manager",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -62,29 +62,35 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/compat": "^1.3.1",
-    "@eslint/eslintrc": "^1.4.1",
-    "@eslint/js": "^10.0.0",
-    "@evilmartians/lefthook": "^1.12.2",
+    "@commitlint/config-conventional": "^19.6.0",
+    "@eslint/compat": "^1.2.7",
+    "@eslint/eslintrc": "^3.3.0",
+    "@eslint/js": "^9.22.0",
+    "@evilmartians/lefthook": "^1.5.0",
     "@react-native/babel-preset": "0.79.2",
-    "@react-native/eslint-config": "^0.79.2",
+    "@react-native/eslint-config": "^0.78.0",
+    "@release-it/conventional-changelog": "^9.0.2",
     "@types/jest": "^29.5.5",
     "@types/react": "^19.0.0",
-    "commitlint": "^19.8.1",
+    "@typescript-eslint/eslint-plugin": "^8.39.0",
+    "commitlint": "^19.6.1",
     "del-cli": "^5.1.0",
-    "eslint": "^9.32.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.3",
+    "eslint": "^9.22.0",
+    "eslint-config-prettier": "^10.1.1",
+    "eslint-plugin-ft-flow": "^3.0.11",
+    "eslint-plugin-jest": "^29.0.1",
+    "eslint-plugin-prettier": "^5.2.3",
+    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-native": "^5.0.0",
     "jest": "^29.7.0",
     "nitro-codegen": "*",
-    "prettier": "^3.6.2",
+    "prettier": "^3.0.3",
     "react": "19.0.0",
     "react-native": "0.79.2",
-    "react-native-builder-bob": "^0.40.13",
+    "react-native-builder-bob": "^0.40.8",
     "react-native-nitro-modules": "*",
-    "release-it": "^19.0.4",
-    "turbo": "^1.13.4",
+    "release-it": "^17.10.0",
+    "turbo": "^1.10.7",
     "typescript": "^5.9.2"
   },
   "peerDependencies": {

package/src/CallManager.nitro.ts

@@ -2,7 +2,6 @@
 import { type HybridObject, NitroModules } from 'react-native-nitro-modules';
 import type { CallEventType } from './CallEventType';
 
-
 // This is workaround for a swift compiler bug, its preventing us from using string[].
 export interface StringHolder {
   value: string;
@@ -14,7 +13,8 @@ export interface AudioRoutesInfo {
   currentRoute: string; // Currently active audio route (e.g., "Speaker", "Earpiece", "Bluetooth", "Headset", "Unknown")
 }
 
-export interface CallManager extends HybridObject<{ ios: 'swift'; android: 'kotlin' }> {
+export interface CallManager
+  extends HybridObject<{ ios: 'swift'; android: 'kotlin' }> {
   // Call control
   endCall(callId: string): void;
   silenceRingtone(): void;
@@ -26,14 +26,29 @@ export interface CallManager extends HybridObject<{ ios: 'swift'; android: 'kotl
   keepScreenAwake(keepAwake: boolean): void;
 
   endAllCalls(): void;
-  startOutgoingCall(callId: string, callType: string, targetName: string, metadata?: string): void;
-  startCall(callId: string, callType: string, targetName: string, metadata?: string): void;
+  startOutgoingCall(
+    callId: string,
+    callType: string,
+    targetName: string,
+    metadata?: string
+  ): void;
+  startCall(
+    callId: string,
+    callType: string,
+    targetName: string,
+    metadata?: string
+  ): void;
   setOnHold(callId: string, onHold: boolean): void;
   setMuted(callId: string, muted: boolean): void;
   updateDisplayCallInformation(callId: string, callerName: string): void;
 
   // added just new
-  reportIncomingCall(callId: string, callType: string, targetName: string, metadata?: string): void;
+  reportIncomingCall(
+    callId: string,
+    callType: string,
+    targetName: string,
+    metadata?: string
+  ): void;
 
   // Event emitter: addListener returns a remove function
   addListener(
@@ -46,10 +61,8 @@ export interface CallManager extends HybridObject<{ ios: 'swift'; android: 'kotl
     listener: (payload: string) => void
   ): () => void;
 
-
-  hasActiveCall() :boolean; // if there is an active call, no matter ringing, incoming, outgoing, whatever
+  hasActiveCall(): boolean; // if there is an active call, no matter ringing, incoming, outgoing, whatever
 }
 
-
 export const CallManagerHybridObject =
   NitroModules.createHybridObject<CallManager>('CallManager');