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
84684f24ea
permalink loadMore: do not endlessly retry on M_UNKNOWN error
...
Currently getting this after
"[rich replies] matrix-sdk: Ensure correct room for events loaded by
chunks"
Change-Id: I6658a9ed9e5df6d1cca580f2e83fff4a86d3383a
2023-02-23 20:00:03 +01:00
af720cdab9
[rich replies] matrix-sdk: Ensure correct room for events loaded by chunks
...
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 19:48:15 +01:00
1e66f4fa49
Fix broken migration
2023-02-23 14:57:28 +01:00
53d03335ab
Remove unused import
2023-02-23 14:18:21 +01:00
6649297ea0
restore onSessionStarted method call
2023-02-23 14:01:49 +01:00
2bd0126523
Extracting logic to compute the badge state into a usecase
2023-02-23 13:59:32 +01:00
85734c05aa
Merge pull request #8147 from vector-im/dependabot/gradle/flipper-0.182.0
...
Bump flipper from 0.178.1 to 0.182.0
2023-02-23 13:56:42 +01:00
476f60bd04
[merge] Fix initial send button color
...
Change-Id: I0361ab015bb4f8e1a31c92dcdbc2dec7cc52fb31
2023-02-23 12:18:45 +01:00
4065d21b7e
[merge] Disable another new useless reply fallback calculation
...
Change-Id: Ia090dac36ce08e7ea8e8bc0fe67a3e316b988bb9
2023-02-23 12:12:46 +01:00
65a1a6e90f
Automatic SchildiChat string correction
...
Change-Id: I979fcf00b93efd23fffa3f9ee7a53fd13882c5e2
2023-02-23 11:55:24 +01:00
e771157851
Automatic upstream merge postprocessing
...
Change-Id: I1899612abed560e8f96288c9dd30827c48c34102
2023-02-23 11:55:23 +01:00
38c8e30541
Merge tag 'v1.5.26' into sc
...
Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d
Conflicts:
dependencies.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/TimelineViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml
vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
vector/src/main/res/drawable/ic_rich_composer_add.xml
vector/src/main/res/drawable/ic_rich_composer_send.xml
2023-02-23 11:55:21 +01:00
c92c579eb6
[TMP] Automatic upstream merge preparation
...
Change-Id: I1e101e6410585303689b9ee1383587c4d1b1f076
2023-02-23 11:39:53 +01:00
fd0f4e733c
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I4d960c3207cfa802fcea0c6659478f848955a7c2
2023-02-23 11:39:52 +01:00
702142f62f
Revert "Revert "stop listening timeline collection changes when app is not resumed ( #7734 )""
...
Upstream fix incoming
This reverts commit 987ca6dec4
2023-02-23 11:29:12 +01:00
2542d7de83
GitHub issue template: please check if it's related to a labs setting
...
Change-Id: Iffa75319272401f1188a6d0a3e77263629d6a007
2023-02-23 11:28:55 +01:00
f782a31592
Fix unit tests
2023-02-23 10:15:34 +01:00
60ebc0dccb
Update build.yml to fix checkout on main
2023-02-23 10:05:45 +01:00
021babc9b1
Fix notification in encrypted room for poll end event
2023-02-23 09:24:14 +01:00
cd648a0b50
Fix unit tests
2023-02-23 09:24:14 +01:00
13866c62bf
Refresh push rules settings on account data changes
2023-02-23 09:24:14 +01:00
8f56f9de46
update doc
2023-02-23 09:24:14 +01:00
84ccd30ab7
Fix wrong import
2023-02-23 09:24:13 +01:00
552c6fbbd3
Changelog
2023-02-23 09:24:13 +01:00
0d28b3a860
Handle errors when updating push rules
2023-02-23 09:24:13 +01:00
f8449f9567
Bump androidx.arch.core:core-testing from 2.1.0 to 2.2.0
...
Bumps androidx.arch.core:core-testing from 2.1.0 to 2.2.0.
---
updated-dependencies:
- dependency-name: androidx.arch.core:core-testing
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-22 23:16:01 +00:00
664fa7f952
Merge pull request #8160 from vector-im/fix/mna/pref-space-setting-visibility
...
Space setting category doesn't show up
2023-02-22 17:59:43 +01:00
2aa5e6f7a0
Apply changes
2023-02-22 17:55:50 +01:00
a98dc86e34
version++
2023-02-22 17:51:12 +01:00
f637996310
Merge branch 'release/1.5.26' into main
2023-02-22 17:48:04 +01:00
a9ebf4fdd6
Adding fastlane file for version 1.5.26
2023-02-22 17:47:59 +01:00
93a6bfb0f2
Changelog for version 1.5.26
2023-02-22 17:47:37 +01:00
8861b36aba
Make the setting visible when using old app layout
2023-02-22 16:09:37 +01:00
7062e0737c
Add changelog entry
2023-02-22 16:08:59 +01:00
af4ab41851
Highlight the badge when there is pending space invite
2023-02-22 15:04:14 +01:00
1b0265662d
Adding changelog entry
2023-02-22 14:50:01 +01:00
18c7f0d894
Remove unused import
2023-02-22 14:39:44 +01:00
b78da9824d
Adding unit tests for NewHomeDetailViewModel
2023-02-22 14:38:35 +01:00
5db9fe6eb6
Merge branch 'origin/develop' into Weblate.
2023-02-22 13:33:42 +00:00
04ce186b6b
Translated using Weblate (Italian)
...
Currently translated at 100.0% (93 of 93 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2023-02-22 13:33:39 +00:00
8fdc95592f
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (2606 of 2606 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2023-02-22 13:33:37 +00:00
ecfbbb15d6
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2606 of 2606 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
2023-02-22 13:33:37 +00:00
26bf8b94dc
Translated using Weblate (Estonian)
...
Currently translated at 99.6% (2598 of 2606 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
2023-02-22 13:33:36 +00:00
e8c95551c1
Adding unit tests for GetNotificationCountForSpacesUseCase
2023-02-22 14:19:21 +01:00
a509da54e8
Adding unit tests for GetSpacesUseCase
2023-02-22 11:58:26 +01:00
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
c74cdb9540
Observe the spaces invites
2023-02-22 10:44:55 +01:00
7938eac490
Merge pull request #8154 from vector-im/dependabot/gradle/com.otaliastudios-transcoder-0.10.5
...
Bump com.otaliastudios:transcoder from 0.10.4 to 0.10.5
2023-02-22 10:42:46 +01:00
13c8ff4ff5
Bump com.google.firebase:firebase-bom from 31.2.1 to 31.2.2
...
Bumps com.google.firebase:firebase-bom from 31.2.1 to 31.2.2.
---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-bom
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-22 07:45:40 +00:00
SpiritCroc
valere
Maxime NATUREL
Florian Renaud
Florian Renaud
ganfra
dependabot[bot]
ganfra
Weblate
random
LinAGKar
Priit Jõerüüt