Commit Graph

5931 Commits

Author SHA1 Message Date
SpiritCroc e054828370 Merge tag 'v1.5.14' into sc
Change-Id: Ib0162cc1f66cd563e15a24a2c090cfd18b5250c2
2022-12-21 09:57:40 +01:00
Benoit Marty 576ea2df55 Prepare hotfix 1.5.14 2022-12-20 16:44:11 +01:00
SpiritCroc f5dcf25a6d Merge tag 'v1.5.13' into sc
Change-Id: I16e8750adb88c86ad6af84f60d904fd5e16d2f13
2022-12-19 18:04:43 +01:00
Benoit Marty ffa49870a9 Version 1.5.13 2022-12-19 16:52:32 +01:00
SpiritCroc dd83c16e46 Disable useless thread fallback to reply fallback calculation
Don't ask me why Element did that much effort for those, instead of just
doing rich replies...

Change-Id: I90146a34b7a29896f550fcde50f821af629d7edb
2022-12-17 15:18:03 +01:00
SpiritCroc aa9e0bc627 Add read receipt debugging
Change-Id: I2cd0b5feb23962bc36295380fe3e77346f0ea694
2022-12-17 11:34:39 +01:00
SpiritCroc 330f0cf5cc Merge tag 'v1.5.12' into sc
Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector-app/build.gradle
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
2022-12-15 11:01:52 +01:00
Nikita Fedrunov cf3abd6562
thread list loading (#7766) 2022-12-14 18:56:16 +01:00
Yoan Pintas c74ea2dd16
Merge pull request #7719 from vector-im/feature/fre/voice_broadcast_last_message
Voice Broadcast - Update last message in the room list
2022-12-14 17:39:42 +01:00
Maxime NATUREL fe5e4d6830
Merge pull request #7757 from vector-im/fix/mna/poll-end-not-recognized
[Poll] Poll end event is not recognized (PSG-948 and PSG-949)
2022-12-13 17:08:01 +01:00
Maxime NATUREL 851276978f Remove unused import 2022-12-13 15:47:30 +01:00
Maxime NATUREL 96e29d4d10 Renaming the name of the test file be consistent 2022-12-13 15:46:14 +01:00
Maxime NATUREL 71df1e61d4 Remove non necessary call when getting the targeted event id 2022-12-13 15:45:46 +01:00
Nikita Fedrunov 3dadebe505
threads are enabled by default end forced to enabled for existing users (#7775) 2022-12-13 14:02:45 +01:00
Valere d05e10e10a
crypto migration tests (#7645)
Crypto migration tests

Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-12-13 11:38:49 +01:00
Onuray Sahin 250bd9c620
Merge pull request #7754 from vector-im/feature/ons/remove_client_information_account_data
Delete unused client information from account data (PSG-871)
2022-12-13 11:10:41 +03:00
Hugh Nimmo-Smith 34ee399f94
Merge pull request #7737 from vector-im/bugfix/hughns/qr-server-change 2022-12-12 18:21:39 +00:00
Onuray Sahin 9954045d30
Merge pull request #7740 from vector-im/feature/ons/remove_account_data
Handle account data removal (PSG-865, PSG-867)
2022-12-12 19:31:16 +03:00
Hugh Nimmo-Smith 21cbe52740 Lint 2022-12-12 16:30:34 +00:00
Hugh Nimmo-Smith 1930047ce1 Fix issue of QR not being offered where domain is entered instead of homeserver 2022-12-12 16:30:34 +00:00
Onuray Sahin 8c6c2dd5c2 Code review fixes. 2022-12-12 16:36:40 +03:00
Onuray Sahin 746fb7719a Code review fixes. 2022-12-12 13:39:56 +03:00
Maxime NATUREL dba8aaea16
Merge pull request #7752 from vector-im/fix/mna/wrong-usage-of-stable-fields
Revert usage of stable fields in live location sharing and polls
2022-12-09 17:32:53 +01:00
Maxime NATUREL bd91db66f8 Fixing retrieve of related event id in the end poll event during aggregation 2022-12-09 14:07:06 +01:00
Onuray Sahin 8206b534f9 Create a task to delete an event data with a given type. 2022-12-09 14:52:27 +03:00
Onuray Sahin 3d68233723 Support retrieving account data whose key starts with a string. 2022-12-09 14:51:23 +03:00
Maxime NATUREL 220b1d86c0 Reverting usage of some stable fields whereas related MSCs have not landed into the specs yet 2022-12-08 17:42:51 +01:00
Onuray Sahin b09a00efda Code review fixes. 2022-12-08 17:11:09 +03:00
Hugh Nimmo-Smith 7bbd91f2a9 Handle error whilst download key for self 2022-12-08 13:27:49 +00:00
Hugh Nimmo-Smith 3a2a916c2f Clarify comment 2022-12-08 13:27:49 +00:00
Hugh Nimmo-Smith 73fd93148a Download device keys for self prior to verification checks
Fixes https://github.com/vector-im/element-android/issues/7676
2022-12-08 13:27:49 +00:00
Onuray Sahin 055bf6d302 Revert unused companion object. 2022-12-07 21:41:22 +03:00
Florian Renaud 1a3ca7b1a0 Filter event types from decrypted content 2022-12-07 18:11:51 +01:00
Florian Renaud 6e5461f300 Stop filtering events with reference relationship when computing latest previewable event 2022-12-07 18:11:51 +01:00
Florian Renaud 4d6c04baf9 Add provider for custom event types 2022-12-07 18:11:51 +01:00
Florian Renaud fdb8743ad3 Create provider package 2022-12-07 18:11:51 +01:00
Onuray Sahin f4429d4c9c Handle sync response to delete user and room account data. 2022-12-07 18:58:14 +03:00
Onuray Sahin 765202e05a Add helper functions to delete user and room account data. 2022-12-07 18:17:43 +03:00
Valere 01533db4e0
Merge pull request #7713 from vector-im/feature/bca/to_device_tracing
add to device tracing id
2022-12-07 16:16:20 +01:00
Onuray Sahin d244f7324c Add api functions to delete account data. 2022-12-07 18:12:25 +03:00
SpiritCroc 87100a8536 Merge remote-tracking branch 'upstream/develop' into sc
Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28

Conflicts:
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
2022-12-07 14:56:07 +01:00
SpiritCroc 001e22bbad Merge tag 'v1.5.11' into sc
Change-Id: Ia736ee03b924e8ec8f641420eac11f5fc68b69f4
2022-12-07 14:36:35 +01:00
Benoit Marty 6c84668611 Hotfix 1.5.11 2022-12-07 13:58:02 +01:00
Benoit Marty 1acd8e1049 Do not propagate failure if saving the filter server side fails. This will be retried later. 2022-12-07 13:55:18 +01:00
valere 63d2886415 use msgid in logs for consistency 2022-12-06 16:07:24 +01:00
valere 8646cc441d do not add tracing ids to verification events 2022-12-06 15:30:06 +01:00
Benoit Marty ae93c07597 Do not propagate failure if saving the filter server side fails. This will be retried later. 2022-12-06 15:01:47 +01:00
valere 139eb1708c fix uncheck cast warning 2022-12-06 08:17:31 +01:00
valere 2ed212aa11 Fix copyright 2022-12-05 18:30:38 +01:00
valere f2952f2dee add to device tracing id 2022-12-05 18:15:55 +01:00