Commit graph

5929 commits

Author SHA1 Message Date
SpiritCroc
65be0039a5 Merge tag 'v1.5.10' into merge-v1.5.10
TODO: re-implement our composer constraint changes

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.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/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.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/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.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/composer/PlainTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.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/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/res/drawable/ic_voice_mic_recording.xml
	vector/src/main/res/layout/composer_layout.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/composer_rich_text_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/composer_rich_text_layout_constraint_set_fullscreen.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_preferences.xml
	vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt

Change-Id: I55e95d86b4bb019544d75dcb653afe05194cd224
2022-12-02 22:03:17 +01:00
Benoit Marty
52477aa9d5 version++ 2022-11-30 11:03:58 +01:00
Florian Renaud
49199bd5e2
Merge pull request #7611 from vector-im/feature/fre/voice_broadcast_deletion
Be less restritive when pruning redacted events
2022-11-28 13:57:40 +01:00
Florian Renaud
dd81584076 Ad default value to MessageStickerContent.body in case of redaction 2022-11-28 12:12:49 +01:00
Nikita Fedrunov
5aeca1f81a
saving sync filter changed (#7627) 2022-11-28 09:48:28 +01:00
Florian Renaud
a8f3bb1d4e Remove to-device events from event type filtering for redaction 2022-11-25 14:42:46 +01:00
Florian Renaud
5a43b76488 Log a warning if the event content is not pruned 2022-11-25 14:42:45 +01:00
Florian Renaud
2477632e2b Fix exception when getting models on some redacted event
An exception was triggered because the excepted model body was null for redacted events
2022-11-25 14:42:45 +01:00
Florian Renaud
0209cc4969 Prune redacted events which are not explicitly restricted 2022-11-25 14:42:45 +01:00
Florian Renaud
eb12b1c99b Use StableUnstableId object for some event types 2022-11-25 14:42:45 +01:00
Nikita Fedrunov
9349b1ae15
read receipt migration added (#7640) 2022-11-25 14:24:14 +01:00
Nikita Fedrunov
18bcc83a46
added read receipts for threads (#7474) 2022-11-25 09:49:06 +01:00
Valere
035b1ebedc
Merge pull request #7594 from vector-im/feature/bca/better_edit_validation
Better edit (replace handling)
2022-11-24 17:22:41 +01:00
Valere
bec8b5f71e code review 2022-11-24 12:45:35 +01:00
Valere
c06eca6936 Migration test and cleaning 2022-11-24 12:45:35 +01:00
Valere
ca907df94b kdoc fix 2022-11-24 12:45:35 +01:00
Valere
2819957585 fix edit display flicker with local echo 2022-11-24 12:45:35 +01:00
Valere
e5d3206b6f code review 2022-11-24 12:45:35 +01:00
Valere
d759f26db6 fix fake awaitTx 2022-11-24 12:45:35 +01:00
Valere
8b47bf004e Fix broken polls states 2022-11-24 12:45:35 +01:00
Valere
3746ede49a Fix test 2022-11-24 12:45:35 +01:00
Valere
e66a0541be Add changelog, some cleaning 2022-11-24 12:45:35 +01:00
Valere
891709ef41 better replace handling 2022-11-24 12:45:35 +01:00
Benoit Marty
ebbfca4ffd Detekt: Use require() instead of throwing an IllegalArgumentException. [UseRequire] 2022-11-24 11:06:00 +01:00
SpiritCroc
bbbefae75c Rich replies: Use live sender info for reply name, if wanted
Change-Id: I3de535c9fdbe7fcff54bee486182b1d84464f832
2022-11-22 13:10:14 +01:00
SpiritCroc
011f9b0853 Add support for sending account custom emotes (MSC-2545)
We had support for room emotes and global room emotes, but this one was
missing.

Change-Id: Ic21078b6d786b46fbcd5512db03d9fd1483b25b1
2022-11-19 16:09:32 +01:00
SpiritCroc
a32fc6bbcb Omit reply fallback when editing replies, as demanded by spec
Change-Id: Iec1567c8c7564a06d22171b8f9451a77f438aeac
2022-11-19 15:02:26 +01:00
SpiritCroc
6c4c35158b Implement rich replies
https://spec.matrix.org/v1.4/client-server-api/#rich-replies

Change-Id: I65ea1fd3e42414fc0e5311ad7abf7035bf723a30
2022-11-19 15:02:06 +01:00
SpiritCroc
3eeca39c4b Merge tag 'v1.5.8' into sc
Release 1.5.8

Change-Id: I763148cfe6bb2155682637ce4c339951441b87ce

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/sync/SyncResponseHandler.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/MessageComposerFragment.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/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_timeline.xml
2022-11-18 16:11:16 +01:00
Maxime NATUREL
14de485c67
Merge pull request #7566 from vector-im/fix/mna/missing-translation-reply-to
Missing translations on "replyTo" messages (PSG-978)
2022-11-18 14:39:18 +01:00
Benoit Marty
65d898e3de version++ 2022-11-17 12:57:08 +01:00
Benoit Marty
5d3228d97b toModel was not catching com.squareup.moshi.JsonDataException properly (discovered when joining a Jitsi conf added as a Widget) 2022-11-17 12:28:58 +01:00
Jorge Martin Espinosa
10775ab2f3
Editing: default to MessageContent.body when no formattedBody is present (#7592)
* Editing: default to `MessageContent.body` when no `formattedBody` is present

* Update docs
2022-11-16 12:13:07 +00:00
Jorge Martin Espinosa
a476544761
Fix some quoted messages having 'null' message bodies (#7532)
* Fix some quoted messages having 'null' message bodies
2022-11-14 11:01:29 +00:00
Maxime NATUREL
4a65e1153a Fix retrieve of the question for poll events 2022-11-14 10:18:42 +01:00
Maxime NATUREL
57e90aee83 Removing description parameter in startLiveLocation method of SDK to avoid translated strings in beacon events 2022-11-10 15:40:50 +01:00
Maxime NATUREL
235b629130 Use case to process formatted body of reply to events 2022-11-10 15:29:58 +01:00
SpiritCroc
58dd1dedc9 Render MSC2530 captions
Change-Id: I10f875121e90102a0518d9bd39d87b3daa68ef2e
2022-11-10 14:00:26 +01:00
Maxime NATUREL
744b03a806
Merge pull request #7523 from vector-im/feature/mna/push-toggle-current-session
Push notifications toggle: align implementation for current session (PSG-971)
2022-11-10 13:44:49 +01:00
Amit Kumar
c07b110b99
Add spannable tracking around SyncResponseHandler (#7514)
* Add spannable tracking around SyncResponseHandler

* Update LICENSE header

* Refactor handleResponse and MetricsExtensions

* Update changelog.d

* Improve code docs and comments

* Check if Sentry is enabled before tracking
2022-11-10 16:13:09 +05:30
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
Maxime NATUREL
ab90da0e51 Adding isReply extension method for RelationDefaultContent 2022-11-10 10:05:01 +01:00
Maxime NATUREL
24a5cfa9e5 Listen for pusher or account data changes to update the local setting 2022-11-10 10:00:27 +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
d07c6da3ac Add a test for incomplete word. 2022-11-09 15:31:27 +01:00
Benoit Marty
823e7bf212 Fix search tests. 2022-11-09 15:26:39 +01:00
Maxime NATUREL
fc24beaa68
Merge pull request #7456 from vector-im/feature/mna/session_manager_multi_signout
[Session manager] Multi-session signout (PSG-857)
2022-11-08 14:21:14 +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
NIkita Fedrunov
0c40acb186 temporary workaround for a failing sync due to unexpected enableUnreadThreadNotifications param 2022-11-07 16:16:51 +01:00
Maxime NATUREL
1d2b8e76a2 Adding min size annotation to task params 2022-11-07 11:13:23 +01:00
Maxime NATUREL
76e2b6b39f Removing some TODOs 2022-11-07 11:09:42 +01:00
Maxime NATUREL
bb262f0c41 Adding new "delete_devices" request API 2022-11-07 11:09:41 +01:00
Florian Renaud
ac0d823c88
Merge pull request #7519 from vector-im/bugfix/fre/unencrypted_media_event_json_type
Fix bad content types when sending unencrypted media event with additional content data
2022-11-04 10:40:18 +01:00
Maxime NATUREL
4621488f21
Merge pull request #7476 from vector-im/fix/mna/push-toggle-check-support
[Session manager] Hide push notification toggle when there is no server support (PSG-970)
2022-11-04 09:19:04 +01:00
Florian Renaud
c0ba2f2f48 Fix bad content types when sending unencrypted media 2022-11-03 11:28:45 +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
ganfra
404383e683 Update versions 2022-11-02 17:58:10 +01:00
Maxime NATUREL
52a77e074f Renaming const for feature value 2022-11-02 09:37:10 +01:00
Maxime NATUREL
1acb42f61d Adding use case to check support for new enabled field support 2022-11-02 09:37:10 +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