@qusaieilouti99/call-manager 0.1.111 → 0.1.113

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

@@ -28,7 +28,6 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import java.net.HttpURLConnection
 import java.net.URL
-import android.view.KeyEvent
 
 class CallActivity : Activity(), CallEngine.CallEndListener {
 
@@ -49,17 +48,6 @@ class CallActivity : Activity(), CallEngine.CallEndListener {
     finishCallActivity()
   }
 
-  override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
-    if (keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
-        keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
-        keyCode == KeyEvent.KEYCODE_VOLUME_MUTE) {
-      // silence the ring immediately
-      CallEngine.stopRingtone()
-      return true
-    }
-    return super.onKeyDown(keyCode, event)
-  }
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     val isSamsungBypass = intent.getBooleanExtra(

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

@@ -42,6 +42,8 @@ import android.os.Vibrator
 import android.os.VibrationEffect
 import android.content.BroadcastReceiver
 import android.content.IntentFilter
+import android.database.ContentObserver
+import android.provider.Settings
 
 /**
  * Core call‐management engine.  Manages self-managed telecom calls,
@@ -53,6 +55,11 @@ object CallEngine {
   private const val NOTIF_CHANNEL_ID = "incoming_call_channel"
   private const val NOTIF_ID = 2001
 
+  // Audio routing timing constants
+  private const val AUDIO_ROUTE_DELAY_AFTER_ANSWER = 500L
+  private const val AUDIO_ROUTE_RETRY_DELAY = 200L
+  private const val MAX_AUDIO_ROUTE_RETRIES = 3
+
   // --- NEW: Call-end listener API ---
   /**
    * Implement this in your UI (CallActivity).  Will be called
@@ -82,17 +89,24 @@ object CallEngine {
   private val isInitialized = AtomicBoolean(false)
   private val initializationLock = Any()
 
-  // Simplified Audio & Media Management (NO MANUAL AUDIO FOCUS)
+  // Audio & Media Management
   private var ringtone: android.media.Ringtone? = null
   private var ringbackPlayer: MediaPlayer? = null
 
-  // Vibration + volume‐change receiver
+  // Volume monitoring
   private var vibrator: Vibrator? = null
-  private var volumeReceiver: BroadcastReceiver? = null
+  private var volumeContentObserver: ContentObserver? = null
+  private var lastRingVolumeLevel = -1
+  private var isMonitoringVolume = false
 
   private var audioManager: AudioManager? = null
   private var wakeLock: PowerManager.WakeLock? = null
 
+  // Audio routing state
+  private var pendingAudioRoute: String? = null
+  private var audioRouteRetryCount = 0
+  private val audioRouteHandler = Handler(Looper.getMainLooper())
+
   // Call State Management
   private val activeCalls = ConcurrentHashMap<String, CallInfo>()
   private val telecomConnections = ConcurrentHashMap<String, Connection>()
@@ -122,6 +136,7 @@ object CallEngine {
       if (isInitialized.compareAndSet(false, true)) {
         appContext = context.applicationContext
         audioManager = appContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
+        setupVolumeMonitoring()
         Log.d(TAG, "CallEngine initialized successfully")
 
         if (isCallActive()) {
@@ -139,6 +154,64 @@ object CallEngine {
     )
   }
 
+  // --- VOLUME MONITORING FOR RINGTONE SILENCING ---
+  private fun setupVolumeMonitoring() {
+    val context = requireContext()
+    audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+
+    // Get initial ring volume
+    lastRingVolumeLevel = audioManager?.getStreamVolume(AudioManager.STREAM_RING) ?: 0
+
+    // Create content observer for ring volume changes
+    volumeContentObserver = object : ContentObserver(mainHandler) {
+      override fun onChange(selfChange: Boolean) {
+        handleVolumeChange()
+      }
+    }
+  }
+
+  private fun startVolumeMonitoring() {
+    if (!isMonitoringVolume) {
+      isMonitoringVolume = true
+      val context = requireContext()
+
+      // Monitor ring volume changes
+      context.contentResolver.registerContentObserver(
+        Settings.System.getUriFor(Settings.System.VOLUME_RING),
+        false,
+        volumeContentObserver!!
+      )
+
+      Log.d(TAG, "Started volume monitoring for ringtone silencing")
+    }
+  }
+
+  private fun stopVolumeMonitoring() {
+    if (isMonitoringVolume) {
+      isMonitoringVolume = false
+      val context = requireContext()
+      volumeContentObserver?.let {
+        context.contentResolver.unregisterContentObserver(it)
+      }
+      Log.d(TAG, "Stopped volume monitoring")
+    }
+  }
+
+  private fun handleVolumeChange() {
+    if (!isMonitoringVolume) return
+
+    val currentRingVolume = audioManager?.getStreamVolume(AudioManager.STREAM_RING) ?: 0
+
+    // Check if ring volume changed
+    if (currentRingVolume != lastRingVolumeLevel) {
+      Log.d(TAG, "Ring volume changed from $lastRingVolumeLevel to $currentRingVolume - silencing ringtone")
+      lastRingVolumeLevel = currentRingVolume
+
+      // Stop ringtone when volume is changed
+      stopRingtone()
+    }
+  }
+
   // --- Event System ---
   fun setEventHandler(handler: ((CallEventType, String) -> Unit)?) {
     Log.d(TAG, "setEventHandler called. Handler present: ${handler != null}")
@@ -393,7 +466,12 @@ object CallEngine {
     bringAppToForeground()
     startForegroundService()
     keepScreenAwake(true)
-    setInitialAudioRoute(callType)
+
+    // Delay initial audio route to avoid conflicts
+    mainHandler.postDelayed({
+      setInitialAudioRoute(callType)
+    }, AUDIO_ROUTE_DELAY_AFTER_ANSWER)
+
     updateLockScreenBypass()
 
     emitOutgoingCallAnsweredWithMetadata(callId)
@@ -418,10 +496,9 @@ object CallEngine {
       return
     }
 
-
     activeCalls[callId] = callInfo.copy(state = CallState.ACTIVE)
     currentCallId = callId
-    Log.d(TAG, "Call $callId set to ACTIVE state (system manages audio focus)")
+    Log.d(TAG, "Call $callId set to ACTIVE state")
 
     stopRingtone()
     stopRingback()
@@ -440,10 +517,10 @@ object CallEngine {
     keepScreenAwake(true)
     updateLockScreenBypass()
 
-    // before you do anything else:
-    setAudioMode()
-    // then pick your route:
-    setInitialAudioRoute(callType)
+    // FIXED: Delay audio routing to avoid conflicts with system
+    mainHandler.postDelayed({
+      setInitialAudioRoute(callInfo.callType)
+    }, AUDIO_ROUTE_DELAY_AFTER_ANSWER)
 
     if (isLocalAnswer) {
       emitCallAnsweredWithMetadata(callId)
@@ -730,42 +807,59 @@ object CallEngine {
     return AudioRoutesInfo(devices.toTypedArray(), current)
   }
 
+  // FIXED: Improved audio route handling with retries and proper timing
   fun setAudioRoute(route: String) {
-    // ensure we have a non‐null AudioManager
+    Log.d(TAG, "setAudioRoute called: $route")
+
+    // Clear any pending route changes
+    audioRouteHandler.removeCallbacksAndMessages(null)
+    audioRouteRetryCount = 0
+
+    // Store the pending route for retry logic
+    pendingAudioRoute = route
+
+    // Execute immediately, then set up retry mechanism
+    performAudioRouteChange(route)
+  }
+
+  private fun performAudioRouteChange(route: String) {
     val ctx = requireContext()
     if (audioManager == null) {
       audioManager = ctx.getSystemService(Context.AUDIO_SERVICE) as AudioManager
     }
     val am = audioManager!!
 
+    // Ensure proper audio mode first
+    if (am.mode != AudioManager.MODE_IN_COMMUNICATION) {
+      setAudioMode()
+    }
+
+    Log.d(TAG, "Performing audio route change to: $route")
+
     when (route) {
       "Speaker" -> {
-        // if Bluetooth SCO is active, turn it off
+        // Disable Bluetooth SCO first if active
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && am.isBluetoothScoOn) {
           am.stopBluetoothSco()
           am.isBluetoothScoOn = false
         }
-        // route to speaker
         am.isSpeakerphoneOn = true
         Log.d(TAG, "Audio routed to SPEAKER")
       }
 
       "Earpiece" -> {
-        // disable SCO if active
+        // Disable Bluetooth SCO if active
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && am.isBluetoothScoOn) {
           am.stopBluetoothSco()
           am.isBluetoothScoOn = false
         }
-        // route to earpiece
         am.isSpeakerphoneOn = false
         Log.d(TAG, "Audio routed to EARPIECE")
       }
 
       "Bluetooth" -> {
-        // disable speaker
         am.isSpeakerphoneOn = false
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-          // start SCO for Bluetooth
           am.startBluetoothSco()
           am.isBluetoothScoOn = true
           Log.d(TAG, "Audio routed to BLUETOOTH (SCO started)")
@@ -775,7 +869,6 @@ object CallEngine {
       }
 
       "Headset" -> {
-        // wired headset is automatic when plugged in, just turn off speaker/SCO
         am.isSpeakerphoneOn = false
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && am.isBluetoothScoOn) {
           am.stopBluetoothSco()
@@ -786,13 +879,41 @@ object CallEngine {
 
       else -> {
         Log.w(TAG, "Unknown audio route: $route")
+        return
       }
     }
 
-    // broadcast route‐change event
+    // Verify the route was applied and retry if necessary
+    audioRouteHandler.postDelayed({
+      verifyAudioRoute(route)
+    }, AUDIO_ROUTE_RETRY_DELAY)
+
     emitAudioRouteChanged()
   }
 
+  private fun verifyAudioRoute(expectedRoute: String) {
+    val currentRoute = getCurrentAudioRoute()
+
+    if (currentRoute != expectedRoute && audioRouteRetryCount < MAX_AUDIO_ROUTE_RETRIES) {
+      audioRouteRetryCount++
+      Log.d(TAG, "Audio route verification failed. Expected: $expectedRoute, Current: $currentRoute. Retry: $audioRouteRetryCount")
+
+      // Retry the audio route change
+      audioRouteHandler.postDelayed({
+        performAudioRouteChange(expectedRoute)
+      }, AUDIO_ROUTE_RETRY_DELAY)
+    } else {
+      if (currentRoute == expectedRoute) {
+        Log.d(TAG, "Audio route successfully verified: $currentRoute")
+      } else {
+        Log.w(TAG, "Audio route change failed after $MAX_AUDIO_ROUTE_RETRIES retries. Expected: $expectedRoute, Current: $currentRoute")
+      }
+      // Clear pending route
+      pendingAudioRoute = null
+      audioRouteRetryCount = 0
+    }
+  }
+
   private fun getCurrentAudioRoute(): String {
     return when {
       audioManager?.isBluetoothScoOn == true -> "Bluetooth"
@@ -921,7 +1042,6 @@ object CallEngine {
   }
 
   // --- Notification Management ---
-  // **SAMSUNG FIX**: Enhanced notification channel creation
   private fun createNotificationChannel() {
     val context = requireContext()
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -935,7 +1055,6 @@ object CallEngine {
       channel.lightColor = Color.GREEN
       channel.enableVibration(true)
 
-      // **SAMSUNG FIX**: Set bypass DND and lock screen visibility
       channel.setBypassDnd(true)
       channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
 
@@ -961,7 +1080,6 @@ object CallEngine {
     val context = requireContext()
     Log.d(TAG, "Showing incoming call UI for $callId")
 
-    // **SIMPLE LOGIC**: If locked -> overlay, if unlocked -> notification
     if (isDeviceLocked(context)) {
       Log.d(TAG, "Device is locked - using overlay approach")
       showCallActivityOverlay(context, callId, callerName, callType, callerPicUrl)
@@ -973,9 +1091,6 @@ object CallEngine {
     playRingtone()
   }
 
-  /**
-   * Simple check if device is locked
-   */
   private fun isDeviceLocked(context: Context): Boolean {
     val keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
     val isLocked = keyguardManager.isKeyguardLocked
@@ -983,9 +1098,6 @@ object CallEngine {
     return isLocked
   }
 
-  /**
-   * Shows the call activity directly as overlay (when device is locked)
-   */
   private fun showCallActivityOverlay(context: Context, callId: String, callerName: String, callType: String, callerPicUrl: String?) {
     val overlayIntent = Intent(context, CallActivity::class.java).apply {
       addFlags(
@@ -1001,11 +1113,10 @@ object CallEngine {
         putExtra("callerAvatar", callerPicUrl)
       }
 
-      putExtra("LOCK_SCREEN_MODE", true) // Flag to identify lock screen mode
+      putExtra("LOCK_SCREEN_MODE", true)
     }
 
     try {
-      // Wake the screen when device is locked
       val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
       val wakeLock = powerManager.newWakeLock(
         PowerManager.SCREEN_BRIGHT_WAKE_LOCK or PowerManager.ACQUIRE_CAUSES_WAKEUP,
@@ -1013,22 +1124,15 @@ object CallEngine {
       )
       wakeLock.acquire(5000)
 
-      // Launch the activity overlay
       context.startActivity(overlayIntent)
       Log.d(TAG, "Successfully launched CallActivity overlay for locked device")
 
-      // **NO NOTIFICATION** when using overlay
-
     } catch (e: Exception) {
       Log.e(TAG, "Overlay failed, falling back to notification: ${e.message}")
-      // If overlay fails, fall back to notification
       showStandardNotification(context, callId, callerName, callType, callerPicUrl)
     }
   }
 
-  /**
-   * Shows standard notification with full-screen intent (when device is unlocked)
-   */
   private fun showStandardNotification(context: Context, callId: String, callerName: String, callType: String, callerPicUrl: String?) {
     createNotificationChannel()
     val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -1041,7 +1145,6 @@ object CallEngine {
       if (callerPicUrl != null) {
         putExtra("callerAvatar", callerPicUrl)
       }
-      // No lock screen flag - standard notification mode
     }
 
     val fullScreenPendingIntent = PendingIntent.getActivity(
@@ -1240,17 +1343,23 @@ object CallEngine {
   }
 
   // --- Media Management ---
+  // FIXED: Improved ringtone management with proper volume monitoring
   private fun playRingtone() {
     val context = requireContext()
 
     audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-    // 0) ensure the ring plays out loud on the speaker
+
+    // Set up proper audio mode for ringtone
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
       audioManager?.mode = AudioManager.MODE_RINGTONE
     }
     audioManager?.isSpeakerphoneOn = true
 
-    // 1) start repeating vibration
+    // Start volume monitoring for silencing
+    startVolumeMonitoring()
+    lastRingVolumeLevel = audioManager?.getStreamVolume(AudioManager.STREAM_RING) ?: 0
+
+    // Start repeating vibration
     vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
     vibrator?.let { v ->
       val pattern = longArrayOf(0L, 500L, 500L)
@@ -1262,33 +1371,15 @@ object CallEngine {
       }
     }
 
-    // 2) play the ringtone
+    // Play the ringtone
     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)
     }
-
-    // 3) register a receiver to catch volume‐key presses on the RING stream
-    if (volumeReceiver == null) {
-      val filter = IntentFilter("android.media.VOLUME_CHANGED_ACTION")
-      volumeReceiver = object : BroadcastReceiver() {
-        override fun onReceive(ctx: Context, intent: Intent) {
-          if (intent.action == "android.media.VOLUME_CHANGED_ACTION") {
-            val streamType = intent.getIntExtra(
-              "android.media.EXTRA_VOLUME_STREAM_TYPE", -1
-            )
-            if (streamType == AudioManager.STREAM_RING) {
-              Log.d(TAG, "Volume key pressed on RING → silencing ringtone/vibrate")
-              stopRingtone()
-            }
-          }
-        }
-      }
-      context.registerReceiver(volumeReceiver, filter)
-    }
   }
 
   fun stopRingtone() {
@@ -1300,15 +1391,12 @@ object CallEngine {
     }
     ringtone = null
 
-    // cancel vibration
+    // Cancel vibration
     vibrator?.cancel()
     vibrator = null
 
-    // unregister our volume‐change receiver
-    volumeReceiver?.let {
-      requireContext().unregisterReceiver(it)
-      volumeReceiver = null
-    }
+    // Stop volume monitoring
+    stopVolumeMonitoring()
   }
 
   private fun startRingback() {
@@ -1345,6 +1433,10 @@ object CallEngine {
     stopForegroundService()
     keepScreenAwake(false)
     resetAudioMode()
+    stopVolumeMonitoring()
+    audioRouteHandler.removeCallbacksAndMessages(null)
+    pendingAudioRoute = null
+    audioRouteRetryCount = 0
   }
 
   // --- Lifecycle Management ---

package/package.json

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