mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-19 15:58:27 +03:00
Code Issues Projects Releases Packages Wiki Activity
6664 commits 163 branches 158 tags 270 MiB
Commit graph

2572 commits

Author SHA1 Message Date
Onuray Sahin
a1941bf609
Merge branch 'develop' into feature/ons/fix_badge_color 2020-11-10 17:20:52 +03:00
Onuray Sahin
a2a2015af6 Exclude yourself when decorating rooms which are direct or don't have more than 2 users. 2020-11-10 17:17:05 +03:00
ganfra
bf9d80c14c Merge branch 'develop' into feature/fix_user_vs_room_member 2020-11-10 15:15:28 +01:00
Benoit Marty
0150d3961b
Merge pull request #2354 from Dominaezzz/suspend_functions 
Convert `AccountService` to suspend functions
 2020-11-10 10:36:44 +01:00
Benoit Marty
13ddc28d05 Fix issue with callback.onSuccess() called multiple times 2020-11-09 23:07:53 +01:00
Benoit Marty
fd4b56572d Use also{} to log info 2020-11-09 16:56:20 +01:00
Dominic Fischer
0da4ff7b02 Run ktlint 2020-11-06 19:20:23 +00:00
Dominic Fischer
983e02888c Remove incorrect comment 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-06 19:17:45 +00:00
Dominic Fischer
35768ff7e8 Convert AccountService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-06 16:49:51 +00:00
Auri B. P
cb49c7d060 Translated using Weblate (Catalan) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ca/
 2020-11-06 02:50:00 +00:00
Benoit Marty
b4f9d40767
Merge pull request #2344 from vector-im/feature/bma/sync_h 
Small fixes
 2020-11-05 16:58:46 +01:00
Benoit Marty
9068168378
Merge branch 'develop' into feature/realm_10 2020-11-05 16:14:19 +01:00
Benoit Marty
5c7a5fab94 Improve API: rename the method and return empty list instead of null 2020-11-05 15:47:28 +01:00
ganfra
eb1fa0919f Room member: add methods to get directly from session 2020-11-04 18:09:51 +01:00
Benoit Marty
45edf6025e SAS Strings for Italian 2020-11-04 16:01:33 +01:00
Weblate
f3b8bb066c Merge branch 'origin/develop' into Weblate. 2020-11-04 13:43:47 +00:00
Onuray Sahin
9ed529b944
Merge branch 'develop' into feature/ons/fix_markdown_formatter 2020-11-04 13:43:26 +03:00
Onuray Sahin
bbc3dc0504 Set br softbreak to html parser. 2020-11-04 13:42:52 +03:00
Benoit Marty
d1d2c5f117
Merge pull request #2327 from vector-im/feature/bma/keysbackupcrash 
Feature/bma/keysbackupcrash
 2020-11-04 00:02:48 +01:00
ganfra
9f3f5d8053 Realm 10: upgrade lib and make it works on our current code. 2020-11-03 16:53:30 +01:00
Onuray Sahin
f24b593349 Update MarkdownParserTest. 2020-11-03 15:56:51 +03:00
Benoit Marty
997cd68344 Add some padding for easier readability 2020-11-03 09:57:34 +01:00
Onuray Sahin
b40334f7db Markdown body should be pure text, see #739, #1506. 2020-11-03 11:53:50 +03:00
Benoit Marty
a216f82b35 Avoid code duplication and log total count 2020-11-03 09:30:26 +01:00
Benoit Marty
5eb2f14375 Move RealmDebugTools and make it an internal class 2020-11-03 09:20:24 +01:00
Benoit Marty
d4963dfb31 Use the same name for the 2 db log methods 2020-11-03 09:17:07 +01:00
Valere
3c7f61e45c Clean oldest gossiping entries on open 
Add a dump of DB size on bug report
 2020-11-02 17:45:08 +01:00
Besnik Bleta
10eef60f45 Translated using Weblate (Albanian) 
Currently translated at 99.4% (189 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
 2020-11-02 15:49:57 +00:00
zeritti
cb70757790 Translated using Weblate (Czech) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
 2020-11-02 15:49:57 +00:00
notramo
438060dfa2 Translated using Weblate (Hungarian) 
Currently translated at 64.2% (122 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/hu/
 2020-10-31 12:50:08 +00:00
Benoit Marty
1db120a963 cleanup 2020-10-30 18:08:11 +01:00
Benoit Marty
fca0aa2cc4 KeysBackup: Avoid using !!, should fix #2262 2020-10-30 17:17:25 +01:00
Benoit Marty
0bcf42dbb8 KeysBackup: some API parameters are mandatory, so stop considering them as optional and avoid using !! 
Also fix an issue with Json name: `hash` -> `etag`
Add some `internal` modifier (not as much as I would like to)
var -> val
Remove unused code
 2020-10-30 16:14:33 +01:00
Benoit Marty
14e7e5e9fd Avoid usage of !! 2020-10-30 14:29:44 +01:00
Benoit Marty
1fcbf7ed42 Release backupOlmPkEncryption 2020-10-30 14:16:04 +01:00
Benoit Marty
d654771fcf
Merge pull request #2318 from vector-im/feature/bca/fix_duplicate_reaction_echo 
Fix ui echo isues
 2020-10-30 11:56:51 +01:00
Benoit Marty
4791eb85af
Merge pull request #2283 from vector-im/feature/bca/crypto_perf 
Crypto cleaning and perf improvement
 2020-10-30 11:11:34 +01:00
Benoit Marty
239ead7ccb
Merge pull request #2311 from vector-im/feature/bma/direct 
Room member profile: Add action to create (or open) a DM (#2310)
 2020-10-29 16:21:26 +01:00
Benoit Marty
41e3ff381f Rename method 2020-10-29 16:02:21 +01:00
Valere
479f10a28e Fix potential ConcurrentModificationException 
give a copy to avoid issues
 2020-10-29 14:36:40 +01:00
Benoit Marty
f48d4c021a Cleanup and split long lines 2020-10-29 14:10:41 +01:00
Benoit Marty
f190356934 Fix compilation warnings 2020-10-29 13:44:47 +01:00
Benoit Marty
1bc726abff Update the algorithm to find an existing DM: simplify and make sure there is only 2 people in the room 2020-10-29 13:25:21 +01:00
Valere
c2027be0ee Fix audit freeze, add export, and buffer gossip saves 2020-10-29 12:55:26 +01:00
Valere
5a111af2fe Fix / add close to IncomingRequestManager 2020-10-29 12:55:26 +01:00
Valere
bb000f77f8 Offload self verif todevice off crypto thread 2020-10-29 12:55:26 +01:00
Valere
6d2b3a6940 cleaning 2020-10-29 12:55:26 +01:00
Valere
dbb14e6313 offload megolm backup import off crypto thread 2020-10-29 12:55:26 +01:00
Valere
2144879e73 Offload sending keywithheld to computation 2020-10-29 12:55:26 +01:00
Valere
e149be9e0f Offload Incoming Gossip to dedicated thread 2020-10-29 12:55:26 +01:00
Valere
9e921d8b50 safeguard for save after store closed 2020-10-29 12:55:26 +01:00
Valere
9bf5059631 Fix test helper not working 2020-10-29 12:55:26 +01:00
Valere
b9fdc14e18 add internal 2020-10-29 12:55:26 +01:00
Valere
f39938d17d Fix / device check was not reading up to date trust 2020-10-29 12:55:26 +01:00
Valere
aa238775c6 Fix copyrights 2020-10-29 12:55:26 +01:00
Valere
7e7a953345 Crypto cleaning and perf improvement 2020-10-29 12:55:26 +01:00
Valere
9ec68fa5be Fix ui echo isues 2020-10-29 12:49:30 +01:00
Benoit Marty
d9723387eb We only need the roomId in many cases, so update the API 2020-10-29 11:00:01 +01:00
Benoit Marty
4433436416 Room member profile: Add action to create (or open) a DM (#2310) 2020-10-28 18:13:36 +01:00
Benoit Marty
6ed77e276b Fix issue with plurals 2020-10-28 16:49:42 +01:00
Benoit Marty
7bebd6151e
Merge pull request #2308 from vector-im/feature/bma/wl 
Fix lint issue
 2020-10-28 15:27:01 +01:00
Benoit Marty
2f7c7badc1 Another lint fix 2020-10-28 15:26:34 +01:00
Benoit Marty
1e60d6f6e8
Merge pull request #2282 from vector-im/feature/bma/room_settings 
Feature/bma/room settings
 2020-10-28 13:54:08 +01:00
Benoit Marty
8091e224f7
Merge branch 'develop' into feature/bma/low_priority 2020-10-28 13:53:19 +01:00
Benoit Marty
e84eba23a1 Fix lint issue 2020-10-28 13:49:16 +01:00
Benoit Marty
b78dac20c0 Room profile: BigImageViewerActivity now only display the image. Use the room setting to change or delete the room Avatar 2020-10-28 11:22:37 +01:00
Weblate
de33f7b3f5 Merge branch 'origin/develop' into Weblate. 2020-10-28 10:09:29 +00:00
Slavi Pantaleev
5be1c447a2 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/bg/
 2020-10-28 10:06:07 +00:00
Tirifto
3c4b88db0a Translated using Weblate (Esperanto) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/eo/
 2020-10-27 19:50:14 +00:00
Nikita Epifanov
fc1b6a4d38 Translated using Weblate (Russian) 
Currently translated at 98.9% (188 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ru/
 2020-10-26 11:51:04 +00:00
MamasLT
10060b35c8 Translated using Weblate (Lithuanian) 
Currently translated at 8.4% (16 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/lt/
 2020-10-24 03:49:51 +00:00
Benoit Marty
5a6683574c Toggle Low priority tag (#1490) 2020-10-23 14:58:31 +02:00
Besnik Bleta
c9748cb46f Translated using Weblate (Albanian) 
Currently translated at 88.4% (168 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
 2020-10-22 21:49:58 +00:00
@a2sc:matrix.org
385f2db038 Translated using Weblate (German) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
 2020-10-22 21:49:57 +00:00
Benoit Marty
4b8c31d806 Add Avatar: SDK 
Also add remove avatar action, and add Crop UX
 2020-10-22 10:25:53 +02:00
sr093906
ea4325c498 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hans/
 2020-10-21 10:05:00 +00:00
Corentin Noël
dc4d2d6ccb Translated using Weblate (French) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/fr/
 2020-10-21 10:05:00 +00:00
Danial Behzadi
06bcd1654c Translated using Weblate (Persian) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/fa/
 2020-10-21 10:04:59 +00:00
Benoit Marty
f1e545ad49
Merge pull request #2264 from vector-im/feature/ons/fix_riotx_crypto_migration 
Fix crpyto store migration from RiotX.
 2020-10-20 22:15:21 +02:00
Valere
dc8a6cc745 Code review 2020-10-20 21:42:24 +02:00
Valere
d319a353d4 change log level 2020-10-20 21:42:24 +02:00
Valere
464ce16d63 fix sdk copyright 2020-10-20 21:41:48 +02:00
Valere
6cca87da49 Stop thread on close session 2020-10-20 21:41:48 +02:00
Valere
ace412f9e3 cleaning 2020-10-20 21:41:48 +02:00
Valere
41e168a519 add UI echo of reactions 2020-10-20 21:41:48 +02:00
Valere
47746d6997 Add event sender in app thread 2020-10-20 21:41:48 +02:00
Onuray Sahin
151f361954
Merge branch 'develop' into feature/ons/fix_riotx_crypto_migration 2020-10-19 11:15:04 +03:00
Onuray Sahin
6d3a659362 Benoit code review fixes. 2020-10-19 11:14:15 +03:00
Benoit Marty
1a9f06681f Translated using Weblate (Czech) 
Currently translated at 88.4% (168 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
 2020-10-18 00:04:46 +00:00
Corentin Noël
e1b8405c8b Translated using Weblate (French) 
Currently translated at 59.4% (113 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/fr/
 2020-10-18 00:04:36 +00:00
Benoit Marty
51c9208952 Translated using Weblate (German) 
Currently translated at 96.8% (184 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
 2020-10-18 00:04:36 +00:00
Benoit Marty
dc7e0a5f88
Merge pull request #2259 from vector-im/feature/ons/fix_file_info_size 
Uploading a file to a room caused it to have a info.size of -1
 2020-10-16 17:05:26 +02:00
Benoit Marty
0ffe20d863 Small changes 2020-10-16 16:50:51 +02:00
Benoit Marty
b07e7a4a36 Use file.length if cursor returns -1 as file size. 
Author: Onuray (squashed)
 2020-10-16 16:11:11 +02:00
Weblate
dea994c1fb Merge branch 'origin/develop' into Weblate. 2020-10-16 14:02:54 +00:00
Benoit Marty
3bf11d1a0b Translated using Weblate (Slovak) 
Currently translated at 86.3% (164 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sk/
 2020-10-16 14:02:44 +00:00
Benoit Marty
dce60d0061 Translated using Weblate (Kabyle) 
Currently translated at 88.4% (168 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/kab/
 2020-10-16 14:02:44 +00:00
Benoit Marty
31e73b2f8c Translated using Weblate (Estonian) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/et/
 2020-10-16 14:02:44 +00:00
Benoit Marty
d314c8ae58 Translated using Weblate (Bengali (India)) 
Currently translated at 88.4% (168 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/bn_IN/
 2020-10-16 14:02:44 +00:00
Benoit Marty
e19af47b77 Translated using Weblate (Italian) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/it/
 2020-10-16 14:02:44 +00:00
Onuray Sahin
6531ba6a13 Fix crpyto store migration from RiotX. 
Fixes #2252
 2020-10-16 15:18:35 +03:00
LinAGKar
72a7bf9e23 Translated using Weblate (Swedish) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sv/
 2020-10-16 09:04:48 +00:00
Nikita Epifanov
5cb46dba6c Translated using Weblate (Russian) 
Currently translated at 98.9% (188 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ru/
 2020-10-16 09:04:47 +00:00
linsui
ba3500baf6 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.8% (186 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hans/
 2020-10-16 09:04:47 +00:00
Priit Jõerüüt
f82ee5efdd Translated using Weblate (Estonian) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/et/
 2020-10-16 09:04:47 +00:00
@a2sc:matrix.org
28df01b184 Translated using Weblate (German) 
Currently translated at 96.8% (184 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
 2020-10-16 09:04:43 +00:00
Jeff Huang
843d1d57cf Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hant/
 2020-10-16 09:04:43 +00:00
Marcelo Filho
c1f08e8f22 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/pt_BR/
 2020-10-16 09:04:39 +00:00
random
e7a8679383 Translated using Weblate (Italian) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/it/
 2020-10-16 09:04:38 +00:00
Benoit Marty
79d7032e3a Don't set presence when handling a push notification or polling (#2156) 2020-10-13 22:34:08 +02:00
Benoit Marty
ede5bb0e90 Format files, in particular align -> 2020-10-13 14:57:45 +02:00
Benoit Marty
db1f129034 Improve detection of encrypted rooms 2020-10-13 11:27:46 +02:00
Benoit Marty
9dc1034891 Fix some of the non-passing tests 2020-10-13 09:47:34 +02:00
Benoit Marty
68947588d7 Replace deprecated shouldEqual and shouldEqualTo by shouldBeEqualTo 2020-10-12 22:30:18 +02:00
Benoit Marty
0fc92889c1 Fix test compilation issue 2020-10-12 22:14:46 +02:00
Benoit Marty
778c5aee32 Add param to when 2020-10-12 21:13:26 +02:00
Benoit Marty
63eb119df6 Inject userId and deviceId instead of sessionParam 2020-10-12 21:13:26 +02:00
Benoit Marty
d0cb5f4212
Merge pull request #2248 from vector-im/feature/bca/detect_reset 
Fix / reset cross signing not well supported
 2020-10-12 20:49:15 +02:00
Benoit Marty
cb40485aad Format strings 2020-10-12 19:02:12 +02:00
Weblate
a6817e8281 Merge branch 'origin/develop' into Weblate. 2020-10-12 16:03:26 +00:00
Danial Behzadi
ecdec83c37 Translated using Weblate (Persian) 
Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/fa/
 2020-10-12 16:01:02 +00:00
Besnik Bleta
087711f1f7 Translated using Weblate (Albanian) 
Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/sq/
 2020-10-12 16:00:12 +00:00
Valere
840c8e0b91 Fix / reset cross signing not well supported 2020-10-12 17:10:46 +02:00
Benoit Marty
6f709a1e7c
Merge pull request #2203 from vector-im/feature/bma/pusher_data 
Feature/bma/pusher data
 2020-10-12 14:51:15 +02:00
Valere
b12c4f854c Fix / Moshi Cannot serialize kotlin 2020-10-09 15:40:30 +02:00
Benoit Marty
ab9bbe9a48 Cleanup and cancel request properly 2020-10-08 22:08:48 +02:00
Benoit Marty
5e45f5c3ea Copyright for SDK 2020-10-08 22:08:48 +02:00
Benoit Marty
5397700ab4 cleanup 2020-10-08 22:08:48 +02:00
Benoit Marty
48ca1384f8 Do some renaming, Sygnal is an implementation of a PushGateway. 2020-10-08 22:08:48 +02:00
Benoit Marty
02f1dab9b2 Push test: better error handling 2020-10-08 22:08:48 +02:00
Benoit Marty
7d53dfeca4 Add Sygnal API implementation to test is Push are correctly received 2020-10-08 22:08:48 +02:00
Benoit Marty
cb33b9f158 cleanup 2020-10-08 22:08:25 +02:00
Benoit Marty
cee5f8a0fb
Merge pull request #2230 from vector-im/feature/bma/sdk_copyright 
Sdk copyright
 2020-10-08 22:04:46 +02:00
Benoit Marty
bc339191ea Fix Copyright mention 2020-10-08 15:11:01 +02:00
Benoit Marty
44114e66c2 Fix Copyright mention in SDK code 2020-10-08 15:04:55 +02:00
Benoit Marty
1dfc739f19 Onuray's review 2020-10-08 14:19:56 +02:00
Benoit Marty
7952e205b9 Implement "Jump to read receipt" and "Mention" actions on the room member profile screen 2020-10-08 14:18:01 +02:00
Benoit Marty
182158c3af Fix runtime issue after upgrading Moshi library 2020-10-06 18:36:54 +02:00
Benoit Marty
dd1c9976e3 Fix runtime issue after upgrading Moshi library 2020-10-06 17:25:27 +02:00
Benoit Marty
e708b0f01b Fix compilation warning (due to Kotlin 1.4) 2020-10-06 15:09:41 +02:00
Benoit Marty
ebfee5868e Remove OkReplay, not compatible to build tools 4.0.1 (and not used) 2020-10-06 13:06:24 +02:00
Benoit Marty
72a412904d small cleanup 2020-10-06 12:26:18 +02:00
ganfra
dfbe1188f0 Draft: use session realm provider when possible 2020-10-06 10:17:17 +02:00
ganfra
91b81af5a8 Draft: handle sharing so it doesn't destroy the previous draft 2020-10-06 10:17:17 +02:00
ganfra
aa0520d47d Start reworking draft (simplify) 2020-10-06 10:13:14 +02:00
Benoit Marty
f030e098a8 Fix code quality and compilation test 2020-10-02 17:18:39 +02:00
Benoit Marty
3705fa14bd Use sender data return from search result 2020-10-01 17:03:53 +02:00
Benoit Marty
4649b2ac1d Code review 2020-10-01 16:09:06 +02:00
Onuray Sahin
4683dc3f21 Documentation added to orderByRecent parameter of the search request. 2020-10-01 14:50:29 +02:00
Onuray Sahin
e21f306635 Use enum directly instead of its value. 2020-10-01 14:50:29 +02:00