From e4551713dcfa312cffd96b9dc05179725dafbf2f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 11 Sep 2023 14:20:01 +0200
Subject: [PATCH] Fixed issue with call notifications & channels

---
 .../notifications/NotificationsManager.kt     | 34 ++++++++++++++-----
 app/src/main/res/values/strings.xml           |  4 ++-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 7960ea85f..989fcb8e2 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -106,6 +106,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
     init {
         createServiceChannel()
         createIncomingCallNotificationChannel()
+        createActiveCallNotificationChannel()
 
         for (notification in notificationManager.activeNotifications) {
             if (notification.tag.isNullOrEmpty()) {
@@ -181,11 +182,11 @@ class NotificationsManager @MainThread constructor(private val context: Context)
 
     @WorkerThread
     private fun startCallForeground() {
-        val channelId = context.getString(R.string.notification_channel_service_id)
+        val channelId = context.getString(R.string.notification_channel_call_id)
         val channel = notificationManager.getNotificationChannel(channelId)
         val importance = channel?.importance ?: NotificationManagerCompat.IMPORTANCE_NONE
         if (importance == NotificationManagerCompat.IMPORTANCE_NONE) {
-            Log.e("$TAG Service channel has been disabled, can't start foreground service!")
+            Log.e("$TAG Calls channel has been disabled, can't start foreground service!")
             return
         }
 
@@ -328,10 +329,13 @@ class NotificationsManager @MainThread constructor(private val context: Context)
             )
         }
 
-        val channel = if (isIncoming) {
-            context.getString(R.string.notification_channel_incoming_call_id)
-        } else {
-            context.getString(R.string.notification_channel_service_id)
+        val channel = when (call.state) {
+            Call.State.IncomingReceived, Call.State.IncomingEarlyMedia -> {
+                context.getString(R.string.notification_channel_incoming_call_id)
+            }
+            else -> {
+                context.getString(R.string.notification_channel_call_id)
+            }
         }
 
         val builder = NotificationCompat.Builder(
@@ -349,7 +353,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
                 setStyle(style)
             } catch (iae: IllegalArgumentException) {
                 Log.e(
-                    "[Api31 Compatibility] Can't use notification call style: $iae, using API 26 notification instead"
+                    "$TAG Can't use notification call style: $iae, using API 26 notification instead"
                 )
             }
             setSmallIcon(smallIcon)
@@ -432,13 +436,27 @@ class NotificationsManager @MainThread constructor(private val context: Context)
         val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH)
         channel.description = name
         channel.lightColor = context.getColor(R.color.primary_color)
-        channel.lockscreenVisibility
+        channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
         channel.enableVibration(true)
         channel.enableLights(true)
         channel.setShowBadge(false)
         notificationManager.createNotificationChannel(channel)
     }
 
+    @MainThread
+    private fun createActiveCallNotificationChannel() {
+        val id = context.getString(R.string.notification_channel_call_id)
+        val name = context.getString(R.string.notification_channel_call_name)
+
+        val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_DEFAULT)
+        channel.description = name
+        channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+        channel.enableVibration(false)
+        channel.enableLights(false)
+        channel.setShowBadge(false)
+        notificationManager.createNotificationChannel(channel)
+    }
+
     @MainThread
     private fun createServiceChannel() {
         val id = context.getString(R.string.notification_channel_service_id)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b6457779..5ee438b55 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,7 +10,8 @@
     <string name="vertical_separator" translatable="false">|</string>
     <string name="assistant_web_platform_link" translatable="false">subscribe.linphone.org</string>
     <string name="assistant_linphone_contact_us_link" translatable="false">linphone.org/contact</string>
-    <string name="notification_channel_incoming_call_id" translatable="false">linphone_notification_call_id</string>
+    <string name="notification_channel_call_id" translatable="false">linphone_notification_call_id</string>
+    <string name="notification_channel_incoming_call_id" translatable="false">linphone_notification_incoming_call_id</string>
     <string name="notification_channel_service_id" translatable="false">linphone_notification_service_id</string>
 
     <string name="sip_address">SIP address</string>
@@ -23,6 +24,7 @@
     <string name="or">or</string>
     <string name="next">next</string>
 
+    <string name="notification_channel_call_name">&appName; active calls notifications</string>
     <string name="notification_channel_incoming_call_name">&appName; incoming calls notifications</string>
     <string name="notification_channel_service_name">&appName; service notification</string>