Florian Renaud
39c702f41b
Merge pull request #8170 from vector-im/feature/fre/apply_push_rules_after_decryption
...
Reapply push rules on the decrypted event source (PSG-1146)
2023-03-07 10:39:48 +01:00
Yoan Pintas
94675b9f85
create encrypted DM for user invite by email ( #8172 )
...
Co-authored-by: jonnyandrew <jonny.andrew@protonmail.com>
2023-03-06 22:05:43 +00:00
Florian Renaud
21c7fc3d0a
Merge remote-tracking branch 'origin/develop' into feature/fre/apply_push_rules_after_decryption
2023-03-06 09:11:48 +01:00
Benoit Marty
ceda85f624
Fix test by mocking `WorkManagerProvider.tag`
...
Appeared when upgrading androidx.work:work-runtime-ktx from 2.7.1 to 2.8.0 in #8099
2023-03-03 18:01:10 +01:00
Yoan Pintas
446ed24bea
Update room member shields behavior ( #8195 )
2023-03-03 09:28:50 +00:00
Florian Renaud
4146b5511a
Merge develop into feature/fre/apply_push_rules_after_decryption
2023-03-02 15:03:22 +01:00
Florian Renaud
084bd44348
Update decryption result on the events from the sync response
...
As the decryption is done on a copy of the event (containing the roomId), we have to update the initial event with the decryption result
2023-03-02 14:40:31 +01:00
Benoit Marty
c7928c2228
Merge pull request #8168 from SpiritCroc/chunk-roomids
...
matrix-sdk: Ensure correct room for events loaded by chunks
2023-03-02 13:57:59 +01:00
Florian Renaud
245ca13049
Improve encryption check condition
2023-03-01 13:52:53 +01:00
Florian Renaud
891897f0a7
Add additional tests
2023-03-01 13:50:40 +01:00
Florian Renaud
75559fb21a
Ensure the event is decrypted before applying push rules
2023-03-01 11:49:43 +01:00
Florian Renaud
ccf971afc4
Update encrypted raw json with decrypted event content for event matching condition
2023-03-01 10:42:57 +01:00
Florian Renaud
9d7758c9e3
Reuse event.supportsNotification extension
2023-02-24 09:26:50 +01:00
Florian Renaud
b6ac915805
Apply push rules on encrypted events
2023-02-24 09:13:44 +01:00
SpiritCroc
8192bb5442
matrix-sdk: Ensure correct room for events loaded by chunks
...
Chunks should not load events from other rooms if they happen to be
requested for one eventId that already exists in a different room.
Motivation from a client that renders rich replies (although the
broken scenario can appear in other cases as well):
If somebody links an invalid eventId in a room, which however is valid
in a different room, this can mess up our timelines badly.
This can be reproduced by replying to an event in a room, then forward
the reply to a different room with a client that also forwards the
replied-to information (such as FluffyChat). Then click on the rich
reply to open the eventId. Previously, Android could find the event from
the other room and thus replace the correct timeline with the wrong one.
Compare e.g. https://matrix.to/#/!bfebJVBOZMnORmkVdO:matrix.org/$wUyRiMQEjaWOpJ-XpdBJzuXkh95N7bce2pVT4IMXW50?via=schildi.chat&via=matrix.org&via=envs.net
linking to an event that exists here
https://matrix.to/#/!SDwMepdfgrmExhyxYZ:schildi.chat/$MO2G4MZZ1zg0Ymc9gTfekIyw7QFkNn4OvYQKK1PAGlE
Change-Id: I4dcee94353d954fb6ed57c3970686a620b831c6f
2023-02-23 20:12:33 +01:00
Florian Renaud
021babc9b1
Fix notification in encrypted room for poll end event
2023-02-23 09:24:14 +01:00
ganfra
a98dc86e34
version++
2023-02-22 17:51:12 +01:00
Maxime NATUREL
24e1740a8a
Merge pull request #8151 from vector-im/fix/mna/edited-reply-parsing
...
[Timeline]: Editing a reply from iOS breaks the "in reply to" rendering (PSG-1168)
2023-02-22 10:48:25 +01:00
dependabot[bot]
77807de811
Bump com.otaliastudios:transcoder from 0.10.4 to 0.10.5
...
Bumps [com.otaliastudios:transcoder](https://github.com/natario1/Transcoder ) from 0.10.4 to 0.10.5.
- [Release notes](https://github.com/natario1/Transcoder/releases )
- [Commits](https://github.com/natario1/Transcoder/compare/v0.10.4...v0.10.5 )
---
updated-dependencies:
- dependency-name: com.otaliastudios:transcoder
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-21 23:57:25 +00:00
Maxime NATUREL
ac0bdb7dfe
Ensure edited text reply contains a formatted body
2023-02-20 15:55:49 +01:00
Maxime NATUREL
de50577ac3
Merge pull request #8136 from vector-im/fix/mna/poll-end-while-no-poll-start
...
[Poll] Improve rendering of poll end message when poll start event isn't available (PSG-1157)
2023-02-17 13:51:50 +01:00
Florian Renaud
7d16c86f37
Merge pull request #8130 from vector-im/feature/fre/poll_sync_push_rules_after_creation
...
[Poll] Synchronize polls and message push rules after creation (PSG-1137)
2023-02-17 13:46:13 +01:00
Florian Renaud
dcd43d6e7f
Move push rule ids extensions to vector module
2023-02-17 10:14:33 +01:00
Florian Renaud
f887acd854
Merge pull request #8114 from vector-im/feature/fre/poll_new_push_rules
...
[Poll] Synchronize polls push rules with message push rules (PSG-954)
2023-02-17 10:03:53 +01:00
Maxime NATUREL
2ae6cd40c7
Merge pull request #8126 from vector-im/fix/mna/poll-votes-aggregation
...
[Poll] Fix votes aggregation process (PSG-1153)
2023-02-16 17:29:45 +01:00
Maxime NATUREL
068a43e1f4
Fix code style issue
2023-02-15 10:37:10 +01:00
Hugh Nimmo-Smith
e8f196a6f1
Deduplicate error messages
2023-02-14 17:53:02 +00:00
Florian Renaud
1f4c098d8b
Synchronize polls and message push rules after creation
2023-02-14 17:56:30 +01:00
Florian Renaud
2cb1ea95dc
Allow notifications for poll end event
2023-02-14 17:52:23 +01:00
Florian Renaud
71455706cb
Sync poll rules with messages rule
2023-02-14 17:52:22 +01:00
Maxime NATUREL
28089618a3
Adding fallback text on Poll end message
2023-02-14 17:01:57 +01:00
Hugh Nimmo-Smith
f43c9bf4d0
Spelling
2023-02-13 17:40:50 +00:00
Maxime NATUREL
6034085244
Adding unit test
2023-02-13 18:08:08 +01:00
Maxime NATUREL
454ce1c095
Aggregate poll response events even when the poll start event has been received yet
2023-02-13 18:08:07 +01:00
Hugh Nimmo-Smith
3a40223bf7
Lint
2023-02-13 16:34:56 +00:00
Hugh Nimmo-Smith
2db75e2a62
Support for v2 of MSC3903
...
Improves the feedback in case of valid code but of unsupported algorithm or transport.
Added some test cases.
2023-02-13 15:07:44 +00:00
Hugh Nimmo-Smith
b1d7831684
Session migration 51
2023-02-09 09:57:07 +00:00
Hugh Nimmo-Smith
10a1ea033b
Merge branch 'develop' into hughns/msc3824-oidc-aware
2023-02-09 09:53:26 +00:00
Benoit Marty
4174023958
version++
2023-02-08 09:52:32 +01:00
Benoit Marty
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
yostyle
8775c4d0a2
Fix lint
2023-02-07 16:54:24 +01:00
Benoit Marty
4226296990
Get Event from cache without using a `Room`
2023-02-07 14:52:12 +01:00
Florian Renaud
e1086669c7
Merge remote-tracking branch 'origin/develop' into fix-at-room
2023-02-06 09:36:00 +01:00
Maxime NATUREL
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
Maxime NATUREL
48393ee5d1
Fixing some previews for end poll events
2023-02-01 10:17:38 +01:00
Maxime NATUREL
8fb38f57dc
Fallback to message content of end message if no event found for start message
2023-01-31 17:15:26 +01:00
Maxime NATUREL
7a95ece738
Fix body of edited reply
2023-01-31 17:13:36 +01:00
Hugh Nimmo-Smith
b1cacb37f9
Actually configure migration 50 to be used
2023-01-27 12:19:40 +00:00
Maxime NATUREL
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
Maxime NATUREL
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