mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added back ring during early media setting

Browse source
This commit is contained in:
Sylvain Berfini 2025-03-26 09:19:37 +01:00
parent 7a3ccc841e
commit 9777295dd1
4 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
View file

@ -204,6 +204,7 @@ class SettingsViewModel
val mediaEncryptionMandatory = MutableLiveData<Boolean>()
val createEndToEndEncryptedConferences = MutableLiveData<Boolean>()
val acceptEarlyMedia = MutableLiveData<Boolean>()
val ringDuringEarlyMedia = MutableLiveData<Boolean>()
val allowOutgoingEarlyMedia = MutableLiveData<Boolean>()
val autoAnswerIncomingCalls = MutableLiveData<Boolean>()
val autoAnswerIncomingCallsDelay = MutableLiveData<Int>()
@ -329,6 +330,7 @@ class SettingsViewModel
createEndToEndEncryptedConferences.postValue(corePreferences.createEndToEndEncryptedMeetingsAndGroupCalls)
acceptEarlyMedia.postValue(corePreferences.acceptEarlyMedia)
ringDuringEarlyMedia.postValue(core.ringDuringIncomingEarlyMedia)
allowOutgoingEarlyMedia.postValue(corePreferences.allowOutgoingEarlyMedia)
autoAnswerIncomingCalls.postValue(corePreferences.autoAnswerEnabled)
autoAnswerIncomingCallsDelay.postValue(corePreferences.autoAnswerDelay)
@ -810,6 +812,16 @@ class SettingsViewModel
}
}
@UiThread
fun toggleRingDuringEarlyMedia() {
val newValue = ringDuringEarlyMedia.value == false
coreContext.postOnCoreThread { core ->
core.ringDuringIncomingEarlyMedia = newValue
ringDuringEarlyMedia.postValue(newValue)
}
}
@UiThread
fun toggleAllowOutgoingEarlyMedia() {
val newValue = allowOutgoingEarlyMedia.value == false

30
app/src/main/res/layout/settings_advanced_calls.xml
View file

@ -223,6 +223,34 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/e2e_encrypted_conferences_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
android:onClick="@{() -> viewModel.toggleRingDuringEarlyMedia()}"
android:id="@+id/ring_during_early_media_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_advanced_ring_during_early_media_title"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/ring_during_early_media_switch"
app:layout_constraintBottom_toBottomOf="@id/ring_during_early_media_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/ring_during_early_media_switch"/>
<com.google.android.material.materialswitch.MaterialSwitch
style="@style/material_switch_style"
android:id="@+id/ring_during_early_media_switch"
android:onClick="@{() -> viewModel.toggleRingDuringEarlyMedia()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:checked="@{viewModel.ringDuringEarlyMedia}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/accept_early_media_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
android:onClick="@{() -> viewModel.toggleAllowOutgoingEarlyMedia()}"
@ -249,7 +277,7 @@
android:layout_marginEnd="16dp"
android:checked="@{viewModel.allowOutgoingEarlyMedia}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/accept_early_media_switch" />
app:layout_constraintTop_toBottomOf="@id/ring_during_early_media_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"

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

@ -272,6 +272,7 @@
<string name="settings_advanced_media_encryption_mandatory_title">Rendre le chiffrement du média obligatoire</string>
<string name="settings_advanced_create_e2e_encrypted_conferences_title">Créer en mode chiffré de bout en bout les réunions et les appels de groupe</string>
<string name="settings_advanced_accept_early_media_title">Accepter l\'early media</string>
<string name="settings_advanced_ring_during_early_media_title">Sonner pendant un appel entrant avec early-media</string>
<string name="settings_advanced_allow_outgoing_early_media_title">Autoriser l\'early media pour les appels sortants</string>
<string name="settings_advanced_enable_auto_answer_incoming_calls_title">Décrocher automatiquement les appels entrants</string>
<string name="settings_advanced_enable_auto_answer_incoming_calls_after_delay_title">Délai avant le décrochage automatique</string>

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

@ -312,6 +312,7 @@
<string name="settings_advanced_media_encryption_mandatory_title">Media encryption mandatory</string>
<string name="settings_advanced_create_e2e_encrypted_conferences_title">Create end-to-end encrypted meetings &amp; group calls</string>
<string name="settings_advanced_accept_early_media_title">Accept early media</string>
<string name="settings_advanced_ring_during_early_media_title">Ring during incoming early media call</string>
<string name="settings_advanced_allow_outgoing_early_media_title">Allow outgoing early media</string>
<string name="settings_advanced_enable_auto_answer_incoming_calls_title">Auto answer incoming calls</string>
<string name="settings_advanced_enable_auto_answer_incoming_calls_after_delay_title">Delay before auto answering call</string>