mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-12-18 22:52:04 +03:00
Code Issues Projects Releases Packages Wiki Activity
2692 commits 95 branches 415 tags 80 MiB
Commit graph

1374 commits

Author SHA1 Message Date
Marcel Hibbe
723ee303d4
Merge pull request #1095 from nextcloud/avoidSharingRestrictedFiles 
do not allow selecting files that are not allowed to be reshared
 2021-04-07 10:58:13 +02:00
Marcel Hibbe
cc5d3d968e
log exceptions 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-04-07 10:00:29 +02:00
Marcel Hibbe
1038612569
use name from theming capability for "Share from..", set fallback to nc_server_product_name 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-04-07 09:47:39 +02:00
Marcel Hibbe
f24addbcf6
avoid hardcoded product name in "Share from Nextcloud" 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-04-06 10:45:17 +02:00
Marcel Hibbe
bd8edbc17f
avoid read redundant string 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-04-06 10:43:53 +02:00
tobiasKaminsky
ada5aeebe5
On Recyclerview everything needs to be set explicitly 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2021-04-06 08:39:48 +02:00
Marcel Hibbe
68c09d8e81
do not allow selecting files in files browser that are not allowed to be reshared 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-03-31 13:18:41 +02:00
Marcel Hibbe
17f3dae165
delete all account-links when disabling phonebooksync 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-03-26 15:47:11 +01:00
Marcel Hibbe
adc0a91dac
fix "chat via"-links in phonebook (no multiple entries, fix deletion) 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-03-26 15:47:11 +01:00
Marcel Hibbe
24f1a1831c
set application name in call screens from String nc_app_name 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-03-26 14:24:59 +01:00
Andy Scherzinger
adac29d756
improve conversation list layout and dark-theme-colors 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2021-03-26 11:48:55 +01:00
Marcel Hibbe
d2f741e917
avoid "null" entry in phonebook and use correct app name 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

dynamically set accountType and accountName

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

comment out applicationIdSuffix

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-03-24 16:26:55 +01:00
Marcel Hibbe
d9f9f8c280
dynamically set accountType and accountName 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-03-24 16:26:55 +01:00
Marcel Hibbe
6e885af18c
avoid Security Exeception from AccountManager 2021-03-17 15:43:20 +01:00
Marcel Hibbe
5b6fd3759f
only check for nc contacts if phonebook on device is not empty 2021-03-17 11:17:36 +01:00
Marcel Hibbe
5e1b69bbe6
split userId on last @ 
(e.g. necessary if email adresses are taken as userId)
 2021-03-17 10:24:13 +01:00
Marcel Hibbe
6a18b9b745
add ability to enter own phone number when enabling address book sync 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-03-11 14:43:38 +01:00
Marcel Hibbe
42fea1a588
fix missing deck card links / always show links if available in message 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-02-25 21:38:50 +01:00
Marcel Hibbe
e454702150
revert dav4jvm to version f2078bc846 
"Share from nextcloud" crashed. version update should be done when okhttp is bumped? https://stackoverflow.com/questions/39545629/noclassdeffounderror-failed-resolution-of-lokhttp3-internal-platform

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-02-24 21:28:30 +01:00
Marcel Hibbe
510e555eb5
update imports for dav4jvm 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-02-24 17:07:25 +01:00
Marcel Hibbe
642146de02
improve call screens, add outgoing ringtone 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-02-18 14:51:18 +01:00
Marcel Hibbe
cc543a660a
add confirm dialog before sharing files 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-02-15 08:57:57 +01:00
Marcel Hibbe
18714b2b8b
resolve some lint warnings 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-02-10 15:07:13 +01:00
Marcel Hibbe
d7bc01e954
resolve some lint warnings 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-02-10 14:35:25 +01:00
Marcel Hibbe
b50501a38f
bump google-webrtc to 1.0.32006 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-02-10 10:59:16 +01:00
Marcel Hibbe
ded0cef839
add ability to delete messages 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-02-01 19:30:40 +01:00
Marcel Hibbe
0b35971ee5
add ability to upload one or multiple files from local storage #254 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-01-30 23:30:34 +01:00
Marcel Hibbe
bd3bbdd755 change email address for feedback 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2021-01-20 09:35:27 +01:00
tobiasKaminsky
ba314c96ee
Do not use -1 as lastCommonRead parameter, but do not set it at all, if undefined 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2021-01-04 16:26:59 +01:00
tobiasKaminsky
e563230fb2
Hide read status setting if old talk version used 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-12-18 15:04:08 +01:00
tobiasKaminsky
98e2117bdf
Missing imports after rebase 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-12-18 14:33:10 +01:00
tobiasKaminsky
1496b902bb
Show phonebook setting only for Talk11 (verified via capability) 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-12-14 15:18:14 +01:00
tobiasKaminsky
ad97abaee4
Add phone book integration 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-12-14 12:05:43 +01:00
Tobias Kaminsky
05a21590da
Merge pull request #907 from nextcloud/fix-data-channel-support-with-newer-janus-versions 
[v8.0.x] Fix data channel suport with newer Janus versions
 2020-10-27 10:51:38 +01:00
tobiasKaminsky
fe4bf8afca
change logo dim so that it fits for other images 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-10-27 10:37:26 +01:00
tobiasKaminsky
0b7e4c09f4
streamline colors 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-10-27 10:37:02 +01:00
tobiasKaminsky
d7400c3f76
Add branding support for 
- hide provider
- hide auth
- multi account support
- enforce domain

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-10-27 10:36:49 +01:00
tobiasKaminsky
f7d9290871
Chat during call 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-10-09 12:08:21 +02:00
Biswajit Das
518d1ea62e
Merge pull request #905 from nextcloud/fix-frozen-video-when-screen-is-shared 
[v8.0.x] Fix frozen video when screen is shared
 2020-10-03 00:00:47 +01:00
Daniel Calviño Sánchez
fcb45e94f3 Fix data channel suport with newer Janus versions 
When Janus is used even if it is possible to open several data channels
with different labels and send data on them all the messages are
received in the first data channel opened.

In Talk the "status" data channel is used to send the data channel
messages, and before Janus 0.7.0 it was the first data channel opened,
so the messages were received on it.

However, since Janus 0.7.0 the data channel messages are received
instead on a data channel opened by Janus, which is named
"JanusDataChannel". It is not possible to change that behaviour on Janus
except by patching it, so for broader compatibility the messages
received in "JanusDataChannel" are treated like messages received in the
"status" data channel

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-10-02 20:15:03 +02:00
Daniel Calviño Sánchez
1321cb21a0 Fix frozen video when screen is shared 
When another participant shared the screen a new offer was requested.
However, the offer was requested for the video instead of for the
screen, which caused the HPB to stop the previous video connection and
replace it with a new one. As receiving new offers for an existing
connection is not properly handled the offer was applied to the existing
peer connection, which caused the new offer to be ignored and the old
peer connection to be kept (but frozen due to the HPB not sending more
data for that connection).

Requesting offers are not needed when the peer connection is a screen,
as the HPB will automatically send the offers itself. Therefore, now
offers are requested only when the connection is of "video" type.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-10-02 10:10:49 +02:00
Daniel Calviño Sánchez
ed8ac14d94 Show avatar for guests in call view 
The avatar of guests is based on their display name/nick.

When the HPB is not used the nick is provided in the offer/answer
signaling messages, and later updated through data channel messages when
it changes. When the HPB is used the nick is periodically sent through
data channel messages. Therefore the avatar is based on the nick set in
the peer connection and reloaded when the nick changes (although it is
currently a bit hacky and brittle, as it is based on whether the nick
shown in the text view changed rather than whether the nick itself
changed, but it works nevertheless).

Note that currently it is required that the guest has a peer connection
to know its nick and, therefore, its avatar; some changes would be
needed in the clients to also send the nick when there is no peer
connection.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-10-02 09:11:16 +02:00
Daniel Calviño Sánchez
783f09316f Remove no longer used method 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-10-01 20:34:48 +02:00
Daniel Calviño Sánchez
8f748caeaa Remove no longer needed parameter 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-10-01 19:18:20 +02:00
Daniel Calviño Sánchez
6b2720653a Always pass the session id in "NICK_CHANGE" PeerConnectionEvents 
Before the NICK_CHANGE event include either the session id or the user
id, depending on whether the participant was a guest or a user. However,
as the session id is also known for users the event can be unified to
always include the session id only.

This also fixes an exception when handling the "NICK_CHANGE" event, as
the session id was got from the user id given in the event, but if the
event already included the session id the look up failed and the session
id was replaced with an empty value. This in turn caused an exception
when trying to use the view for the now invalid session id. Now the
session id provided in the event is always directly used.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-10-01 19:07:25 +02:00
Daniel Calviño Sánchez
5b9f02e99c Fix setting guest nicks 
The "nick" attribute was set with itself instead of with the
"internalNick" variable that holds the value received in the
"nickChanged" event.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-10-01 19:00:07 +02:00
Daniel Calviño Sánchez
6846eb950b Fix websocket reconnection when a guest joins the conversation 
When the standalone signaling server is used and a participant joins a
conversation a "join" signaling message is received. The code assumed
that the event always contains a "user" attribute, but that attribute is
empty for guests. As the "user" attribute was used unconditionally this
caused an exception, and as the exception happened when handling a
websocket message it propagated until it caused a reconnection of the
websocket.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-10-01 18:45:16 +02:00
tobiasKaminsky
6d7cf8305a
Fix join call directly after first start 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-09-29 09:40:46 +02:00
Mario Danic
ac1bb0ecf7
Fix spamming participants 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-04-15 12:02:56 +02:00
Mario Danic
b14f9990b4
Fix #761 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-03-23 14:16:26 +01:00
Mario Danic
4b12ede79e
Fix duplicate 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-03-22 19:43:55 +01:00
Mario Danic
84cb7cc45a
Fix timeout stuff 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-03-22 19:26:16 +01:00
Mario Danic
68c1cd6d4d
Fix #684 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-03-22 11:19:54 +01:00
Mario Danic
408da749fe
Fix vibration and fix #745 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-03-21 16:26:03 +01:00
Stephan Ritscher
5a1e050928 Fix NullPointerException on (first) account creation with client certificates (#195) 
Signed-off-by: Stephan Ritscher <no3pam@gmail.com>
 2020-03-08 20:42:54 +01:00
Mario Danic
39c2dced64
Fix #713, Fix #720 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-02-12 10:57:35 +01:00
Mario Danic
9e2fbc076c
First step towards working calls on Q 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-02-10 00:33:41 +01:00
Mario Danic
f115b83607
Fix #716 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-02-03 11:05:40 +01:00
Mario Danic
c4eaf319a1
Update version 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-01-16 10:12:40 +01:00
Mario Danic
4b9f47c6b5
Improve contacts 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-01-16 10:11:16 +01:00
Mario Danic
74fb018a8e
Fix #706 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-01-16 03:20:00 +01:00
Mario Danic
fbbcb92ec8
Fix #707 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-01-15 15:17:29 +01:00
Mario Danic
1e2ae2c8b0
Fix #704 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-01-15 13:48:04 +01:00
Mario Danic
0451131fa4
Fix #692 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-01-15 10:42:52 +01:00
Mario Danic
652b72ebde
Fix #702 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-01-15 10:25:15 +01:00
Mario Danic
5262d08e3c
Fix avatars 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-01-13 12:41:38 +01:00
Mario Danic
d166276b80
Improvements to replies 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-01-13 12:36:52 +01:00
Mario Danic
d21d5f51b4
Implemented most of message replies 
# Conflicts:
#	app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
#	app/src/main/res/layout/view_message_input.xml
#	app/src/main/res/values/strings.xml
 2020-01-13 12:07:32 +01:00
Mario Danic
2613c1f074
Some progress on replies 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-01-13 11:15:20 +01:00
Mario Danic
fcdcb12e48 Update version 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-10-31 12:32:22 +01:00
Mario Danic
dd8d2cb00d Tag v7.0.7 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-10-28 12:29:46 +01:00
Mario Danic
345035e93a Fixed issues with sending messages 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-30 14:53:35 +02:00
Mario Danic
f308a5093d Various fix for crashes 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-30 14:15:01 +02:00
Mario Danic
7f3e93edd4 Fix issues with messages processing 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-30 12:33:28 +02:00
Mario Danic
a56319d3a9 Fix message title 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-30 12:33:28 +02:00
Mario Danic
8a60fad0c4 Fix unread message notices 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-30 12:33:28 +02:00
Mario Danic
e1d9a24130 Fix issues with chat title crash 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-30 10:35:30 +02:00
Mario Danic
b95bb003df Fix notifications crash 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-27 13:53:02 +02:00
Mario Danic
5334a0fd15 Update version 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-27 13:06:25 +02:00
Mario Danic
041b77da21 Kotlin & hardening 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-27 12:48:22 +02:00
Mario Danic
a316739c9e Few more fixes 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-27 11:55:43 +02:00
Mario Danic
7eeefa3ae6 Fix issues with setting the title 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-27 11:42:02 +02:00
Mario Danic
d1074257be Clean up imports 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-26 14:14:54 +02:00
Mario Danic
2bbfdda400 Fix moderation issues with add participants 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-26 14:14:41 +02:00
Mario Danic
48c1505cb5 Fix participants management UI 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-26 13:59:55 +02:00
Mario Danic
c1f9dd2ac5 Bug fixes related to guest account 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-26 13:29:00 +02:00
Mario Danic
139c1f1724 Fix some lobby crashes 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-26 10:39:07 +02:00
Mario Danic
ecfe91f36f Significant improvements to the dark theme 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-26 10:39:07 +02:00
Mario Danic
df7f50ba01 Remove logs 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-26 10:39:07 +02:00
Mario Danic
0fa1ae28fb Clean up 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-16 14:06:32 +02:00
Mario Danic
cba3f3317c Fix the final bugs with user management 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-16 14:05:22 +02:00
Mario Danic
85b75b7da5 Fix up magical stuff 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-16 12:49:12 +02:00
Mario Danic
0b7ce8295c First draft of participants management 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-16 11:10:35 +02:00
Mario Danic
3f374ca232 Fix messages stuff 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-13 15:48:19 +02:00
Mario Danic
0648ceb44c New notice logic 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-13 12:39:50 +02:00
Mario Danic
0a0aece7d0 Partly fix messages loading 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-13 12:13:27 +02:00
Mario Danic
82170b77d7 Fix automated app starting due to room invite 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-13 10:39:26 +02:00
Mario Danic
362042e27e Better scroll on new messages & Kotlin 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-09 21:59:40 +02:00
Mario Danic
4d9781fbe2 First scroll to new messages 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-09 18:11:09 +02:00
Mario Danic
f686bf9057 Change timeout for first future pull 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-09 14:00:37 +02:00
Mario Danic
8ed3d1404e Change messages fetch limit 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-09 13:58:08 +02:00
Mario Danic
a8ee4a355b Add some whitespace to bottom of the chat 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-09 13:54:47 +02:00
Mario Danic
6504a3b6e7 Improve things a bit 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-09 13:46:49 +02:00
Mario Danic
ec44092676 Fix endless loading of messages 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-09 13:40:26 +02:00
Mario Danic
31ce180c6d Remove avatars from last message 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-09 11:41:52 +02:00
Mario Danic
175f64b8c3 Remove duplicate clicks on conversation info 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-09 11:17:05 +02:00
Mario Danic
b100095f69 Update small items size 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-06 10:26:50 +02:00
Mario Danic
67e9405040 Add support for last read message & fix pinned magic 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-05 15:52:41 +02:00
Mario Danic
8ad09d3395 Update chatkit 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-05 13:21:48 +02:00
Mario Danic
69c4435b1e Fix #579 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-05 12:03:21 +02:00
Mario Danic
4697e4f340 Fix up guest mentions and autocomplete callback 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-05 11:17:20 +02:00
Mario Danic
3ac3a3b965 Fix #352 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-05 11:17:19 +02:00
Mario Danic
c831b90a09 Fix #615 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-05 11:17:19 +02:00
Mario Danic
29fa1c7deb Fix some more emoji compatibilities 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-03 16:00:51 +02:00
Mario Danic
49fe0a691b Fix #613, Fix #614 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-03 14:38:21 +02:00
Mario Danic
98e1168b25 Fix #612 (again? :D) 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-03 13:45:24 +02:00
Mario Danic
ccb554e1f5 Fix conversation creation process 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-03 10:52:10 +02:00
Mario Danic
4e76a5e83e Fix #612 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-03 10:52:09 +02:00
Mario Danic
6bd36e408c Fix #611 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-03 10:52:08 +02:00
Mario Danic
1ebb2e079d Fix #249 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-02 16:22:37 +02:00
Mario Danic
8d592a996d Fix #601 and mentions 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-02 14:12:31 +02:00
Mario Danic
8cbc0c7bc9 Fix #402 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-02 13:47:24 +02:00
Mario Danic
7d838bd72b Fix #570 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-02 13:30:28 +02:00
Mario Danic
a93a2cdb6b Change mute call behaviour 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-02 13:22:41 +02:00
Mario Danic
85a322dd61 Fix date selection & time formatting for lobby 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-02 12:55:20 +02:00
Mario Danic
86974a8437 Fix lobby check crash, fix user related crash, fix infinite lobby progress bar 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-09-02 12:55:20 +02:00
Mario Danic
75e5852646 Fix #607 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-30 23:21:45 +02:00
Mario Danic
f9ecf17504 Fix #601 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-30 13:45:35 +02:00
Mario Danic
6a5aaac224 Lobby & Various bugfixes and improvements 
Includes conversion to Kotlin of some files

Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-30 12:13:33 +02:00
Mario Danic
14efe5992a Clean up MerlinTheWizard 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-30 12:13:33 +02:00
Mario Danic
530e8b0547 Refactoring & fix for earlier Nc versions 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-25 23:24:18 +02:00
Mario Danic
eade532f79 Add missing ; 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-25 22:24:20 +02:00
Mario Danic
8d73c89f69 Clean up message timestamp even further 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-23 19:20:23 +02:00
Mario Danic
c5df8250de Update when for notifications 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-23 18:39:29 +02:00
Mario Danic
9cb72de8e8 Improve message timestamps 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-23 18:39:29 +02:00
Mario Danic
8f311ae3bc Improve on the notifications 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-23 18:39:29 +02:00
Mario Danic
750218febd Clean up 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-23 18:39:29 +02:00
Mario Danic
90d494e3ea Initial work on grouping messages 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-23 18:39:29 +02:00
Mario Danic
5ecdda4cde Don’t show notifications on error 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-20 19:29:19 +02:00
Mario Danic
e5cb10e386 Better cleanup 
Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	app/build.gradle
 2019-08-15 17:08:59 +02:00
Mario Danic
28e24992fd Fix 
Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	app/build.gradle
 2019-08-15 17:08:42 +02:00
Mario Danic
0eab88f302 Remove latin america for s4 mini 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-13 22:00:24 +02:00
Mario Danic
687f6f3aee Fix #597 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-13 21:53:10 +02:00
Joas Schilling
93ed52231b Make the unread counter more usable 2019-08-12 12:38:48 +02:00
Mario Danic
38df5d2859 Check signatures when opening files app 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-12 09:24:07 +02:00
Mario Danic
0b0086317c Fix another crashing bug 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-09 18:07:47 +02:00
Mario Danic
45e2bd505d Prevent some crashes 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-09 18:05:23 +02:00
Mario Danic
0e6779616b Fix-up remaining things 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-09 17:56:37 +02:00
Mario Danic
925ac6724e Various updates to theming settings & fixes 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-09 17:56:37 +02:00
Daniel Bailey
a4efa5a746 Tweaks to message colours. 
Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
 2019-08-09 17:56:37 +02:00
Daniel Bailey
f384651c81 Altered colours used by system message bubble and @ avatars. 
Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
 2019-08-09 17:56:37 +02:00
Daniel Bailey
8a013cb837 Base commit for dark theme v1.5 
Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
 2019-08-09 17:56:37 +02:00
Dominik Schürmann
ee44394268 add FIDO U2F support using WebViewFidoBridge 
Signed-off-by: Dominik Schürmann <dominik@schuermann.eu>
 2019-08-08 18:31:29 +02:00
Mario Danic
b10ed2805f Fix disabled calling sound 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-07 12:58:50 +02:00
Mario Danic
ef7cf64c02 Switch the place where we check for timeout 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-07 12:58:30 +02:00
Mario Danic
63db659079 Hopefully fix double messages with MCU 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-07 12:58:30 +02:00
Mario Danic
c1838e21f8 Fix an issue with conversation menu 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-01 11:01:13 +02:00
Mario Danic
7349e67b79 Fix double message when using MCU 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-01 11:01:13 +02:00
Mario Danic
7ebf1648ca Fix scrolling and flicker for real 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-01 11:01:13 +02:00
Mario Danic
9a441d8c4a Remove automatic scroll 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-08-01 11:01:13 +02:00
Mario Danic
9ec0ad12a4 Fix issues with opening attachments 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-07-29 12:52:14 +02:00
Mario Danic
e1cdc58cef Fix issues with filesystem browser 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-07-29 12:52:14 +02:00
Mario Danic
893c014cb8 Fix issued with unread messages 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-07-29 12:52:14 +02:00
Mario Danic
0c73a75990 Fix broken call notifications 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-07-29 12:52:14 +02:00
Mario Danic
aca1f9a13d Fix various issues with emojis 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-07-22 12:41:54 +02:00
Mario Danic
d8e8a1dc91 Fix #585 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-07-22 11:13:08 +02:00
Mario Danic
d225e2ac9f Fix #584 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-07-21 22:39:03 +02:00
Mario Danic
ceac6efa39 Finally some reconnection magic working 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-07-21 16:38:17 +02:00
Mario Danic
de219a28f7 Fix #574 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-07-05 16:36:10 +02:00
Mario Danic
48a011bbdb Fix #576 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-07-05 09:40:23 +02:00
Mario Danic
ae427d0036 Fix scrolling issue 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-26 11:32:53 +02:00
Mario Danic
bc089e9ee8 Fix chat controller backstack ordering 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-26 09:04:57 +02:00
Mario Danic
842f2c2380 Fixes various issues 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-26 08:11:55 +02:00
Mario Danic
a520cd4716 Fix #566 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-25 23:43:54 +02:00
Mario Danic
400c41e731 Fix #551 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-25 22:46:24 +02:00
Mario Danic
323d9e16b1 Updates to notifications handling 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-25 22:41:02 +02:00
Mario Danic
2a90560056 Fix #565 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-25 15:14:27 +02:00
Mario Danic
f37a05dfb6 Fix joining magic 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-25 10:17:08 +02:00
Mario Danic
c48e9e01a2 Improve sending nick 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-25 10:17:08 +02:00
Mario Danic
6ce0d53412 Fix nick & some reconnection 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-25 10:17:08 +02:00
Mario Danic
1819b6db44 Fix websocket manager access 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-25 10:17:07 +02:00
Mario Danic
0f0119d22c Fix #554 and fix #557 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-09 20:27:55 +02:00
Mario Danic
03917b8008 Improve code 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-06 14:48:27 +02:00
Mario Danic
6e68f41d1f Improve reconnections & Avatar handling 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-06 12:33:12 +02:00
Mario Danic
fe77d46ebe Fix #404 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-03 21:17:58 +02:00
Mario Danic
55dd682830 Some selection progress 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-03 21:02:17 +02:00
Mario Danic
660b2be745 Always show searchItem 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-06-03 12:40:13 +02:00
Mario Danic
7d44805c9e Additional logging 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-31 17:08:42 +02:00
Mario Danic
ef2d1b8c92 Initial file logging 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-31 12:46:49 +02:00
Mario Danic
63360a63e9 Revert "Update dependencies" & Fix issue with mimetype preview 
This reverts commit 3c0c332aa2.

Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-31 10:21:14 +02:00
Mario Danic
75e3722ad1 Fix #548 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-30 20:56:11 +02:00
Mario Danic
80eaf71388 Fix #550 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-30 20:02:17 +02:00
Mario Danic
24cd232908 Fix #537 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-30 15:02:01 +02:00
Mario Danic
c335e7b7bd Fix #544 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-30 13:52:23 +02:00
Mario Danic
3ecd2ac111 Fix speakerphone icon 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-29 16:11:19 +02:00
Mario Danic
215b339d1e Init Merlin when we add an account 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-29 15:28:31 +02:00
Mario Danic
27d69e73d1 Fix up internet reconnections 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-29 15:16:44 +02:00
Mario Danic
e510a35ae4 Further improvements to MCU reconnections 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-29 11:53:09 +02:00
Mario Danic
f13292a1b7 Update version 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-27 18:57:15 +02:00
Mario Danic
92e56cdef2 Improve MCU re-connection magic 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-27 18:32:27 +02:00
Mario Danic
cc96878d52 Fix #527 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-03 09:55:21 +02:00
Mario Danic
e42a41f87a Update versionCode for NC app link click 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-03 09:55:21 +02:00
tobiasKaminsky
ebb878d6a5 add extras direct to intent, do not use option/bundle 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2019-05-03 09:55:21 +02:00
Mario Danic
72761ebb5f Temporary version change for Tobias 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-03 09:55:21 +02:00
Mario Danic
db46330d6e Fix an issue with spaces in user ids 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-03 09:55:21 +02:00
Mario Danic
71de8a5245 Use fileID for passing to the files app 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-03 09:55:21 +02:00
Mario Danic
550b46c454 Fix subscription thread 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-05-03 09:55:21 +02:00
Mario Danic
699af11b8c Tag v6.0.2 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-29 09:01:29 +02:00
Mario Danic
60d329b8b1 Crashing bug fixes 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-28 13:46:40 +02:00
Mario Danic
60d19bc658 Fix a crash in conversation info 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-28 13:42:26 +02:00
Mario Danic
eb66c97fe9 Initial fix for rounded vector drawables 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-28 12:57:33 +02:00
Mario Danic
4f908a2961 Fix call management buttons 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-28 12:30:58 +02:00
Mario Danic
4d0fa0927b Fix an issue with loading background due to etags usage 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-28 11:18:26 +02:00
Mario Danic
7621081449 Fix an issue with loading avatar for a call 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-28 10:59:12 +02:00
Mario Danic
1d09854a91 Fix an issue with setting the placeholder for preview 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-28 10:57:27 +02:00
Mario Đanić
4143bd841e
Fresco and sharing (#531) 
* Various improvements

This is literally the worst commit I ever did, but due to rebasing issues this is how it is.

* Fixes after rebase

Signed-off-by: Mario Danic <mario@lovelyhq.com>

* Updates post-rebase

Signed-off-by: Mario Danic <mario@lovelyhq.com>

* Updates #2 post rebase

Signed-off-by: Mario Danic <mario@lovelyhq.com>

* Update deps

Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-24 08:32:19 +02:00
Mario Danic
077f0dc1b2 Remove magical scroll 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-18 22:49:48 +02:00
Mario Danic
b7dec6e4fa Fix account removal if it’s the last account 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-18 01:56:14 +02:00
Mario Danic
c52d08410d Update chips colors 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-18 01:33:45 +02:00
ardevd
017ee9e034 controllers: removed identical sub-expression in if statement. (#529) 
Using the same value on either side of a binary operator is almost always a mistake. Either there is supposed to be a null check for something else in there or the second sub expression should be removed.

Signed-off-by: eho <edvard.holst@gmail.com>
 2019-04-17 23:50:18 +02:00
Mario Danic
0f7b004023 Fix finger auth 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-16 17:51:38 +02:00
Mario Danic
8a07e94e0e Fix a crashing bug 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-16 15:04:11 +02:00
Mario Danic
ab4d76b227 Fix accents 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-16 14:51:12 +02:00
ardevd
ae77f48a6d utils: use try-with-resources to properly close Closable. (#522) 
Use try-with-resources to properly close Closable
 2019-04-11 14:25:00 +02:00
Mario Đanić
f6c3c51e2c
Merge pull request #523 from nextcloud/unit-tests 
test: added unit tests for the TextMatchers utility class.
 2019-04-11 14:17:05 +02:00
Mario Danic
f3877b4bb5 Fix #494 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-11 10:59:36 +02:00
eho
d2aa3a7f50
test: added unit tests for the TextMatchers utility class. 
- Replaced Patterns with PatternsCompat equivalent for unit testing compatibility
- Removed ExampleUnitTest placeholder test class

Signed-off-by: eho <edvard.holst@gmail.com>
 2019-04-10 22:07:50 +02:00
Mario Danic
667e01924c Fix span refresh 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-10 14:26:44 +02:00
Mario Danic
06992b400f Update chips 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-10 14:16:26 +02:00
Mario Danic
bd3eae81d2 Fix call chips in edit text 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-10 12:15:46 +02:00
Mario Danic
c121ffdd5d Update chip type 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-10 11:21:14 +02:00
Mario Danic
4feb46f40a Improvements to call chip 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-10 11:21:06 +02:00
Mario Danic
ad3b440e88 Progress with setting chip avatars 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-10 09:41:13 +02:00
Mario Danic
1938c3fbb4 Color changes to own mention 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-09 21:52:25 +02:00
Mario Danic
00c2d64f98 Change the way we shown own mention 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-09 21:48:22 +02:00
Mario Danic
24461f99b6 Optimize imports 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-09 21:18:40 +02:00
Mario Danic
f4f96bb7d9 First step towards mention chips 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-09 21:18:02 +02:00
Mario Danic
67b590d9d0 Fix #389 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-09 13:27:50 +02:00
Mario Danic
48fdee2a65 Fix mention coloring 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-09 10:40:30 +02:00
Mario Danic
3c184f7d52 Fix @all mentions 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-09 10:27:47 +02:00
Mario Danic
41d7208384 Fix emoji in call menu 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-07 21:30:08 +02:00
Mario Danic
e1edf954e9 Fix a menu issue 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-07 21:25:21 +02:00
Mario Danic
08d44641d5 Fix an issue with one2one rooms not leavable 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-07 21:05:09 +02:00
Mario Danic
6dc99607c1 Fix #130 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-06 23:54:13 +02:00
Mario Danic
4222e395cc Fix #477 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-06 23:14:02 +02:00
Mario Danic
d43c37d88b Improve notification level storage 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-05 12:27:02 +02:00
Mario Danic
2b7d04b775 Turn bot logo into black 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-02 14:38:13 +02:00
Mario Danic
1b86d7ff1e Add changelog support, fix #479 and other things 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-04-02 14:34:38 +02:00
Mario Danic
68586ba901 Fixes to url handling in settings & notification 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-03-31 17:50:29 +02:00
Mario Danic
60b340ce89 Fix #369 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2019-03-31 17:34:01 +02:00