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
669a80e8e4
Update Realm gradle plugin and Flipper dependencies.
2024-07-19 12:36:02 +02:00
5203dd86b4
Add packaging pickFirst to fix tests.
2024-07-16 13:14:41 +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
8ab5a544b9
Increment version
...
Change-Id: I2dfe6a609bafd26c34f782dc8e81c7e7fb96553e
2024-07-06 09:53:19 +02:00
21eec091f8
Merge tag 'v1.6.18' into sc
...
Change-Id: Ifc8466ddf92154fb9be05b372f234ffe26da47ba
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
2024-06-29 10:28:16 +02:00
207ab2802a
version++
2024-06-25 15:14:20 +02:00
4cf3ff606e
Increment version
...
Change-Id: Ic498505da7a12b71dc084eed0127dcdd4d2240b3
2024-06-01 15:50:54 +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
72575a2493
version++
2024-05-29 12:07:55 +02:00
38b0b246e2
Merge tag 'v1.6.14' into sc
...
tag
Change-Id: I87dca48559687c9210fec8bebb031305d8d5578c
2024-04-02 19:51:29 +02:00
c2b46a1c1e
version++
2024-04-02 18:16:38 +02:00
14cd245c24
Increment version
...
Change-Id: I55eb27c1deb5b65e923ea9985bece94556823148
2024-02-27 12:04:24 +01:00
4b3b454068
Merge tag 'v1.6.12' into sc
...
tag
Change-Id: Iecfd29cb1d95af84fa2c8433c45e69c6ffa20a57
2024-02-20 15:01:32 +01:00
52ce0d2311
Increment version
...
Change-Id: I7a0c9e40109bb151a9eaf7efb92dca1810fa86e8
2024-02-20 10:59:02 +01:00
8682a75b0a
version++
2024-02-16 11:57:54 +01:00
d7e7a319f0
Increment version
...
Change-Id: Id67482f897e5f28851077bec9c84045120b731a7
2024-01-21 10:42:22 +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
ee16ef06e9
version++
2024-01-09 12:20:07 +01:00
86317190c4
Increment version
...
Change-Id: I35b83dc3f579688f9c580c243e933a95b908952a
2023-12-07 17:51:38 +01:00
b2c8548e29
Merge tag 'v1.6.8' into sc
...
tag
Change-Id: I0a2384fc2e4eda861a191b0b8c85641916854ac8
Conflicts:
dependencies.gradle
matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
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/call/webrtc/WebRtcCallManager.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/item/MessageTextItem.kt
2023-11-28 20:04:00 +01:00
bb9d1fc8d8
version++
2023-11-28 17:23:40 +01:00
454ba7bf7c
Merge branch 'develop' into feature/bca/clean_up_legacy_crypto
2023-11-07 14:13:56 +01:00
b14338d2c4
Remove unused WebRTC dependency ( #8658 )
2023-11-07 14:12:27 +01:00
3a7b2e8d1d
Increment version
...
Change-Id: I0e3ba74ecbaf84d5e96411d85ab0627d2abbc9e2
2023-10-13 09:17:22 +02:00
25ecd599f3
Merge branch 'develop' into feature/bca/clean_up_legacy_crypto
2023-10-10 13:00:45 +02:00
1892cf0ff8
Merge tag 'v1.6.6' into sc
...
Change-Id: I785561f0b2283214dd419a6c7028e374b85dc598
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2023-10-05 17:23:23 +02:00
ecd1057ce9
version++
2023-10-05 17:00:51 +02:00
dfbb3122e7
Remove legacy crypto code
2023-10-02 13:58:51 +02:00
1a47878318
Increment version
...
Change-Id: Ibd52a8f3dcc58279d789f453f4d2ed5303752711
2023-09-28 11:14:57 +02:00
6c3c0dbc66
Fix typo
...
Change-Id: I867f7003604c8505eb87affbd31b14de26d729f4
2023-08-06 19:03:37 +02:00
b98153c4dd
Increment version
...
Change-Id: If0173218f423a5f872232fe5663bd0d77078ccfe
2023-08-06 18:57:54 +02:00
7fb2e3fdf7
Make split ABI fdroid-checkupdates-friendly
...
This partially reverts 92e9d9e747
2023-08-06 18:06:22 +02:00
e448cce8d9
Increment version
...
Change-Id: Ica574ddd60dd46b0dfaf2c422dcd144f438c5d71
2023-08-05 17:04:55 +02:00
6b5bfde91e
Merge tag 'v1.6.5' into sc
...
tag
Change-Id: I4b548719336b58914ac6b52da5a2ea6fac0c4545
2023-07-26 11:01:57 +02:00
9aeb3b7074
version++
2023-07-25 14:58:22 +02:00
92e9d9e747
Enable split ABI support
...
https://github.com/SchildiChat/SchildiChat-android/issues/183
Change-Id: Ia8eff01c973d365d6d4a4390153f23510ab77e0e
2023-07-21 15:10:01 +02:00
22b5d7d6bd
Increment version
...
Change-Id: I37bb4499dba5aae301cd6f34a6241de6e0328184
2023-07-18 09:28:48 +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
2b4b5f05eb
Merge pull request #8556 from vector-im/feature/bma/noJcenter
...
Feature/bma/no jcenter
2023-06-27 17:04:59 +02:00
7b8cf5d917
version++
2023-06-27 13:30:17 +02:00
8cd51ea803
Setting version for the release 1.6.3
2023-06-27 10:04:39 +02:00
69680a9856
Import source from https://github.com/2dxgujun/Kpan
2023-06-23 18:23:14 +02:00
f440628208
Merge tag 'v1.6.2' into sc
...
Change-Id: I7a9ebbae6df28044a8fa308fe34241dbd1d8b8ae
Conflicts:
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
2023-06-05 14:59:06 +02:00
3c08fb637a
version++
2023-06-02 18:05:49 +02:00
9614f5994d
Merge tag 'v1.6.1' into sc
...
Change-Id: If1da0c145abfecd01df1384bedc794d2dd4d6bef
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
2023-05-25 12:03:56 +02:00
8f69e411d7
version++
2023-05-25 11:22:07 +02:00
82748591f9
Setting version for the release 1.6.1
2023-05-25 11:05:07 +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
66aa4226b5
version++
2023-05-17 14:55:30 +02:00
SpiritCroc
Benoit Marty
Benoit Marty
ganfra
Yoan Pintas
Valere
ganfra