Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when opening group story replies.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-02-05 16:30:54 -05:00
parent c8c4fdc65e
commit 2cf9fa0524
3 changed files with 10 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
app/src/main/java/org/thoughtcrime/securesms/conversation/colors/NameColors.kt
View File

@@ -1,63 +0,0 @@
package org.thoughtcrime.securesms.conversation.colors
import androidx.lifecycle.LiveData
import androidx.lifecycle.map
import androidx.lifecycle.switchMap
import com.annimon.stream.Stream
import org.signal.core.util.MapUtil
import org.thoughtcrime.securesms.conversation.colors.ChatColorsPalette.Names.all
import org.thoughtcrime.securesms.groups.GroupId
import org.thoughtcrime.securesms.groups.LiveGroup
import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry.FullMember
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.DefaultValueLiveData
import java.util.Optional
object NameColors {
fun createSessionMembersCache(): MutableMap<GroupId, Set<Recipient>> {
return mutableMapOf()
}
fun getNameColorsMapLiveData(
recipientId: LiveData<RecipientId>,
sessionMemberCache: MutableMap<GroupId, Set<Recipient>>
): LiveData<Map<RecipientId, NameColor>> {
val recipient = recipientId.switchMap { r: RecipientId? -> Recipient.live(r!!).liveData }
val group = recipient.map { obj: Recipient -> obj.groupId }
val groupMembers = group.switchMap { g: Optional<GroupId> ->
g.map { groupId: GroupId -> this.getSessionGroupRecipients(groupId, sessionMemberCache) }
.orElseGet { DefaultValueLiveData(emptySet()) }
}
return groupMembers.map { members: Set<Recipient>? ->
val sorted = Stream.of(members)
.filter { member: Recipient? -> member != Recipient.self() }
.sortBy { obj: Recipient -> obj.requireStringId() }
.toList()
val names = all
val colors: MutableMap<RecipientId, NameColor> = HashMap()
for (i in sorted.indices) {
colors[sorted[i].id] = names[i % names.size]
}
colors
}
}
private fun getSessionGroupRecipients(groupId: GroupId, sessionMemberCache: MutableMap<GroupId, Set<Recipient>>): LiveData<Set<Recipient>> {
val fullMembers = LiveGroup(groupId)
.fullMembers
.map { members: List<FullMember>? ->
Stream.of(members)
.map { it.member }
.toList()
}
return fullMembers.map { currentMembership: List<Recipient>? ->
val cachedMembers: MutableSet<Recipient> = MapUtil.getOrDefault(sessionMemberCache, groupId, HashSet()).toMutableSet()
cachedMembers.addAll(currentMembership!!)
sessionMemberCache[groupId] = cachedMembers
cachedMembers
}
}
}