Compare commits

...

2 Commits

Author SHA1 Message Date
Alex Hart
e2ef8a14f1 Bump version to 5.53.7 2022-10-25 13:17:35 -03:00
Alex Hart
b6a53e673c Fix crash when viewing views of a group story. 2022-10-25 09:47:42 -03:00
2 changed files with 14 additions and 10 deletions

View File

@@ -58,14 +58,14 @@ ktlint {
} }
def canonicalVersionCode = 1149 def canonicalVersionCode = 1149
def canonicalVersionName = "5.53.6" def canonicalVersionName = "5.53.7"
def postFixSize = 100 def postFixSize = 100
def abiPostFix = ['universal' : 0, def abiPostFix = ['universal' : 5,
'armeabi-v7a' : 1, 'armeabi-v7a' : 6,
'arm64-v8a' : 2, 'arm64-v8a' : 7,
'x86' : 3, 'x86' : 8,
'x86_64' : 4] 'x86_64' : 9]
def keystores = [ 'debug' : loadKeystoreProperties('keystore.debug.properties') ] def keystores = [ 'debug' : loadKeystoreProperties('keystore.debug.properties') ]

View File

@@ -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
} }
) )
} }