Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-26 14:09:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible crash in story replies.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-02-12 14:59:57 -05:00
parent 19cfae1da5
commit cdfc42cc38
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyRepository.kt
View File

@@ -11,6 +11,7 @@ import org.signal.paging.PagingController
import org.thoughtcrime.securesms.conversation.colors.GroupAuthorNameColorHelper
import org.thoughtcrime.securesms.conversation.colors.NameColor
import org.thoughtcrime.securesms.database.DatabaseObserver
import org.thoughtcrime.securesms.database.NoSuchMessageException
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.database.model.MessageId
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
@@ -54,8 +55,17 @@ class StoryGroupReplyRepository {
fun getNameColorsMap(storyId: Long): Observable<Map<RecipientId, NameColor>> {
return Single
.fromCallable {
val groupId = SignalDatabase.messages.getMessageRecord(storyId).toRecipient.groupId
GroupAuthorNameColorHelper().getColorMap(groupId.get())
try {
val messageRecord = SignalDatabase.messages.getMessageRecord(storyId)
val groupId = messageRecord.toRecipient.groupId.or { messageRecord.fromRecipient.groupId }
if (groupId.isPresent) {
GroupAuthorNameColorHelper().getColorMap(groupId.get())
} else {
emptyMap()
}
} catch (e: NoSuchMessageException) {
emptyMap()
}
}
.toObservable()
}