3291517b8b
Merge tag 'v1.6.20' into sc
...
Change-Id: Ibf61668b312b1f4b1867ccc6ba4d3174e37550a5
Conflicts:
library/attachment-viewer/build.gradle
library/ui-styles/build.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/core/glide/ImageContentRendererDataLoader.kt
vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
vector/src/main/java/im/vector/app/core/ui/views/JoinConferenceView.kt
vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
vector/src/main/java/im/vector/app/features/crypto/verification/user/VerificationEpoxyExt.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.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/PlainTextComposerLayout.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/edithistory/ViewEditHistoryEpoxyController.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.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/TimelineMediaSizeProvider.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/BasedMergedItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.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/MessageVoiceItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFooterController.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt
vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
2024-07-30 20:56:50 +02:00
19500a8cd9
Upgrade a few dependencies and update the codebase
...
Use fully qualified R classes
Fix or ignore deprecation
Update github actions and ensure JDK 17 is used
Add group for paparazzi
Fixes Lint issues
Fix Jacoco configuration
2024-07-15 18:12:20 +02:00
abdc558c07
Merge tag 'v1.6.16' into sc
...
Change-Id: I690d21f0bac84dfed5d6f87e9c1aa30c78c8d346
Conflicts:
dependencies_groups.gradle
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
2024-05-30 20:16:19 +02:00
4acbe4e582
Merge pull request #8820 from element-hq/feature/bca/bump_posthog_version_3
...
Bump posthog version to 3.2.0
2024-05-16 14:41:15 +02:00
443db6ce8e
Bump posthog version to 3.2.0
2024-05-06 09:28:53 +02:00
6e1b346095
Add dependency on `com.github.matrix-org:matrix-analytics-events` and remove local plan and management of its import.
2024-03-27 10:15:57 +01:00
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
b6e3e875ac
Organization renaming: `vector-im` -> `element-hq`
2023-12-13 11:09:03 +01:00
29c921eb96
Drop GlideWebp
...
The benefit of rendering some corner-case webp images is negligible
compared to issues related to the slow update policy of the library,
such as recently in relevance to CVE-2023-4863 (but also previously
for updating glide versions).
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/210
Change-Id: I3809e2b48e595809fed1a6f4e405cdf178126cdb
2023-09-28 09:47:49 +02:00
6b5bfde91e
Merge tag 'v1.6.5' into sc
...
tag
Change-Id: I4b548719336b58914ac6b52da5a2ea6fac0c4545
2023-07-26 11:01:57 +02:00
1aa3337cba
Merge tag 'v1.6.3' into sc
...
tag
Change-Id: I59d0cd559bb0aba334dc8662500670d91d00906c
Conflicts:
vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
2023-06-27 20:13:46 +02:00
dc9e649703
Remove Jcenter repository ref ( #2773 )
2023-06-23 19:00:06 +02:00
e9f9decf00
Import source from https://github.com/dm77/barcodescanner
2023-06-23 18:58:42 +02:00
69680a9856
Import source from https://github.com/2dxgujun/Kpan
2023-06-23 18:23:14 +02:00
e9b9434671
Remove unused dep.
2023-06-23 18:01:36 +02:00
ff09ba1208
Import source from https://github.com/cmelchior/realmfieldnameshelper
2023-06-23 17:58:51 +02:00
1dd3c1589e
Remove unused dep.
2023-06-23 17:48:06 +02:00
3da1497d27
Import source from https://github.com/natario1/Autocomplete
2023-06-23 17:46:12 +02:00
f304e40d57
Import source from https://github.com/amulyakhare/TextDrawable
2023-06-23 17:35:14 +02: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
2d1dcd34c0
Add mentions to rich text editor
2023-05-18 13:09:26 +01:00
3a88f04f0d
Allow dependency `org.jitsi:webrtc`, required by `com.facebook.react:react-native-webrtc:111.0.0-jitsi-13672566`
2023-05-02 14:38:40 +02:00
3e1b59d062
Merge branch 'develop' into feature/bca/rust_flavor
2023-04-06 08:53:20 +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
bcc1ac4ac9
rust-crypto 0.3.1 , wa to fix compilation
2023-03-28 23:33:23 +02:00
ca6dd3a0a1
Bump vanniktechEmoji from 0.16.0-SNAPSHOT to 0.16.0 Release ( #8281 )
2023-03-28 18:20:17 +00:00
9b384c0971
Update to vanniktechEmoji 0.16.0 to fix compile
...
Revert "Use vanniktechEmoji "0.16.0-SNAPSHOT""
This reverts commit a1f4ffbf17
2023-03-27 12:18:03 +02:00
9521814f32
Support webp rendering in the timeline
...
Change-Id: I701cc96bdc466e1de961222e30d25289a159557e
2023-02-19 10:10:42 +01:00
a9b970832e
Merge branch 'develop' into feature/bca/rust_flavor
2022-11-30 11:05:32 +01:00
cf366f7a9c
suspend verif WIP
2022-11-16 09:12:54 +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
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
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
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
beb334babe
Merge pull request #7335 from vector-im/feature/bma/upgrade_arrow
...
Remove Arrow-kt dependency
2022-10-12 16:26:02 +02:00
1669316682
Remove dependency to arrow. Please use `org.matrix.android.sdk.api.util.Optional` instead.
2022-10-12 10:20:52 +02:00
def67b2e7d
Integrate WYSIWYG editor ( #7288 )
...
* Add WYSIWYG lib dependency
* Replace EditText with RichTextEditor
* Add bold button, fix sending formatting messages issues
* Add missing inline formatting buttons, make scrollview horizontal
* Disable autocomplete for rich text editor
* Add formatted text to messages sent, replies, quotes and edited messages.
* Several fixes
* Add changelog
* Try to fix lint issues
* Address review comments.
* Exclude Epoxy KSP generated files from ktlint checks
2022-10-11 17:05:47 +02: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
cde088e315
Merge branch 'develop' into dependabot/gradle/epoxy-5.0.0
2022-10-05 17:29:17 +02:00
aad2eed396
Add initial Sentry setup for crashes and perf tracking ( #7141 )
...
* Add initial Sentry setup for crashes and perf tracking
* Fix failing analytics tests
* Reformat code to fix style issue
* Close sentry when user signs out
* Add initial unit tests for Sentry
* Remove unused import
* Exclude amitkma from signoff requirements for PRs
2022-10-05 16:49:14 +05:30
8d54a0d759
Remove Robolectric, make Robolectric test an instrumentation test
2022-10-04 14:15:54 +02:00
8653b74964
Prefer to add explicit group.
2022-10-03 17:00:04 +02:00
f5cb980020
Fix dependencies and code issues
2022-09-30 09:39:01 +02:00
c66a38057e
adding paparazzi screenshot testing lib setup
2022-09-26 10:26:38 +01:00
bb6595110b
Merge tag 'v1.5.0' into merge-v1.5.0
...
Change-Id: Ifaa56941340ac1774d8b7bd470e32c5203d15f69
Conflicts:
library/ui-styles/src/main/res/values/colors.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
vector/build.gradle
vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteEmojiDataItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/res/menu/menu_new_home.xml
vector/src/main/res/xml/vector_settings_labs.xml
2022-09-23 16:28:00 +02:00
a1f4ffbf17
Use vanniktechEmoji "0.16.0-SNAPSHOT"
2022-09-16 23:12:48 +02:00
c61df899b4
removing unused dependency
2022-09-16 11:37:39 +01:00
e6023c6bae
Merge tag 'v1.4.34' into sc
...
Change-Id: I7e1939f6c87e14d1497433a9bad4f97e074bb838
Conflicts:
vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.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/room/list/home/HomeRoomListAction.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
vector/src/main/res/layout/fragment_login_server_url_form_2.xml
vector/src/main/res/layout/fragment_room_list.xml
2022-08-24 10:14:36 +02:00
fa8f72c909
Merge pull request #6792 from vector-im/feature/mna/enable-leakcanary
...
Add a developer setting to enable LeakCanary at runtime
2022-08-11 12:10:26 +02:00
5d1722054e
Merge tag 'v1.4.32' into sc
...
Change-Id: Ib3724625b1aada2541e030f9fdaf47a032538c85
Conflicts:
.gitignore
library/ui-styles/src/main/res/values/styles_toolbar.xml
vector/build.gradle
vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
vector/src/main/java/im/vector/app/VectorApplication.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/list/RoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.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/res/layout/fragment_timeline.xml
2022-08-10 17:07:09 +02:00
SpiritCroc
Benoit Marty
Valere
Benoit Marty
jonnyandrew
valere
Yoan Pintas
dependabot[bot]
Jorge Martin Espinosa
Amit Kumar
Adam Brown
Maxime NATUREL