From 157c233ab1c08a4d5e2a99fbd3cb97b161b31598 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 31 Aug 2023 14:20:23 +0200
Subject: [PATCH] Fixed issue with abort confirmation dialog in new contact
 fragment

---
 .../contacts/fragment/NewContactFragment.kt   | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
index 76883baab..62019e1cc 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
@@ -24,6 +24,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.UiThread
@@ -59,6 +60,12 @@ class NewContactFragment : GenericFragment() {
         R.id.newContactFragment
     )
 
+    private val backPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            showAbortConfirmationDialog()
+        }
+    }
+
     private val pickMedia = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
         if (uri != null) {
             Log.i("$TAG Picture picked [$uri]")
@@ -84,6 +91,7 @@ class NewContactFragment : GenericFragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = ContactNewOrEditFragmentBinding.inflate(layoutInflater)
+
         return binding.root
     }
 
@@ -94,6 +102,11 @@ class NewContactFragment : GenericFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        requireActivity().onBackPressedDispatcher.addCallback(
+            viewLifecycleOwner,
+            backPressedCallback
+        )
+
         binding.lifecycleOwner = viewLifecycleOwner
         binding.viewModel = viewModel
 
@@ -110,8 +123,7 @@ class NewContactFragment : GenericFragment() {
         }
 
         binding.setBackClickListener {
-            goBack()
-            // TODO: confirmation dialog
+            showAbortConfirmationDialog()
         }
 
         binding.setPickImageClickListener {
@@ -121,6 +133,7 @@ class NewContactFragment : GenericFragment() {
         viewModel.saveChangesEvent.observe(viewLifecycleOwner) {
             it.consume { refKey ->
                 if (refKey.isNotEmpty()) {
+                    backPressedCallback.isEnabled = false
                     goBack()
                     sharedViewModel.showContactEvent.value = Event(refKey)
                 } else {
@@ -157,6 +170,11 @@ class NewContactFragment : GenericFragment() {
         sharedViewModel.contactEditorReadyToBeDisplayedEvent.value = Event(true)
     }
 
+    override fun onResume() {
+        super.onResume()
+        backPressedCallback.isEnabled = true
+    }
+
     private fun addCell(model: NewOrEditNumberOrAddressModel) {
         val inflater = requireContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val parent = if (model.isSip) binding.sipAddresses else binding.phoneNumbers
@@ -201,6 +219,7 @@ class NewContactFragment : GenericFragment() {
 
         model.confirmRemovalEvent.observe(viewLifecycleOwner) {
             it.consume {
+                backPressedCallback.isEnabled = false
                 goBack()
                 dialog.dismiss()
             }