From 0dc790e4c12db8b3c9d8d0772a4c9d742e343851 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Mon, 19 May 2025 11:51:58 +0300
Subject: [PATCH] Apply volume keys to ringtone volume when call is coming in
 and to in-call volume during call

---
 app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt | 2 ++
 app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 132d9f53..01bf3797 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -518,6 +518,7 @@ class BaresipService: Service() {
                 val vidMode = intent.getIntExtra("video", Api.VIDMODE_OFF)
                 stopRinging()
                 stopMediaPlayer()
+                am.mode = MODE_IN_COMMUNICATION
                 setCallVolume()
                 proximitySensing(true)
                 Api.ua_answer(uap, callp, vidMode)
@@ -1304,6 +1305,7 @@ class BaresipService: Service() {
     }
 
     private fun startRinging() {
+        am.mode = AudioManager.MODE_RINGTONE
         rt!!.isLooping = true
         rt!!.play()
         if (shouldVibrate()) {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 56e1c25a..c33df5b9 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -2333,7 +2333,7 @@ class MainActivity : ComponentActivity() {
         val stream = if (am.mode == AudioManager.MODE_RINGTONE)
             AudioManager.STREAM_RING
         else
-            AudioManager.STREAM_MUSIC
+            AudioManager.STREAM_VOICE_CALL
         when (keyCode) {
             KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_UP -> {
                 am.adjustStreamVolume(stream,