filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5757 from ofalvai/bugfix/uploads-order-e2e 

Fix sorting of uploads in encrypted rooms
This commit is contained in:
Benoit Marty 2022-04-14 18:11:49 +02:00 committed by GitHub
parent ace8ae6a37 3f735e4346
commit 6a6f59a3be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5757.bugfix Normal file
View File

@ -0,0 +1 @@
Fix sorting of uploads in encrypted rooms

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
View File

@ -17,6 +17,7 @@
package org.matrix.android.sdk.internal.session.room.uploads package org.matrix.android.sdk.internal.session.room.uploads
import com.zhuinden.monarchy.Monarchy import com.zhuinden.monarchy.Monarchy
import io.realm.Sort
import org.matrix.android.sdk.api.session.events.model.Event import org.matrix.android.sdk.api.session.events.model.Event
import org.matrix.android.sdk.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.EventType
import org.matrix.android.sdk.api.session.events.model.toModel import org.matrix.android.sdk.api.session.events.model.toModel
@ -75,6 +76,7 @@ internal class DefaultGetUploadsTask @Inject constructor(
monarchy.doWithRealm { realm -> monarchy.doWithRealm { realm ->
eventsFromRealm = EventEntity.whereType(realm, EventType.ENCRYPTED, params.roomId) eventsFromRealm = EventEntity.whereType(realm, EventType.ENCRYPTED, params.roomId)
.like(EventEntityFields.DECRYPTION_RESULT_JSON, TimelineEventFilter.DecryptedContent.URL) .like(EventEntityFields.DECRYPTION_RESULT_JSON, TimelineEventFilter.DecryptedContent.URL)
.sort(EventEntityFields.ORIGIN_SERVER_TS, Sort.DESCENDING)
.findAll() .findAll()
.map { it.asDomain() } .map { it.asDomain() }
// Exclude stickers // Exclude stickers