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

Added CCMP server URL setting in advanced account params

Browse source
This commit is contained in:
Sylvain Berfini 2024-10-23 23:03:33 +02:00
parent cc6ec98846
commit 4ff8c7c7eb
4 changed files with 47 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt
View file

@ -67,6 +67,8 @@ class AccountSettingsViewModel @UiThread constructor() : GenericViewModel() {
val audioVideoConferenceFactoryUri = MutableLiveData<String>()
val ccmpServerUrl = MutableLiveData<String>()
val limeServerUrl = MutableLiveData<String>()
val bundleModeEnabled = MutableLiveData<Boolean>()
@ -142,6 +144,8 @@ class AccountSettingsViewModel @UiThread constructor() : GenericViewModel() {
params.audioVideoConferenceFactoryAddress?.asStringUriOnly()
)
ccmpServerUrl.postValue(params.ccmpServerUrl)
limeServerUrl.postValue(params.limeServerUrl)
accountFoundEvent.postValue(Event(true))
@ -235,6 +239,7 @@ class AccountSettingsViewModel @UiThread constructor() : GenericViewModel() {
newParams.audioVideoConferenceFactoryAddress = null
}
newParams.ccmpServerUrl = ccmpServerUrl.value
newParams.limeServerUrl = limeServerUrl.value
account.params = newParams

46
app/src/main/res/layout/account_advanced_settings.xml
View file

@ -239,20 +239,22 @@
app:layout_constraintTop_toBottomOf="@id/bundle_mode_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
android:id="@+id/cpim_basic_chat_room_title"
style="@style/settings_title_style"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/account_settings_cpim_in_basic_conversations_title"
android:maxLines="2"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/account_settings_cpim_in_basic_conversations_title"
android:visibility="@{viewModel.imEncryptionMandatory ? View.GONE : View.VISIBLE}"
app:layout_constraintTop_toTopOf="@id/cpim_basic_chat_room_switch"
app:layout_constraintBottom_toBottomOf="@id/cpim_basic_chat_room_switch"
app:layout_constraintEnd_toStartOf="@id/cpim_basic_chat_room_switch"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/cpim_basic_chat_room_switch"/>
app:layout_constraintTop_toTopOf="@id/cpim_basic_chat_room_switch"
app:layout_constraintVertical_bias="1.0" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
@ -352,6 +354,38 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/audio_video_conference_factory_uri_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
android:id="@+id/ccmp_server_url_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/account_settings_ccmp_server_url_title"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toBottomOf="@id/audio_video_conference_factory_uri"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatEditText
style="@style/default_text_style"
android:id="@+id/ccmp_server_url"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:background="@drawable/edit_text_background"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@={viewModel.ccmpServerUrl}"
android:inputType="text|textUri"
android:hint="@string/account_settings_ccmp_server_url_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/ccmp_server_url_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
android:id="@+id/lime_server_title"
@ -363,7 +397,7 @@
android:text="@string/account_settings_lime_server_url_title"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toBottomOf="@id/audio_video_conference_factory_uri"
app:layout_constraintTop_toBottomOf="@id/ccmp_server_url"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

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

@ -303,6 +303,7 @@
<string name="account_settings_expire_title">Expiration (en secondes)</string>
<string name="account_settings_conference_factory_uri_title">URI de l\'usine à conversations</string>
<string name="account_settings_audio_video_conference_factory_uri_title">URI de l\'usine à réunions</string>
<string name="account_settings_ccmp_server_url_title">URL du serveur CCMP</string>
<string name="account_settings_lime_server_url_title">URL du serveur d\'échange de clés de chiffrement</string>
<string name="account_settings_bundle_mode_title">Mode "bundle"</string>
<string name="account_settings_cpim_in_basic_conversations_title">Utiliser CPIM dans les conversations \"basiques\"</string>

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

@ -340,6 +340,7 @@
<string name="account_settings_expire_title">Expire (in seconds)</string>
<string name="account_settings_conference_factory_uri_title">Conference factory URI</string>
<string name="account_settings_audio_video_conference_factory_uri_title">Audio/video conference factory URI</string>
<string name="account_settings_ccmp_server_url_title">CCMP server URL</string>
<string name="account_settings_lime_server_url_title">E2E encryption keys server URL</string>
<string name="account_settings_bundle_mode_title">Bundle mode</string>
<string name="account_settings_cpim_in_basic_conversations_title">Use CPIM in \"basic\" conversations</string>