@qusaieilouti99/call-manager 0.1.102 → 0.1.103

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

@@ -43,8 +43,8 @@ import android.database.ContentObserver
 import android.os.Vibrator
 import android.os.VibrationEffect
 import android.provider.Settings
-import android.content.ContentResolver
-import android.database.ContentObserver
+
+
 
 /**
  * Core call‐management engine.  Manages self-managed telecom calls,
@@ -89,8 +89,8 @@ object CallEngine {
   private var ringtone: android.media.Ringtone? = null
   private var ringbackPlayer: MediaPlayer? = null
   // Vibration + volume‐key observer
-  private var vibrator: android.os.Vibrator? = null
-  private var volumeObserver: android.database.ContentObserver? = null
+  private var vibrator: Vibrator? = null
+  private var volumeObserver: ContentObserver? = null
   private var audioManager: AudioManager? = null
   private var wakeLock: PowerManager.WakeLock? = null
 
@@ -1214,10 +1214,11 @@ object CallEngine {
   private fun playRingtone() {
     val context = requireContext()
 
-    // 1) Start repeating vibration
-    vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
+    // 1) start repeating vibration
+    vibrator = context.getSystemService(Context.VIBRATOR_SERVICE)
+                 as? Vibrator
     vibrator?.let { v ->
-      val pattern = longArrayOf(0L, 500L, 500L) // wait, vibrate, pause
+      val pattern = longArrayOf(0L, 500L, 500L)
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
         v.vibrate(VibrationEffect.createWaveform(pattern, 0))
       } else {
@@ -1226,7 +1227,7 @@ object CallEngine {
       }
     }
 
-    // 2) Play the ringtone
+    // 2) play the ringtone
     try {
       val uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
       ringtone = RingtoneManager.getRingtone(context, uri)
@@ -1235,22 +1236,19 @@ object CallEngine {
       Log.e(TAG, "Failed to play ringtone", e)
     }
 
-    // 3) Observe any change to the ring‐volume setting
+    // 3) observe ANY system‐settings change (will include volume changes)
     if (volumeObserver == null) {
       val resolver: ContentResolver = context.contentResolver
       volumeObserver = object : ContentObserver(Handler(Looper.getMainLooper())) {
         override fun onChange(selfChange: Boolean, uri: Uri?) {
           super.onChange(selfChange, uri)
-          // If the ring volume changed, silence both ringtone+vibration
-          if (uri == Settings.System.getUriFor(Settings.System.VOLUME_RING)) {
-            Log.d(TAG, "Ring volume changed → silencing ringtone/vibration")
-            stopRingtone()
-          }
+          Log.d(TAG, "Settings change observed → silencing ringtone/vibration")
+          stopRingtone()
         }
       }
       resolver.registerContentObserver(
-        Settings.System.getUriFor(Settings.System.VOLUME_RING),
-        false,
+        Settings.System.CONTENT_URI,
+        true,                  // listen to descendants too
         volumeObserver!!
       )
     }
@@ -1265,11 +1263,11 @@ object CallEngine {
     }
     ringtone = null
 
-    // 1) Cancel vibration
+    // cancel vibration
     vibrator?.cancel()
     vibrator = null
 
-    // 2) Unregister volume observer
+    // unregister our observer
     volumeObserver?.let {
       requireContext().contentResolver.unregisterContentObserver(it)
       volumeObserver = null

package/package.json

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