mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved genericity related to contact / suggestion picker

Browse source
This commit is contained in:
Sylvain Berfini 2023-10-24 10:22:50 +02:00
parent 5847e7d2c2
commit d9d7508292
14 changed files with 349 additions and 451 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
View file

@ -128,7 +128,7 @@ class ConversationInfoFragment : GenericFragment() {
}
binding.setAddParticipantsClickListener {
val action = ConversationInfoFragmentDirections.actionConversationInfoFragmentToAddParticipantToConversationFragment()
val action = ConversationInfoFragmentDirections.actionConversationInfoFragmentToAddParticipantsFragment()
findNavController().navigate(action)
}
}

42
app/src/main/java/org/linphone/ui/main/chat/fragment/StartConversationFragment.kt
View file

@ -27,8 +27,6 @@ import androidx.annotation.UiThread
import androidx.annotation.WorkerThread
import androidx.core.view.doOnPreDraw
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R
import org.linphone.core.Address
import org.linphone.core.Friend
@ -37,8 +35,6 @@ import org.linphone.databinding.StartChatFragmentBinding
import org.linphone.ui.main.MainActivity
import org.linphone.ui.main.chat.viewmodel.StartConversationViewModel
import org.linphone.ui.main.fragment.GenericAddressPickerFragment
import org.linphone.ui.main.history.adapter.ContactsAndSuggestionsListAdapter
import org.linphone.ui.main.model.SelectedAddressModel
import org.linphone.utils.Event
@UiThread
@ -49,9 +45,7 @@ class StartConversationFragment : GenericAddressPickerFragment() {
private lateinit var binding: StartChatFragmentBinding
private lateinit var viewModel: StartConversationViewModel
private lateinit var adapter: ContactsAndSuggestionsListAdapter
override lateinit var viewModel: StartConversationViewModel
override fun onCreateView(
inflater: LayoutInflater,
@ -63,31 +57,22 @@ class StartConversationFragment : GenericAddressPickerFragment() {
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
viewModel = ViewModelProvider(this)[StartConversationViewModel::class.java]
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner
viewModel = ViewModelProvider(this)[StartConversationViewModel::class.java]
binding.viewModel = viewModel
binding.setBackClickListener {
goBack()
}
adapter = ContactsAndSuggestionsListAdapter(viewLifecycleOwner)
binding.contactsList.setHasFixedSize(true)
binding.contactsList.adapter = adapter
setupRecyclerView(binding.contactsList)
adapter.contactClickedEvent.observe(viewLifecycleOwner) {
it.consume { model ->
handleClickOnContactModel(model)
}
}
binding.contactsList.layoutManager = LinearLayoutManager(requireContext())
viewModel.contactsList.observe(
viewModel.contactsAndSuggestionsList.observe(
viewLifecycleOwner
) {
Log.i("$TAG Contacts & suggestions list is ready with [${it.size}] items")
@ -118,11 +103,6 @@ class StartConversationFragment : GenericAddressPickerFragment() {
}
}
viewModel.searchFilter.observe(viewLifecycleOwner) { filter ->
val trimmed = filter.trim()
viewModel.applyFilter(trimmed)
}
sharedViewModel.defaultAccountChangedEvent.observe(viewLifecycleOwner) {
// Do not consume it!
viewModel.updateGroupChatButtonVisibility()
@ -130,15 +110,7 @@ class StartConversationFragment : GenericAddressPickerFragment() {
}
@WorkerThread
override fun onAddressSelected(address: Address, friend: Friend) {
if (viewModel.multipleSelectionMode.value == true) {
val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(address)
val model = SelectedAddressModel(address, avatarModel) {
viewModel.removeAddressModelFromSelection(it)
}
viewModel.addAddressModelToSelection(model)
} else {
viewModel.createOneToOneChatRoomWith(address)
}
override fun onSingleAddressSelected(address: Address, friend: Friend) {
viewModel.createOneToOneChatRoomWith(address)
}
}

141
app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt
View file

@ -23,20 +23,14 @@ import androidx.annotation.UiThread
import androidx.annotation.WorkerThread
import androidx.lifecycle.MediatorLiveData
import androidx.lifecycle.MutableLiveData
import kotlin.collections.ArrayList
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.R
import org.linphone.contacts.ContactsManager.ContactsListener
import org.linphone.core.Address
import org.linphone.core.ChatRoom
import org.linphone.core.ChatRoomListenerStub
import org.linphone.core.ChatRoomParams
import org.linphone.core.MagicSearch
import org.linphone.core.MagicSearchListenerStub
import org.linphone.core.SearchResult
import org.linphone.core.tools.Log
import org.linphone.ui.main.history.model.ContactOrSuggestionModel
import org.linphone.ui.main.model.isInSecureMode
import org.linphone.ui.main.viewmodel.AddressSelectionViewModel
import org.linphone.utils.AppUtils
@ -48,10 +42,6 @@ class StartConversationViewModel @UiThread constructor() : AddressSelectionViewM
private const val TAG = "[Start Conversation ViewModel]"
}
val searchFilter = MutableLiveData<String>()
val contactsList = MutableLiveData<ArrayList<ContactOrSuggestionModel>>()
val hideGroupChatButton = MutableLiveData<Boolean>()
val subject = MutableLiveData<String>()
@ -96,33 +86,6 @@ class StartConversationViewModel @UiThread constructor() : AddressSelectionViewM
}
}
private var currentFilter = ""
private var previousFilter = "NotSet"
private var limitSearchToLinphoneAccounts = true
private lateinit var magicSearch: MagicSearch
private val magicSearchListener = object : MagicSearchListenerStub() {
@WorkerThread
override fun onSearchResultsReceived(magicSearch: MagicSearch) {
Log.i("$TAG Magic search contacts available")
processMagicSearchResults(magicSearch.lastSearch)
}
}
private val contactsListener = object : ContactsListener {
@WorkerThread
override fun onContactsLoaded() {
Log.i("$TAG Contacts have been (re)loaded, updating list")
applyFilter(
currentFilter,
if (limitSearchToLinphoneAccounts) corePreferences.defaultDomain else "",
MagicSearch.Source.Friends.toInt(),
MagicSearch.Aggregation.Friend
)
}
}
init {
groupChatRoomCreateButtonEnabled.postValue(false)
groupChatRoomCreateButtonEnabled.addSource(selection) {
@ -137,32 +100,6 @@ class StartConversationViewModel @UiThread constructor() : AddressSelectionViewM
}
updateGroupChatButtonVisibility()
coreContext.postOnCoreThread { core ->
val defaultAccount = core.defaultAccount
limitSearchToLinphoneAccounts = defaultAccount?.isInSecureMode() ?: false
coreContext.contactsManager.addListener(contactsListener)
magicSearch = core.createMagicSearch()
magicSearch.limitedSearch = false
magicSearch.addListener(magicSearchListener)
}
applyFilter(currentFilter)
}
@UiThread
override fun onCleared() {
coreContext.postOnCoreThread {
magicSearch.removeListener(magicSearchListener)
coreContext.contactsManager.removeListener(contactsListener)
}
super.onCleared()
}
@UiThread
fun clearFilter() {
searchFilter.value = ""
}
@UiThread
@ -341,82 +278,4 @@ class StartConversationViewModel @UiThread constructor() : AddressSelectionViewM
hideGroupChatButton.postValue(hideGroupChat)
}
}
@WorkerThread
fun processMagicSearchResults(results: Array<SearchResult>) {
Log.i("$TAG Processing [${results.size}] results")
val contactsList = arrayListOf<ContactOrSuggestionModel>()
var previousLetter = ""
for (result in results) {
val address = result.address
if (address != null) {
val friend = coreContext.contactsManager.findContactByAddress(address)
if (friend != null) {
val model = ContactOrSuggestionModel(address, friend)
val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(
address
)
model.avatarModel.postValue(avatarModel)
val currentLetter = friend.name?.get(0).toString()
val displayLetter = previousLetter.isEmpty() || currentLetter != previousLetter
if (currentLetter != previousLetter) {
previousLetter = currentLetter
}
avatarModel.firstContactStartingByThatLetter.postValue(
displayLetter
)
contactsList.add(model)
}
}
}
val list = arrayListOf<ContactOrSuggestionModel>()
list.addAll(contactsList)
this.contactsList.postValue(list)
Log.i("$TAG Processed [${results.size}] results, extracted [${list.size}] suggestions")
}
@UiThread
fun applyFilter(filter: String) {
coreContext.postOnCoreThread {
applyFilter(
filter,
if (limitSearchToLinphoneAccounts) corePreferences.defaultDomain else "",
MagicSearch.Source.Friends.toInt(),
MagicSearch.Aggregation.Friend
)
}
}
@WorkerThread
private fun applyFilter(
filter: String,
domain: String,
sources: Int,
aggregation: MagicSearch.Aggregation
) {
if (previousFilter.isNotEmpty() && (
previousFilter.length > filter.length ||
(previousFilter.length == filter.length && previousFilter != filter)
)
) {
magicSearch.resetSearchCache()
}
currentFilter = filter
previousFilter = filter
Log.i(
"$TAG Asking Magic search for contacts matching filter [$filter], domain [$domain] and in sources [$sources]"
)
magicSearch.getContactsListAsync(
filter,
domain,
sources,
aggregation
)
}
}

46
app/src/main/java/org/linphone/ui/main/chat/fragment/AddParticipantToConversationFragment.kt → app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt
View file

@ -17,32 +17,38 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.linphone.ui.main.chat.fragment
package org.linphone.ui.main.fragment
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.annotation.UiThread
import androidx.core.view.doOnPreDraw
import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController
import org.linphone.databinding.ChatAddParticipantFragmentBinding
import org.linphone.ui.main.chat.viewmodel.ConversationAddParticipantViewModel
import org.linphone.ui.main.fragment.GenericFragment
import org.linphone.core.Address
import org.linphone.core.Friend
import org.linphone.core.tools.Log
import org.linphone.databinding.GenericAddParticipantsFragmentBinding
import org.linphone.ui.main.viewmodel.AddParticipantsViewModel
@UiThread
class AddParticipantToConversationFragment : GenericFragment() {
class AddParticipantsFragment : GenericAddressPickerFragment() {
companion object {
private const val TAG = "[Add Participants Fragment]"
}
private lateinit var binding: ChatAddParticipantFragmentBinding
private lateinit var binding: GenericAddParticipantsFragmentBinding
private lateinit var viewModel: ConversationAddParticipantViewModel
override lateinit var viewModel: AddParticipantsViewModel
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
binding = ChatAddParticipantFragmentBinding.inflate(layoutInflater)
binding = GenericAddParticipantsFragmentBinding.inflate(layoutInflater)
return binding.root
}
@ -51,19 +57,41 @@ class AddParticipantToConversationFragment : GenericFragment() {
return true
}
override fun onSingleAddressSelected(address: Address, friend: Friend) {
Log.e("$TAG This shouldn't happen as we should always be in multiple selection mode here!")
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
// This fragment is displayed in a SlidingPane "child" area
isSlidingPaneChild = true
viewModel = ViewModelProvider(this)[AddParticipantsViewModel::class.java]
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner
viewModel = ViewModelProvider(this)[ConversationAddParticipantViewModel::class.java]
binding.viewModel = viewModel
binding.setBackClickListener {
goBack()
}
setupRecyclerView(binding.contactsList)
viewModel.contactsAndSuggestionsList.observe(
viewLifecycleOwner
) {
Log.i("$TAG Contacts & suggestions list is ready with [${it.size}] items")
val count = adapter.itemCount
adapter.submitList(it)
if (count == 0) {
(view.parent as? ViewGroup)?.doOnPreDraw {
startPostponedEnterTransition()
}
}
}
}
}

69
app/src/main/java/org/linphone/ui/main/fragment/GenericAddressPickerFragment.kt
View file

@ -20,8 +20,12 @@
package org.linphone.ui.main.fragment
import android.app.Dialog
import android.os.Bundle
import android.view.View
import androidx.annotation.UiThread
import androidx.annotation.WorkerThread
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.contacts.getListOfSipAddressesAndPhoneNumbers
import org.linphone.core.Address
@ -30,9 +34,13 @@ import org.linphone.core.tools.Log
import org.linphone.ui.main.contacts.model.ContactNumberOrAddressClickListener
import org.linphone.ui.main.contacts.model.ContactNumberOrAddressModel
import org.linphone.ui.main.contacts.model.NumberOrAddressPickerDialogModel
import org.linphone.ui.main.history.adapter.ContactsAndSuggestionsListAdapter
import org.linphone.ui.main.history.model.ContactOrSuggestionModel
import org.linphone.ui.main.model.SelectedAddressModel
import org.linphone.ui.main.model.isInSecureMode
import org.linphone.ui.main.viewmodel.AddressSelectionViewModel
import org.linphone.utils.DialogUtils
import org.linphone.utils.RecyclerViewHeaderDecoration
@UiThread
abstract class GenericAddressPickerFragment : GenericFragment() {
@ -42,15 +50,9 @@ abstract class GenericAddressPickerFragment : GenericFragment() {
private var numberOrAddressPickerDialog: Dialog? = null
@WorkerThread
abstract fun onAddressSelected(address: Address, friend: Friend)
protected lateinit var adapter: ContactsAndSuggestionsListAdapter
override fun onPause() {
super.onPause()
numberOrAddressPickerDialog?.dismiss()
numberOrAddressPickerDialog = null
}
protected abstract val viewModel: AddressSelectionViewModel
private val listener = object : ContactNumberOrAddressClickListener {
@UiThread
@ -74,6 +76,57 @@ abstract class GenericAddressPickerFragment : GenericFragment() {
}
}
@WorkerThread
abstract fun onSingleAddressSelected(address: Address, friend: Friend)
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
adapter = ContactsAndSuggestionsListAdapter(viewLifecycleOwner)
adapter.contactClickedEvent.observe(viewLifecycleOwner) {
it.consume { model ->
handleClickOnContactModel(model)
}
}
viewModel.searchFilter.observe(viewLifecycleOwner) { filter ->
val trimmed = filter.trim()
viewModel.applyFilter(trimmed)
}
}
override fun onPause() {
super.onPause()
numberOrAddressPickerDialog?.dismiss()
numberOrAddressPickerDialog = null
}
@UiThread
protected fun setupRecyclerView(recyclerView: RecyclerView) {
recyclerView.setHasFixedSize(true)
recyclerView.adapter = adapter
val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter, true)
recyclerView.addItemDecoration(headerItemDecoration)
recyclerView.layoutManager = LinearLayoutManager(requireContext())
}
@WorkerThread
fun onAddressSelected(address: Address, friend: Friend) {
if (viewModel.multipleSelectionMode.value == true) {
val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(address)
val model = SelectedAddressModel(address, avatarModel) {
viewModel.removeAddressModelFromSelection(it)
}
viewModel.addAddressModelToSelection(model)
} else {
onSingleAddressSelected(address, friend)
}
}
protected fun handleClickOnContactModel(model: ContactOrSuggestionModel) {
coreContext.postOnCoreThread { core ->
val friend = model.friend

35
app/src/main/java/org/linphone/ui/main/history/fragment/StartCallFragment.kt
View file

@ -26,8 +26,7 @@ import android.view.ViewGroup
import androidx.annotation.UiThread
import androidx.annotation.WorkerThread
import androidx.core.view.doOnPreDraw
import androidx.navigation.navGraphViewModels
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.lifecycle.ViewModelProvider
import com.google.android.material.bottomsheet.BottomSheetBehavior
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R
@ -36,9 +35,7 @@ import org.linphone.core.Friend
import org.linphone.core.tools.Log
import org.linphone.databinding.StartCallFragmentBinding
import org.linphone.ui.main.fragment.GenericAddressPickerFragment
import org.linphone.ui.main.history.adapter.ContactsAndSuggestionsListAdapter
import org.linphone.ui.main.history.viewmodel.StartCallViewModel
import org.linphone.utils.RecyclerViewHeaderDecoration
import org.linphone.utils.addCharacterAtPosition
import org.linphone.utils.hideKeyboard
import org.linphone.utils.removeCharacterAtPosition
@ -53,11 +50,7 @@ class StartCallFragment : GenericAddressPickerFragment() {
private lateinit var binding: StartCallFragmentBinding
private val viewModel: StartCallViewModel by navGraphViewModels(
R.id.main_nav_graph
)
private lateinit var adapter: ContactsAndSuggestionsListAdapter
override lateinit var viewModel: StartCallViewModel
override fun onCreateView(
inflater: LayoutInflater,
@ -69,6 +62,8 @@ class StartCallFragment : GenericAddressPickerFragment() {
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
viewModel = ViewModelProvider(this)[StartCallViewModel::class.java]
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
@ -85,20 +80,7 @@ class StartCallFragment : GenericAddressPickerFragment() {
viewModel.hideNumpad()
}
adapter = ContactsAndSuggestionsListAdapter(viewLifecycleOwner)
binding.contactsAndSuggestionsList.setHasFixedSize(true)
binding.contactsAndSuggestionsList.adapter = adapter
val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter, true)
binding.contactsAndSuggestionsList.addItemDecoration(headerItemDecoration)
adapter.contactClickedEvent.observe(viewLifecycleOwner) {
it.consume { model ->
handleClickOnContactModel(model)
}
}
binding.contactsAndSuggestionsList.layoutManager = LinearLayoutManager(requireContext())
setupRecyclerView(binding.contactsAndSuggestionsList)
viewModel.contactsAndSuggestionsList.observe(
viewLifecycleOwner
@ -114,11 +96,6 @@ class StartCallFragment : GenericAddressPickerFragment() {
}
}
viewModel.searchFilter.observe(viewLifecycleOwner) { filter ->
val trimmed = filter.trim()
viewModel.applyFilter(trimmed)
}
viewModel.removedCharacterAtCurrentPositionEvent.observe(viewLifecycleOwner) {
it.consume {
binding.searchBar.removeCharacterAtPosition()
@ -165,7 +142,7 @@ class StartCallFragment : GenericAddressPickerFragment() {
}
@WorkerThread
override fun onAddressSelected(address: Address, friend: Friend) {
override fun onSingleAddressSelected(address: Address, friend: Friend) {
coreContext.startCall(address)
}

167
app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt
View file

@ -20,37 +20,25 @@
package org.linphone.ui.main.history.viewmodel
import androidx.annotation.UiThread
import androidx.annotation.WorkerThread
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import java.util.ArrayList
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.contacts.ContactsManager.ContactsListener
import org.linphone.core.MagicSearch
import org.linphone.core.MagicSearchListenerStub
import org.linphone.core.SearchResult
import org.linphone.core.tools.Log
import org.linphone.ui.main.history.model.ContactOrSuggestionModel
import org.linphone.ui.main.history.model.NumpadModel
import org.linphone.ui.main.model.isInSecureMode
import org.linphone.ui.main.viewmodel.AddressSelectionViewModel
import org.linphone.utils.Event
import org.linphone.utils.LinphoneUtils
class StartCallViewModel @UiThread constructor() : ViewModel() {
class StartCallViewModel @UiThread constructor() : AddressSelectionViewModel() {
companion object {
private const val TAG = "[Start Call ViewModel]"
}
val title = MutableLiveData<String>()
val searchFilter = MutableLiveData<String>()
val contactsAndSuggestionsList = MutableLiveData<ArrayList<ContactOrSuggestionModel>>()
val numpadModel: NumpadModel
val hideGroupCallButton = MutableLiveData<Boolean>()
@ -71,33 +59,6 @@ class StartCallViewModel @UiThread constructor() : ViewModel() {
MutableLiveData<Event<Boolean>>()
}
private var currentFilter = ""
private var previousFilter = "NotSet"
private var limitSearchToLinphoneAccounts = true
private lateinit var magicSearch: MagicSearch
private val magicSearchListener = object : MagicSearchListenerStub() {
@WorkerThread
override fun onSearchResultsReceived(magicSearch: MagicSearch) {
Log.i("$TAG Magic search contacts available")
processMagicSearchResults(magicSearch.lastSearch)
}
}
private val contactsListener = object : ContactsListener {
@WorkerThread
override fun onContactsLoaded() {
Log.i("$TAG Contacts have been (re)loaded, updating list")
applyFilter(
currentFilter,
if (limitSearchToLinphoneAccounts) corePreferences.defaultDomain else "",
MagicSearch.Source.All.toInt(),
MagicSearch.Aggregation.Friend
)
}
}
init {
isNumpadVisible.value = false
numpadModel = NumpadModel(
@ -129,32 +90,6 @@ class StartCallViewModel @UiThread constructor() : ViewModel() {
)
updateGroupCallButtonVisibility()
coreContext.postOnCoreThread { core ->
val defaultAccount = core.defaultAccount
limitSearchToLinphoneAccounts = defaultAccount?.isInSecureMode() ?: false
coreContext.contactsManager.addListener(contactsListener)
magicSearch = core.createMagicSearch()
magicSearch.limitedSearch = false
magicSearch.addListener(magicSearchListener)
}
applyFilter(currentFilter)
}
@UiThread
override fun onCleared() {
coreContext.postOnCoreThread {
magicSearch.removeListener(magicSearchListener)
coreContext.contactsManager.removeListener(contactsListener)
}
super.onCleared()
}
@UiThread
fun clearFilter() {
searchFilter.value = ""
}
@UiThread
@ -181,102 +116,4 @@ class StartCallViewModel @UiThread constructor() : ViewModel() {
fun hideNumpad() {
isNumpadVisible.value = false
}
@WorkerThread
fun processMagicSearchResults(results: Array<SearchResult>) {
Log.i("$TAG Processing [${results.size}] results")
val contactsList = arrayListOf<ContactOrSuggestionModel>()
val suggestionsList = arrayListOf<ContactOrSuggestionModel>()
var previousLetter = ""
for (result in results) {
val address = result.address
if (address != null) {
val friend = coreContext.contactsManager.findContactByAddress(address)
if (friend != null) {
val model = ContactOrSuggestionModel(address, friend)
val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(
address
)
model.avatarModel.postValue(avatarModel)
val currentLetter = friend.name?.get(0).toString()
val displayLetter = previousLetter.isEmpty() || currentLetter != previousLetter
if (currentLetter != previousLetter) {
previousLetter = currentLetter
}
avatarModel.firstContactStartingByThatLetter.postValue(
displayLetter
)
contactsList.add(model)
} else {
// If user-input generated result (always last) already exists, don't show it again
if (result.sourceFlags == MagicSearch.Source.Request.toInt()) {
val found = suggestionsList.find {
it.address.weakEqual(address)
}
if (found != null) {
Log.i(
"$TAG Result generated from user input is a duplicate of an existing solution, preventing double"
)
continue
}
}
val model = ContactOrSuggestionModel(address) {
coreContext.startCall(address)
}
suggestionsList.add(model)
}
}
}
val list = arrayListOf<ContactOrSuggestionModel>()
list.addAll(contactsList)
list.addAll(suggestionsList)
contactsAndSuggestionsList.postValue(list)
Log.i("$TAG Processed [${results.size}] results, extracted [${list.size}] suggestions")
}
@UiThread
fun applyFilter(filter: String) {
coreContext.postOnCoreThread {
applyFilter(
filter,
if (limitSearchToLinphoneAccounts) corePreferences.defaultDomain else "",
MagicSearch.Source.All.toInt(),
MagicSearch.Aggregation.Friend
)
}
}
@WorkerThread
private fun applyFilter(
filter: String,
domain: String,
sources: Int,
aggregation: MagicSearch.Aggregation
) {
if (previousFilter.isNotEmpty() && (
previousFilter.length > filter.length ||
(previousFilter.length == filter.length && previousFilter != filter)
)
) {
magicSearch.resetSearchCache()
}
currentFilter = filter
previousFilter = filter
Log.i(
"$TAG Asking Magic search for contacts matching filter [$filter], domain [$domain] and in sources [$sources]"
)
magicSearch.getContactsListAsync(
filter,
domain,
sources,
aggregation
)
}
}

18
app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationAddParticipantViewModel.kt → app/src/main/java/org/linphone/ui/main/viewmodel/AddParticipantsViewModel.kt
View file

@ -17,20 +17,16 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.linphone.ui.main.chat.viewmodel
package org.linphone.ui.main.viewmodel
import androidx.annotation.UiThread
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import org.linphone.ui.main.history.model.ContactOrSuggestionModel
class ConversationAddParticipantViewModel @UiThread constructor() : ViewModel() {
val searchFilter = MutableLiveData<String>()
class AddParticipantsViewModel @UiThread constructor() : AddressSelectionViewModel() {
companion object {
private const val TAG = "[Add Participants ViewModel]"
}
val contactsList = MutableLiveData<ArrayList<ContactOrSuggestionModel>>()
@UiThread
fun clearFilter() {
searchFilter.value = ""
init {
switchToMultipleSelectionMode()
}
}

176
app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
View file

@ -23,9 +23,17 @@ import androidx.annotation.UiThread
import androidx.annotation.WorkerThread
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.R
import org.linphone.contacts.ContactsManager
import org.linphone.core.MagicSearch
import org.linphone.core.MagicSearchListenerStub
import org.linphone.core.SearchResult
import org.linphone.mediastream.Log
import org.linphone.ui.main.history.model.ContactOrSuggestionModel
import org.linphone.ui.main.model.SelectedAddressModel
import org.linphone.ui.main.model.isInSecureMode
import org.linphone.utils.AppUtils
abstract class AddressSelectionViewModel @UiThread constructor() : ViewModel() {
@ -39,14 +47,82 @@ abstract class AddressSelectionViewModel @UiThread constructor() : ViewModel() {
val selectionCount = MutableLiveData<String>()
protected var magicSearchSourceFlags = MagicSearch.Source.All.toInt()
private var currentFilter = ""
private var previousFilter = "NotSet"
val searchFilter = MutableLiveData<String>()
val contactsAndSuggestionsList = MutableLiveData<ArrayList<ContactOrSuggestionModel>>()
private var limitSearchToLinphoneAccounts = true
private lateinit var magicSearch: MagicSearch
private val magicSearchListener = object : MagicSearchListenerStub() {
@WorkerThread
override fun onSearchResultsReceived(magicSearch: MagicSearch) {
Log.i("$TAG Magic search contacts available")
processMagicSearchResults(magicSearch.lastSearch)
}
}
private val contactsListener = object : ContactsManager.ContactsListener {
@WorkerThread
override fun onContactsLoaded() {
Log.i("$TAG Contacts have been (re)loaded, updating list")
applyFilter(
currentFilter,
if (limitSearchToLinphoneAccounts) corePreferences.defaultDomain else "",
magicSearchSourceFlags,
MagicSearch.Aggregation.Friend
)
}
}
init {
multipleSelectionMode.value = false
coreContext.postOnCoreThread { core ->
val defaultAccount = core.defaultAccount
limitSearchToLinphoneAccounts = defaultAccount?.isInSecureMode() ?: false
coreContext.contactsManager.addListener(contactsListener)
magicSearch = core.createMagicSearch()
magicSearch.limitedSearch = false
magicSearch.addListener(magicSearchListener)
}
applyFilter(currentFilter)
}
@UiThread
override fun onCleared() {
coreContext.postOnCoreThread {
magicSearch.removeListener(magicSearchListener)
coreContext.contactsManager.removeListener(contactsListener)
}
super.onCleared()
}
@UiThread
fun clearFilter() {
searchFilter.value = ""
}
@UiThread
fun switchToMultipleSelectionMode() {
Log.i("$$TAG Multiple selection mode ON")
multipleSelectionMode.value = true
selectionCount.postValue(
AppUtils.getStringWithPlural(
R.plurals.selection_count_label,
0,
"0"
)
)
}
@WorkerThread
@ -101,4 +177,104 @@ abstract class AddressSelectionViewModel @UiThread constructor() : ViewModel() {
Log.w("$TAG Address isn't in selection, doing nothing")
}
}
@WorkerThread
fun processMagicSearchResults(results: Array<SearchResult>) {
Log.i("$TAG Processing [${results.size}] results")
val contactsList = arrayListOf<ContactOrSuggestionModel>()
val suggestionsList = arrayListOf<ContactOrSuggestionModel>()
var previousLetter = ""
for (result in results) {
val address = result.address
if (address != null) {
val friend = coreContext.contactsManager.findContactByAddress(address)
if (friend != null) {
val model = ContactOrSuggestionModel(address, friend)
val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(
address
)
model.avatarModel.postValue(avatarModel)
val currentLetter = friend.name?.get(0).toString()
val displayLetter = previousLetter.isEmpty() || currentLetter != previousLetter
if (currentLetter != previousLetter) {
previousLetter = currentLetter
}
avatarModel.firstContactStartingByThatLetter.postValue(
displayLetter
)
contactsList.add(model)
} else {
// If user-input generated result (always last) already exists, don't show it again
if (result.sourceFlags == MagicSearch.Source.Request.toInt()) {
val found = suggestionsList.find {
it.address.weakEqual(address)
}
if (found != null) {
Log.i(
"$TAG Result generated from user input is a duplicate of an existing solution, preventing double"
)
continue
}
}
val model = ContactOrSuggestionModel(address) {
coreContext.startCall(address)
}
suggestionsList.add(model)
}
}
}
val list = arrayListOf<ContactOrSuggestionModel>()
list.addAll(contactsList)
list.addAll(suggestionsList)
contactsAndSuggestionsList.postValue(list)
Log.i(
"$TAG Processed [${results.size}] results, extracted [${suggestionsList.size}] suggestions"
)
}
@UiThread
fun applyFilter(filter: String) {
coreContext.postOnCoreThread {
applyFilter(
filter,
if (limitSearchToLinphoneAccounts) corePreferences.defaultDomain else "",
magicSearchSourceFlags,
MagicSearch.Aggregation.Friend
)
}
}
@WorkerThread
private fun applyFilter(
filter: String,
domain: String,
sources: Int,
aggregation: MagicSearch.Aggregation
) {
if (previousFilter.isNotEmpty() && (
previousFilter.length > filter.length ||
(previousFilter.length == filter.length && previousFilter != filter)
)
) {
magicSearch.resetSearchCache()
}
currentFilter = filter
previousFilter = filter
Log.i(
"$TAG Asking Magic search for contacts matching filter [$filter], domain [$domain] and in sources [$sources]"
)
magicSearch.getContactsListAsync(
filter,
domain,
sources,
aggregation
)
}
}

60
app/src/main/res/layout/chat_add_participant_fragment.xml → app/src/main/res/layout/generic_add_participants_fragment.xml
View file

@ -10,7 +10,7 @@
type="View.OnClickListener" />
<variable
name="viewModel"
type="org.linphone.ui.main.chat.viewmodel.ConversationAddParticipantViewModel" />
type="org.linphone.ui.main.viewmodel.AddParticipantsViewModel" />
</data>
<androidx.coordinatorlayout.widget.CoordinatorLayout
@ -42,7 +42,7 @@
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:text="@string/conversation_add_participant_title"
android:text="@string/conversation_add_participants_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent" />
@ -56,6 +56,36 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_300"
android:id="@+id/multiple_selection_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:text="@{viewModel.selectionCount, default=`0 selected`}"
android:textSize="12sp"
android:textColor="@color/black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/background" />
<HorizontalScrollView
android:id="@+id/multiple_selection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/multiple_selection_count">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
entries="@{viewModel.selection}"
layout="@{@layout/address_selected_list_cell}"/>
</HorizontalScrollView>
<androidx.appcompat.widget.AppCompatEditText
style="@style/default_text_style"
android:id="@+id/search_bar"
@ -80,7 +110,7 @@
app:layout_constraintWidth_max="@dimen/text_input_max_width"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/background" />
app:layout_constraintTop_toBottomOf="@id/multiple_selection"/>
<ImageView
android:id="@+id/clear_field"
@ -101,7 +131,7 @@
android:layout_height="0dp"
android:layout_margin="10dp"
android:src="@drawable/illu"
android:visibility="@{viewModel.contactsList.size() == 0 ? View.VISIBLE : View.GONE}"
android:visibility="@{viewModel.contactsAndSuggestionsList.size() == 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_max="200dp"
@ -115,36 +145,22 @@
android:id="@+id/no_contact_label"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/new_conversation_no_contact"
android:text="@{viewModel.searchFilter.length() > 0 ? @string/new_conversation_no_matching_contact : @string/new_conversation_no_contact, default=@string/new_conversation_no_contact}"
android:gravity="center"
android:visibility="@{viewModel.contactsList.size() == 0 ? View.VISIBLE : View.GONE}"
android:visibility="@{viewModel.contactsAndSuggestionsList.size() == 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_contact_image" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"
android:id="@+id/contacts_label"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:text="@string/history_call_start_contacts_list_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/search_bar"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contacts_list"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:visibility="@{viewModel.contactsList.size() == 0 ? View.GONE : View.VISIBLE}"
android:visibility="@{viewModel.contactsAndSuggestionsList.size() == 0 ? View.GONE : View.VISIBLE}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/contacts_label"
app:layout_constraintTop_toBottomOf="@id/search_bar"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/layout/start_call_fragment.xml
View file

@ -11,9 +11,6 @@
<variable
name="hideNumpadClickListener"
type="View.OnClickListener" />
<variable
name="title"
type="String" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.viewmodel.StartCallViewModel" />

24
app/src/main/res/layout/start_chat_fragment.xml
View file

@ -248,7 +248,7 @@
android:layout_height="0dp"
android:layout_margin="10dp"
android:src="@drawable/illu"
android:visibility="@{viewModel.contactsList.size() == 0 ? View.VISIBLE : View.GONE}"
android:visibility="@{viewModel.contactsAndSuggestionsList.size() == 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_max="200dp"
@ -262,36 +262,22 @@
android:id="@+id/no_contact_label"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/new_conversation_no_contact"
android:text="@{viewModel.searchFilter.length() > 0 ? @string/new_conversation_no_matching_contact : @string/new_conversation_no_contact, default=@string/new_conversation_no_contact}"
android:gravity="center"
android:visibility="@{viewModel.contactsList.size() == 0 ? View.VISIBLE : View.GONE}"
android:visibility="@{viewModel.contactsAndSuggestionsList.size() == 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_contact_image" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"
android:id="@+id/contacts_label"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:text="@string/history_call_start_contacts_list_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/group_chat_icon"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contacts_list"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:visibility="@{viewModel.contactsList.size() == 0 ? View.GONE : View.VISIBLE}"
android:visibility="@{viewModel.contactsAndSuggestionsList.size() == 0 ? View.GONE : View.VISIBLE}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/contacts_label"
app:layout_constraintTop_toBottomOf="@id/group_chat_icon"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

12
app/src/main/res/navigation/chat_nav_graph.xml
View file

@ -48,8 +48,8 @@
android:name="remoteSipUri"
app:argType="string" />
<action
android:id="@+id/action_conversationInfoFragment_to_addParticipantToConversationFragment"
app:destination="@id/addParticipantToConversationFragment"
android:id="@+id/action_conversationInfoFragment_to_addParticipantsFragment"
app:destination="@id/addParticipantsFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
@ -57,9 +57,9 @@
</fragment>
<fragment
android:id="@+id/addParticipantToConversationFragment"
android:name="org.linphone.ui.main.chat.fragment.AddParticipantToConversationFragment"
android:label="AddParticipantToConversationFragment"
tools:layout="@layout/chat_add_participant_fragment" />
android:id="@+id/addParticipantsFragment"
android:name="org.linphone.ui.main.fragment.AddParticipantsFragment"
android:label="AddParticipantsFragment"
tools:layout="@layout/generic_add_participants_fragment" />
</navigation>

5
app/src/main/res/values/strings.xml
View file

@ -345,14 +345,15 @@
<string name="new_conversation_title">New conversation</string>
<string name="new_conversation_search_bar_filter_hint">Search contact</string>
<string name="new_conversation_create_group">Create a group conversation</string>
<string name="new_conversation_no_contact">No contact for the moment…</string>
<string name="new_conversation_no_contact">No contact and no suggestion for the moment…</string>
<string name="new_conversation_no_matching_contact">No matching result…</string>
<string name="new_conversation_group_name_title">Name of the group</string>
<string name="conversation_text_field_hint">Say something…</string>
<plurals name="conversation_composing_label">
<item quantity="one">%s is composing…</item>
<item quantity="other">%s are composing…</item>
</plurals>
<string name="conversation_add_participant_title">Add participant</string>
<string name="conversation_add_participants_title">Add participants</string>
<string name="conversation_info_participants_list_title">Group members</string>
<string name="conversation_info_add_participants_label">Add participants</string>