5988 Commits

Author SHA1 Message Date
SpiritCroc
94b996b52a [rich replies] Disable useless recent upstream reply fallback changes
Change-Id: I37cf9986dba043ae6ca146b98a29e05f004de3a4
2023-01-13 16:16:33 +01:00
SpiritCroc
d4cb55eeaa Merge tag 'v1.5.20' into sc
Change-Id: I438392b41ebe84dccfae1639ae90102c3d45c680

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
	vector/src/main/res/xml/vector_settings_advanced_settings.xml
2023-01-13 14:50:46 +01:00
Benoit Marty
31a0a049b1
Merge pull request #7432 from ByeongsuPark/feature/bspark/enhancement-7111-trim-username
Add trim to username input when sign-in
2023-01-10 14:38:56 +01:00
Benoit Marty
6eece5b270 Remove the "device" field from get /pushrules response model. 2023-01-09 18:07:47 +01:00
Benoit Marty
ca3d441de0 Handle error in the thread list request. 2023-01-09 14:16:12 +01:00
Benoit Marty
ce0c514dae Fix link on doc. 2023-01-09 14:11:16 +01:00
Benoit Marty
baa46634b5
Merge pull request #7885 from vector-im/feature/bma/fixLint
Fix lint false positive
2023-01-06 18:44:37 +01:00
Benoit Marty
b7076a13dc
Merge pull request #7879 from vector-im/feature/bma/still_investigating
Reduce number of crypto database transactions when handling the sync response
2023-01-06 15:16:16 +01:00
Benoit Marty
0d2fb8e3d0 Lint: fix KotlinNullnessAnnotation warning 2023-01-05 14:07:12 +01:00
Benoit Marty
dbf3b76331 Update doc. 2023-01-05 11:54:19 +01:00
Benoit Marty
27d32188bf Aggregate data outside of the RealmCryptoStore. 2023-01-05 11:22:54 +01:00
Benoit Marty
30940cb937 Rename UserCrossSigningKeys to UserIdentity 2023-01-05 09:53:12 +01:00
Benoit Marty
7e26c4b6f2 Rename fun 2023-01-05 09:48:25 +01:00
Benoit Marty
437b93cc18 Add some doc 2023-01-04 11:35:34 +01:00
Benoit Marty
92d048f45a Update replied event when it's updated
Rebased and squashed.
Authors: Claire and Ganfra
2023-01-03 18:16:38 +01:00
Benoit Marty
06f3c11010 Changelog 2023-01-03 16:43:09 +01:00
Benoit Marty
02e7157206 Introduce CryptoCrossSigningKeys container 2023-01-03 16:16:17 +01:00
Benoit Marty
4c4ef0d73e Batch insertion of user data after downloading keys. 2023-01-03 15:57:39 +01:00
Benoit Marty
f26178fc21 Avoid useless transaction 2023-01-03 15:21:03 +01:00
Benoit Marty
a386a4762c Crypto store: Log realm transactions and the duration 2023-01-03 15:18:32 +01:00
Benoit Marty
c1a8bf828b Batch insertion of shouldEncryptForInvitedMembers 2023-01-03 15:15:15 +01:00
Benoit Marty
6f384c799f Batch insertion of shouldShareHistory 2023-01-03 15:02:45 +01:00
Benoit Marty
0e504e9014 Format 2023-01-03 11:55:41 +01:00
Benoit Marty
837590104d Avoid launching coroutine for nothing. 2023-01-03 11:55:32 +01:00
SpiritCroc
dadeadcad4 Merge tag 'v1.5.18' into sc
Change-Id: I4730268dc4327fb16756e73d4dcb428a8c262ec3
2023-01-02 17:57:49 +01:00
Benoit Marty
5ee3ae5eea version++ 2023-01-02 13:39:05 +01:00
valere
a345c6c8e5 fix 7870 2022-12-31 13:21:07 +01:00
SpiritCroc
740364f733 Merge remote-tracking branch 'deepbluev7/nico/fix-at-room' into sc
Change-Id: I9587d87c60e70c2efc098b7379a6bac9f9c9be26
2022-12-31 08:24:15 +01:00
SpiritCroc
25dddf7566 Merge tag 'v1.5.16' into sc
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2022-12-30 17:58:06 +01:00
valere
ea2c41b818 version++ 2022-12-29 18:24:33 +01:00
valere
25f4f2175a Fix failing tests 2022-12-28 10:19:25 +01:00
valere
558317260b Add migration to clean db from SyncFilterParamsEntity 2022-12-27 15:40:49 +01:00
NIkita Fedrunov
91b4dc1f97 tests are fixed 2022-12-23 13:51:19 +01:00
NIkita Fedrunov
d20121603a sync filter params moved to matrix config 2022-12-23 13:10:27 +01:00
SpiritCroc
e054828370 Merge tag 'v1.5.14' into sc
Change-Id: Ib0162cc1f66cd563e15a24a2c090cfd18b5250c2
2022-12-21 09:57:40 +01:00
Benoit Marty
67e15a42c0 Version++ 2022-12-20 16:50:08 +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
Benoit Marty
555cbe5f7d Return faster if list is empty 2022-12-16 20:44:26 +01:00
Benoit Marty
b063b25e8c Ignore typing notification for ignored users (part of #2965) 2022-12-16 20:39:44 +01:00
Maxime NATUREL
648f97ba78
Merge pull request #7779 from vector-im/feature/mna/relations-api-poll-end
[Poll] When a poll is ended, use /relations API to ensure poll results are correct (PSG-1013)
2022-12-16 10:40: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
Benoit Marty
8c49609aa6 version++ 2022-12-15 10:20:26 +01:00
Maxime NATUREL
e5663ec1c3 Fixing unit tests 2022-12-15 09:45:17 +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
4e4f72f241 Fixing code styling issues 2022-12-14 17:37:45 +01:00