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
bb0725b2e2
Merge pull request #4656 from vector-im/feature/adm/dynamic-login-flow
...
Feature based FTUE flows
2021-12-30 10:29:52 +01:00
fc4d18f84e
Dummy maptiler key added for CI.
2021-12-28 14:00:37 +03:00
46c7c7421e
Merge branch 'develop' into feature/ons/static_location
...
* develop: (87 commits)
Update versions to 1.3.13
Release: prepare CHANGES
adding changelog entry
removing android version bypass for using text futures - the emoji span changes affect all android versions
Update versions to 1.3.12
Release: prepare CHANGES
removing trailing space
extracting the emoji processing to an interface so that we can override the behaviour in the unit test
adding comment to explain SpannableStringBuilder usage
adding changelog entry
using the safe emoji processor to avoid the timeline failing when processing the content and the emoji library hasn't initialised yet
Update changelog.d/4743.bugfix
Small UI fix in room member profile hearder (#4700 )
Add changelog
adding changelog entry
adding missing binding options emote content - fixes android 12+ crash when certain emojis are used within the emote content
Fix crash ImmutableModelException
Update Gradle Wrapper from 7.3.1 to 7.3.2.
Call banner: center text vertically
adding changelog entry
...
2021-12-27 14:27:19 +03:00
863b201793
Bump libphonenumber from 8.12.39 to 8.12.40
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.39 to 8.12.40.
- [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.39...v8.12.40 )
---
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>
2021-12-23 23:07:37 +00:00
acdd4e24b9
Merge tag 'v1.3.12' into sc
...
Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10
Conflicts:
build.gradle
vector/build.gradle
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/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/detail/timeline/url/PreviewUrlView.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/actions/RoomListQuickActionsEpoxyController.kt
vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/res/drawable/highlighted_message_background.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/fragment_home_detail.xml
vector/src/main/res/layout/fragment_login_server_selection.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_expandable_textview.xml
vector/src/main/res/layout/item_login_header.xml
vector/src/main/res/layout/item_radio.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
vector/src/main/res/layout/item_timeline_event_poll_stub.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_timeline_event_voice_stub.xml
vector/src/main/res/layout/view_stub_room_profile_header.xml
vector/src/main/res/layout/view_url_preview.xml
vector/src/main/res/xml/vector_settings_labs.xml
vector/src/main/res/xml/vector_settings_root.xml
2021-12-23 14:36:13 +01:00
7048080ee0
Merge branch 'develop' into feature/aris/threads
2021-12-21 13:24:03 +02:00
55c0f1fcb3
Update versions to 1.3.13
2021-12-20 15:35:09 +01:00
c6a118fc1f
Update versions to 1.3.12
2021-12-17 19:05:17 +01:00
5904a5955f
Show and track the current location of the user on map.
2021-12-15 21:07:16 +03:00
824e713c51
Add mapview to the layout.
2021-12-15 13:57:43 +03:00
cd95fc41e4
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# library/ui-styles/src/main/res/values/dimens.xml
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.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/send/LocalEchoEventFactory.kt
# vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
# vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
# vector/src/main/java/im/vector/app/features/command/Command.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.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/TimelineFragment.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.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/MessageComposerViewState.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/factory/MessageItemFactory.kt
# vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.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/permalink/PermalinkHandler.kt
# vector/src/main/res/layout/fragment_room_detail.xml
2021-12-14 20:18:54 +02:00
fa65cc59fe
Version++
2021-12-14 14:46:08 +01:00
fd0e1e44c4
renaming login version to variants to better describe the different flows
2021-12-14 08:50:57 +00:00
f4cfb5d6d3
Merge pull request #4559 from vector-im/feature/bma/posthog
...
Analytics
2021-12-14 09:31:55 +01:00
a40e60ba8f
Merge branch 'develop' into feature/bma/posthog
2021-12-13 23:18:14 +01:00
df3f8bd88e
Use emoji2 library
2021-12-13 12:36:46 +01:00
a6dec7b9cb
Merge pull request #4670 from vector-im/feature/bma/safer_dependencies
...
Safer dependencies
2021-12-13 11:30:15 +01:00
0df11fc145
Remove unused dependency videocache
2021-12-09 23:47:04 +01:00
29837d48fe
Alerter is now on Jitpack
2021-12-09 23:39:22 +01:00
45ee39f3c0
Add a TODO
2021-12-09 21:06:22 +01:00
db60a2f6d2
Upgrade flexbox to 3.0.0
...
It has been moved to mavenCentral
2021-12-09 16:05:30 +01:00
7c2bae3b6b
Merge pull request #4627 from vector-im/feature/adm/removing-notification-settings-v1
...
Removing notification settings v1
2021-12-09 12:30:40 +01:00
d2969766ca
Bump libphonenumber from 8.12.38 to 8.12.39
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.38 to 8.12.39.
- [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.38...v8.12.39 )
---
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>
2021-12-08 00:42:33 +00:00
673cbb29de
Merge branch 'develop' into feature/bma/posthog
2021-12-07 14:26:31 +01:00
c1438f0a65
Analytics: iterate on the config - and disable by default on forks
2021-12-07 12:01:01 +01:00
8c794b1059
Analytics: Opt-in screen logic + remove from SplashScreen
2021-12-06 11:13:49 +01:00
4b63a9f939
Merge tag 'v1.3.9' into sc
...
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861
Conflicts:
vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
vector/src/main/java/im/vector/app/VectorApplication.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/composer/MessageComposerViewEvents.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/MessageComposerViewState.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
vector/src/main/res/drawable/ic_shield_custom.xml
vector/src/main/res/drawable/ic_shield_trusted.xml
2021-12-05 13:46:55 +01:00
e3155b6c98
removing notifications v1, v2 is live
2021-12-03 16:08:44 +00:00
11669fa2ac
porting the notifications setting version to the vector features
2021-12-03 15:26:43 +00:00
8007654e2a
setting login version via typed build config field instead of resources
2021-12-03 15:11:31 +00:00
9b7650e5db
Analytics: Remove `/` suffix in the URLs.
2021-12-02 14:10:03 +01:00
4c7ccfb438
Analytics: fix a swap in URL and add API keys
2021-12-02 14:10:03 +01:00
b33cddf0e3
Analytics: add PostHog library
2021-12-02 14:10:03 +01:00
8608230fa0
Analytics: add config to build.gradle
2021-12-02 14:10:03 +01:00
f80069604c
Version++
2021-12-01 17:03:00 +01:00
d3ac345c3b
Increment version
...
Change-Id: I41824b09b1b58864c47c7a692bee00a4d031147a
2021-12-01 15:47:43 +01:00
8a8fa066f9
Bump libphonenumber from 8.12.37 to 8.12.38
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.37 to 8.12.38.
- [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.37...v8.12.38 )
---
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>
2021-11-25 23:06:20 +00:00
a036601e0c
Update unifiedpush libs
...
Change-Id: I049f38329388f86ba9836adfb914af4439cc257e
2021-11-24 09:42:41 +01:00
e233915c0f
Jitsi android-sdk-3.1.0 -> android-sdk-3.10.0
2021-11-18 15:58:40 +01:00
c4fd115209
Add a BuildConfig to allow external unifiedpush distrib
...
Change-Id: I5435c02dab05f84dd5dd99507afd1075f357e76d
2021-11-17 20:59:32 +01:00
d9a5991559
Merge tag 'v1.3.8' into HEAD
...
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309
Conflicts:
dependencies.gradle
vector/src/fdroid/AndroidManifest.xml
vector/src/gplay/AndroidManifest.xml
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/main/AndroidManifest.xml
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/composer/ComposerEditText.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-11-17 20:17:45 +01:00
c5f48fa4d2
Merge tag 'v1.3.7' into sc
...
Change-Id: Id73c834c10e11ccd46d7d2adc8328eb95d051941
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/database/model/RoomSummaryEntity.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
vector/build.gradle
vector/src/fdroid/AndroidManifest.xml
vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/main/java/im/vector/app/VectorApplication.kt
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
2021-11-17 19:01:22 +01:00
a8f6efd5e8
Version++
2021-11-17 16:07:07 +01:00
be3aafeef2
Merge pull request #4433 from vector-im/feature/bma/android12
...
Android12
2021-11-16 13:27:33 +01:00
8c539426e6
- Thread Summary along with optimization
...
- Create new thread & reply to thread
2021-11-15 19:17:13 +02:00
fb8b720a3b
Add comment to run on Android 12
2021-11-15 12:25:42 +01:00
0a9845af30
@OnLifecycleEvent is deprecated, use DefaultLifecycleObserver instead
2021-11-15 12:24:48 +01:00
a1630b5546
androidx.lifecycle:lifecycle-extensions is deprecated
...
See https://developer.android.com/jetpack/androidx/releases/lifecycle#declaring_dependencies
2021-11-15 12:24:48 +01:00
56776aed21
Bump browser from 1.3.0 to 1.4.0
...
Bumps browser from 1.3.0 to 1.4.0.
---
updated-dependencies:
- dependency-name: androidx.browser:browser
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 12:24:48 +01:00
ad48223273
Bump libphonenumber from 8.12.36 to 8.12.37
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.36 to 8.12.37.
- [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.36...v8.12.37 )
---
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>
2021-11-11 23:08:34 +00:00
bd6814325b
Increment version
...
Change-Id: Ibbb95ad01f2fbc96d1941de8db57c754c059ea7f
2021-11-06 09:24:27 +01:00
f3655d4664
Merge pull request #4363 from vector-im/feature/fga/rx_flow_migration
...
Feature/fga/rx flow migration
2021-11-04 18:44:48 +01:00
bcffbbefd7
Version++
2021-11-04 18:42:52 +01:00
959e6b67e3
Bump firebase-messaging from 22.0.0 to 23.0.0
...
Bumps firebase-messaging from 22.0.0 to 23.0.0.
---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-messaging
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-29 23:07:15 +00:00
16e4a7f653
Flow migration: fix kotlinx-coroutines-debug dependencie
2021-10-28 18:17:01 +02:00
73995eb7bd
downgrading zxing library as it has a known crash on android versions below 7.0
2021-10-28 16:18:34 +01:00
635ca8e276
Merge branch 'develop' into feature/fga/rx_flow_migration
2021-10-27 16:05:43 +02:00
72a7e0677e
Merge tag 'v1.3.6' into sc
...
Change-Id: I6fb1ef7b45ef67915a8d5bd17bf36cab90e9bf02
2021-10-27 15:25:05 +02:00
34cb99e8ae
Flow migration: remove Rx completely (rxbinding)
2021-10-27 12:13:49 +02:00
82b3d17db6
Bump libphonenumber from 8.12.35 to 8.12.36
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.35 to 8.12.36.
- [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.35...v8.12.36 )
---
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>
2021-10-26 23:08:52 +00:00
042e91ee1c
Set version to 1.3.6
2021-10-26 18:28:47 +02:00
a9d192fa39
Flow migration: add back some test
2021-10-26 18:09:07 +02:00
01a29f67d0
Version++
2021-10-26 17:33:23 +02:00
9479342a64
Flow: remove more rx
2021-10-26 15:16:10 +02:00
c936954119
Flow migration: start replacing Rx by Flow
2021-10-26 14:24:23 +02:00
3354cd1760
Merge pull request #4312 from vector-im/feature/fga/hilt_app_migration
...
Migrate App DI framework to Hilt
2021-10-25 12:41:02 +02:00
79d56319b7
Version++
2021-10-25 12:40:24 +02:00
e9b58844b3
Merge branch 'develop' into feature/fga/hilt_app_migration
2021-10-22 11:30:49 +02:00
8171a85657
Merge remote-tracking branch 'upstream/develop' into sc
...
Change-Id: Ia092f493aa3e3ad509eb7876e19fc773b40cc233
2021-10-22 11:16:40 +02: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
d41ff50097
Fix crash when clicking on ViewEvent source actions #4279
2021-10-21 16:34:20 +02:00
7c9c4ecf5f
Version++
2021-10-20 10:49:40 +02:00
85983562fa
No need to add explicit dependencies on stdlib, this is added by the gradle plugin since 1.4
...
https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default
2021-10-19 19:06:27 +02:00
ff53cf4db9
Hilt: replace the VectorComponent
2021-10-14 18:47:28 +02:00
0a9c6673af
Bump media from 1.4.2 to 1.4.3
...
Bumps media from 1.4.2 to 1.4.3.
---
updated-dependencies:
- dependency-name: androidx.media:media
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-13 23:05:53 +00:00
7be7d50575
Bump libphonenumber from 8.12.34 to 8.12.35
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.34 to 8.12.35.
- [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.34...v8.12.35 )
---
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>
2021-10-12 23:10:59 +00:00
e3034e5d11
Merge pull request #4190 from vector-im/feature/fga/mavericks_2
...
Feature/fga/mavericks 2
2021-10-12 14:11:00 +02:00
a24a9b43fa
Mavericks 2: make the UT happy. Let SDK exposes MatrixCoroutineDispatchers.
2021-10-12 13:47:32 +02:00
f89a32da1f
Add opt-in for kotlinx.coroutines annotations
2021-10-11 14:27:55 +02:00
6721669d1d
Fixes false positive "This is an internal Mavericks API. It is not intended for external use."
...
of MvRx `by viewModel()` calls. Maybe due to the inlining of code... This is a temporary fix...
2021-10-11 14:27:45 +02:00
57a9ea4617
Merge tag 'v1.3.3' into sc
...
Change-Id: Ie2c7157dba2c23916e99669ee5c3705c2f6cea30
2021-10-11 12:42:06 +02:00
343783f807
Version++
2021-10-11 12:06:51 +02:00
dffc0c1d65
Merge tag 'v1.3.2' into sc
...
Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5
Conflicts:
.gitignore
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/summary/RoomSummaryUpdater.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/TextComposerView.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.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/filtered/FilteredRoomFooterItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
2021-10-11 09:55:26 +02:00
2a29243298
Mavericks 2: clean code, but have warnings
2021-10-08 16:45:29 +02:00
3a387c5e32
version++
2021-10-08 16:36:48 +02:00
3bdf264a53
Merge develop into feature/fga/mavericks_2
2021-10-08 10:49:43 +02:00
2eec10a0c9
Increment version
...
Change-Id: I59493d232f89b6d61d442993b6a260c4d5e578b3
2021-10-08 08:49:37 +02:00
362ebcbe42
Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow"
...
This reverts commit d9b02a20d8
2021-10-07 11:11:44 +02:00
c55598a099
Bump libphonenumber from 8.12.33 to 8.12.34
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.33 to 8.12.34.
- [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.33...v8.12.34 )
---
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>
2021-10-06 23:07:32 +00:00
450b0bbbaf
Update UnifiedPush:android-connector to 1.2.2
2021-10-06 09:24:48 +02:00
d9b02a20d8
Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow
2021-10-05 18:57:34 +02:00
9337e0e76d
Mavericks 2: create sdk flow module
2021-10-01 15:19:48 +02:00
2324bf5d05
Mavericks 2: include the libs and make it compile
2021-09-30 19:52:37 +02:00
38ae03893f
Merge tag 'v1.3.1' into sc
...
Change-Id: I1e5589c78e3398867519b1dbd326581cbe60baea
Conflicts:
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
vector/src/main/res/drawable/ic_jump_to_unread.xml
vector/src/main/res/drawable/ic_radio_on.xml
vector/src/main/res/drawable/ic_voice_message_locked.xml
vector/src/main/res/drawable/ic_voice_mic_recording.xml
2021-09-30 09:27:15 +02:00
de0f44307b
Switch to own UP FCM fork for now
...
Change-Id: Ic96668ca69da62d93d360a4175e08579d58c6e67
2021-09-30 09:18:57 +02:00
d5f9d8086a
Merge pull request #4049 from vector-im/dependabot/gradle/com.arthenica-ffmpeg-kit-audio-4.5
...
Bump ffmpeg-kit-audio from 4.4.LTS to 4.5
2021-09-29 17:10:31 +02:00
31a7bfed02
version++
2021-09-29 14:56:10 +02:00
0c7981dc26
Revert "Revert "Revert "Use Java 11 source code"""
...
This reverts commit 23afa02cad957e4426cc7fc872910c6f0b556cb5.
Change-Id: I0dc76749a7084473a5c15e84032f0ba5058cac72
Conflicts:
attachment-viewer/build.gradle
library/ui-styles/build.gradle
matrix-sdk-android-rx/build.gradle
matrix-sdk-android/build.gradle
vector/build.gradle
2021-09-29 09:56:32 +02:00
4f93eb041c
Merge tag 'v1.3.0' into sc
...
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68
Conflicts:
gradle.properties
vector/build.gradle
vector/src/main/java/im/vector/app/AppStateHandler.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/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/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/res/layout/reaction_button.xml
2021-09-29 09:55:02 +02:00
b51bd743c7
Revert "Revert "Use Java 11 source code""
...
This will make the latest upstream merge easier.
This reverts commit 302b2865264ec94471c59041ce8efdc45d3764f4.
2021-09-29 09:13:59 +02:00
ae3e6a0706
Bump seismic from 1.0.2 to 1.0.3
...
Bumps [seismic](https://github.com/square/seismic ) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/square/seismic/releases )
- [Changelog](https://github.com/square/seismic/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/seismic/compare/seismic-parent-1.0.2...seismic-parent-1.0.3 )
---
updated-dependencies:
- dependency-name: com.squareup:seismic
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-28 23:06:09 +00:00
23615c0038
Merge pull request #4091 from vector-im/feature/adm/verify-exported-keys-output
...
Verify exported keys output
2021-09-28 15:14:34 +02:00
7d7ea3b9ad
Avoid multiple PRs from Dependabot when a new version of com.vanniktech:emoji* is available
...
Not updating the vesion here, dependabot will do it.
2021-09-28 11:29:52 +02:00
789cc6b597
exlcuding the slf4j logger from the test dependencies
...
the videocache dependency includes slf4j which in turn causes mockk to reflectively attempt to call real Log functions, which crashes the units tests due to the stub android.jar
2021-09-27 17:23:03 +01:00
9f93850046
Keep LTS version
2021-09-27 16:22:00 +02:00
5b5dcf988d
Version++
2021-09-27 13:09:58 +02:00
53c8862ca2
Change version to 1.3.0
2021-09-27 11:57:23 +02:00
78b870c558
Downgrade markwon version and enable LaTeX rendering for messages
2021-09-24 13:50:34 +01:00
5e7e66b18c
Bump barista from 4.1.0 to 4.2.0
...
Bumps [barista](https://github.com/AdevintaSpain/Barista ) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/AdevintaSpain/Barista/releases )
- [Commits](https://github.com/AdevintaSpain/Barista/compare/4.1.0...4.2.0 )
---
updated-dependencies:
- dependency-name: com.adevinta.android:barista
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-24 07:53:52 +00:00
1b262a4df8
Merge pull request #4071 from vector-im/tools/adm/connected_tests
...
Fixing no tests found when running vector:connectedAndroidTest
2021-09-24 09:53:04 +02:00
7bd8890276
extracting orchestrator dependency to the dependencies.gradle file
2021-09-23 20:24:16 +01:00
d7bc32d7ca
including tech orchestrator in the vector module script, fixes the no tests found error
2021-09-23 17:22:19 +01:00
e4bc60d255
Merge pull request #4020 from vector-im/dependabot/gradle/androidx.media-media-1.4.2
...
Bump media from 1.4.1 to 1.4.2
2021-09-23 15:53:17 +02:00
6e010ad693
Bump ffmpeg-kit-audio from 4.4.LTS to 4.5
...
Bumps [ffmpeg-kit-audio](https://github.com/tanersener/ffmpeg-kit ) from 4.4.LTS to 4.5.
- [Release notes](https://github.com/tanersener/ffmpeg-kit/releases )
- [Commits](https://github.com/tanersener/ffmpeg-kit/compare/v4.4.LTS...v4.5 )
---
updated-dependencies:
- dependency-name: com.arthenica:ffmpeg-kit-audio
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-23 12:24:46 +00:00
93506d18fa
Display push counter on debug mode
2021-09-23 13:54:03 +02:00
654010570e
Bump libphonenumber from 8.12.32 to 8.12.33
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.32 to 8.12.33.
- [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.32...v8.12.33 )
---
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>
2021-09-22 23:05:09 +00:00
f97549073e
Increment version
...
Change-Id: If37db85f2d3e0affd140961f9efc87c8440c5033
2021-09-18 20:38:14 +02:00
756529e565
Revert "Use Java 11 source code"
...
This seems to break device compatibility with a ZTE Blade L3, Android
5.0.2, stock ROM - even though the Google Play Developer Console views
the device as supported.
Not sure how long we want to stick to Java 8, but we should at least
give everyone who had v1.2.0 installed the chance to get to v1.2.2, to
get a version with the recent security vulerability fix.
This reverts commit 80f23f1f3c
2021-09-18 20:26:29 +02:00
a3a49593e4
Bump media from 1.4.1 to 1.4.2
...
Bumps media from 1.4.1 to 1.4.2.
---
updated-dependencies:
- dependency-name: androidx.media:media
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-17 13:29:35 +00:00
1dcf6b9539
Enhance dependencies handling to support Dependabot
2021-09-17 14:58:44 +03:00
87fefdc7bb
Add more dependencies to common dependencies.gradle
2021-09-15 20:22:52 +03:00
c89b2c0536
Optimize dependencies handling
2021-09-15 13:21:25 +03:00
c38ece586e
Increment version
...
Change-Id: I70c18491f03854898fa9989add666530dbc0b668
2021-09-13 16:20:06 +02:00
741ac9f3f6
Merge tag 'v1.2.2' into sc
...
Change-Id: Icda1859305bac1e48f3d1889282a23049dd83c29
2021-09-13 15:37:54 +02:00
db55693201
version++
2021-09-13 15:29:51 +02:00
cccf812906
Version++ (1.2.2)
2021-09-13 15:25:56 +02:00
57abc04752
Bump libphonenumber from 8.12.31 to 8.12.32
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.31 to 8.12.32.
- [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.31...v8.12.32 )
---
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>
2021-09-10 23:07:44 +00:00
ariskotsomitopoulos
Onuray Sahin
Benoit Marty
Benoit Marty
dependabot[bot]
Adam Brown
SpiritCroc
ganfra
S1m
Nick Hu