Commit graph

14600 commits

Author SHA1 Message Date
Milos Kozak
253601980d :database:entities 2022-11-09 23:28:48 +01:00
Milos Kozak
f870a74796 :database:impl 2022-11-09 16:49:36 +01:00
Milos Kozak
2206a516d0 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2022-11-09 15:57:38 +01:00
Milos Kozak
1041de39c8 core-fabric module 2022-11-09 15:56:59 +01:00
Milos Kozak
62cdbdc41a Update Crowdin configuration file 2022-11-09 14:48:08 +01:00
dependabot[bot]
be4dbc6552
chore(deps): bump rxandroid from 3.0.0 to 3.0.1
Bumps [rxandroid](https://github.com/ReactiveX/RxAndroid) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/ReactiveX/RxAndroid/releases)
- [Changelog](https://github.com/ReactiveX/RxAndroid/blob/3.x/CHANGES.md)
- [Commits](https://github.com/ReactiveX/RxAndroid/compare/3.0.0...3.0.1)

---
updated-dependencies:
- dependency-name: io.reactivex.rxjava3:rxandroid
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-09 12:31:58 +00:00
Milos Kozak
6cc67e52a4 core -> core-main 2022-11-09 13:30:48 +01:00
Milos Kozak
efd4d43a50 build.gradle optimization 2022-11-09 12:20:03 +01:00
Milos Kozak
1c95cb107d WeekDayPicker -> automations 2022-11-09 10:48:59 +01:00
dependabot[bot]
14816fca50
chore(deps): bump org.jetbrains.kotlin.android from 1.7.20 to 1.7.21
Bumps org.jetbrains.kotlin.android from 1.7.20 to 1.7.21.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-09 08:01:33 +00:00
Milos Kozak
f43e090296 move more to interfaces module 2022-11-08 21:17:46 +01:00
Milos Kozak
34320ad8ca sync -> plugins module 2022-11-08 17:34:47 +01:00
Milos Kozak
936192b0de resolve rireylink -> pump-common dependency 2022-11-08 12:17:53 +01:00
Milos Kozak
ed91df6341 add interfaces -> shared dependency (ResourceHelper) 2022-11-08 11:08:14 +01:00
Milos Kozak
821c77cdec
New Crowdin updates (#2166)
* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* Update source file strings.xml

* Update source file strings.xml

* Update source file strings.xml

* Update source file strings.xml

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Greek)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Greek)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Irish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Catalan)

* New translations strings.xml (French)

* New translations strings.xml (Russian)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Croatian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Spanish)

* New translations strings.xml (German)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Danish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* Update source file strings.xml

* New translations strings.xml (French)

* New translations strings.xml (Czech)

* New translations strings.xml (Catalan)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Danish)

* New translations strings.xml (Russian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (German)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Russian)

* New translations strings.xml (Dutch)

* New translations exam.xml (Dutch)

* New translations objectives.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)
2022-11-08 09:29:04 +01:00
Milos Kozak
7e7399757a
Merge pull request #2169 from yodax/nsclient_autosens
Show correct icon when AutoSens data is available under AAPSClient
2022-11-08 09:27:56 +01:00
Milos Kozak
7747834a36
Merge pull request #2173 from tim2000s/dynisf_pred_curves
Dynisf pred curves
2022-11-08 09:27:14 +01:00
Milos Kozak
a0bf9d2104
Merge pull request #2175 from nightscout/dependabot/gradle/dev/com.polidea.rxandroidble3-rxandroidble-1.17.0
chore(deps): bump rxandroidble from 1.16.0 to 1.17.0
2022-11-08 09:24:39 +01:00
Milos Kozak
774ed51e1b
NSClient v3 initial work, NS v1 improvements
* NSCv3 initial work

* Allow only 1 NSC

* read sgv

* NSv3: Read Bolus, Carbs

* NSCv3: more work

* fix build

* loading working

* work on TT

* TT working

* TBR processing

* EPS working

* PS Sync

* Process entries at once. Share code v1,v3

* BolusCalculatorWizard working

* TherapyEvent working

* process bg at once

* improve sync

* sdk -> ns-sdk

* handle status per version

* OffileEvents working

* EB working

* RemoteDeviceStatus

* fix build

* cleanup
2022-11-08 09:23:46 +01:00
dependabot[bot]
16ada310f0
chore(deps): bump rxandroidble from 1.16.0 to 1.17.0
Bumps [rxandroidble](https://github.com/dariuszseweryn/RxAndroidBle) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/dariuszseweryn/RxAndroidBle/releases)
- [Changelog](https://github.com/dariuszseweryn/RxAndroidBle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dariuszseweryn/RxAndroidBle/commits)

---
updated-dependencies:
- dependency-name: com.polidea.rxandroidble3:rxandroidble
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-08 08:03:14 +00:00
Milos Kozak
7ae9ad1105 EOPatch2: log insulin change on activation 2022-11-07 09:52:16 +01:00
Milos Kozak
8641273d7c move to interfaces 2022-11-06 23:58:05 +01:00
Milos Kozak
430a2656d0 move interfaces 2022-11-06 23:10:04 +01:00
Milos Kozak
39ec5be45b move interfaces 2022-11-06 21:35:34 +01:00
Milos Kozak
e17ca2be0a PumpEnactResultImpl 2022-11-06 20:55:48 +01:00
Milos Kozak
b30fb687db move interfaces 2022-11-06 18:21:10 +01:00
Milos Kozak
6b298a0344 interfaces module 2022-11-06 17:48:42 +01:00
Carlos Rafael Giani
c535e96ec7 combov2: Reset states associated with pump when unpairing
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 16:30:34 +01:00
Carlos Rafael Giani
cdfb197c54 combov2: Minor cleanup to reduce some code smell
* Kotlin code convention specifies that ignored exceptions must be named
  "_", not "ignored."
* Add explanation about empty overridden method implementations.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 16:30:06 +01:00
Carlos Rafael Giani
8fda1ab0b8 combov2: More adjustments to pairing activity text
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 14:40:08 +01:00
Carlos Rafael Giani
c996c39b54 combov2: Add note about pairing confirmation to pairing activity text
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 13:50:08 +01:00
Carlos Rafael Giani
c447df3599 combov2: Restrict contents of "status" label in JSON pump status
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 13:48:02 +01:00
Milos Kozak
4643b12414 Rx module 2022-11-06 12:28:35 +01:00
Michael Kroes
0540640548 Show correct icon when AutoSens data is available under AAPSClient 2022-11-06 12:21:46 +01:00
Carlos Rafael Giani
01560f45be comboctl-main: Fix missing entry #1 in TDD history
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 00:13:43 +01:00
Carlos Rafael Giani
9aff10537e comboctl-main: Directly push MENU button to switch to TBR duration screen
There's no reason to use the full navigation function to switch from the
TBR percentage to the TBR duration screen, since these are next to each
other, and switching over is done by pressing MENU once.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 00:13:43 +01:00
Carlos Rafael Giani
4201fe08a5 combov2: Improve shortStatus output
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 00:13:43 +01:00
Carlos Rafael Giani
7d9925db47 Begin implementation of new combo plugin, called "combov2"
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 00:13:43 +01:00
Carlos Rafael Giani
643f26b7bf Import ComboCtl
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 00:13:43 +01:00
Carlos Rafael Giani
5df6084fa8 Enable data binding in app gradle script
This is necessary for autogenerating data binding code.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 00:13:43 +01:00
Carlos Rafael Giani
eb39d44a80 IDEA/Android Studio: Restore wildcard import rules
Commit 9b1b797d09 disabled wildcard imports
for these reasons:

(Source: https://jiga.dev/avoiding-wildcard-imports-in-java-kotlin-with-intellij/)

* Explicit imports clearly states what external classes the current class
  is directly using, provided that you don’t leave redundant imports
  in your code.

* If there are two classes with the same name from different packages,
  it can introduce collision when using wildcard imports.

* When multiple people are working in a project, wildcard imports can
  create confusion as to which classes are actually imported.

Apparently, this got accidentally reverted.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-06 00:13:43 +01:00
Milos Kozak
b4edb71e27 TreatmentsActivity -> ui module 2022-11-05 23:20:36 +01:00
Milos Kozak
d49b988e95
New Crowdin updates (#2164)
* New translations strings.xml (Polish)

* New translations strings.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Greek)

* New translations strings.xml (Danish)

* New translations strings.xml (Czech)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Norwegian)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Czech)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Romanian)

* New translations strings.xml (Danish)

* New translations strings.xml (Catalan)

* New translations strings.xml (Greek)

* New translations strings.xml (Russian)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Slovak)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Korean)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Irish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Serbian (Latin))

* Update source file strings.xml

* Update source file strings.xml

* Update source file strings.xml

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Czech)

* New translations strings.xml (Irish)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Danish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Danish)

* New translations strings.xml (Czech)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Hebrew)

* New translations strings.xml (German)

* New translations strings.xml (Catalan)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Croatian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Croatian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)
2022-11-05 21:50:08 +01:00
t_j_s
1f6c097693 Merge remote-tracking branch 'origin/dev' into dynisf_pred_curves 2022-11-05 18:57:58 +00:00
Milos Kozak
e0fba68fd2 contraints plugins -> plugins module 2022-11-04 21:51:37 +01:00
Milos Kozak
f0f5a89fe6 AutotunePlugin -> plugins module 2022-11-04 20:43:11 +01:00
Milos Kozak
efcae9f073 ProfilePlugin -> plugins module 2022-11-04 19:13:37 +01:00
Milos Kozak
683f87cd15 ThemeSwitcherPlugin -> plugins module 2022-11-04 17:14:43 +01:00
Milos Kozak
139e788e6e FoodPlugin -> plugins module 2022-11-04 16:55:32 +01:00
Milos Kozak
cb2adc9fab CareDialog -> ui module 2022-11-04 16:07:32 +01:00