From 26f3ab6ac06527fcadcd533ae783fab15f55545b Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sun, 6 Jul 2025 15:02:33 +0300
Subject: [PATCH 1/3] Added Colorblind setting and registration status icons

---
 .../com/tutpro/baresip/BaresipService.kt      |  9 ++--
 .../main/kotlin/com/tutpro/baresip/Config.kt  |  7 +++
 .../com/tutpro/baresip/SettingsScreen.kt      | 44 +++++++++++++++++++
 .../kotlin/com/tutpro/baresip/UserAgent.kt    |  2 +-
 .../main/kotlin/com/tutpro/baresip/Utils.kt   | 21 +++++++++
 app/src/main/res/drawable/circle_green.xml    |  4 +-
 .../main/res/drawable/circle_green_blind.xml  | 10 +++++
 app/src/main/res/drawable/circle_red.xml      |  4 +-
 .../main/res/drawable/circle_red_blind.xml    | 10 +++++
 app/src/main/res/drawable/circle_white.xml    |  4 +-
 app/src/main/res/drawable/circle_yellow.xml   |  4 +-
 .../main/res/drawable/circle_yellow_blind.xml | 10 +++++
 app/src/main/res/values-fi/strings.xml        |  2 +
 app/src/main/res/values/strings.xml           |  2 +
 14 files changed, 120 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable/circle_green_blind.xml
 create mode 100644 app/src/main/res/drawable/circle_red_blind.xml
 create mode 100644 app/src/main/res/drawable/circle_yellow_blind.xml

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 36f768a9..1469ff29 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -676,7 +676,7 @@ class BaresipService: Service() {
             ua.status = if (ua.account.regint == 0)
                 R.drawable.circle_white
             else
-                R.drawable.circle_yellow
+                Utils.circleYellow()
             ua.add()
 
             val acc = ua.account
@@ -773,7 +773,7 @@ class BaresipService: Service() {
                 when (ev[0]) {
                     "registering", "unregistering" -> {
                         updateStatusNotification()
-                        ua.uaUpdateStatus(R.drawable.circle_yellow)
+                        ua.uaUpdateStatus(Utils.circleYellow())
                         if (isMainVisible)
                             registrationUpdate.postValue(System.currentTimeMillis())
                         return
@@ -783,7 +783,7 @@ class BaresipService: Service() {
                             if (Api.account_regint(ua.account.accp) == 0)
                                 R.drawable.circle_white
                             else
-                                R.drawable.circle_green)
+                                Utils.circleGreen())
                         updateStatusNotification()
                         if (isMainVisible)
                             registrationUpdate.postValue(System.currentTimeMillis())
@@ -793,7 +793,7 @@ class BaresipService: Service() {
                         ua.uaUpdateStatus(if (Api.account_regint(ua.account.accp) == 0)
                             R.drawable.circle_white
                         else
-                            R.drawable.circle_red)
+                            Utils.circleRed())
                         updateStatusNotification()
                         if (isMainVisible)
                             registrationUpdate.postValue(System.currentTimeMillis())
@@ -1725,6 +1725,7 @@ class BaresipService: Service() {
         var contactsMode = "baresip"
         var addressFamily = ""
         var dnsServers = listOf<InetAddress>()
+        var colorblind = false
         // <aor, password> of those accounts that have auth username without auth password
         val aorPasswords = mutableMapOf<String, String>()
         var audioFocusRequest: AudioFocusRequestCompat? = null
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
index 1874d8fa..8c9f3669 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
@@ -119,6 +119,13 @@ object Config {
             AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
         }
 
+        val colorblind = previousVariable("colorblind")
+        config = if (colorblind != "")
+            "${config}colorblind $colorblind\n"
+        else
+            "${config}colorblind no\n"
+        BaresipService.colorblind = colorblind == "yes"
+
         var contactsMode = previousVariable("contacts_mode").lowercase()
         if (contactsMode != "") {
             if (contactsMode != "baresip" &&
diff --git a/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
index 342f9bc8..75dd5edd 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
@@ -246,6 +246,8 @@ private var newBatteryOptimizations = false
 
 private var newDarkTheme = false
 
+private var newColorblind = false
+
 private var newDefaultDialer = false
 
 private var newDebug = false
@@ -312,6 +314,7 @@ private fun SettingsContent(
         Ringtone(ctx)
         BatteryOptimizations()
         DarkTheme()
+        ColorBlind()
         if (VERSION.SDK_INT >= 29)
             DefaultDialer()
         Debug()
@@ -1085,6 +1088,37 @@ private fun DarkTheme() {
         )
     }
 }
+@Composable
+private fun ColorBlind() {
+    Row(
+        Modifier
+            .fillMaxWidth()
+            .padding(end = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Start
+    ) {
+        val ctx = LocalContext.current
+        Text(text = stringResource(R.string.colorblind),
+            modifier = Modifier
+                .weight(1f)
+                .clickable {
+                    alertTitle.value = ctx.getString(R.string.colorblind)
+                    alertMessage.value = ctx.getString(R.string.colorblind_help)
+                    showAlert.value = true
+                },
+            color = LocalCustomColors.current.itemText,
+            fontSize = 18.sp)
+        var colorblind by remember { mutableStateOf(Config.variable("colorblind") == "yes") }
+        newColorblind = colorblind
+        Switch(
+            checked = colorblind,
+            onCheckedChange = {
+                colorblind = it
+                newColorblind = colorblind
+            }
+        )
+    }
+}
 
 @RequiresApi(29)
 @Composable
@@ -1369,6 +1403,16 @@ private fun checkOnClick(ctx: Context) {
         save = true
     }
 
+    if ((Config.variable("colorblind") == "yes") != newColorblind) {
+        Config.replaceVariable(
+            "colorblind",
+            if (newColorblind) "yes" else "no"
+        )
+        BaresipService.colorblind = newColorblind
+        save = true
+        restart = true
+    }
+
     if ((Config.variable("log_level") == "0") != newDebug) {
         val logLevelString = if (newDebug) "0" else "2"
         Config.replaceVariable("log_level", logLevelString)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt b/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
index abc7df4b..f998f81b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
@@ -46,7 +46,7 @@ class UserAgent(val uap: Long) {
     }
 
     fun reRegister() {
-        this.status = R.drawable.circle_yellow
+        this.status = Utils.circleYellow()
         if (this.account.regint == 0)
             Api.ua_unregister(this.uap)
         else
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
index ef922d05..a0150a35 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
@@ -996,6 +996,27 @@ object Utils {
 
     }
 
+    fun circleGreen(): Int {
+        return if (BaresipService.colorblind)
+            R.drawable.circle_green_blind
+        else
+            R.drawable.circle_green
+    }
+
+    fun circleYellow(): Int {
+        return if (BaresipService.colorblind)
+            R.drawable.circle_yellow_blind
+        else
+            R.drawable.circle_yellow
+    }
+
+    fun circleRed(): Int {
+        return if (BaresipService.colorblind)
+            R.drawable.circle_red_blind
+        else
+            R.drawable.circle_red
+    }
+
     /*fun listFilesInDirectory(directoryPath: String): List<File> {
         val directory = File(directoryPath)
         if (!directory.exists()) {
diff --git a/app/src/main/res/drawable/circle_green.xml b/app/src/main/res/drawable/circle_green.xml
index d47778d7..1b32aabb 100644
--- a/app/src/main/res/drawable/circle_green.xml
+++ b/app/src/main/res/drawable/circle_green.xml
@@ -1,6 +1,6 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector android:autoMirrored="true" android:height="28dp"
 android:viewportHeight="100" android:viewportWidth="100"
-android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
 <path android:fillColor="@color/colorTrafficGreen"
     android:pathData="M50,50m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
     android:strokeColor="#000000" android:strokeWidth="3"/>
diff --git a/app/src/main/res/drawable/circle_green_blind.xml b/app/src/main/res/drawable/circle_green_blind.xml
new file mode 100644
index 00000000..0ec8ac99
--- /dev/null
+++ b/app/src/main/res/drawable/circle_green_blind.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="@color/colorTrafficGreen">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M424,664L706,382L650,326L424,552L310,438L254,494L424,664ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/circle_red.xml b/app/src/main/res/drawable/circle_red.xml
index b060591a..39bbd7c5 100644
--- a/app/src/main/res/drawable/circle_red.xml
+++ b/app/src/main/res/drawable/circle_red.xml
@@ -1,6 +1,6 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector android:autoMirrored="true" android:height="28dp"
     android:viewportHeight="100" android:viewportWidth="100"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@color/colorTrafficRed"
         android:pathData="M50,50m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
         android:strokeColor="#000000" android:strokeWidth="3"/>
diff --git a/app/src/main/res/drawable/circle_red_blind.xml b/app/src/main/res/drawable/circle_red_blind.xml
new file mode 100644
index 00000000..6c10f465
--- /dev/null
+++ b/app/src/main/res/drawable/circle_red_blind.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="@color/colorTrafficRed">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680ZM440,520L520,520L520,280L440,280L440,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/circle_white.xml b/app/src/main/res/drawable/circle_white.xml
index 02e90016..0ec69239 100644
--- a/app/src/main/res/drawable/circle_white.xml
+++ b/app/src/main/res/drawable/circle_white.xml
@@ -1,6 +1,6 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector android:autoMirrored="true" android:height="28dp"
     android:viewportHeight="100" android:viewportWidth="100"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#ffffff"
         android:pathData="M50,50m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
         android:strokeColor="#000000" android:strokeWidth="3"/>
diff --git a/app/src/main/res/drawable/circle_yellow.xml b/app/src/main/res/drawable/circle_yellow.xml
index 2a83258a..8833e882 100644
--- a/app/src/main/res/drawable/circle_yellow.xml
+++ b/app/src/main/res/drawable/circle_yellow.xml
@@ -1,6 +1,6 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector android:autoMirrored="true" android:height="28dp"
     android:viewportHeight="100" android:viewportWidth="100"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@color/colorTrafficYellow"
         android:pathData="M50,50m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
         android:strokeColor="#000000" android:strokeWidth="3"/>
diff --git a/app/src/main/res/drawable/circle_yellow_blind.xml b/app/src/main/res/drawable/circle_yellow_blind.xml
new file mode 100644
index 00000000..fbd635f4
--- /dev/null
+++ b/app/src/main/res/drawable/circle_yellow_blind.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="@color/colorTrafficYellow">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M280,540Q305,540 322.5,522.5Q340,505 340,480Q340,455 322.5,437.5Q305,420 280,420Q255,420 237.5,437.5Q220,455 220,480Q220,505 237.5,522.5Q255,540 280,540ZM480,540Q505,540 522.5,522.5Q540,505 540,480Q540,455 522.5,437.5Q505,420 480,420Q455,420 437.5,437.5Q420,455 420,480Q420,505 437.5,522.5Q455,540 480,540ZM680,540Q705,540 722.5,522.5Q740,505 740,480Q740,455 722.5,437.5Q705,420 680,420Q655,420 637.5,437.5Q620,455 620,480Q620,505 637.5,522.5Q655,540 680,540ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index bbb8b426..0b7103b9 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -416,6 +416,8 @@
     <string name="tone_country_help">Soitto-, odotus- ja varattuäänien maa</string>
     <string name="dark_theme">Tumma teema</string>
     <string name="dark_theme_help">Käytä aina tummaa näyttöteemaa</string>
+    <string name="colorblind">Värisokea</string>
+    <string name="colorblind_help">Käytä värisokealle ystävällisiä rekisteröintitilaikoineita</string>
     <string name="video_size">Videon kehyskoko</string>
     <string name="video_size_help">Lähetettävän videon kehyskoko (leveys x korkeus)</string>
     <string name="video_fps">Videokehysten lähetystaajuus</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a7413857..c79060ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -387,6 +387,8 @@
     <string name="tone_country_help">Country of call ringing, waiting, and callee busy tones</string>
     <string name="dark_theme">Dark Theme</string>
     <string name="dark_theme_help">Force dark display theme</string>
+    <string name="colorblind">Colorblind</string>
+    <string name="colorblind_help">Use colorblind friendly registration status icons</string>
     <string name="video_size">Video Frame Size</string>
     <string name="video_size_help">Size of transmitted video frames (width x height)</string>
     <string name="video_fps">Video Frames Per Second</string>

From 926d2b672cc26f73a7e9fc795584d16cbb598b91 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sun, 6 Jul 2025 17:32:16 +0300
Subject: [PATCH 2/3] Avoid need to restart after Colorblind setting change

---
 .../com/tutpro/baresip/SettingsScreen.kt      |  5 ++++-
 .../kotlin/com/tutpro/baresip/UserAgent.kt    | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
index 75dd5edd..e180432d 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
@@ -1409,8 +1409,11 @@ private fun checkOnClick(ctx: Context) {
             if (newColorblind) "yes" else "no"
         )
         BaresipService.colorblind = newColorblind
+        UserAgent.updateColorblindStatus()
+        val baresipService = Intent(ctx, BaresipService::class.java)
+        baresipService.action = "Update Notification"
+        ctx.startService(baresipService)
         save = true
-        restart = true
     }
 
     if ((Config.variable("log_level") == "0") != newDebug) {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt b/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
index f998f81b..4fa82c66 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
@@ -105,6 +105,28 @@ class UserAgent(val uap: Long) {
             }
         }
 
+        fun updateColorblindStatus() {
+            val updatedUas = uas.value.toMutableList()
+            for (ua in updatedUas)
+                ua.status =
+                    if (BaresipService.colorblind)
+                        when (ua.status) {
+                            R.drawable.circle_green -> R.drawable.circle_green_blind
+                            R.drawable.circle_yellow -> R.drawable.circle_yellow_blind
+                            R.drawable.circle_red -> R.drawable.circle_red_blind
+                            else -> R.drawable.circle_white
+                        }
+                    else
+                        when (ua.status) {
+                            R.drawable.circle_green_blind -> R.drawable.circle_green
+                            R.drawable.circle_yellow_blind -> R.drawable.circle_yellow
+                            R.drawable.circle_red_blind -> R.drawable.circle_red
+                            else -> R.drawable.circle_white
+                        }
+            uas.value = updatedUas.toList()
+            uasStatus.value = statusMap()
+        }
+
         fun statusMap(): Map<String, Int> {
             val result = emptyMap<String, Int>().toMutableMap()
             for (ua in uas.value)

From b4ca26dba9b6660cfb89dd2f4d33d0e7b76c01c2 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Mon, 7 Jul 2025 11:35:27 +0300
Subject: [PATCH 3/3] Added shouldStartRinging check to incoming call

---
 .../com/tutpro/baresip/BaresipService.kt      | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 1469ff29..38ef8b79 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -873,19 +873,19 @@ class BaresipService: Service() {
                         Call(callp, ua, peerUri, "in", "incoming").add()
                         if (speakerPhone && !Utils.isSpeakerPhoneOn(am))
                             Utils.toggleSpeakerPhone(ContextCompat.getMainExecutor(this), am)
-                        if (ua.account.answerMode == Api.ANSWERMODE_MANUAL) {
-                            Log.d(TAG, "CurrentInterruptionFilter ${nm.currentInterruptionFilter}")
-                            if (nm.currentInterruptionFilter <= NotificationManager.INTERRUPTION_FILTER_ALL)
-                                startRinging()
-                        } else {
+                        if (ua.account.answerMode == Api.ANSWERMODE_AUTO) {
                             val newIntent = Intent(this, MainActivity::class.java)
-                            newIntent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP or
-                                    Intent.FLAG_ACTIVITY_NEW_TASK
+                            newIntent.flags =
+                                Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP or
+                                        Intent.FLAG_ACTIVITY_NEW_TASK
                             newIntent.putExtra("action", "call answer")
                             newIntent.putExtra("callp", callp)
                             startActivity(newIntent)
                             return
                         }
+                        val channelId = if (shouldVibrate()) MEDIUM_CHANNEL_ID else HIGH_CHANNEL_ID
+                        if (shouldStartRinging(channelId))
+                            startRinging()
                         if (!Utils.isVisible()) {
                             val piFlags = PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
                             val intent = Intent(applicationContext, MainActivity::class.java)
@@ -894,8 +894,7 @@ class BaresipService: Service() {
                             intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP or
                                         Intent.FLAG_ACTIVITY_NEW_TASK
                             val pi = PendingIntent.getActivity(applicationContext, CALL_REQ_CODE, intent, piFlags)
-                            val nb = NotificationCompat.Builder(this,
-                                if (shouldVibrate()) MEDIUM_CHANNEL_ID else HIGH_CHANNEL_ID)
+                            val nb = NotificationCompat.Builder(this, channelId)
                             val caller = Utils.friendlyUri(this, peerUri, ua.account)
                             val person = Person.Builder().setName(caller).build()
                             nb.setSmallIcon(R.drawable.ic_stat_call)
@@ -1293,6 +1292,7 @@ class BaresipService: Service() {
     private fun createNotificationChannels() {
         val lowChannel = NotificationChannel(LOW_CHANNEL_ID, "No sound or vibrate",
             NotificationManager.IMPORTANCE_LOW)
+        lowChannel.enableVibration(false)
         lowChannel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
         nm.createNotificationChannel(lowChannel)
 
@@ -1304,8 +1304,8 @@ class BaresipService: Service() {
 
         val mediumChannel = NotificationChannel(MEDIUM_CHANNEL_ID, "Sound",
             NotificationManager.IMPORTANCE_HIGH)
-        highChannel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-        highChannel.enableVibration(false)
+        mediumChannel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+        mediumChannel.enableVibration(false)
         nm.createNotificationChannel(mediumChannel)
     }
 
@@ -1397,21 +1397,29 @@ class BaresipService: Service() {
         }
     }
 
+
+    private fun shouldStartRinging(channelId: String): Boolean {
+        val currentFilter = nm.currentInterruptionFilter
+        val dndAllowsRinging = currentFilter == NotificationManager.INTERRUPTION_FILTER_ALL ||
+                currentFilter == NotificationManager.INTERRUPTION_FILTER_PRIORITY
+        if (dndAllowsRinging)
+            return true
+        val channel = nm.getNotificationChannel(channelId)
+        return channel != null && channel.canBypassDnd()
+    }
+
     private fun shouldVibrate(): Boolean {
-        return if (am.ringerMode != RINGER_MODE_SILENT) {
-            if (am.ringerMode == AudioManager.RINGER_MODE_VIBRATE) {
+        return if (am.ringerMode != RINGER_MODE_SILENT)
+            if (am.ringerMode == AudioManager.RINGER_MODE_VIBRATE)
                 true
-            } else {
-                if (am.getStreamVolume(AudioManager.STREAM_RING) != 0) {
+            else
+                if (am.getStreamVolume(AudioManager.STREAM_RING) != 0)
                     @Suppress("DEPRECATION")
-                    Settings.System.getInt(contentResolver, Settings.System.VIBRATE_WHEN_RINGING, 0) == 1
-                } else {
+                    Settings.System.getInt(contentResolver, Settings.System.VIBRATE_WHEN_RINGING, 0) != 0
+                else
                     false
-                }
-            }
-        } else {
+        else
             false
-        }
     }
 
     private fun stopRinging() {