mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-27 16:49:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Using async mode of magic search

Browse source
This commit is contained in:
Sylvain Berfini 2022-02-22 11:43:10 +01:00
parent 7894311cdd
commit 16e59d8009
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt
View file

@ -28,6 +28,8 @@ import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.contact.Contact
import org.linphone.contact.ContactsUpdatedListenerStub
import org.linphone.contact.NativeContact
import org.linphone.core.MagicSearch
import org.linphone.core.MagicSearchListenerStub
import org.linphone.core.SearchResult
import org.linphone.core.tools.Log
@ -36,6 +38,8 @@ class ContactsListViewModel : ViewModel() {
val contactsList = MutableLiveData<ArrayList<ContactViewModel>>()
val fetchInProgress = MutableLiveData<Boolean>()
val filter = MutableLiveData<String>()
private var previousFilter = "NotSet"
@ -46,14 +50,24 @@ class ContactsListViewModel : ViewModel() {
}
}
private val magicSearchListener = object : MagicSearchListenerStub() {
override fun onSearchResultsReceived(magicSearch: MagicSearch) {
processMagicSearchResults(magicSearch.lastSearch)
fetchInProgress.value = false
}
}
init {
sipContactsSelected.value = coreContext.contactsManager.shouldDisplaySipContactsList()
fetchInProgress.value = false
coreContext.contactsManager.addListener(contactsUpdatedListener)
coreContext.contactsManager.magicSearch.addListener(magicSearchListener)
}
override fun onCleared() {
contactsList.value.orEmpty().forEach(ContactViewModel::destroy)
coreContext.contactsManager.magicSearch.removeListener(magicSearchListener)
coreContext.contactsManager.removeListener(contactsUpdatedListener)
super.onCleared()
@ -69,8 +83,11 @@ class ContactsListViewModel : ViewModel() {
previousFilter = filterValue
val domain = if (sipContactsSelected.value == true) coreContext.core.defaultAccount?.params?.domain ?: "" else ""
val results = coreContext.contactsManager.magicSearch.getContactListFromFilter(filterValue, domain)
fetchInProgress.value = true
coreContext.contactsManager.magicSearch.getContactListFromFilterAsync(filterValue, domain)
}
private fun processMagicSearchResults(results: Array<SearchResult>) {
val list = arrayListOf<ContactViewModel>()
for (result in results) {
val contact = searchMatchingContact(result) ?: Contact(searchResult = result)

4
app/src/main/res/layout/contact_master_fragment.xml
View file

@ -175,6 +175,10 @@
android:text="@string/no_contact"
android:visibility="@{!viewModel.sipContactsSelected &amp;&amp; viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
<include
layout="@layout/wait_layout"
app:visibility="@{viewModel.fetchInProgress}"/>
</RelativeLayout>
<View