From 52cb8ca3a3640959e500e079954a20f8e787a6f3 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Sun, 16 Mar 2025 20:53:21 +0100 Subject: [PATCH] Prevent crash if not on contact fragment before navigating to editor --- app/src/main/java/org/linphone/ui/GenericActivity.kt | 1 - .../ui/main/contacts/fragment/ContactFragment.kt | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/GenericActivity.kt b/app/src/main/java/org/linphone/ui/GenericActivity.kt index 3471c2c28..6eb20d8d0 100644 --- a/app/src/main/java/org/linphone/ui/GenericActivity.kt +++ b/app/src/main/java/org/linphone/ui/GenericActivity.kt @@ -41,7 +41,6 @@ import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.R import org.linphone.compatibility.Compatibility import org.linphone.core.tools.Log -import org.linphone.ui.main.settings.fragment.SettingsFragment import org.linphone.utils.ToastUtils import org.linphone.utils.slideInToastFromTop import org.linphone.utils.slideInToastFromTopForDuration diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt index 40950ee1e..7ccb9d9d1 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt @@ -185,10 +185,13 @@ class ContactFragment : SlidingPaneChildFragment() { viewModel.openLinphoneContactEditor.observe(viewLifecycleOwner) { it.consume { refKey -> - val action = ContactFragmentDirections.actionContactFragmentToEditContactFragment( - refKey - ) - findNavController().navigate(action) + if (findNavController().currentDestination?.id == R.id.contactFragment) { + val action = + ContactFragmentDirections.actionContactFragmentToEditContactFragment( + refKey + ) + findNavController().navigate(action) + } } }