Timeline: fix validation of timeline event changes #6462
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ouchadam
added
the
Z-NextRelease
ouchadam
reviewed
Jul 5, 2022
| val lastInsertion = results[range.startIndex + range.length - 1] ?: return false | ||
| if (firstBuiltEvent.displayIndex + 1 != lastInsertion.displayIndex) { | ||
| Timber.v("There is no continuation in the chunk, chunk is not fully loaded yet, skip insert.") | ||
| return false |
There was a problem hiding this comment.
out of interest, what happens to these events, are they skipped forever?
There was a problem hiding this comment.
No, they will be loaded when paginating manually!
ouchadam
reviewed
Jul 5, 2022
| @@ -558,6 +528,21 @@ internal class TimelineChunk( | |||
| } | |||
| } | |||
|
|
|||
| private fun validateInsertion(range: OrderedCollectionChangeSet.Range, results: RealmResults<TimelineEventEntity>): Boolean { | |||
There was a problem hiding this comment.
💯 for pulling out a function
bmarty
reviewed
Jul 5, 2022
There was a problem hiding this comment.
I can confirm that this fixes the crash from #6461, but I have another crash when closing the thread and going back to the main timeline.
Thread: DefaultTimeline_Thread, Exception: java.lang.IllegalStateException: Cannot create asynchronous query while in a write transaction in /tmp/realm-java/realm/realm-library/src/main/cpp/io_realm_internal_OsResults.cpp line 243
at io.realm.internal.OsResults.nativeStartListening(Native Method)
at io.realm.internal.OsResults.addListener(OsResults.java:673)
at io.realm.RealmResults.addChangeListener(RealmResults.java:734)
at org.matrix.android.sdk.internal.session.room.timeline.TimelineChunk.(TimelineChunk.kt:117)
at org.matrix.android.sdk.internal.session.room.timeline.TimelineChunk.createTimelineChunk(TimelineChunk.kt:567)
at org.matrix.android.sdk.internal.session.room.timeline.TimelineChunk.chunkObjectListener$lambda-2(TimelineChunk.kt:96)
at org.matrix.android.sdk.internal.session.room.timeline.TimelineChunk.$r8$lambda$pCFJ5imq9fIZIR0Q2XoxgvbuKjU(Unknown Source:0)
at org.matrix.android.sdk.internal.session.room.timeline.TimelineChunk$$ExternalSyntheticLambda1.onChange(Unknown Source:4)
See https://github.com/matrix-org/element-android-rageshakes/issues/40144
| } | ||
| } | ||
| } | ||
| if (!validateInsertion(range, results)) continue |
|
Kudos, SonarCloud Quality Gate passed! |
|
Yes, this is one of the other issues I was talking about. But it happens randomly and already exists before my fix. |
ouchadam
reviewed
Jul 5, 2022
| val firstBuiltEvent = builtEvents.firstOrNull() | ||
| if (firstBuiltEvent != null) { | ||
| val lastInsertion = results[range.startIndex + range.length - 1] ?: return false | ||
| if (firstBuiltEvent.displayIndex + 1 != lastInsertion.displayIndex) { |
There was a problem hiding this comment.
for my understanding, is the only false case when the firstBuiltEvent exists and it doesn't have the same display index as the results[range.startIndex + range.length - 1]
it might be a little easier to read as a when rather than nested ifs
private fun validateInsertion(range: OrderedCollectionChangeSet.Range, results: RealmResults<TimelineEventEntity>): Boolean {
// Insertion can only happen from LastForward chunk after a sync.
val firstForwardEvent = isLastForward.get().takeIf { it }?.let { builtEvents.firstOrNull() }
return when {
firstForwardEvent == null -> true
firstForwardEvent.nextDisplayIndexDoesNotMatch(results.last(range)) -> {
Timber.v("There is no continuation in the chunk, chunk is not fully loaded yet, skip insert.")
false
}
else -> true
}
}
private fun RealmResults<TimelineEventEntity>.last(range: OrderedCollectionChangeSet.Range): TimelineEventEntity? {
return this[range.startIndex + range.length - 1]
}
private fun TimelineEvent.nextDisplayIndexDoesNotMatch(event: TimelineEventEntity?): Boolean {
return (displayIndex + 1) != event?.displayIndex
}not a blocker ^^^
ouchadam
approved these changes
Jul 5, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #6461