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
5d30146a4b
[TMP] Automatic upstream merge preparation
...
Change-Id: If24c33d54a205bcd5721ad620725e9c2bf7ca7b3
2022-12-15 10:39:04 +01:00
243af7358f
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I03f5d0d1693253d23b9cd25b57228a288ca83a99
2022-12-15 10:39:04 +01:00
d13494aa67
[TMP] merge_helpers.sh: Hardcode develop branch
...
Change-Id: I3aecb7aae1d16b0f578a15b6271d2e66bc443cea
2022-12-15 10:38:32 +01:00
7341e5c47b
Merge branch 'release/1.5.12' into main
2022-12-15 10:18:25 +01:00
cf1a115c67
Merge branch 'release/1.5.12' into main
2022-12-15 10:16:25 +01:00
dd88ac597e
Adding fastlane file for version 1.5.12
2022-12-15 10:16:02 +01:00
82ad08aced
Changelog for version 1.5.12
2022-12-15 10:15:24 +01:00
cf3abd6562
thread list loading ( #7766 )
2022-12-14 18:56:16 +01:00
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
e0a611a16e
changed copy for threads labs flag ( #7776 )
2022-12-14 15:13:24 +01:00
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
851276978f
Remove unused import
2022-12-13 15:47:30 +01:00
96e29d4d10
Renaming the name of the test file be consistent
2022-12-13 15:46:14 +01:00
71df1e61d4
Remove non necessary call when getting the targeted event id
2022-12-13 15:45:46 +01:00
3dadebe505
threads are enabled by default end forced to enabled for existing users ( #7775 )
2022-12-13 14:02:45 +01:00
4657729e36
Bump dependency-check-gradle from 7.3.0 to 7.4.1 ( #7759 )
...
Bumps dependency-check-gradle from 7.3.0 to 7.4.1.
---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-13 12:41:17 +00:00
d05e10e10a
crypto migration tests ( #7645 )
...
Crypto migration tests
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-12-13 11:38:49 +01:00
c626100ae1
Disable unnecessary reply fallback processing
...
We have rich replies!
Change-Id: Ifc5f41471f32e0a60e23f41c7fa9a51f25865d77
2022-12-13 10:43:01 +01:00
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
4e0c3a97bd
thread message notification should navigate to thread timeline ( #7771 )
2022-12-12 22:35:09 +01:00
34ee399f94
Merge pull request #7737 from vector-im/bugfix/hughns/qr-server-change
2022-12-12 18:21:39 +00:00
0ffc2af679
Update test to work with new state
2022-12-12 17:32:28 +00:00
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
f111a84e17
More unit test fix
2022-12-12 16:30:35 +00:00
096e52612e
More fix up of unit tests
2022-12-12 16:30:35 +00:00
643b09a77c
Fix up unit tests
2022-12-12 16:30:35 +00:00
1437f6d41d
Remove unused bad function call
2022-12-12 16:30:35 +00:00
006e2b5c0d
Changelog
2022-12-12 16:30:35 +00:00
21cbe52740
Lint
2022-12-12 16:30:34 +00:00
1930047ce1
Fix issue of QR not being offered where domain is entered instead of homeserver
2022-12-12 16:30:34 +00:00
8c6c2dd5c2
Code review fixes.
2022-12-12 16:36:40 +03:00
c523e144b8
Rich text editor: improve performance when changing composer mode ( #7691 )
...
* Rich text editor: improve performance when changing composer mode
* Add changelog
* Make `MessageComposerMode.Quote` and `Reply` data classes
* Re-arrange code to fix composer not being emptied when sneding a message
2022-12-12 13:52:17 +01:00
a12167077f
Update project board IDs for automation
...
"PN-" prefixed IDs are no longer working, update to new IDs
2022-12-12 10:40:49 +00:00
746fb7719a
Code review fixes.
2022-12-12 13:39:56 +03:00
361b0411c7
Merge pull request #7747 from vector-im/fix/mna/verification-request-priority
...
Verification request is not showing when verify session popup is displayed (PSG-1017)
2022-12-12 09:44:25 +01:00
74d7e60380
Bump fragment from 1.5.4 to 1.5.5 ( #7741 )
...
Bumps `fragment` from 1.5.4 to 1.5.5.
Updates `fragment-ktx` from 1.5.4 to 1.5.5
Updates `fragment-testing` from 1.5.4 to 1.5.5
---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-12 09:21:24 +01:00
85a6c8c6f2
Write unit tests for the use case.
2022-12-09 19:53:20 +03:00
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
bd91db66f8
Fixing retrieve of related event id in the end poll event during aggregation
2022-12-09 14:07:06 +01:00
7a667b513e
Execute use case from a better place.
2022-12-09 15:47:28 +03:00
a762179c32
Merge pull request #7699 from vector-im/bugfix/hughns/qr-device-race
2022-12-09 12:04:29 +00:00
22cce30e35
Create use case to detect and delete unnecessary account data of client information.
2022-12-09 14:53:27 +03:00
8206b534f9
Create a task to delete an event data with a given type.
2022-12-09 14:52:27 +03:00
3d68233723
Support retrieving account data whose key starts with a string.
2022-12-09 14:51:23 +03:00
57cedaeb69
Adding changelog entry
2022-12-09 10:10:59 +01:00
be7b49b707
Merge pull request #7736 from vector-im/fix/mna/session-without-crypto-keys
...
[Session manager] Sessions without encryption support should not prompt to verify (PSG-1004)
2022-12-09 09:52:39 +01:00
cf59c80100
stop listening timeline collection changes when app is not resumed ( #7734 )
2022-12-09 09:42:45 +01:00
99942c2714
Adding changelog entry
2022-12-09 09:33:06 +01:00
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
SpiritCroc
Benoit Marty
Nikita Fedrunov
Yoan Pintas
Maxime NATUREL
Maxime NATUREL
dependabot[bot]
Valere
Onuray Sahin
Hugh Nimmo-Smith
Hugh Nimmo-Smith
Onuray Sahin
Jorge Martin Espinosa
Ekaterina Gerasimova