From eeca0cc7cb03179d0e151d0da0bd6c52494fefda Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 20 Mar 2025 12:26:44 +0100
Subject: [PATCH] Added back apply prefix to phone numbers for calls & chat
 setting

---
 .../viewmodel/AccountSettingsViewModel.kt     |  5 ++++
 .../res/layout/account_settings_fragment.xml  | 29 ++++++++++++++++++-
 app/src/main/res/values-fr/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 35 insertions(+), 1 deletion(-)

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 bf9ef2f4f..4ee95049f 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
@@ -90,6 +90,7 @@ class AccountSettingsViewModel
     val mwiUri = MutableLiveData<String>()
     val voicemailUri = MutableLiveData<String>()
 
+    val applyPrefix = MutableLiveData<Boolean>()
     val replacePlusBy00 = MutableLiveData<Boolean>()
 
     val cpimInBasicChatRooms = MutableLiveData<Boolean>()
@@ -167,6 +168,8 @@ class AccountSettingsViewModel
 
                 mwiUri.postValue(params.mwiServerAddress?.asStringUriOnly().orEmpty())
                 voicemailUri.postValue(params.voicemailAddress?.asStringUriOnly().orEmpty())
+
+                applyPrefix.postValue(params.useInternationalPrefixForCallsAndChats)
                 replacePlusBy00.postValue(params.isDialEscapePlusEnabled)
 
                 expire.postValue(params.expires.toString())
@@ -301,6 +304,8 @@ class AccountSettingsViewModel
 
                 newParams.ccmpServerUrl = ccmpServerUrl.value
                 newParams.limeServerUrl = limeServerUrl.value
+
+                newParams.useInternationalPrefixForCallsAndChats = applyPrefix.value == true
                 newParams.isDialEscapePlusEnabled = replacePlusBy00.value == true
 
                 account.params = newParams
diff --git a/app/src/main/res/layout/account_settings_fragment.xml b/app/src/main/res/layout/account_settings_fragment.xml
index 904c34482..4370b094d 100644
--- a/app/src/main/res/layout/account_settings_fragment.xml
+++ b/app/src/main/res/layout/account_settings_fragment.xml
@@ -193,6 +193,33 @@
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toBottomOf="@id/mwi_uri_title"
+                            app:layout_constraintBottom_toTopOf="@id/apply_international_switch"/>
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/settings_title_style"
+                            android:id="@+id/apply_international_prefix_title"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginEnd="10dp"
+                            android:text="@string/account_settings_apply_international_prefix_title"
+                            android:maxLines="2"
+                            android:ellipsize="end"
+                            app:layout_constraintTop_toTopOf="@id/apply_international_switch"
+                            app:layout_constraintBottom_toBottomOf="@id/apply_international_switch"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/apply_international_switch"/>
+
+                        <com.google.android.material.materialswitch.MaterialSwitch
+                            style="@style/material_switch_style"
+                            android:id="@+id/apply_international_switch"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:layout_marginEnd="16dp"
+                            android:checked="@={viewModel.applyPrefix}"
+                            app:layout_constraintTop_toBottomOf="@id/mwi_uri"
+                            app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintBottom_toTopOf="@id/replace_plus_by_00_switch"/>
 
                         <androidx.appcompat.widget.AppCompatTextView
@@ -219,7 +246,7 @@
                             android:layout_marginEnd="16dp"
                             android:layout_marginBottom="20dp"
                             android:checked="@={viewModel.replacePlusBy00}"
-                            app:layout_constraintTop_toBottomOf="@id/mwi_uri"
+                            app:layout_constraintTop_toBottomOf="@id/apply_international_switch"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintBottom_toBottomOf="parent"/>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cda2e1177..15f72b2d5 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -333,6 +333,7 @@
     <string name="account_settings_cpim_in_basic_conversations_title">Utiliser CPIM dans les conversations \"basiques\"</string>
     <string name="account_settings_voicemail_uri_title">URI de la messagerie vocale</string>
     <string name="account_settings_mwi_uri_title">URI du serveur MWI (Message Waiting Indicator)</string>
+    <string name="account_settings_apply_international_prefix_title">Formatter les numéros en utilisant l\'indicatif international</string>
     <string name="account_settings_replace_plus_by_00_title">Remplacer + par 00 lors du formattage des numéros de téléphone</string>
     <string name="account_settings_update_password_title">Mettre à jour le mot de passe</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ec08ee5f1..0f29dc8f6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -373,6 +373,7 @@
     <string name="account_settings_cpim_in_basic_conversations_title">Use CPIM in \"basic\" conversations</string>
     <string name="account_settings_voicemail_uri_title">Voicemail URI</string>
     <string name="account_settings_mwi_uri_title"> MWI server URI (Message Waiting Indicator)</string>
+    <string name="account_settings_apply_international_prefix_title">Format phone numbers using international prefix</string>
     <string name="account_settings_replace_plus_by_00_title">Replace + by 00 when formatting phone numbers</string>
     <string name="account_settings_update_password_title">Update password</string>