fd9032e89c
Use legacy login
...
Change-Id: I9e5b6cdd85eb5eef0fd650904baab1a1705d8579
2022-02-20 11:58:11 +01:00
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
a6bf921d64
Release: update versions
2022-02-09 11:18:03 +01:00
077c0eea98
Revert "AGP 7.1.0"
2022-02-04 12:20:20 +02:00
aa12a73a05
Version++
2022-02-03 15:51:04 +01:00
3d5f8ed7e7
Merge pull request #4746 from vector-im/feature/aris/threads
...
Threads P0 Release
2022-02-01 15:58:32 +02:00
79b4c76a09
Merge pull request #5082 from vector-im/feature/bma/agp_7_1_0
...
AGP 7.1.0
2022-02-01 13:57:15 +01:00
3a040aaee2
Update vector/build.gradle
2022-01-31 17:17:37 +01:00
3caf81d07e
Bump ucrop from 2.2.7 to 2.2.8-native
...
Bumps [ucrop](https://github.com/Yalantis/uCrop ) from 2.2.7 to 2.2.8-native.
- [Release notes](https://github.com/Yalantis/uCrop/releases )
- [Commits](https://github.com/Yalantis/uCrop/compare/2.2.7...2.2.8-native )
---
updated-dependencies:
- dependency-name: com.github.yalantis:ucrop
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-31 15:22:21 +00:00
d509b3324c
Merge branch 'develop' into feature/aris/threads
2022-01-31 15:58:12 +02:00
7dad08654b
Revert "Downgrade the version to 1.3.17 to prepare a corrective release."
...
This reverts commit 2efa67e587
2022-01-31 14:53:43 +01:00
2efa67e587
Downgrade the version to 1.3.17 to prepare a corrective release.
2022-01-31 14:48:54 +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
beb2b1e8a0
[merge] Use Java 11 again
...
Change-Id: I3cc03216236097f4ba7b9de320fc927a603885a3
2022-01-29 10:35:54 +01:00
c07b09c727
Bump libphonenumber from 8.12.41 to 8.12.42
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.41 to 8.12.42.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.41...v8.12.42 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-27 23:11:05 +00:00
b2a2fe2710
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
# tools/check/forbidden_strings_in_code.txt
# vector/build.gradle
# vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
# vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
# vector/src/main/java/im/vector/app/features/command/Command.kt
# vector/src/main/java/im/vector/app/features/command/CommandParser.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/composer/MessageComposerViewModel.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.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/navigation/Navigator.kt
# vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
# vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
# vector/src/main/res/layout/fragment_timeline.xml
# vector/src/main/res/xml/vector_settings_labs.xml
2022-01-27 17:11:26 +02:00
4aff1ab017
AGP 7.1.0
2022-01-27 16:08:47 +01:00
d127e0c39d
Fix buildkite build
2022-01-26 11:55:44 +01:00
fe5109fead
Version++
2022-01-25 21:48:18 +01:00
b619f70904
Merge branch 'develop' into feature/ons/static_location
2022-01-25 14:29:13 +01:00
9516e379ea
Keep build settings to enable location sharing for possible use cases of forks.
2022-01-24 18:49:49 +03:00
3994373387
Delabs location sharing.
2022-01-24 15:27:20 +03:00
dc42d7e8d7
Increment version
...
Change-Id: I01f0938a9b54bd0b8f00e6200389765aee68e306
2022-01-22 11:08:15 +01:00
194a584e4c
Merge branch hotfix/1.3.15
2022-01-18 14:21:09 +01:00
ea8465f5f3
Version 1.3.15 for hotfix release
2022-01-18 14:06:02 +01:00
bdd30e3b8f
Fix crash when viewing source which contains an emoji.
...
Import source of jsonviewer as a module of this project.
2022-01-18 12:04:06 +01:00
ede1fe39fc
Disable location sharing from build settings.
2022-01-18 13:41:40 +03:00
636474b748
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.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/features/command/Command.kt
# vector/src/main/java/im/vector/app/features/command/CommandParser.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
2022-01-18 12:41:40 +02:00
42dcf52eb0
Use official maptiler key.
2022-01-18 12:34:02 +03:00
b8aaa177c2
Add a module library/core-utils as a base module for all util tools
2022-01-13 20:28:50 +01:00
9d48ecea2f
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# .github/workflows/integration.yml
# 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/TimelineFragment.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
2022-01-12 18:20:50 +02:00
f8afe04a3b
Merge pull request #4842 from vector-im/feature/aris/integration_tests_improvement
...
Trying to fix integration tests
2022-01-12 17:11:16 +01:00
c194568b08
Merge pull request #4923 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.41
...
Bump libphonenumber from 8.12.40 to 8.12.41
2022-01-12 14:54:34 +01:00
ea6347b1c7
Add signing config for the release buildType. No secret added
...
To be able to test the release build sooner during the release process.
2022-01-12 14:07:51 +01:00
c1d89c5304
Version++
2022-01-12 12:56:19 +01:00
8038d40195
Prepare for hotfix release 1.3.14
2022-01-12 12:28:16 +01:00
1951130c43
Bump libphonenumber from 8.12.40 to 8.12.41
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.40 to 8.12.41.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.40...v8.12.41 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-11 23:07:26 +00:00
848a7f4062
Version++
...
Also add comment about the new versioning strategy
2022-01-11 17:44:04 +01:00
9ea30445ef
Merge branch 'develop' into feature/ons/static_location
...
* develop: (281 commits)
Add a comment about the workaround
Remove deprecated restricted lab option (#4889 )
Bump actions/github-script from 3 to 5.1.0
Add some missing language in the change language screen
Workaround to not to reuse poll option cells.
Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10
Changelog
Test: Fix test after change on OnBoarding screens
Test: Analytics opt-in
Cleanup
Revert "Disable automatic opt-in screen display."
- Do not add GitHub comments on successful ktlint runs - Remove already existing comments when ktlint succeed
restore deprecated lab preference
Update nb of enum classes
Change autoUisi label + rename matching_issue
code review
Fix enabling was broken
Simple rate limiting of RS sending
use flow instead of reactivex
Fix UISIS preference listener
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
# vector/src/main/res/layout/view_attachment_type_selector.xml
# vector/src/main/res/values/strings.xml
2022-01-11 14:42:11 +03:00
ac5caccdf9
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.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/EventEntity.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/handler/room/RoomSyncHandler.kt
# tools/check/forbidden_strings_in_code.txt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
# vector/src/main/res/menu/menu_timeline.xml
2022-01-07 13:29:43 +02:00
3465b7d844
switching the element onboarding flow to use FTUE_AUTH
...
- this flow consistent of feature flag which can enable disable other parts, by default the I already have an account is enabled
2022-01-06 17:21:08 +00:00
355d8ebdc6
Merge pull request #4657 from vector-im/feature/adm/cloning-login-domain-to-ftue
...
Cloning the `LoginViewModel` domain to `Onboarding`
2022-01-06 09:43:46 +00:00
261030f51e
- Fix integration tests (still not perfect while github actions are very very limited for that)
...
- Split them in msdk and app test along with multiple smaller steps.
- Mark the not working tests with @Ignore so that they will not run neither local or on github actions
- Add user friendly comment on PR to view the results
2022-01-05 23:42:57 +02:00
8fa36750a2
Manual upgrade of the emoji2 lib
...
Dependabot does not care about this dependency, I do not know why.
2022-01-05 13:50:16 +01:00
98078da13d
renaming the ftue domain to onboarding and ftue to ftue auth
2022-01-05 10:32:31 +00:00
c2183800d3
Github actions improvement test
2022-01-03 12:14:14 +02:00
694b8de034
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# library/ui-styles/src/main/res/values/dimens.xml
2022-01-03 11:08:22 +02:00
95b1ae9488
Merge branch 'develop' into maths
2021-12-31 16:41:06 +01:00
4d6eec8972
Rate limited maptiler key is added.
2021-12-31 15:12:46 +03:00
6a73c9315a
Merge pull request #4809 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.40
...
Bump libphonenumber from 8.12.39 to 8.12.40
2021-12-30 10:30:27 +01:00
SpiritCroc
ganfra
Aris Kotsomitopoulos
Benoit Marty
Benoit Marty
dependabot[bot]
ariskotsomitopoulos
Onuray Sahin
Onuray Sahin
Adam Brown