mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-21 16:55:06 +03:00
Code Issues Projects Releases Packages Wiki Activity
16891 commits 160 branches 159 tags 271 MiB
Commit graph

9653 commits

Author SHA1 Message Date
Jozef Gaal
c68e3d89c8 Translated using Weblate (Slovak) 
Currently translated at 100.0% (2239 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-06-02 09:32:21 +00:00
lvre
cda71d2752 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2239 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2022-06-02 09:32:19 +00:00
random
41db82a731 Translated using Weblate (Italian) 
Currently translated at 100.0% (2239 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2022-06-02 09:32:18 +00:00
Linerly
b822055e2d Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2239 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-06-02 09:32:17 +00:00
Tuomas Hietala
ffb1066a30 Translated using Weblate (Finnish) 
Currently translated at 82.8% (1854 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2022-06-02 09:32:15 +00:00
Danial Behzadi
100da85e4a Translated using Weblate (Persian) 
Currently translated at 100.0% (2239 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2022-06-02 09:32:14 +00:00
Priit Jõerüüt
dc7d2d7482 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2239 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-06-02 09:32:13 +00:00
waclaw66
f728d5ff74 Translated using Weblate (Czech) 
Currently translated at 100.0% (2239 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2022-06-02 09:32:11 +00:00
Auri B. P
095b220d99 Translated using Weblate (Catalan) 
Currently translated at 100.0% (2239 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-06-02 09:32:10 +00:00
Onuray Sahin
966b3ce54a Create a new list for sublist to fix stackoverflowerror. 2022-06-01 16:55:42 +03:00
Adam Brown
31db65e348 updating exit onboarding copy to avoid manual line breaks, matching iOS 2022-06-01 14:44:40 +01:00
Adam Brown
d002ab6a6b removing unused imports 2022-06-01 09:11:05 +01:00
Adam Brown
8d3c70f522 removing unused imports 2022-06-01 09:11:05 +01:00
Adam Brown
70c35304ce aligning the with develop to use the initial state for reading the activity arguments 2022-06-01 09:11:05 +01:00
Adam Brown
28050488ba passing the authentication state from the onboarding and tracking sign up after the user has consented to tracking 2022-06-01 09:11:04 +01:00
Adam Brown
ac89495348 chaining the current authentication type into the onboarding state 2022-06-01 09:09:56 +01:00
Adam Brown
e89f9eae1a providing the full SSOProvider instead of selection instead of just the id 2022-06-01 09:09:56 +01:00
Adam Brown
9110fe8a6a lifting unavailable homeserver rendering to the activity/ftuevariant 
- the viewmodel is now responsible for inferring connectivity errors and providing a retry action
 2022-06-01 09:09:56 +01:00
ganfra
c48fd7708c Increase extraBufferCapacity (and allow configuration) and validate behavior with tests 2022-05-31 20:11:54 +02:00
Benoit Marty
e6beb73e3d
Merge pull request #5970 from ofalvai/feature/ofa/read-receipts-design 
Make read receipt avatar list more compact
 2022-05-31 18:26:57 +02:00
Benoit Marty
884525bef0
Merge pull request #6125 from vector-im/task/eric/code-style-parenthesis 
Code Style - New line before and after method parentheses
 2022-05-31 18:17:07 +02:00
Olivér Falvai
b5168f27dd Merge remote-tracking branch 'origin/develop' into feature/ofa/read-receipts-design 2022-05-31 17:50:02 +02:00
Benoit Marty
8e5c96adf5
Merge pull request #6205 from vector-im/johannes/fatal 
Use fatalError instead of NPE
 2022-05-31 16:37:49 +02:00
Benoit Marty
fd5c30c8a9 Fix formatting issue. 2022-05-31 16:36:59 +02:00
Benoit Marty
5b985dc032
Merge pull request #5827 from mikonse/fix-notification-space-switch 
do not switch away from home space on notification
 2022-05-31 16:34:47 +02:00
Maxime NATUREL
de185b94f3
Merge pull request #6199 from vector-im/feature/mna/6198-remove-background-location-permission 
Remove background location permission
 2022-05-31 15:58:57 +02:00
Benoit Marty
df23fd10bc
Remove unused import 2022-05-31 14:42:09 +02:00
Maxime NATUREL
2ca96a770d Declaring tools namespace prefix to fix strange build error 2022-05-31 14:24:09 +02:00
ericdecanini
8af49891ff Post merge conflict reformatting 2022-05-31 14:23:02 +02:00
ericdecanini
e6e05317e1 Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
#	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
 2022-05-31 14:21:16 +02:00
Maxime NATUREL
4f3b4a71ce Ignore unused strings to be deleted 2022-05-31 13:46:14 +02:00
Johannes Marbach
4fc6cb1de3 Use fatalError instead of NPE 
Signed-off-by: Johannes Marbach <johannesm@element.io>
 2022-05-31 13:42:31 +02:00
Benoit Marty
9d60aff8a2 Remove unused strings. 2022-05-31 12:11:16 +02:00
Benoit Marty
3cc1951587
Merge pull request #6196 from vector-im/feature/bma/lao 
Make Lao language available in the in app setting.
 2022-05-31 11:42:07 +02:00
Benoit Marty
d6b68a33c9
Merge pull request #6194 from vector-im/bma/translators_note 
Add note to translators.
 2022-05-31 11:40:52 +02:00
Benoit Marty
aa753e4845
Merge pull request #6197 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-05-31 11:38:41 +02:00
Jorge Martín
2271df9907 Add support for setting pre sharing keys mode from .well-known 2022-05-31 11:32:39 +02:00
Maxime NATUREL
233fe21f26 Remove runtime permission request 2022-05-31 11:04:48 +02:00
Maxime NATUREL
90cda6b2be Adding todo to delete some strings 2022-05-31 11:04:29 +02:00
Maxime NATUREL
00002105cf Remove permission declaration in Manifests 2022-05-31 11:04:14 +02:00
Jorge Martin Espinosa
2e1a11e10e
Merge pull request #6134 from vector-im/feature/jorgem/mandatory-backup-passphrase 
Add support for mandatory backup or passphrase from .well-known home server configuration
 2022-05-31 11:02:02 +02:00
Johannes Marbach
7dd5b801bb
Merge pull request #6149 from vector-im/johannes/widget-system-permissions 
Make widget web view request system permissions for camera and microphone (PSF-1061)
 2022-05-31 10:54:45 +02:00
Adam Brown
7fdf138e5a
Merge pull request #6036 from vector-im/feature/adm/ftue-deeplinks 
FTUE - Homeserver sign in/up deeplinks
 2022-05-31 09:30:17 +01:00
Weblate
7f59efb876 Merge branch 'origin/develop' into Weblate. 2022-05-31 08:04:30 +00:00
Mr.Narsus
2e7c7c94fb Translated using Weblate (Arabic) 
Currently translated at 44.0% (981 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-05-31 08:04:18 +00:00
Jorge Martín
130ed63b03 Add support for mandatory backup or passphrase from .well-known configuration 2022-05-31 10:00:46 +02:00
Johannes Marbach
4ebb26d3d3 Merge branch 'develop' into johannes/widget-system-permissions 2022-05-31 09:53:31 +02:00
Benoit Marty
c6c96677e2 Make Lao language available in the in app setting. 2022-05-31 09:52:11 +02:00
Johannes Marbach
373991915e Add missing file 2022-05-31 08:10:13 +02:00
Benoit Marty
8cddd9f575
Add note to translators. 2022-05-30 21:20:15 +02:00
Benoit Marty
483b1ab503
Merge pull request #6132 from jtbx/patch-1 
Fixed grammar in 2 English strings
 2022-05-30 21:18:08 +02:00
Benoit Marty
5de6771547
Merge pull request #6166 from networkException/autoplay-animated-images 
[Feature] Add the option to autoplay animated images
 2022-05-30 20:42:19 +02:00
Johannes Marbach
70bb2b7fee Combine event listener interfaces 2022-05-30 20:28:09 +02:00
Benoit Marty
bd2cd3ad96
Merge pull request #6183 from SpiritCroc/persist-image-notification 
Fix some notifications never getting dismissed
 2022-05-30 20:24:11 +02:00
Johannes Marbach
5b64946dfb Remove empty default implementation 2022-05-30 20:18:56 +02:00
Onuray Sahin
4ccd242cbf
Merge pull request #6170 from vector-im/feature/ons/live_location_bottom_sheet 
Live Location Sharing - User List Bottom Sheet [PSF-890]
 2022-05-30 21:07:25 +03:00
networkException
b138ac8601
MessageImageVideoItem: Hide play button for autoplaying animated images 
This patch updates the logic checking whether to show the
playContentView to not show it when an animated image message would
autoplay its animation.

Signed-off-by: networkException <git@nwex.de>
 2022-05-30 20:05:26 +02:00
networkException
9d0fe46723
ImageContentRenderer: Enable image animation if enabled in preferences 
This patch removes dontAnimate() in the createGlideRequest() builder
conditionally depending on the user's animated image autoplay
preferences.

Resolves #1160, #5094

Signed-off-by: networkException <git@nwex.de>
 2022-05-30 20:05:26 +02:00
networkException
9b60ee70c5
MessageInformationData: Add messageType field 
This patch adds the messageType field to MessageInformationData,
containing a nullable string representation of the message event's type.

Signed-off-by: networkException <git@nwex.de>
 2022-05-30 20:05:26 +02:00
networkException
f86362f065
VectorPreferences: Add switch for autoplaying animated images 
This patch adds a new switch to VectorPreferences, the vector settings
preferences view and various classes propergating the set value of the
switch into parts of the application touched by the following patches.

Signed-off-by: networkException <git@nwex.de>
 2022-05-30 20:05:26 +02:00
Benoit Marty
ae94f45f34
Merge pull request #5952 from vector-im/feature/bma/sdk_user_story 
Sdk user story
 2022-05-30 18:30:56 +02:00
Johannes Marbach
769b217c7e Remove unused imports 2022-05-30 16:53:59 +02:00
Johannes Marbach
d757914225 Unsuppress lint rule 2022-05-30 16:35:44 +02:00
Auri B. P
a10e67c594 Translated using Weblate (Catalan) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-05-30 14:32:30 +00:00
Mr.Narsus
1e5b378fbf Translated using Weblate (Arabic) 
Currently translated at 44.0% (979 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-05-30 14:32:10 +00:00
Onuray Sahin
04679ea21d Merge branch 'develop' into feature/ons/live_location_bottom_sheet 
* develop: (114 commits)
  Docs: Fix various formatting and spelling issues in notifications.md
  Fixing non necessary breaking line
  continuing to the originally supplied url when a rtl override character is detected
  splitting url detection condition into separate branches
  Cleaner code
  Create extension `String?.toActiveSpaceOrOrphanRooms()` to reduce noise.
  Add changelog
  Fix test compilation
  Add some Kdoc
  Add some Kdoc
  Create SpaceFilter.OrphanRooms to improve the API. Not 100% of the side effect. There is probably some (fixed?) bugs here.
  Rename ActiveSpaceFilter to SpaceFilter
  Remove `ActiveSpaceFilter.None` Prefer nullability for API coherency of `RoomSummaryQueryParams`
  Add some Kdoc
  Remove duplicated lines of code (the same code is done a few lines later)
  Remove `RoomCategoryFilter.ALL` Prefer nullability for API coherency of `RoomSummaryQueryParams`
  `displayName` default value is now `QueryStringValue.NoCondition`. It was working fine since in the DB we always have a name using `RoomDisplayNameFallbackProvider`, which in our current implementation always return a non empty String.
  Small rework for nicer code
  Remove duplicated code lines
  Remove `roomId` from `RoomSummaryQueryParams.Builder()`. Create a new API in RoomService to observe a room summary from a roomId.
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
 2022-05-30 16:27:11 +03:00
Aris Kotsomitopoulos
9a756f2b7a
Merge pull request #6168 from vector-im/feature/aris/threads_update_icons 
Fix wrong rendered vector icon
 2022-05-30 15:59:18 +03:00
Onuray Sahin
21abc3fa77 Code review fixes. 2022-05-30 15:40:36 +03:00
Benoit Marty
ab651cbe50
Merge pull request #6164 from vector-im/bug/adm/link-checking 
Ask the user to confirm urls which contain unicode direction overrides
 2022-05-30 14:07:23 +02:00
SpiritCroc
292020e95d Fix some notifications never getting dismissed 
Persisting notification info fails for non-null Uris:

E NotificationEventPersistence: ## Failed to save cached notification info
E NotificationEventPersistence: java.io.NotSerializableException: android.net.Uri$HierarchicalUri
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1240)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1604)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1565)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1488)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1234)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:354)
E NotificationEventPersistence: 	at java.util.ArrayList.writeObject(ArrayList.java:762)
E NotificationEventPersistence: 	at java.lang.reflect.Method.invoke(Native Method)
E NotificationEventPersistence: 	at java.io.ObjectStreamClass.invokeWriteObject(ObjectStreamClass.java:1036)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1552)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1488)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1234)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:354)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.SecretStoringUtils.saveSecureObjectM(SecretStoringUtils.kt:283)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.SecretStoringUtils.securelyStoreObject(SecretStoringUtils.kt:150)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.DefaultSecureStorageService.securelyStoreObject(DefaultSecureStorageService.kt:27)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationEventPersistence.persistEvents(NotificationEventPersistence.kt:58)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager$persistEvents$1.invoke(NotificationDrawerManager.kt:183)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager$persistEvents$1.invoke(NotificationDrawerManager.kt:182)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationState.queuedEvents(NotificationState.kt:55)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager.persistEvents(NotificationDrawerManager.kt:182)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager.refreshNotificationDrawerBg(NotificationDrawerManager.kt:177)

Accordingly, if a notification for an image is shown, and the
notification state is loaded from storage later, none of the previously
shown notifications will get dismissed once read.

Likely addresses https://github.com/vector-im/element-android/issues/4862.

Change-Id: I2d6be497e8b92e770b680e16e42b3610add57323
 2022-05-30 13:06:09 +02:00
Onuray Sahin
aa344b1ecd Code documentation. 2022-05-30 13:56:17 +03:00
Maxime NATUREL
eeaf9fd616
Merge pull request #6129 from vector-im/feature/mna/PSF-1019-user-pins 
[Location sharing] - Show user live location pins in map view (PSF-1019)
 2022-05-30 12:32:09 +02:00
Onuray Sahin
b262aad3a8 Remove unused layout. 2022-05-30 13:24:31 +03:00
Maxime NATUREL
538c099913 Fixing non necessary breaking line 2022-05-30 11:44:03 +02:00
Adam Brown
67f1929784 continuing to the originally supplied url when a rtl override character is detected 2022-05-30 10:42:42 +01:00
Adam Brown
e6198d7bf6 splitting url detection condition into separate branches 2022-05-30 10:38:42 +01:00
Benoit Marty
ec498cf054 Cleaner code 2022-05-30 11:38:31 +02:00
Benoit Marty
c071dc502e Create extension String?.toActiveSpaceOrOrphanRooms() to reduce noise. 2022-05-30 11:38:31 +02:00
Benoit Marty
0b6f35b256 Create SpaceFilter.OrphanRooms to improve the API. 
Not 100% of the side effect. There is probably some (fixed?) bugs here.
 2022-05-30 11:34:55 +02:00
Benoit Marty
c7997edf9a Rename ActiveSpaceFilter to SpaceFilter 2022-05-30 11:34:55 +02:00
Benoit Marty
00809027c1 Remove ActiveSpaceFilter.None 
Prefer nullability for API coherency of `RoomSummaryQueryParams`
 2022-05-30 11:34:55 +02:00
Benoit Marty
8843fe0a54 Remove RoomCategoryFilter.ALL 
Prefer nullability for API coherency of `RoomSummaryQueryParams`
 2022-05-30 11:34:55 +02:00
Benoit Marty
6a728e3851 Remove duplicated code lines 2022-05-30 11:34:55 +02:00
Benoit Marty
bfdc885d7f Remove roomId from RoomSummaryQueryParams.Builder(). 
Create a new API in RoomService to observe a room summary from a roomId.
 2022-05-30 11:34:55 +02:00
Benoit Marty
12b3afbc50 Always use roomSummaryQueryParams, and not directly a RoomSummaryQueryParams.Builder() 
Also format and add some Kdoc
 2022-05-30 11:34:55 +02:00
Maxime NATUREL
1756fa26e1 Using @AndroidEntryPoint for map fragment 2022-05-30 11:21:23 +02:00
Eric Decanini
eeb7d60e59
Merge pull request #5860 from vector-im/feature/eric/replace-search-room-subheader 
Replaces subtitle in Search Rooms with room context rather than last event
 2022-05-30 11:13:10 +02:00
Eric Decanini
b8c0c61a4c
Merge pull request #6073 from vector-im/feature/eric/improve-back-navigation 
Adds up navigation in spaces
 2022-05-30 10:38:28 +02:00
ericdecanini
90ab67e1fc Removes unused string 2022-05-27 16:38:33 +02:00
Onuray Sahin
8018ba3213 Zoom to selected user from bottom sheet. 2022-05-27 17:21:49 +03:00
Onuray Sahin
2eaf843031 Implement stop sharing function from bottom sheet. 2022-05-27 16:52:20 +03:00
Onuray Sahin
83e79207c1 Implement stop sharing button visibility. 2022-05-27 16:33:55 +03:00
ericdecanini
e54a82f658 Deletes ic_arrow_back 2022-05-27 15:09:50 +02:00
ericdecanini
a5dc8ec181 Only gets flattenParents if specifically requested 2022-05-27 15:05:39 +02:00
Onuray Sahin
daa0734e5b Implement user list bottom sheet. 2022-05-27 15:34:42 +03:00
Onuray Sahin
8247b1dd7a Add location update timestamp live location view state mapper. 2022-05-27 15:33:57 +03:00
Onuray Sahin
924d7e10a1 Implement bottom sheet controller. 2022-05-27 15:28:18 +03:00
Onuray Sahin
44b2a7fb72 Refactor duration formatter to be able to user StringProvider. 2022-05-27 15:27:38 +03:00
Onuray Sahin
88de113a4e Add bottom sheet layout. 2022-05-27 15:26:40 +03:00
Onuray Sahin
453aa28380 Add required resources. 2022-05-27 15:25:59 +03:00
ariskotsomitopoulos
21225b8a28 Replace old drawable from 2022-05-27 13:56:52 +03:00
ariskotsomitopoulos
1d36269b03 Fix wrong rendered vector icon 2022-05-27 13:40:53 +03:00
Anderson Ivanovich
bbef119f62 Translated using Weblate (Tamil) 
Currently translated at 3.3% (75 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ta/
 2022-05-27 08:32:07 +00:00
ericdecanini
e84f012b73 Changes set method name to emit 2022-05-26 15:45:18 +02:00
Onuray Sahin
03a8289a13 Code review fixes. 2022-05-26 15:45:53 +03:00
Adam Brown
913c6b0f14 warning the user when urls contain directional overrides and allowing them to confirm the url 2022-05-26 12:32:22 +01:00
ericdecanini
d5432cd0e7 Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/onboarding/DirectLoginUseCase.kt
 2022-05-26 10:37:19 +02:00
kingoflove819
6a52ff4da2 Translated using Weblate (Tamil) 
Currently translated at 3.2% (72 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ta/
 2022-05-26 07:32:17 +00:00
Anderson Ivanovich
c6e5a75448 Translated using Weblate (Tamil) 
Currently translated at 3.2% (72 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ta/
 2022-05-26 07:32:16 +00:00
homocomputeris
fc3ebca273 Translated using Weblate (Russian) 
Currently translated at 97.6% (2172 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2022-05-26 07:32:12 +00:00
Didek
7a9b931a36 Translated using Weblate (Polish) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2022-05-26 07:32:11 +00:00
Johan Smits
fef3cdaeb1 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2022-05-26 07:32:11 +00:00
Sveinn í Felli
e6614fc4fc Translated using Weblate (Icelandic) 
Currently translated at 84.0% (1870 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
 2022-05-26 07:32:11 +00:00
Szimszon
bc8432418d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-05-26 07:32:08 +00:00
Vancha
24dc5b10e8 Translated using Weblate (Frisian) 
Currently translated at 40.6% (905 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
 2022-05-26 07:32:08 +00:00
Glandos
e1285aa50b Translated using Weblate (French) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-05-26 07:32:08 +00:00
Auri B. P
3336249b00 Translated using Weblate (Catalan) 
Currently translated at 84.2% (1874 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-05-26 07:32:07 +00:00
Johannes Marbach
92a140b504 Add unit tests for filter/map logic 2022-05-25 20:50:58 +02:00
Adam Brown
096db6c35d giving arugment a proper name 2022-05-25 17:34:00 +01:00
Adam Brown
0675b7c16c
Merge pull request #5995 from vector-im/feature/adm/ftue-sign-in 
FTUE - Sign in
 2022-05-25 17:30:03 +01:00
ericdecanini
8647400dda Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
 2022-05-25 17:35:31 +02:00
Johannes Marbach
9e084ec372 Inject permission utils 2022-05-25 16:22:16 +02:00
Johannes Marbach
6ec6d41aa9 Make permission utils instantiable and throw when permission request is null 2022-05-25 15:53:58 +02:00
Benoit Marty
8f06415744 Fix compilation issue after rebase 2022-05-25 15:08:13 +02:00
Maxime NATUREL
c8fb034c57
Merge pull request #6128 from vector-im/feature/mna/PSF-999-auto-refresh-db 
[Location sharing] - Update DB entity when a live is timed out (PSF-999)
 2022-05-25 14:59:54 +02:00
Adam Brown
86c9e60129 formatting 2022-05-25 13:34:08 +01:00
Adam Brown
75d038b058 adding test case around invalid deeplinks within the onboarding flow 2022-05-25 13:34:08 +01:00
Adam Brown
797e0ee706 creating a build meta abstraction for allowing testing classes with build version checks 2022-05-25 13:34:08 +01:00
Adam Brown
ea7df9b673 lifting unavailable homeserver rendering to the activity/ftuevariant 
- the viewmodel is now responsible for inferring connectivity errors and providing a retry action
 2022-05-25 13:34:08 +01:00
Adam Brown
100aa24021 adding helper for inferring if the device has connectivity, this helps with breaking down UnknownHost exceptioncauses and shouldn't be used for checking offline status 2022-05-25 13:34:07 +01:00
Adam Brown
59afb5cf4c downscoping the possible action types when selecting homeservers 2022-05-25 13:34:07 +01:00
Adam Brown
b8418f97dc extracting server selection branches to their own functions 2022-05-25 13:34:07 +01:00
Adam Brown
690fda180c providing dedicated reset action for resetting invalid deeplink homeserver 
- also fixes the usecase screen becoming stuck with an invalid homeserver deeplink
 2022-05-25 13:34:07 +01:00
Maxime NATUREL
aa65d82341 Adding unit tests for ViewModel 2022-05-25 14:05:14 +02:00
Maxime NATUREL
65d7ec8696 Adding unit tests for use case to get the list of current running lives 2022-05-25 14:05:14 +02:00
Maxime NATUREL
5efe26c7dd Fix code quality issues 2022-05-25 14:05:14 +02:00
Maxime NATUREL
8145049315 Fix potential access to null value 2022-05-25 14:05:14 +02:00
Maxime NATUREL
401027e919 Adding end of live timestamp into view state 2022-05-25 14:05:14 +02:00
Maxime NATUREL
bd473375a1 Fix no text visible if using direct pin drawable 2022-05-25 14:05:14 +02:00
Maxime NATUREL
40d8d5c605 Updating user pins on location update 2022-05-25 14:04:22 +02:00
Maxime NATUREL
81b90df909 Observe the current live location shares in a room 2022-05-25 14:04:22 +02:00
Maxime NATUREL
5410b61ae3 Show user pins with correct zoom when map is first opened 2022-05-25 14:03:37 +02:00
Maxime NATUREL
d6029210d0 Adding use case to get live location of users 2022-05-25 14:03:37 +02:00
Maxime NATUREL
44ca82bbef Adding ViewModel to Activity 2022-05-25 14:03:37 +02:00
Johannes Marbach
f5a621a6d5
Merge pull request #6140 from vector-im/johannes/widget-screen-rotation 
Prevent widget web view from reloading on screen / orientation change (PSF-1034)
 2022-05-25 13:42:24 +02:00
Johannes Marbach
580bbd60e7 Appease the linter 2022-05-25 13:01:42 +02:00
Johannes Marbach
59c13bf8c1 Make widget web view request system permissions for camera and microphone 
Previously the widget web view prompted to grant the widget permissions but it didn't
actually request those permissions from the system. So if the web view requested, e.g.
the camera permission but the app hadn't previously been granted that permission, the
web view wouldn't get camera access even when the widget permission request had been
confirmed.

With this commit, the app will also request camera and microphone permissions from the
system when needed.

Signed-off-by: Johannes Marbach <johannesm@element.io>
 2022-05-25 12:35:43 +02:00
Adam Brown
8c44c9828c fixing listener import 2022-05-25 10:22:27 +01:00
Adam Brown
8b2132c6dd fixing detekt/formatting issues 2022-05-25 10:22:27 +01:00
Adam Brown
137fe89938 hiding username/password fields when the homeserver doesn't support them and showing SSO options when available 2022-05-25 10:22:27 +01:00
Adam Brown
610c1d1150 extracting sso buttons render method to reduce duplication 2022-05-25 10:22:27 +01:00
Adam Brown
d86c12dc7a extracting duplicated field resetting logic 2022-05-25 10:22:27 +01:00
Adam Brown
fb1a686f90 extracting the login error handling to its own class 2022-05-25 10:22:27 +01:00
Adam Brown
d1bafc531e removing input footer fields, they're only needed for sign up, not login 2022-05-25 10:22:27 +01:00
Adam Brown
b2af918969 using correct copy for the login validation errors 
- extracts helpers to make the logic more declarative
 2022-05-25 10:22:27 +01:00
Adam Brown
25b81c2952 creating subtype for register/login authentication types 2022-05-25 10:22:26 +01:00
Adam Brown
c3ce887e33 minor refactors 
- extracting login fields validation
- renaming xml fields to login
- renaming direct login property to matrixId
 2022-05-25 10:17:51 +01:00
Adam Brown
b3bbb0329e directing to the combined login after homeserver check 
- also removes the subtitle view which is not needed for login
 2022-05-25 10:17:51 +01:00
Adam Brown
4b6f74364d adding dedicated login action 2022-05-25 10:17:51 +01:00
Adam Brown
34e97112a4 adding feature flag and redirecting the sign in flow 
- temporarily to the combined register fragment
 2022-05-25 10:17:51 +01:00
Glandos
71706bc6a6 Translated using Weblate (French) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-05-25 07:14:58 +00:00
Jean-Luc KABORE-TURQUIN
d0628129f5 Translated using Weblate (French) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-05-25 07:14:56 +00:00
Adam Brown
b4b2b97eb1
Merge pull request #6068 from vector-im/dependabot/gradle/vanniktechEmoji-0.12.0 
Bump vanniktechEmoji from 0.9.0 to 0.12.0
 2022-05-24 16:26:06 +01:00
Johannes Marbach
f95853a7b3 Prevent widget web view from reloading on screen / orientation change (PSF-1034) 
Signed-off-by: Johannes Marbach <johannesm@element.io>
 2022-05-24 16:29:38 +02:00
ericdecanini
6c21a6b48d Separates some method parameters 2022-05-24 15:26:24 +02:00
Jeremy
b131848b72
Fix grammar in strings in strings.xml 
`room_list_people_empty_body` and `room_list_rooms_empty_body`
 2022-05-24 14:12:49 +12:00
Adam Brown
a59b8bf50c
Merge pull request #6065 from vector-im/feature/adm/matrix-org-ordering 
FTUE - Only override sign up steps for `matrix.org`
 2022-05-23 21:24:48 +01:00
Maxime NATUREL
b05fc763ae Rely only on isActive field on UI side 2022-05-23 17:34:52 +02:00
ericdecanini
a07c1b8afa Removes top bar back arrow 2022-05-23 13:46:53 +01:00
ericdecanini
f831252e35 Fixes UpgradeRoom command not working 2022-05-23 14:09:29 +02:00
ericdecanini
b9b0e84704 Adds set method to MutableDataSource 2022-05-23 14:09:18 +02:00
Maxime NATUREL
9a38d59f9a
Merge pull request #6092 from vector-im/feature/mna/PSF-888-navigation 
[Location sharing] - Navigation to Map view from live location message (PSF-888)
 2022-05-23 13:54:04 +02:00
Benoit Marty
fd252dbaff
Merge pull request #5856 from ofalvai/bugfix/ofa/read-recept-text-scale 
Use fixed text size in read receipt counter
 2022-05-23 13:41:03 +02:00
ericdecanini
b3fdb5ed17 Changes code style when arrow alignment 2022-05-23 12:57:57 +02:00
ericdecanini
3f3662e605 Changes code style method parameters new line around parentheses to true 2022-05-23 12:30:42 +02:00
Adam Brown
98999c754f
Merge pull request #5868 from vector-im/feature/adm/ftue-email-verification 
[FTUE] - Email input and verification
 2022-05-23 11:14:46 +01:00
Maxime NATUREL
7bb73ffb57 Making the layout file more generic 2022-05-23 11:41:33 +02:00
Maxime NATUREL
b331521e93 Improving code in Fragment 2022-05-23 11:30:57 +02:00
Maxime NATUREL
721d7cb6a0 Remove commented code 2022-05-23 11:30:35 +02:00
Maxime NATUREL
c46aaa24a5 Using @AndroidEntryPoint in Fragment 2022-05-23 10:40:52 +02:00
Benoit Marty
71e14ea43b
Merge pull request #6110 from vector-im/defect/jorgem/PSE-613-fix-multi-invites-to-room 
Fix sending multiple invites to a room reaching only one or two people
 2022-05-23 09:39:47 +02:00
Jorge Martín
96e3544a47 Fix sending multiple invites to a room reaching only one or two people 2022-05-23 08:14:32 +02:00
Auri B. P
76fc3b5336 Translated using Weblate (Catalan) 
Currently translated at 83.3% (1855 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-05-22 20:32:05 +00:00
anoloth
9779e9b9a5 Translated using Weblate (Lao) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lo/
 2022-05-21 17:32:31 +00:00
Jeff Huang
7d9cb1dc0c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2022-05-21 17:32:13 +00:00
Ihor Hordiichuk
b784c0fcc2 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2022-05-21 17:32:13 +00:00
LinAGKar
3826b7ba28 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2022-05-21 17:32:13 +00:00
Jozef Gaal
096e51951a Translated using Weblate (Slovak) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-05-21 17:32:12 +00:00
homocomputeris
79858a6560 Translated using Weblate (Russian) 
Currently translated at 97.6% (2172 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2022-05-21 17:32:12 +00:00
lvre
b12e0cd9f3 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2022-05-21 17:32:10 +00:00
Didek
946353aeb9 Translated using Weblate (Polish) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2022-05-21 17:32:10 +00:00
Piotr Strebski
9710447ea3 Translated using Weblate (Polish) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2022-05-21 17:32:09 +00:00
random
165b8d1b93 Translated using Weblate (Italian) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2022-05-21 17:32:09 +00:00
Linerly
d307349ae2 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-05-21 17:32:09 +00:00
Danial Behzadi
7ff9566788 Translated using Weblate (Persian) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2022-05-21 17:32:08 +00:00
Priit Jõerüüt
49acc6704f Translated using Weblate (Estonian) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-05-21 17:32:08 +00:00
John Doe
aac075fa89 Translated using Weblate (Spanish) 
Currently translated at 99.8% (2221 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-05-21 17:32:08 +00:00
waclaw66
422487ea9f Translated using Weblate (Czech) 
Currently translated at 100.0% (2225 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2022-05-21 17:32:07 +00:00
Auri B. P
97b2dd3d14 Translated using Weblate (Catalan) 
Currently translated at 83.3% (1854 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-05-21 17:32:07 +00:00
Benoit Marty
ede784684f Change in KeysBackupService: isEnabled and isStucked are now fun, and state has been renamed to getState and is now a fun. 2022-05-20 21:14:42 +02:00
Benoit Marty
1ab4ae9eac Extract KeyRef to its own file 2022-05-20 21:14:42 +02:00
Benoit Marty
d3d17ebbcb Extract HttpPusher to its own file 2022-05-20 21:14:42 +02:00
Benoit Marty
768df330b5 Rename currentThreePid to getCurrentThreePid 2022-05-20 21:14:42 +02:00
Benoit Marty
e6c8ffd1b8 Change val to fun on the SDK interfaces. 
Dokka will generate a better documentation (`Functions` and `Properties` are 2 distinct tab), and for Service it's better to have only `fun`
 2022-05-20 21:14:42 +02:00
Onuray Sahin
109b381e2e
Merge pull request #6103 from vector-im/feature/ons/fix_live_location_flickering 
Glide - Use current drawable while loading new static map image
 2022-05-20 18:36:12 +03:00
Adam Brown
2d351aa60f applying api changes 2022-05-20 15:20:24 +01:00
Adam Brown
c71f9c81cd provides a dedicated job for the email verification polling to allow it to be cancelled when resetting the auth flow 
- extracts an auto cancelling job delegate
 2022-05-20 13:10:03 +01:00
Adam Brown
2378643071 adding missing punctuation 2022-05-20 12:13:09 +01:00
Adam Brown
4bcdaa309e removing unused imports 2022-05-20 12:11:44 +01:00
Adam Brown
9fddd09f1c using direct string reference for design preview 2022-05-20 12:11:44 +01:00
Adam Brown
47635aae6e avoiding cancelling the polling job when resending verification email 2022-05-20 12:11:44 +01:00
Adam Brown
bc5ebb20b5 adding gradient background to xml preview 2022-05-20 12:11:44 +01:00
Adam Brown
0979d56a36 inlining single use extension function 2022-05-20 12:11:44 +01:00
Adam Brown
4dc8d23826 removing unneeded state reacting when entering email address for verification 2022-05-20 12:11:44 +01:00
Adam Brown
641c06f10d removing this usage for project consistency 2022-05-20 12:11:44 +01:00
Adam Brown
80b6b77a3a reusing editText unboxing extension 2022-05-20 12:11:44 +01:00
Adam Brown
c414f80fa6 adding listener suffix for consistency 2022-05-20 12:11:44 +01:00
Adam Brown
c4834a44d1 aligning the carousel listener removal with the viewLifecycleOwner 
- fixes crash where the scheduled callbacks can attempt to trigger after the view has been destroyed
 2022-05-20 12:11:44 +01:00
Adam Brown
a4b5d1819d renaming sdk model to matrix 2022-05-20 12:11:44 +01:00
Adam Brown
8136f57b5e making use of the view lifecycle scope for the view based fragment logic 2022-05-20 12:11:44 +01:00
Adam Brown
8e7ae5e9d2 removing extra end of file lines 2022-05-20 12:11:44 +01:00
Adam Brown
350643c8a4 resetting authentication state when the viewmodel resets whilst in the email entry step - matching legacy flow 2022-05-20 12:11:44 +01:00
Adam Brown
9cc646760a removing copied back behaviour, isn't needed for the email entry screen 2022-05-20 12:11:44 +01:00
Adam Brown
8a53eafa72 adding gradient background to the waiting for verification screen, matching designs 
- renames drawable which redirects to the attribute colorBackground
 2022-05-20 12:11:44 +01:00
Adam Brown
eb4d31e955 extracting reusable logic for styling terminating full stops and applying to the waiting for verification title 2022-05-20 12:11:44 +01:00
Adam Brown
817d692471 renaming xml ids to the email verification domain and attaching the click logic for resending verification emails 2022-05-20 12:11:44 +01:00
Adam Brown
4964c9f151 showing loading spinner when returning to the email verification waiting screen 2022-05-20 12:11:44 +01:00
Adam Brown
02b6916487 adding UI for updated email verification waiting screen 2022-05-20 12:11:44 +01:00
Adam Brown
074e5bcfb6 porting registration email verification polling to the registration action handler instead of the fragment 2022-05-20 12:11:44 +01:00
Adam Brown
d4a5b71a4d adding email input FTUE screen 
- lifts the threepid email error handling to the RegistrationActionHandler rather than having the UI infer success from a 401
 2022-05-20 12:11:44 +01:00
Onuray Sahin
2b681a43c8 Use current drawable while loading new map image. 2022-05-20 12:16:35 +03:00
Benoit Marty
f5d0663b06 Remove non needed extra spaces 2022-05-20 09:48:17 +02:00
Benoit Marty
51fe7b9a93 Detekt: Fix OutdatedDocumentation 2022-05-20 09:48:05 +02:00
ClaireG
b379ef46ec
Revert: Use member name instead of room name in DM creation item (#6049) 2022-05-19 14:14:58 +00:00
Onuray Sahin
2e2dffd9c9 Merge branch 'develop' into live_location_labs_flag 
* develop:
  Space explore rooms screen alignment with design in figma (#5834)
  leaving space aligned with ios (#5942)
  Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
 2022-05-19 12:52:05 +03:00
fedrunov
a30912f688
Space explore rooms screen alignment with design in figma (#5834) 2022-05-19 11:49:20 +02:00
fedrunov
18842b5e3d
leaving space aligned with ios (#5942) 2022-05-19 11:49:08 +02:00
Onuray Sahin
51ac6f22d7 Labs flag added for enabling live location sharing. 2022-05-19 12:01:42 +03:00
ericdecanini
93264812c0 Adds back navigation to spaces 2022-05-19 10:20:46 +02:00
Michael Kaye
5260e729ac
Merge pull request #6095 from vector-im/michaelk/correct_well_known_behaviour 
Well known lookups should be to port 443 only.
 2022-05-18 16:50:43 +01:00
Benoit Marty
12644e9915
Merge pull request #5947 from vector-im/feature/bma/renaming 
Small changes
 2022-05-18 16:27:48 +02:00
Michael Kaye
e66284fbd3 Rename 'getDomain' to 'getServerName'. 
In the context of matrix IDs, this removes the leading @name: leaving the hostname or hostname and port.
 2022-05-18 15:21:33 +01:00
Benoit Marty
7ae3f6ea40
Merge pull request #6083 from vector-im/feature/bma/remove_badge 
Remove ShortcutBadger lib and usage (it was dead code)
 2022-05-18 16:19:37 +02:00
Maxime NATUREL
738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view 
[Location sharing] - Message for live sharing in timeline (PSF-884)
 2022-05-18 15:39:51 +02:00
Maxime NATUREL
5265856772 Remove unused imports 2022-05-18 14:44:44 +02:00
Maxime NATUREL
4864980a5a Enable navigation only from running state item 2022-05-18 14:44:44 +02:00
Maxime NATUREL
23e8cad10f Rollback to Fragment to be able to use Maverick capabilities 2022-05-18 14:44:44 +02:00
Maxime NATUREL
26cddd2d0d Use SupportMapFragment instead of custom fragment 2022-05-18 14:44:44 +02:00
Maxime NATUREL
54d7d47dfc Updating the title of the map view screen 2022-05-18 14:44:44 +02:00
Maxime NATUREL
52c0fa41c6 Creation of map view screen and basic navigation 2022-05-18 14:44:44 +02:00