1092 Commits

Author	SHA1	Message	Date
Onuray Sahin	ede1fe39fc	Disable location sharing from build settings.	2022-01-18 13:41:40 +03:00
ariskotsomitopoulos	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
Onuray Sahin	42dcf52eb0	Use official maptiler key.	2022-01-18 12:34:02 +03:00
Benoit Marty	b8aaa177c2	Add a module library/core-utils as a base module for all util tools	2022-01-13 20:28:50 +01:00
ariskotsomitopoulos	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
Benoit Marty	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
Benoit Marty	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
Benoit Marty	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
Benoit Marty	c1d89c5304	Version++	2022-01-12 12:56:19 +01:00
Benoit Marty	8038d40195	Prepare for hotfix release 1.3.14	2022-01-12 12:28:16 +01:00
dependabot[bot]	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
Benoit Marty	848a7f4062	Version++ ... Also add comment about the new versioning strategy	2022-01-11 17:44:04 +01:00
Onuray Sahin	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
ariskotsomitopoulos	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
Adam Brown	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
Adam Brown	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
ariskotsomitopoulos	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
Benoit Marty	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
Adam Brown	98078da13d	renaming the ftue domain to onboarding and ftue to ftue auth	2022-01-05 10:32:31 +00:00
ariskotsomitopoulos	c2183800d3	Github actions improvement test	2022-01-03 12:14:14 +02:00
ariskotsomitopoulos	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
Benoit Marty	95b1ae9488	Merge branch 'develop' into maths	2021-12-31 16:41:06 +01:00
Onuray Sahin	4d6eec8972	Rate limited maptiler key is added.	2021-12-31 15:12:46 +03:00
Benoit Marty	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
Benoit Marty	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
Onuray Sahin	fc4d18f84e	Dummy maptiler key added for CI.	2021-12-28 14:00:37 +03:00
Onuray Sahin	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
dependabot[bot]	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
SpiritCroc	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
ariskotsomitopoulos	7048080ee0	Merge branch 'develop' into feature/aris/threads	2021-12-21 13:24:03 +02:00
ganfra	55c0f1fcb3	Update versions to 1.3.13	2021-12-20 15:35:09 +01:00
ganfra	c6a118fc1f	Update versions to 1.3.12	2021-12-17 19:05:17 +01:00
Onuray Sahin	5904a5955f	Show and track the current location of the user on map.	2021-12-15 21:07:16 +03:00
Onuray Sahin	824e713c51	Add mapview to the layout.	2021-12-15 13:57:43 +03:00
ariskotsomitopoulos	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
Benoit Marty	fa65cc59fe	Version++	2021-12-14 14:46:08 +01:00
Adam Brown	fd0e1e44c4	renaming login version to variants to better describe the different flows	2021-12-14 08:50:57 +00:00
Benoit Marty	f4cfb5d6d3	Merge pull request #4559 from vector-im/feature/bma/posthog ... Analytics	2021-12-14 09:31:55 +01:00
Benoit Marty	a40e60ba8f	Merge branch 'develop' into feature/bma/posthog	2021-12-13 23:18:14 +01:00
Benoit Marty	df3f8bd88e	Use emoji2 library	2021-12-13 12:36:46 +01:00
Benoit Marty	a6dec7b9cb	Merge pull request #4670 from vector-im/feature/bma/safer_dependencies ... Safer dependencies	2021-12-13 11:30:15 +01:00
Benoit Marty	0df11fc145	Remove unused dependency videocache	2021-12-09 23:47:04 +01:00
Benoit Marty	29837d48fe	Alerter is now on Jitpack	2021-12-09 23:39:22 +01:00
Benoit Marty	45ee39f3c0	Add a TODO	2021-12-09 21:06:22 +01:00
Benoit Marty	db60a2f6d2	Upgrade flexbox to 3.0.0 ... It has been moved to mavenCentral	2021-12-09 16:05:30 +01:00
Benoit Marty	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
dependabot[bot]	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
Benoit Marty	673cbb29de	Merge branch 'develop' into feature/bma/posthog	2021-12-07 14:26:31 +01:00
Benoit Marty	c1438f0a65	Analytics: iterate on the config - and disable by default on forks	2021-12-07 12:01:01 +01:00
Benoit Marty	8c794b1059	Analytics: Opt-in screen logic + remove from SplashScreen	2021-12-06 11:13:49 +01:00
SpiritCroc	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
Adam Brown	e3155b6c98	removing notifications v1, v2 is live	2021-12-03 16:08:44 +00:00
Adam Brown	11669fa2ac	porting the notifications setting version to the vector features	2021-12-03 15:26:43 +00:00
Adam Brown	8007654e2a	setting login version via typed build config field instead of resources	2021-12-03 15:11:31 +00:00
Benoit Marty	9b7650e5db	Analytics: Remove `/` suffix in the URLs.	2021-12-02 14:10:03 +01:00
Benoit Marty	4c7ccfb438	Analytics: fix a swap in URL and add API keys	2021-12-02 14:10:03 +01:00
Benoit Marty	b33cddf0e3	Analytics: add PostHog library	2021-12-02 14:10:03 +01:00
Benoit Marty	8608230fa0	Analytics: add config to build.gradle	2021-12-02 14:10:03 +01:00
Benoit Marty	f80069604c	Version++	2021-12-01 17:03:00 +01:00
SpiritCroc	d3ac345c3b	Increment version ... Change-Id: I41824b09b1b58864c47c7a692bee00a4d031147a	2021-12-01 15:47:43 +01:00
dependabot[bot]	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
S1m	a036601e0c	Update unifiedpush libs ... Change-Id: I049f38329388f86ba9836adfb914af4439cc257e	2021-11-24 09:42:41 +01:00
Benoit Marty	e233915c0f	Jitsi android-sdk-3.1.0 -> android-sdk-3.10.0	2021-11-18 15:58:40 +01:00
S1m	c4fd115209	Add a BuildConfig to allow external unifiedpush distrib ... Change-Id: I5435c02dab05f84dd5dd99507afd1075f357e76d	2021-11-17 20:59:32 +01:00
SpiritCroc	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
SpiritCroc	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
Benoit Marty	a8f6efd5e8	Version++	2021-11-17 16:07:07 +01:00
Benoit Marty	be3aafeef2	Merge pull request #4433 from vector-im/feature/bma/android12 ... Android12	2021-11-16 13:27:33 +01:00
ariskotsomitopoulos	8c539426e6	- Thread Summary along with optimization ... - Create new thread & reply to thread	2021-11-15 19:17:13 +02:00
Benoit Marty	fb8b720a3b	Add comment to run on Android 12	2021-11-15 12:25:42 +01:00
Benoit Marty	0a9845af30	@OnLifecycleEvent is deprecated, use DefaultLifecycleObserver instead	2021-11-15 12:24:48 +01:00
Benoit Marty	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
dependabot[bot]	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
dependabot[bot]	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
SpiritCroc	bd6814325b	Increment version ... Change-Id: Ibbb95ad01f2fbc96d1941de8db57c754c059ea7f	2021-11-06 09:24:27 +01:00
Benoit Marty	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
Benoit Marty	bcffbbefd7	Version++	2021-11-04 18:42:52 +01:00
dependabot[bot]	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
ganfra	16e4a7f653	Flow migration: fix kotlinx-coroutines-debug dependencie	2021-10-28 18:17:01 +02:00
Adam Brown	73995eb7bd	downgrading zxing library as it has a known crash on android versions below 7.0	2021-10-28 16:18:34 +01:00
ganfra	635ca8e276	Merge branch 'develop' into feature/fga/rx_flow_migration	2021-10-27 16:05:43 +02:00
SpiritCroc	72a7e0677e	Merge tag 'v1.3.6' into sc ... Change-Id: I6fb1ef7b45ef67915a8d5bd17bf36cab90e9bf02	2021-10-27 15:25:05 +02:00
ganfra	34cb99e8ae	Flow migration: remove Rx completely (rxbinding)	2021-10-27 12:13:49 +02:00
dependabot[bot]	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
Benoit Marty	042e91ee1c	Set version to 1.3.6	2021-10-26 18:28:47 +02:00
ganfra	a9d192fa39	Flow migration: add back some test	2021-10-26 18:09:07 +02:00
Benoit Marty	01a29f67d0	Version++	2021-10-26 17:33:23 +02:00
ganfra	9479342a64	Flow: remove more rx	2021-10-26 15:16:10 +02:00
ganfra	c936954119	Flow migration: start replacing Rx by Flow	2021-10-26 14:24:23 +02:00
Benoit Marty	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
Benoit Marty	79d56319b7	Version++	2021-10-25 12:40:24 +02:00
ganfra	e9b58844b3	Merge branch 'develop' into feature/fga/hilt_app_migration	2021-10-22 11:30:49 +02:00
SpiritCroc	8171a85657	Merge remote-tracking branch 'upstream/develop' into sc ... Change-Id: Ia092f493aa3e3ad509eb7876e19fc773b40cc233	2021-10-22 11:16:40 +02:00
SpiritCroc	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 Author: S1m <git@sgougeon.fr> Date: Fri Oct 15 09:36:46 2021 +0200 Merge remote-tracking branch 'upstream/develop' into unifiedpush Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b	2021-10-21 17:31:11 +02:00
ganfra	d41ff50097	Fix crash when clicking on ViewEvent source actions #4279	2021-10-21 16:34:20 +02:00
Benoit Marty	7c9c4ecf5f	Version++	2021-10-20 10:49:40 +02:00
Benoit Marty	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
ganfra	ff53cf4db9	Hilt: replace the VectorComponent	2021-10-14 18:47:28 +02:00
dependabot[bot]	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
dependabot[bot]	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
Benoit Marty	e3034e5d11	Merge pull request #4190 from vector-im/feature/fga/mavericks_2 ... Feature/fga/mavericks 2	2021-10-12 14:11:00 +02:00
ganfra	a24a9b43fa	Mavericks 2: make the UT happy. Let SDK exposes MatrixCoroutineDispatchers.	2021-10-12 13:47:32 +02:00
Benoit Marty	f89a32da1f	Add opt-in for kotlinx.coroutines annotations	2021-10-11 14:27:55 +02:00
Benoit Marty	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
SpiritCroc	57a9ea4617	Merge tag 'v1.3.3' into sc ... Change-Id: Ie2c7157dba2c23916e99669ee5c3705c2f6cea30	2021-10-11 12:42:06 +02:00
Benoit Marty	343783f807	Version++	2021-10-11 12:06:51 +02:00
SpiritCroc	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
ganfra	2a29243298	Mavericks 2: clean code, but have warnings	2021-10-08 16:45:29 +02:00
Benoit Marty	3a387c5e32	version++	2021-10-08 16:36:48 +02:00
ganfra	3bdf264a53	Merge develop into feature/fga/mavericks_2	2021-10-08 10:49:43 +02:00
SpiritCroc	2eec10a0c9	Increment version ... Change-Id: I59493d232f89b6d61d442993b6a260c4d5e578b3	2021-10-08 08:49:37 +02:00
ganfra	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
dependabot[bot]	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
S1m	450b0bbbaf	Update UnifiedPush:android-connector to 1.2.2	2021-10-06 09:24:48 +02:00
ganfra	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
ganfra	9337e0e76d	Mavericks 2: create sdk flow module	2021-10-01 15:19:48 +02:00
ganfra	2324bf5d05	Mavericks 2: include the libs and make it compile	2021-09-30 19:52:37 +02:00
SpiritCroc	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
SpiritCroc	de0f44307b	Switch to own UP FCM fork for now ... Change-Id: Ic96668ca69da62d93d360a4175e08579d58c6e67	2021-09-30 09:18:57 +02:00
Benoit Marty	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
Benoit Marty	31a7bfed02	version++	2021-09-29 14:56:10 +02:00
SpiritCroc	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
SpiritCroc	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
SpiritCroc	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
dependabot[bot]	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
Benoit Marty	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
Benoit Marty	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
Adam Brown	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
Benoit Marty	9f93850046	Keep LTS version	2021-09-27 16:22:00 +02:00
Benoit Marty	5b5dcf988d	Version++	2021-09-27 13:09:58 +02:00
Benoit Marty	53c8862ca2	Change version to 1.3.0	2021-09-27 11:57:23 +02:00
Nick Hu	78b870c558	Downgrade markwon version and enable LaTeX rendering for messages	2021-09-24 13:50:34 +01:00
dependabot[bot]	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
Benoit Marty	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
Adam Brown	7bd8890276	extracting orchestrator dependency to the dependencies.gradle file	2021-09-23 20:24:16 +01:00
Adam Brown	d7bc32d7ca	including tech orchestrator in the vector module script, fixes the no tests found error	2021-09-23 17:22:19 +01:00
Benoit Marty	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
dependabot[bot]	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
Benoit Marty	93506d18fa	Display push counter on debug mode	2021-09-23 13:54:03 +02:00
dependabot[bot]	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
SpiritCroc	f97549073e	Increment version ... Change-Id: If37db85f2d3e0affd140961f9efc87c8440c5033	2021-09-18 20:38:14 +02:00
SpiritCroc	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. Change-Id: If599d9154e9385a33f10b6df17469cd86deccb7b	2021-09-18 20:26:29 +02:00
dependabot[bot]	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
ariskotsomitopoulos	1dcf6b9539	Enhance dependencies handling to support Dependabot	2021-09-17 14:58:44 +03:00
ariskotsomitopoulos	87fefdc7bb	Add more dependencies to common dependencies.gradle	2021-09-15 20:22:52 +03:00
ariskotsomitopoulos	c89b2c0536	Optimize dependencies handling	2021-09-15 13:21:25 +03:00
SpiritCroc	c38ece586e	Increment version ... Change-Id: I70c18491f03854898fa9989add666530dbc0b668	2021-09-13 16:20:06 +02:00
SpiritCroc	741ac9f3f6	Merge tag 'v1.2.2' into sc ... Change-Id: Icda1859305bac1e48f3d1889282a23049dd83c29	2021-09-13 15:37:54 +02:00
Benoit Marty	db55693201	version++	2021-09-13 15:29:51 +02:00
Benoit Marty	cccf812906	Version++ (1.2.2)	2021-09-13 15:25:56 +02:00
dependabot[bot]	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
SpiritCroc	3be0b85dcf	Actually, this is 1.2.1 now ... Change-Id: I13a84dc84c37892cf5d18c549bc305f9a6b1e7ce	2021-09-09 16:21:19 +02:00
SpiritCroc	133579d066	Merge tag 'v1.2.1' into sc ... Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a Conflicts: build.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/core/di/VectorComponent.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.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/composer/VoiceMessageRecorderView.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/list/actions/RoomListQuickActionsEpoxyController.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt	2021-09-09 10:51:12 +02:00
Benoit Marty	5a5d4fda2d	DSL value has shorter alias now	2021-09-09 09:55:24 +02:00
SpiritCroc	832f0e0e5b	Increment version ... Change-Id: Ia225fd512fb1bccd7a2277a2e6f423c8f7ef8969	2021-09-09 09:39:24 +02:00
Benoit Marty	9914fb2d0f	Version++	2021-09-08 19:15:08 +02:00
Benoit Marty	73881d0813	Upgrade dependency on Barista. ... Should fix #3929 Barista has changed location since 4.0.0	2021-09-03 17:02:14 +02:00
Benoit Marty	ec6bae6b1e	Lint now check all the modules, but is does not check all the variants. Let's keep it like that for now ... https://developer.android.com/studio/releases/gradle-plugin#running_lint_on_default_variant_only	2021-09-02 10:43:33 +02:00
Benoit Marty	80f23f1f3c	Use Java 11 source code ... https://developer.android.com/studio/releases/gradle-plugin#java-11	2021-09-02 09:50:34 +02:00
Benoit Marty	5b2478a34f	Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings ... Feature/dla/keyword notification settings	2021-08-27 18:19:17 +02:00
Benoit Marty	54a4a84ac0	Merge pull request #3741 from vector-im/dependabot/gradle/daggerVersion-2.38.1 ... Bump daggerVersion from 2.38 to 2.38.1	2021-08-27 17:37:03 +02:00
Benoit Marty	0046de576e	Merge pull request #3767 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.0 ... Bump constraintlayout from 2.1.0-beta02 to 2.1.0	2021-08-27 16:39:34 +02:00
dependabot[bot]	7a44c6980c	Bump daggerVersion from 2.38 to 2.38.1 ... Bumps `daggerVersion` from 2.38 to 2.38.1. Updates `dagger` from 2.38 to 2.38.1 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.38...dagger-2.38.1) Updates `dagger-compiler` from 2.38 to 2.38.1 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.38...dagger-2.38.1) --- updated-dependencies: - dependency-name: com.google.dagger:dagger dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.google.dagger:dagger-compiler dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-08-27 14:33:17 +00:00
Benoit Marty	fa1a6b141a	Merge pull request #3832 from vector-im/dependabot/gradle/com.jakewharton.timber-timber-5.0.1 ... Bump timber from 4.7.1 to 5.0.1	2021-08-27 16:32:29 +02:00
ganfra	fd25813862	Merge branch 'develop' into feature/fga/new_voip_design	2021-08-26 15:15:16 +02:00
David Langley	ce9acd440e	Enabled Notifications V2	2021-08-25 17:54:23 +01:00
Benoit Marty	f843712d7e	Merge pull request #3825 from vector-im/feature/dla/room_notification_settings ... Room Notification Settings V2	2021-08-25 15:20:43 +02:00
dependabot[bot]	8988ea8997	Bump libphonenumber from 8.12.30 to 8.12.31 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.30 to 8.12.31. - [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.30...v8.12.31) --- 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-08-24 23:09:52 +00:00
David Langley	4d4d370b8f	checks and remove build settings	2021-08-24 22:33:32 +01:00
David Langley	f8114dd7a1	Fix HomeList error snackbar and add dialog for bottom sheet errors	2021-08-24 22:28:31 +01:00
ganfra	42bfa129b3	Merge branch 'develop' into feature/fga/new_voip_design	2021-08-24 16:21:35 +02:00
dependabot[bot]	3a03b5b63c	Bump timber from 4.7.1 to 5.0.1 ... Bumps [timber](https://github.com/JakeWharton/timber) from 4.7.1 to 5.0.1. - [Release notes](https://github.com/JakeWharton/timber/releases) - [Changelog](https://github.com/JakeWharton/timber/blob/trunk/CHANGELOG.md) - [Commits](https://github.com/JakeWharton/timber/compare/4.7.1...5.0.1) --- updated-dependencies: - dependency-name: com.jakewharton.timber:timber dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-08-23 13:12:59 +00:00
dependabot[bot]	9659bcf3e0	Bump constraintlayout from 2.1.0-beta02 to 2.1.0 ... Bumps [constraintlayout](https://github.com/androidx/constraintlayout) from 2.1.0-beta02 to 2.1.0. - [Release notes](https://github.com/androidx/constraintlayout/releases) - [Commits](https://github.com/androidx/constraintlayout/commits) --- updated-dependencies: - dependency-name: androidx.constraintlayout:constraintlayout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-08-23 13:12:18 +00:00
Benoit Marty	49f2ac26ad	Merge pull request #3783 from vector-im/dependabot/gradle/big_image_viewer_version-1.8.1 ... Bump big_image_viewer_version from 1.8.0 to 1.8.1	2021-08-23 15:09:29 +02:00
Benoit Marty	20baee2f53	Merge pull request #3794 from vector-im/dependabot/gradle/androidx.media-media-1.4.1 ... Bump media from 1.4.0 to 1.4.1	2021-08-23 15:05:33 +02:00
SpiritCroc	4918b7e7bf	Merge branch 'unifiedpush' into sc ... Change-Id: I0d19e4032b0f31cc1dee404cb383046d04a3259e	2021-08-21 09:21:19 +02:00
SpiritCroc	5f18fce771	Increment version ... Change-Id: Iaee1fa3f6de051c2ea57b0e2cb286de25052e31c	2021-08-20 10:45:57 +02:00
SpiritCroc	cad30d4790	Actually, we're still at 1.2.0 ... Got develop in by accident due to unifiedpush, but whatever Change-Id: I3d15dd820274076e4383aa17467a87dac9eebe31	2021-08-19 10:42:47 +02:00
SpiritCroc	8475f24f17	Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush ... Change-Id: Ief98ae56d40f0724ba0e5f1f1c6ec09832425e58	2021-08-18 13:16:37 +02:00
SpiritCroc	3b3e39bbb6	Merge branch 'sc' into unifiedpush ... Change-Id: I715e67cc1600706a6cfd7a2317df38909c74e11e	2021-08-18 13:16:19 +02:00
dependabot[bot]	fac0198b26	Bump libphonenumber from 8.12.28 to 8.12.30 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.28 to 8.12.30. - [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.28...v8.12.30) --- 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-08-17 23:05:56 +00:00
ganfra	3b1249c489	Merge branch 'develop' into feature/fga/new_voip_design	2021-08-17 17:10:10 +02:00
S1m	c584fa60dd	Merge remote-tracking branch 'upstream/develop' into unifiedpush	2021-08-16 18:00:33 +02:00
SpiritCroc	8fe2a0021f	Increment version ... Change-Id: I5c2d1293f5251d6d4c0cb889195f2db8a509e378	2021-08-14 14:38:23 +02:00
SpiritCroc	cf756b8789	Merge branch 'sc' into unifiedpush ... Change-Id: Ieae8e880360266f2f5e44aac371701e0356419de	2021-08-12 09:30:41 +02:00
SpiritCroc	58f5310e83	Merge tag 'v1.2.0' into sc ... v1.2.0 Change-Id: I900672607ec264e60c96c886d0accb053934fa4a Conflicts: vector/src/main/res/xml/vector_settings_labs.xml	2021-08-12 09:03:42 +02:00
Onuray Sahin	37e722e85d	version++	2021-08-12 02:36:39 +03:00
SpiritCroc	5b7e2fdcaa	Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush-2 ... Change-Id: If4c64b14513d70cd376e3e1a9fbaeb1efb0ded12 Conflicts: vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt	2021-08-11 18:08:02 +02:00
David Langley	de5b2ad460	simplify logic in bottom sheet and add comment	2021-08-11 15:00:27 +01:00
Onuray Sahin	8216acfd5c	version++	2021-08-11 16:40:45 +03:00
David Langley	92a44cd9d6	add build config, use single variable in grandle file and update source to use feature flag	2021-08-11 13:13:38 +01:00
ganfra	bcc9a75bdb	Merge branch 'develop' into feature/fga/new_voip_design	2021-08-11 12:37:54 +02:00
David Langley	7f3c4f0073	Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings	2021-08-10 10:54:22 +01:00
SpiritCroc	677330921d	Merge tag 'v1.1.16' into sc ... v1.1.16 Change-Id: Id68bd7e36129c9168cc871d81c5c0935b689e1e9 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt	2021-08-10 09:54:58 +02:00
Onuray Sahin	c167c8874d	version++	2021-08-09 00:54:16 +03:00
dependabot[bot]	9006118bc7	Bump media from 1.4.0 to 1.4.1 ... Bumps media from 1.4.0 to 1.4.1. --- 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-08-04 23:10:33 +00:00
dependabot[bot]	ef1a66a37c	Bump big_image_viewer_version from 1.8.0 to 1.8.1 ... Bumps `big_image_viewer_version` from 1.8.0 to 1.8.1. Updates `BigImageViewer` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/compare/v1.8.0...v1.8.1) Updates `GlideImageLoader` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/compare/v1.8.0...v1.8.1) Updates `ProgressPieIndicator` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/compare/v1.8.0...v1.8.1) Updates `GlideImageViewFactory` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/compare/v1.8.0...v1.8.1) --- updated-dependencies: - dependency-name: com.github.piasy:BigImageViewer dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.github.piasy:GlideImageLoader dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.github.piasy:ProgressPieIndicator dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.github.piasy:GlideImageViewFactory dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-08-03 23:06:57 +00:00
SpiritCroc	25ba52115b	Merge tag 'v1.1.15' into sc ... Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4 Conflicts: vector/src/main/assets/open_source_licenses.html vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt vector/src/main/res/drawable/ic_insert_emoji.xml vector/src/main/res/layout/composer_layout_constraint_set_compact.xml vector/src/main/res/layout/fragment_room_detail.xml vector/src/main/res/layout/item_timeline_event_base.xml vector/src/main/res/xml/vector_settings_labs.xml	2021-08-01 09:37:33 +02:00
Onuray Sahin	c7c589354e	version++	2021-07-30 18:01:22 +03:00
Onuray Sahin	c6bd6e4961	Merge pull request #3598 from vector-im/feature/ons/voice_message ... Voice Message	2021-07-30 17:24:17 +03:00
David Langley	7091de9942	merge in static push definitions and adapt push v2 ui/logic	2021-07-27 19:54:17 +01:00
SpiritCroc	782141998d	Increment version ... Change-Id: I710e0f58cc1fef70e5bc199ab4effb607ad321db	2021-07-27 14:53:48 +02:00
SpiritCroc	f8b9d3571c	Increment version ... Change-Id: I04751368e916d37162f752abd25243400dc6575d	2021-07-26 12:51:54 +02:00
SpiritCroc	acb12c2005	Merge tag 'v1.1.14' into sc ... Change-Id: I7668fc7603c8f6e7aafa89886bb0fdf586e4a871 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.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	2021-07-24 10:12:48 +02:00
ganfra	4788630949	Merge branch 'develop' into feature/fga/new_voip_design	2021-07-23 12:17:05 +02:00
Benoit Marty	bdbfbe6175	Version++	2021-07-23 11:53:21 +02:00
dependabot[bot]	a75ceee03f	Bump appcompat from 1.3.0 to 1.3.1 ... Bumps appcompat from 1.3.0 to 1.3.1. --- updated-dependencies: - dependency-name: androidx.appcompat:appcompat dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-07-22 12:13:24 +00:00
Benoit Marty	2070b0ecde	Merge pull request #3718 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.6 ... Bump fragment-ktx from 1.3.5 to 1.3.6	2021-07-22 14:12:42 +02:00
dependabot[bot]	76f412ffe8	Bump fragment-ktx from 1.3.5 to 1.3.6 ... Bumps fragment-ktx from 1.3.5 to 1.3.6. --- updated-dependencies: - dependency-name: androidx.fragment:fragment-ktx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-07-21 23:05:41 +00:00
dependabot[bot]	b6e739afd3	Bump media from 1.3.1 to 1.4.0 ... Bumps media from 1.3.1 to 1.4.0. --- updated-dependencies: - dependency-name: androidx.media:media dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-07-21 23:04:46 +00:00
Benoit Marty	e4ae80e348	Merge pull request #3708 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.28 ... Bump libphonenumber from 8.12.27 to 8.12.28	2021-07-21 09:28:19 +02:00
dependabot[bot]	89dc4bb13e	Bump daggerVersion from 2.37 to 2.38 ... Bumps `daggerVersion` from 2.37 to 2.38. Updates `dagger` from 2.37 to 2.38 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.37...dagger-2.38) Updates `dagger-compiler` from 2.37 to 2.38 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.37...dagger-2.38) --- updated-dependencies: - dependency-name: com.google.dagger:dagger dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:dagger-compiler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-07-20 23:06:50 +00:00
dependabot[bot]	b809d4acf4	Bump libphonenumber from 8.12.27 to 8.12.28 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.27 to 8.12.28. - [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.27...v8.12.28) --- 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-07-20 23:06:30 +00:00
SpiritCroc	8497a307a1	Merge tag 'v1.1.13' into sc ... Change-Id: Icc97ef8699b1cc96447369121f3c88582ac651bc Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.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/RoomListFragment.kt	2021-07-19 16:10:57 +02:00
Benoit Marty	6d1cabaee3	Version++	2021-07-19 15:28:14 +02:00
SpiritCroc	0dcb14482d	Increment version ... Change-Id: I8c9b382eea65a87575d0642eb8bfa5bc4f0b4707	2021-07-16 12:34:43 +02:00
Benoit Marty	bfc70be5bb	Record voice on Android 21	2021-07-15 17:23:46 +02:00
David Langley	5044b21545	add changelog, checks/tests	2021-07-14 11:49:16 +01:00
David Langley	baab726df2	Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings	2021-07-14 10:18:54 +01:00
David Langley	a3204fdad9	add resValue to enable feature, put back old code	2021-07-13 21:22:56 +01:00
dependabot[bot]	b0ea022eea	Bump kluent-android from 1.67 to 1.68 ... Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent) from 1.67 to 1.68. - [Release notes](https://github.com/MarkusAmshove/Kluent/releases) - [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md) - [Commits](https://github.com/MarkusAmshove/Kluent/commits) --- updated-dependencies: - dependency-name: org.amshove.kluent:kluent-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-07-12 23:07:08 +00:00
Benoit Marty	e391a1371c	Merge branch 'develop' into feature/ons/voice_message	2021-07-09 22:19:50 +02:00
dependabot[bot]	76890a3b26	Bump libphonenumber from 8.12.26 to 8.12.27 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.26 to 8.12.27. - [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.26...v8.12.27) --- 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-07-07 23:06:17 +00:00
S1m	15c3bb7fc3	exclude firebase analytics	2021-07-07 23:11:18 +02:00
S1m	7ead76c8ca	up: moshi to parse json	2021-07-07 03:35:16 +02:00
S1m	4ac4755868	up pr: code reviewed	2021-07-07 01:49:39 +02:00
S1m	6c153d04da	Merge remote-tracking branch 'upstream/develop' into unifiedpush	2021-07-07 00:49:54 +02:00
Onuray Sahin	7a1b138894	Merge branch 'develop' into feature/ons/voice_message ... * develop: (286 commits) Fix crash after video call Fix issue on button styles Clean after benoits review Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime." Bump kotlin_version from 1.5.10 to 1.5.20 Bump libphonenumber from 8.12.25 to 8.12.26 Fix call invite processed after call is ended because of fastlane mode. Jump to unread: removes unnecessary check which can cause scroll issue Jump to unread: avoid blink when jumping Clean after Benoits review Delete unused drawable to avoid conflict on develop Jump to unread: add towncrier file. Read marker: fix some issues with jump to unread visibility. Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/ Reordering Add text style for dialogs Colored dialog button is now handled by the theme Update theme for material dialog and create a destructive variant Reorder buttons Update doc ... # Conflicts: # library/ui-styles/src/main/res/values/theme_dark.xml # library/ui-styles/src/main/res/values/theme_light.xml # vector/build.gradle # 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/composer/TextComposerView.kt # vector/src/main/res/values/strings.xml	2021-07-06 13:17:49 +03:00
Benoit Marty	e22bd8f637	Merge pull request #3593 from vector-im/dependabot/gradle/androidx.test.ext-junit-1.1.3 ... Bump junit from 1.1.2 to 1.1.3	2021-07-05 21:36:38 +02:00
Benoit Marty	692adffa69	Merge pull request #3626 from vector-im/dependabot/gradle/com.google.android.material-material-1.4.0 ... Bump material from 1.3.0 to 1.4.0	2021-07-05 21:29:49 +02:00
ganfra	cdf97fc29f	Merge branch 'develop' into feature/fga/new_voip_design	2021-07-05 18:02:19 +02:00
SpiritCroc	e5c9c33a0f	Merge tag 'v1.1.12' into sc ... Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236 Conflicts: library/ui-styles/src/main/res/values/text_appearances.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/home/room/detail/timeline/TimelineEventController.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/list/GroupRoomListSectionBuilder.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/RoomListViewModel.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt vector/src/main/res/layout/dialog_export_e2e_keys.xml vector/src/main/res/layout/dialog_import_e2e_keys.xml	2021-07-05 16:58:45 +02:00
dependabot[bot]	974d5c23d3	Bump junit from 1.1.2 to 1.1.3 ... Bumps junit from 1.1.2 to 1.1.3. --- updated-dependencies: - dependency-name: androidx.test.ext:junit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-07-05 14:19:54 +00:00
dependabot[bot]	8639582671	Bump espresso_version from 3.3.0 to 3.4.0 ... Bumps `espresso_version` from 3.3.0 to 3.4.0. Updates `espresso-core` from 3.3.0 to 3.4.0 Updates `espresso-contrib` from 3.3.0 to 3.4.0 Updates `espresso-intents` from 3.3.0 to 3.4.0 --- updated-dependencies: - dependency-name: androidx.test.espresso:espresso-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.test.espresso:espresso-contrib dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.test.espresso:espresso-intents dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-07-05 12:38:04 +00:00
Benoit Marty	5ccfbf4ed8	Merge pull request #3596 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.6.0 ... Bump core-ktx from 1.5.0 to 1.6.0	2021-07-05 14:37:48 +02:00
Benoit Marty	f03155bbae	Merge pull request #3591 from vector-im/dependabot/gradle/androidxTest_version-1.4.0 ... Bump androidxTest_version from 1.3.0 to 1.4.0	2021-07-05 14:37:14 +02:00
Benoit Marty	72dcc92032	Version++	2021-07-05 14:27:33 +02:00
SpiritCroc	1ba30d4bdb	Increment version ... Change-Id: I01966a3e4b177a2a19f7c50322bb3e601cf1bb24	2021-07-04 11:52:31 +02:00
dependabot[bot]	9ff1e20f07	Bump material from 1.3.0 to 1.4.0 ... Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/material-components/material-components-android/releases) - [Commits](https://github.com/material-components/material-components-android/compare/1.3.0...1.4.0) --- updated-dependencies: - dependency-name: com.google.android.material:material dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-07-02 23:07:53 +00:00
ganfra	f74a71001a	Change active call bar + some minor changes in call screen	2021-07-01 20:05:58 +02:00
Benoit Marty	69c399a229	Merge pull request #3529 from erikhuizinga/erikhuizinga-3527-fix-google-play-service-application ... Apply Google Services Gradle plugin more robustly	2021-07-01 10:16:00 +02:00
Onuray Sahin	5676226f42	Voice message recording view implementations.	2021-07-01 10:47:41 +03:00
dependabot[bot]	752290424c	Bump core-ktx from 1.5.0 to 1.6.0 ... Bumps core-ktx from 1.5.0 to 1.6.0. --- updated-dependencies: - dependency-name: androidx.core:core-ktx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-30 23:07:55 +00:00
dependabot[bot]	2ebfeb1709	Bump androidxTest_version from 1.3.0 to 1.4.0 ... Bumps `androidxTest_version` from 1.3.0 to 1.4.0. Updates `core` from 1.3.0 to 1.4.0 Updates `runner` from 1.3.0 to 1.4.0 Updates `rules` from 1.3.0 to 1.4.0 --- updated-dependencies: - dependency-name: androidx.test:core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.test:runner dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.test:rules dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-30 23:06:24 +00:00
S1m	4a8fa4a3ce	embedded distrib: original gateway	2021-06-30 19:53:24 +02:00
dependabot[bot]	9e2f2f2372	Bump libphonenumber from 8.12.25 to 8.12.26 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.25 to 8.12.26. - [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.25...v8.12.26) --- 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-06-24 23:05:19 +00:00
Benoit Marty	ca3e5cdf90	Merge pull request #3544 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.67 ... Bump kluent-android from 1.65 to 1.67	2021-06-24 14:49:53 +02:00
Benoit Marty	14184aae6f	Merge pull request #3506 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.25 ... Bump libphonenumber from 8.12.24 to 8.12.25	2021-06-24 14:34:45 +02:00
Benoit Marty	ed90f376e6	Merge pull request #3518 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.5 ... Bump fragment-ktx from 1.3.4 to 1.3.5	2021-06-24 14:31:04 +02:00
SpiritCroc	d11c1fcc62	Merge tag 'v1.1.11' into sc ... Change-Id: I15d6e584f1594764f956c129003b2a459b5d24a6	2021-06-24 10:19:24 +02:00
SpiritCroc	72aa4bb999	Merge tag 'v1.1.10' into sc ... Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab Conflicts: library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml library/ui-styles/src/main/res/drawable/splash.xml library/ui-styles/src/main/res/values/theme_light.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.kt vector/src/main/AndroidManifest.xml 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/room/detail/composer/TextComposerView.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt vector/src/main/res/drawable/ic_attachment.xml vector/src/main/res/drawable/ic_insert_emoji.xml vector/src/main/res/drawable/ic_keyboard.xml 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 vector/src/main/res/layout/fragment_home_detail.xml vector/src/main/res/layout/fragment_login_server_url_form.xml vector/src/main/res/layout/fragment_user_list.xml vector/src/main/res/layout/item_bottom_sheet_message_preview.xml vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml vector/src/main/res/layout/item_room.xml vector/src/main/res/layout/item_space_beta_header.xml vector/src/main/res/layout/item_suggested_room.xml vector/src/main/res/layout/item_timeline_event_redacted_stub.xml vector/src/main/res/layout/item_timeline_event_text_message_stub.xml vector/src/main/res/values/styles_riot.xml	2021-06-23 13:38:41 +02:00
Benoit Marty	0c88d11429	Version++	2021-06-22 12:28:18 +02:00
dependabot[bot]	e2e3e2de86	Bump kluent-android from 1.65 to 1.67 ... Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent) from 1.65 to 1.67. - [Release notes](https://github.com/MarkusAmshove/Kluent/releases) - [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md) - [Commits](https://github.com/MarkusAmshove/Kluent/commits) --- updated-dependencies: - dependency-name: org.amshove.kluent:kluent-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-21 23:06:17 +00:00
SpiritCroc	6626c5b600	Merge commit '8b138e8ff' into sc ... Change-Id: Icbda29234a03a5498d1aa1b9bbf9bba386f7c2cc Conflicts: vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.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/MessageTextItem.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/filtered/FilteredRoomFooterItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt	2021-06-20 09:18:03 +02:00
Benoit Marty	b30c27b7a6	Version++	2021-06-18 21:50:12 +02:00
Erik Huizinga	cc5260b311	Disable non-Gplay flavor *GoogleServices* tasks	2021-06-18 17:23:11 +02:00
Erik Huizinga	22f3f612d7	Apply Google Services Gradle plugin more robustly ... Fixes #3527	2021-06-18 12:26:31 +02:00
Onuray Sahin	69350ef514	Voice message UI initial implementation.	2021-06-17 16:17:38 +03:00
dependabot[bot]	7c19c9f0b7	Bump fragment-ktx from 1.3.4 to 1.3.5 ... Bumps fragment-ktx from 1.3.4 to 1.3.5. --- updated-dependencies: - dependency-name: androidx.fragment:fragment-ktx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-16 23:08:30 +00:00
Benoit Marty	df613c6044	Merge pull request #3511 from vector-im/feature/bma/theme_again ... Create a module with themes and styles	2021-06-16 14:33:45 +02:00
Benoit Marty	f5f09224b1	Create module for ui-styles	2021-06-15 12:23:54 +02:00
dependabot[bot]	dd74b8a755	Bump libphonenumber from 8.12.24 to 8.12.25 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.24 to 8.12.25. - [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.24...v8.12.25) --- 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-06-15 06:25:21 +00:00
dependabot[bot]	a2db0e4cce	Bump epoxy_version from 4.6.1 to 4.6.2 ... Bumps `epoxy_version` from 4.6.1 to 4.6.2. Updates `epoxy` from 4.6.1 to 4.6.2 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.6.1...4.6.2) Updates `epoxy-glide-preloading` from 4.6.1 to 4.6.2 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.6.1...4.6.2) Updates `epoxy-processor` from 4.6.1 to 4.6.2 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.6.1...4.6.2) Updates `epoxy-paging` from 4.6.1 to 4.6.2 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.6.1...4.6.2) --- updated-dependencies: - dependency-name: com.airbnb.android:epoxy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.airbnb.android:epoxy-glide-preloading dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.airbnb.android:epoxy-processor dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.airbnb.android:epoxy-paging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-14 07:33:43 +00:00
SpiritCroc	99832243a6	Increment version ... Change-Id: Ia33c739201d13d466f302fce991488d8d850bbfd	2021-06-12 10:29:05 +02:00
Benoit Marty	e9db1dbb08	Merge pull request #3488 from vector-im/dependabot/gradle/daggerVersion-2.37 ... Bump daggerVersion from 2.36 to 2.37	2021-06-11 12:24:49 +02:00
dependabot[bot]	cc67e83b21	Bump daggerVersion from 2.36 to 2.37 ... Bumps `daggerVersion` from 2.36 to 2.37. Updates `dagger` from 2.36 to 2.37 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.36...dagger-2.37) Updates `dagger-compiler` from 2.36 to 2.37 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.36...dagger-2.37) --- updated-dependencies: - dependency-name: com.google.dagger:dagger dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:dagger-compiler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-11 05:54:29 +00:00
ganfra	68143ab2cf	Merge branch 'develop' into feature/fga/voip_asserted_identity	2021-06-10 16:01:48 +02:00
Benoit Marty	aa8456575d	use multidex from androidx and not android support	2021-06-09 20:49:56 +02:00
Benoit Marty	706b2f5ea2	Merge pull request #3455 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.1 ... Bump recyclerview from 1.2.0 to 1.2.1	2021-06-09 18:02:36 +02:00
dependabot[bot]	b8c10312d1	Bump zxcvbn from 1.5.0 to 1.5.2 ... Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.5.0 to 1.5.2. - [Release notes](https://github.com/nulab/zxcvbn4j/releases) - [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md) - [Commits](https://github.com/nulab/zxcvbn4j/compare/1.5.0...1.5.2) --- updated-dependencies: - dependency-name: com.nulab-inc:zxcvbn dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-08 06:12:38 +00:00
Benoit Marty	8ec22de0b8	Merge pull request #3432 from vector-im/dependabot/gradle/com.github.yalantis-ucrop-2.2.7 ... Bump ucrop from 2.2.6 to 2.2.7	2021-06-03 10:13:28 +02:00
dependabot[bot]	37176b9770	Bump recyclerview from 1.2.0 to 1.2.1 ... Bumps recyclerview from 1.2.0 to 1.2.1. --- updated-dependencies: - dependency-name: androidx.recyclerview:recyclerview dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-03 06:50:02 +00:00
SpiritCroc	c00600666e	Merge tag 'v1.1.9' into sc ... Change-Id: I75baba645677d13f9937643a29630070f1470f9c 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/session/sync/RoomSyncHandler.kt vector/build.gradle vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt	2021-06-02 17:49:34 +02:00
SpiritCroc	bddc574766	Increment version ... Change-Id: I03d7c37b12b0f5e6af2a44dedf76c3aff154d716	2021-06-02 16:51:11 +02:00
Benoit Marty	26d54eeb8b	Explicitly add dep to androidx.transition.transition, before it was a transitive dep from ucrop library.	2021-06-02 12:03:46 +02:00
Benoit Marty	77ffdabd60	Version++	2021-06-02 11:48:08 +02:00
user	a3a946fb75	unifiedpush notification	2021-06-01 20:29:44 +02:00
ganfra	0eca809b83	Asserted identity: handle if needed and use the data	2021-06-01 18:12:10 +02:00
dependabot[bot]	92f5008a41	Bump ucrop from 2.2.6 to 2.2.7 ... Bumps [ucrop](https://github.com/Yalantis/uCrop) from 2.2.6 to 2.2.7. - [Release notes](https://github.com/Yalantis/uCrop/releases) - [Commits](https://github.com/Yalantis/uCrop/compare/2.2.6...2.2.7) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-31 19:10:36 +00:00
dependabot[bot]	7fb76b2541	Bump libphonenumber from 8.12.23 to 8.12.24 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.23 to 8.12.24. - [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.23...v8.12.24) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-27 06:23:10 +00:00
Benoit Marty	2bea2de0c5	Merge pull request #3365 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.5.0 ... Bump core-ktx from 1.3.2 to 1.5.0	2021-05-26 14:22:26 +02:00
Benoit Marty	526f43044e	Merge pull request #3367 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.4 ... Bump fragment-ktx from 1.3.3 to 1.3.4	2021-05-26 14:21:18 +02:00
SpiritCroc	3b2f09e80d	Merge remote-tracking branch 'AquaWolf/feature/conversations' into sc ... Change-Id: Idbbe13f56d988900ade365c3d582bd03799d245c Conflicts: vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt	2021-05-26 10:55:56 +02:00
SpiritCroc	6c06462ec9	Merge tag 'v1.1.8' into sc ... Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480 Conflicts: 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/RoomDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt	2021-05-26 10:44:19 +02:00
dependabot[bot]	2703097294	Bump daggerVersion from 2.35.1 to 2.36 ... Bumps `daggerVersion` from 2.35.1 to 2.36. Updates `dagger` from 2.35.1 to 2.36 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36) Updates `dagger-compiler` from 2.35.1 to 2.36 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-26 06:00:27 +00:00
Benoit Marty	680837611a	Version++	2021-05-25 18:13:09 +02:00
Benoit Marty	b44c1a1c77	Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi ... Feature/fga/authenticated jitsi	2021-05-25 10:24:54 +02:00
SpiritCroc	4f46f470d6	Increment version ... Change-Id: I08b244059c9619a0adfe900c0aac569525cee9ad	2021-05-22 10:12:03 +02:00
Benoit Marty	a7c1dc5cd9	Merge branch 'develop' into feature/bma/login_v2	2021-05-20 15:18:18 +02:00
dependabot[bot]	ef884d84dc	Bump fragment-ktx from 1.3.3 to 1.3.4 ... Bumps fragment-ktx from 1.3.3 to 1.3.4. Signed-off-by: dependabot[bot] <support@github.com>	2021-05-20 13:08:13 +00:00
dependabot[bot]	9b6a2c91f4	Bump core-ktx from 1.3.2 to 1.5.0 ... Bumps core-ktx from 1.3.2 to 1.5.0. Signed-off-by: dependabot[bot] <support@github.com>	2021-05-20 13:08:12 +00:00
Benoit Marty	5d7acad75c	Merge pull request #3366 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.3.0 ... Bump appcompat from 1.2.0 to 1.3.0	2021-05-20 15:07:27 +02:00
Benoit Marty	4ba40b1d34	Disable LoginFlowV2 to merge it on develop	2021-05-20 13:56:41 +02:00
ganfra	82c50b7c1d	Jitsi auth: introduce JitsiService and JWT token creation	2021-05-19 18:19:49 +02:00
dependabot[bot]	5629d30932	Bump appcompat from 1.2.0 to 1.3.0 ... Bumps appcompat from 1.2.0 to 1.3.0. Signed-off-by: dependabot[bot] <support@github.com>	2021-05-19 06:20:33 +00:00
dependabot[bot]	e5cc6ceba7	Bump epoxy_version from 4.5.0 to 4.6.1 ... Bumps `epoxy_version` from 4.5.0 to 4.6.1. Updates `epoxy` from 4.5.0 to 4.6.1 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1) Updates `epoxy-glide-preloading` from 4.5.0 to 4.6.1 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1) Updates `epoxy-processor` from 4.5.0 to 4.6.1 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1) Updates `epoxy-paging` from 4.5.0 to 4.6.1 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-18 18:18:15 +00:00
SpiritCroc	e40bf1704b	Increment version ... Change-Id: If1b871b3ab76544d87e965986a8c53b782692f8e	2021-05-15 10:03:28 +02:00
Philipp Neumann	74b8660a44	Merge branch 'develop' into feature/conversations	2021-05-13 14:19:59 +02:00
dependabot[bot]	90f6f9f7c1	Bump libphonenumber from 8.12.22 to 8.12.23 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.22 to 8.12.23. - [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.22...v8.12.23) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-13 06:30:31 +00:00
Benoit Marty	1b84039407	Merge pull request #3288 from vector-im/dependabot/gradle/androidx.media-media-1.3.1 ... Bump media from 1.3.0 to 1.3.1	2021-05-12 20:58:23 +02:00
Benoit Marty	796bb80868	Merge pull request #3252 from vector-im/dependabot/gradle/com.github.chrisbanes-PhotoView-2.3.0 ... Bump PhotoView from 2.1.4 to 2.3.0	2021-05-12 16:51:12 +02:00
dependabot[bot]	cbd9ec33fe	Bump android-snowfall from 1.2.0 to 1.2.1 ... Bumps [android-snowfall](https://github.com/JetradarMobile/android-snowfall) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/JetradarMobile/android-snowfall/releases) - [Changelog](https://github.com/JetradarMobile/android-snowfall/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetradarMobile/android-snowfall/compare/1.2.0...1.2.1) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-12 14:50:50 +00:00
Benoit Marty	dcc37ec292	Merge pull request #3276 from vector-im/dependabot/gradle/daggerVersion-2.35.1 ... Bump daggerVersion from 2.35 to 2.35.1	2021-05-12 16:50:39 +02:00
dependabot[bot]	58dfe0f924	Bump daggerVersion from 2.35 to 2.35.1 ... Bumps `daggerVersion` from 2.35 to 2.35.1. Updates `dagger` from 2.35 to 2.35.1 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.35...dagger-2.35.1) Updates `dagger-compiler` from 2.35 to 2.35.1 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.35...dagger-2.35.1) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-12 14:50:20 +00:00
Benoit Marty	4b87413b5f	Merge pull request #3278 from vector-im/dependabot/gradle/nl.dionsegijn-konfetti-1.3.2 ... Bump konfetti from 1.2.6 to 1.3.2	2021-05-12 16:50:10 +02:00
Benoit Marty	2709c1e99b	Merge pull request #3321 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-22.0.0 ... Bump firebase-messaging from 21.1.0 to 22.0.0	2021-05-12 16:49:27 +02:00
Benoit Marty	a42a9b5e32	Version++	2021-05-12 15:15:24 +02:00
dependabot[bot]	3ddf181224	Bump firebase-messaging from 21.1.0 to 22.0.0 ... Bumps firebase-messaging from 21.1.0 to 22.0.0. Signed-off-by: dependabot[bot] <support@github.com>	2021-05-12 05:58:36 +00:00
Philipp Neumann	f7d7362a85	Merge branch 'develop' into feature/conversations	2021-05-11 09:41:04 +02:00
dependabot[bot]	711dfe41b7	Bump media from 1.3.0 to 1.3.1 ... Bumps media from 1.3.0 to 1.3.1. Signed-off-by: dependabot[bot] <support@github.com>	2021-05-06 07:11:17 +00:00
dependabot[bot]	314ace9208	Bump konfetti from 1.2.6 to 1.3.2 ... Bumps [konfetti](https://github.com/DanielMartinus/Konfetti) from 1.2.6 to 1.3.2. - [Release notes](https://github.com/DanielMartinus/Konfetti/releases) - [Commits](https://github.com/DanielMartinus/Konfetti/compare/v1.2.6...v1.3.2) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-05 07:12:55 +00:00
SpiritCroc	39359f7d24	Merge remote-tracking branch 'upstream/develop' into spaces ... Change-Id: I10235a7a808ae66f5b00ad2e58c2aedf395e8e25 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt 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/summary/RoomSummaryDataSource.kt vector/build.gradle vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.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/HomeDrawerFragment.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/action/MessageActionsViewModel.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/list/RoomListAction.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/RoomListViewModel.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt	2021-05-02 12:12:52 +02:00
SpiritCroc	ca21a3fc43	Increment version ... Change-Id: I046fe728801113e31b8590f7b18422d0f9f85fba	2021-05-02 10:03:17 +02:00
dependabot[bot]	5a53838194	Bump PhotoView from 2.1.4 to 2.3.0 ... Bumps [PhotoView](https://github.com/Baseflow/PhotoView) from 2.1.4 to 2.3.0. - [Release notes](https://github.com/Baseflow/PhotoView/releases) - [Commits](https://github.com/Baseflow/PhotoView/compare/2.1.4...2.3.0) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-30 07:06:20 +00:00
Benoit Marty	faef2fba9a	Enable login v2 by default, but keep the possibility to use v1	2021-04-29 15:57:52 +02:00
Benoit Marty	55f1f56fec	`master` branch has been renamed to `main` ... Also in project vector-im/jitsi_libre_maven	2021-04-29 12:29:52 +02:00
Benoit Marty	264eb3b0a2	Merge pull request #3246 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.22 ... Bump libphonenumber from 8.12.21 to 8.12.22	2021-04-29 11:12:29 +02:00
dependabot[bot]	7593c3f03d	Bump libphonenumber from 8.12.21 to 8.12.22 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.21 to 8.12.22. - [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.21...v8.12.22) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-29 07:18:14 +00:00
Valere	0d3c2b4bef	Fix space filtering	2021-04-28 11:15:58 +02:00
Philipp Neumann	dd7c264483	Added shortcut for conversation notifications	2021-04-28 09:54:05 +02:00
Benoit Marty	8b5d86f68d	Merge pull request #3228 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.5.0 ... Bump zxcvbn from 1.4.1 to 1.5.0	2021-04-26 21:38:10 +02:00
dependabot[bot]	49d1b3e583	Bump zxcvbn from 1.4.1 to 1.5.0 ... Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.4.1 to 1.5.0. - [Release notes](https://github.com/nulab/zxcvbn4j/releases) - [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md) - [Commits](https://github.com/nulab/zxcvbn4j/compare/1.4.1...1.5.0) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-26 14:31:37 +00:00
dependabot[bot]	ed9db95aa0	Bump fragment-ktx from 1.3.2 to 1.3.3 ... Bumps fragment-ktx from 1.3.2 to 1.3.3. Signed-off-by: dependabot[bot] <support@github.com>	2021-04-26 14:27:59 +00:00
Benoit Marty	e3a667cbc6	Merge pull request #3220 from vector-im/dependabot/gradle/daggerVersion-2.35 ... Bump daggerVersion from 2.34.1 to 2.35	2021-04-26 16:27:39 +02:00
Benoit Marty	43b17be7a7	Merge pull request #3216 from vector-im/dependabot/gradle/epoxy_version-4.5.0 ... Bump epoxy_version from 4.4.4 to 4.5.0	2021-04-26 16:26:46 +02:00
dependabot[bot]	7575959c4a	Bump daggerVersion from 2.34.1 to 2.35 ... Bumps `daggerVersion` from 2.34.1 to 2.35. Updates `dagger` from 2.34.1 to 2.35 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35) Updates `dagger-compiler` from 2.34.1 to 2.35 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-23 07:05:44 +00:00
dependabot[bot]	bb48fea116	Bump epoxy_version from 4.4.4 to 4.5.0 ... Bumps `epoxy_version` from 4.4.4 to 4.5.0. Updates `epoxy` from 4.4.4 to 4.5.0 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0) Updates `epoxy-glide-preloading` from 4.4.4 to 4.5.0 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0) Updates `epoxy-processor` from 4.4.4 to 4.5.0 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0) Updates `epoxy-paging` from 4.4.4 to 4.5.0 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-20 17:59:41 +00:00
Benoit Marty	fe9bd38115	Merge pull request #3175 from vector-im/dependabot/gradle/daggerVersion-2.34.1 ... Bump daggerVersion from 2.34 to 2.34.1	2021-04-20 19:58:48 +02:00
Benoit Marty	47134c39af	Merge pull request #3174 from vector-im/dependabot/gradle/big_image_viewer_version-1.8.0 ... Bump big_image_viewer_version from 1.7.1 to 1.8.0	2021-04-20 19:58:36 +02:00
Benoit Marty	5e3d8a5424	Merge pull request #3173 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.4.1 ... Bump zxcvbn from 1.4.0 to 1.4.1	2021-04-20 19:58:12 +02:00
SpiritCroc	2ae0fb8886	Merge tag 'v1.1.6' into sc ... Change-Id: I80d2ce9bdcb22c2fcc9795d3a5c727cb5ba772a6	2021-04-16 15:32:18 +02:00
Benoit Marty	19427fbfec	merge hotfix to develop	2021-04-16 14:36:15 +02:00
Benoit Marty	72515ee635	Prepare corrective release 1.1.6	2021-04-16 14:33:00 +02:00
SpiritCroc	28c5f036c8	Merge tag 'v1.1.5' into sc ... Change-Id: I263852c42cfa21935890bee435f063d7fa43edfa	2021-04-15 12:29:59 +02:00
Benoit Marty	9565e8975e	merge hotfix to develop	2021-04-15 11:09:58 +02:00
Benoit Marty	59637c4a6b	Revert to Realm 10.3.1 to fix issue with migration ... Waiting for https://github.com/realm/realm-java/issues/7402	2021-04-14 21:54:07 +02:00
dependabot[bot]	30b415e77e	Bump daggerVersion from 2.34 to 2.34.1 ... Bumps `daggerVersion` from 2.34 to 2.34.1. Updates `dagger` from 2.34 to 2.34.1 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1) Updates `dagger-compiler` from 2.34 to 2.34.1 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-14 07:09:19 +00:00
dependabot[bot]	39f304a57b	Bump big_image_viewer_version from 1.7.1 to 1.8.0 ... Bumps `big_image_viewer_version` from 1.7.1 to 1.8.0. Updates `BigImageViewer` from 1.7.1 to 1.8.0 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/commits) Updates `GlideImageLoader` from 1.7.1 to 1.8.0 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/commits) Updates `ProgressPieIndicator` from 1.7.1 to 1.8.0 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/commits) Updates `GlideImageViewFactory` from 1.7.1 to 1.8.0 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/commits) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-14 07:09:03 +00:00
dependabot[bot]	afe617357d	Bump zxcvbn from 1.4.0 to 1.4.1 ... Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/nulab/zxcvbn4j/releases) - [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md) - [Commits](https://github.com/nulab/zxcvbn4j/compare/1.4.0...1.4.1) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-14 07:08:48 +00:00
SpiritCroc	0e601aa8f0	Merge tag 'v1.1.4' into sc ... Note: this merge needs more work, since upstream changed implementations affecting following features: - Mark unread - Notification count badges - Overview list filtering / combined overview - Remember expanded categories - Read receipt layout Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435 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/room/RoomAvatarResolver.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt vector/src/main/java/im/vector/app/core/utils/Emoji.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.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/timeline/helper/MessageInformationDataFactory.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.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/RoomListViewModel.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/RoomSummaryController.kt vector/src/main/res/layout/item_timeline_event_base.xml vector/src/main/res/layout/item_timeline_event_base_state.xml	2021-04-13 09:28:13 +02:00
SpiritCroc	d329f08162	Increment version ... Change-Id: Ieeae5d0355183e5fadd8a0303514d8af9d7301a5	2021-04-12 10:57:35 +02:00
Benoit Marty	6d46bfc260	Merge pull request #3148 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-21.1.0 ... Bump firebase-messaging from 21.0.1 to 21.1.0	2021-04-09 16:39:05 +02:00
Benoit Marty	d40f2ef463	Merge pull request #3139 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0 ... Bump recyclerview from 1.2.0-rc01 to 1.2.0	2021-04-09 16:38:53 +02:00
Benoit Marty	8d1b56d526	Merge pull request #3138 from vector-im/dependabot/gradle/androidx.media-media-1.3.0 ... Bump media from 1.2.1 to 1.3.0	2021-04-09 16:38:39 +02:00
Benoit Marty	388e4eb112	Merge pull request #3137 from vector-im/dependabot/gradle/daggerVersion-2.34 ... Bump daggerVersion from 2.33 to 2.34	2021-04-09 16:38:25 +02:00
Benoit Marty	bec6cfc46d	Version++	2021-04-09 12:42:59 +02:00
Marcus Hoffmann	1f37da276e	propagate jitsi LIBRE_BUILD exclusion rules to not pull in gms libs ... Previously jitsi only had optional dependencies being disabled by the LIBRE build flag but a while ago they introduced optional exclusion rules which don't transitively propagate to consumers of the library, so instead we need to mirror the exclusion rules from the jitsi gradle file: See: 7a64bf006e/android/sdk/build.gradle (L53) Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu> Change-Id: Ifadfef30a6b3f3040e98713fa21dbc4e2ee94a9b	2021-04-09 12:25:47 +02:00
SpiritCroc	6aa6f3e01b	Merge tag 'v1.1.3' into sc ... Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13 Conflicts: vector/src/main/res/layout/item_bottom_sheet_message_preview.xml	2021-04-09 11:57:11 +02:00
dependabot[bot]	b5b651244b	Bump firebase-messaging from 21.0.1 to 21.1.0 ... Bumps firebase-messaging from 21.0.1 to 21.1.0. Signed-off-by: dependabot[bot] <support@github.com>	2021-04-09 07:25:53 +00:00
dependabot[bot]	68efa63de4	Bump recyclerview from 1.2.0-rc01 to 1.2.0 ... Bumps recyclerview from 1.2.0-rc01 to 1.2.0. Signed-off-by: dependabot[bot] <support@github.com>	2021-04-08 07:22:33 +00:00
dependabot[bot]	3ca00969c5	Bump media from 1.2.1 to 1.3.0 ... Bumps media from 1.2.1 to 1.3.0. Signed-off-by: dependabot[bot] <support@github.com>	2021-04-08 07:22:02 +00:00
dependabot[bot]	505b01ad97	Bump daggerVersion from 2.33 to 2.34 ... Bumps `daggerVersion` from 2.33 to 2.34. Updates `dagger` from 2.33 to 2.34 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34) Updates `dagger-compiler` from 2.33 to 2.34 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-08 07:19:20 +00:00
Marcus Hoffmann	62038e8a89	propagate jitsi LIBRE_BUILD exclusion rules to not pull in gms libs ... Previously jitsi only had optional dependencies being disabled by the LIBRE build flag but a while ago they introduced optional exclusion rules which don't transitively propagate to consumers of the library, so instead we need to mirror the exclusion rules from the jitsi gradle file: See: 7a64bf006e/android/sdk/build.gradle (L53) Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>	2021-04-06 20:55:48 +02:00
Benoit Marty	7d88d038f5	Merge pull request #3102 from vector-im/dependabot/gradle/moshi_version-1.12.0 ... Bump moshi_version from 1.11.0 to 1.12.0	2021-04-06 14:22:12 +02:00
dependabot[bot]	0addb3aeee	Bump libphonenumber from 8.12.20 to 8.12.21 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.20 to 8.12.21. - [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.20...v8.12.21) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-06 07:20:12 +00:00
dependabot[bot]	fcc635ac8f	Bump moshi_version from 1.11.0 to 1.12.0 ... Bumps `moshi_version` from 1.11.0 to 1.12.0. Updates `moshi-adapters` from 1.11.0 to 1.12.0 - [Release notes](https://github.com/square/moshi/releases) - [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0) Updates `moshi-kotlin-codegen` from 1.11.0 to 1.12.0 - [Release notes](https://github.com/square/moshi/releases) - [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-02 07:19:53 +00:00
Benoit Marty	c0913711d6	Merge pull request #3059 from vector-im/dependabot/gradle/epoxy_version-4.4.4 ... Bump epoxy_version from 4.4.3 to 4.4.4	2021-03-31 17:57:05 +02:00
dependabot[bot]	57df510ecb	Bump stetho from 1.5.1 to 1.6.0 ... Bumps [stetho](https://github.com/facebook/stetho) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/facebook/stetho/releases) - [Changelog](https://github.com/facebook/stetho/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/stetho/compare/v1.5.1...v1.6.0) Signed-off-by: dependabot[bot] <support@github.com>	2021-03-31 06:58:20 +00:00
dependabot[bot]	980d057b4a	Bump epoxy_version from 4.4.3 to 4.4.4 ... Bumps `epoxy_version` from 4.4.3 to 4.4.4. Updates `epoxy` from 4.4.3 to 4.4.4 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4) Updates `epoxy-glide-preloading` from 4.4.3 to 4.4.4 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4) Updates `epoxy-processor` from 4.4.3 to 4.4.4 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4) Updates `epoxy-paging` from 4.4.3 to 4.4.4 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4) Signed-off-by: dependabot[bot] <support@github.com>	2021-03-29 14:46:27 +00:00
Benoit Marty	11a56dacb6	Merge pull request #3054 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.2 ... Bump fragment-ktx from 1.3.0 to 1.3.2	2021-03-25 13:57:02 +01:00
dependabot[bot]	ee1059f1db	Bump fragment-ktx from 1.3.0 to 1.3.2 ... Bumps fragment-ktx from 1.3.0 to 1.3.2. Signed-off-by: dependabot[bot] <support@github.com>	2021-03-25 06:33:50 +00:00
dependabot[bot]	30515492ca	Bump recyclerview from 1.2.0-beta02 to 1.2.0-rc01 ... Bumps recyclerview from 1.2.0-beta02 to 1.2.0-rc01. Signed-off-by: dependabot[bot] <support@github.com>	2021-03-25 06:31:57 +00:00
dependabot[bot]	973e111dad	Bump epoxy_version from 4.4.2 to 4.4.3 ... Bumps `epoxy_version` from 4.4.2 to 4.4.3. Updates `epoxy` from 4.4.2 to 4.4.3 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/commits) Updates `epoxy-glide-preloading` from 4.4.2 to 4.4.3 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/commits) Updates `epoxy-processor` from 4.4.2 to 4.4.3 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/commits) Updates `epoxy-paging` from 4.4.2 to 4.4.3 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/commits) Signed-off-by: dependabot[bot] <support@github.com>	2021-03-18 12:12:17 +00:00
Benoit Marty	2f2bc758d7	Merge pull request #3022 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.20 ... Bump libphonenumber from 8.12.19 to 8.12.20	2021-03-18 13:11:41 +01:00
Benoit Marty	3078adf0da	Version++	2021-03-18 10:40:33 +01:00
dependabot[bot]	8e85d5515d	Bump libphonenumber from 8.12.19 to 8.12.20 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.19 to 8.12.20. - [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.19...v8.12.20) Signed-off-by: dependabot[bot] <support@github.com>	2021-03-18 07:18:33 +00:00
Benoit Marty	5edf7ca520	Version++	2021-03-16 22:31:25 +01:00
SpiritCroc	699ad4eaeb	Merge tag 'v1.1.1' into sc ... Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.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/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/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/MessageInformationData.kt vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt vector/src/main/res/drawable/rounded_rect_shape.xml vector/src/main/res/menu/menu_timeline.xml vector/src/main/res/values/array.xml vector/src/main/res/xml/vector_settings_preferences.xml	2021-03-14 10:58:57 +01:00
Benoit Marty	b5fa61c8aa	Merge pull request #2983 from vector-im/dependabot/gradle/com.schibsted.spain-barista-3.9.0 ... Bump barista from 3.8.0 to 3.9.0	2021-03-11 22:44:54 +01:00
Benoit Marty	4b8c59a23b	Fix crash on ViewSource of event	2021-03-11 14:14:55 +01:00
dependabot[bot]	507eba3ddb	Bump barista from 3.8.0 to 3.9.0 ... Bumps barista from 3.8.0 to 3.9.0. Signed-off-by: dependabot[bot] <support@github.com>	2021-03-10 21:08:12 +00:00
Benoit Marty	4e3ad91c67	Version++	2021-03-10 22:05:31 +01:00
Benoit Marty	263ad899d8	Setup com.likethesalad.android:string-reference to have compilation time build of Strings resource with the app_name	2021-03-03 17:30:57 +01:00
Onuray Sahin	8b39eabc0f	Code review fixes.	2021-03-02 18:50:43 +01:00
Onuray Sahin	a623395585	Code review fixes.	2021-03-02 18:50:43 +01:00
Onuray Sahin	ae648c3e11	Make outbound key sharing strategy configurable.	2021-03-02 18:49:11 +01:00
dependabot[bot]	a9f923591d	Bump barista from 3.7.0 to 3.8.0 ... Bumps barista from 3.7.0 to 3.8.0. Signed-off-by: dependabot[bot] <support@github.com>	2021-03-02 15:32:08 +00:00
Benoit Marty	7d7e4a0e6d	Merge pull request #2945 from vector-im/dependabot/gradle/big_image_viewer_version-1.7.1 ... Bump big_image_viewer_version from 1.7.0 to 1.7.1	2021-03-02 16:30:57 +01:00
dependabot[bot]	161804be0d	Bump big_image_viewer_version from 1.7.0 to 1.7.1 ... Bumps `big_image_viewer_version` from 1.7.0 to 1.7.1. Updates `BigImageViewer` from 1.7.0 to 1.7.1 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1) Updates `GlideImageLoader` from 1.7.0 to 1.7.1 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1) Updates `ProgressPieIndicator` from 1.7.0 to 1.7.1 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1) Updates `GlideImageViewFactory` from 1.7.0 to 1.7.1 - [Release notes](https://github.com/Piasy/BigImageViewer/releases) - [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md) - [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1) Signed-off-by: dependabot[bot] <support@github.com>	2021-03-02 10:39:41 +00:00
Benoit Marty	32e7845c2b	Merge pull request #2943 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.19 ... Bump libphonenumber from 8.12.18 to 8.12.19	2021-03-02 11:39:38 +01:00
dependabot[bot]	8c87716013	Bump libphonenumber from 8.12.18 to 8.12.19 ... Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.18 to 8.12.19. - [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.18...v8.12.19) Signed-off-by: dependabot[bot] <support@github.com>	2021-03-02 06:59:54 +00:00
dependabot[bot]	5f29668c27	Bump epoxy_version from 4.4.1 to 4.4.2 ... Bumps `epoxy_version` from 4.4.1 to 4.4.2. Updates `epoxy` from 4.4.1 to 4.4.2 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/commits) Updates `epoxy-glide-preloading` from 4.4.1 to 4.4.2 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/commits) Updates `epoxy-processor` from 4.4.1 to 4.4.2 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/commits) Updates `epoxy-paging` from 4.4.1 to 4.4.2 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/commits) Signed-off-by: dependabot[bot] <support@github.com>	2021-03-02 06:57:55 +00:00
Benoit Marty	f7bcc521d2	Merge pull request #2917 from vector-im/dependabot/gradle/epoxy_version-4.4.1 ... Bump epoxy_version from 4.4.0 to 4.4.1	2021-03-01 10:56:22 +01:00
Benoit Marty	3a20792668	Merge pull request #2918 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0-beta02 ... Bump recyclerview from 1.2.0-beta01 to 1.2.0-beta02	2021-03-01 10:56:10 +01:00
SpiritCroc	ff08370cd7	Increment version ... Change-Id: I8bf35900b2ab99c1cacd7d360ce653918cea200b	2021-02-26 12:59:31 +01:00
dependabot[bot]	f6123d8dfd	Bump daggerVersion from 2.32 to 2.33 ... Bumps `daggerVersion` from 2.32 to 2.33. Updates `dagger` from 2.32 to 2.33 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.32...dagger-2.33) Updates `dagger-compiler` from 2.32 to 2.33 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.32...dagger-2.33) Signed-off-by: dependabot[bot] <support@github.com>	2021-02-26 07:14:10 +00:00
dependabot[bot]	8c23b0561b	Bump recyclerview from 1.2.0-beta01 to 1.2.0-beta02 ... Bumps recyclerview from 1.2.0-beta01 to 1.2.0-beta02. Signed-off-by: dependabot[bot] <support@github.com>	2021-02-25 07:20:31 +00:00
dependabot[bot]	6ec8be0d35	Bump epoxy_version from 4.4.0 to 4.4.1 ... Bumps `epoxy_version` from 4.4.0 to 4.4.1. Updates `epoxy` from 4.4.0 to 4.4.1 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1) Updates `epoxy-glide-preloading` from 4.4.0 to 4.4.1 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1) Updates `epoxy-processor` from 4.4.0 to 4.4.1 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1) Updates `epoxy-paging` from 4.4.0 to 4.4.1 - [Release notes](https://github.com/airbnb/epoxy/releases) - [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1) Signed-off-by: dependabot[bot] <support@github.com>	2021-02-25 07:18:51 +00:00
dependabot[bot]	76923ad88a	Bump alerter from 5.1.2 to 7.0.1 ... Bumps [alerter](https://github.com/Tapadoo/Alerter) from 5.1.2 to 7.0.1. - [Release notes](https://github.com/Tapadoo/Alerter/releases) - [Changelog](https://github.com/Tapadoo/Alerter/blob/master/CHANGELOG.md) - [Commits](https://github.com/Tapadoo/Alerter/commits) Signed-off-by: dependabot[bot] <support@github.com>	2021-02-21 16:16:55 +01:00
dependabot[bot]	4465d87eb8	Bump browser from 1.2.0 to 1.3.0 ... Bumps browser from 1.2.0 to 1.3.0. Signed-off-by: dependabot[bot] <support@github.com>	2021-02-21 11:10:00 +01:00
Benoit Marty	370651ab56	Dependabot will create only 1 PR to upgrade RxBinding dependencies	2021-02-21 10:43:35 +01:00
Benoit Marty	c985639691	Merge pull request #2883 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0-beta01 ... Bump recyclerview from 1.2.0-alpha06 to 1.2.0-beta01	2021-02-21 00:09:48 +01:00
Benoit Marty	580c48d4f9	Merge pull request #2868 from vector-im/dependabot/gradle/com.google.android-flexbox-2.0.1 ... Bump flexbox from 1.1.1 to 2.0.1	2021-02-21 00:09:15 +01:00
Benoit Marty	e612e66ac9	Merge pull request #2865 from vector-im/dependabot/gradle/com.jakewharton.rxbinding3-rxbinding-material-3.1.0 ... Bump rxbinding-material from 3.0.0 to 3.1.0	2021-02-21 00:08:16 +01:00
Benoit Marty	ec2493c03c	Merge pull request #2869 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.0 ... Bump fragment-ktx from 1.3.0-beta01 to 1.3.0	2021-02-21 00:07:56 +01:00
Benoit Marty	4a510d583d	Merge pull request #2876 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.5.0 ... Bump work-runtime-ktx from 2.4.0 to 2.5.0	2021-02-21 00:07:28 +01:00
Benoit Marty	ff4643be8c	Merge pull request #2858 from vector-im/dependabot/gradle/io.reactivex.rxjava2-rxkotlin-2.4.0 ... Bump rxkotlin from 2.3.0 to 2.4.0	2021-02-21 00:07:01 +01:00
SpiritCroc	ca0b360875	Merge tag 'v1.1.0' into sc ... Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6 Conflicts: vector/build.gradle 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/room/breadcrumbs/BreadcrumbsItem.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/item/AbsBaseMessageItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt vector/src/main/res/drawable/oval_positive.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/dialog_disclaimer_content.xml vector/src/main/res/layout/fragment_login_splash.xml vector/src/main/res/layout/item_generic_with_value.xml vector/src/main/res/layout/item_timeline_event_media_message_stub.xml vector/src/main/res/menu/menu_timeline.xml vector/src/main/res/values/array.xml	2021-02-20 15:41:01 +01:00
Benoit Marty	5a54899835	Merge pull request #2866 from vector-im/dependabot/gradle/big_image_viewer_version-1.7.0 ... Bump big_image_viewer_version from 1.6.2 to 1.7.0	2021-02-20 11:29:08 +01:00
Benoit Marty	183c104ff3	Merge pull request #2874 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.4.0 ... Bump zxcvbn from 1.2.7 to 1.4.0	2021-02-20 11:26:34 +01:00