From 544f37a75be13f728f2ba1b9601957b516ff7b17 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 21 Sep 2023 11:40:19 +0200 Subject: [PATCH] Hide message button if chat is disabled --- .../linphone/ui/main/calls/viewmodel/CallLogViewModel.kt | 9 +++++++++ .../ui/main/contacts/viewmodel/ContactViewModel.kt | 4 ++++ app/src/main/res/layout/call_fragment.xml | 2 ++ app/src/main/res/layout/contact_fragment.xml | 2 ++ 4 files changed, 17 insertions(+) diff --git a/app/src/main/java/org/linphone/ui/main/calls/viewmodel/CallLogViewModel.kt b/app/src/main/java/org/linphone/ui/main/calls/viewmodel/CallLogViewModel.kt index 0c644972d..033bc5e4c 100644 --- a/app/src/main/java/org/linphone/ui/main/calls/viewmodel/CallLogViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/calls/viewmodel/CallLogViewModel.kt @@ -4,6 +4,7 @@ import androidx.annotation.UiThread import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import org.linphone.LinphoneApplication.Companion.coreContext +import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.core.Address import org.linphone.core.Call import org.linphone.ui.main.calls.model.CallLogHistoryModel @@ -18,12 +19,20 @@ class CallLogViewModel @UiThread constructor() : ViewModel() { val historyCallLogs = MutableLiveData>() + val chatDisabled = MutableLiveData() + val historyDeletedEvent: MutableLiveData> by lazy { MutableLiveData>() } private lateinit var address: Address + init { + coreContext.postOnCoreThread { + chatDisabled.postValue(corePreferences.disableChat) + } + } + @UiThread fun findCallLogByCallId(callId: String) { coreContext.postOnCoreThread { core -> 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 37f4a69a3..9921bcceb 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 @@ -28,6 +28,7 @@ import java.io.File import java.util.Locale import kotlinx.coroutines.launch import org.linphone.LinphoneApplication.Companion.coreContext +import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.contacts.ContactsManager import org.linphone.contacts.getListOfSipAddressesAndPhoneNumbers import org.linphone.core.Friend @@ -65,6 +66,8 @@ class ContactViewModel @UiThread constructor() : ViewModel() { val contactFoundEvent = MutableLiveData>() + val chatDisabled = MutableLiveData() + val showLongPressMenuForNumberOrAddressEvent: MutableLiveData> by lazy { MutableLiveData>() } @@ -143,6 +146,7 @@ class ContactViewModel @UiThread constructor() : ViewModel() { expandDevicesTrust.value = false // TODO FIXME: set it to true when it will work for real coreContext.postOnCoreThread { + chatDisabled.postValue(corePreferences.disableChat) coreContext.contactsManager.addListener(contactsListener) } } diff --git a/app/src/main/res/layout/call_fragment.xml b/app/src/main/res/layout/call_fragment.xml index fe8aed355..27d9ad870 100644 --- a/app/src/main/res/layout/call_fragment.xml +++ b/app/src/main/res/layout/call_fragment.xml @@ -168,6 +168,7 @@