From 4ff8c7c7eb0c40cd53844cc19fe3edf69d65f064 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 23 Oct 2024 23:03:33 +0200
Subject: [PATCH] Added CCMP server URL setting in advanced account params

---
 .../viewmodel/AccountSettingsViewModel.kt     |  5 ++
 .../res/layout/account_advanced_settings.xml  | 46 ++++++++++++++++---
 app/src/main/res/values-fr/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt
index 19da5d03e..0d1a9a163 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt
@@ -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
diff --git a/app/src/main/res/layout/account_advanced_settings.xml b/app/src/main/res/layout/account_advanced_settings.xml
index 556c6a644..bac5954a7 100644
--- a/app/src/main/res/layout/account_advanced_settings.xml
+++ b/app/src/main/res/layout/account_advanced_settings.xml
@@ -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"/>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d49831abe..0e776d70c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c13578079..0aedd85da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>