mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-17 23:02:03 +03:00
Code Issues Projects Releases Packages Wiki Activity
12757 commits 7 branches 122 tags 229 MiB
Commit graph

8030 commits

Author SHA1 Message Date
Benoit Marty
fc7beb7e5f Prefer usage of any or none rather indexOfFirst wherever it is possible 2022-01-05 15:24:20 +01:00
Benoit Marty
51c9c2f032 Optimize call flow 2022-01-05 14:56:17 +01:00
Benoit Marty
5efe1f4bd8
Merge pull request #4841 from vector-im/feature/bma/safe_start_activity 
Small cleanup
 2022-01-05 14:43:13 +01:00
Benoit Marty
24c7064cc6
Merge pull request #4857 from vector-im/feature/bma/emoji_upgrade 
Manual upgrade of the emoji2 lib
 2022-01-05 14:40:29 +01:00
Benoit Marty
8fa36750a2 Manual upgrade of the emoji2 lib 
Dependabot does not care about this dependency, I do not know why.
 2022-01-05 13:50:16 +01:00
Adam Brown
603ddf7eac taking into account when the current call is not yet available and defaulting to the audio call mode 2022-01-05 10:35:00 +00:00
Adam Brown
98078da13d renaming the ftue domain to onboarding and ftue to ftue auth 2022-01-05 10:32:31 +00:00
Adam Brown
1e5c057223 clones the login view model domain to the ftue so that we can start overriding and merge login2 behaviour 2022-01-05 10:31:30 +00:00
Adam Brown
6380ee9176 allowing nullable message content in order to reset the content when recycling and an item doesn't contain a message 2022-01-05 09:59:39 +00:00
Adam Brown
57e0ce2303 removing any existing text futures before setting new text 
- tentatively fixes IllegalArgumentException when recycling the text views due to AppCompatTextView.consumeTextFutureAndSetBlocking attempting to consuming any futures, even if they may be invalid
 2022-01-05 09:58:46 +00:00
Adam Brown
4daef6018e extracting the emoji text setting to an extension 2022-01-05 09:58:08 +00:00
Benoit Marty
5fc1efb542
Merge pull request #4852 from vector-im/feature/bma/tooltip 
Add tooltip to explain what are the actions behind the icons
 2022-01-05 09:47:12 +01:00
Benoit Marty
d07dd154b8 Remove audio item from attachment picker. 
Keep some related code for now
 2022-01-04 18:50:32 +01:00
Benoit Marty
97459bc822 Update wording of tooltips (Gaelle's review) 2022-01-04 18:43:17 +01:00
Benoit Marty
10a63f8949 Fix code after #4837 has been merged 2022-01-04 16:22:06 +01:00
Benoit Marty
7bbea52e66
Merge branch 'develop' into feature/bma/math_final 2022-01-04 16:13:23 +01:00
Benoit Marty
ecc4009689 Add tooltip to explain what are the actions behind the buttons 2022-01-04 16:00:06 +01:00
Benoit Marty
ed00f9f712
Merge pull request #4848 from vector-im/cgizard/translate_error_message_joining_room 
Update error message when joining room
 2022-01-04 15:27:49 +01:00
Benoit Marty
e724c2e26c
Merge pull request #4849 from vector-im/feature/bma/fix_lint 
Fix lint after #4843
 2022-01-04 15:24:56 +01:00
Benoit Marty
d52e61413d Ask for user confirmation before deleting Widget 2022-01-04 14:32:03 +01:00
Benoit Marty
185afe403f Rename some string resources 2022-01-04 14:25:36 +01:00
Benoit Marty
3db27f89bb Remove useless comments in translations 2022-01-04 14:02:52 +01:00
Claire Gizard
63c63bc462 Update error message when joining room 2022-01-04 13:49:18 +01:00
Benoit Marty
108e924783 Remove unused strings 2022-01-04 13:17:41 +01:00
Benoit Marty
ee69ece697 Fix some typo in string resource name 2022-01-04 13:06:02 +01:00
Benoit Marty
eb875823d5 Remove unused class and resource after new poll implementation 2022-01-04 13:02:17 +01:00
Benoit Marty
64e56b0dd7 Remove unused strings 2022-01-04 12:56:36 +01:00
Benoit Marty
99d77c5bca Reanme some string (and group them together) 2022-01-04 12:51:20 +01:00
Benoit Marty
9946e64c23 Fix lint issue (TypographyDashes) 2022-01-04 12:47:46 +01:00
Benoit Marty
81e2e8db06 Fix lint issue 2022-01-04 12:42:24 +01:00
Weblate
b1d18eb8b6 Merge branch 'origin/develop' into Weblate. 2022-01-04 09:35:17 +00:00
Benoit Marty
279f9e00a3
Merge pull request #4837 from vector-im/feature/bma/safe_epoxy_char_sequence 
Safe epoxy char sequence
 2022-01-04 09:53:49 +01:00
Benoit Marty
d670d3e872
Merge pull request #4405 from vector-im/feature/fga/timeline_chunks_rework 
Feature/fga/timeline chunks rework
 2022-01-03 20:20:42 +01:00
Benoit Marty
2c7df1c376
Merge pull request #4825 from vector-im/feature/bma/call_cleanup 
Remove dead code and do some cleanup in CallService
 2022-01-03 16:34:50 +01:00
Benoit Marty
74af485137 Small cleanup. 
Remove unused methods.
 2022-01-03 16:33:41 +01:00
ganfra
91215854f4 Merge branch 'develop' into feature/fga/timeline_chunks_rework 2022-01-03 16:07:05 +01:00
Benoit Marty
e03c806fd8 Split long line 2022-01-03 15:30:51 +01:00
Benoit Marty
a38f5f9644 Format 2022-01-03 14:23:29 +01:00
Benoit Marty
27161bf794 preventMutation is not needed anymore, since we now uses EpoxyCharSequence 2022-01-03 14:23:29 +01:00
Benoit Marty
ca44d8f4d8 Use EpoxyCharSequence for all Epoxy items 
Or use String if possible
 2022-01-03 14:23:29 +01:00
Benoit Marty
d7c9e15a73 Create EpoxyCharSequence: wrapper for a CharSequence, which support mutation of the CharSequence, which can happen during rendering 2022-01-03 12:01:10 +01:00
Jozef Gaal
fa65156e87 Translated using Weblate (Slovak) 
Currently translated at 67.7% (1845 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-01-02 10:26:21 +00:00
Denys Nykula
03cc812a35 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-31 22:26:14 +00:00
LinAGKar
d1e46a18fa Translated using Weblate (Swedish) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-12-31 22:26:14 +00:00
Jozef Gaal
6a44606c78 Translated using Weblate (Slovak) 
Currently translated at 59.4% (1619 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2021-12-31 22:26:13 +00:00
libexus
47e4ff4768 Translated using Weblate (German) 
Currently translated at 98.5% (2686 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-12-31 22:26:04 +00:00
Tobias Preuss
74363ff823 Let ShareCompat.IntentBuilder create the chooser intent for sharing content. 
+ Although the system's intent chooser normally takes care of cases when
  no app is found we still keep the safeguard here to be prepared for
  exotic devices behaving different.

Signed-off-by: Tobias Preuss <tobias.preuss@googlemail.com>
 2021-12-31 22:37:42 +01:00
Tobias Preuss
70b07471cf Use ShareCompat.IntentBuilder in "shareText()" utility function. 
Signed-off-by: Tobias Preuss <tobias.preuss@googlemail.com>
 2021-12-31 22:37:39 +01:00
Tobias Preuss
5fd3317197 Use property access syntax. 
Signed-off-by: Tobias Preuss <tobias.preuss@googlemail.com>
 2021-12-31 22:37:32 +01:00
Benoit Marty
a80f8b96c1 Format 2021-12-31 17:35:53 +01:00
Benoit Marty
c3480bfd16 Add summary to the setting 2021-12-31 16:47:46 +01:00
Benoit Marty
95b1ae9488
Merge branch 'develop' into maths 2021-12-31 16:41:06 +01:00
Benoit Marty
96d5652fcd Small cleanup 2021-12-31 15:48:08 +01:00
Benoit Marty
6d8b5db18e Fix latest small bugs 2021-12-31 15:34:42 +01:00
Benoit Marty
a7b72ed39d Fix latest small bugs 2021-12-31 15:22:48 +01:00
Benoit Marty
1cb91ca5df Use color parser 2021-12-31 15:13:01 +01:00
Benoit Marty
ddadefdbd6 Move logic to ViewModel 2021-12-31 15:08:30 +01:00
Benoit Marty
07d2a15cf8 Code cleanup 2021-12-31 14:45:35 +01:00
Benoit Marty
364457d102 Move logic to dedicated ViewModel 2021-12-31 13:13:48 +01:00
Benoit Marty
454baf8beb
Merge branch 'develop' into feature/issue-2610-override-nick-color-via-user-account-data 2021-12-31 13:02:24 +01:00
Benoit Marty
ce0a582b3e
Merge pull request #4823 from vector-im/feature/ons/attachment_picker 
Attachment Picker UI Improvements
 2021-12-31 11:43:49 +01:00
Benoit Marty
561f32c1f3 Remove dead code and do some cleanup 2021-12-31 10:20:16 +01:00
Benoit Marty
5eebc995ff Animate the attachment open/close button 2021-12-30 16:52:58 +01:00
Benoit Marty
464ac3bce2 Fix blink effect when opening the attachment popup, and improve clickability of the buttons 2021-12-30 16:36:36 +01:00
Onuray Sahin
cc8da82d02 New attachment picker implemented. 2021-12-30 16:28:50 +03:00
Benoit Marty
2ddc7f04b3
Merge pull request #4747 from vector-im/feature/bca/clean_state_in_tl 
cleaning rendering of state event in timeline
 2021-12-30 12:41:22 +01:00
Benoit Marty
753d704c69
Merge pull request #4757 from vector-im/feature/fre/minor_code_enhancements 
Some code enhancements
 2021-12-30 11:33:57 +01:00
Benoit Marty
f124eba665
Merge pull request #4810 from vector-im/feature/adm/voip-mute-notification 
Fixing duplicated/empty notifications when joining/muting/leaving a VOIP call
 2021-12-30 11:31:06 +01:00
Benoit Marty
abcdfc6f73
Merge pull request #4758 from vector-im/feature/adm/emoji-inconsistencies 
Wrong emojis in composer
 2021-12-30 10:34:22 +01:00
Benoit Marty
6a73c9315a
Merge pull request #4809 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.40 
Bump libphonenumber from 8.12.39 to 8.12.40
 2021-12-30 10:30:27 +01:00
Benoit Marty
bb0725b2e2
Merge pull request #4656 from vector-im/feature/adm/dynamic-login-flow 
Feature based FTUE flows
 2021-12-30 10:29:52 +01:00
Szimszon
d632d54b6d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-12-27 21:26:02 +00:00
Bjørn I.Svindseth
fec74bf864 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 33.6% (918 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nn/
 2021-12-26 19:26:01 +00:00
Van Linh Nguyen
01b5544261 Translated using Weblate (Vietnamese) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2021-12-25 10:28:02 +00:00
Dinh Quang Tuyen
2e56d3811e Translated using Weblate (Vietnamese) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2021-12-25 10:28:01 +00:00
lvre
6d7d80e7c1 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-12-25 10:26:02 +00:00
Martin Berg Alstad
d41ad89c9e Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.2% (1614 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
 2021-12-25 10:26:02 +00:00
egrimstad
302b24a6b7 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.2% (1614 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
 2021-12-25 10:26:01 +00:00
Adam Brown
41ae67d214 only converting encrypted events to NotifiableMessageEvent if the decrypted type is also a message 
- fixes the app displaying encrypted non message events as notification messages
 2021-12-24 11:12:59 +00:00
dependabot[bot]
863b201793
Bump libphonenumber from 8.12.39 to 8.12.40 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.39 to 8.12.40.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.39...v8.12.40)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-23 23:07:37 +00:00
Adam Brown
eb8a704ee7 forcing the outgoing calls to use the same audio config as the call itself 
- tentatively fixes the speaker being used by previous instance changes if a reset fails
 2021-12-22 15:57:47 +00:00
Denys Nykula
945749c6fb Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-21 16:26:06 +00:00
Ihor Hordiichuk
47f29e63c2 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-21 16:26:06 +00:00
LinAGKar
fa38db7d93 Translated using Weblate (Swedish) 
Currently translated at 99.9% (2724 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-12-21 16:26:05 +00:00
Glandos
f58aab6e9d Translated using Weblate (French) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-12-21 16:26:03 +00:00
waclaw66
db2e52bb25 Translated using Weblate (Czech) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-12-21 16:25:59 +00:00
ganfra
55c0f1fcb3 Update versions to 1.3.13 2021-12-20 15:35:09 +01:00
Adam Brown
f1dff33dc2 removing android version bypass for using text futures 
- the emoji span changes affect all android versions
 2021-12-20 10:09:17 +00:00
rickeesingh
b8f9c3f600 Translated using Weblate (Punjabi) 
Currently translated at 4.0% (110 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pa/
 2021-12-19 12:26:29 +00:00
Adam Brown
b72d40a3e7 Translated using Weblate (Hebrew) 
Currently translated at 76.1% (2075 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2021-12-19 12:26:18 +00:00
Ihor Hordiichuk
b2477af0f1 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-19 12:26:13 +00:00
Denys Nykula
f1c31f048a Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-19 12:26:13 +00:00
LinAGKar
dff9bbcf94 Translated using Weblate (Swedish) 
Currently translated at 99.0% (2700 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-12-19 12:26:13 +00:00
Jozef Gaal
50a9e444ce Translated using Weblate (Slovak) 
Currently translated at 53.6% (1461 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2021-12-19 12:26:12 +00:00
lvre
0495cdf343 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-12-19 12:26:08 +00:00
Anon Translator
d25d407cc4 Translated using Weblate (Polish) 
Currently translated at 97.6% (2662 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-12-19 12:26:08 +00:00
Arūnas Svečiulis
cb06ba3ad0 Translated using Weblate (Lithuanian) 
Currently translated at 4.6% (126 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lt/
 2021-12-19 12:26:06 +00:00
Linerly
4c33f7c512 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-12-19 12:26:05 +00:00
notramo
597616ea92 Translated using Weblate (Hungarian) 
Currently translated at 99.9% (2723 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-12-19 12:26:05 +00:00
Danial Behzadi
8ad8f05e12 Translated using Weblate (Persian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-12-19 12:26:02 +00:00
Priit Jõerüüt
a33f49739c Translated using Weblate (Estonian) 
Currently translated at 99.8% (2722 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-12-19 12:25:59 +00:00
waclaw66
c9d650eb0c Translated using Weblate (Czech) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-12-19 12:25:59 +00:00
rickeesingh
9b6b74ae2e Added translation using Weblate (Punjabi) 2021-12-18 01:35:55 +00:00
ganfra
c6a118fc1f Update versions to 1.3.12 2021-12-17 19:05:17 +01:00
Florian Renaud
7e2eb2a21e Remove useless val in RoomListViewModel constructor 2021-12-17 17:31:24 +01:00
Florian Renaud
c13feb983e Remove useless nullability in method param 2021-12-17 17:31:24 +01:00
Florian Renaud
61b74bb083 Add missing setting key constant 2021-12-17 17:31:00 +01:00
ganfra
461beda634
Merge pull request #4742 from vector-im/feature/aris/fix_immutable_model_crash 
Fix crash ImmutableModelException
 2021-12-17 15:30:19 +01:00
Adam Brown
680c22d4c8 using app compat edit text for official emoji support 2021-12-17 13:41:19 +00:00
ganfra
e155eefb7b
Merge pull request #4748 from vector-im/feature/adm/late-emoji-initialisation 
Unable to render messages
 2021-12-17 12:35:37 +01:00
ganfra
ac65942c28
Merge pull request #4744 from vector-im/feature/adm/emoji-notice-fix 
Emojis in emotes causing crashes on Android 12+
 2021-12-17 11:47:16 +01:00
Adam Brown
ddbf8582dd removing trailing space 2021-12-17 10:46:03 +00:00
Adam Brown
6918372a87 extracting the emoji processing to an interface so that we can override the behaviour in the unit test 2021-12-17 10:38:49 +00:00
Adam Brown
b73bae452a
adding comment to explain SpannableStringBuilder usage 2021-12-17 09:37:50 +00:00
Adam Brown
37db28ae7c using the safe emoji processor to avoid the timeline failing when processing the content and the emoji library hasn't initialised yet 2021-12-17 09:25:16 +00:00
Valere
240ce6873b cleaning rendering of state event in timeline 2021-12-17 09:20:17 +01:00
ClaireGizard
ca58a04f57
Small UI fix in room member profile hearder (#4700) 
Small ui fix on room member profile name

Co-authored-by: Claire Gizard <cgizard>
 2021-12-16 21:10:03 +01:00
Adam Brown
ae6be3fdc4 adding missing binding options emote content 
- fixes android 12+ crash when certain emojis are used within the emote content
 2021-12-16 18:34:00 +00:00
ariskotsomitopoulos
2275bdd4fa Fix crash ImmutableModelException 2021-12-16 20:14:21 +02:00
David Langley
e7bb030d52 full markdown should work in replies, was hardcoded to simple irrespective of prefrence. 2021-12-16 14:10:49 +00:00
Benoit Marty
3b35be510f
Merge pull request #4729 from vector-im/feature/adm/avoid-leaking-window-when-showing-loading 
Avoid leaking Activity Window when showing loading dialog
 2021-12-16 11:07:23 +01:00
Benoit Marty
818a8898b3 Call banner: center text vertically 2021-12-15 22:19:23 +01:00
Adam Brown
4c238e81cf dismisses any potential loading dialogs when the linked fragment is destroyed 
- fixes leaking the activity window when the fragment is destroyed
 2021-12-15 18:16:10 +00:00
Adam Brown
8b96d8cd8d only acquire a wake lock if a lock is not already held 2021-12-15 17:32:39 +00:00
Jeff Huang
2d490a98cd Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-12-15 09:57:34 +00:00
sr093906
75ca3bab09 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-12-15 09:57:30 +00:00
Ihor Hordiichuk
7c791e3482 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-15 09:57:26 +00:00
Denys Nykula
531c06da50 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-15 09:57:26 +00:00
Besnik Bleta
e6a94d6387 Translated using Weblate (Albanian) 
Currently translated at 99.4% (2711 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2021-12-15 09:57:26 +00:00
lvre
eb18bbb3b8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-12-15 09:57:22 +00:00
AmeliMeow
d594ee780a Translated using Weblate (Lithuanian) 
Currently translated at 4.5% (125 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lt/
 2021-12-15 09:57:22 +00:00
Arūnas Svečiulis
ad763e6fb3 Translated using Weblate (Lithuanian) 
Currently translated at 4.5% (125 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lt/
 2021-12-15 09:57:21 +00:00
random
657d7ee85a Translated using Weblate (Italian) 
Currently translated at 99.8% (2722 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-12-15 09:57:20 +00:00
Linerly
09854abf25 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-12-15 09:57:16 +00:00
Balázs Meskó
b8d8b9b718 Translated using Weblate (Hungarian) 
Currently translated at 98.8% (2694 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-12-15 09:57:12 +00:00
Priit Jõerüüt
e9010dff94 Translated using Weblate (Estonian) 
Currently translated at 99.8% (2722 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-12-15 09:57:11 +00:00
waclaw66
469dde33b6 Translated using Weblate (Czech) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-12-15 09:57:07 +00:00
Daimar Stein
218f8f51ab Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-12-14 21:36:32 +00:00
lvre
18d2da4d25 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-12-14 21:36:31 +00:00
David Langley
96062b7daa Enable on replies and quotes even if preference is disabled to fix newline issues. 2021-12-14 17:10:54 +00:00
Denys Nykula
f3ede9db6a Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-14 14:45:55 +00:00
Ihor Hordiichuk
ccee4a9952 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2725 of 2725 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-14 14:45:50 +00:00
David Langley
20b5742227 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_reply_and_quote_newlines 2021-12-14 13:46:45 +00:00
Benoit Marty
fa65cc59fe Version++ 2021-12-14 14:46:08 +01:00
Benoit Marty
73dba2b692 Fix another crash 2021-12-14 14:37:01 +01:00
Benoit Marty
32820f7893 Comment out some part of the test to make it pass. Tested manually for this time. 2021-12-14 13:27:33 +01:00
Benoit Marty
1961309458 Fix a crash on reactions bottom sheet 2021-12-14 13:26:03 +01:00
Benoit Marty
0411291515
Merge pull request #4708 from vector-im/feature/bma/analytics_before_release 
Disable automatic opt-in screen display
 2021-12-14 12:07:12 +01:00
Benoit Marty
08def813cc Disable automatic opt-in screen display. 
We want to wait for translations to be available in the project before showing this screen to every users.
 2021-12-14 11:34:06 +01:00
Adam Brown
74594d8fc3 porting the LoginActivty2 to a dynamic FTUE activity 
- supports switching between a copied legacy flow (DefaultFTUE) and the WIP variant
- this will allow us to make iterative changes to the default ftue flow without affecting the legacy flow/forks
 2021-12-14 09:06:15 +00:00
Weblate
1e40b5cd34 Merge branch 'origin/develop' into Weblate. 2021-12-14 08:58:12 +00:00
Adam Brown
fd0e1e44c4 renaming login version to variants to better describe the different flows 2021-12-14 08:50:57 +00:00
Adam Brown
dae2e9988f moving the sso redirect parameter to the sso redirect activity for sharing 2021-12-14 08:50:57 +00:00
Adam Brown
01d4a48b8b adding ability to lazily create viewmodels 
- helpful when multiple view models are injected but not all are needed
 2021-12-14 08:50:57 +00:00
Adam Brown
a3ad8c5e2e removing non accessible softlogout2 activity 
- there's no manifest entry
- the implementation looks like it delegates back to login 1, will look to add back as part of the FTUE changes
 2021-12-14 08:50:56 +00:00
Benoit Marty
f4cfb5d6d3
Merge pull request #4559 from vector-im/feature/bma/posthog 
Analytics
 2021-12-14 09:31:55 +01:00
Benoit Marty
aad19e4bce code qual 2021-12-14 09:06:36 +01:00
Denys Nykula
cb4690a3e6 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2693 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-14 02:26:03 +00:00
Jozef Gaal
d3d5d79b7d Translated using Weblate (Slovak) 
Currently translated at 52.6% (1417 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2021-12-14 02:25:58 +00:00
DUCKCHI
0a090fab65 Translated using Weblate (Korean) 
Currently translated at 49.0% (1322 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ko/
 2021-12-14 02:25:57 +00:00
Benoit Marty
ea9a524048 Fix compilation issue after merge develop 2021-12-13 23:23:18 +01:00
Benoit Marty
a40e60ba8f Merge branch 'develop' into feature/bma/posthog 2021-12-13 23:18:14 +01:00
Benoit Marty
e519e314fe Limit width of content on tablets 2021-12-13 23:16:47 +01:00
Benoit Marty
48fa411d83
Merge pull request #4698 from vector-im/feature/bma/emoji_hotfix 
Emoji fix
 2021-12-13 23:15:46 +01:00
Benoit Marty
2c81e7ea08
Merge pull request #4601 from vector-im/feature/aris/search_no_data_displayed_4600 
Fix issue 4600 that search results sometimes are not displayed properly
 2021-12-13 23:01:03 +01:00
Benoit Marty
3719551913
Merge pull request #4693 from SpiritCroc/spaceChildIds 
Fix possible crash when having identical subspaces in multiple root spaces
 2021-12-13 22:59:57 +01:00
Benoit Marty
240d0c0a5e
Merge pull request #4703 from vector-im/feature/bma/fix_poll_create 
Use only non empty option to create a poll
 2021-12-13 22:56:58 +01:00
Benoit Marty
b9799b46fd Fix test compilation 2021-12-13 22:45:24 +01:00
Benoit Marty
28588eb10c Use only non empty option to create a poll 2021-12-13 22:17:43 +01:00
Benoit Marty
db81ec260e Recycle View a bit more 2021-12-13 21:49:40 +01:00
Benoit Marty
0981af3085 Remove unused attribute 2021-12-13 21:33:15 +01:00
Benoit Marty
f29e14fdd8 Rename class 2021-12-13 21:17:14 +01:00
Benoit Marty
da407ef8a2 Avoid lateinit 2021-12-13 21:16:44 +01:00
Benoit Marty
10b39ccd28 Do some renaming 2021-12-13 21:08:52 +01:00
Benoit Marty
eac06d5401 Do some renaming 2021-12-13 21:04:52 +01:00
Benoit Marty
c1ea653561 Reorder classes so that it follows the poll status logical order 2021-12-13 21:02:11 +01:00
Onuray Sahin
e2bbc3f8ae Code review fixes. 2021-12-13 22:47:15 +03:00
Benoit Marty
6e646b12b5 Add some comments and default values 2021-12-13 20:34:44 +01:00
Benoit Marty
96b186ca8c Add tests to cover the new feature 2021-12-13 20:28:58 +01:00
Benoit Marty
e8fbbe2b97 Fix the test 2021-12-13 20:09:33 +01:00
Benoit Marty
c302148e89 Rename 2021-12-13 18:21:27 +01:00
Benoit Marty
808c401675 Fix a crash on Epoxy if text contains a MetricAffectingSpan 2021-12-13 18:16:58 +01:00
Onuray Sahin
f028f9836b Merge branch 'develop' into feature/ons/poll_timeline 
* develop: (49 commits)
  Update changelog.d/4592.bugfix
  Remove jcenter from here, let's see what the CI will say
  Common struct for each maven repo
  Rename the file to group them
  Add changelog file
  Revert PR 4592 for devtools
  Enhance include groups implementation by decoupling them to a separate file
  Cleanup
  Legals: improve API to get homeserver terms
  Legals: update setting icon
  Auto-review
  Add a help section in the settings.
  Changelog
  Color for links
  Use same height than the loading item to avoid dynamic resizing
  Legals: only display external URLs.
  Legals: Move the 2 copyrights items to the new legal screen
  Add some space between the 2 TextViews, and improve the layout
  Legals: Move the 3 element links to the new legal screen
  Rename some classes
  ...

# Conflicts:
#	vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
#	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
 2021-12-13 17:44:21 +03:00
Onuray Sahin
f6dcda6841 Code review fixes. 2021-12-13 17:37:11 +03:00
Onuray Sahin
c7ad50a4d6 Code and design review fixes. 2021-12-13 17:07:17 +03:00
Benoit Marty
04d23ce7f6 Rename for clarity 2021-12-13 14:56:21 +01:00
Benoit Marty
ab70ee5ae2 Change usage of SpannableStringBuilder when this is not required 2021-12-13 13:14:20 +01:00
Benoit Marty
5ea7f3cbca
Merge pull request #4652 from vector-im/feature/bma/avoid_useless_codegen 
Use viewBindingIgnore="true" when we do not need the ViewBinding.
 2021-12-13 12:51:05 +01:00
Benoit Marty
df3f8bd88e Use emoji2 library 2021-12-13 12:36:46 +01:00
Benoit Marty
b701bb7c1a Fix crash when using TextFuture with MetricAffectingSpan added by EmojiCompat (#4691) 2021-12-13 12:14:24 +01:00
Benoit Marty
406881c8a7
Merge pull request #4689 from vector-im/feature/aris/dev_tools_fix_4592 
Feature/aris/dev tools fix 4592
 2021-12-13 11:37:53 +01:00
Benoit Marty
3620a265d0
Merge pull request #4650 from vector-im/feature/bma/id_ref 
Cleanup id ref. Use type views instead.
 2021-12-13 11:32:18 +01:00
Benoit Marty
a6dec7b9cb
Merge pull request #4670 from vector-im/feature/bma/safer_dependencies 
Safer dependencies
 2021-12-13 11:30:15 +01:00
SpiritCroc
f1ee8183e5 Ensure unique ids for subspaces 
When you have two root spaces with the same space as subspace, and you expand both root spaces, you end up with two times the same id in the list. This has two problems:

- The expand animation is slightly broken, if you expand the second root space first and then the first one
- If you select one of these items with same id, the app crashes:
    java.lang.IllegalStateException: Two different ViewHolders have the same stable ID. Stable IDs in your adapter MUST BE unique and SHOULD NOT change.

As solution, just prefix the epoxy item ids with the parent spaces.
 2021-12-12 12:09:25 +01:00
Denys Nykula
7d169a8a8d Translated using Weblate (Ukrainian) 
Currently translated at 97.8% (2634 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-12 06:25:58 +00:00
Ihor Hordiichuk
790049f33a Translated using Weblate (Ukrainian) 
Currently translated at 97.8% (2634 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-12 06:25:58 +00:00
Benoit Marty
b49c30d879
Merge pull request #4635 from vector-im/feature/adm/debug-features-override 
Debug features override
 2021-12-11 12:39:49 +01:00
ariskotsomitopoulos
c77fa38cc3 Revert PR 4592 for devtools 2021-12-10 19:45:27 +02:00
אלון גלסמן
431064e5f8 Translated using Weblate (Hebrew) 
Currently translated at 77.0% (2075 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2021-12-10 15:26:12 +00:00
Ihor Hordiichuk
6ef556e834 Translated using Weblate (Ukrainian) 
Currently translated at 97.0% (2613 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-10 15:26:03 +00:00
Denys Nykula
e7cf9f51e7 Translated using Weblate (Ukrainian) 
Currently translated at 97.0% (2613 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-10 15:26:03 +00:00
Jozef Gaal
a940fcaf8b Translated using Weblate (Slovak) 
Currently translated at 52.6% (1417 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2021-12-10 15:26:02 +00:00
Suguru Hirahara
e8d8814c80 Translated using Weblate (Japanese) 
Currently translated at 69.3% (1868 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-12-10 15:26:02 +00:00
Linerly
d0400641e6 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2693 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-12-10 15:25:59 +00:00
Glandos
a9aea96db4 Translated using Weblate (French) 
Currently translated at 100.0% (2693 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-12-10 15:25:59 +00:00
Jiri Grönroos
07b04b6e55 Translated using Weblate (Finnish) 
Currently translated at 84.9% (2289 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2021-12-10 15:25:58 +00:00
Benoit Marty
a090642c67 Cleanup 2021-12-10 16:22:01 +01:00
Benoit Marty
ba8121641f
Merge branch 'develop' into feature/bma/avoid_useless_codegen 2021-12-10 16:09:47 +01:00
Onuray Sahin
9b2a3cf445 Code review fixes. 2021-12-10 17:57:57 +03:00
Benoit Marty
bf7907a119 Legals: improve API to get homeserver terms 2021-12-10 15:35:46 +01:00
Benoit Marty
6ba5c7af27 Legals: update setting icon 2021-12-10 15:35:46 +01:00
Benoit Marty
72bb58645b Auto-review 2021-12-10 15:35:46 +01:00
Benoit Marty
7f7199abd4 Add a help section in the settings. 2021-12-10 15:35:46 +01:00
Benoit Marty
287587f356 Color for links 2021-12-10 15:35:46 +01:00
Benoit Marty
50a84a6c56 Use same height than the loading item to avoid dynamic resizing 2021-12-10 15:35:46 +01:00
Benoit Marty
eed7d15b0e Legals: only display external URLs. 2021-12-10 15:35:46 +01:00
Benoit Marty
5823777755 Legals: Move the 2 copyrights items to the new legal screen 2021-12-10 15:35:46 +01:00
Benoit Marty
a8c921ef03 Add some space between the 2 TextViews, and improve the layout 2021-12-10 15:34:25 +01:00
Benoit Marty
e91e26ebfb Legals: Move the 3 element links to the new legal screen 2021-12-10 15:34:25 +01:00
Benoit Marty
e1fc7cfaba Rename some classes 2021-12-10 15:34:25 +01:00
Benoit Marty
411fd31d4c Legals: Trick to get the homeserver policy 2021-12-10 15:34:25 +01:00
Benoit Marty
d49a0dde6e Legals: Add the screen (WIP) 2021-12-10 15:34:25 +01:00
Benoit Marty
f340a19c8e Fix issue in disconnect identity server confirmation dialog content 2021-12-10 15:34:25 +01:00
Benoit Marty
0df11fc145 Remove unused dependency videocache 2021-12-09 23:47:04 +01:00
Benoit Marty
29837d48fe Alerter is now on Jitpack 2021-12-09 23:39:22 +01:00
Benoit Marty
45ee39f3c0 Add a TODO 2021-12-09 21:06:22 +01:00
Benoit Marty
db60a2f6d2 Upgrade flexbox to 3.0.0 
It has been moved to mavenCentral
 2021-12-09 16:05:30 +01:00
Ihor Hordiichuk
022acb39e5 Translated using Weblate (Ukrainian) 
Currently translated at 96.9% (2611 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-09 14:38:05 +00:00
Denys Nykula
e379c690b3 Translated using Weblate (Ukrainian) 
Currently translated at 96.9% (2611 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-09 14:38:04 +00:00
Onuray Sahin
be9e592aa5 Do not allow to vote the same option twice. 2021-12-09 16:08:59 +03:00
Onuray Sahin
d5f8931e20 Support to show hidden poll events as formatted. 2021-12-09 15:54:37 +03:00
Onuray Sahin
b2e599ea2b Merge branch 'develop' into feature/ons/poll_timeline 
* develop: (21 commits)
  Remove automation for new Delight board
  Remove automation for old Delight board
  Bump gradle from 7.0.3 to 7.0.4
  Bump realm-gradle-plugin from 10.8.1 to 10.9.0
  Bump libphonenumber from 8.12.38 to 8.12.39
  Bump mavericks from 2.4.0 to 2.5.0
  removing no longer possible branches
  adding a consistent padding to allow message types to avoid touching the side gutter
  Upgrade OLM to v3.2.7 and get it from our maven repository.
  removing manual send status spacing - it's no longer needed as the send status is always present (but invisible)
  removing manual end alignment for voice messages as send status gutter is now always present
  forcing the send spacing to always be taking into account - ensures all message lengths are consistent
  capping the preview image url based on the height - stops large screens eg tablets from attempting to fill the screen
  matching iOS max line rules for the preview description
  using themed colours for the close button
  limiting title to avoid overlapping with close icon
  flattening preview url view layout with custom view to reduce view hierarchy
  adding changelog entry
  updating url preview to match new designs
  removing now longer needed Mode argument
  ...

# Conflicts:
#	vector/src/main/res/layout/item_timeline_event_base.xml
 2021-12-09 15:38:15 +03:00
Onuray Sahin
04a7590804 Code review fixes. 2021-12-09 15:09:12 +03:00
ganfra
1280687640 Merge branch 'develop' into feature/fga/timeline_chunks_rework 2021-12-09 12:36:59 +01:00
ganfra
bf287d1827 Timeline: clean up 2021-12-09 12:35:23 +01:00
Benoit Marty
7c2bae3b6b
Merge pull request #4627 from vector-im/feature/adm/removing-notification-settings-v1 
Removing notification settings v1
 2021-12-09 12:30:40 +01:00
ganfra
faebf95e1c Timeline: remove LifecycleOwner on EpoxyModel as it's not used (and takes some time uselessly) 2021-12-09 12:28:53 +01:00
ganfra
31ba912d6e Timeline: url preview listen to Flow in ViewModel 2021-12-09 12:28:13 +01:00
ganfra
c830d49924 Timeline: remove onStateUpdated in controller 2021-12-09 12:27:36 +01:00
Benoit Marty
f187c30d79 OptIn layout: Create a master flow 2021-12-08 11:44:27 +01:00
Benoit Marty
a38747da22 OptIn layout: Create Flow for the buttons 2021-12-08 11:31:49 +01:00
Benoit Marty
36ff0e6e78 OptIn layout: Improve the 3 points block. Center on big screens 2021-12-08 11:30:50 +01:00
ganfra
bf1be4f20d Merge branch 'develop' into feature/fga/timeline_chunks_rework 2021-12-08 10:38:42 +01:00
Adam Brown
696ee9fdfe Translated using Weblate (Hebrew) 
Currently translated at 74.8% (2017 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2021-12-08 01:26:00 +00:00
Ihor Hordiichuk
1563f1234a Translated using Weblate (Ukrainian) 
Currently translated at 96.2% (2593 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-08 01:25:59 +00:00
LinAGKar
bfe199de9b Translated using Weblate (Swedish) 
Currently translated at 100.0% (2693 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-12-08 01:25:55 +00:00
dependabot[bot]
d2969766ca
Bump libphonenumber from 8.12.38 to 8.12.39 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.38 to 8.12.39.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.38...v8.12.39)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-08 00:42:33 +00:00
ganfra
29a4fd1e41 Timeline: make 3 integration tests passing (also add some suspend method on the timeline) 2021-12-07 21:13:41 +01:00
Onuray Sahin
0f11e498a0 Changelog added. 2021-12-07 20:13:45 +03:00
Benoit Marty
0a4e093e64 auto-review 2021-12-07 18:04:08 +01:00