Commit Graph

246 Commits

Author SHA1 Message Date
dependabot[bot] ea274c4df6 Bump appcompat from 1.4.2 to 1.5.0
Bumps appcompat from 1.4.2 to 1.5.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-16 23:00:39 +02:00
dependabot[bot] e86b72b8db
Bump appDistribution from 16.0.0-beta03 to 16.0.0-beta04
Bumps `appDistribution` from 16.0.0-beta03 to 16.0.0-beta04.

Updates `firebase-appdistribution-api-ktx` from 16.0.0-beta03 to 16.0.0-beta04

Updates `firebase-appdistribution` from 16.0.0-beta03 to 16.0.0-beta04

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-appdistribution-api-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.firebase:firebase-appdistribution
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-15 23:11:49 +00:00
dependabot[bot] 125339a164
Bump flipper from 0.163.0 to 0.164.0
Bumps `flipper` from 0.163.0 to 0.164.0.

Updates `flipper` from 0.163.0 to 0.164.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.163.0...v0.164.0)

Updates `flipper-network-plugin` from 0.163.0 to 0.164.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.163.0...v0.164.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-12 23:10:32 +00:00
Benoit Marty 2a59533818
Merge pull request #7082 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.55
Bump libphonenumber from 8.12.54 to 8.12.55
2022-09-12 17:29:44 +02:00
SpiritCroc bc1f3cb24d Merge tag 'v1.4.36' into merge-v1.4.36
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5

Conflicts:
	library/ui-strings/src/main/res/values-bg/strings_sc.xml
	library/ui-strings/src/main/res/values-cs/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
	library/ui-strings/src/main/res/values-es/strings_sc.xml
	library/ui-strings/src/main/res/values-et/strings_sc.xml
	library/ui-strings/src/main/res/values-eu/strings_sc.xml
	library/ui-strings/src/main/res/values-fa/strings_sc.xml
	library/ui-strings/src/main/res/values-fr/strings_sc.xml
	library/ui-strings/src/main/res/values-hu/strings_sc.xml
	library/ui-strings/src/main/res/values-it/strings_sc.xml
	library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
	library/ui-strings/src/main/res/values-nl/strings_sc.xml
	library/ui-strings/src/main/res/values-pl/strings_sc.xml
	library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
	library/ui-strings/src/main/res/values-ro/strings_sc.xml
	library/ui-strings/src/main/res/values-ru/strings_sc.xml
	library/ui-strings/src/main/res/values-sk/strings_sc.xml
	library/ui-strings/src/main/res/values-sv/strings_sc.xml
	library/ui-strings/src/main/res/values-tr/strings_sc.xml
	library/ui-strings/src/main/res/values-vi/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
	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/sync/SyncResponseHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.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/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.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/spaces/SubSpaceSummaryItem.kt
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2022-09-10 15:24:40 +02:00
dependabot[bot] b4d72d2219
Bump flipper from 0.162.0 to 0.163.0
Bumps `flipper` from 0.162.0 to 0.163.0.

Updates `flipper` from 0.162.0 to 0.163.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.162.0...v0.163.0)

Updates `flipper-network-plugin` from 0.162.0 to 0.163.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.162.0...v0.163.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-08 23:09:02 +00:00
dependabot[bot] b66c405430
Bump libphonenumber from 8.12.54 to 8.12.55
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.54 to 8.12.55.
- [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.54...v8.12.55)

---
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-09-08 23:08:41 +00:00
Adam Brown 5c994ebfdd lifting the phonenumber dependency to the deps file and exposing as api for the app level module 2022-08-31 09:16:00 +01:00
dependabot[bot] 19ed871627
Bump flipper from 0.161.0 to 0.162.0
Bumps `flipper` from 0.161.0 to 0.162.0.

Updates `flipper` from 0.161.0 to 0.162.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.161.0...v0.162.0)

Updates `flipper-network-plugin` from 0.161.0 to 0.162.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.161.0...v0.162.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-26 14:15:16 +00:00
Florian Renaud c96343f1d7 Persists CreateRoomParams into LocalRoomSummaryEntity 2022-08-25 13:57:49 +02:00
SpiritCroc e6023c6bae Merge tag 'v1.4.34' into sc
Change-Id: I7e1939f6c87e14d1497433a9bad4f97e074bb838

Conflicts:
	vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
	vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/layout/fragment_login_server_url_form_2.xml
	vector/src/main/res/layout/fragment_room_list.xml
2022-08-24 10:14:36 +02:00
dependabot[bot] ce87795520
Bump flipper from 0.157.0 to 0.161.0
Bumps `flipper` from 0.157.0 to 0.161.0.

Updates `flipper` from 0.157.0 to 0.161.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.157.0...v0.161.0)

Updates `flipper-network-plugin` from 0.157.0 to 0.161.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.157.0...v0.161.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-19 23:09:53 +00:00
Benoit Marty 4485673db9
Merge pull request #6734 from vector-im/dependabot/gradle/flipper-0.157.0
Bump flipper from 0.156.0 to 0.157.0
2022-08-17 17:03:01 +02:00
dependabot[bot] fde0039027
Bump fragment from 1.5.1 to 1.5.2
Bumps `fragment` from 1.5.1 to 1.5.2.

Updates `fragment-ktx` from 1.5.1 to 1.5.2

Updates `fragment-testing` from 1.5.1 to 1.5.2

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-10 23:11:18 +00:00
SpiritCroc 5d1722054e Merge tag 'v1.4.32' into sc
Change-Id: Ib3724625b1aada2541e030f9fdaf47a032538c85

Conflicts:
	.gitignore
	library/ui-styles/src/main/res/values/styles_toolbar.xml
	vector/build.gradle
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/list/RoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_timeline.xml
2022-08-10 17:07:09 +02:00
dependabot[bot] 7bf8a41959
Bump flipper from 0.156.0 to 0.157.0
Bumps `flipper` from 0.156.0 to 0.157.0.

Updates `flipper` from 0.156.0 to 0.157.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.156.0...v0.157.0)

Updates `flipper-network-plugin` from 0.156.0 to 0.157.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.156.0...v0.157.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-03 23:09:11 +00:00
Maxime NATUREL 21e88efaff
Merge pull request #6657 from vector-im/dependabot/gradle/fragment-1.5.1
Bump fragment from 1.5.0 to 1.5.1
2022-08-01 10:29:50 +02:00
SpiritCroc 9b44975635 Merge tag 'v1.4.30' into sc
Change-Id: Ia43ff3781ad84699eb36fba937f7213d47fc0510

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultLiveLocationShareStatusItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/res/xml/vector_settings_labs.xml
2022-07-29 16:55:28 +02:00
dependabot[bot] a83f714657 Bump lifecycle from 2.5.0 to 2.5.1
Bumps `lifecycle` from 2.5.0 to 2.5.1.

Updates `lifecycle-common` from 2.5.0 to 2.5.1

Updates `lifecycle-livedata-ktx` from 2.5.0 to 2.5.1

Updates `lifecycle-process` from 2.5.0 to 2.5.1

Updates `lifecycle-runtime-ktx` from 2.5.0 to 2.5.1

---
updated-dependencies:
- dependency-name: androidx.lifecycle:lifecycle-common
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-livedata-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-process
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-runtime-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-29 15:23:30 +02:00
dependabot[bot] c20c3a741a Bump activity from 1.5.0 to 1.5.1
Bumps activity from 1.5.0 to 1.5.1.

---
updated-dependencies:
- dependency-name: androidx.activity:activity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-29 15:23:10 +02:00
dependabot[bot] 5b9c7c3b27
Bump flipper from 0.154.0 to 0.156.0
Bumps `flipper` from 0.154.0 to 0.156.0.

Updates `flipper` from 0.154.0 to 0.156.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.154.0...v0.156.0)

Updates `flipper-network-plugin` from 0.154.0 to 0.156.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.154.0...v0.156.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-27 23:09:51 +00:00
dependabot[bot] 4958b8ae7b
Bump fragment from 1.5.0 to 1.5.1
Bumps `fragment` from 1.5.0 to 1.5.1.

Updates `fragment-ktx` from 1.5.0 to 1.5.1

Updates `fragment-testing` from 1.5.0 to 1.5.1

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-27 23:09:20 +00:00
Benoit Marty a06dc55848
Merge pull request #6629 from vector-im/feature/bma/nightyl_in_app_alert
Add in-app alert to let user know if a new version is available.
2022-07-25 10:40:42 +02:00
Benoit Marty 83f3229805 Add in-app alert to let user know if a new version is available. 2022-07-22 17:29:59 +02:00
Benoit Marty bc3ab9dd11 Remove duplicated and unused dependencies. 2022-07-20 10:25:33 +02:00
Benoit Marty ba9c1dde32
Merge pull request #6551 from vector-im/dependabot/gradle/kotlinCoroutines-1.6.4
Bump kotlinCoroutines from 1.6.3 to 1.6.4
2022-07-18 18:27:54 +02:00
ganfra 0a4595df5b
Merge pull request #6552 from vector-im/dependabot/gradle/flipper-0.154.0
Bump flipper from 0.153.0 to 0.154.0
2022-07-18 15:35:37 +02:00
SpiritCroc dec61e7a35 Merge tag 'v1.4.28' into merge-v1.4.28
Change-Id: I623898b2034f132f23d2ac2dfeedb02fee16cd10

Conflicts:
	fastlane/README.md
	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/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/action/MessageActionsViewModel.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/ReadReceiptsItem.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/RoomListViewState.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/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
2022-07-17 18:52:55 +02:00
dependabot[bot] 92801f625d Bump opusencoder from 1.0.3 to 1.0.4
Bumps [opusencoder](https://github.com/vector-im/libopusencoder-android) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/vector-im/libopusencoder-android/releases)
- [Commits](https://github.com/vector-im/libopusencoder-android/compare/v1.0.3...v1.0.4)

---
updated-dependencies:
- dependency-name: io.element.android:opusencoder
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-15 10:13:35 +02:00
dependabot[bot] 4b7069f47c
Bump flipper from 0.153.0 to 0.154.0
Bumps `flipper` from 0.153.0 to 0.154.0.

Updates `flipper` from 0.153.0 to 0.154.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.153.0...v0.154.0)

Updates `flipper-network-plugin` from 0.153.0 to 0.154.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.153.0...v0.154.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-13 23:07:14 +00:00
dependabot[bot] 840b8847d9
Bump kotlinCoroutines from 1.6.3 to 1.6.4
Bumps `kotlinCoroutines` from 1.6.3 to 1.6.4.

Updates `kotlinx-coroutines-core` from 1.6.3 to 1.6.4
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.3...1.6.4)

Updates `kotlinx-coroutines-android` from 1.6.3 to 1.6.4
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.3...1.6.4)

Updates `kotlinx-coroutines-test` from 1.6.3 to 1.6.4
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.3...1.6.4)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-13 23:07:00 +00:00
Benoit Marty a806991e88
Merge pull request #6489 from vector-im/feature/bma/lib_opusencoder
Add dependency to opusencoder and remove module from this project
2022-07-11 22:39:53 +02:00
Benoit Marty a7ed2114be io.element.android:opusencoder:1.0.3 - should fix lint false positive issues 2022-07-11 17:00:17 +02:00
SpiritCroc 204e111c1c Merge tag 'v1.4.27-RC2' into merge-v1.4.27
Change-Id: I6fba3a97a37a4e0a908289272ea9dec2efc85d00

Conflicts:
	.gitignore
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.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/summary/RoomSummaryDataSource.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/TimelineChunk.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/SyncTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	tmp_sc_fastlane/README.md
	vector-config/src/main/res/values/config.xml
	vector/build.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
	vector/src/gplay/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/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.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/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
	vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.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/MergedHeaderItemFactory.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/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.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/ChronologicalRoomComparator.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/RoomListSectionBuilderGroup.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
	vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.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/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
	vector/src/main/res/xml/vector_settings_notifications.xml
2022-07-09 18:16:33 +02:00
Adam Brown 6a2a69ada6
Merge pull request #6418 from vector-im/dependabot/gradle/lifecycle-2.5.0
Bump lifecycle from 2.4.1 to 2.5.0
2022-07-08 10:00:18 +01:00
Benoit Marty dd5c343269 io.element.android:opusencoder:1.0.1 2022-07-07 20:34:27 +02:00
dependabot[bot] 7c3257942c
Bump flipper from 0.152.0 to 0.153.0
Bumps `flipper` from 0.152.0 to 0.153.0.

Updates `flipper` from 0.152.0 to 0.153.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.152.0...v0.153.0)

Updates `flipper-network-plugin` from 0.152.0 to 0.153.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.152.0...v0.153.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-06 23:05:35 +00:00
Benoit Marty e3b3617b1a Add dependency to opusencoder and remove module from this project 2022-07-06 17:54:57 +02:00
Benoit Marty c6a89c738a
Merge pull request #6419 from vector-im/dependabot/gradle/androidx.activity-activity-1.5.0
Bump activity from 1.4.0 to 1.5.0
2022-07-01 11:47:49 +02:00
Benoit Marty 529898d9fa
Merge pull request #6420 from vector-im/dependabot/gradle/fragment-1.5.0
Bump fragment from 1.4.1 to 1.5.0
2022-07-01 11:47:18 +02:00
dependabot[bot] 356718dc9a
Bump fragment from 1.4.1 to 1.5.0
Bumps `fragment` from 1.4.1 to 1.5.0.

Updates `fragment-ktx` from 1.4.1 to 1.5.0

Updates `fragment-testing` from 1.4.1 to 1.5.0

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-29 23:11:02 +00:00
dependabot[bot] 62a20ba69d
Bump activity from 1.4.0 to 1.5.0
Bumps activity from 1.4.0 to 1.5.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-29 23:10:20 +00:00
dependabot[bot] dfd8bf6c4c
Bump lifecycle from 2.4.1 to 2.5.0
Bumps `lifecycle` from 2.4.1 to 2.5.0.

Updates `lifecycle-common` from 2.4.1 to 2.5.0

Updates `lifecycle-livedata-ktx` from 2.4.1 to 2.5.0

Updates `lifecycle-process` from 2.4.1 to 2.5.0

Updates `lifecycle-runtime-ktx` from 2.4.1 to 2.5.0

---
updated-dependencies:
- dependency-name: androidx.lifecycle:lifecycle-common
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.lifecycle:lifecycle-livedata-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.lifecycle:lifecycle-process
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.lifecycle:lifecycle-runtime-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-29 23:10:12 +00:00
dependabot[bot] 85504162a5
Bump flipper from 0.151.1 to 0.152.0
Bumps `flipper` from 0.151.1 to 0.152.0.

Updates `flipper` from 0.151.1 to 0.152.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.151.1...v0.152.0)

Updates `flipper-network-plugin` from 0.151.1 to 0.152.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.151.1...v0.152.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-29 23:09:50 +00:00
Benoit Marty 667db71fb9 Avoid multiple PR from Dependabot when Flipper is upgraded. 2022-06-28 14:27:55 +02:00
Adam Brown 1cfcc18407
Merge pull request #6322 from vector-im/dependabot/gradle/androidx.annotation-annotation-1.4.0
Bump annotation from 1.3.0 to 1.4.0
2022-06-23 09:31:59 +01:00
Adam Brown 4779b78616
Merge pull request #6274 from vector-im/dependabot/gradle/mavericks-2.7.0
Bump mavericks from 2.6.1 to 2.7.0
2022-06-23 09:31:26 +01:00
dependabot[bot] 6d53bf667c
Bump kotlinCoroutines from 1.6.2 to 1.6.3
Bumps `kotlinCoroutines` from 1.6.2 to 1.6.3.

Updates `kotlinx-coroutines-core` from 1.6.2 to 1.6.3
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.2...1.6.3)

Updates `kotlinx-coroutines-android` from 1.6.2 to 1.6.3
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.2...1.6.3)

Updates `kotlinx-coroutines-test` from 1.6.2 to 1.6.3
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.2...1.6.3)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-20 23:11:06 +00:00
Jorge Martín b5aedd4626 Re-implement lock screen feature using our own implementation. 2022-06-20 17:38:05 +02:00
Benoit Marty 16ca26569f
Merge pull request #6228 from vector-im/feature/bma/unifiedPush2
UnifiedPush
2022-06-16 16:09:31 +02:00
Benoit Marty 90f16c6736 Remove unused dep. 2022-06-16 12:16:07 +02:00
dependabot[bot] 3367c059e9
Bump annotation from 1.3.0 to 1.4.0
Bumps annotation from 1.3.0 to 1.4.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-16 08:40:08 +00:00
Jorge Martín c204f41bec Try to fix tests, address review comments. 2022-06-15 11:37:50 +02:00
Jorge Martín 64334c3437 Add some tests 2022-06-15 11:34:23 +02:00
Jorge Martín 6fc278eb2b Replace ffmpeg-kit with libopus and libopusenc. 2022-06-15 11:34:23 +02:00
dependabot[bot] 53c0609c38
Bump mavericks from 2.6.1 to 2.7.0
Bumps `mavericks` from 2.6.1 to 2.7.0.

Updates `mavericks` from 2.6.1 to 2.7.0
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/commits)

Updates `mavericks-testing` from 2.6.1 to 2.7.0
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/commits)

---
updated-dependencies:
- dependency-name: com.airbnb.android:mavericks
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.airbnb.android:mavericks-testing
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 15:37:13 +00:00
sim 04b297b261 Add UnifiedPush support 2022-06-09 10:16:59 +02:00
dependabot[bot] 524dcbb3d1
Bump core-ktx from 1.7.0 to 1.8.0
Bumps core-ktx from 1.7.0 to 1.8.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>
2022-06-02 10:50:27 +00:00
dependabot[bot] 7c50720b76
Bump appcompat from 1.4.1 to 1.4.2
Bumps appcompat from 1.4.1 to 1.4.2.

---
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>
2022-06-01 23:19:50 +00:00
SpiritCroc 49663a1154 Merge tag 'v1.4.18' into sc
Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5

Conflicts:
	dependencies.gradle
	library/attachment-viewer/build.gradle
	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/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.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/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.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/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.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/media/ImageContentRenderer.kt
	vector/src/main/res/xml/vector_settings_labs.xml
2022-06-01 13:54:34 +02:00
dependabot[bot] 5934043d17
Bump material from 1.6.0 to 1.6.1
Bumps [material](https://github.com/material-components/material-components-android) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.6.0...1.6.1)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-31 23:06:50 +00:00
dependabot[bot] cb3e2b6a0c
Bump activity from 1.2.4 to 1.4.0
Bumps activity from 1.2.4 to 1.4.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-30 14:23:11 +00:00
Benoit Marty 0806e7358a
Merge pull request #5780 from ofalvai/dependency-cleanup
Remove unused dependencies
2022-05-30 15:41:10 +02:00
Benoit Marty a94bea3b91
Merge pull request #6173 from vector-im/dependabot/gradle/kotlinCoroutines-1.6.2
Bump kotlinCoroutines from 1.6.1 to 1.6.2
2022-05-30 14:23:22 +02:00
dependabot[bot] 174e1fe332
Bump vanniktechEmoji from 0.13.0 to 0.15.0
Bumps `vanniktechEmoji` from 0.13.0 to 0.15.0.

Updates `emoji-material` from 0.13.0 to 0.15.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.13.0...0.15.0)

Updates `emoji-google` from 0.13.0 to 0.15.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.13.0...0.15.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-30 07:40:59 +00:00
dependabot[bot] ff1dbf6f22
Bump kotlinCoroutines from 1.6.1 to 1.6.2
Bumps `kotlinCoroutines` from 1.6.1 to 1.6.2.

Updates `kotlinx-coroutines-core` from 1.6.1 to 1.6.2
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.1...1.6.2)

Updates `kotlinx-coroutines-android` from 1.6.1 to 1.6.2
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.1...1.6.2)

Updates `kotlinx-coroutines-test` from 1.6.1 to 1.6.2
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.1...1.6.2)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-27 23:05:23 +00:00
Olivér Falvai 9ce9ad6d3a Merge remote-tracking branch 'origin/develop' into dependency-cleanup 2022-05-26 14:04:39 +02:00
Adam Brown fdaaed430e
Merge pull request #6131 from vector-im/dependabot/gradle/vanniktechEmoji-0.13.0
Bump vanniktechEmoji from 0.9.0 to 0.13.0
2022-05-25 10:14:56 +01:00
Adam Brown b9853d1aec excluding the gms play-service-location optional transistive dependency for the fdroid variant
- fixes fdroid being unable to compile the project due to a non foss dependency

Change-Id: Ia24c07337f3da0de83b952e6e0082cf18acab357
2022-05-25 10:56:35 +02:00
Adam Brown ae9922a731
Merge pull request #6136 from vector-im/feature/adm/foss-avoid-gms-location-provider
Excluding the gms play-service-location from maplibre for fdroid builds
2022-05-25 08:59:18 +01:00
Michael Kaye 5faa2ff205 Add comment linking to an issue 2022-05-24 16:53:17 +01:00
Michael Kaye 5766414d79 Downgrade gradle from 7.2.0 to 7.1.3 2022-05-24 16:36:14 +01:00
dependabot[bot] d4af2a7a87
Bump vanniktechEmoji from 0.9.0 to 0.13.0
Bumps `vanniktechEmoji` from 0.9.0 to 0.13.0.

Updates `emoji-material` from 0.9.0 to 0.13.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.13.0)

Updates `emoji-google` from 0.9.0 to 0.13.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.13.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-24 15:26:52 +00:00
Adam Brown b4b2b97eb1
Merge pull request #6068 from vector-im/dependabot/gradle/vanniktechEmoji-0.12.0
Bump vanniktechEmoji from 0.9.0 to 0.12.0
2022-05-24 16:26:06 +01:00
Adam Brown bec72264cd excluding the gms play-service-location optional transistive dependency for the fdroid variant
- fixes fdroid being unable to compile the project due to a non foss dependency
2022-05-24 10:10:03 +01:00
dependabot[bot] 13175212a0
Bump constraintlayout from 2.1.3 to 2.1.4
Bumps [constraintlayout](https://github.com/androidx/constraintlayout) from 2.1.3 to 2.1.4.
- [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>
2022-05-20 09:55:29 +00:00
Olivér Falvai 2dcc120cf7 Merge remote-tracking branch 'origin/develop' into dependency-cleanup
# Conflicts:
#	build.gradle
#	dependencies.gradle
2022-05-18 11:47:21 +02:00
SpiritCroc 4f60963741 Merge tag 'v1.4.16' into sc
Change-Id: Ibfb03ebf80dc1403fa438a390f609f2201602ba9

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.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/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.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/roommemberprofile/RoomMemberProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-05-18 09:59:01 +02:00
dependabot[bot] 271bc91303
Bump vanniktechEmoji from 0.9.0 to 0.12.0
Bumps `vanniktechEmoji` from 0.9.0 to 0.12.0.

Updates `emoji-material` from 0.9.0 to 0.12.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.12.0)

Updates `emoji-google` from 0.9.0 to 0.12.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.12.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-16 23:08:43 +00:00
Benoit Marty 4123da8ebc
Merge pull request #5981 from vector-im/dependabot/gradle/kotlinCoroutines-1.6.1
Bump kotlinCoroutines from 1.6.0 to 1.6.1
2022-05-16 07:13:56 +02:00
dependabot[bot] d3ecc8e5c3
Bump mockk from 1.12.3 to 1.12.4
Bumps `mockk` from 1.12.3 to 1.12.4.

Updates `mockk` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4)

Updates `mockk-android` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-11 23:11:45 +00:00
Benoit Marty deb0f1ad1b
Merge pull request #6000 from vector-im/dependabot/gradle/androidx.preference-preference-ktx-1.2.0
Bump preference-ktx from 1.1.1 to 1.2.0
2022-05-11 16:17:17 +02:00
dependabot[bot] 530d43bcbb
Bump kotlinCoroutines from 1.6.0 to 1.6.1
Bumps `kotlinCoroutines` from 1.6.0 to 1.6.1.

Updates `kotlinx-coroutines-core` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.0...1.6.1)

Updates `kotlinx-coroutines-android` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.0...1.6.1)

Updates `kotlinx-coroutines-test` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.0...1.6.1)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-10 16:25:02 +00: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
dependabot[bot] e65d3ee993
Bump dagger from 2.41 to 2.42 (#5998)
* Bump dagger from 2.41 to 2.42

Bumps `dagger` from 2.41 to 2.42.

Updates `hilt-android-gradle-plugin` from 2.41 to 2.42
- [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.41...dagger-2.42)

Updates `dagger` from 2.41 to 2.42
- [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.41...dagger-2.42)

Updates `dagger-compiler` from 2.41 to 2.42
- [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.41...dagger-2.42)

Updates `hilt-android` from 2.41 to 2.42
- [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.41...dagger-2.42)

Updates `hilt-compiler` from 2.41 to 2.42
- [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.41...dagger-2.42)

---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- 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
- dependency-name: com.google.dagger:hilt-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:hilt-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* maven central url added to element-android/buld.gradle to buildscript configuration

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NIkita Fedrunov <fedrunov@element.io>
2022-05-10 14:11:04 +02:00
Benoit Marty a8c39e1d36
Merge pull request #6011 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.4.1
Bump fragment-ktx from 1.4.0 to 1.4.1
2022-05-10 11:23:04 +02:00
Benoit Marty 3906ee371b
Merge pull request #6002 from vector-im/dependabot/gradle/lifecycle-2.4.1
Bump lifecycle from 2.4.0 to 2.4.1
2022-05-10 10:01:11 +02:00
dependabot[bot] b566e15438
Bump fragment-ktx from 1.4.0 to 1.4.1
Bumps fragment-ktx from 1.4.0 to 1.4.1.

---
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>
2022-05-10 07:59:21 +00:00
Benoit Marty 1e5a53e5c5
Merge pull request #5999 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.4.1
Bump appcompat from 1.4.0 to 1.4.1
2022-05-10 09:58:57 +02:00
Benoit Marty 42513265cf
Merge pull request #6004 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.3
Bump constraintlayout from 2.1.2 to 2.1.3
2022-05-10 09:56:50 +02:00
Benoit Marty e05684d078
Merge pull request #6007 from vector-im/dependabot/gradle/com.google.android.material-material-1.6.0
Bump material from 1.5.0 to 1.6.0
2022-05-10 09:55:43 +02:00
dependabot[bot] d36eeb1a06
Bump material from 1.5.0 to 1.6.0
Bumps [material](https://github.com/material-components/material-components-android) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.5.0...1.6.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>
2022-05-09 23:10:28 +00:00
dependabot[bot] e8c61cf86f
Bump constraintlayout from 2.1.2 to 2.1.3
Bumps [constraintlayout](https://github.com/androidx/constraintlayout) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/androidx/constraintlayout/releases)
- [Commits](https://github.com/androidx/constraintlayout/compare/2.1.2...2.1.3)

---
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>
2022-05-09 23:09:32 +00:00
dependabot[bot] 900e05c1a1
Bump gradle from 7.0.4 to 7.2.0
Bumps gradle from 7.0.4 to 7.2.0.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 23:09:09 +00:00
dependabot[bot] 5bab32f6dc
Bump lifecycle from 2.4.0 to 2.4.1
Bumps `lifecycle` from 2.4.0 to 2.4.1.

Updates `lifecycle-common` from 2.4.0 to 2.4.1

Updates `lifecycle-livedata-ktx` from 2.4.0 to 2.4.1

Updates `lifecycle-process` from 2.4.0 to 2.4.1

Updates `lifecycle-runtime-ktx` from 2.4.0 to 2.4.1

---
updated-dependencies:
- dependency-name: androidx.lifecycle:lifecycle-common
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-livedata-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-process
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-runtime-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 23:08:43 +00:00
dependabot[bot] 48c126515c
Bump preference-ktx from 1.1.1 to 1.2.0
Bumps preference-ktx from 1.1.1 to 1.2.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 23:08:00 +00:00
dependabot[bot] f3eb8dd325
Bump appcompat from 1.4.0 to 1.4.1
Bumps appcompat from 1.4.0 to 1.4.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>
2022-05-09 23:07:48 +00:00
dependabot[bot] aabd705161
Bump vanniktechEmoji from 0.8.0 to 0.9.0
Bumps `vanniktechEmoji` from 0.8.0 to 0.9.0.

Updates `emoji-material` from 0.8.0 to 0.9.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.8.0...0.9.0)

Updates `emoji-google` from 0.8.0 to 0.9.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.8.0...0.9.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 15:01:48 +00:00
dependabot[bot] 381159ca2f
Bump mavericks from 2.5.0 to 2.6.1
Bumps `mavericks` from 2.5.0 to 2.6.1.

Updates `mavericks` from 2.5.0 to 2.6.1
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/compare/2.5.0...2.6.1)

Updates `mavericks-testing` from 2.5.0 to 2.6.1
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/compare/2.5.0...2.6.1)

---
updated-dependencies:
- dependency-name: com.airbnb.android:mavericks
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.airbnb.android:mavericks-testing
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 15:01:07 +00:00
Benoit Marty 8c37a46994
Merge pull request #5982 from vector-im/dependabot/gradle/glide-4.13.2
Bump glide from 4.12.0 to 4.13.2
2022-05-09 17:00:12 +02:00