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

Reverts to fix by removing event timestamp condition

This commit is contained in:
ericdecanini 2022-03-10 19:15:12 +01:00
parent df6ae4b848
commit fe3c9cc09f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
View File

@ -385,7 +385,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
} }
val closedTime = existingPollSummary?.closedTime val closedTime = existingPollSummary?.closedTime
if (closedTime != null && eventTimestamp > closedTime) { if (closedTime != null) {
Timber.v("## POLL is closed ignore event poll:$targetEventId, event :${event.eventId}") Timber.v("## POLL is closed ignore event poll:$targetEventId, event :${event.eventId}")
return return
} }
@ -499,8 +499,6 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
} }
val txId = event.unsignedData?.transactionId val txId = event.unsignedData?.transactionId
existingPollSummary.closedTime = event.originServerTs
// is it a remote echo? // is it a remote echo?
if (!isLocalEcho && existingPollSummary.sourceLocalEchoEvents.contains(txId)) { if (!isLocalEcho && existingPollSummary.sourceLocalEchoEvents.contains(txId)) {
// ok it has already been managed // ok it has already been managed
@ -509,6 +507,8 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
existingPollSummary.sourceEvents.add(event.eventId) existingPollSummary.sourceEvents.add(event.eventId)
return return
} }
existingPollSummary.closedTime = event.originServerTs
} }
private fun getPollEvent(roomId: String, eventId: String): TimelineEvent? { private fun getPollEvent(roomId: String, eventId: String): TimelineEvent? {