bffb997511
[merge] Increase gradle jvm heap space for compile again
...
Change-Id: I1c1f64a87612cff0fc5896a9f458399a6fbd134b
2024-08-02 20:10:21 +02:00
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
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
83084f6481
Upgrade lint
2023-11-07 11:09:30 +01:00
2fe66ed458
Disable build caching
...
This sometimes messes my gradle cache really badly, as in:
- Clean builds will finish within 1 minute
- Any code changes I do will be ignored
- There's no real indicator whether this just happened, apart from clean
builds being unreasonably fast
Change-Id: I4559368d3c12f2700827022a5266a451bd97dc6b
2023-07-21 12:27:58 +02:00
d4cb55eeaa
Merge tag 'v1.5.20' into sc
...
Change-Id: I438392b41ebe84dccfae1639ae90102c3d45c680
Conflicts:
dependencies.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
vector/src/main/res/xml/vector_settings_advanced_settings.xml
2023-01-13 14:50:46 +01:00
0d5b6efd5c
Use latest version of lint
2023-01-04 14:56:41 +01: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
5f778fff01
re-enabling the jetifier, it's required by the autocomplete library
...
- the upstream library source doesn't require the jetifier however it hasn't been released
2022-09-28 10:09:13 +01:00
dc0599f966
removing jetifier screenshot config as the jetifier is no longer needed
2022-09-26 10:26:39 +01: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
0691046601
enabling build caching by default to improve build times
2022-09-15 14:50:08 +01:00
9b44975635
Merge tag 'v1.4.30' into sc
...
Change-Id: Ia43ff3781ad84699eb36fba937f7213d47fc0510
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.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/model/RoomSummaryEntity.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
vector/build.gradle
vector/src/main/java/im/vector/app/AppStateHandler.kt
vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.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/HomeDetailViewState.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.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/item/DefaultLiveLocationShareStatusItem.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/list/RoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.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/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/res/xml/vector_settings_labs.xml
2022-07-29 16:55:28 +02:00
f469450ca4
Setup `nightly` buildType
2022-07-05 16:07:12 +02:00
91a4195537
Increase max heap size for build
...
The F-Droid build ran OOM during R8 shrinking with 3GB, but worked fine with 4GB
Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
2022-02-12 15:18:53 +01:00
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
53531bb2f3
Dummy values for signing secrets
2022-01-12 14:21:14 +01:00
978056e01f
Merge tag 'v1.3.4' into sc
...
Conflicts:
dependencies.gradle
gradle.properties
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/parsing/RoomSyncAccountDataHandler.kt
vector/build.gradle
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
Parts of conflict resolution taken from
commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
Merge: 06f52832b 1f74bc986
2021-10-21 17:31:11 +02:00
9ab59a543d
* Implement Presence Service:
...
- Get Presence Status
- Set Presence Status
* Integrate presence in room details screen
* Integrate presence in room people's view
* Update UI to support presence
* Fix bug when insertOrUpdate was called on RoomMemberEventHandler and override the correct presence value in RoomMemberSummaryEntity
* Improve performance on updateUserPresence in RoomMemberSummaryEntity entity
* Remarks & linter fixes
* Disable presence when there is no m.presence events. In some servers like matrix.org is disabled atm.
* Enhance UI Presence on DM room lists to support dark/light theme
* Restore missing lines in gradle.properties to speed up debugging
2021-10-06 18:00:02 +03:00
de0f44307b
Switch to own UP FCM fork for now
...
Change-Id: Ic96668ca69da62d93d360a4175e08579d58c6e67
2021-09-30 09:18:57 +02:00
f167a00921
Increase gradle/java heap size to fix fdroid build again
...
Was 4G before merge, upstream changed from 2G to 3G, which still seems
too small.
Change-Id: I1a9f334a1ea991e9c2d27950a37504e68fee87d2
2021-09-29 10:34:41 +02:00
fe1d9aa589
- Optimize build time for local builds
...
- Enhance CI/CD workflows (7GB Ram, 2CPU) by adding custom gradle arguments to properly run
- Add unit test UI comment representation plugin
2021-09-13 19:03:35 +03:00
a0c8a8e97c
Log HTTP requests and responses in production (level BASIC, i.e. without any private data)
2020-12-08 13:44:42 +01:00
6a3eed49fc
Enable file system watch to reduce compilation time
2020-10-15 15:55:55 +02:00
6f996f1f09
Put xmx to 2048m
2020-07-07 14:23:59 +02:00
2e4d30ef29
Set `tickerText` to improve accessibility of notifications.
...
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
2020-04-15 07:43:41 -05:00
11b5c2c3ba
Restore previous log level
2019-10-21 18:17:03 +02:00
d8f449388c
Read marker: start working on it (no UI)
2019-08-20 18:30:24 +02:00
875947dd61
Give the opportunity to override log configuration in local gradle properties file
2019-06-11 14:52:39 +02:00
ac2d20ad3f
Migration androidx : first commit where it compiles. Updates some libs and android studio version in the same time.
2019-01-16 19:25:43 +01:00
b406e8301a
first commit
2018-10-03 17:58:12 +02:00
SpiritCroc
Benoit Marty
Benoit Marty
Maxime NATUREL
Adam Brown
Sylvia van Os
ariskotsomitopoulos
Mathieu Velten
Nolan Darilek
ganfra
Benoit Marty
ganfra