IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android, desktop: align member name functions with ios (fixes issue with displaying unknown members) (#3680)

Browse Source
This commit is contained in:
spaced4ndy 2024-01-12 20:54:26 +04:00 committed by GitHub
parent dad9716915
commit 516410a899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
View File

@ -1263,7 +1263,8 @@ data class GroupMember (
val id: String get() = "#$groupId @$groupMemberId" val id: String get() = "#$groupId @$groupMemberId"
val displayName: String val displayName: String
get() { get() {
val name = memberProfile.localAlias.ifEmpty { memberProfile.displayName } val p = memberProfile
val name = p.localAlias.ifEmpty { p.displayName }
return pastMember(name) return pastMember(name)
} }
val fullName: String get() = memberProfile.fullName val fullName: String get() = memberProfile.fullName
@ -1273,7 +1274,8 @@ data class GroupMember (
val chatViewName: String val chatViewName: String
get() { get() {
val name = memberProfile.localAlias.ifEmpty { displayName + (if (fullName == "" || fullName == displayName) "" else " / $fullName") } val p = memberProfile
val name = p.localAlias.ifEmpty { p.displayName + (if (p.fullName == "" || p.fullName == p.displayName) "" else " / ${p.fullName}") }
return pastMember(name) return pastMember(name)
} }