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

742 Commits

Author SHA1 Message Date
Valere 3aea0a50ca
Merge branch 'develop' into feature/pending_edits_ux 2019-07-22 23:53:16 +02:00
Valere ab87a3caea
Merge pull request #397 from vector-im/feature/animation_image_preview 
Better image fullscreen preview animation
 2019-07-22 23:37:15 +02:00
Valere c58328f94e cleaning / review 2019-07-22 23:36:19 +02:00
ganfra 03974c8bdf Create Direct Room : fix loading/error state (WIP) 2019-07-22 19:01:17 +02:00
ganfra 2c81e41288 Merge branch 'develop' into feature/create_direct_room 2019-07-19 18:18:22 +02:00
ganfra cb44ab547c Create direct room: almost finished, still need to handle showing selected users in search field 2019-07-19 18:12:42 +02:00
Benoit Marty 6d01a570fd Clear notification for a room left on another client 2019-07-19 16:44:30 +02:00
Valere 4a2bf0d6c6 Cleaning Lint 2019-07-19 16:18:47 +02:00
Valere 36af8a6a9f Lab / show replace in timeline when show hidden event selected 2019-07-19 16:13:55 +02:00
Valere 40a68c3e9f Show pending edits by fading the event body #193 
+ Fix issues with edits local echo management in aggregation
 2019-07-19 16:13:35 +02:00
Benoit Marty 1a4ec34bb2 Code cleanup 2019-07-19 16:03:37 +02:00
Benoit Marty 10490e3aa6 Close detail room screen when the room is left with another client (#256) 2019-07-19 16:00:06 +02:00
Benoit Marty cd6624a8a6 Fix issue on setting screen: bad alignment of title 2019-07-19 15:15:29 +02:00
Valere 3965218bf9 Cleaning / Review 2019-07-19 12:12:17 +02:00
Valere d78ff7ab08 Fix / can't zoom after rotation 2019-07-19 11:58:24 +02:00
Valere c00dbce536 Fix #390 
(edited) string in edited message body
 2019-07-19 09:58:53 +02:00
Valere db88caf7fa Better image fullscreen preview animation 2019-07-18 18:53:46 +02:00
Benoit Marty c3d945d6bb Version++ 2019-07-18 17:48:56 +02:00
Benoit Marty d609c49b31 Prepare release 0.2.0 2019-07-18 17:47:24 +02:00
ganfra 001603cf9a Create direct room: add filtering and enhance design a bit 2019-07-18 17:42:22 +02:00
Valere d87ee32422
Merge pull request #384 from vector-im/feature/edit_e2e 
Feature/edit e2e
 2019-07-18 16:44:44 +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 9c67036c08 Fix / keyboard won't show when using reply from long tap menu 2019-07-18 12:13:17 +02:00
ganfra 62657538af
Merge pull request #389 from vector-im/feature/cleanup 
Do not show invitation in the filtered room list
 2019-07-18 12:10:47 +02:00
Valere 5438207fba faster animation for quick reply 2019-07-18 12:01:23 +02:00
Benoit Marty fe88aaffbd Inject RoomListNameFilter 2019-07-18 11:39:13 +02:00
Benoit Marty 21ba72e5e7 Do not show invitation in the filtered room list 2019-07-18 11:34:49 +02:00
Benoit Marty 0afde3b021 Rename class member for code clarity 2019-07-18 11:07:09 +02:00
ganfra 4341b0d0f5 Merge branch 'develop' into feature/create_direct_room 2019-07-18 09:47:25 +02:00
Valere 51fdccb393 cleaning 2019-07-18 09:29:27 +02:00
Benoit Marty 977721881f Cancel invitation notification when handling the invitation in the application 2019-07-17 18:35:41 +02:00
ganfra 838003b68a Create direct room: start creating all the required stuff 2019-07-17 18:30:14 +02:00
Valere 7d41352918 Fix / edit reply was quoting wrong text 
+ e2e reply of edit
 2019-07-17 16:46:56 +02:00
Valere 077396a832 E2E replies 
+ Edit History / support e2e and use original event
 2019-07-17 16:20:12 +02:00
Benoit Marty fc9ef579ca
Merge pull request #381 from vector-im/feature/room_members_perf 
Feature/room members perf
 2019-07-17 15:01:06 +02:00
Benoit Marty 77fa5af1b8 Fix compilation issue after merge 2019-07-17 14:58:23 +02:00
Benoit Marty 90d25ff45e Code cleanup 2019-07-17 14:41:01 +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 927cd7285d
Merge pull request #378 from vector-im/feature/fix_sync_thread_wrong_autostart 
Fix / SyncThread was started in background
 2019-07-17 14:32:19 +02:00
Benoit Marty 0be987ac0d
Merge branch 'develop' into feature/better_long_tap_menu 2019-07-17 14:28:36 +02:00
Valere 4bfaa00be4 Fix / clean bad method name 2019-07-17 14:27:02 +02:00
Benoit Marty 8e78d8a58d
Merge pull request #380 from vector-im/feature/rs_crash_steve 
Fix a crash in notificationwhen display name is empty
 2019-07-17 14:22:45 +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 c647648e79
Merge pull request #371 from vector-im/feature/composer_fix_edit_reply 
Feature/composer fix edit reply
 2019-07-17 14:03:10 +02:00
Benoit Marty b654025a3b Fix alignment issue in toolbars 2019-07-17 12:38:35 +02:00
Benoit Marty 786a7d7560 Rename id 2019-07-17 12:20:11 +02:00
Benoit Marty b935b9311e Scroll the list to top after each new filter 2019-07-17 12:18:45 +02:00
Benoit Marty 8e12f71535 Add top left back button 2019-07-17 12:16:10 +02:00
Benoit Marty 7eea2ccfb4 Fix infinite opening of room once the room is created 2019-07-17 12:09:09 +02:00
Benoit Marty c32ef02a12 Pre fill the room directory filter and and the room name with the already entered string from the user 2019-07-17 12:04:19 +02:00
Benoit Marty 3651ec4870 Add some doc 2019-07-17 11:58:18 +02:00
Valere 9494174c33 Swipe to reply in timeline (lab) 2019-07-17 10:54:15 +02:00
ganfra a8f06f609b Use latest retrofit version to properly cancel requests 
Fix cancelation requests
 2019-07-16 17:46:52 +02:00
Valere 9bdea5b325 Change order of actions (and reply on top) 2019-07-16 16:35:57 +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 0f7a56d005 Use Session.myUserId whereas it's possible 2019-07-16 15:54:00 +02:00
Valere 63d2861bc8 Fix / SyncThread was started in background 
Upon reception of a push, is the session is instantiated the sync thread was starting to loop
 2019-07-16 15:44:08 +02:00
Benoit Marty 6bbc784c29 Fix crash (from Steve's rageshake) 2019-07-16 15:42:02 +02:00
Valere c6fd625761 code review 2019-07-16 14:56:16 +02:00
Valere d8092abc4e fix / strip reply prefix on history 2019-07-16 14:39:46 +02:00
Valere 6effb90361 Fix / edit of reply and edit of edit of reply 2019-07-16 14:39:05 +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 efd973208f Green close icon 2019-07-15 17:35:51 +02:00
Benoit Marty 30a6c98c08 Room name in bold 2019-07-15 17:29:37 +02:00
Benoit Marty 61bb4c0427 Introduce CreateRoomActivity, a simple container for [CreateRoomFragment] 2019-07-15 17:26:48 +02:00
Benoit Marty 3c25088243 Filter rooms 2019-07-15 17:26:48 +02:00
Benoit Marty fc1c0caea3 Avoid displaying two loaders if there is no elements between them 2019-07-15 17:25:59 +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 0289d2ee87 Simpler code 2019-07-15 10:48:44 +02:00
Benoit Marty 222201cc64 Fix crash observe on the PlayStore (#341) 2019-07-15 10:48:44 +02:00
Benoit Marty b15dea6de3
Merge pull request #338 from vector-im/feature/green_encrypt 
Text in green when encrypting
 2019-07-15 10:46:44 +02:00
Benoit Marty 2ba83e456d
Merge pull request #343 from vector-im/feature/click_on_redacted_event 
Handle click on redacted event
 2019-07-15 10:46:06 +02:00
Benoit Marty e2ea76f871 Fix crash reported by PlayStore 2019-07-12 16:48:35 +02:00
Benoit Marty 3625c462f0 Click on redacted event 2019-07-12 13:51:37 +02:00
Benoit Marty 41465450d8 Code cleanup 2019-07-12 10:45:08 +02:00
Benoit Marty bd009caaf1 Code cleanup 2019-07-12 10:22:58 +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 43b3680774 Prepare next release 2019-07-11 17:44:58 +02:00
Benoit Marty 52dced43ff Fix version code issue 2019-07-11 16:49:06 +02:00
ganfra 252b2ea30a
Merge pull request #334 from vector-im/feature/general_perf 
Feature/general perf
 2019-07-11 15:52:00 +02:00
Benoit Marty f65becf7c0 Rework login screen before release 2019-07-11 14:38:30 +02:00
Valere d0b145d031 Edit emote 2019-07-11 12:29:02 +02:00
Valere 98306e223b
Merge pull request #322 from vector-im/feature/clean 
Improve reply feature
 2019-07-11 11:46:00 +02:00
Benoit Marty c9fe1adb77 Add a debug button to test crash of the app 2019-07-11 10:36:59 +02:00
ganfra 1b95336ad3 EventEntity|TimelineEventEntity : remove UUID as primary key and use auto-incremented Long 2019-07-11 10:25:30 +02:00
Valere 54b1d18812 Merge remote-tracking branch 'origin/feature/clean' into feature/clean 2019-07-10 18:07:03 +02:00
Valere 3aa30e5f15 Fix reply of reply 2019-07-10 18:06:44 +02:00
Benoit Marty ddf4a81905 Do not display the banner when keys backup is sending keys 2019-07-10 18:04:27 +02:00
Benoit Marty 794fd650a4 Mutualize code, and also, when replying to an edited event, use the last text in the reply prefix content 2019-07-10 17:37:22 +02:00
Benoit Marty 9a57a02996 Cleaner code: add TimelineEvent to special modes 2019-07-10 17:05:32 +02:00
Benoit Marty 7e8cd07e1e Do not send edition if text is identical 2019-07-10 16:32:44 +02:00
Benoit Marty d613abf4b4 i18n edited_suffix 2019-07-10 15:29:52 +02:00
Benoit Marty c8ab53e39c Video visibility fix 2019-07-10 14:11:49 +02:00
Benoit Marty e6409d4c60 Create a common canReact() method 2019-07-10 12:10:55 +02:00
Benoit Marty 19c7de687e We can react on e2e room text event 2019-07-10 11:51:09 +02:00
Benoit Marty 1918302297 Reply with formatted content 2019-07-10 11:29:47 +02:00
Valere a09850b16c
Merge pull request #316 from vector-im/feature/initial_sync_progress 
Feature/initial sync progress
 2019-07-09 17:58:24 +02:00
Valere c9931e3ba3 Block interaction on initial sync 2019-07-09 17:36:08 +02:00
Valere fc302c1b5a FIx / crash notification drawer empty nam 2019-07-09 17:35:50 +02:00
Benoit Marty 34ac987494 Cleanup 2019-07-09 16:36:46 +02:00
Benoit Marty 8a0c9ae9b0 Rename PreferencesManager to VectorPreferences for code clarity 2019-07-09 16:29:24 +02:00
Benoit Marty a79227424f Convert PreferencesManager file to Kotlin 2019-07-09 16:07:16 +02:00
Benoit Marty ffe0b9712c Convert file to Kotlin 2019-07-09 15:50:15 +02:00
Valere fa81d1a9c7 Fix / revert bad refactor rename 2019-07-09 15:38:44 +02:00
Valere dba4df6836 clean 2019-07-09 15:38:44 +02:00
Valere 95d83db90c WIP 2019-07-09 15:38:44 +02:00
Benoit Marty 0919b9460d Code quality: split long lines 2019-07-09 15:26:32 +02:00
Benoit Marty ba589e7961 Add missing permission request 2019-07-09 15:03:21 +02:00
Benoit Marty 5dc83d64c1 Fix compilation issue 2019-07-09 15:03:21 +02:00
Benoit Marty 9a4eb8e9a4 add getFileUrl extension 2019-07-09 15:03:21 +02:00
Benoit Marty 058e7153a1 Fix bug 2019-07-09 15:03:21 +02:00
Benoit Marty d7b2371854 Add long click listener to file items 2019-07-09 15:03:21 +02:00
Benoit Marty b0c939866f Download file - typo 2019-07-09 15:03:21 +02:00
Benoit Marty a07f8b615e Download file - WIP 2019-07-09 15:03:21 +02:00
Benoit Marty 12bd85e0a9 Decrypt video file 2019-07-09 15:02:31 +02:00
Benoit Marty 1b82ed5abb Fix regression 2019-07-09 15:02:31 +02:00
Benoit Marty ea77686746 Send file: cleanup 2019-07-09 15:02:31 +02:00
Benoit Marty 8a5612be3d Send file: improve UI feedback 2019-07-09 15:02:31 +02:00
Valere b73d3b15f8
Merge pull request #317 from vector-im/feature/realm_entity_rework 
Feature/realm entity rework
 2019-07-09 15:01:05 +02:00
Valere 8777d13d8b Fix / view source, decrypted source was not correct 2019-07-09 14:22:40 +02:00
Valere d52613d723 Trick / Remove home progress blank paddings 2019-07-09 11:17:36 +02:00
ganfra dd07f5c2a6 TimelineEvent : update sender data when loading room members and prune event (+ remove RoomSummaryMapper param) 2019-07-08 15:32:24 +02:00
Valere 7e6e09bc19 fix / compilation 2019-07-08 15:30:11 +02:00
Valere 1d11a163af Notification resolver try to decrypt 2019-07-08 15:08:49 +02:00
Valere 25bc5001f9 RoomSummary / Use encrypted message screen 2019-07-08 14:57:37 +02:00
Valere ee27d3e047 Fix / clear unknown session map before re-request decrypt 2019-07-08 12:49:22 +02:00
Benoit Marty 443fb41d18 Cleanup 2019-07-08 11:21:26 +02:00
Valere 94b4351e19 wip async crypto + persist 2019-07-08 11:18:27 +02:00
Benoit Marty e90aeff417 ThrottleLast the notification drawer manager 2019-07-08 11:08:23 +02:00
Valere e50dd265d4 merge develop 2019-07-08 10:58:41 +02:00
Benoit Marty 535b41d818 Rename Debouncer to FirstThrottler 2019-07-08 10:49:32 +02:00
Benoit Marty 21357a1ec7 private fun 2019-07-08 10:32:38 +02:00
Benoit Marty 8c872caf78 Inject IconLoader and BitmapLoader 2019-07-08 10:30:45 +02:00
Benoit Marty 62a81a556e Refresh notification drawer in a background thread. It also fixes the person and room avatar display 2019-07-08 10:26:22 +02:00
Benoit Marty 568e8c8bc0 Do not load user icon before Android Pie 2019-07-08 10:10:39 +02:00
Benoit Marty 8c86a653b2
Merge pull request #309 from vector-im/feature/crypto_cleanup 
Rework Crypto using Try
 2019-07-05 19:03:59 +02:00
Benoit Marty ea0526821e Top left Back does not go to previous Activity anymore (Fixes #275) 2019-07-05 18:44:09 +02:00
Benoit Marty e5adf174a8 Fix crash when invalid urls for image 2019-07-05 17:00:57 +02:00
Benoit Marty f3fab0dc08 Rename ErrorTypes 2019-07-05 15:52:37 +02:00
Benoit Marty 4a512d2425 Create enum for errorType and fix a few issues 2019-07-05 15:43:28 +02:00
Benoit Marty 07f80f43bd Display clear type 2019-07-05 15:15:55 +02:00
Benoit Marty 87dec337d8 Rework Crypto using Try 2019-07-05 14:41:32 +02:00
Dominic Fischer b0e5612bdc Convert java-esque code to Kotlin 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2019-07-05 12:32:21 +01:00
ganfra 25b0cd0e4b Remove some work from UI thread 2019-07-04 19:02:37 +02:00
Benoit Marty 01bc0de2c2 Set again input type for composer, lost after merge 2019-07-04 18:43:36 +02:00
Benoit Marty 857a4c5a26 Quick implementation of accept/reject invitation from notification 2019-07-04 18:14:39 +02:00
Benoit Marty 063c35380a Fix regression on invitation full screen display 2019-07-04 16:44:37 +02:00
Benoit Marty 5322251bc0 Fix wording for direct message tab 2019-07-04 15:37:19 +02:00
Benoit Marty c21b9df9a5 Fix issue with notification from previous account displayed after logout 2019-07-04 15:23:59 +02:00
Benoit Marty f2a52f0253
Merge pull request #297 from vector-im/feature/crypto_stabilization 
Safely remove all usage of `!![`
 2019-07-04 15:17:26 +02:00
Benoit Marty 72e5aa981a
Merge pull request #298 from vector-im/feature/quote 
Fix issue when quoting event in e2e rooms (Fixes #295)
 2019-07-04 14:49:53 +02:00
Benoit Marty 9d0c50907c Fix issue when quoting event in e2e rooms (Fixes #295) 2019-07-04 12:39:59 +02:00
Benoit Marty e5958983d8 Safely remove all usage of `!![` 2019-07-04 11:44:09 +02:00
ganfra ab23ec3f35 Fix https://github.com/matrix-org/riot-android-rageshakes/issues/5851 (DI) 2019-07-04 10:20:50 +02:00
ganfra 9ff24cbf2a Merge branch 'feature/fix_issues' into develop 2019-07-03 19:46:34 +02:00
Valere 2eee25bbc1 Fix / crash not called on UI Thread 2019-07-03 19:36:25 +02:00
Valere b4ea85fc76 Fix / Rageshake crashes + cleaning !! 
https://github.com/matrix-org/riot-android-rageshakes/issues/5880
https://github.com/matrix-org/riot-android-rageshakes/issues/5877
https://github.com/matrix-org/riot-android-rageshakes/issues/5873
https://github.com/matrix-org/riot-android-rageshakes/issues/5871
 2019-07-03 18:40:04 +02:00
ganfra 480f14902d Rx: observe on computation by default 2019-07-03 18:28:56 +02:00
Benoit Marty 20c8e8d922 Change the test to apply Google Service plugin to be able to run sonar 2019-07-03 18:18:07 +02:00
Benoit Marty 60d46538de
Merge pull request #292 from vector-im/feature/sonar_fix 
Feature sonar fix and convert remaining Java files to Kotlin
 2019-07-03 18:03:23 +02:00
Benoit Marty f789fb275d Convert MXUsersDevicesMap to kotlin 2019-07-03 17:34:22 +02:00
Benoit Marty 1ee1c31b9c Fix bugs detected by Sonar 2019-07-03 15:42:35 +02:00
Valere 5d171e0240 Moved incoming key/verif to active session holder 2019-07-03 12:56:08 +02:00
Benoit Marty f41c0311fa Fix done TODO 2019-07-03 11:58:50 +02:00
Benoit Marty a476ac71da Import translations from Riot 2019-07-03 10:20:07 +02:00
ganfra bc2d321a84 Merge branch 'feature/Perf' into develop 2019-07-02 23:07:16 +02:00
ganfra 9adeab6bae Perf: revert constraintLayout version as it breaks at the moment 2019-07-02 23:06:40 +02:00
Benoit Marty d90698fe92
Merge pull request #279 from vector-im/feature/clear_glide_cache 
Clear media cache from the settings and clear cache when signing out
 2019-07-02 21:56:31 +02:00
Benoit Marty af0af6e260 Fix bad background color in dark theme 2019-07-02 21:49:52 +02:00
Benoit Marty 6e71fb565a Fix bad layout for button when keyboard is opened (Fixes #268) 2019-07-02 21:23:57 +02:00
Benoit Marty 6c66ab1568 Fix code quality 2019-07-02 21:17:41 +02:00
Benoit Marty 77fd7cd33c Update wording 2019-07-02 20:48:20 +02:00
Benoit Marty 0d329f0338 Clear media cache from the settings and clear cache when signing out 2019-07-02 20:21:40 +02:00
ganfra 2f66321c2a RoomSummary: don't fetch last event by default as it takes some time 2019-07-02 19:59:01 +02:00
Benoit Marty 313055b96d Fix bad alignment of button 2019-07-02 18:54:06 +02:00
ganfra 37199da52f Merge branch 'develop' into feature/Perf 2019-07-02 18:29:59 +02:00
Benoit Marty 504009499f Rename im.vector.riotredesign to im.vector.riotx 2019-07-02 17:27:08 +02:00
ganfra 11bf00030d Merge branch 'develop' into feature/Perf 2019-07-02 17:00:09 +02:00
Benoit Marty 73277c5b08
Merge pull request #259 from vector-im/feature/fix_read_receipts_not_updated 
Fix / send read marker for collapsed items
 2019-07-02 16:51:53 +02:00
Valere 363f52b10c Encrypt Realm databases 2019-07-02 16:48:58 +02:00
Benoit Marty 498b1f2b06
Merge pull request #261 from vector-im/feature/e2e_file 
Encrypt attachment in e2e rooms
 2019-07-02 16:44:17 +02:00
Valere ee9440c1cb Fix / crash signout bottom sheet 2019-07-02 16:05:01 +02:00
Benoit Marty 0980a41752 use file name with extension 2019-07-02 14:59:44 +02:00
Benoit Marty 18a821f3f6 add message 2019-07-02 14:43:07 +02:00
Benoit Marty 14a2570ea4 Preview of encrypted images (first and fast implementation) 2019-07-02 14:35:22 +02:00
Valere c7df433a44 Fix / send read marker for collapsed items 
Also remove unnecessary check on matrix id format
 2019-07-02 12:08:44 +02:00
ganfra 9378d30601 Merge branch 'develop' into feature/Perf 2019-07-02 11:25:39 +02:00
Valere 58a80ec543 Fix / crash user autocomplete after invite command 2019-07-02 10:43:55 +02:00
Benoit Marty 95ea6db946 Change name from "Riot X" to "RiotX" 2019-07-02 10:42:45 +02:00
Benoit Marty 014d03893a Fix issue after rebase and use classic request for clear image 2019-07-02 09:56:20 +02:00
ganfra 164c8dab09 Glide: try to handle encrypted image. [WIP] 2019-07-02 09:56:20 +02:00
Benoit Marty b54ca5a8a0 Decrypt Attachment - WIP 2019-07-02 09:56:20 +02:00
Benoit Marty 707a4712fc Add some javadoc from Matrix spec and add EncryptedFileInfo where necessary 2019-07-02 09:56:20 +02:00
Benoit Marty 8e76700c8d Handle redacted e2e event 2019-07-02 09:56:20 +02:00