Fix crash when viewing views of a group story.
This commit is contained in:
parent
6055515be9
commit
09361b2d40
1 changed files with 8 additions and 4 deletions
|
@ -34,20 +34,24 @@ class StoryViewsRepository {
|
||||||
fun getViews(storyId: Long): Observable<List<StoryViewItemData>> {
|
fun getViews(storyId: Long): Observable<List<StoryViewItemData>> {
|
||||||
return Observable.create<List<StoryViewItemData>> { emitter ->
|
return Observable.create<List<StoryViewItemData>> { emitter ->
|
||||||
val record: MessageRecord = SignalDatabase.mms.getMessageRecord(storyId)
|
val record: MessageRecord = SignalDatabase.mms.getMessageRecord(storyId)
|
||||||
val distributionId: DistributionId = SignalDatabase.distributionLists.getDistributionId(record.recipient.requireDistributionListId())!!
|
val filterIds: Set<RecipientId> = if (record.recipient.isDistributionList) {
|
||||||
val recipientIds: Set<RecipientId> = SignalDatabase.storySends.getRecipientsForDistributionId(storyId, distributionId)
|
val distributionId: DistributionId = SignalDatabase.distributionLists.getDistributionId(record.recipient.requireDistributionListId())!!
|
||||||
|
SignalDatabase.storySends.getRecipientsForDistributionId(storyId, distributionId)
|
||||||
|
} else {
|
||||||
|
emptySet()
|
||||||
|
}
|
||||||
|
|
||||||
fun refresh() {
|
fun refresh() {
|
||||||
emitter.onNext(
|
emitter.onNext(
|
||||||
SignalDatabase.groupReceipts.getGroupReceiptInfo(storyId).filter {
|
SignalDatabase.groupReceipts.getGroupReceiptInfo(storyId).filter {
|
||||||
it.status == GroupReceiptDatabase.STATUS_VIEWED
|
it.status == GroupReceiptDatabase.STATUS_VIEWED
|
||||||
|
}.filter {
|
||||||
|
filterIds.isEmpty() || it.recipientId in filterIds
|
||||||
}.map {
|
}.map {
|
||||||
StoryViewItemData(
|
StoryViewItemData(
|
||||||
recipient = Recipient.resolved(it.recipientId),
|
recipient = Recipient.resolved(it.recipientId),
|
||||||
timeViewedInMillis = it.timestamp
|
timeViewedInMillis = it.timestamp
|
||||||
)
|
)
|
||||||
}.filter {
|
|
||||||
it.recipient.id in recipientIds
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue