diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt index f77dec41c..72fc995fd 100644 --- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt +++ b/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") } diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt index 1d6378ad8..e8bb258dc 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt +++ b/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) { diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt index 17c0cc7e5..be23b513a 100644 --- a/app/src/main/java/org/linphone/utils/DialogUtils.kt +++ b/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) } diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml index 312ba5e29..8831257c0 100644 --- a/app/src/main/res/layout/account_profile_fragment.xml +++ b/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"/> diff --git a/app/src/main/res/layout/dialog_remove_account.xml b/app/src/main/res/layout/dialog_remove_account.xml index e07b1776e..ed6690314 100644 --- a/app/src/main/res/layout/dialog_remove_account.xml +++ b/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" diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 8914ae951..7d59bc9a6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -277,7 +277,7 @@ Indicatif international Choisisez votre pays pour permettre à &appName; de faire le lien avec vos contacts. Paramètres de compte - Supprimer le compte + Se déconnecter Choisir le mode Appliquer Chiffré de bout en bout @@ -286,8 +286,8 @@ 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. Supprimer Dernière connexion : - Supprimer %s ? - 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. + Se déconnecter du compte ? + Si vous souhaitez supprimer définitivement votre compte rendez-vous sur : https://sip.linphone.org Paramètres de compte Autoriser les notifications poussées diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b6b017ba..e584f1816 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -314,7 +314,7 @@ International Prefix Pick your country to allow &appName; to match your contacts. Account settings - Delete account + Sign out Choose account mode Apply End-to-end encrypted mode @@ -323,8 +323,8 @@ This mode allows you to enjoy all &appName; features while staying interoperable with any SIP service through point-to-point encryption. Remove Last connection: - Delete %s? - You can reconnect at any time by clicking \“Add an account\”.\nHowever, all data on this phone will be deleted. + Sign out of your account? + If you wish to delete your account permanently, go to: https://sip.linphone.org Account settings Allow push notifications