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 8d7c7f522..7b0929082 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 @@ -118,7 +118,7 @@ class ContactFragment : GenericFragment() { viewModel.showLongPressMenuForNumberOrAddressEvent.observe(viewLifecycleOwner) { it.consume { model -> - val modalBottomSheet = ContactNumberOrAddressMenuDialogFragment(model.isSip, { + val modalBottomSheet = ContactNumberOrAddressMenuDialogFragment(model.isSip, model.hasPresence, { // onDismiss model.selected.value = false }, { diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactNumberOrAddressMenuDialogFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactNumberOrAddressMenuDialogFragment.kt index 9f2adaba2..33bc68162 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactNumberOrAddressMenuDialogFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactNumberOrAddressMenuDialogFragment.kt @@ -31,6 +31,7 @@ import org.linphone.databinding.ContactNumberOrAddressLongPressMenuBinding @UiThread class ContactNumberOrAddressMenuDialogFragment( private val isSip: Boolean, + private val hideInviteMenu: Boolean, private val onDismiss: (() -> Unit)? = null, private val onCopyNumberOrAddressToClipboard: (() -> Unit)? = null, private val onInviteNumberOrAddress: (() -> Unit)? = null @@ -56,6 +57,7 @@ class ContactNumberOrAddressMenuDialogFragment( ): View { val view = ContactNumberOrAddressLongPressMenuBinding.inflate(layoutInflater) view.isSip = isSip + view.hideInvite = hideInviteMenu view.setCopyNumberOrAddressClickListener { onCopyNumberOrAddressToClipboard?.invoke() diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt index 81eaddb44..c3b82f32b 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt @@ -29,7 +29,8 @@ class ContactNumberOrAddressModel @UiThread constructor( val isEnabled: Boolean, private val listener: ContactNumberOrAddressClickListener, val isSip: Boolean = true, - val label: String = "" + val label: String = "", + val hasPresence: Boolean = true ) { val selected = MutableLiveData() diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt index 6679bef13..97c63cc0a 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt @@ -208,7 +208,8 @@ class ContactViewModel @UiThread constructor() : ViewModel() { enablePhoneNumbers, listener, false, - label + label, + presenceAddress != null ) addressesAndNumbers.add(data) } diff --git a/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml b/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml index fa6cd316f..7a5387292 100644 --- a/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml +++ b/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml @@ -13,6 +13,9 @@ +