Commit Graph

17830 Commits

Author SHA1 Message Date
Eric Decanini 7ceef0045b
Merge pull request #6602 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.52
Bump libphonenumber from 8.12.51 to 8.12.52
2022-07-20 13:51:45 +02:00
Onuray Sahin 26a677edc2
Merge branch 'develop' into feature/ons/fix_live_location_sharing_permission 2022-07-20 13:40:55 +03:00
Eric Decanini 38ba61f144
Merge pull request #6200 from vector-im/bugfix/eric/upgrade-room-deduplication
Fixes room not being in space after upgrade
2022-07-20 12:30:42 +02:00
Valere 10b1443fda add quick test for direct parent name 2022-07-20 12:12:32 +02:00
Eric Decanini a0bf1787cb
Merge pull request #6593 from vector-im/task/eric/trailing-commas
Code style change: Trailing Commas
2022-07-20 11:46:53 +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
Benoit Marty bc3ab9dd11 Remove duplicated and unused dependencies. 2022-07-20 10:25:33 +02:00
Maxime NATUREL a5fffdfc1b DB migration 2022-07-20 10:00:19 +02:00
Maxime NATUREL ca8e4f51e9 Updating unit tests of aggregation process 2022-07-20 09:58:14 +02:00
Maxime NATUREL a48d33dc3c Adding changelog entry 2022-07-20 09:57:54 +02:00
Maxime NATUREL 3ad754e732 Adding start of live timestamp threshold when deactivating previous beacons 2022-07-20 09:57:52 +02:00
Valere 78afa3f100 no need to store inbound after decrypt 2022-07-20 09:57:31 +02:00
Valere 51376cc202 add change log 2022-07-20 09:57:31 +02:00
Valere 309642845e fix backup looping same keys 2022-07-20 09:57:31 +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
dependabot[bot] 6332668b8c
Bump libphonenumber from 8.12.51 to 8.12.52
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.51 to 8.12.52.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.51...v8.12.52)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-19 23:06:00 +00: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
ericdecanini 8c53d2f9b0 Reformats modules 2022-07-19 15:11:42 +02:00
ericdecanini cc1e1fe8eb Enables trailing comma editor config 2022-07-19 14:51:07 +02: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