From 8c6975a859b238b35b5f913358d54d8c991739ea Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 13 Mar 2023 13:02:32 +0100
Subject: [PATCH] Added account removal confirmation dialog

---
 CHANGELOG.md                                  |  1 +
 .../chat/fragments/MasterChatRoomsFragment.kt |  2 +
 .../fragments/DetailContactFragment.kt        |  2 +
 .../fragments/MasterContactsFragment.kt       |  2 +
 .../fragments/MasterCallLogsFragment.kt       |  2 +
 .../fragments/AccountSettingsFragment.kt      | 38 ++++++++++++
 .../viewmodels/AccountSettingsViewModel.kt    | 61 +++++++++++--------
 .../main/viewmodels/DialogViewModel.kt        |  2 +
 .../main/res/drawable/dialog_delete_icon.xml  |  7 +++
 app/src/main/res/layout/dialog.xml            | 11 ++++
 app/src/main/res/values-fr/strings.xml        |  3 +
 app/src/main/res/values/strings.xml           |  3 +
 12 files changed, 109 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/drawable/dialog_delete_icon.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58c73a7af..98bbc518d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Group changes to describe their impact on the project, as follows:
 
 ### Added
 - Showing short term presence for contacts whom publish it + added setting to disable it (enabled by default for sip.linphone.org accounts)
+- Confirmation dialog before removing account
 
 ### Changed
 - Account EXPIRES is now set to 1 month instead of 1 year for sip.linphone.org accounts
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
index 3769c87a2..3ddf12b51 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
@@ -191,6 +191,8 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
 
             override fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder) {
                 val viewModel = DialogViewModel(getString(R.string.chat_room_delete_one_dialog))
+                viewModel.showIcon = true
+                viewModel.iconResource = R.drawable.dialog_delete_icon
                 val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
 
                 val index = viewHolder.bindingAdapterPosition
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt
index 49d6f8ee9..ed0445386 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt
@@ -162,6 +162,8 @@ class DetailContactFragment : GenericFragment<ContactDetailFragmentBinding>() {
 
     private fun confirmContactRemoval() {
         val dialogViewModel = DialogViewModel(getString(R.string.contact_delete_one_dialog))
+        dialogViewModel.showIcon = true
+        dialogViewModel.iconResource = R.drawable.dialog_delete_icon
         val dialog: Dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
 
         dialogViewModel.showCancelButton {
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
index 76b7acf52..b1b725f07 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
@@ -154,6 +154,8 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
 
             override fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder) {
                 val viewModel = DialogViewModel(getString(R.string.contact_delete_one_dialog))
+                viewModel.showIcon = true
+                viewModel.iconResource = R.drawable.dialog_delete_icon
                 val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
 
                 val index = viewHolder.bindingAdapterPosition
diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
index 146f2f363..67c04e2fb 100644
--- a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
@@ -142,6 +142,8 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
 
             override fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder) {
                 val viewModel = DialogViewModel(getString(R.string.history_delete_one_dialog))
+                viewModel.showIcon = true
+                viewModel.iconResource = R.drawable.dialog_delete_icon
                 val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
 
                 val index = viewHolder.bindingAdapterPosition
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/AccountSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/AccountSettingsFragment.kt
index 5ee6034dc..41688eb5c 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/AccountSettingsFragment.kt
@@ -19,16 +19,20 @@
  */
 package org.linphone.activities.main.settings.fragments
 
+import android.app.Dialog
 import android.os.Bundle
 import android.view.View
 import androidx.core.view.doOnPreDraw
 import androidx.lifecycle.ViewModelProvider
+import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.R
 import org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModel
 import org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModelFactory
+import org.linphone.activities.main.viewmodels.DialogViewModel
 import org.linphone.activities.navigateToPhoneLinking
 import org.linphone.core.tools.Log
 import org.linphone.databinding.SettingsAccountFragmentBinding
+import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
 
 class AccountSettingsFragment : GenericSettingFragment<SettingsAccountFragmentBinding>() {
@@ -100,6 +104,40 @@ class AccountSettingsFragment : GenericSettingFragment<SettingsAccountFragmentBi
             }
         }
 
+        viewModel.deleteAccountRequiredEvent.observe(
+            viewLifecycleOwner
+        ) {
+            it.consume {
+                val defaultDomainAccount = viewModel.account.params.identityAddress?.domain == corePreferences.defaultDomain
+                Log.i("[Account Settings] User clicked on delete account, showing confirmation dialog for ${if (defaultDomainAccount) "default domain account" else "third party account"}")
+                val dialogViewModel = if (defaultDomainAccount) {
+                    DialogViewModel(getString(R.string.account_setting_delete_sip_linphone_org_confirmation_dialog), getString(R.string.account_setting_delete_dialog_title))
+                } else {
+                    DialogViewModel(getString(R.string.account_setting_delete_generic_confirmation_dialog), getString(R.string.account_setting_delete_dialog_title))
+                }
+                val dialog: Dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
+
+                dialogViewModel.showIcon = true
+                dialogViewModel.iconResource = R.drawable.dialog_delete_icon
+                dialogViewModel.showSubscribeLinphoneOrgLink = defaultDomainAccount
+
+                dialogViewModel.showCancelButton {
+                    Log.i("[Account Settings] User cancelled account removal")
+                    dialog.dismiss()
+                }
+
+                dialogViewModel.showDeleteButton(
+                    {
+                        viewModel.startDeleteAccount()
+                        dialog.dismiss()
+                    },
+                    getString(R.string.dialog_delete)
+                )
+
+                dialog.show()
+            }
+        }
+
         view.doOnPreDraw {
             // Notifies fragment is ready to be drawn
             sharedViewModel.accountSettingsFragmentOpenedEvent.value = Event(true)
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
index d1efc536d..47a7ed980 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
@@ -89,7 +89,7 @@ class AccountSettingsViewModel(val account: Account) : GenericSettingsViewModel(
             message: String
         ) {
             if (state == RegistrationState.Cleared && account == accountToDelete) {
-                Log.i("[Account Settings] Account to remove registration is now cleared")
+                Log.i("[Account Settings] Account to remove ([${account.params.identityAddress?.asStringUriOnly()}]) registration is now cleared, removing it")
                 waitForUnregister.value = false
                 deleteAccount(account)
             } else {
@@ -236,35 +236,16 @@ class AccountSettingsViewModel(val account: Account) : GenericSettingsViewModel(
         }
 
         core.removeAccount(account)
+        accountToDelete = null
         accountRemovedEvent.value = Event(true)
     }
 
+    val deleteAccountRequiredEvent: MutableLiveData<Event<Boolean>> by lazy {
+        MutableLiveData<Event<Boolean>>()
+    }
     val deleteListener = object : SettingListenerStub() {
         override fun onClicked() {
-            accountToDelete = account
-
-            val registered = account.state == RegistrationState.Ok
-            waitForUnregister.value = registered
-
-            if (core.defaultAccount == account) {
-                Log.i("[Account Settings] Account was default, let's look for a replacement")
-                for (accountIterator in core.accountList) {
-                    if (account != accountIterator) {
-                        core.defaultAccount = accountIterator
-                        Log.i("[Account Settings] New default account is $accountIterator")
-                        break
-                    }
-                }
-            }
-
-            val params = account.params.clone()
-            params.isRegisterEnabled = false
-            account.params = params
-
-            if (!registered) {
-                Log.w("[Account Settings] Account isn't registered, don't unregister before removing it")
-                deleteAccount(account)
-            }
+            deleteAccountRequiredEvent.value = Event(true)
         }
     }
 
@@ -527,4 +508,34 @@ class AccountSettingsViewModel(val account: Account) : GenericSettingsViewModel(
         transportLabels.value = labels
         transportIndex.value = account.params.transport.toInt()
     }
+
+    fun startDeleteAccount() {
+        Log.i("[Account Settings] Starting to delete account [${account.params.identityAddress?.asStringUriOnly()}]")
+        accountToDelete = account
+
+        val registered = account.state == RegistrationState.Ok
+        waitForUnregister.value = registered
+
+        if (core.defaultAccount == account) {
+            Log.i("[Account Settings] Account was default, let's look for a replacement")
+            for (accountIterator in core.accountList) {
+                if (account != accountIterator) {
+                    core.defaultAccount = accountIterator
+                    Log.i("[Account Settings] New default account is [${accountIterator.params.identityAddress?.asStringUriOnly()}]")
+                    break
+                }
+            }
+        }
+
+        val params = account.params.clone()
+        params.isRegisterEnabled = false
+        account.params = params
+
+        if (!registered) {
+            Log.w("[Account Settings] Account isn't registered, don't unregister before removing it")
+            deleteAccount(account)
+        } else {
+            Log.i("[Account Settings] Waiting for account registration to be cleared before removing it")
+        }
+    }
 }
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/DialogViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/DialogViewModel.kt
index 050821270..85299b292 100644
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/DialogViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/viewmodels/DialogViewModel.kt
@@ -40,6 +40,8 @@ class DialogViewModel(val message: String, val title: String = "") : ViewModel()
 
     var iconResource: Int = 0
 
+    var showSubscribeLinphoneOrgLink: Boolean = false
+
     val doNotAskAgain = MutableLiveData<Boolean>()
 
     val dismissEvent = MutableLiveData<Event<Boolean>>()
diff --git a/app/src/main/res/drawable/dialog_delete_icon.xml b/app/src/main/res/drawable/dialog_delete_icon.xml
new file mode 100644
index 000000000..bf1d1d574
--- /dev/null
+++ b/app/src/main/res/drawable/dialog_delete_icon.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/menu_delete_default"
+            android:tint="@color/white_color"/>
+    </item>
+</selector>
diff --git a/app/src/main/res/layout/dialog.xml b/app/src/main/res/layout/dialog.xml
index 74aa030fd..e2c95b406 100644
--- a/app/src/main/res/layout/dialog.xml
+++ b/app/src/main/res/layout/dialog.xml
@@ -43,6 +43,17 @@
             android:gravity="center"
             android:text="@{viewModel.message, default=Message}"/>
 
+        <TextView
+            android:textColor="?attr/accentColor"
+            android:textSize="16sp"
+            android:textColorLink="@color/primary_color"
+            android:autoLink="web"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/assistant_forgotten_password_link"
+            android:visibility="@{viewModel.showSubscribeLinphoneOrgLink ? View.VISIBLE : View.GONE}" />
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 53eb565b7..07721a1a7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -765,4 +765,7 @@
     <string name="chat_room_presence_last_seen_online_today">En ligne aujourd\'hui à</string>
     <string name="chat_room_presence_last_seen_online_yesterday">En ligne hier à</string>
     <string name="chat_room_presence_last_seen_online">En ligne le</string>
+    <string name="account_setting_delete_dialog_title">Voulez-vous supprimer votre compte ?</string>
+    <string name="account_setting_delete_generic_confirmation_dialog">Votre compte sera supprimé localement.\nPour le supprimer de manière définitive, rendez-vous sur le site internet de votre fournisseur SIP.</string>
+    <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">Votre compte sera supprimé localement.\nPour le supprimer de manière définitive, rendez-vous sur notre plateforme de gestion des comptes :</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 894449b0c..abf90cdeb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -707,6 +707,9 @@
     <string name="account_setting_audio_video_conference_factory_address">Audio/video conference factory URI</string>
     <string name="account_setting_end_to_end_encryption_keys_server_url">E2E encryption keys server URL</string>
     <string name="account_setting_publish_presence_title">Publish presence information</string>
+    <string name="account_setting_delete_dialog_title">Do you want to delete your account?</string>
+    <string name="account_setting_delete_generic_confirmation_dialog">Your account will only be deleted locally.\nTo delete it permanently, go on your SIP provider website.</string>
+    <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">Your account will only be deleted locally.\nTo delete it permanently, go to our account management platform:</string>
 
     <!-- Conferences settings -->
     <string name="conferences_settings_layout_title">Default layout</string>