From 1c3173b8712cfed876e18b3d17abc5775f3165d6 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 15 May 2025 09:58:01 +0200
Subject: [PATCH] Moved call related advanced parameters into dedicated
 fragment

---
 .../fragment/SettingsAdvancedCallFragment.kt  |  92 +++++
 .../fragment/SettingsAdvancedFragment.kt      |  26 --
 .../settings/fragment/SettingsFragment.kt     |   7 +
 .../settings/viewmodel/SettingsViewModel.kt   |  15 +
 .../res/layout/settings_advanced_calls.xml    | 352 ------------------
 .../settings_advanced_calls_auto_answer.xml   | 112 ++++++
 .../settings_advanced_calls_early_media.xml   | 107 ++++++
 .../settings_advanced_calls_fragment.xml      | 347 +++++++++++++++++
 .../res/layout/settings_advanced_fragment.xml | 107 +-----
 app/src/main/res/layout/settings_calls.xml    |  22 ++
 app/src/main/res/layout/settings_fragment.xml |   4 +
 .../main/res/navigation/main_nav_graph.xml    |  17 +-
 app/src/main/res/values-fr/strings.xml        |   3 +
 app/src/main/res/values/strings.xml           |   3 +
 14 files changed, 733 insertions(+), 481 deletions(-)
 create mode 100644 app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedCallFragment.kt
 delete mode 100644 app/src/main/res/layout/settings_advanced_calls.xml
 create mode 100644 app/src/main/res/layout/settings_advanced_calls_auto_answer.xml
 create mode 100644 app/src/main/res/layout/settings_advanced_calls_early_media.xml
 create mode 100644 app/src/main/res/layout/settings_advanced_calls_fragment.xml

diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedCallFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedCallFragment.kt
new file mode 100644
index 000000000..c5ca37b06
--- /dev/null
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedCallFragment.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2010-2025 Belledonne Communications SARL.
+ *
+ * This file is part of linphone-android
+ * (see https://www.linphone.org).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.linphone.ui.main.settings.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import androidx.annotation.UiThread
+import androidx.lifecycle.ViewModelProvider
+import org.linphone.R
+import org.linphone.databinding.SettingsAdvancedCallsFragmentBinding
+import org.linphone.ui.main.fragment.GenericMainFragment
+import org.linphone.ui.main.settings.viewmodel.SettingsViewModel
+
+@UiThread
+class SettingsAdvancedCallFragment : GenericMainFragment() {
+    private lateinit var binding: SettingsAdvancedCallsFragmentBinding
+
+    private lateinit var viewModel: SettingsViewModel
+
+    private val mediaEncryptionDropdownListener = object : AdapterView.OnItemSelectedListener {
+        override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+            viewModel.setMediaEncryption(position)
+        }
+
+        override fun onNothingSelected(parent: AdapterView<*>?) {
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = SettingsAdvancedCallsFragmentBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        postponeEnterTransition()
+        super.onViewCreated(view, savedInstanceState)
+
+        viewModel = ViewModelProvider(this)[SettingsViewModel::class.java]
+
+        binding.lifecycleOwner = viewLifecycleOwner
+        binding.viewModel = viewModel
+        observeToastEvents(viewModel)
+
+        binding.setBackClickListener {
+            goBack()
+        }
+
+        viewModel.mediaEncryptionIndex.observe(viewLifecycleOwner) {
+            setupMediaEncryptionPicker()
+        }
+
+        startPostponedEnterTransition()
+    }
+
+    private fun setupMediaEncryptionPicker() {
+        val index = viewModel.mediaEncryptionIndex.value ?: 0
+        val adapter = ArrayAdapter(
+            requireContext(),
+            R.layout.drop_down_item,
+            viewModel.mediaEncryptionLabels
+        )
+        adapter.setDropDownViewResource(R.layout.generic_dropdown_cell)
+        binding.mediaEncryption.adapter = adapter
+        binding.mediaEncryption.onItemSelectedListener = mediaEncryptionDropdownListener
+        binding.mediaEncryption.setSelection(index)
+    }
+}
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt
index b3e38aa44..f1cc856a0 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt
@@ -40,15 +40,6 @@ class SettingsAdvancedFragment : GenericMainFragment() {
 
     private lateinit var viewModel: SettingsViewModel
 
-    private val mediaEncryptionDropdownListener = object : AdapterView.OnItemSelectedListener {
-        override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-            viewModel.setMediaEncryption(position)
-        }
-
-        override fun onNothingSelected(parent: AdapterView<*>?) {
-        }
-    }
-
     private val inputAudioDeviceDropdownListener = object : AdapterView.OnItemSelectedListener {
         override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
             viewModel.setInputAudioDevice(position)
@@ -94,10 +85,6 @@ class SettingsAdvancedFragment : GenericMainFragment() {
             (requireActivity() as GenericActivity).goToAndroidPermissionSettings()
         }
 
-        viewModel.mediaEncryptionIndex.observe(viewLifecycleOwner) {
-            setupMediaEncryptionPicker()
-        }
-
         viewModel.inputAudioDeviceIndex.observe(viewLifecycleOwner) {
             setupInputAudioDevicePicker()
         }
@@ -122,19 +109,6 @@ class SettingsAdvancedFragment : GenericMainFragment() {
         super.onPause()
     }
 
-    private fun setupMediaEncryptionPicker() {
-        val index = viewModel.mediaEncryptionIndex.value ?: 0
-        val adapter = ArrayAdapter(
-            requireContext(),
-            R.layout.drop_down_item,
-            viewModel.mediaEncryptionLabels
-        )
-        adapter.setDropDownViewResource(R.layout.generic_dropdown_cell)
-        binding.advancedCallsSettings.mediaEncryption.adapter = adapter
-        binding.advancedCallsSettings.mediaEncryption.onItemSelectedListener = mediaEncryptionDropdownListener
-        binding.advancedCallsSettings.mediaEncryption.setSelection(index)
-    }
-
     private fun setupInputAudioDevicePicker() {
         val index = viewModel.inputAudioDeviceIndex.value ?: 0
         val adapter = ArrayAdapter(
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
index b3c1afa9e..071adca75 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
@@ -148,6 +148,13 @@ class SettingsFragment : GenericMainFragment() {
             goBack()
         }
 
+        binding.setAdvancedCallSettingsClickListener {
+            if (findNavController().currentDestination?.id == R.id.settingsFragment) {
+                val action = SettingsFragmentDirections.actionSettingsFragmentToSettingsAdvancedCallFragment()
+                findNavController().navigate(action)
+            }
+        }
+
         binding.setAdvancedSettingsClickListener {
             if (findNavController().currentDestination?.id == R.id.settingsFragment) {
                 val action = SettingsFragmentDirections.actionSettingsFragmentToSettingsAdvancedFragment()
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
index 4586b2192..0fc439ecf 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
@@ -233,6 +233,9 @@ class SettingsViewModel
     val expandVideoCodecs = MutableLiveData<Boolean>()
     val videoCodecs = MutableLiveData<List<CodecModel>>()
 
+    val expandEarlyMedia = MutableLiveData<Boolean>()
+    val expandAutoAnswer = MutableLiveData<Boolean>()
+
     // Developer settings
     val showDeveloperSettings = MutableLiveData<Boolean>()
 
@@ -286,6 +289,8 @@ class SettingsViewModel
         expandAudioDevices.value = false
         expandAudioCodecs.value = false
         expandVideoCodecs.value = false
+        expandEarlyMedia.value = false
+        expandAutoAnswer.value = false
 
         val vfsEnabled = VFS.isEnabled(coreContext.context)
         isVfsEnabled.value = vfsEnabled
@@ -839,6 +844,11 @@ class SettingsViewModel
         }
     }
 
+    @UiThread
+    fun toggleEarlyMediaExpand() {
+        expandEarlyMedia.value = expandEarlyMedia.value == false
+    }
+
     @UiThread
     fun toggleAcceptEarlyMedia() {
         val newValue = acceptEarlyMedia.value == false
@@ -869,6 +879,11 @@ class SettingsViewModel
         }
     }
 
+    @UiThread
+    fun toggleAutoAnswerExpand() {
+        expandAutoAnswer.value = expandAutoAnswer.value == false
+    }
+
     @UiThread
     fun toggleEnableAutoAnswerIncomingCalls() {
         val newValue = autoAnswerIncomingCalls.value == false
diff --git a/app/src/main/res/layout/settings_advanced_calls.xml b/app/src/main/res/layout/settings_advanced_calls.xml
deleted file mode 100644
index 636e03283..000000000
--- a/app/src/main/res/layout/settings_advanced_calls.xml
+++ /dev/null
@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="viewModel"
-            type="org.linphone.ui.main.settings.viewmodel.SettingsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="20dp"
-        android:background="@drawable/shape_squircle_white_background">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/settings_title_style"
-            android:onClick="@{() -> viewModel.toggleEnableVideoFec()}"
-            android:id="@+id/enable_fec_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="10dp"
-            android:text="@string/settings_calls_enable_fec_title"
-            android:maxLines="2"
-            android:ellipsize="end"
-            android:visibility="@{viewModel.videoEnabled ? View.VISIBLE : View.GONE}"
-            app:layout_constraintTop_toTopOf="@id/enable_fec_switch"
-            app:layout_constraintBottom_toBottomOf="@id/enable_fec_switch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/enable_fec_switch"/>
-
-        <com.google.android.material.materialswitch.MaterialSwitch
-            style="@style/material_switch_style"
-            android:id="@+id/enable_fec_switch"
-            android:onClick="@{() -> viewModel.toggleEnableVideoFec()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="16dp"
-            android:visibility="@{viewModel.videoEnabled ? View.VISIBLE : View.GONE}"
-            android:enabled="@{viewModel.videoEnabled}"
-            android:checked="@{viewModel.videoEnabled &amp;&amp; viewModel.videoFecEnabled}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/settings_title_style"
-            android:onClick="@{() -> viewModel.toggleUseSmffForCallRecording()}"
-            android:id="@+id/use_smff_call_recording_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="10dp"
-            android:text="@string/settings_advanced_use_smff_format_for_call_recordings_title"
-            android:maxLines="2"
-            android:ellipsize="end"
-            app:layout_constraintTop_toTopOf="@id/use_smff_call_recording_switch"
-            app:layout_constraintBottom_toTopOf="@id/use_smff_call_recording_subtitle"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/use_smff_call_recording_switch"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/settings_subtitle_style"
-            android:onClick="@{() -> viewModel.toggleUseSmffForCallRecording()}"
-            android:id="@+id/use_smff_call_recording_subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="10dp"
-            android:text="@string/settings_advanced_use_smff_format_for_call_recordings_subtitle"
-            android:maxLines="2"
-            android:ellipsize="end"
-            app:layout_constraintTop_toBottomOf="@id/use_smff_call_recording_title"
-            app:layout_constraintBottom_toBottomOf="@id/use_smff_call_recording_switch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/use_smff_call_recording_switch"/>
-
-        <com.google.android.material.materialswitch.MaterialSwitch
-            style="@style/material_switch_style"
-            android:id="@+id/use_smff_call_recording_switch"
-            android:onClick="@{() -> viewModel.toggleUseSmffForCallRecording()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="16dp"
-            android:checked="@{viewModel.useSmffForCallRecording}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/enable_fec_switch" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/settings_title_style"
-            android:id="@+id/media_encryption_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:text="@string/settings_advanced_media_encryption_title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/use_smff_call_recording_switch"/>
-
-        <androidx.appcompat.widget.AppCompatSpinner
-            style="@style/default_text_style"
-            android:id="@+id/media_encryption"
-            android:layout_width="0dp"
-            android:layout_height="50dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="8dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:textSize="14sp"
-            android:textColor="@color/gray_main2_600"
-            android:gravity="center_vertical"
-            android:overlapAnchor="false"
-            android:dropDownVerticalOffset="2dp"
-            android:spinnerMode="dropdown"
-            android:popupBackground="@drawable/shape_squircle_white_background"
-            android:background="@drawable/edit_text_background"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintWidth_max="@dimen/text_input_max_width"
-            app:layout_constraintTop_toBottomOf="@id/media_encryption_label"
-            app:layout_constraintStart_toStartOf="@id/media_encryption_label"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <ImageView
-            android:id="@+id/media_encryption_caret"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:src="@drawable/caret_down"
-            android:contentDescription="@null"
-            app:tint="?attr/color_main2_600"
-            app:layout_constraintTop_toTopOf="@id/media_encryption"
-            app:layout_constraintBottom_toBottomOf="@id/media_encryption"
-            app:layout_constraintEnd_toEndOf="@id/media_encryption"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/settings_title_style"
-            android:onClick="@{() -> viewModel.toggleMediaEncryptionMandatory()}"
-            android:id="@+id/media_encryption_mandatory_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="10dp"
-            android:text="@string/settings_advanced_media_encryption_mandatory_title"
-            android:maxLines="2"
-            android:ellipsize="end"
-            app:layout_constraintTop_toTopOf="@id/media_encryption_mandatory_switch"
-            app:layout_constraintBottom_toBottomOf="@id/media_encryption_mandatory_switch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/media_encryption_mandatory_switch"/>
-
-        <com.google.android.material.materialswitch.MaterialSwitch
-            style="@style/material_switch_style"
-            android:id="@+id/media_encryption_mandatory_switch"
-            android:onClick="@{() -> viewModel.toggleMediaEncryptionMandatory()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="16dp"
-            android:checked="@{viewModel.mediaEncryptionMandatory}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/media_encryption" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/settings_title_style"
-            android:onClick="@{() -> viewModel.toggleAcceptEarlyMedia()}"
-            android:id="@+id/accept_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_accept_early_media_title"
-            android:maxLines="2"
-            android:ellipsize="end"
-            app:layout_constraintTop_toTopOf="@id/accept_early_media_switch"
-            app:layout_constraintBottom_toBottomOf="@id/accept_early_media_switch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/accept_early_media_switch"/>
-
-        <com.google.android.material.materialswitch.MaterialSwitch
-            style="@style/material_switch_style"
-            android:id="@+id/accept_early_media_switch"
-            android:onClick="@{() -> viewModel.toggleAcceptEarlyMedia()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="16dp"
-            android:checked="@{viewModel.acceptEarlyMedia}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/media_encryption_mandatory_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"
-            android:enabled="@{viewModel.acceptEarlyMedia}"
-            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:enabled="@{viewModel.acceptEarlyMedia}"
-            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()}"
-            android:id="@+id/allow_outgoing_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_allow_outgoing_early_media_title"
-            android:maxLines="2"
-            android:ellipsize="end"
-            app:layout_constraintTop_toTopOf="@id/allow_outgoing_early_media_switch"
-            app:layout_constraintBottom_toBottomOf="@id/allow_outgoing_early_media_switch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/allow_outgoing_early_media_switch"/>
-
-        <com.google.android.material.materialswitch.MaterialSwitch
-            style="@style/material_switch_style"
-            android:id="@+id/allow_outgoing_early_media_switch"
-            android:onClick="@{() -> viewModel.toggleAllowOutgoingEarlyMedia()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="16dp"
-            android:checked="@{viewModel.allowOutgoingEarlyMedia}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ring_during_early_media_switch" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/settings_title_style"
-            android:onClick="@{() -> viewModel.toggleEnableAutoAnswerIncomingCalls()}"
-            android:id="@+id/auto_answer_incoming_calls_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="10dp"
-            android:text="@string/settings_advanced_enable_auto_answer_incoming_calls_title"
-            android:maxLines="2"
-            android:ellipsize="end"
-            app:layout_constraintTop_toTopOf="@id/auto_answer_incoming_calls_switch"
-            app:layout_constraintBottom_toBottomOf="@id/auto_answer_incoming_calls_switch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/auto_answer_incoming_calls_switch"/>
-
-        <com.google.android.material.materialswitch.MaterialSwitch
-            style="@style/material_switch_style"
-            android:id="@+id/auto_answer_incoming_calls_switch"
-            android:onClick="@{() -> viewModel.toggleEnableAutoAnswerIncomingCalls()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="16dp"
-            android:checked="@{viewModel.autoAnswerIncomingCalls}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/allow_outgoing_early_media_switch" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/settings_title_style"
-            android:id="@+id/auto_answer_incoming_calls_delay_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:visibility="@{viewModel.autoAnswerIncomingCalls ? View.VISIBLE : View.GONE}"
-            android:text="@string/settings_advanced_enable_auto_answer_incoming_calls_after_delay_title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/auto_answer_incoming_calls_switch"/>
-
-        <androidx.appcompat.widget.AppCompatEditText
-            style="@style/default_text_style"
-            android:id="@+id/auto_answer_incoming_calls_delay"
-            onValueChanged="@{() -> viewModel.updateAutoAnswerIncomingCallsDelay(autoAnswerIncomingCallsDelay.getText().toString())}"
-            android:layout_width="0dp"
-            android:layout_height="50dp"
-            android:layout_marginEnd="16dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@{viewModel.autoAnswerIncomingCallsDelay.toString()}"
-            android:textSize="14sp"
-            android:maxLines="1"
-            android:background="@drawable/edit_text_background"
-            android:inputType="number"
-            android:hint="@string/settings_advanced_enable_auto_answer_incoming_calls_after_delay_hint"
-            android:visibility="@{viewModel.autoAnswerIncomingCalls ? View.VISIBLE : View.GONE}"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintWidth_max="@dimen/text_input_max_width"
-            app:layout_constraintTop_toBottomOf="@id/auto_answer_incoming_calls_delay_title"
-            app:layout_constraintStart_toStartOf="@id/auto_answer_incoming_calls_delay_title"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/settings_title_style"
-            android:onClick="@{() -> viewModel.toggleEnableAutoAnswerIncomingCallsWithVideoDirectionSendReceive()}"
-            android:id="@+id/auto_answer_incoming_calls_video_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="10dp"
-            android:text="@string/settings_advanced_enable_auto_answer_video_send_receive"
-            android:maxLines="2"
-            android:ellipsize="end"
-            android:visibility="@{viewModel.autoAnswerIncomingCalls ? View.VISIBLE : View.GONE}"
-            app:layout_constraintTop_toTopOf="@id/auto_answer_incoming_calls_video_switch"
-            app:layout_constraintBottom_toBottomOf="@id/auto_answer_incoming_calls_video_switch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/auto_answer_incoming_calls_video_switch"/>
-
-        <com.google.android.material.materialswitch.MaterialSwitch
-            style="@style/material_switch_style"
-            android:id="@+id/auto_answer_incoming_calls_video_switch"
-            android:onClick="@{() -> viewModel.toggleEnableAutoAnswerIncomingCallsWithVideoDirectionSendReceive()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="16dp"
-            android:checked="@{viewModel.autoAnswerIncomingCallsWithVideoDirectionSendReceive}"
-            android:visibility="@{viewModel.autoAnswerIncomingCalls ? View.VISIBLE : View.GONE}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/auto_answer_incoming_calls_delay" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_advanced_calls_auto_answer.xml b/app/src/main/res/layout/settings_advanced_calls_auto_answer.xml
new file mode 100644
index 000000000..f5b948fc3
--- /dev/null
+++ b/app/src/main/res/layout/settings_advanced_calls_auto_answer.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.main.settings.viewmodel.SettingsViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="20dp"
+        android:background="@drawable/shape_squircle_white_background">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:onClick="@{() -> viewModel.toggleEnableAutoAnswerIncomingCalls()}"
+            android:id="@+id/auto_answer_incoming_calls_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/settings_advanced_enable_auto_answer_incoming_calls_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="@id/auto_answer_incoming_calls_switch"
+            app:layout_constraintBottom_toBottomOf="@id/auto_answer_incoming_calls_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/auto_answer_incoming_calls_switch"/>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/material_switch_style"
+            android:id="@+id/auto_answer_incoming_calls_switch"
+            android:onClick="@{() -> viewModel.toggleEnableAutoAnswerIncomingCalls()}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
+            android:checked="@{viewModel.autoAnswerIncomingCalls}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/auto_answer_incoming_calls_delay_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:text="@string/settings_advanced_enable_auto_answer_incoming_calls_after_delay_title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/auto_answer_incoming_calls_switch"/>
+
+        <androidx.appcompat.widget.AppCompatEditText
+            style="@style/default_text_style"
+            android:id="@+id/auto_answer_incoming_calls_delay"
+            onValueChanged="@{() -> viewModel.updateAutoAnswerIncomingCallsDelay(autoAnswerIncomingCallsDelay.getText().toString())}"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_marginEnd="16dp"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
+            android:text="@{viewModel.autoAnswerIncomingCallsDelay.toString()}"
+            android:textSize="14sp"
+            android:maxLines="1"
+            android:background="@drawable/edit_text_background"
+            android:inputType="number"
+            android:hint="@string/settings_advanced_enable_auto_answer_incoming_calls_after_delay_hint"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
+            app:layout_constraintTop_toBottomOf="@id/auto_answer_incoming_calls_delay_title"
+            app:layout_constraintStart_toStartOf="@id/auto_answer_incoming_calls_delay_title"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:onClick="@{() -> viewModel.toggleEnableAutoAnswerIncomingCallsWithVideoDirectionSendReceive()}"
+            android:id="@+id/auto_answer_incoming_calls_video_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/settings_advanced_enable_auto_answer_video_send_receive"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="@id/auto_answer_incoming_calls_video_switch"
+            app:layout_constraintBottom_toBottomOf="@id/auto_answer_incoming_calls_video_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/auto_answer_incoming_calls_video_switch"/>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/material_switch_style"
+            android:id="@+id/auto_answer_incoming_calls_video_switch"
+            android:onClick="@{() -> viewModel.toggleEnableAutoAnswerIncomingCallsWithVideoDirectionSendReceive()}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
+            android:checked="@{viewModel.autoAnswerIncomingCallsWithVideoDirectionSendReceive}"
+            android:enabled="@{viewModel.autoAnswerIncomingCalls}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/auto_answer_incoming_calls_delay" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_advanced_calls_early_media.xml b/app/src/main/res/layout/settings_advanced_calls_early_media.xml
new file mode 100644
index 000000000..8f264bcd4
--- /dev/null
+++ b/app/src/main/res/layout/settings_advanced_calls_early_media.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.main.settings.viewmodel.SettingsViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="20dp"
+        android:background="@drawable/shape_squircle_white_background">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:onClick="@{() -> viewModel.toggleAcceptEarlyMedia()}"
+            android:id="@+id/accept_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_accept_early_media_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="@id/accept_early_media_switch"
+            app:layout_constraintBottom_toBottomOf="@id/accept_early_media_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/accept_early_media_switch"/>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/material_switch_style"
+            android:id="@+id/accept_early_media_switch"
+            android:onClick="@{() -> viewModel.toggleAcceptEarlyMedia()}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
+            android:checked="@{viewModel.acceptEarlyMedia}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <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"
+            android:enabled="@{viewModel.acceptEarlyMedia}"
+            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:enabled="@{viewModel.acceptEarlyMedia}"
+            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()}"
+            android:id="@+id/allow_outgoing_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_allow_outgoing_early_media_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="@id/allow_outgoing_early_media_switch"
+            app:layout_constraintBottom_toBottomOf="@id/allow_outgoing_early_media_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/allow_outgoing_early_media_switch"/>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/material_switch_style"
+            android:id="@+id/allow_outgoing_early_media_switch"
+            android:onClick="@{() -> viewModel.toggleAllowOutgoingEarlyMedia()}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
+            android:checked="@{viewModel.allowOutgoingEarlyMedia}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ring_during_early_media_switch" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_advanced_calls_fragment.xml b/app/src/main/res/layout/settings_advanced_calls_fragment.xml
new file mode 100644
index 000000000..61bd69ae5
--- /dev/null
+++ b/app/src/main/res/layout/settings_advanced_calls_fragment.xml
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="backClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.main.settings.viewmodel.SettingsViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/color_background_contrast_in_dark_mode">
+
+        <ImageView
+            android:id="@+id/back"
+            android:onClick="@{backClickListener}"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:adjustViewBounds="true"
+            android:padding="15dp"
+            android:src="@drawable/caret_left"
+            android:contentDescription="@string/content_description_go_back_icon"
+            app:tint="?attr/color_main1_500"
+            app:layout_constraintBottom_toBottomOf="@id/title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/title" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/main_page_title_style"
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/top_bar_height"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/settings_advanced_calls"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/back"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <ScrollView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:fillViewport="true"
+            android:background="?attr/color_grey_100"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/settings_title_style"
+                    android:onClick="@{() -> viewModel.toggleEnableVideoFec()}"
+                    android:id="@+id/enable_fec_title"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="10dp"
+                    android:text="@string/settings_calls_enable_fec_title"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    android:visibility="@{viewModel.videoEnabled ? View.VISIBLE : View.GONE}"
+                    app:layout_constraintTop_toTopOf="@id/enable_fec_switch"
+                    app:layout_constraintBottom_toBottomOf="@id/enable_fec_switch"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/enable_fec_switch"/>
+
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    style="@style/material_switch_style"
+                    android:id="@+id/enable_fec_switch"
+                    android:onClick="@{() -> viewModel.toggleEnableVideoFec()}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginEnd="16dp"
+                    android:visibility="@{viewModel.videoEnabled ? View.VISIBLE : View.GONE}"
+                    android:enabled="@{viewModel.videoEnabled}"
+                    android:checked="@{viewModel.videoEnabled &amp;&amp; viewModel.videoFecEnabled}"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/settings_title_style"
+                    android:onClick="@{() -> viewModel.toggleUseSmffForCallRecording()}"
+                    android:id="@+id/use_smff_call_recording_title"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="10dp"
+                    android:text="@string/settings_advanced_use_smff_format_for_call_recordings_title"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    app:layout_constraintTop_toTopOf="@id/use_smff_call_recording_switch"
+                    app:layout_constraintBottom_toTopOf="@id/use_smff_call_recording_subtitle"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/use_smff_call_recording_switch"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/settings_subtitle_style"
+                    android:onClick="@{() -> viewModel.toggleUseSmffForCallRecording()}"
+                    android:id="@+id/use_smff_call_recording_subtitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="10dp"
+                    android:text="@string/settings_advanced_use_smff_format_for_call_recordings_subtitle"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    app:layout_constraintTop_toBottomOf="@id/use_smff_call_recording_title"
+                    app:layout_constraintBottom_toBottomOf="@id/use_smff_call_recording_switch"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/use_smff_call_recording_switch"/>
+
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    style="@style/material_switch_style"
+                    android:id="@+id/use_smff_call_recording_switch"
+                    android:onClick="@{() -> viewModel.toggleUseSmffForCallRecording()}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginEnd="16dp"
+                    android:checked="@{viewModel.useSmffForCallRecording}"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/enable_fec_switch" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/settings_title_style"
+                    android:id="@+id/media_encryption_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    android:text="@string/settings_advanced_media_encryption_title"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/use_smff_call_recording_switch"/>
+
+                <androidx.appcompat.widget.AppCompatSpinner
+                    style="@style/default_text_style"
+                    android:id="@+id/media_encryption"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="8dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:textSize="14sp"
+                    android:textColor="@color/gray_main2_600"
+                    android:gravity="center_vertical"
+                    android:overlapAnchor="false"
+                    android:dropDownVerticalOffset="2dp"
+                    android:spinnerMode="dropdown"
+                    android:popupBackground="@drawable/shape_squircle_white_background"
+                    android:background="@drawable/edit_text_background"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/media_encryption_label"
+                    app:layout_constraintStart_toStartOf="@id/media_encryption_label"
+                    app:layout_constraintEnd_toEndOf="parent" />
+
+                <ImageView
+                    android:id="@+id/media_encryption_caret"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:src="@drawable/caret_down"
+                    android:contentDescription="@null"
+                    app:tint="?attr/color_main2_600"
+                    app:layout_constraintTop_toTopOf="@id/media_encryption"
+                    app:layout_constraintBottom_toBottomOf="@id/media_encryption"
+                    app:layout_constraintEnd_toEndOf="@id/media_encryption"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/settings_title_style"
+                    android:onClick="@{() -> viewModel.toggleMediaEncryptionMandatory()}"
+                    android:id="@+id/media_encryption_mandatory_title"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="10dp"
+                    android:text="@string/settings_advanced_media_encryption_mandatory_title"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    app:layout_constraintTop_toTopOf="@id/media_encryption_mandatory_switch"
+                    app:layout_constraintBottom_toBottomOf="@id/media_encryption_mandatory_switch"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/media_encryption_mandatory_switch"/>
+
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    style="@style/material_switch_style"
+                    android:id="@+id/media_encryption_mandatory_switch"
+                    android:onClick="@{() -> viewModel.toggleMediaEncryptionMandatory()}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginEnd="16dp"
+                    android:checked="@{viewModel.mediaEncryptionMandatory}"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/media_encryption" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/section_header_style"
+                    android:id="@+id/early_media_settings_title"
+                    android:onClick="@{() -> viewModel.toggleEarlyMediaExpand()}"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_marginStart="26dp"
+                    android:layout_marginEnd="26dp"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/settings_advanced_early_media_title"
+                    android:drawableEnd="@{viewModel.expandEarlyMedia ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
+                    android:drawableTint="?attr/color_main2_600"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/media_encryption_mandatory_switch"/>
+
+                <include
+                    android:id="@+id/early_media_settings"
+                    layout="@layout/settings_advanced_calls_early_media"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:visibility="@{viewModel.expandEarlyMedia ? View.VISIBLE : View.GONE, default=gone}"
+                    app:layout_constraintTop_toBottomOf="@id/early_media_settings_title"
+                    bind:viewModel="@{viewModel}"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/section_header_style"
+                    android:id="@+id/auto_answer_settings_title"
+                    android:onClick="@{() -> viewModel.toggleAutoAnswerExpand()}"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_marginStart="26dp"
+                    android:layout_marginEnd="26dp"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/settings_advanced_auto_answer_title"
+                    android:drawableEnd="@{viewModel.expandAutoAnswer ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
+                    android:drawableTint="?attr/color_main2_600"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/early_media_settings"/>
+
+                <include
+                    android:id="@+id/auto_answer_settings"
+                    layout="@layout/settings_advanced_calls_auto_answer"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:visibility="@{viewModel.expandAutoAnswer ? View.VISIBLE : View.GONE, default=gone}"
+                    app:layout_constraintTop_toBottomOf="@id/auto_answer_settings_title"
+                    bind:viewModel="@{viewModel}"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/section_header_style"
+                    android:id="@+id/audio_codecs_title"
+                    android:onClick="@{() -> viewModel.toggleAudioCodecsExpand()}"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_marginStart="26dp"
+                    android:layout_marginEnd="26dp"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/settings_advanced_audio_codecs_title"
+                    android:drawableEnd="@{viewModel.expandAudioCodecs ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
+                    android:drawableTint="?attr/color_main2_600"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/auto_answer_settings"/>
+
+                <LinearLayout
+                    android:id="@+id/audio_codecs"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="8dp"
+                    android:orientation="vertical"
+                    android:paddingBottom="16dp"
+                    android:background="@drawable/shape_squircle_white_background"
+                    android:visibility="@{viewModel.expandAudioCodecs ? View.VISIBLE : View.GONE}"
+                    entries="@{viewModel.audioCodecs}"
+                    layout="@{@layout/settings_codec_list_cell}"
+                    app:layout_constraintTop_toBottomOf="@id/audio_codecs_title"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/section_header_style"
+                    android:id="@+id/video_codecs_title"
+                    android:onClick="@{() -> viewModel.toggleVideoCodecsExpand()}"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_marginStart="26dp"
+                    android:layout_marginEnd="26dp"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/settings_advanced_video_codecs_title"
+                    android:drawableEnd="@{viewModel.expandVideoCodecs ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
+                    android:drawableTint="?attr/color_main2_600"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/audio_codecs"/>
+
+                <LinearLayout
+                    android:id="@+id/video_codecs"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="@dimen/screen_bottom_margin"
+                    android:orientation="vertical"
+                    android:paddingBottom="16dp"
+                    android:background="@drawable/shape_squircle_white_background"
+                    android:visibility="@{viewModel.expandVideoCodecs ? View.VISIBLE : View.GONE}"
+                    entries="@{viewModel.videoCodecs}"
+                    layout="@{@layout/settings_codec_list_cell}"
+                    app:layout_constraintVertical_bias="0"
+                    app:layout_constraintTop_toBottomOf="@id/video_codecs_title"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </ScrollView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml
index f9708e1b5..6000c756c 100644
--- a/app/src/main/res/layout/settings_advanced_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_fragment.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:bind="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
         <import type="android.view.View" />
@@ -232,35 +231,6 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/remote_provisioning"/>
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/section_header_style"
-                    android:id="@+id/calls"
-                    android:onClick="@{() -> viewModel.toggleAdvancedCallsExpand()}"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:layout_marginStart="26dp"
-                    android:layout_marginEnd="26dp"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/settings_calls_title"
-                    android:drawableEnd="@{viewModel.expandAdvancedCalls ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
-                    android:drawableTint="?attr/color_main2_600"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/download_and_apply"/>
-
-                <include
-                    android:id="@+id/advanced_calls_settings"
-                    layout="@layout/settings_advanced_calls"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:visibility="@{viewModel.expandAdvancedCalls ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintTop_toBottomOf="@id/calls"
-                    bind:viewModel="@{viewModel}"/>
-
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/section_header_style"
                     android:id="@+id/audio_devices_title"
@@ -276,7 +246,7 @@
                     android:drawableTint="?attr/color_main2_600"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/advanced_calls_settings"/>
+                    app:layout_constraintTop_toBottomOf="@id/download_and_apply"/>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/audio_devices"
@@ -288,7 +258,7 @@
                     android:paddingBottom="16dp"
                     android:background="@drawable/shape_squircle_white_background"
                     android:orientation="vertical"
-                    android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE}"
+                    android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE, default=gone}"
                     app:layout_constraintTop_toBottomOf="@id/audio_devices_title"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent">
@@ -397,74 +367,6 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/section_header_style"
-                    android:id="@+id/audio_codecs_title"
-                    android:onClick="@{() -> viewModel.toggleAudioCodecsExpand()}"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:layout_marginStart="26dp"
-                    android:layout_marginEnd="26dp"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/settings_advanced_audio_codecs_title"
-                    android:drawableEnd="@{viewModel.expandAudioCodecs ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
-                    android:drawableTint="?attr/color_main2_600"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/audio_devices"/>
-
-                <LinearLayout
-                    android:id="@+id/audio_codecs"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginTop="8dp"
-                    android:orientation="vertical"
-                    android:paddingBottom="16dp"
-                    android:background="@drawable/shape_squircle_white_background"
-                    android:visibility="@{viewModel.expandAudioCodecs ? View.VISIBLE : View.GONE}"
-                    entries="@{viewModel.audioCodecs}"
-                    layout="@{@layout/settings_codec_list_cell}"
-                    app:layout_constraintTop_toBottomOf="@id/audio_codecs_title"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/section_header_style"
-                    android:id="@+id/video_codecs_title"
-                    android:onClick="@{() -> viewModel.toggleVideoCodecsExpand()}"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:layout_marginStart="26dp"
-                    android:layout_marginEnd="26dp"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/settings_advanced_video_codecs_title"
-                    android:drawableEnd="@{viewModel.expandVideoCodecs ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
-                    android:drawableTint="?attr/color_main2_600"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/audio_codecs"/>
-
-                <LinearLayout
-                    android:id="@+id/video_codecs"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginTop="8dp"
-                    android:orientation="vertical"
-                    android:paddingBottom="16dp"
-                    android:background="@drawable/shape_squircle_white_background"
-                    android:visibility="@{viewModel.expandVideoCodecs ? View.VISIBLE : View.GONE}"
-                    entries="@{viewModel.videoCodecs}"
-                    layout="@{@layout/settings_codec_list_cell}"
-                    app:layout_constraintTop_toBottomOf="@id/video_codecs_title"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent" />
-
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/settings_title_style"
                     android:id="@+id/android_settings"
@@ -477,9 +379,10 @@
                     android:drawableEnd="@drawable/arrow_square_out"
                     android:drawableTint="?attr/color_main2_600"
                     app:layout_constraintHorizontal_bias="1"
+                    app:layout_constraintVertical_bias="0"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/video_codecs"
+                    app:layout_constraintTop_toBottomOf="@id/audio_devices"
                     app:layout_constraintBottom_toBottomOf="parent"/>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/settings_calls.xml b/app/src/main/res/layout/settings_calls.xml
index 43fe0e779..1566fd8c4 100644
--- a/app/src/main/res/layout/settings_calls.xml
+++ b/app/src/main/res/layout/settings_calls.xml
@@ -5,6 +5,9 @@
 
     <data>
         <import type="android.view.View" />
+        <variable
+            name="advancedCallSettingsClickListener"
+            type="View.OnClickListener" />
         <variable
             name="viewModel"
             type="org.linphone.ui.main.settings.viewmodel.SettingsViewModel" />
@@ -225,6 +228,25 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/auto_record_switch"/>
 
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/advanced_call_settings"
+            android:onClick="@{advancedCallSettingsClickListener}"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="@dimen/screen_bottom_margin"
+            android:text="@string/settings_advanced_calls"
+            android:drawableEnd="@drawable/caret_right"
+            android:drawableTint="?attr/color_main2_600"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/change_ringtone"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
index c9515b759..30e17770f 100644
--- a/app/src/main/res/layout/settings_fragment.xml
+++ b/app/src/main/res/layout/settings_fragment.xml
@@ -11,6 +11,9 @@
         <variable
             name="turnOnVfsClickListener"
             type="View.OnClickListener" />
+        <variable
+            name="advancedCallSettingsClickListener"
+            type="View.OnClickListener" />
         <variable
             name="advancedSettingsClickListener"
             type="View.OnClickListener" />
@@ -124,6 +127,7 @@
                     android:layout_marginEnd="16dp"
                     android:visibility="@{viewModel.expandCalls ? View.VISIBLE : View.GONE, default=gone}"
                     app:layout_constraintTop_toBottomOf="@id/calls"
+                    bind:advancedCallSettingsClickListener="@{advancedCallSettingsClickListener}"
                     bind:viewModel="@{viewModel}"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/navigation/main_nav_graph.xml b/app/src/main/res/navigation/main_nav_graph.xml
index 9684ce3f3..febb3ff7f 100644
--- a/app/src/main/res/navigation/main_nav_graph.xml
+++ b/app/src/main/res/navigation/main_nav_graph.xml
@@ -145,6 +145,14 @@
             app:exitAnim="@anim/slide_out_left"
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right" />
+        <action
+            android:id="@+id/action_settingsFragment_to_settingsAdvancedCallFragment"
+            app:destination="@id/settingsAdvancedCallFragment"
+            app:launchSingleTop="true"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
     </fragment>
 
     <action
@@ -411,7 +419,8 @@
         android:id="@+id/settingsAdvancedFragment"
         android:name="org.linphone.ui.main.settings.fragment.SettingsAdvancedFragment"
         android:label="SettingsAdvancedFragment"
-        tools:layout="@layout/settings_advanced_fragment"/>
+        tools:layout="@layout/settings_advanced_fragment">
+    </fragment>
 
     <fragment
         android:id="@+id/singleSignOnFragment"
@@ -446,4 +455,10 @@
         android:label="SettingsDeveloperFragment"
         tools:layout="@layout/settings_developer_fragment"/>
 
+    <fragment
+        android:id="@+id/settingsAdvancedCallFragment"
+        android:name="org.linphone.ui.main.settings.fragment.SettingsAdvancedCallFragment"
+        android:label="SettingsAdvancedCallFragment"
+        tools:layout="@layout/settings_advanced_calls_fragment"/>
+
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 318cad9a4..b6adebfef 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -270,14 +270,17 @@
     <string name="settings_advanced_device_id_hint">Caractères alpha-numériques uniquement</string>
     <string name="settings_advanced_upload_server_url">URL du serveur de partage de fichier</string>
     <string name="settings_advanced_logs_upload_server_url">URL du serveur de partage des logs</string>
+    <string name="settings_advanced_calls">Paramètres d\'appels avancés</string>
     <string name="settings_advanced_use_smff_format_for_call_recordings_title">Enregistrer les appels vidéos utilisant H265/AV1</string>
     <string name="settings_advanced_use_smff_format_for_call_recordings_subtitle">Utilisera un format de fichier propriétaire</string>
     <string name="settings_advanced_media_encryption_title">Chiffrement du média</string>
     <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_early_media_title">Early media</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_auto_answer_title">Décrochage automatique</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>
     <string name="settings_advanced_enable_auto_answer_incoming_calls_after_delay_hint">Délai en millisecondes</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e4d24c061..464ab9020 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -310,14 +310,17 @@
     <string name="settings_advanced_device_id_hint">Alpha-numerical characters only</string>
     <string name="settings_advanced_upload_server_url">File sharing server URL</string>
     <string name="settings_advanced_logs_upload_server_url">Logs sharing server URL</string>
+    <string name="settings_advanced_calls">Advanced calls settings</string>
     <string name="settings_advanced_use_smff_format_for_call_recordings_title">Record video calls using H265/AV1</string>
     <string name="settings_advanced_use_smff_format_for_call_recordings_subtitle">Will use a proprietary file format</string>
     <string name="settings_advanced_media_encryption_title">Media encryption</string>
     <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_early_media_title">Early-media</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_auto_answer_title">Auto-answer</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>
     <string name="settings_advanced_enable_auto_answer_incoming_calls_after_delay_hint">Delay in milliseconds</string>