Changed delete account into sign out (wording only)

app/src/main/java/org/linphone/ui/main/MainActivity.kt

@@ -620,7 +620,7 @@ class MainActivity : GenericActivity() {
                     Log.w(
                         "$TAG Closing already opened conversation to prevent attaching file in it directly"
                     )
-                    sharedViewModel.hideConversationEvent.postValue(Event(true))
+                    sharedViewModel.hideConversationEvent.value = Event(true)
                 } else {
                     Log.i("$TAG No chat room currently displayed, nothing to close")
                 }

app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt

@@ -164,8 +164,7 @@ class AccountProfileFragment : GenericMainFragment() {
             val model = ConfirmationDialogModel()
             val dialog = DialogUtils.getConfirmAccountRemovalDialog(
                 requireActivity(),
-                model,
-                viewModel.displayName.value.orEmpty()
+                model
             )
 
             model.dismissEvent.observe(viewLifecycleOwner) {

app/src/main/java/org/linphone/utils/DialogUtils.kt

@@ -122,8 +122,7 @@ class DialogUtils {
         @UiThread
         fun getConfirmAccountRemovalDialog(
             context: Context,
-            viewModel: ConfirmationDialogModel,
-            displayName: String
+            viewModel: ConfirmationDialogModel
         ): Dialog {
             val binding: DialogRemoveAccountBinding = DataBindingUtil.inflate(
                 LayoutInflater.from(context),
@@ -132,10 +131,6 @@ class DialogUtils {
                 false
             )
             binding.viewModel = viewModel
-            binding.title.text = context.getString(
-                R.string.manage_account_dialog_remove_account_title,
-                displayName
-            )
 
             return getDialog(context, binding)
         }

app/src/main/res/layout/account_profile_fragment.xml

@@ -534,7 +534,7 @@
                         android:layout_marginBottom="@dimen/screen_bottom_margin"
                         android:background="@drawable/action_background"
                         android:text="@string/manage_account_delete"
-                        android:drawableStart="@drawable/trash_simple"
+                        android:drawableStart="@drawable/sign_out"
                         app:layout_constraintTop_toBottomOf="@id/action_settings"
                         app:layout_constraintStart_toStartOf="@id/actions_background"
                         app:layout_constraintEnd_toEndOf="@id/actions_background"/>

app/src/main/res/layout/dialog_remove_account.xml

@@ -54,6 +54,8 @@
             android:layout_marginTop="10dp"
             android:text="@string/manage_account_dialog_remove_account_message"
             android:textSize="14sp"
+            android:autoLink="web"
+            android:textColorLink="?attr/color_main1_500"
             app:layout_constraintBottom_toTopOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"

app/src/main/res/values-fr/strings.xml

@@ -277,7 +277,7 @@
     <string name="manage_account_international_prefix">Indicatif international</string>
     <string name="manage_account_dialog_international_prefix_help_message">Choisisez votre pays pour permettre à &appName; de faire le lien avec vos contacts.</string>
     <string name="manage_account_settings">Paramètres de compte</string>
-    <string name="manage_account_delete">Supprimer le compte</string>
+    <string name="manage_account_delete">Se déconnecter</string>
     <string name="manage_account_choose_mode_title">Choisir le mode</string>
     <string name="manage_account_choose_mode_apply_label">Appliquer</string>
     <string name="manage_account_e2e_encrypted_mode_default_title">Chiffré de bout en bout</string>
@@ -286,8 +286,8 @@
     <string name="manage_account_e2e_encrypted_mode_interoperable_summary">Ce mode vous permet de profiter de toutes les fonctionnalités de &appName; tout en restant interopérable avec n’importe qu’elle autre service SIP.</string>
     <string name="manage_account_device_remove">Supprimer</string>
     <string name="manage_account_device_last_connection">Dernière connexion :</string>
-    <string name="manage_account_dialog_remove_account_title">Supprimer %s ?</string>
-    <string name="manage_account_dialog_remove_account_message">Vous pouvez vous reconnecter à tout moment en cliquant sur \"Ajouter un compte\" dans le menu latéral.\nCependant toutes les informations stockées sur ce périphérique seront supprimées.</string>
+    <string name="manage_account_dialog_remove_account_title">Se déconnecter du compte ?</string>
+    <string name="manage_account_dialog_remove_account_message">Si vous souhaitez supprimer définitivement votre compte rendez-vous sur : https://sip.linphone.org</string>
 
     <string name="account_settings_title">Paramètres de compte</string>
     <string name="account_settings_push_notification_title">Autoriser les notifications poussées</string>

app/src/main/res/values/strings.xml

@@ -314,7 +314,7 @@
     <string name="manage_account_international_prefix">International Prefix</string>
     <string name="manage_account_dialog_international_prefix_help_message">Pick your country to allow &appName; to match your contacts.</string>
     <string name="manage_account_settings">Account settings</string>
-    <string name="manage_account_delete">Delete account</string>
+    <string name="manage_account_delete">Sign out</string>
     <string name="manage_account_choose_mode_title">Choose account mode</string>
     <string name="manage_account_choose_mode_apply_label">Apply</string>
     <string name="manage_account_e2e_encrypted_mode_default_title">End-to-end encrypted mode</string>
@@ -323,8 +323,8 @@
     <string name="manage_account_e2e_encrypted_mode_interoperable_summary">This mode allows you to enjoy all &appName; features while staying interoperable with any SIP service through point-to-point encryption.</string>
     <string name="manage_account_device_remove">Remove</string>
     <string name="manage_account_device_last_connection">Last connection:</string>
-    <string name="manage_account_dialog_remove_account_title">Delete %s?</string>
-    <string name="manage_account_dialog_remove_account_message">You can reconnect at any time by clicking \“Add an account\”.\nHowever, all data on this phone will be deleted.</string>
+    <string name="manage_account_dialog_remove_account_title">Sign out of your account?</string>
+    <string name="manage_account_dialog_remove_account_message">If you wish to delete your account permanently, go to: https://sip.linphone.org</string>
 
     <string name="account_settings_title">Account settings</string>
     <string name="account_settings_push_notification_title">Allow push notifications</string>