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

Moved call related advanced settings to dedicated sub-section, added back auto answer

Browse source
This commit is contained in:
Sylvain Berfini 2025-03-20 21:37:19 +01:00
parent fecf067b50
commit a83f9d4424
10 changed files with 454 additions and 263 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/linphone/core/CoreContext.kt
View file

@ -265,6 +265,21 @@ class CoreContext
"$TAG Call [${call.remoteAddress.asStringUriOnly()}] state changed [$currentState]"
)
when (currentState) {
Call.State.IncomingReceived -> {
if (corePreferences.autoAnswerEnabled) {
val autoAnswerDelay = corePreferences.autoAnswerDelay
if (autoAnswerDelay == 0) {
Log.w("$TAG Auto answering call immediately")
answerCall(call)
} else {
Log.i("$TAG Scheduling auto answering in $autoAnswerDelay milliseconds")
postOnCoreThreadDelayed({
Log.w("$TAG Auto answering call")
answerCall(call)
}, autoAnswerDelay.toLong())
}
}
}
Call.State.OutgoingInit -> {
val conferenceInfo = core.findConferenceInformationFromUri(call.remoteAddress)
// Do not show outgoing call view for conference calls, wait for connected state

14
app/src/main/java/org/linphone/core/CorePreferences.kt
View file

@ -154,6 +154,20 @@ class CorePreferences
config.setBool("misc", "real_early_media", value)
}
@get:WorkerThread @set:WorkerThread
var autoAnswerEnabled: Boolean
get() = config.getBool("app", "auto_answer", false)
set(value) {
config.setBool("app", "auto_answer", value)
}
@get:WorkerThread @set:WorkerThread
var autoAnswerDelay: Int
get() = config.getInt("app", "auto_answer_delay", 0)
set(value) {
config.setInt("app", "auto_answer_delay", value)
}
// Conversation related
@get:WorkerThread @set:WorkerThread

9
app/src/main/java/org/linphone/notifications/NotificationsManager.kt
View file

@ -189,8 +189,9 @@ class NotificationsManager
state: Call.State?,
message: String
) {
Log.i("$TAG Call state changed: [$state]")
when (state) {
val currentState = call.state
Log.i("$TAG Call state changed: [$currentState]")
when (currentState) {
Call.State.IncomingReceived, Call.State.IncomingEarlyMedia -> {
Log.i(
"$TAG Showing incoming call notification for [${call.remoteAddress.asStringUriOnly()}]"
@ -205,14 +206,14 @@ class NotificationsManager
}
Call.State.Connected,
Call.State.StreamsRunning -> {
if (call.state == Call.State.Connected && call.dir == Call.Dir.Incoming) {
if (currentState == Call.State.Connected && call.dir == Call.Dir.Incoming) {
Log.i(
"$TAG Connected call was incoming (so it was answered), removing incoming call notification"
)
removeIncomingCallNotification()
}
if (call.state == Call.State.Connected || call.dir == Call.Dir.Incoming) {
if (currentState == Call.State.Connected || call.dir == Call.Dir.Incoming) {
Log.i(
"$TAG Showing connected call notification for [${call.remoteAddress.asStringUriOnly()}]"
)

35
app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt
View file

@ -60,21 +60,7 @@ class TelecomCallControlCallback(
Log.i("$TAG Call [${call.remoteAddress.asStringUriOnly()}] state changed [$state]")
if (state == Call.State.Connected) {
if (call.dir == Call.Dir.Incoming) {
val isVideo = LinphoneUtils.isVideoEnabled(call)
val type = if (isVideo) {
CallAttributesCompat.Companion.CALL_TYPE_VIDEO_CALL
} else {
CallAttributesCompat.Companion.CALL_TYPE_AUDIO_CALL
}
scope.launch {
Log.i("$TAG Answering [${if (isVideo) "video" else "audio"}] call")
callControl.answer(type)
}
if (isVideo && corePreferences.routeAudioToSpeakerWhenVideoIsEnabled) {
Log.i("$TAG Answering video call, routing audio to speaker")
AudioUtils.routeAudioToSpeaker(call)
}
answerCall()
} else {
scope.launch {
Log.i("$TAG Setting call active")
@ -116,6 +102,7 @@ class TelecomCallControlCallback(
val state = call.state
Log.i("$TAG Call state currently is [$state]")
when (state) {
Call.State.Connected, Call.State.StreamsRunning -> answerCall()
Call.State.End -> callEnded()
Call.State.Error -> callError("")
Call.State.Released -> callEnded()
@ -283,6 +270,24 @@ class TelecomCallControlCallback(
return false
}
private fun answerCall() {
val isVideo = LinphoneUtils.isVideoEnabled(call)
val type = if (isVideo) {
CallAttributesCompat.Companion.CALL_TYPE_VIDEO_CALL
} else {
CallAttributesCompat.Companion.CALL_TYPE_AUDIO_CALL
}
scope.launch {
Log.i("$TAG Answering [${if (isVideo) "video" else "audio"}] call")
callControl.answer(type)
}
if (isVideo && corePreferences.routeAudioToSpeakerWhenVideoIsEnabled) {
Log.i("$TAG Answering video call, routing audio to speaker")
AudioUtils.routeAudioToSpeaker(call)
}
}
private fun callEnded() {
val reason = call.reason
val direction = call.dir

6
app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt
View file

@ -131,9 +131,9 @@ class SettingsAdvancedFragment : GenericMainFragment() {
viewModel.mediaEncryptionLabels
)
adapter.setDropDownViewResource(R.layout.generic_dropdown_cell)
binding.mediaEncryption.adapter = adapter
binding.mediaEncryption.onItemSelectedListener = mediaEncryptionDropdownListener
binding.mediaEncryption.setSelection(index)
binding.advancedCallsSettings.mediaEncryption.adapter = adapter
binding.advancedCallsSettings.mediaEncryption.onItemSelectedListener = mediaEncryptionDropdownListener
binding.advancedCallsSettings.mediaEncryption.setSelection(index)
}
private fun setupInputAudioDevicePicker() {

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

@ -203,6 +203,8 @@ class SettingsViewModel
val fileSharingServerUrl = MutableLiveData<String>()
val remoteProvisioningUrl = MutableLiveData<String>()
val expandAdvancedCalls = MutableLiveData<Boolean>()
val mediaEncryptionIndex = MutableLiveData<Int>()
val mediaEncryptionLabels = arrayListOf<String>()
private val mediaEncryptionValues = arrayListOf<MediaEncryption>()
@ -210,6 +212,8 @@ class SettingsViewModel
val createEndToEndEncryptedConferences = MutableLiveData<Boolean>()
val acceptEarlyMedia = MutableLiveData<Boolean>()
val allowOutgoingEarlyMedia = MutableLiveData<Boolean>()
val autoAnswerIncomingCalls = MutableLiveData<Boolean>()
val autoAnswerIncomingCallsDelay = MutableLiveData<Int>()
val expandAudioDevices = MutableLiveData<Boolean>()
val inputAudioDeviceIndex = MutableLiveData<Int>()
@ -262,6 +266,7 @@ class SettingsViewModel
expandNetwork.value = false
expandUserInterface.value = false
expandTunnel.value = false
expandAdvancedCalls.value = false
expandAudioDevices.value = false
expandAudioCodecs.value = false
expandVideoCodecs.value = false
@ -331,6 +336,12 @@ class SettingsViewModel
fileSharingServerUrl.postValue(core.fileTransferServer)
remoteProvisioningUrl.postValue(core.provisioningUri)
createEndToEndEncryptedConferences.postValue(corePreferences.createEndToEndEncryptedMeetingsAndGroupCalls)
acceptEarlyMedia.postValue(corePreferences.acceptEarlyMedia)
allowOutgoingEarlyMedia.postValue(corePreferences.allowOutgoingEarlyMedia)
autoAnswerIncomingCalls.postValue(corePreferences.autoAnswerEnabled)
autoAnswerIncomingCallsDelay.postValue(corePreferences.autoAnswerDelay)
setupMediaEncryption()
setupAudioDevices()
setupCodecs()
@ -763,9 +774,6 @@ class SettingsViewModel
}
mediaEncryptionMandatory.postValue(core.isMediaEncryptionMandatory)
createEndToEndEncryptedConferences.postValue(corePreferences.createEndToEndEncryptedMeetingsAndGroupCalls)
acceptEarlyMedia.postValue(corePreferences.acceptEarlyMedia)
allowOutgoingEarlyMedia.postValue(corePreferences.allowOutgoingEarlyMedia)
}
@UiThread
@ -821,6 +829,28 @@ class SettingsViewModel
}
}
@UiThread
fun toggleEnableAutoAnswerIncomingCalls() {
val newValue = autoAnswerIncomingCalls.value == false
coreContext.postOnCoreThread { core ->
corePreferences.autoAnswerEnabled = newValue
autoAnswerIncomingCalls.postValue(newValue)
}
}
@UiThread
fun updateAutoAnswerIncomingCallsDelay(newValue: String) {
if (newValue.isNotEmpty()) {
try {
val delay = newValue.toInt()
corePreferences.autoAnswerDelay = delay
} catch (nfe: NumberFormatException) {
Log.e("$TAG Ignoring new auto answer incoming calls delay as it can't be converted to int: $nfe")
}
}
}
@UiThread
fun updateDeviceName() {
coreContext.postOnCoreThread {
@ -874,6 +904,11 @@ class SettingsViewModel
}
}
@UiThread
fun toggleAdvancedCallsExpand() {
expandAdvancedCalls.value = expandAdvancedCalls.value == false
}
@UiThread
fun toggleAudioDevicesExpand() {
expandAudioDevices.value = expandAudioDevices.value == false

320
app/src/main/res/layout/settings_advanced_calls.xml Normal file
View file

@ -0,0 +1,320 @@
<?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.toggleConferencesEndToEndEncryption()}"
android:id="@+id/e2e_encrypted_conferences_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_advanced_create_e2e_encrypted_conferences_title"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/e2e_encrypted_conferences_switch"
app:layout_constraintBottom_toBottomOf="@id/e2e_encrypted_conferences_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/e2e_encrypted_conferences_switch"/>
<com.google.android.material.materialswitch.MaterialSwitch
style="@style/material_switch_style"
android:id="@+id/e2e_encrypted_conferences_switch"
android:onClick="@{() -> viewModel.toggleConferencesEndToEndEncryption()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:checked="@{viewModel.createEndToEndEncryptedConferences}"
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.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/e2e_encrypted_conferences_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/accept_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.constraintlayout.widget.ConstraintLayout>
</layout>

271
app/src/main/res/layout/settings_advanced_fragment.xml
View file

@ -1,6 +1,7 @@
<?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:app="http://schemas.android.com/apk/res-auto"
xmlns:bind="http://schemas.android.com/tools">
<data>
<import type="android.view.View" />
@ -114,241 +115,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/start_at_boot_switch"/>
<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_toBottomOf="@id/keep_alive_service_switch" />
<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.toggleConferencesEndToEndEncryption()}"
android:id="@+id/e2e_encrypted_conferences_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_advanced_create_e2e_encrypted_conferences_title"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/e2e_encrypted_conferences_switch"
app:layout_constraintBottom_toBottomOf="@id/e2e_encrypted_conferences_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/e2e_encrypted_conferences_switch"/>
<com.google.android.material.materialswitch.MaterialSwitch
style="@style/material_switch_style"
android:id="@+id/e2e_encrypted_conferences_switch"
android:onClick="@{() -> viewModel.toggleConferencesEndToEndEncryption()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:checked="@{viewModel.createEndToEndEncryptedConferences}"
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.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/e2e_encrypted_conferences_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/accept_early_media_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
android:id="@+id/device_id_label"
@ -360,7 +126,7 @@
android:paddingBottom="8dp"
android:text="@string/settings_advanced_device_id"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/allow_outgoing_early_media_switch"/>
app:layout_constraintTop_toBottomOf="@id/keep_alive_service_switch"/>
<androidx.appcompat.widget.AppCompatEditText
style="@style/default_text_style"
@ -470,6 +236,35 @@
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"
@ -485,7 +280,7 @@
android:drawableTint="?attr/color_main2_600"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/download_and_apply"/>
app:layout_constraintTop_toBottomOf="@id/advanced_calls_settings"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/audio_devices"

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

@ -274,6 +274,9 @@
<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_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>
<string name="settings_advanced_enable_auto_answer_incoming_calls_after_delay_hint">Délai en millisecondes</string>
<string name="settings_advanced_remote_provisioning_url">URL de configuration distante</string>
<string name="settings_advanced_download_apply_remote_provisioning">Télécharger &amp; appliquer</string>
<string name="settings_advanced_audio_devices_title">Périphériques audio</string>

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

@ -314,6 +314,9 @@
<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_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>
<string name="settings_advanced_enable_auto_answer_incoming_calls_after_delay_hint">Delay in milliseconds</string>
<string name="settings_advanced_remote_provisioning_url">Remote provisioning URL</string>
<string name="settings_advanced_download_apply_remote_provisioning">Download &amp; apply</string>
<string name="settings_advanced_audio_devices_title">Audio devices</string>