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 #4960 from vector-im/feature/aris/improve_local_echo_stuck_fix 

Avoid deleting sent messages on non room events
This commit is contained in:
Benoit Marty 2022-01-17 15:26:46 +01:00 committed by GitHub
parent c59bb5740a 52348e399e
commit eafb76b9b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4960.misc Normal file
View File

@ -0,0 +1 @@
Improves local echo blinking when non room events received

24
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
View File

@ -129,8 +129,6 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
} else { } else {
handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) { handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
handleJoinedRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis, aggregator) handleJoinedRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis, aggregator)
}.also {
fixStuckLocalEcho(it)
} }
} }
} }
@ -428,6 +426,10 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
} }
} }
} }
// Handle deletion of [stuck] local echos if needed
deleteLocalEchosIfNeeded(insertType, roomEntity, eventList)
// posting new events to timeline if any is registered // posting new events to timeline if any is registered
timelineInput.onNewTimelineEvents(roomId = roomId, eventIds = eventIds) timelineInput.onNewTimelineEvents(roomId = roomId, eventIds = eventIds)
return chunkEntity return chunkEntity
@ -513,14 +515,16 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
* While we cannot know when a specific event arrived from the pagination (no transactionId included), after each room /sync * While we cannot know when a specific event arrived from the pagination (no transactionId included), after each room /sync
* we clear all SENT events, and we are sure that we will receive it from /sync or pagination * we clear all SENT events, and we are sure that we will receive it from /sync or pagination
*/ */
private fun fixStuckLocalEcho(rooms: List<RoomEntity>) { private fun deleteLocalEchosIfNeeded(insertType: EventInsertType, roomEntity: RoomEntity, eventList: List<Event>) {
rooms.forEach { roomEntity -> // Skip deletion if we are on initial sync
roomEntity.sendingTimelineEvents.filter { timelineEvent -> if (insertType == EventInsertType.INITIAL_SYNC) return
timelineEvent.root?.sendState == SendState.SENT // Skip deletion if there are no timeline events or there is no event received from the current user
}.forEach { if (eventList.firstOrNull { it.senderId == userId } == null) return
roomEntity.sendingTimelineEvents.remove(it) roomEntity.sendingTimelineEvents.filter { timelineEvent ->
it.deleteOnCascade(true) timelineEvent.root?.sendState == SendState.SENT
} }.forEach {
roomEntity.sendingTimelineEvents.remove(it)
it.deleteOnCascade(true)
} }
} }
} }