98b98c069d
[merge] Fix room summary preview mismerge
...
Change-Id: I7a1511fc0c6adc1a98cea4a0517835efae83e069
2023-02-11 08:36:41 +01:00
a48ce4b18c
[TESTING] Fight duplicate read markers in main timeline, pt.2
...
- Make my read-marker experiments backwards-compatible, by introducing a
new artificial marker
- Fix sometimes the marker going missing, by not deduplicating read
markers, then filtering out the other one because duplicates didn't
respect the thread id
Needs an initial sync to fully apply.
Change-Id: Id02ae19d03077016cbeb8d9a8fd5130d77931b2d
2023-02-10 16:04:26 +01:00
51274af2fe
Merge tag 'v1.5.24' into sc
...
Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
2023-02-08 13:08:42 +01:00
0971a28532
Merge pull request #8057 from vector-im/yostyle/vb_utd
...
Let the user know when we are not able to decrypt the voice broadcast…
2023-02-07 18:16:34 +01:00
8775c4d0a2
Fix lint
2023-02-07 16:54:24 +01:00
4226296990
Get Event from cache without using a `Room`
2023-02-07 14:52:12 +01:00
cd9a3b9be2
[TEST] Fight duplicate read markers in main timeline
...
Let synced null and main markers both update the main marker.
Looks like desktop does the same:
7158a99a1c/src/sync-accumulator.ts (L459-L460)
2023-02-07 09:30:27 +01:00
e1086669c7
Merge remote-tracking branch 'origin/develop' into fix-at-room
2023-02-06 09:36:00 +01:00
ebd35bdd88
Merge pull request #7969 from vector-im/feature/ons/fix_poll_end_reply
...
Show poll question when rendering reply to a poll end event (PSG-1133)
2023-02-01 11:22:39 +01:00
48393ee5d1
Fixing some previews for end poll events
2023-02-01 10:17:38 +01:00
8fb38f57dc
Fallback to message content of end message if no event found for start message
2023-01-31 17:15:26 +01:00
7a95ece738
Fix body of edited reply
2023-01-31 17:13:36 +01:00
d8bd92c413
Merge tag 'v1.5.22' into sc
...
Change-Id: I3e8db4d0d0d6afa0f47c9daa0f809410938674e0
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
2023-01-26 19:49:36 +01:00
3ab465ea93
Merge pull request #8003 from vector-im/feature/mna/fetch-poll-history-timeline
...
[Poll] Unmock poll history timeline (PSG-1045, PSG-1095)
2023-01-26 17:18:56 +01:00
00c90c19d7
Merge pull request #8006 from vector-im/feature/mna/push-rules-api-order
...
[Push rules] Call /actions api before /enabled api (PSG-1099)
2023-01-26 16:46:07 +01:00
b6f77ac578
Adding unit tests for LoadMorePollsTask
2023-01-26 15:56:28 +01:00
4182581235
Adding unit tests for SyncPollsTask
2023-01-26 14:51:16 +01:00
3045a8581a
Adding unit tests for DefaultGetLoadedPollsStatusTaskTest
2023-01-26 13:58:30 +01:00
030e37655e
Fixing unit tests in SDK
2023-01-26 13:50:46 +01:00
c7d3e1926f
Renaming API field and adding more doc to make things clearer
2023-01-26 11:05:34 +01:00
fc26d61305
Removing a debug log
2023-01-26 11:05:34 +01:00
f9591a5fc6
Fix code quality issues
2023-01-26 11:05:34 +01:00
7118368a15
Fix copyright in SDK
2023-01-26 11:05:34 +01:00
8a54f7a4ed
Revert nullable field in RoomAPI
2023-01-26 11:05:34 +01:00
652a2c2834
Fix migration of DB after rebase
2023-01-26 11:05:34 +01:00
cfc67d5b67
Adding unit tests for PollSummaryMapper
2023-01-26 11:05:34 +01:00
326ece4b08
Fixing code styling issue
2023-01-26 11:05:34 +01:00
470218ca52
Updating existing unit tests
2023-01-26 11:05:33 +01:00
db2e2916a5
Remove some TODOs
2023-01-26 11:05:33 +01:00
2f06095273
Remove TODO
2023-01-26 11:05:33 +01:00
63026a3da5
Using copy() on realm object when getting current poll history status
2023-01-26 11:05:33 +01:00
cd1f41594d
Sync polls until now when landing on screen
2023-01-26 11:05:33 +01:00
05c4de6c6c
Adding distinctBy on event ids for polls
2023-01-26 11:05:33 +01:00
492b8a012d
Use Timeline interface to paginate
2023-01-26 11:05:33 +01:00
4cfd6d29fc
Fix query on poll events for encrypted rooms
2023-01-26 11:05:33 +01:00
6b6dea0c45
Store in DB events which failed to be decrypted
2023-01-26 11:05:32 +01:00
3ba2c47d1e
Load more poll during sync if there is no completed backward load
2023-01-26 11:05:32 +01:00
96252ec2af
Observation of the local events to render UI
2023-01-26 11:05:32 +01:00
7ca532a5f6
Filter and store poll events
2023-01-26 11:05:32 +01:00
e3a2000e29
Calling syncPolls of SDK service
2023-01-26 11:05:32 +01:00
10be07590d
Get loaded polls status use case
2023-01-26 11:05:32 +01:00
3e118f24ad
Loading events in a loop
2023-01-26 11:05:32 +01:00
5473789577
Removing non necessary fields that can be computed using other existing fields
2023-01-26 11:05:32 +01:00
aa736e2bfc
Set page size to 250
2023-01-26 11:05:31 +01:00
9d92128631
Starting to implement LoadMorePollsTask with update of poll history status
2023-01-26 11:05:31 +01:00
1ab6faf2d2
Adding PollHistoryStatusEntity
2023-01-26 11:05:31 +01:00
c7f6ece825
Introducing a new room service for poll history
2023-01-26 11:05:31 +01:00
bb4ec4f542
Call push rule /actions api before the /enabled api
2023-01-25 14:45:17 +01:00
cb093e0496
version++
2023-01-25 14:06:48 +01:00
c802e2d0f7
Merge pull request #7988 from vector-im/yostyle/msc3912
...
Implement MSC3912 to delete server side all the data of a deleted voice broadcast
2023-01-25 10:32:21 +01:00
SpiritCroc
Benoit Marty
yostyle
Benoit Marty
Florian Renaud
Maxime NATUREL