4573a4235e
Merge tag 'v1.6.10' into sc
...
Change-Id: If32b84a60de38eab046bbedeb2b1e8d9c6094bb3
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
2024-01-10 19:57:20 +01:00
6d65a74f1d
Organization renaming: replace all ` https://github.com/vector-im ` by ` https://github.com/element-hq `
2023-12-13 11:01:40 +01:00
d9c1ec588d
Merge tag 'v1.6.0' into sc
...
v1.6.0
Change-Id: Iaca4b437bc5a267c40b83a87a98eb7761dae345b
Conflicts:
library/ui-styles/src/main/res/values/styles_app_bar_layout.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/build.gradle
vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
vector/src/main/res/layout/dialog_disclaimer_content.xml
vector/src/main/res/xml/vector_settings_help_about.xml
2023-05-22 14:19:46 +02:00
14884b768a
Remove unused resource
2023-05-11 14:32:52 +02:00
c8fbb88511
Let the focus go to the room list and the actions at the bottom, useful when navigating with the keyboard.
2023-05-10 13:39:18 +02:00
9e0ec534d5
[merge] More appropriate pill size for downstream text size
...
https://developer.android.com/reference/com/google/android/material/chip/ChipDrawable
Change-Id: Ib21bb1426547c8a49f55e2ecd836f83d9dfe1654
2023-04-11 17:27:21 +02:00
965ba93de4
Merge tag 'v1.5.30' into sc
...
Version 1.5.30
Change-Id: I732e9fe05182e53968eab1d03f99dabdc148fed9
Conflicts:
dependencies.gradle
dependencies_groups.gradle
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
vector/src/main/res/drawable/ic_composer_rich_text_save.xml
2023-04-05 11:28:26 +02:00
9fd1a22e10
Pillify permalinks ( #8242 )
2023-03-21 21:31:45 +00:00
51274af2fe
Merge tag 'v1.5.24' into sc
...
Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.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/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
2023-02-08 13:08:42 +01:00
d5bd05d0bb
Fix: cannot select text in plain text mode in Rich Text Editor
2023-01-30 12:13:09 +01:00
d8bd92c413
Merge tag 'v1.5.22' into sc
...
Change-Id: I3e8db4d0d0d6afa0f47c9daa0f809410938674e0
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/timeline/LoadTimelineStrategy.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/list/RoomSummaryItemFactory.kt
2023-01-26 19:49:36 +01:00
ba77e7fcc9
Image rich replies: Enforce smaller max width
...
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/172
Change-Id: I23979ef1790f9881fd57395b56e5cf6bd61326e3
2023-01-16 16:31:08 +01:00
b7073cb104
[Rich text editor] Update list item bullet appearance ( #7930 )
2023-01-10 17:04:39 +00:00
035e1ae7f7
Give replied-to text preview more height
...
Change-Id: Iceb552d5f73d7860c333e242adfe066a8cf7105e
2022-12-08 10:56:47 +01:00
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
8e97b7c79d
Render images in replies
...
Change-Id: Ia0678184c42a2a01f2e1e65ccd8287bbd71c8c80
2022-12-04 13:17:45 +01:00
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
310ea99c44
Fix bad pills color background. For light and dark theme the color is now 61708B (iso EleWeb)
2022-12-02 10:50:08 +01:00
15d8a916b1
Rich replies also when replying via media
...
Change-Id: I3352fe0a6c4b0c08a7564337b02d1cc8e5e4bbc4
2022-11-21 10:04:21 +01:00
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
7417241cd5
New RTE full screen implementation with BottomSheet ( #7578 )
...
* RTE full screen editor using custom BottomSheet
* Fix formatting menu item dimensions
* Fix bug with insets when opening attachment menu
* Clear the EditText for plain text mode when a message is sent
* Set `MessageComposerMode.Special` as a sealed class
* Fix insets issue on landscape
* Fix small UI issues with rounded corners
* Use simplified icons for full screen and minimise
2022-11-18 08:57:37 +01:00
1ed92e5215
Adding overflow menu capability in sessions list header view
2022-11-07 11:09:41 +01:00
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
a851e5aa85
VoiceBroadcastPlayer - Add seek control views
2022-11-02 17:06:23 +01:00
6c5e72a695
Fix space discovery search icon
...
Change-Id: I5cbcabd7dfeeabb728af03c2b7e7bcf2b34032f6
2022-11-02 08:37:34 +01:00
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
4defc3dded
Voice Broadcast - Add style for the "live" indicator
2022-10-25 16:31:25 +02:00
1566adb669
Timeline - Add abstraction on voice broadcast items
2022-10-25 16:31:24 +02:00
4c71209573
VoiceBroadcast - Add recording view
2022-10-20 23:28:31 +02:00
47c87141b2
Merge pull request #7338 from vector-im/feature/ons/qr_code_login_ui
...
QR Code Login UI
2022-10-17 17:20:07 +03:00
93a346392b
Bump gradle from 7.2.2 to 7.3.1 ( #7364 )
...
* Bump gradle from 7.2.2 to 7.3.1
Bumps gradle from 7.2.2 to 7.3.1.
---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Try to fix build issue caused by KSP workaround
* Add missing dependency
* Suppress false positive in linter
* Suppress more false positives, fix 2 possible leaks
* Fix tests
* Ignore flaky test
* Use namespaces instead of packagenames in AndroidManifest files
* Reorder dependency groups
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
2022-10-17 09:14:28 +02:00
612d2e51e5
Merge pull request #7361 from vector-im/feature/mna/device-manager-unknown-verification-status
...
[Device management] Update the unknown verification status icon (PSG-824)
2022-10-14 16:22:33 +02:00
5953346b3d
Merge branch 'develop' into feature/ons/qr_code_login_ui
...
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
# vector/src/main/java/im/vector/app/features/VectorFeatures.kt
2022-10-14 15:17:55 +03:00
cf25b81e9a
Adding new shield color into resources
2022-10-14 14:00:01 +02:00
81ef1415dc
Apply design changes to WYSIWYG editor ( #7354 )
...
* Apply design changes to WYSIWYG editor
* Add changelog
* Remove unneeded attribute in RichTextComposerLayout
* Fix lint issues
* Fix style naming issue.
* Change rich text editor border radius depending on the number of lines.
* Replace standby voice recorder icon.
2022-10-14 09:59:43 +02:00
1e1affbb7b
Merge branch 'develop' into feature/ons/qr_code_login_ui
...
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
# vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
# vector/src/main/java/im/vector/app/features/VectorFeatures.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
# vector/src/main/res/layout/fragment_other_sessions.xml
# vector/src/main/res/layout/fragment_settings_devices.xml
2022-10-12 14:32:09 +03:00
5566300665
Add qr code options to layout.
2022-10-11 14:15:44 +03:00
2fe636e93b
Adds Push Notification toggle to Device Manager ( #7261 )
...
* Adds push notifications switch
* Adds functionality to Push notification toggle
* Adds DefaultPushersServiceTest for togglePusher
* Adds DefaultTogglePusherTaskTest
* Adds SessionOverviewViewModelTest for toggling pusher
* Hides pusher toggle if there are no pushers of the device
* Adds changelog file
* Edits changelog file
* Fixes copyrights
* Unregisters checkedChangelistener in onDetachedFromWindow for switch view
* Fixes post merge errors
* Fixes legal copies
* Removes unused imports
* Fixes lint errors
* Fixes test errors
* Fixes error
* Fixes error
* Fixes error
* Fixes error
* Fixes error
2022-10-10 19:21:34 -04:00
fe785613e7
Merge tag 'v1.5.2' into sc
...
Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e
Conflicts:
vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.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/settings/VectorLocale.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
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
2022-10-07 20:32:26 +02:00
4fdb4e8c79
Create custom view for instructions section.
2022-10-05 13:23:39 +03:00
6fbdd87dcf
Create custom view for header section.
2022-10-04 17:05:42 +03:00
81b5fcdc7d
Merge pull request #5716 from thefirstofthe300/styling-tweaks
...
Styling tweaks
2022-10-04 15:32:32 +02:00
1d11eae0cc
Removing learn more link from security header
2022-09-29 14:06:44 +02:00
214867ad0e
Merge pull request #7248 from vector-im/feature/bca/hotfix_1.5.1_merge
...
Feature/bca/hotfix 1.5.1 merge back from main
2022-09-29 11:58:36 +02:00
ce86e29122
Merge branch 'main' into develop
2022-09-28 18:16:39 +02:00
5c442296ef
Security fix CVE-2022-39246 CVE-2022-39248
2022-09-28 16:26:47 +02:00
87eaf85224
Security patch v1.5.1
...
Conflicts:
library/ui-styles/src/main/res/values/colors.xml
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
Change-Id: I0c8f5e098f92d0bf42e5ddc41bb6ad43c69bfdd2
2022-09-28 10:41:00 +02:00
b2b3ee1fe5
Adding button to trigger sign out
2022-09-27 15:04:33 +02:00
2c1eef7a59
Merge pull request #7142 from vector-im/feature/adm/dialpad-lib
...
Manually including `im.dlg:android-dialer:1.2.5`
2022-09-26 10:14:56 +01:00
f0fe636654
Fix file name for styles of session warning info view
2022-09-26 09:46:58 +02:00
SpiritCroc
Benoit Marty
Yoan Pintas
Jorge Martín
jonnyandrew
Maxime NATUREL
Florian Renaud
Onuray Sahin
dependabot[bot]
Maxime NATUREL
Onuray Sahin
Eric Decanini
Benoit Marty
Valere
Adam Brown