acdf419768
Note: mainly conflicts in differing implementations to fix duplicate read receipts. After a quick glance at the upstream implementation, my first impression is that we likely want to keep our downstream implementation: - Better performance by checking for the more recent receipt in the SDK upon receipt receival, instead on rendering the timeline - null seems to always map to main, which caused us jumping receipts in the past, which we have addressed by now Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt Change-Id: I47ae2afe5fcbe77a4fec69374d83821b94a431de |
||
|---|---|---|
| .. | ||
| docs | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||