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

Added setting to disable automatic redirect of declined incoming calls to voicemail

Browse source
This commit is contained in:
Sylvain Berfini 2021-05-17 10:33:59 +02:00
parent 86eb0694a8
commit 4dfaf7eb09
4 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,11 +134,19 @@ class CallSettingsViewModel : GenericSettingsViewModel() {
val voiceMailUriListener = object : SettingListenerStub() {
override fun onTextValueChanged(newValue: String) {
voiceMailUri.value = newValue
prefs.voiceMailUri = newValue
}
}
val voiceMailUri = MutableLiveData<String>()
val redirectToVoiceMailIncomingDeclinedCallsListener = object : SettingListenerStub() {
override fun onBoolValueChanged(newValue: Boolean) {
prefs.redirectDeclinedCallToVoiceMail = newValue
}
}
val redirectToVoiceMailIncomingDeclinedCalls = MutableLiveData<Boolean>()
val acceptEarlyMediaListener = object : SettingListenerStub() {
override fun onBoolValueChanged(newValue: Boolean) {
prefs.acceptEarlyMedia = newValue
@ -177,6 +185,7 @@ class CallSettingsViewModel : GenericSettingsViewModel() {
autoAnswerDelay.value = prefs.autoAnswerDelay
incomingTimeout.value = core.incTimeout
voiceMailUri.value = prefs.voiceMailUri
redirectToVoiceMailIncomingDeclinedCalls.value = prefs.redirectDeclinedCallToVoiceMail
acceptEarlyMedia.value = prefs.acceptEarlyMedia
ringDuringEarlyMedia.value = core.ringDuringIncomingEarlyMedia
}

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

@ -171,6 +171,14 @@
linphone:defaultValue="@{viewModel.voiceMailUri}"
linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_URI}"/>
<include
layout="@layout/settings_widget_switch"
linphone:title="@{@string/call_settings_redirect_to_voice_mail_declined_calls_title}"
linphone:subtitle="@{@string/call_settings_redirect_to_voice_mail_declined_calls_summary}"
linphone:listener="@{viewModel.redirectToVoiceMailIncomingDeclinedCallsListener}"
linphone:checked="@={viewModel.redirectToVoiceMailIncomingDeclinedCalls}"
linphone:enabled="@{viewModel.voiceMailUri.length() > 0}"/>
<include
layout="@layout/settings_widget_switch"
linphone:title="@{@string/call_settings_accept_early_media_title}"

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

@ -597,4 +597,5 @@
<string name="settings_primary_account_username_summary"></string>
<string name="logs_upload_failure">Erreur pendant l\'envoi des journaux !</string>
<string name="logs_reset_complete">Les journaux ont été néttoyés</string>
<string name="call_settings_redirect_to_voice_mail_declined_calls_title">Rediriger les appels déclinés vers la boîte vocale</string>
</resources>

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

@ -278,7 +278,7 @@
<string name="assistant_error_phone_number_already_exists">There is already an account using this number</string>
<string name="assistant_error_username_invalid_characters">Invalid characters found</string>
<string name="assistant_error_passwords_dont_match">Passwords do not match</string>
<string name="assistant_error_invalid_email_address">Email address is not valid</string>
<string name="assistant_error_invalid_email_address">Email address is invalid</string>
<string name="assistant_error_username_too_long">Username has too many characters</string>
<string name="assistant_error_account_not_activated">Your account has not been validated yet</string>
<string name="assistant_error_invalid_credentials">Account does not exist or password does not match</string>
@ -422,11 +422,13 @@
<string name="call_settings_incoming_timeout_title">Incoming call timeout</string>
<string name="call_settings_incoming_timeout_summary">in seconds</string>
<string name="call_settings_voice_mail_uri_title">Voice mail URI</string>
<string name="call_settings_voice_mail_uri_summary"></string>
<string name="call_settings_redirect_to_voice_mail_declined_calls_title">Redirect declined calls to voice mail URI</string>
<string name="call_settings_redirect_to_voice_mail_declined_calls_summary"></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>
<!-- Chat settings -->