filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,548 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

5390 Commits

Author SHA1 Message Date
Maxime NATUREL c3105c8bb1
Merge pull request #6486 from vector-im/feature/mna/delete-lls 
[Location sharing] - Delete action on a live message (PSG-523)
 2022-07-19 16:43:41 +02:00
Maxime NATUREL b08337e3a7
Merge pull request #6501 from vector-im/feature/mna/collapse-deleted-events 
[Timeline] - Collapse redacted events (PSG-523)
 2022-07-19 16:39:45 +02:00
ericdecanini 8c53d2f9b0 Reformats modules 2022-07-19 15:11:42 +02:00
Benoit Marty 62f2fe1c16 Detekt: This explicit usage of `it` as the lambda parameter name can be omitted. [ExplicitItLambdaParameter] 2022-07-19 15:02:21 +02:00
Benoit Marty 40f8d94954 Detekt: Use require() instead of throwing an IllegalArgumentException. [UseRequire] 2022-07-19 15:02:21 +02:00
Benoit Marty 70c8703b2b
Merge pull request #6545 from vector-im/feature/adm/ftue-combined-register-copy-review 
FTUE - Combined register copy review
 2022-07-19 14:44:29 +02:00
ericdecanini f9580e6cd5 Fixes error in RealmSessionStoreMigration 2022-07-19 14:12:56 +02:00
Maxime NATUREL 667b30f145 Refactoring redact task unit tests 2022-07-19 14:06:18 +02:00
Maxime NATUREL 7b15193eff Renaming a method to reflect its implementation 2022-07-19 14:06:18 +02:00
Maxime NATUREL 17227f1ae6 DB migration 2022-07-19 14:06:16 +02:00
Maxime NATUREL 1277376496 Fix missing handling of redacted beacon location data events 2022-07-19 14:05:13 +02:00
Maxime NATUREL 63626b79de Redact beacon info event first to refresh timeline faster 2022-07-19 14:05:13 +02:00
Maxime NATUREL f6415b0a5d Deleting summaries related to a redacted live location sharing 2022-07-19 14:05:13 +02:00
Maxime NATUREL d3ad8d8deb Prune event entity when redacted 2022-07-19 14:05:13 +02:00
Maxime NATUREL 391bf842b4 Calling usecase to redact live location share event 2022-07-19 14:05:13 +02:00
Maxime NATUREL 237a5a18f3 Adding new method in location sharing service to redact a live location share 2022-07-19 14:05:13 +02:00
Maxime NATUREL c9273dd067 Adding task to redact live location share related events 2022-07-19 14:05:13 +02:00
Maxime NATUREL c404454cd7 Adding related event ids of live in entity 2022-07-19 14:05:13 +02:00
Maxime NATUREL bad4eba153 Remove non necessary @MainThread annotations 2022-07-19 14:05:13 +02:00
Maxime NATUREL 9c619001a5 Updating string value for redacted event to be more consistent 2022-07-19 14:04:09 +02:00
ericdecanini 6f9b5c010d Deletes migration test 2022-07-19 13:49:21 +02:00
ericdecanini e926871570 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
 2022-07-19 11:17:14 +02:00
Benoit Marty ade1b7be8c Add some punctuation to please detekt. 2022-07-19 09:49:34 +02:00
Benoit Marty 3f8cbd1b9c Create a parent `MatrixRealmMigration` and improve the logs. 2022-07-18 17:22:49 +02:00
Benoit Marty ae8f977d6b Log the end of the migration and it's duration 2022-07-18 17:21:49 +02:00
ericdecanini bc5c53b70d Fixes copyright lint error 2022-07-18 15:53:51 +02:00
ericdecanini e6475a3f83 Fixes copyright lint error 2022-07-18 15:47:19 +02:00
ericdecanini 7bb7a085a8 Fixes copyright lint error 2022-07-18 15:38:03 +02:00
ericdecanini 7d29fbc68c Fixes post merge errors 2022-07-18 15:06:25 +02:00
ericdecanini c73c36eb26 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo032.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
 2022-07-18 15:05:04 +02:00
ericdecanini 67dd250f83 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 2022-07-18 15:03:42 +02:00
ericdecanini 1ae5965632 Fixes import order 2022-07-18 14:48:10 +02:00
Valere 4c554e4e85 fix unused import 2022-07-15 14:18:35 +02:00
Valere e8bd7ea967 fix olm session proliferation 2022-07-15 14:17:44 +02:00
Adam Brown 38763d0575 adding function to extract usernames from full matrix ids 2022-07-15 11:34:12 +01:00
Nikita Fedrunov c7b54b8d3d
legacy groups removal (#6268) 2022-07-15 12:25:10 +02:00
Jorge Martín 50f8d0a667 Ignore `forwardPaginationTest` to unblock the CI 2022-07-14 15:42:20 +02:00
Benoit Marty 4c496bb148 Version++ 2022-07-13 12:46:32 +02:00
Adam Brown 257f41dbf1
Merge pull request #6471 from vector-im/feature/adm/sharing-tests 
Adding tests around the share intent handling
 2022-07-13 10:12:09 +01:00
Florian Renaud fca4df3522 Revert "Ensure that Realm is up to date before returning the roomId" 
This reverts commit 8a5a47c6a5.
 2022-07-11 16:44:32 +02:00
Florian Renaud fdb9ed80d4 Change method visibility 2022-07-11 16:22:49 +02:00
Florian Renaud 68bd55fef5 Merge branch 'develop' into feature/fre/start_dm_on_first_msg 
* develop: (156 commits)
  adding test case for showing html entities are processed
  adding tests around the event html rendering - the test helper is a little hacky in order to covert the spans to something human readable
  removing extra line
  adding changelog entry
  overriding the default list handler with an implementation that takes into account the initial starting position
  trigger CI
  Use executeTransactionAwait (need realm refresh in this case)
  Bump flipper from 0.152.0 to 0.153.0
  Use executeTransactionAwait (need realm refresh in this case)
  generating 1.4.27 changelog and updating version
  Fixing crash when sharing plain text, such as a url
  Fix crashes when opening Thread (#6463)
  Timeline: fix validation of timeline event changes
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix crashes when opening Thread (#6463)
  suppressing unused string resource
  Changelog
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix typo
  adding changelog entry
  ...
 2022-07-11 12:03:24 +02:00
ericdecanini 051f925f0e Adds MigrateSessionTo032Test 2022-07-07 13:03:58 +01:00
Adam Brown 67d5289f01
Merge pull request #6462 from vector-im/feature/fga/fix_6461 
Timeline: fix validation of timeline event changes
 2022-07-07 11:25:33 +01:00
Adam Brown 3e770f9efa
Merge pull request #6474 from vector-im/feature/fga/fix_6463 
Fix crashes when opening Thread (#6463)
 2022-07-07 11:12:28 +01:00
ganfra 19fc97ba0f Use executeTransactionAwait (need realm refresh in this case) 2022-07-06 19:33:34 +02:00
Adam Brown 169ac9d0a0 updating the known SDK mimetypes and making use of them for the intent switches 2022-07-06 12:06:17 +01:00
ganfra 0743140973 Fix crashes when opening Thread (#6463) 2022-07-05 17:00:01 +02:00
Benoit Marty b847d8cf36 Fix ConcurrentModificationException on BackgroundDetectionObserver 2022-07-05 12:06:49 +02:00
ganfra f58ba13ef0 Timeline: fix validation of timeline event changes 2022-07-05 10:41:22 +02:00
ericdecanini 98d195c010 Changes migration to be realm list field 2022-07-05 09:35:05 +01:00
Florian Renaud 414dc52f7d Fix copyright date 2022-07-04 18:03:43 +02:00
Florian Renaud 2b6bfc1ebc Create local events using local echo 2022-07-04 18:00:30 +02:00
Florian Renaud e89bb0eea7 Set local room members as loaded 2022-07-04 17:53:21 +02:00
Florian Renaud 0d9cd2b3a3 Delete local room related entities with cascade 2022-07-04 17:47:48 +02:00
Florian Renaud f4b50f1e0f Fix logs when deleting local room 2022-07-04 17:41:00 +02:00
Florian Renaud 8a5a47c6a5 Ensure that Realm is up to date before returning the roomId 2022-07-04 17:38:32 +02:00
ericdecanini e003bc973a Adds clearing to directParentNames 2022-07-04 09:37:36 +01:00
Valere 8dc57fe2f0
Merge pull request #5853 from vector-im/feature/aris/crypto_share_room_keys_past_messages 
Share Megolm session keys when inviting a new user
 2022-07-01 17:33:43 +02:00
Eric Decanini bdb49f5946
Merge pull request #5398 from vector-im/bugfix/eric/softlogout-ux-broken 
Fixes broken SoftLogout UX for homeservers that support both Password and SSO
 2022-07-01 15:52:48 +01:00
ericdecanini b437996208 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 2022-07-01 15:47:30 +01:00
Valere d281f9dde5 use XXX not TODO 2022-07-01 16:07:03 +02:00
Maxime NATUREL d5b375e82b
Merge pull request #6414 from vector-im/feature/mna/reply-to-lls 
[Location sharing] - Reply action on a live message (PSG-343)
 2022-07-01 16:03:02 +02:00
Valere 6fd99dc302 resist ConnectivityManager$TooManyRequestsException 2022-07-01 15:56:03 +02:00
ericdecanini ed3a201f0b Changes directParentName to a list 2022-07-01 13:34:55 +01:00
Valere 90a4e71b06 update flacky test 2022-07-01 14:30:21 +02:00
Maxime NATUREL f5e33ca980 Fix unit tests 2022-07-01 14:27:10 +02:00
Valere 08cb6de83d Fix migration 2022-07-01 11:08:35 +02:00
Artjom König 03da067e44 fixed issues with reporting sync state events from different threads 2022-07-01 11:03:29 +02:00
Florian Renaud 0dad4cb02a Set current ts for local events age 2022-07-01 09:57:45 +02:00
Valere fb5f0cbd00 Fix test compilation 2022-07-01 09:43:17 +02:00
Valere e7322e8524 outdated configuration 2022-07-01 09:43:17 +02:00
Valere 5a67c39c7f reuse code for test 2022-07-01 09:43:17 +02:00
Valere a885ff5e47 Fix test 2022-07-01 09:43:17 +02:00
Valere b0907de582 Fix migration 2022-07-01 09:43:17 +02:00
Valere ddd82441bd kdoc 2022-07-01 09:43:17 +02:00
Valere 8e829c6aad Add lab flag and more tests 2022-07-01 09:43:17 +02:00
Valere d9fb58fbcb Fix tests 2022-07-01 09:42:31 +02:00
Valere f64adeba7f fix bad sender key export 2022-07-01 09:42:31 +02:00
Valere 34145f0374 post rebase fix 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos df241dbdb8 Fix broken unit test 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 010cf540b6 Fix broken unit test 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 55fdff4242 Resolve merge conflicts 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos d3a516b05d Enhance key sharing to respect matrix configuration 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos a9a7400fef Add MXCryptoConfig flag for key history sharing 
Add shared_history flag to sessionBackupData
 2022-07-01 09:42:31 +02:00
Valere fb352ffa38 quick format 2022-07-01 09:42:31 +02:00
Valere d8d808d0b4 removed deprecated annotation, CI don't like 2022-07-01 09:42:31 +02:00
Valere 8c26592d46 cleaning 2022-07-01 09:42:31 +02:00
Valere 9b8e45ebfe share keys for history take2 2022-07-01 09:42:31 +02:00
Valere 93aac8faea post rebase fix 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 2e88998b05 Add integration tests for shared keys rotation on room history visibility change 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 3a5b737639 Fix existing E2eeSanityTests to support changes for key history sharing 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 28dd507a74 Add crypto shared history sanity test 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 96f0d52753 Update copyright 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 243463adbc Add logs 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 395d48f946 Refactor code structure and improve naming 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 497f7cf044 Rotate our session when there is a room history visibility change since the last outboundSession 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos d6358dcb16 Prevent injecting a forged encrypted message and using session_id/sender_key of another room. 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 28a3ae264c Remove sharedHistory from OlmInboundGroupSessionWrapper2 while there are migration issues, and use only the equivalent DB entity value 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos dd3928f075 Remove sendSharedHistoryKeys while we will only share latest messages 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos b3bfd05ecb - Share only the first chunk of inbound sessions instead of the whole key history 
- Download keys if the user is unknown (first invite)
 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos e861edd544 Implement history key sharing functionality with respect to room visibility settings 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 6e57aeb9e5 Add roomId in InboundSessionEntity for better performance 
Add shared history flag to InboundSessionEntity
 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 98b55457b5 Add sendSharedHistoryKeys in crypto service 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos 34713d5023 Add sharing existing inbound sessions functionality on new room invites 2022-07-01 09:42:31 +02:00
Florian Renaud 33a19c1ef5 Merge branch 'develop' into feature/fre/start_dm_on_first_msg 
* develop: (91 commits)
  Remove unused import
  Update versions
  Update CHANGES
  Improve readability.
  Weblate: also clean trads
  Changelog
  Format file
  Add android:hasFragileUserData="true" to the manifest. See details in #2352
  Clean the TODO delete (UnusedResource not compatible with string template)
  showing a toast on password reset confirmation
  lifting duplicated event_base layout to the base class, with the option for children to override
  using vector model for consistency
  Replace 5 manual steps to 1 command line step
  Translated using Weblate (Italian)
  Translated using Weblate (Swedish)
  Translated using Weblate (Swedish)
  Translated using Weblate (Russian)
  extracting common breaker background selection to ftue extensions
  removing unused imports
  adding changelog entry
  ...
 2022-07-01 09:35:40 +02:00
Benoit Marty c77ecc6a21
Merge pull request #6288 from deepbluev7/nico/stable-aliases 
Use stable endpoint for alias management
 2022-06-30 22:30:14 +02:00
Benoit Marty 58580f1e6a
Merge pull request #6413 from vector-im/feature/bma/room_member_loading 
Show a loader if all the Room Member are not yet loaded.
 2022-06-30 17:13:50 +02:00
Benoit Marty fbbd6b1a90 Remove unused import 2022-06-30 17:13:13 +02:00
ganfra 6d1dd089f0 Update versions 2022-06-30 16:58:51 +02:00
Adam Brown 054c0435a8
Merge pull request #6130 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.11.0 
Bump realm-gradle-plugin from 10.9.0 to 10.11.0
 2022-06-30 15:00:21 +01:00
Benoit Marty 90e851a4bc
Merge pull request #6392 from vector-im/feature/bma/safe_clearWith 
Ensure clearWith lambda is deleting all the list item
 2022-06-30 15:46:53 +02:00
Benoit Marty e53dd1e1a1 Improve readability. 2022-06-30 14:50:20 +02:00
Florian Renaud 3f087eb632 Merge branch 'develop' into feature/fre/start_dm_on_first_msg 
* develop: (174 commits)
  Bump libphonenumber from 8.12.50 to 8.12.51
  LoadRoomMember: fix presence
  Cleanup
  LoadRoomMembers: add changelog
  LoadRoomMembers: handle room member event a bit more efficiently
  LoadRoomMembers: exclude Membership.Leave
  LoadRoomMembers: divide by chunk
  Bump soloader from 0.10.3 to 0.10.4
  Code review fix.
  Try no using the gradle daemon on CI
  Harmonize values of `CI_GRADLE_ARG_PROPERTIES`
  removing unused dependencies and marking soloader and ignored from dependency check (as it's dynamic)
  Remove non necessary prefix in logs
  Adding changelog entry
  Updating the unit tests
  Stopping existing active live when starting a new one
  Avoid multiple PR from Dependabot when Flipper is upgraded.
  Change context inside the get live summary use case
  Use a TestDispatcher in the FakeSession
  Code review fixes.
  ...
 2022-06-30 11:48:55 +02:00
Benoit Marty 8da88f9263
Merge pull request #6417 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.51 
Bump libphonenumber from 8.12.50 to 8.12.51
 2022-06-30 09:07:47 +02:00
dependabot[bot] 5a02bca442
Bump libphonenumber from 8.12.50 to 8.12.51 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.50 to 8.12.51.
- [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.50...v8.12.51)

---
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-06-29 23:09:57 +00:00
ganfra b446ceded8 LoadRoomMember: fix presence 2022-06-29 19:01:23 +02:00
ericdecanini cb400b660d Fixes post merge error 2022-06-29 17:07:37 +02:00
ericdecanini 9350053214 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# 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/migration/MigrateSessionTo030.kt
 2022-06-29 17:05:28 +02:00
ericdecanini 4cf97d48c9 Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
#	vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
#	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
 2022-06-29 15:53:22 +02:00
Benoit Marty e75070be91 Use a DataSrouce instead of a Task and return a non Optional Boolean. 2022-06-29 15:35:00 +02:00
Benoit Marty a0025bc99b Update after PR review. 2022-06-29 15:05:26 +02:00
Maxime NATUREL f5d3bcbb94 Sending a reply to a live location share 2022-06-29 15:04:57 +02:00
Benoit Marty f278e2884a Fix detekt issue. 2022-06-29 14:18:36 +02:00
Benoit Marty e91be2b599 Show a loader if all the Room Member are not yet loaded. 2022-06-29 12:19:17 +02:00
ericdecanini e87d97083f Merge remote-tracking branch 'origin/develop' into bugfix/eric/upgrade-room-deduplication 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
 2022-06-29 12:02:34 +02:00
ganfra 1a33f6e094
Merge branch 'develop' into feature/fga/load_room_members_by_chunk 2022-06-29 11:45:52 +02:00
ganfra 7d349bdfc3 Cleanup 2022-06-29 11:38:15 +02:00
ganfra 61c5bbc444 LoadRoomMembers: handle room member event a bit more efficiently 2022-06-29 11:35:31 +02:00
ganfra 63f0cce561 LoadRoomMembers: exclude Membership.Leave 2022-06-29 11:34:43 +02:00
ganfra 3a216759a1 LoadRoomMembers: divide by chunk 2022-06-29 11:32:38 +02:00
Maxime NATUREL e7a68907f9
Merge pull request #6365 from vector-im/feature/mna/start-lls-from-other-device 
[Location sharing] - Stop any active live before starting a new one (PSF-942)
 2022-06-29 09:47:26 +02:00
Maxime NATUREL d112f860a2
Merge pull request #6356 from vector-im/fix/mna/stop-lls-from-other-device 
[Location sharing] - Make stop of a live from another device possible (PSF-1060)
 2022-06-29 09:45:44 +02:00
Maxime NATUREL 324b3cc68c Updating the unit tests 2022-06-28 14:36:38 +02:00
Maxime NATUREL c2c58f81d8 Stopping existing active live when starting a new one 2022-06-28 14:36:36 +02:00
Valere a2aa0471c5
Merge pull request #6328 from vector-im/feature/bca/verif_resist_no_age 
Feature/bca/verif resist no age
 2022-06-28 14:13:37 +02:00
Valere 86b888c336 Display specific message when verif code malformed 2022-06-28 12:17:18 +02:00
Benoit Marty 9866bfefed Ensure clearWith lambda is deleting all the list item, else we will get an infinite loop. This specific error will help to figure out what is happening. 2022-06-28 11:56:41 +02:00
Valere 82e68472dc code review update 2022-06-28 11:28:06 +02:00
Benoit Marty 69920a6e46 Split long line 2022-06-28 09:26:29 +02:00
Maxime NATUREL af3718d202
Merge pull request #6376 from vector-im/fix/mna/geo-uri-pattern 
[Location Share] - Adding missing prefix "u=" for uncertainty in geo URI (PSF-945)
 2022-06-28 09:24:55 +02:00
Benoit Marty a398391908
Merge pull request #6366 from vector-im/feature/ons/poll_view_state_unit_tests 
Poll view state unit tests [PSF-1130]
 2022-06-27 19:59:13 +02:00
Benoit Marty 2f8aeb991e Merge hotfix 1.4.25 to develop 2022-06-27 18:03:22 +02:00
Benoit Marty e0b378e2be Delete all the chunks in one step. 2022-06-27 17:37:04 +02:00
Benoit Marty d17152cbe2 Delete all the timelineEvents 2022-06-27 17:23:30 +02:00
Maxime NATUREL 5fa3b3f168 Fix pseudo code in comments 2022-06-27 17:18:28 +02:00
Benoit Marty 95969253b5 Prepare hotfix 1.4.25 2022-06-27 14:50:05 +02:00
Benoit Marty c9a28c1cf1 Fix migration issue. We had an infinite migration, since `clearWith` wait for the list to be empty. 2022-06-27 14:50:05 +02:00
Valere 622ada7125 ensure ageLocalTs is set 2022-06-27 09:14:20 +02:00
Adam Brown c6ef972e3c adding missing fullstop and removing unused import 2022-06-24 15:08:48 +01:00