Commit graph

17579 commits

Author SHA1 Message Date
Valere
10b1443fda add quick test for direct parent name 2022-07-20 12:12:32 +02:00
ericdecanini
5f6f16d94b Adds migrate session to 034 2022-07-20 11:22:42 +02:00
ericdecanini
ee941cf88d Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo033.kt
2022-07-20 10:56:07 +02:00
Maxime NATUREL
448b6e1c74
Merge pull request #6539 from vector-im/bugfix/mna/lls-status-bar-disappearing
[Location Share] - Wrong room live location status bar visibility in timeline (PSG-625)
2022-07-20 09:55:06 +02:00
Maxime NATUREL
c3105c8bb1
Merge pull request #6486 from vector-im/feature/mna/delete-lls
[Location sharing] - Delete action on a live message (PSG-523)
2022-07-19 16:43:41 +02:00
Maxime NATUREL
b08337e3a7
Merge pull request #6501 from vector-im/feature/mna/collapse-deleted-events
[Timeline] - Collapse redacted events (PSG-523)
2022-07-19 16:39:45 +02:00
Onuray Sahin
9976b3b8ac
Merge pull request #6567 from vector-im/feature/ons/share_location_with_other_apps
Share location with other apps (PSG-242)
2022-07-19 17:08:36 +03:00
Benoit Marty
70c62233d0
Merge pull request #6569 from vector-im/feature/adm/ftue-copy-review
FTUE - Copy review
2022-07-19 14:49:28 +02:00
Benoit Marty
70c8703b2b
Merge pull request #6545 from vector-im/feature/adm/ftue-combined-register-copy-review
FTUE - Combined register copy review
2022-07-19 14:44:29 +02:00
Maxime NATUREL
ecbd2d48a7 Replacing callback by a SharedFlow to notify of roomIds updates 2022-07-19 14:43:33 +02:00
Maxime NATUREL
33714b850f Make the status bar only visible in rooms where there is an active live 2022-07-19 14:43:33 +02:00
Maxime NATUREL
d2d24cbcbe Adding a changelog entry 2022-07-19 14:43:33 +02:00
Maxime NATUREL
82391aa281 Replacing ViewEvent by a ViewState property 2022-07-19 14:43:33 +02:00
ericdecanini
f9580e6cd5 Fixes error in RealmSessionStoreMigration 2022-07-19 14:12:56 +02:00
Maxime NATUREL
b2d7ef9fbf Re-arranging imports 2022-07-19 14:06:19 +02:00
Maxime NATUREL
7961525869 Unit tests: adding verification that redaction does not happen when event id is empty 2022-07-19 14:06:19 +02:00
Maxime NATUREL
2121ec5739 Moving use case to check if event is redacted into a dedicated package 2022-07-19 14:06:19 +02:00
Maxime NATUREL
99fc4b4a21 Simplify logic of the use case to check if event can be redacted 2022-07-19 14:06:18 +02:00
Maxime NATUREL
667b30f145 Refactoring redact task unit tests 2022-07-19 14:06:18 +02:00
Maxime NATUREL
7b15193eff Renaming a method to reflect its implementation 2022-07-19 14:06:18 +02:00
Maxime NATUREL
17227f1ae6 DB migration 2022-07-19 14:06:16 +02:00
Maxime NATUREL
1277376496 Fix missing handling of redacted beacon location data events 2022-07-19 14:05:13 +02:00
Maxime NATUREL
8fb402ab10 Stop sharing live location if live is redacted 2022-07-19 14:05:13 +02:00
Maxime NATUREL
63626b79de Redact beacon info event first to refresh timeline faster 2022-07-19 14:05:13 +02:00
Maxime NATUREL
f6415b0a5d Deleting summaries related to a redacted live location sharing 2022-07-19 14:05:13 +02:00
Maxime NATUREL
d3ad8d8deb Prune event entity when redacted 2022-07-19 14:05:13 +02:00
Maxime NATUREL
391bf842b4 Calling usecase to redact live location share event 2022-07-19 14:05:13 +02:00
Maxime NATUREL
237a5a18f3 Adding new method in location sharing service to redact a live location share 2022-07-19 14:05:13 +02:00
Maxime NATUREL
c9273dd067 Adding task to redact live location share related events 2022-07-19 14:05:13 +02:00
Maxime NATUREL
c404454cd7 Adding related event ids of live in entity 2022-07-19 14:05:13 +02:00
Maxime NATUREL
bad4eba153 Remove non necessary @MainThread annotations 2022-07-19 14:05:13 +02:00
Maxime NATUREL
e26759fa89 Adding changelog entry 2022-07-19 14:05:13 +02:00
Maxime NATUREL
c095cc73ce Introducing use case to check if an event can be redacted 2022-07-19 14:05:13 +02:00
Maxime NATUREL
9c619001a5 Updating string value for redacted event to be more consistent 2022-07-19 14:04:09 +02:00
Maxime NATUREL
4a5fe3c0f9 Fix the criteria to start merging redacted events 2022-07-19 14:04:09 +02:00
Maxime NATUREL
fe4174f005 Small improvements in code 2022-07-19 14:04:08 +02:00
Maxime NATUREL
c9794d8280 Small fixes in comments 2022-07-19 14:04:08 +02:00
Maxime NATUREL
b412b9f4e9 Merging redacted events by reusing existing mechanism for same type events 2022-07-19 14:04:08 +02:00
Maxime NATUREL
8d8ee051eb Improve readability of merged Header factory code 2022-07-19 14:04:08 +02:00
Maxime NATUREL
578d90e463 Adding changelog entry 2022-07-19 14:04:08 +02:00
Onuray Sahin
c408f824d3 Code review fixes. 2022-07-19 14:58:00 +03:00
ericdecanini
6f9b5c010d Deletes migration test 2022-07-19 13:49:21 +02:00
Eric Decanini
221cb24de8
Merge pull request #6584 from vector-im/task/eric/new_layout_feature_flag
Adds NewAppLayoutEnabled Feature Flag
2022-07-19 12:24:16 +01:00
Benoit Marty
246307ab98
Merge pull request #6592 from vector-im/feature/bma/fix_nightly
Fix error when building `./gradlew assembleGplayNightly`
2022-07-19 12:59:51 +02:00
Benoit Marty
758f0398bd Fix error when building `./gradlew assembleGplayNightly. Just reordering lines...
Error was `No matching client found for package name 'im.vector.app'`
2022-07-19 12:50:47 +02:00
Benoit Marty
4d4dbc958b
Merge pull request #6590 from vector-im/bugfix/nfe/missing_font_scale_setting
fixed crash when system font scale setting isn't set
2022-07-19 12:30:38 +02:00
Onuray Sahin
8b6e4dd4d4
Merge pull request #6579 from vector-im/feature/ons/fix_remove_live_location_logs
Do not log the live location of the user (PSG-63)
2022-07-19 12:18:58 +03:00
ericdecanini
e926871570 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-07-19 11:17:14 +02:00
ericdecanini
2f408656a7 Changes vector override to vector feature 2022-07-19 10:43:55 +02:00
NIkita Fedrunov
f37e3b71eb fixed crash when system font scale setting isn't set 2022-07-19 10:40:14 +02:00