Skip to content
Snippets Groups Projects
Commit cf7119c0 authored by Kamal Bramwell's avatar Kamal Bramwell
Browse files

Fixed issue preventing local results from being shown

parent b3fce773
No related branches found
No related tags found
4 merge requests!84Version 2.92 build 629,!77v2.9 b627,!72FE-948: Invite Friend,!66FE-937 Connections search results
...@@ -355,27 +355,34 @@ class UserSearchViewModel @Inject constructor( ...@@ -355,27 +355,34 @@ class UserSearchViewModel @Inject constructor(
val requests = filter { val requests = filter {
it.status != RequestStatus.ACCEPTED.value it.status != RequestStatus.ACCEPTED.value
}.toSet() }.toSet()
// Separate into a sublist of accepted connections and requests.
val contacts = this - requests val contacts = this - requests
// Wrap the requests as SearchResultItems for UI layer.
val requestItems = requests.map { val requestItems = requests.map {
SearchResultItem( SearchResultItem(
ContactRequestData(it), ContactRequestData(it),
resolveBitmap(it.photo) resolveBitmap(it.photo)
) )
} }.toMutableList()
// Wrap the connections as AcceptedConnectionItems for UI layer.
val contactItems = contacts.map { val contactItems = contacts.map {
val requestData = ContactRequestData(it)
AcceptedConnectionItem( AcceptedConnectionItem(
ContactRequestData(it), requestData,
resolveBitmap(it.photo) resolveBitmap(it.photo)
) )
} }
return requestItems.apply { val localResults = if (contacts.isNotEmpty()) {
if (contactItems.isNotEmpty()) { requestItems + ConnectionsDividerItem() + contactItems
plus(ConnectionsDividerItem()) } else {
plus(contactItems) requestItems
}
} }
Timber.d("RequestItems: ${requestItems.size} entries")
Timber.d("ContactItems: ${contactItems.size} entries")
Timber.d("LocalResults: ${localResults.size} entries")
return localResults
} }
private suspend fun resolveBitmap(data: ByteArray?): Bitmap? = withContext(Dispatchers.IO) { private suspend fun resolveBitmap(data: ByteArray?): Bitmap? = withContext(Dispatchers.IO) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment