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

Fixed deadlock causing ANR because SDK method was called directly in adapter

Browse source
This commit is contained in:
Sylvain Berfini 2024-12-16 16:39:26 +01:00
parent 31b9836cc0
commit d4b0356bda
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt
View file

@ -90,7 +90,7 @@ class ConversationsContactsAndSuggestionsListAdapter :
return if (model.localAddress != null) { return if (model.localAddress != null) {
CONVERSATION_TYPE CONVERSATION_TYPE
} else if (model.friend != null) { } else if (model.friend != null) {
if (model.friend.starred) { if (model.starred) {
FAVORITE_TYPE FAVORITE_TYPE
} else { } else {
CONTACT_TYPE CONTACT_TYPE

2
app/src/main/java/org/linphone/ui/main/model/ConversationContactOrSuggestionModel.kt
View file

@ -39,6 +39,8 @@ class ConversationContactOrSuggestionModel
) { ) {
val id = friend?.refKey ?: address.asStringUriOnly().hashCode() val id = friend?.refKey ?: address.asStringUriOnly().hashCode()
val starred = friend?.starred == true
val name = conversationSubject val name = conversationSubject
?: if (friend != null) { ?: if (friend != null) {
friend.name ?: LinphoneUtils.getDisplayName(address) friend.name ?: LinphoneUtils.getDisplayName(address)