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
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
Maxime NATUREL
637961bbb1
Update related account data event on notification method change
2022-12-05 09:43:56 +01:00
Maxime NATUREL
14b21dc039
Adding use cases to create and delete notifications settings in account data
2022-12-05 09:43:56 +01:00
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
