mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-02-14 23:18:43 +00:00
Fix GroupTable.memberLabel() to return null for blank labels.
This commit is contained in:
committed by
Greyson Parrelli
parent
74dbd0814a
commit
61522cd682
@@ -1278,11 +1278,16 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) :
|
|||||||
* Gets the member label for a specific member in the group, or null if the member is not found.
|
* Gets the member label for a specific member in the group, or null if the member is not found.
|
||||||
*/
|
*/
|
||||||
fun memberLabel(aci: ACI): MemberLabel? {
|
fun memberLabel(aci: ACI): MemberLabel? {
|
||||||
return decryptedGroup
|
val member = decryptedGroup
|
||||||
.members
|
.members
|
||||||
.findMemberByAci(aci)
|
.findMemberByAci(aci)
|
||||||
.orNull()
|
.orNull()
|
||||||
?.let { member -> MemberLabel(member.labelEmoji, member.labelString) }
|
|
||||||
|
return if (member != null && member.labelString.isNotBlank()) {
|
||||||
|
MemberLabel(member.labelEmoji, member.labelString)
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user