Commit Graph

5825 Commits

Author SHA1 Message Date
SpiritCroc 58dd1dedc9 Render MSC2530 captions
Change-Id: I10f875121e90102a0518d9bd39d87b3daa68ef2e
2022-11-10 14:00:26 +01:00
SpiritCroc 3214c782bc Fix clearing unread counts if the read receipt was only implicitely set
1. Open room with notifications without reading
2. Send a message
3. Try to mark as read

Before: didn't work, as the read receipt was internally already correct
After: works, since we force set it either way if we see unread counts
Change-Id: I68b20dd0242ea59f454dfbeeabfb58178e4a8395
2022-11-10 10:34:20 +01:00
SpiritCroc 773df1f4cc Merge tag 'v1.5.7' into merge-v1.5.7
Change-Id: I5d64f28783cb2d9a331e97ccfb5b0855fe915c6e
2022-11-10 09:55:04 +01:00
Benoit Marty c323326a58 Version 1.5.7 2022-11-07 17:14:18 +01:00
NIkita Fedrunov 38651353aa temporary workaround for a failing sync due to unexpected `enableUnreadThreadNotifications` param 2022-11-07 17:09:20 +01:00
SpiritCroc eab87760fe Merge tag 'v1.5.6' into sc
Change-Id: I4c39b35ff50c57cc9894b709a91691fa745cb0a6

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
	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/database/mapper/RoomSummaryMapper.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/sync/handler/room/RoomSyncHandler.kt
	vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
2022-11-03 09:31:58 +01:00
Amit Kumar b6746653f1
Add metrics plugin to track device download keys task (#7438)
* Add metrics tracking plugin for download device keys

* Add support for multiple metrics plugin

* Update copyright license header in matrix-sdk-android

* Add tests for MetricExtension

* Update changelog

* Improve MetricsExtension and reformatting
2022-11-02 13:43:57 +05:30
SpiritCroc 9269a4442c Merge remote-tracking branch 'sc2/merge-v1.5.4-1' into sc
Change-Id: Idc08fd88297d8e1f5211908217e32b93fb6df693

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
2022-10-28 18:16:15 +02:00
SpiritCroc 759da1fd09 Merge tag 'v1.5.4' into merge-v1.5.4
Change-Id: I3028022ed007c35d0ddbd6a859bc71958b8d2146

Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
	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/send/LocalEchoEventFactory.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/SpaceStateHandler.kt
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	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/MessageComposerView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
	vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
	vector/src/main/res/drawable/ic_voice_mic.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-10-28 18:02:53 +02:00
Eric Decanini 29d3856ef2
Merge pull request #7424 from vector-im/feature/eric/msc3773
Implements MSC3773 (Thread Notifications)
2022-10-26 10:44:32 -04:00
Benoit Marty c8d08e21a8 Small refactor 2022-10-26 12:36:58 +02:00
Benoit Marty e8046da0ba Use `GpsTagConstants.ALL_GPS_TAGS` to remove all tags related to GPS. 2022-10-26 12:34:03 +02:00
Benoit Marty 3632e6dc8a Replace library `org.apache.sanselan:sanselan:0.97-incubator` with `org.apache.commons:commons-imaging:1.0-alpha3` 2022-10-26 12:32:27 +02:00
ericdecanini dffb9d3d9d Fixes lint error 2022-10-24 21:39:31 -04:00
ericdecanini 3673e720fa Code improvements 2022-10-24 10:31:55 -04:00
ericdecanini 35be56a44a Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-10-24 10:28:21 -04:00
SpiritCroc d880bdb798 Add some extra UTD logging
Change-Id: Ie694b2317cb457d314b7cec36bf07a377c2af2d2
2022-10-22 10:59:33 +02:00
Nikita Fedrunov 113d0ff540
thread read receipts and unread notifications support is added to hom… (#7386) 2022-10-21 15:06:20 +02:00
ericdecanini 1086ed367e Fixes thread notifications instantly disappearing 2022-10-20 19:42:06 -04:00
Florian Renaud d44d81ed46
Merge pull request #7419 from vector-im/feature/fre/voice_broadcast_live_listening
Voice broadcast - live listening
2022-10-20 23:52:57 +02:00
Benoit Marty ed0d255495 Quick improvement on the doc. 2022-10-20 14:03:42 +02:00
Florian Renaud e9c81ca98f VoiceBroadcastPlayer - Live listening 2022-10-20 12:51:08 +02:00
ericdecanini dc7bff10c1 Merge remote-tracking branch 'origin/feature/nfe/threads_notifications_and_receipts' into feature/eric/msc3773
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-10-19 17:03:20 -04:00
ericdecanini 2379ce673b Adds filter event to opt in to thread notifications 2022-10-19 17:02:32 -04:00
Benoit Marty 9122d96fc6 Merge remote-tracking branch 'origin/develop' into develop 2022-10-19 17:17:33 +02:00
Benoit Marty 36eb538a93 Version++ 2022-10-19 17:17:21 +02:00
Johannes Marbach 451f5f824a
Merge pull request #7369 from vector-im/feature/hughns/qr_code_login
Implement logic for sign in with QR
2022-10-19 17:10:19 +02:00
Hugh Nimmo-Smith 4f652f1026 Request changes from review 2022-10-19 09:12:09 +01:00
Benoit Marty f5fe5cce62
Merge pull request #7372 from vector-im/feature/bma/fix_getUser_null
Handle properly when getUser returns null - prefer using getUserOrDefault
2022-10-19 08:40:44 +02:00
Florian Renaud fbf242756e Allow additional content when sending an event 2022-10-18 21:08:08 +02:00
ericdecanini ed9ecb7fc9 Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773 2022-10-18 11:03:41 -04:00
Hugh Nimmo-Smith 67be8c3c40 The one that got away 2022-10-18 12:44:05 +01:00
Florian Renaud 16c27ba174 Voice Broadcast - Get voice messages events related to a given VB 2022-10-18 13:41:05 +02:00
Florian Renaud 5f35926ce6 Voice Broadcast - Hide related voice message events 2022-10-18 13:41:04 +02:00
Florian Renaud ce14270fab Introduce MessageAudioEvent 2022-10-18 13:41:04 +02:00
Hugh Nimmo-Smith f7e0a19833 Remove redundant annotations 2022-10-18 12:29:48 +01:00
Hugh Nimmo-Smith 811d6d87ae Reuse getDecimalCodeRepresentation from SAS instead of duplicating code 2022-10-18 12:23:21 +01:00
Hugh Nimmo-Smith a83fb8bf83
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-18 12:09:17 +01:00
Hugh Nimmo-Smith 8530f8f280
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-18 12:09:06 +01:00
Hugh Nimmo-Smith 0d1df3f66e
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-18 12:08:09 +01:00
NIkita Fedrunov 6f5fefba56 lint 2022-10-18 10:44:20 +02:00
Hugh Nimmo-Smith 376cd1cb36 Missing throws 2022-10-18 09:34:28 +01:00
Hugh Nimmo-Smith 57a8dd4a1f Whitespce 2022-10-18 09:31:13 +01:00
Hugh Nimmo-Smith a1d2944c32 Always check master key when provided by verifying device 2022-10-18 09:08:40 +01:00
Hugh Nimmo-Smith f297117df2 Use mutex 2022-10-18 08:48:28 +01:00
Hugh Nimmo-Smith 8a62dfb34a Lint 2022-10-18 00:35:43 +01:00
Florian Renaud fb9c747a20 Reformat and add trailing commas 2022-10-17 22:33:43 +02:00
Florian Renaud 33a021c8ed Add sdk entry to attach reference to the outgoing events 2022-10-17 22:33:42 +02:00
Florian Renaud dbc61971df Reduce duplicated code 2022-10-17 22:33:42 +02:00
Hugh Nimmo-Smith 6d17d51fe9 remove nullability 2022-10-17 17:36:35 +01:00