Commit graph

1007 commits

Author SHA1 Message Date
Benoit Marty
91fcf428dd Login screens: login with unknown email 2019-11-22 14:21:14 +01:00
Benoit Marty
8de1fa835b Improve M_LIMIT_EXCEEDED error rendering 2019-11-22 12:15:19 +01:00
Benoit Marty
af45c554fd Login screens: fix scroll issue 2019-11-22 12:15:19 +01:00
Benoit Marty
489a594027 Login screens: ensure forms are scrollable on small screens 2019-11-22 12:15:19 +01:00
Benoit Marty
3f83c161e4 Login screens: fix code quality issues 2019-11-22 12:15:19 +01:00
Benoit Marty
71ae3c4a8c Login screens: reset password: display a warning when the process is not finished 2019-11-22 12:15:19 +01:00
Benoit Marty
90027cc4d5 Login screens: reset password WIP 2019-11-22 12:15:19 +01:00
Benoit Marty
2789268c23 Login screens: MSISDN: check format and compute country code 2019-11-22 12:15:19 +01:00
Benoit Marty
127916a8d9 Login screens: add MSISDN 2019-11-22 12:15:19 +01:00
Benoit Marty
b8a3ad0c43 Login screens: Wait for email validation screen 2019-11-22 12:15:19 +01:00
Benoit Marty
23315ede92 Login screens: update wording 2019-11-22 12:15:19 +01:00
Benoit Marty
f74cabd145 Login screens: UI: style to prepare for landscape 2019-11-22 12:15:19 +01:00
Benoit Marty
0e2237226f Login screens: back button management for registration 2019-11-22 12:15:19 +01:00
Benoit Marty
7caa8ce3bc Login screens: disabled registration 2019-11-22 12:15:19 +01:00
Benoit Marty
20f969d563 Login screens: fix issue on terms 2019-11-22 12:15:19 +01:00
Benoit Marty
a8f24e5c39 Login screens: a11y 2019-11-22 12:15:19 +01:00
Benoit Marty
1dc7dfc896 Login screens: registration fallback 2019-11-22 12:15:19 +01:00
Benoit Marty
381084b2ab Login screens: USER_IN_USE error 2019-11-22 12:15:19 +01:00
Benoit Marty
41ac2c6d70 Login screens: Registration WIP 2019-11-22 12:15:19 +01:00
Benoit Marty
08ea3d049e Login screens: Simple Input form (UI) 2019-11-22 12:15:19 +01:00
Benoit Marty
b5f9549a8b Login screens: Fix issues on button style 2019-11-22 12:15:19 +01:00
Benoit Marty
416bef7903 Login screens: button theme 2019-11-22 12:15:19 +01:00
Benoit Marty
823acebf78 Login screens: harmonize styles for containers 2019-11-22 12:15:19 +01:00
Benoit Marty
2871e4f5b1 Login screens: forget password screens 2019-11-22 12:15:19 +01:00
Benoit Marty
b7bfb20a2e Login screens: login and registration fallback 2019-11-22 12:15:19 +01:00
Benoit Marty
c6b0ae63ea Login screens: handle loading Views and global navigation - WIP 2019-11-22 12:15:19 +01:00
Benoit Marty
6525314af8 Login screens: server ur form 2019-11-22 12:15:19 +01:00
Benoit Marty
da8d6fb4f4 Login screens: signup signin selection 2019-11-22 12:15:19 +01:00
Benoit Marty
fa6a9cab7e Login screens: server selection 2019-11-22 12:15:19 +01:00
Benoit Marty
bdfc4ad8a7 Login screens: splash screen 2019-11-22 12:15:19 +01:00
Andrew Morgan
3673520ef6
Small typo fix 2019-11-18 13:30:03 +00:00
ganfra
8aab46804b Profile room: continue working on it (try to get a nice animation) [WIP] 2019-11-15 20:37:36 +01:00
ganfra
c7db695e67 Timeline: handle join rules event 2019-11-14 12:21:55 +01:00
Benoit Marty
fc3d4187d1
Merge pull request #676 from vector-im/feature/long_click_room
Add help to reveal the long click on a room
2019-11-12 18:29:42 +01:00
Benoit Marty
5449592422 Add action to block user in the message action bottom sheet (following Nad's design) 2019-11-12 17:52:03 +01:00
Benoit Marty
fc91694bdd
Merge pull request #673 from vector-im/feature/us
Update strings
2019-11-12 12:08:55 +01:00
Benoit Marty
08c864bad7 Add help to reveal the long click on a room 2019-11-12 11:39:47 +01:00
ganfra
61ac250e2b Merge branch 'develop' into feature/room_list_actions 2019-11-07 15:43:21 +01:00
Benoit Marty
9c952b6bc8 Display ignored users list 2019-11-07 14:18:57 +01:00
Benoit Marty
d0c3271628 Import string from Riot-Android and fix #671 2019-11-06 18:19:37 +01:00
ganfra
945e5d5a74 Merge branch 'develop' into feature/room_list_actions 2019-11-04 17:17:43 +01:00
Benoit Marty
b3233d3eb7 Change spoiler bg colors 2019-11-04 16:50:32 +01:00
Valere
3c4c0ed46a Add /spoiler command 2019-11-04 16:50:32 +01:00
Benoit Marty
9fdfd091ac
Merge branch 'develop' into feature/search_reaction 2019-11-04 15:51:16 +01:00
ganfra
6177e69855 Merge branch 'develop' into feature/room_list_actions 2019-11-04 15:11:20 +01:00
ganfra
6ebe5532c5 Room list actions: use new strings 2019-11-04 14:59:12 +01:00
ganfra
57b640622b Sender Name: we should use disambiguated display name over senderName. PrevContent fallback is now handled in SDK 2019-10-28 16:48:55 +01:00
Valere
199456487c Search reaction by name/keywords 2019-10-28 14:36:15 +01:00
ganfra
cb275aee37 Room list actions: start showing items and refact a bit RxStore 2019-10-24 19:11:49 +02:00
Benoit Marty
bdee5e0687 Fix warning on Strings 2019-10-23 15:17:21 +02:00
Benoit Marty
ff81715783 Import Strings from Riot 2019-10-23 14:18:40 +02:00
ganfra
2974f8b200 Merge branch 'develop' into feature/attachments 2019-10-22 17:27:15 +02:00
ganfra
7388a408b8 Permissions: allow to provide the rationale message as it requires "context" and cannot be generic 2019-10-22 17:13:38 +02:00
Benoit Marty
4a6237b50e Report content: confirmation dialogs 2019-10-21 17:22:00 +02:00
Benoit Marty
8d0aa0437c Report content: UI menu 2019-10-21 17:21:26 +02:00
ganfra
05a069be04 Attachments: fix themes for selection view 2019-10-16 10:04:33 +02:00
ganfra
13a5f784dc Merge branch 'develop' into feature/attachments 2019-10-11 17:05:03 +02:00
ganfra
0ca8696e88 Attachments/Share: cleaning code and add contact picking 2019-10-11 16:41:04 +02:00
ganfra
ee5ebb4b83 Attachments: get better layout 2019-10-11 12:20:39 +02:00
ganfra
20696353b8 Attachments: try to improve a bit the UI and adding options [WIP] 2019-10-10 19:12:16 +02:00
Benoit Marty
d387c310c8 Cleanup code after a11y PR (#596) and fix some merging issues 2019-10-07 18:41:44 +02:00
Benoit Marty
ac6aff9175
Merge pull request #596 from pvagner/a11y
more a11y tweaks
2019-10-07 17:15:29 +02:00
Peter Vágner
5db3c81aa9 Add contentDescription to the jump to botton view
Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
2019-10-02 20:51:57 +02:00
Peter Vágner
53543453b3 Login: add contentDescription to password reveal
Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
2019-10-02 20:04:33 +02:00
Peter Vágner
7ef471ad0d Add contentDescription for the read receipts
Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
2019-10-02 20:04:33 +02:00
ganfra
ff7856c535 Optimize: start removing some constraint layout from timeline 2019-10-02 19:30:01 +02:00
ganfra
a3f561d788 Merge branch 'develop' into feature/read_marker 2019-09-26 12:19:40 +02:00
Benoit Marty
62b7a83a31 Update after Dominaezzz's review 2019-09-26 10:08:44 +02:00
Benoit Marty
a0b1ef3216 Do not upload file to big for the homeserver (#587)
Also create a HomeServerCapabilitiesService which provide configuration of the homeserver.
Data are retrieved every 8 hours (as RiotWeb?)
2019-09-25 16:59:50 +02:00
ganfra
05d09bf950 Merge branch 'develop' into feature/read_marker 2019-09-24 11:10:59 +02:00
Benoit Marty
c1f2e9f171 Fix a few accessibility issues - home menu (best compromise) 2019-09-23 17:48:13 +02:00
Benoit Marty
620ba279d8 Fix a few accessibility issues 2019-09-23 16:32:54 +02:00
ganfra
d1ff3314a7 Timeline : add badge on jump to bottom view 2019-09-19 19:12:45 +02:00
Benoit Marty
3739e50d46 Better error message for timeout 2019-09-17 14:55:48 +02:00
Benoit Marty
6bda437f5d Auto configure homeserver and identity server URLs of LoginActivity with a magic link 2019-09-16 10:58:51 +02:00
Benoit Marty
3e6b65e174 Handle M_CONSENT_NOT_GIVEN error (#64) 2019-09-13 18:21:56 +02:00
Benoit Marty
e89ba7b87b Update wording 2019-09-05 15:23:38 +02:00
Valere
eec2abf164 Reduce release build log level 2019-09-02 14:33:53 +02:00
Benoit Marty
47d22a3d5e Import translation from Riot and MatrixSDK 2019-08-30 11:21:43 +02:00
Valere
166be4e289 Improve read receipt design 2019-08-28 09:56:10 +02:00
ganfra
bc1350aaf5
Merge pull request #484 from vector-im/feature/timeline_read_receipts
Feature/timeline read receipts
2019-08-19 14:29:59 +02:00
ganfra
e11c66035c Theme: the action menu text items should use colorAccent 2019-08-14 14:19:21 +02:00
ganfra
1dbb02a80d Read receipts: create custom view to use it wherever we want easily 2019-08-08 17:51:06 +02:00
Benoit Marty
81c7f694d6 Import Strings form Riot 2019-08-07 16:10:50 +02:00
Benoit Marty
20437446b4 Add "View Edit History" item in the message bottom sheet (#401) 2019-08-07 13:05:22 +02:00
ganfra
77c4355aed Merge branch 'develop' into feature/room_update 2019-07-31 14:27:12 +02:00
ganfra
dc4786ecf0 Room upgrade: add rx flux and handle failures more precisely 2019-07-30 19:13:09 +02:00
Valere
000db4b192 Basic Message Failure support + Resend (text only)
+ clean worker inputs when starting new independent task in unique queue
2019-07-30 17:53:43 +02:00
ganfra
ab25980c4e
Merge pull request #437 from vector-im/feature/create_direct_room
Feature/create direct room
2019-07-30 15:13:30 +02:00
ganfra
65f0af918f Remove default identity server as we don't use it. 2019-07-29 18:26:26 +02:00
ganfra
76a9625f25 Direct chat : finalize flow 2019-07-25 16:34:27 +02:00
ganfra
5af6bf3762 Direct room: finally handle selection with chips (not as Nad design) 2019-07-25 16:34:27 +02:00
ganfra
2c81e41288 Merge branch 'develop' into feature/create_direct_room 2019-07-19 18:18:22 +02:00
Benoit Marty
cd6624a8a6 Fix issue on setting screen: bad alignment of title 2019-07-19 15:15:29 +02:00
ganfra
001603cf9a Create direct room: add filtering and enhance design a bit 2019-07-18 17:42:22 +02:00
Benoit Marty
f0671b9e73 "Riot X" -> "RiotX" 2019-07-18 14:28:46 +02:00
Benoit Marty
e218691bf2 Import strings and translation from Riot 2019-07-18 14:25:34 +02:00
Valere
22dc2a6790 Fix Copying link from a message shouldn't open context menu 2019-07-17 14:36:47 +02:00
Benoit Marty
0be987ac0d
Merge branch 'develop' into feature/better_long_tap_menu 2019-07-17 14:28:36 +02:00
Benoit Marty
e3e86c0a41
Merge pull request #383 from vector-im/feature/filter_params
Pass filter to room directory screen or create room screen
2019-07-17 14:20:29 +02:00
Benoit Marty
0ddef67cc9 Migrate to rxbinding 3 and fix bad layout for room directory filter (Fixes #349) 2019-07-17 14:16:20 +02:00
Benoit Marty
896e582a9c Create style VectorSearchView 2019-07-17 14:16:20 +02:00
Benoit Marty
b654025a3b Fix alignment issue in toolbars 2019-07-17 12:38:35 +02:00
Valere
9494174c33 Swipe to reply in timeline (lab) 2019-07-17 10:54:15 +02:00
Valere
2f01ad99b3 Compact long tap menu 2019-07-16 16:35:36 +02:00
Benoit Marty
bb3b5788ba Update hint from design 2019-07-16 16:35:10 +02:00
Benoit Marty
42584fc55a
Merge pull request #372 from vector-im/feature/room_filtering
Room filtering
2019-07-16 11:41:08 +02:00
Valere
020c32bb1a Fix / composer separator color was using a clear theme color 2019-07-15 17:46:24 +02:00
Benoit Marty
3c25088243 Filter rooms 2019-07-15 17:26:48 +02:00
Valere
25f1d21bc7 Edit history
Get history from API


cleaning


Updated change log


Missing copyrights


Code review


cleaning
2019-07-15 14:57:12 +02:00
Benoit Marty
33252c3b65 Green text color during encrypting 2019-07-12 10:16:43 +02:00
Benoit Marty
919dec4a56 Add ".debug" to the applicationId to be able to install the app along with the prod version 2019-07-11 17:59:07 +02:00
Benoit Marty
f65becf7c0 Rework login screen before release 2019-07-11 14:38:30 +02:00
Benoit Marty
d613abf4b4 i18n edited_suffix 2019-07-10 15:29:52 +02:00
Benoit Marty
a07f8b615e Download file - WIP 2019-07-09 15:03:21 +02:00
Benoit Marty
8a5612be3d Send file: improve UI feedback 2019-07-09 15:02:31 +02:00
Benoit Marty
5322251bc0 Fix wording for direct message tab 2019-07-04 15:37:19 +02:00
Benoit Marty
a476ac71da Import translations from Riot 2019-07-03 10:20:07 +02:00
Benoit Marty
77fd7cd33c Update wording 2019-07-02 20:48:20 +02:00
Benoit Marty
95ea6db946 Change name from "Riot X" to "RiotX" 2019-07-02 10:42:45 +02:00
Benoit Marty
07309c90e1 Room list: rework invitations 2019-07-01 16:29:04 +02:00
Valere
b14a6224ba Add lab option to show hidden events in timeline
+ cleaning labs settings
2019-06-28 12:45:08 +02:00
Benoit Marty
a550743f2f Report suggestion feature 2019-06-28 10:40:00 +02:00
Benoit Marty
bd8d6f92da Update wording 2019-06-27 16:04:02 +02:00
Benoit Marty
f9c8e4f85a Show disclaimer at first launch (Fixes #215) 2019-06-27 16:01:11 +02:00
Valere
338de3ebf5 Cleans notification pref screen
+ fix troubleshoots
2019-06-27 12:21:38 +02:00
Benoit Marty
f092c40999
Merge pull request #228 from vector-im/feature/settings_v2
Split settings into sub sections
2019-06-27 11:54:03 +02:00
Benoit Marty
679a4c7f31 Add ignored users icon in the root settings 2019-06-27 10:17:57 +02:00
Benoit Marty
9fd9124643 Disable some unimplemented pref 2019-06-26 17:43:36 +02:00
Valere
289b2a4eb1 Launch icons update 2019-06-26 17:14:28 +02:00
Benoit Marty
5feebeba01 Integrate new icons for preference root screen 2019-06-26 15:01:46 +02:00
Benoit Marty
328f090723 Code quality: i18n 2019-06-26 12:19:54 +02:00
Valere
0584fc3666 Get real push rules from server and evaluate them 2019-06-26 12:19:54 +02:00
Valere
0e46fc4c0a WIP 2019-06-26 12:19:54 +02:00
Valere
8fe0bd5abe
Merge pull request #214 from vector-im/feature/update_quick_reactions
Feature/ Update quick reactions
2019-06-25 15:47:17 +02:00
Benoit Marty
625242a3d9 handle all themes 2019-06-25 09:34:12 +02:00
Benoit Marty
76ade2957e Handle permalink click 2019-06-25 09:34:12 +02:00
Benoit Marty
9d3a8e7c40 Add usage of com.google.android.gms:oss-licenses-plugin to list open source licenses 2019-06-25 09:31:45 +02:00
Valere
43ead66991 Update quick reactions to new design 2019-06-24 16:13:58 +02:00
Benoit Marty
1cfc85a772 Display some version of Riot and SDK (Fix #185) 2019-06-21 11:13:16 +02:00
Benoit Marty
53bdd58c1b Fix UI issue on BugReportActivity (send button not visible) 2019-06-18 10:25:13 +02:00
Benoit Marty
907a1d1a4b Import keys: WIP 2019-06-17 19:05:26 +02:00
Benoit Marty
97b066b8fa Import strings from Riot 2019-06-17 14:55:17 +02:00
Benoit Marty
ab95cbee92 Improve keys backup banner rendering 2019-06-13 14:20:43 +02:00
Benoit Marty
6cd3b4dd95 Import https://github.com/vector-im/riot-android/pull/3111/files in RiotX 2019-06-13 10:33:04 +02:00
Benoit Marty
480d197ffa Keys share request handling 2019-06-12 18:32:24 +02:00
Benoit Marty
af1a48d918 SAS: fix issue on emoji rendering 2019-06-12 15:44:25 +02:00
Benoit Marty
b47ef9220e Keys backup: migrate settings to Epoxy and MvRx 2019-06-12 13:09:43 +02:00
Benoit Marty
53dd9c3427 Keys backup fix some issue on layout 2019-06-11 16:48:48 +02:00
Benoit Marty
6dacb9894e Merge branch 'develop' into feature/crypto 2019-06-11 10:11:53 +02:00
Benoit Marty
4c5bffe0f5 Create room screen - WIP TODO: screen rotation - navigate to created room 2019-06-10 13:39:51 +02:00
ganfra
07c516ccdd Merge branch 'develop' into feature/crypto 2019-06-07 19:25:55 +02:00
ganfra
81330d30cf Merge branch 'develop' into feature/crypto 2019-06-07 18:53:24 +02:00
Valere
5f34e58bd3 Fix / style on emoji picker appbar layout 2019-06-07 14:29:42 +02:00
Valere
053dc1d8dd Show 'view reaction' option in context menu 2019-06-07 14:14:51 +02:00
Valere
440442bb99 New View Reactions bottom sheet
+ visible on reaction long click
+ Reaction pills size adapt to count, and number format
2019-06-07 14:14:51 +02:00
Valere
ecccb80e04 Fix / No elevation on toolbars
In order to work se need to set a background on toolbar
2019-06-07 13:26:03 +02:00
Benoit Marty
f2da46b5f9 Dark dialog 2019-06-06 19:09:59 +02:00
Benoit Marty
1f85f4a007 Remove unused themes 2019-06-06 18:47:27 +02:00
Benoit Marty
bfbb29b2cf Theme FAB menu 2019-06-06 16:45:45 +02:00
Benoit Marty
dd563ec9ae Fix issue in theme 2019-06-06 15:56:05 +02:00
Benoit Marty
e2d36aa213 Fix issue in theme 2019-06-06 15:24:04 +02:00
Benoit Marty
2cc2844abf Fix issue in theme 2019-06-06 15:16:56 +02:00
Benoit Marty
75b8932395 Fix issue in theme 2019-06-06 14:37:30 +02:00
Benoit Marty
8afe31192b Fix issue in themes 2019-06-06 09:50:26 +02:00
Benoit Marty
acedff4e89 FAB Menu
FAB Menu WIP

FAB Menu WIP

FAB Menu WIP
2019-06-05 18:59:50 +02:00
Benoit Marty
94c91e0dae Theme rework WIP 2019-06-05 15:58:00 +02:00
Benoit Marty
48fadd1a11 Theme rework WIP 2019-06-05 15:27:35 +02:00
Benoit Marty
51f5594ea0 Theme rework WIP 2019-06-05 14:57:30 +02:00
Benoit Marty
2b6eee4237 Merge branch 'develop' into feature/home_rework 2019-06-04 12:54:16 +02:00
Benoit Marty
fc5edcdf0f Expanding Fab menu 2019-06-04 10:14:48 +02:00
Benoit Marty
c1fa728c24 Public rooms little rework 2019-06-03 16:44:31 +02:00
Benoit Marty
12b03a844d Room preview world readable room 2019-06-03 14:29:29 +02:00
Benoit Marty
9da727b623 All caught up screen 2019-05-29 16:20:25 +02:00
Benoit Marty
6244913ab9 Join room from room preview 2019-05-28 17:21:54 +02:00
Benoit Marty
33fbcc8ba3 RoomPreview when the room is not world readable 2019-05-28 15:58:30 +02:00
Benoit Marty
dde94c0d0f Plug screens together 2019-05-27 17:28:18 +02:00
Valere
00d66ffd48
Merge branch 'develop' into feature/edit_message 2019-05-27 17:08:39 +02:00
Benoit Marty
02555fcbac Fix compilation issues after rebase 2019-05-27 15:43:26 +02:00
ganfra
eb2344a43f Home: continue room list rework. 2019-05-27 15:32:20 +02:00
ganfra
c0fd06fd2d Home: start reworking room list. 2019-05-27 15:31:26 +02:00
Benoit Marty
39f69a6c3b Code quality 2019-05-27 14:00:13 +02:00
Benoit Marty
fe6e27fd6a Create ButtonStateView with some custom attributes 2019-05-27 12:08:18 +02:00
Valere
0e06908a48 Design update
+ Reply 
+ Better preview in action menu
2019-05-27 11:55:52 +02:00
Benoit Marty
128dea2677 Scope and error manager 2019-05-24 22:27:26 +02:00
Benoit Marty
877de1f597 Get Public rooms and join public room 2019-05-24 11:36:04 +02:00
Valere
45ea5c356e WIP / edit message 2019-05-23 16:44:51 +02:00
Valere
6f103101b6 Show edited annotation in timeline + simple edit history 2019-05-21 14:12:18 +02:00
Valere
6eafa3c43d Undo Reaction 2019-05-20 10:16:00 +02:00
ganfra
2780ca30a8 Merge branch 'feature/invites' into develop 2019-05-17 17:38:09 +02:00
Benoit Marty
1436667e7d Crypto 2019-05-16 10:34:17 +02:00
Valere
11e3a5def8 Moved reactions view to a stub 2019-05-16 09:20:24 +02:00
ganfra
f60a5f568f Invitation : start polishing but theme has to be rework. Waiting for Nad inputs. 2019-05-14 11:55:48 +02:00
Valere
00fd866cc8 Reactions: Display existing reactions below the message
- Reaction Button Bellow the message
- Upgrade to constraint layout 2.0.0 beta (for Constraint Helpers / Flow)
- Added tap on member name action
- Cleaning
2019-05-14 11:07:53 +02:00
Valere
608bbdd4ee Refactoring / Use view ViewStub to avoid layout xml duplication 2019-05-10 18:31:56 +02:00
Valere
6bf1deb99b Code Review 2019-05-10 12:14:40 +02:00
Valere
dcc430f91b Refactoring / revert reaction module to package in main module 2019-05-09 18:26:32 +02:00
Valere
64216f74ae fix / code quality 2019-05-09 09:15:30 +02:00
Valere
56a2a3a065 [WIP] Emoji Reactions 2019-05-07 18:01:51 +02:00
ganfra
dcac9aed55 Merge branch 'feature/media_attachment' into develop 2019-04-11 13:21:51 +02:00
ganfra
0225fc7120 Media upload: handle local echo by pinning at the bottom... will probably be changed 2019-04-11 12:48:35 +02:00
Benoit Marty
82d89825d3 Differentiate icon from Riot one 2019-04-04 11:10:31 +02:00
Benoit Marty
3091a337c9 Launcher + Animated logo 2019-04-03 14:46:15 +02:00
Benoit Marty
c188bb290f Not implemented toast or Snackbar 2019-04-03 14:08:25 +02:00
Benoit Marty
6830957d31 Import settings from Riot - not all fonctional of course 2019-04-02 18:08:43 +02:00
Benoit Marty
10520fb1bd Upgrade string from Riot 2019-04-02 11:57:12 +02:00
Benoit Marty
9048a1dbbe Rename app to vector 2019-04-02 11:24:54 +02:00