filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,670 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

5308 Commits

Author SHA1 Message Date
Valere fb05ab34d8
Merge pull request #6395 from vector-im/feature/bca/fix_invalid_qr_warning 
Display specific message when verif code malformed
 2022-07-21 12:36:46 +02:00
Valere 687c2794fd use specific unstable/stable class 2022-07-21 10:13:15 +02:00
Valere d51a1fdb0e add back withheld tests 2022-07-21 10:01:41 +02:00
Valere 7a3f2bb240 stable name for withheld 2022-07-21 10:01:41 +02:00
ericdecanini 3f637ea41a Fixes migration crash 2022-07-20 17:50:59 +02:00
ericdecanini b89df0b520 Adds MigrateSessionTo035 2022-07-20 16:45:35 +02:00
ericdecanini 9e1235d51f 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/MigrateSessionTo034.kt
 2022-07-20 16:44:33 +02:00
Maxime NATUREL 7639f158d7
Merge pull request #6600 from vector-im/bugfix/mna/lls-ended-too-soon 
[Location Share] - Live is considered as ended while still active (PSG-617)
 2022-07-20 14:01:05 +02:00
Valere a8cd77c267
Merge pull request #6585 from vector-im/feature/bca/fix_backup_regression 
fix backup looping same keys
 2022-07-20 13:52:47 +02:00
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
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
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 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 309642845e fix backup looping same keys 2022-07-20 09:57:31 +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
ericdecanini 8c53d2f9b0 Reformats modules 2022-07-19 15:11:42 +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