Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added setting to control ringing during early media behavior

Browse source
This commit is contained in:
Sylvain Berfini 2021-04-14 11:09:50 +02:00
parent 6bd231098a
commit a63b057101
4 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/linphone/activities/main/settings/viewmodels/CallSettingsViewModel.kt
View file

@ -139,6 +139,13 @@ class CallSettingsViewModel : GenericSettingsViewModel() {
} }
val acceptEarlyMedia = MutableLiveData<Boolean>() val acceptEarlyMedia = MutableLiveData<Boolean>()
val ringDuringEarlyMediaListener = object : SettingListenerStub() {
override fun onBoolValueChanged(newValue: Boolean) {
core.ringDuringIncomingEarlyMedia = newValue
}
}
val ringDuringEarlyMedia = MutableLiveData<Boolean>()
val goToAndroidNotificationSettingsListener = object : SettingListenerStub() { val goToAndroidNotificationSettingsListener = object : SettingListenerStub() {
override fun onClicked() { override fun onClicked() {
goToAndroidNotificationSettingsEvent.value = Event(true) goToAndroidNotificationSettingsEvent.value = Event(true)
@ -163,6 +170,7 @@ class CallSettingsViewModel : GenericSettingsViewModel() {
incomingTimeout.value = core.incTimeout incomingTimeout.value = core.incTimeout
voiceMailUri.value = prefs.voiceMailUri voiceMailUri.value = prefs.voiceMailUri
acceptEarlyMedia.value = prefs.acceptEarlyMedia acceptEarlyMedia.value = prefs.acceptEarlyMedia
ringDuringEarlyMedia.value = core.ringDuringIncomingEarlyMedia
} }
private fun initEncryptionList() { private fun initEncryptionList() {

8
app/src/main/res/layout/settings_call_fragment.xml
View file

@ -170,6 +170,14 @@
linphone:listener="@{viewModel.acceptEarlyMediaListener}" linphone:listener="@{viewModel.acceptEarlyMediaListener}"
linphone:checked="@={viewModel.acceptEarlyMedia}"/> 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 <include
layout="@layout/settings_widget_basic" layout="@layout/settings_widget_basic"
linphone:listener="@{viewModel.goToAndroidNotificationSettingsListener}" linphone:listener="@{viewModel.goToAndroidNotificationSettingsListener}"

2
app/src/main/res/values-fr/strings.xml
View file

@ -573,4 +573,6 @@
<string name="advanced_settings_vfs_summary">Attention, ne pourra pas être désactivé !</string> <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_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="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> </resources>

2
app/src/main/res/values/strings.xml
View file

@ -408,6 +408,8 @@
<string name="call_settings_voice_mail_uri_title">Voice mail URI</string> <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_title">Accept early media</string>
<string name="call_settings_accept_early_media_summary"></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_voice_mail_uri_summary"></string>
<string name="call_settings_go_to_android_notification_settings">Android notification settings</string> <string name="call_settings_go_to_android_notification_settings">Android notification settings</string>