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

Merge branch 'main' into develop

This commit is contained in:
Adam Brown 2022-03-09 21:33:16 +00:00
parent ecb49b3b27 9e8067dd19
commit d3fc3791bc
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/SendingEventsDataSource.kt
View File

@ -66,7 +66,9 @@ internal class RealmSendingEventsDataSource(
private fun updateFrozenResults(sendingEvents: RealmList<TimelineEventEntity>?) { private fun updateFrozenResults(sendingEvents: RealmList<TimelineEventEntity>?) {
// Makes sure to close the previous frozen realm // Makes sure to close the previous frozen realm
if (frozenSendingTimelineEvents?.isValid == true) {
frozenSendingTimelineEvents?.realm?.close() frozenSendingTimelineEvents?.realm?.close()
}
frozenSendingTimelineEvents = sendingEvents?.freeze() frozenSendingTimelineEvents = sendingEvents?.freeze()
} }
@ -74,6 +76,7 @@ internal class RealmSendingEventsDataSource(
val builtSendingEvents = mutableListOf<TimelineEvent>() val builtSendingEvents = mutableListOf<TimelineEvent>()
uiEchoManager.getInMemorySendingEvents() uiEchoManager.getInMemorySendingEvents()
.addWithUiEcho(builtSendingEvents) .addWithUiEcho(builtSendingEvents)
if (frozenSendingTimelineEvents?.isValid == true) {
frozenSendingTimelineEvents frozenSendingTimelineEvents
?.filter { timelineEvent -> ?.filter { timelineEvent ->
builtSendingEvents.none { it.eventId == timelineEvent.eventId } builtSendingEvents.none { it.eventId == timelineEvent.eventId }
@ -81,6 +84,7 @@ internal class RealmSendingEventsDataSource(
?.map { ?.map {
timelineEventMapper.map(it) timelineEventMapper.map(it)
}?.addWithUiEcho(builtSendingEvents) }?.addWithUiEcho(builtSendingEvents)
}
return builtSendingEvents return builtSendingEvents
} }