Commit Graph

1090 Commits

Author SHA1 Message Date
Benoit Marty 9e106990c8 Setup knit 2022-05-16 12:23:10 +02:00
Benoit Marty 04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 18:23:51 +02:00
Benoit Marty 67cd82385a Fix warning: w: '-Xopt-in' is deprecated and will be removed in a future release, please use -opt-in instead 2022-05-10 16:07:24 +02:00
Benoit Marty 396d13c3f9
Merge pull request #6001 from vector-im/dependabot/gradle/androidx.media-media-1.6.0
Bump media from 1.4.3 to 1.6.0
2022-05-10 09:58:06 +02:00
dependabot[bot] 71b45947cb
Bump emoji2 from 1.0.1 to 1.1.0
Bumps emoji2 from 1.0.1 to 1.1.0.

---
updated-dependencies:
- dependency-name: androidx.emoji2:emoji2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 23:10:49 +00:00
dependabot[bot] 427a548e8b
Bump media from 1.4.3 to 1.6.0
Bumps media from 1.4.3 to 1.6.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>
2022-05-09 23:08:08 +00:00
Benoit Marty 07c22e7a19
Merge pull request #5988 from vector-im/dependabot/gradle/com.arthenica-ffmpeg-kit-audio-4.5.1-1
Bump ffmpeg-kit-audio from 4.5.LTS to 4.5.1-1
2022-05-09 22:04:19 +02:00
Benoit Marty 96b0a3f760
Merge pull request #5986 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.7.0
Bump zxcvbn from 1.5.2 to 1.7.0
2022-05-09 17:02:10 +02:00
Benoit Marty c9677c8b5a
LTS version 2022-05-09 15:36:20 +02:00
Benoit Marty 9b4c861545
(try to) ensure LTS version will not be removed by mistake 2022-05-09 15:36:10 +02:00
dependabot[bot] d567796928
Bump ffmpeg-kit-audio from 4.5.LTS to 4.5.1-1
Bumps [ffmpeg-kit-audio](https://github.com/tanersener/ffmpeg-kit) from 4.5.LTS to 4.5.1-1.
- [Release notes](https://github.com/tanersener/ffmpeg-kit/releases)
- [Commits](https://github.com/tanersener/ffmpeg-kit/commits)

---
updated-dependencies:
- dependency-name: com.arthenica:ffmpeg-kit-audio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 13:26:46 +00:00
dependabot[bot] 24e36eb8af
Bump zxcvbn from 1.5.2 to 1.7.0
Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.5.2 to 1.7.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.5.2...1.7.0)

---
updated-dependencies:
- dependency-name: com.nulab-inc:zxcvbn
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 13:25:08 +00:00
dependabot[bot] 718516a0c3
Bump lazythreetenbp from 0.9.0 to 0.10.0
Bumps [lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp) from 0.9.0 to 0.10.0.
- [Release notes](https://github.com/gabrielittner/lazythreetenbp/releases)
- [Changelog](https://github.com/gabrielittner/lazythreetenbp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gabrielittner/lazythreetenbp/compare/0.9.0...0.10.0)

---
updated-dependencies:
- dependency-name: com.gabrielittner.threetenbp:lazythreetenbp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 13:24:03 +00:00
SpiritCroc 9d6749f8cb Increment version
Change-Id: Ieb63a5f1f3f14f11ef0f874b45f74d95e14240b6
2022-05-09 12:41:04 +02:00
dependabot[bot] 6668814ab6
Bump libphonenumber from 8.12.47 to 8.12.48
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.47 to 8.12.48.
- [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.47...v8.12.48)

---
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-05-05 23:09:00 +00:00
SpiritCroc 4617d2d698 Merge tag 'v1.4.14' into sc
v1.4.14

Change-Id: I3667009380f1e35ce05c75c3769e62e3446212db

Conflicts:
	.editorconfig
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.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/session/room/send/LocalEchoEventFactory.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/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/receiver/BackgroundSyncStarter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.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/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.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/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.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/SpaceSummaryController.kt
2022-05-05 17:41:26 +02:00
ganfra 83f8a8f278 Bump version to 1.4.16 2022-05-05 11:34:12 +02:00
SpiritCroc 99053e8467 Support inline images in the timeline
Change-Id: I4af76058b400e9a0bf7c10e4ad98b7c7fb5015c1
2022-04-29 15:28:02 +02:00
SpiritCroc 9a8efb0ef8 Increment version
Change-Id: I3a73a0e2d2956d2e7bdc8efa5a308e89f6411bb7
2022-04-29 09:50:04 +02:00
SpiritCroc e450d4e9ce Merge tag 'v1.4.13' into sc
Change-Id: I308735bb5d47ae39a73437926180f563cc1a7391
2022-04-26 17:46:15 +02:00
Benoit Marty b2f9d6778a Version hotfix 1.4.13 2022-04-26 11:29:40 +02:00
SpiritCroc d44cb85dc7 Merge tag 'v1.4.12' into sc
Change-Id: I499d1a654345d59b01881da90e8f5b529ef4dfd2

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
	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/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
	vector/src/main/java/im/vector/app/AppStateHandler.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/room/detail/RoomDetailViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/layout/item_space_beta_header.xml
2022-04-24 11:15:52 +02:00
dependabot[bot] ed0ef4ad81
Bump libphonenumber from 8.12.46 to 8.12.47
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.46 to 8.12.47.
- [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.46...v8.12.47)

---
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-04-20 23:08:25 +00:00
Adam Brown 441751a6ec updating release version in preparation for next cycle 2022-04-20 15:03:46 +01:00
Olivér Falvai 2bbecd4cc5 Fix regressions 2022-04-17 11:35:30 +02:00
SpiritCroc 616a121ccf Increment version
Change-Id: I384a270af4f41a76e9aeecd043eb5122b9306489
2022-04-16 08:58:58 +02:00
Olivér Falvai a8bbf29b42 Remove unused dependencies 2022-04-15 22:50:54 +02:00
Maxime NATUREL 9d2c704aef Removing the BuildConfigField 2022-04-13 10:56:20 +02:00
aringenbach 047a45d77f
Add a setting to be able to always appear offline (#5583)
Add a setting to be able to always appear offline
Move presence enabling to a app-only preference
2022-04-12 12:08:56 +02:00
SpiritCroc 7c35f5fda5 Merge tag 'v1.4.11' into sc
Change-Id: I454f1ec4f1df6366065d5690d9704eb1bd573c2d

Conflicts:
	dependencies_groups.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/menu/menu_timeline.xml
2022-04-12 11:57:16 +02:00
Benoit Marty 0e1c587eff Version 1.4.11 2022-04-07 17:58:25 +02:00
Benoit Marty c849cc5c5d
Merge pull request #5079 from vector-im/feature/bma/konfetti2
WIP and low priority: upgrade konfetti to 2.0.2
2022-04-06 10:00:09 +02:00
Benoit Marty 02401f7f3d Version++ 2022-04-05 22:37:16 +02:00
Benoit Marty a0899477e9 Try with 2.0.2 2022-04-04 15:19:26 +02:00
Benoit Marty 9050c488e4 konfetti 2.0.1
Does not compile
2022-04-04 15:19:26 +02:00
dependabot[bot] 224eb7a968
Bump libphonenumber from 8.12.45 to 8.12.46
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.45 to 8.12.46.
- [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.45...v8.12.46)

---
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-03-31 23:08:28 +00:00
Benoit Marty 9a2cc1a4c5
Merge pull request #5664 from vector-im/feature/bma/dep_upgrade
Upgrade Jitsi and ktlint
2022-03-31 11:32:14 +02:00
SpiritCroc d5d555d07f Merge tag 'v1.4.8' into merge-v1.4.8
Change-Id: Ic6338fef4f27ca95016eb11ab07a10d3f3a8986e

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	library/ui-styles/src/main/res/values/styles_buttons.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.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/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.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/timeline/action/MessageActionsViewModel.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/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.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/RoomsSection.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
	vector/src/main/res/drawable/ic_home_bottom_catchup.xml
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
	vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
	vector/src/main/res/layout/fragment_ftue_account_created.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/view_attachment_type_selector.xml
	vector/src/main/res/layout/view_room_detail_toolbar.xml
	vector/src/main/res/menu/menu_submit.xml
2022-03-30 15:53:51 +02:00
Benoit Marty 587948c1b9 Bump Jitsi lib from 5.0.1 to 5.0.2
https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md#502-2022-03-29
2022-03-29 18:24:44 +02:00
Benoit Marty 0d2d1339e0 Bump Jitsi lib from 3.10.0 to 5.0.1 2022-03-29 16:29:35 +02:00
ganfra ebee66cfaf Update versions to 1.4.10 2022-03-28 16:37:24 +02:00
Adam Brown e01c5049f6 updating version to 1.4.8 2022-03-28 09:46:26 +01:00
ganfra 70e5698082 Update versions to 1.4.7 2022-03-24 15:41:35 +01:00
ganfra adf2c642da Update versions to 1.4.8 2022-03-23 16:27:36 +01:00
Onuray Sahin c478503c13 Merge branch 'develop' into feature/ons/voice_message_scrubbing
* develop: (429 commits)
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  PR remarks
  Increase the thread summaries limit
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
2022-03-23 13:32:36 +03:00
SpiritCroc 45d16e16d2 Increment version
Change-Id: I32ebcef22a33d864d1ed43a161413a9029c5b462
2022-03-19 11:52:53 +01:00
SpiritCroc b2dd42ac6e Increment version
Change-Id: Ic672c3b2f370fc0d69d6168aa9d9ec839498d084
2022-03-19 10:24:10 +01:00
Maxime NATUREL 3547c5acba
Merge pull request #5565 from vector-im/feature/mna/PSF-664-5536-permissions
Live Location Sharing - Background permission
2022-03-18 12:06:30 +01:00
Arnaud Ringenbach d3459d1d3d Use MatrixConfiguration & move presence sync enabled checks out of view 2022-03-17 14:50:15 +01:00
Arnaud Ringenbach 4bcf31e0c2 Add a presence sync enabling build config 2022-03-17 11:43:07 +01:00
Maxime Naturel 9c6cd9f630 Adding build config field 2022-03-15 17:45:26 +01:00
Maxime Naturel 0aaa650ac3 Using flow to show items counter 2022-03-14 11:15:17 +01:00
dependabot[bot] 2d5638baaf
Bump libphonenumber from 8.12.44 to 8.12.45
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.44 to 8.12.45.
- [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.44...v8.12.45)

---
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-03-10 23:09:19 +00:00
SpiritCroc f5afdefe2f Merge tag 'v1.4.4' into sc
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	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/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/res/drawable/bg_unread_notification.xml
	vector/src/main/res/drawable/ic_add_reaction_small.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2022-03-10 13:26:09 +01:00
Adam Brown 60bc3b09b7 updating to version 1.4.6 in prep for next release cycle 2022-03-09 16:03:00 +00:00
Onuray Sahin 2c611790db
Merge branch 'develop' into feature/ons/voice_message_scrubbing 2022-03-04 18:03:44 +03:00
SpiritCroc 2f5df9133f Merge tag 'v1.4.2' into sc
Change-Id: I8a96211645ff31284897d818ce93c7b5571fbd0f

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	library/ui-styles/src/main/res/values/theme_black.xml
	library/ui-styles/src/main/res/values/theme_dark.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.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/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/html/PillImageSpan.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/res/layout/item_room.xml
	vector/src/main/res/values/config.xml
2022-03-04 11:42:30 +01:00
Yoan Pintas 6e6b04c57e
Merge pull request #4498 from vector-im/yostyle/fix_strandhogg
Override task affinity to prevent unknown activities running in our app tasks.
2022-03-03 15:05:29 +01:00
Onuray Sahin 243a714586 Remove 3rd party waveform library. 2022-03-02 17:46:09 +03:00
ariskotsomitopoulos ae98185c9d Cleanup enabling threads from buildConfig 2022-02-28 17:39:40 +02:00
Benoit Marty fbd5456360
Merge pull request #5353 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.44
Bump libphonenumber from 8.12.43 to 8.12.44
2022-02-28 09:58:18 +01:00
Benoit Marty 85b59654ae Remove unused strings in build.gradle. Rely on BuildConfig fields only 2022-02-25 13:45:24 +01:00
dependabot[bot] ca56865dd1
Bump libphonenumber from 8.12.43 to 8.12.44
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.43 to 8.12.44.
- [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.43...v8.12.44)

---
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-02-24 23:10:16 +00:00
Benoit Marty d93199259a Update plugin to generated string with template from `com.likethesalad.android:string-reference:1.2.2` to `com.likethesalad.android:stem-plugin:2.0.0` 2022-02-24 15:25:30 +01:00
Benoit Marty 96c2c6f4a4 Move file config.xml to the module vector-config 2022-02-23 18:10:08 +01:00
Benoit Marty 924a4f8c94
Merge pull request #5309 from vector-im/feature/eric/modules-to-subfolder
#5289:  Moves modules to subfolders under library
2022-02-22 22:58:14 +01:00
Benoit Marty cc77afbf66 Version++ 2022-02-22 21:33:20 +01:00
ericdecanini 4651c45b2f moves multipicker module to library 2022-02-22 19:48:48 +01:00
ericdecanini c1afb3d5d1 moves attachment-viewer module to library 2022-02-22 19:44:30 +01:00
ericdecanini b4ceaefeab moves diff-match-patch module to library 2022-02-22 19:40:17 +01:00
SpiritCroc fd9032e89c Use legacy login
Change-Id: I9e5b6cdd85eb5eef0fd650904baab1a1705d8579
2022-02-20 11:58:11 +01:00
SpiritCroc ecd28447c9 Merge tag 'v1.4.0' into sc
Change-Id: If953d524434cd8a7073a16014f4ec6850b72a226

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/drawable/ic_filter.xml
	vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_notice_stub.xml
	vector/src/main/res/layout/item_timeline_event_voice_stub.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/menu/menu_timeline.xml
2022-02-19 10:55:47 +01:00
dependabot[bot] 002332496a
Bump libphonenumber from 8.12.42 to 8.12.43
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.42 to 8.12.43.
- [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.42...v8.12.43)

---
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-02-09 23:11:56 +00:00
ganfra c28a20dce3 Bump versions to 1.4.2 2022-02-09 12:55:33 +01:00
ganfra a6bf921d64 Release: update versions 2022-02-09 11:18:03 +01:00
Aris Kotsomitopoulos 077c0eea98
Revert "AGP 7.1.0" 2022-02-04 12:20:20 +02:00
Benoit Marty aa12a73a05 Version++ 2022-02-03 15:51:04 +01:00
Aris Kotsomitopoulos 3d5f8ed7e7
Merge pull request #4746 from vector-im/feature/aris/threads
Threads P0 Release
2022-02-01 15:58:32 +02:00
Benoit Marty 79b4c76a09
Merge pull request #5082 from vector-im/feature/bma/agp_7_1_0
AGP 7.1.0
2022-02-01 13:57:15 +01:00
Benoit Marty 3a040aaee2
Update vector/build.gradle 2022-01-31 17:17:37 +01:00
dependabot[bot] 3caf81d07e
Bump ucrop from 2.2.7 to 2.2.8-native
Bumps [ucrop](https://github.com/Yalantis/uCrop) from 2.2.7 to 2.2.8-native.
- [Release notes](https://github.com/Yalantis/uCrop/releases)
- [Commits](https://github.com/Yalantis/uCrop/compare/2.2.7...2.2.8-native)

---
updated-dependencies:
- dependency-name: com.github.yalantis:ucrop
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-31 15:22:21 +00:00
ariskotsomitopoulos d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Benoit Marty 7dad08654b Revert "Downgrade the version to 1.3.17 to prepare a corrective release."
This reverts commit 2efa67e587.
2022-01-31 14:53:43 +01:00
Benoit Marty 2efa67e587 Downgrade the version to 1.3.17 to prepare a corrective release. 2022-01-31 14:48:54 +01:00
SpiritCroc a9d5700d2b Merge tag 'v1.3.16' into sc
Change-Id: I8b3937f4ac30d3e72e2cb694eee2dc5bf034cb75

Conflicts:
	gradle.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/layout/activity_call.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/values/config.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-01-29 12:18:19 +01:00
SpiritCroc beb2b1e8a0 [merge] Use Java 11 again
Change-Id: I3cc03216236097f4ba7b9de320fc927a603885a3
2022-01-29 10:35:54 +01:00
dependabot[bot] c07b09c727
Bump libphonenumber from 8.12.41 to 8.12.42
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.41 to 8.12.42.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.41...v8.12.42)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-27 23:11:05 +00:00
ariskotsomitopoulos b2a2fe2710 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
2022-01-27 17:11:26 +02:00
Benoit Marty 4aff1ab017 AGP 7.1.0 2022-01-27 16:08:47 +01:00
Benoit Marty d127e0c39d Fix buildkite build 2022-01-26 11:55:44 +01:00
Benoit Marty fe5109fead Version++ 2022-01-25 21:48:18 +01:00
Benoit Marty b619f70904 Merge branch 'develop' into feature/ons/static_location 2022-01-25 14:29:13 +01:00
Onuray Sahin 9516e379ea Keep build settings to enable location sharing for possible use cases of forks. 2022-01-24 18:49:49 +03:00
Onuray Sahin 3994373387 Delabs location sharing. 2022-01-24 15:27:20 +03:00
SpiritCroc dc42d7e8d7 Increment version
Change-Id: I01f0938a9b54bd0b8f00e6200389765aee68e306
2022-01-22 11:08:15 +01:00
Benoit Marty 194a584e4c Merge branch hotfix/1.3.15 2022-01-18 14:21:09 +01:00
Benoit Marty ea8465f5f3 Version 1.3.15 for hotfix release 2022-01-18 14:06:02 +01:00
Benoit Marty bdd30e3b8f Fix crash when viewing source which contains an emoji.
Import source of jsonviewer as a module of this project.
2022-01-18 12:04:06 +01:00
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