Commit graph

4956 commits

Author SHA1 Message Date
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
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
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
ericdecanini
f9580e6cd5 Fixes error in RealmSessionStoreMigration 2022-07-19 14:12:56 +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
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
9c619001a5 Updating string value for redacted event to be more consistent 2022-07-19 14:04:09 +02:00
ericdecanini
6f9b5c010d Deletes migration test 2022-07-19 13:49:21 +02: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
Benoit Marty
ade1b7be8c Add some punctuation to please detekt. 2022-07-19 09:49:34 +02:00
Benoit Marty
3f8cbd1b9c Create a parent MatrixRealmMigration and improve the logs. 2022-07-18 17:22:49 +02:00
Benoit Marty
ae8f977d6b Log the end of the migration and it's duration 2022-07-18 17:21:49 +02:00
ericdecanini
bc5c53b70d Fixes copyright lint error 2022-07-18 15:53:51 +02:00
ericdecanini
e6475a3f83 Fixes copyright lint error 2022-07-18 15:47:19 +02:00
ericdecanini
7bb7a085a8 Fixes copyright lint error 2022-07-18 15:38:03 +02:00
ericdecanini
7d29fbc68c Fixes post merge errors 2022-07-18 15:06:25 +02:00
ericdecanini
c73c36eb26 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/MigrateSessionTo032.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
2022-07-18 15:05:04 +02:00
ericdecanini
67dd250f83 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 2022-07-18 15:03:42 +02:00
ericdecanini
1ae5965632 Fixes import order 2022-07-18 14:48:10 +02:00
Valere
4c554e4e85 fix unused import 2022-07-15 14:18:35 +02:00
Valere
e8bd7ea967 fix olm session proliferation 2022-07-15 14:17:44 +02:00
Adam Brown
38763d0575 adding function to extract usernames from full matrix ids 2022-07-15 11:34:12 +01:00
Nikita Fedrunov
c7b54b8d3d
legacy groups removal (#6268) 2022-07-15 12:25:10 +02:00
Jorge Martín
50f8d0a667 Ignore forwardPaginationTest to unblock the CI 2022-07-14 15:42:20 +02:00
Adam Brown
257f41dbf1
Merge pull request #6471 from vector-im/feature/adm/sharing-tests
Adding tests around the share intent handling
2022-07-13 10:12:09 +01:00
Florian Renaud
fca4df3522 Revert "Ensure that Realm is up to date before returning the roomId"
This reverts commit 8a5a47c6a5.
2022-07-11 16:44:32 +02:00
Florian Renaud
fdb9ed80d4 Change method visibility 2022-07-11 16:22:49 +02:00
Florian Renaud
68bd55fef5 Merge branch 'develop' into feature/fre/start_dm_on_first_msg
* develop: (156 commits)
  adding test case for showing html entities are processed
  adding tests around the event html rendering - the test helper is a little hacky in order to covert the spans to something human readable
  removing extra line
  adding changelog entry
  overriding the default list handler with an implementation that takes into account the initial starting position
  trigger CI
  Use executeTransactionAwait (need realm refresh in this case)
  Bump flipper from 0.152.0 to 0.153.0
  Use executeTransactionAwait (need realm refresh in this case)
  generating 1.4.27 changelog and updating version
  Fixing crash when sharing plain text, such as a url
  Fix crashes when opening Thread (#6463)
  Timeline: fix validation of timeline event changes
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix crashes when opening Thread (#6463)
  suppressing unused string resource
  Changelog
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix typo
  adding changelog entry
  ...
2022-07-11 12:03:24 +02:00
ericdecanini
051f925f0e Adds MigrateSessionTo032Test 2022-07-07 13:03:58 +01:00
Adam Brown
67d5289f01
Merge pull request #6462 from vector-im/feature/fga/fix_6461
Timeline: fix validation of timeline event changes
2022-07-07 11:25:33 +01:00
Adam Brown
3e770f9efa
Merge pull request #6474 from vector-im/feature/fga/fix_6463
Fix crashes when opening Thread (#6463)
2022-07-07 11:12:28 +01:00
ganfra
19fc97ba0f Use executeTransactionAwait (need realm refresh in this case) 2022-07-06 19:33:34 +02:00
Adam Brown
169ac9d0a0 updating the known SDK mimetypes and making use of them for the intent switches 2022-07-06 12:06:17 +01:00
ganfra
0743140973 Fix crashes when opening Thread (#6463) 2022-07-05 17:00:01 +02:00
Benoit Marty
b847d8cf36 Fix ConcurrentModificationException on BackgroundDetectionObserver 2022-07-05 12:06:49 +02:00
ganfra
f58ba13ef0 Timeline: fix validation of timeline event changes 2022-07-05 10:41:22 +02:00
ericdecanini
98d195c010 Changes migration to be realm list field 2022-07-05 09:35:05 +01:00
Florian Renaud
414dc52f7d Fix copyright date 2022-07-04 18:03:43 +02:00