Commit graph

551 commits

Author SHA1 Message Date
SpiritCroc
ecd28447c9 Merge tag 'v1.4.0' into sc
Change-Id: If953d524434cd8a7073a16014f4ec6850b72a226

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt
	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/RoomDetailViewState.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/timeline/TimelineEventController.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/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/drawable/ic_filter.xml
	vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_notice_stub.xml
	vector/src/main/res/layout/item_timeline_event_voice_stub.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/menu/menu_timeline.xml
2022-02-19 10:55:47 +01:00
Benoit Marty
7d463cc9bc Towncrier 2022-01-31 14:51:09 +01:00
Benoit Marty
8ee23c1e6a Merge branch 'develop' into feature/bma/location_crash 2022-01-31 12:49:17 +01:00
Benoit Marty
4e3c730940 Changelog 2022-01-31 12:49:08 +01:00
SpiritCroc
a9d5700d2b Merge tag 'v1.3.16' into sc
Change-Id: I8b3937f4ac30d3e72e2cb694eee2dc5bf034cb75

Conflicts:
	gradle.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.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/di/NetworkModule.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.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/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.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/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/layout/activity_call.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/item_timeline_event_base.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/values/config.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-01-29 12:18:19 +01:00
Adam Brown
2eeeefdf49 adding changelog entry 2022-01-28 12:11:54 +00:00
David Langley
235f2c78f8
Merge pull request #5083 from vector-im/feature/dla/hold_call_for_transfer_selection
Hold call for transfer selection
2022-01-28 09:14:26 +00:00
David Langley
a5df52ce28
Update changelog.d/5081.bugfix
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-01-27 15:39:47 +00:00
David Langley
79b11623b5 Call transfer should put other side on hold while the transfer is being selected and unhold when the user cancels selection. 2022-01-27 15:16:46 +00:00
Benoit Marty
ff6810f1f4
Merge pull request #5062 from vector-im/feature/bma/location_sharing_fix
Ensure mapbox legal mention are displayed on the map
2022-01-27 15:35:52 +01:00
Benoit Marty
c6ee513ba1
Merge pull request #5069 from vector-im/feature/ons/fix_end_poll
Allow ending polls if user created it
2022-01-27 14:09:18 +01:00
Benoit Marty
1518a08c29 Fix towncrier mistake due to file extension change 2022-01-27 12:17:25 +01:00
Benoit Marty
62a554b5e2 Changelog 2022-01-26 17:01:52 +01:00
Onuray Sahin
db1152cb72 Allow ending polls if user created it. 2022-01-26 17:50:31 +03:00
Benoit Marty
bf1ef3ce56 Towncrier 2022-01-25 21:42:37 +01:00
Benoit Marty
f14bf0dd50
Merge pull request #4817 from vector-im/feature/ons/static_location
Static Location Sharing
2022-01-25 18:03:17 +01:00
Benoit Marty
871b05b641
Merge pull request #5019 from vector-im/feature/bca/auto_uisi_update
Quick fixes on auto uisi RS
2022-01-25 16:41:01 +01:00
Benoit Marty
bca65281b6
Merge pull request #5025 from vector-im/feature/adm/use-case-dark-mode
Updating use case icons to match designs
2022-01-25 16:06:40 +01:00
Benoit Marty
1ee29555c6 Merge branch 'develop' into feature/ons/static_location 2022-01-25 16:01:16 +01:00
Benoit Marty
63b3def667
Merge pull request #5008 from SpiritCroc/globstar
Speed up event match regex evaluation for big messages
2022-01-25 15:52:55 +01:00
Benoit Marty
b619f70904 Merge branch 'develop' into feature/ons/static_location 2022-01-25 14:29:13 +01:00
Onuray Sahin
95020a81c5 Changelog added. 2022-01-24 14:32:40 +03:00
Adam Brown
3866cfeabc adding changelog entry 2022-01-21 17:21:00 +00:00
fedrunov
f7aedff418
toolbar management (#4887)
Toolbar management rework and toolbar style alignment
2022-01-21 13:38:27 +01:00
Valere
f0dfb1dc02 add changelog 2022-01-21 12:11:43 +01:00
Benoit Marty
a085b4db21
Merge pull request #5012 from vector-im/feature/adm/fdroid-broken-background-sync
Missing fdroid notifications
2022-01-21 09:29:46 +01:00
Adam Brown
28130489c7 adding changelog entry 2022-01-20 17:12:59 +00:00
Benoit Marty
9bfeb6f814
Merge pull request #4734 from vector-im/feature/bma/analytics_next
Implement analytics plan
2022-01-20 18:12:46 +01:00
Benoit Marty
af43890fab
Merge pull request #4041 from vector-im/feature/bca/fix_switch_space_on_tap_notif
Fix switch to best space when tapping notification
2022-01-20 16:54:06 +01:00
Benoit Marty
d82743eeab
Merge pull request #4995 from vector-im/feature/fre/fix_retry_delay_on_429
Do not auto-retry on 429 in case of too long retry delay
2022-01-20 14:31:29 +01:00
SpiritCroc
af34399135 Speed up event match regex evaluation for big messages
`regex.containsMatchIn()` for `.*@room.*` can take significantly longer
than checking for `@room` (some real-world events I was getting took
around 15 seconds with this, significantly slowing down the sync
parsing).

Checking `containsMatchIn()` does not lead to different results when
having leading and trailing stars however, it will match in the same
cases as when these are omitted.

For testing purposes, I sent myself some Lorem Ipsum with 5000 words
(not containing any @room).
Without this change, the regex evaluation takes about 16 seconds.
With this change, the regex evaluation now takes significantly less then
a second.
2022-01-20 12:16:34 +01:00
Benoit Marty
c40fc52ef5
Merge pull request #4999 from vector-im/feature/bma/zero_vote
Fix an error in string resource (#4997)
2022-01-20 10:38:33 +01:00
Benoit Marty
953f34f5e3 Fix an error in string resource (#4997) 2022-01-19 21:40:26 +01:00
Benoit Marty
e9f9c7e739 Changelog 2022-01-19 21:13:00 +01:00
Florian Renaud
9ebcb3ed52 Add changelog 2022-01-19 17:04:00 +01:00
Adam Brown
491044b0c5
Merge pull request #4964 from vector-im/feature/adm/splash-carousel-review
Enabling FTUE splash carousel
2022-01-19 15:52:25 +00:00
Tiago Loureiro
3c4fbce440 Add changelog 2022-01-19 12:02:47 -03:00
Benoit Marty
9e57263fb6 Changelog 2022-01-19 15:45:59 +01:00
Benoit Marty
ec6677643d
Merge pull request #4989 from vector-im/feature/aris/ignore_dependabot_github_script
Ignore dependabot upgrade for @github-script@v3
2022-01-19 12:24:45 +01:00
ariskotsomitopoulos
8d0299e411 Ignore dependabot upgrade for @github-script@v3 2022-01-19 12:46:22 +02:00
Adam Brown
00f2947636 enabling the splash carousel feature by default 2022-01-19 10:17:04 +00:00
Adam Brown
37c4d94109 adding changelog entry 2022-01-18 16:20:33 +00:00
Ekaterina Gerasimova
8af92a4091 Sync issue automation with element-web
Add automation for
* labelling Labs issues
* adding design and product issues to boards
* adding design and product PRs to boards
* adding UISI issues to Crypto team board

Fixes issue #4949
2022-01-18 13:24:58 +00:00
Adam Brown
256929b78f
Merge pull request #4880 from vector-im/feature/adm/carousel-images-update
Updated splash carousel images and copy
2022-01-17 15:11:08 +00:00
Benoit Marty
e2e3f72564 Merge branch 'develop' into feature/bca/fix_switch_space_on_tap_notif 2022-01-17 15:28:56 +01:00
Benoit Marty
eafb76b9b6
Merge pull request #4960 from vector-im/feature/aris/improve_local_echo_stuck_fix
Avoid deleting sent messages on non room events
2022-01-17 15:26:46 +01:00
Benoit Marty
95b116b8a1
Merge pull request #4952 from abaker/disable_http_2
Force HTTP/1.1
2022-01-17 15:20:23 +01:00
Benoit Marty
ab29a15572
Merge pull request #4942 from vector-im/feature/bma/delete_rx
Remove unused module matrix-sdk-android-rx and do some cleanup
2022-01-17 11:59:23 +01:00
ariskotsomitopoulos
493374c423 Add changelog 2022-01-17 12:21:22 +02:00
Adam Brown
1528238a2f adding changelog entry 2022-01-17 09:27:04 +00:00