From a63b057101770786cf4fe9a1f6f6e98a78a80f38 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 14 Apr 2021 11:09:50 +0200
Subject: [PATCH] Added setting to control ringing during early media behavior

---
 .../main/settings/viewmodels/CallSettingsViewModel.kt     | 8 ++++++++
 app/src/main/res/layout/settings_call_fragment.xml        | 8 ++++++++
 app/src/main/res/values-fr/strings.xml                    | 2 ++
 app/src/main/res/values/strings.xml                       | 2 ++
 4 files changed, 20 insertions(+)

diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/CallSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/CallSettingsViewModel.kt
index c322f4f01..254aa4901 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/CallSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/CallSettingsViewModel.kt
@@ -139,6 +139,13 @@ class CallSettingsViewModel : GenericSettingsViewModel() {
     }
     val acceptEarlyMedia = MutableLiveData<Boolean>()
 
+    val ringDuringEarlyMediaListener = object : SettingListenerStub() {
+        override fun onBoolValueChanged(newValue: Boolean) {
+            core.ringDuringIncomingEarlyMedia = newValue
+        }
+    }
+    val ringDuringEarlyMedia = MutableLiveData<Boolean>()
+
     val goToAndroidNotificationSettingsListener = object : SettingListenerStub() {
         override fun onClicked() {
             goToAndroidNotificationSettingsEvent.value = Event(true)
@@ -163,6 +170,7 @@ class CallSettingsViewModel : GenericSettingsViewModel() {
         incomingTimeout.value = core.incTimeout
         voiceMailUri.value = prefs.voiceMailUri
         acceptEarlyMedia.value = prefs.acceptEarlyMedia
+        ringDuringEarlyMedia.value = core.ringDuringIncomingEarlyMedia
     }
 
     private fun initEncryptionList() {
diff --git a/app/src/main/res/layout/settings_call_fragment.xml b/app/src/main/res/layout/settings_call_fragment.xml
index 2b3c9a706..165b60971 100644
--- a/app/src/main/res/layout/settings_call_fragment.xml
+++ b/app/src/main/res/layout/settings_call_fragment.xml
@@ -170,6 +170,14 @@
                     linphone:listener="@{viewModel.acceptEarlyMediaListener}"
                     linphone:checked="@={viewModel.acceptEarlyMedia}"/>
 
+                <include
+                    layout="@layout/settings_widget_switch"
+                    linphone:title="@{@string/call_settings_ring_during_early_media_title}"
+                    linphone:subtitle="@{@string/call_settings_ring_during_early_media_summary}"
+                    linphone:listener="@{viewModel.ringDuringEarlyMediaListener}"
+                    linphone:checked="@={viewModel.ringDuringEarlyMedia}"
+                    linphone:enabled="@{viewModel.acceptEarlyMedia}"/>
+
                 <include
                     layout="@layout/settings_widget_basic"
                     linphone:listener="@{viewModel.goToAndroidNotificationSettingsListener}"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 29b946525..50746e220 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -573,4 +573,6 @@
     <string name="advanced_settings_vfs_summary">Attention, ne pourra pas être désactivé !</string>
     <string name="chat_settings_use_in_app_file_viewer_title">Ouvrir les fichiers dans l\'application</string>
     <string name="chat_settings_use_in_app_file_viewer_summary">Vous pourrez toujours les exporter dans une appli tierce</string>
+    <string name="call_settings_ring_during_early_media_title">Sonner durant un appel entrant avec early-media</string>
+    <string name="call_settings_ring_during_early_media_summary"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8196f3fd9..6dbd22dc7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -408,6 +408,8 @@
     <string name="call_settings_voice_mail_uri_title">Voice mail URI</string>
     <string name="call_settings_accept_early_media_title">Accept early media</string>
     <string name="call_settings_accept_early_media_summary"></string>
+    <string name="call_settings_ring_during_early_media_title">Ring during incoming early media</string>
+    <string name="call_settings_ring_during_early_media_summary"></string>
     <string name="call_settings_voice_mail_uri_summary"></string>
     <string name="call_settings_go_to_android_notification_settings">Android notification settings</string>