From 9837a834d452577e3a4cfc29e389d643d62a770b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 17 Mar 2025 14:37:54 +0100
Subject: [PATCH] Added back "replace + by 00 when formatting phone numbers"
 account setting

---
 .../viewmodel/AccountSettingsViewModel.kt     |  4 +++
 .../java/org/linphone/utils/AudioUtils.kt     |  2 +-
 .../res/layout/account_settings_fragment.xml  | 29 ++++++++++++++++++-
 app/src/main/res/values-fr/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 35 insertions(+), 2 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 ea3c01c3b..bf9ef2f4f 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,8 @@ class AccountSettingsViewModel
     val mwiUri = MutableLiveData<String>()
     val voicemailUri = MutableLiveData<String>()
 
+    val replacePlusBy00 = MutableLiveData<Boolean>()
+
     val cpimInBasicChatRooms = MutableLiveData<Boolean>()
 
     val accountFoundEvent = MutableLiveData<Event<Boolean>>()
@@ -165,6 +167,7 @@ class AccountSettingsViewModel
 
                 mwiUri.postValue(params.mwiServerAddress?.asStringUriOnly().orEmpty())
                 voicemailUri.postValue(params.voicemailAddress?.asStringUriOnly().orEmpty())
+                replacePlusBy00.postValue(params.isDialEscapePlusEnabled)
 
                 expire.postValue(params.expires.toString())
 
@@ -298,6 +301,7 @@ class AccountSettingsViewModel
 
                 newParams.ccmpServerUrl = ccmpServerUrl.value
                 newParams.limeServerUrl = limeServerUrl.value
+                newParams.isDialEscapePlusEnabled = replacePlusBy00.value == true
 
                 account.params = newParams
                 Log.i("$TAG Changes have been saved")
diff --git a/app/src/main/java/org/linphone/utils/AudioUtils.kt b/app/src/main/java/org/linphone/utils/AudioUtils.kt
index d3057923d..cdf802573 100644
--- a/app/src/main/java/org/linphone/utils/AudioUtils.kt
+++ b/app/src/main/java/org/linphone/utils/AudioUtils.kt
@@ -230,7 +230,7 @@ class AudioUtils {
                 }
             }
             Log.i(
-                "$TAG Found headset/headphones/hearingAid sound card [$headsetCard], bluetooth sound card [$bluetoothCard] and microphone card [$microphoneCard]"
+                "$TAG Found headset/headphones sound card [$headsetCard], bluetooth/hearingAid sound card [$bluetoothCard] and microphone card [$microphoneCard]"
             )
             return headsetCard ?: bluetoothCard ?: microphoneCard
         }
diff --git a/app/src/main/res/layout/account_settings_fragment.xml b/app/src/main/res/layout/account_settings_fragment.xml
index 655aad1dc..904c34482 100644
--- a/app/src/main/res/layout/account_settings_fragment.xml
+++ b/app/src/main/res/layout/account_settings_fragment.xml
@@ -184,7 +184,6 @@
                             android:layout_height="50dp"
                             android:layout_marginEnd="16dp"
                             android:layout_marginStart="16dp"
-                            android:layout_marginBottom="20dp"
                             android:background="@drawable/edit_text_background"
                             android:paddingStart="20dp"
                             android:paddingEnd="20dp"
@@ -194,6 +193,34 @@
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toBottomOf="@id/mwi_uri_title"
+                            app:layout_constraintBottom_toTopOf="@id/replace_plus_by_00_switch"/>
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/settings_title_style"
+                            android:id="@+id/replace_plus_by_00_title"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginEnd="10dp"
+                            android:text="@string/account_settings_replace_plus_by_00_title"
+                            android:maxLines="2"
+                            android:ellipsize="end"
+                            app:layout_constraintTop_toTopOf="@id/replace_plus_by_00_switch"
+                            app:layout_constraintBottom_toBottomOf="@id/replace_plus_by_00_switch"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/replace_plus_by_00_switch"/>
+
+                        <com.google.android.material.materialswitch.MaterialSwitch
+                            style="@style/material_switch_style"
+                            android:id="@+id/replace_plus_by_00_switch"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:layout_marginEnd="16dp"
+                            android:layout_marginBottom="20dp"
+                            android:checked="@={viewModel.replacePlusBy00}"
+                            app:layout_constraintTop_toBottomOf="@id/mwi_uri"
+                            app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintBottom_toBottomOf="parent"/>
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e2d41d9e1..e42b94860 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -331,6 +331,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_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>
 
     <string name="account_settings_dialog_invalid_password_title">Autentification requise</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d72a82dc0..de6bc47d7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -370,6 +370,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_replace_plus_by_00_title">Replace + by 00 when formatting phone numbers</string>
     <string name="account_settings_update_password_title">Update password</string>
 
     <string name="account_settings_dialog_invalid_password_title">Authentication needed</string>