From f3178a0854917d67bef69b8b3a7e916a3cfd037f Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 21 Nov 2022 16:11:52 +0100 Subject: [PATCH] Prevent use of const friend in contact editor --- .../main/contact/fragments/ContactEditorFragment.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt index cdce1f3ff..43766bcff 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt @@ -30,6 +30,7 @@ import androidx.core.content.FileProvider import androidx.lifecycle.lifecycleScope import java.io.File import kotlinx.coroutines.launch +import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.R import org.linphone.activities.GenericFragment @@ -55,8 +56,9 @@ class ContactEditorFragment : GenericFragment(), S binding.lifecycleOwner = viewLifecycleOwner val contact = sharedViewModel.selectedContact.value - // TODO: FIXME: contact can be const! Find a way to get it not-const! - data = ContactEditorData(contact) + val contactRefKey = contact?.refKey + val friend = if (contactRefKey != null) coreContext.core.getFriendByRefKey(contactRefKey) else null + data = ContactEditorData(friend ?: contact) binding.viewModel = data useMaterialSharedAxisXForwardAnimation = sharedViewModel.isSlidingPaneSlideable.value == false