Commit graph

1687 commits

Author SHA1 Message Date
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
639c0e8e5a Update important conversation explanation
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-09-03 11:37:15 +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
Nextcloud bot
ba868c682d
[tx-robot] updated from transifex 2019-09-03 03:11:02 +00: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
Nextcloud bot
8fd9208b9e
[tx-robot] updated from transifex 2019-09-02 03:10:13 +00:00
Nextcloud bot
ed38167a62
[tx-robot] updated from transifex 2019-09-01 03:15:44 +00:00
Nextcloud bot
783b90f511
[tx-robot] updated from transifex 2019-08-31 03:10:18 +00:00
Mario Danic
75e5852646 Fix #607
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-08-30 23:21:45 +02:00
Mario Danic
2141a38faa Update wording for lobby
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-08-30 14:17:10 +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
Nextcloud bot
01bcc6ffe8
[tx-robot] updated from transifex 2019-08-30 03:12:59 +00:00
Nextcloud bot
76fa4d07d8
[tx-robot] updated from transifex 2019-08-28 03:17:13 +00:00
Nextcloud bot
1279e6c823
[tx-robot] updated from transifex 2019-08-27 03:11:18 +00:00
Nextcloud bot
b594781d3c
[tx-robot] updated from transifex 2019-08-26 03:07:06 +00: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
Nextcloud bot
3ffa4c08ef
[tx-robot] updated from transifex 2019-08-23 03:14:42 +00:00
Nextcloud bot
ba0f045ddc
[tx-robot] updated from transifex 2019-08-22 03:09:11 +00: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
Nextcloud bot
2746d302f7
[tx-robot] updated from transifex 2019-08-20 03:09:45 +00:00
Nextcloud bot
63adaff4d4
[tx-robot] updated from transifex 2019-08-19 03:10:04 +00:00
Nextcloud bot
852b1fc682
[tx-robot] updated from transifex 2019-08-18 03:14:33 +00: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
Nextcloud bot
e797e9c199
[tx-robot] updated from transifex 2019-08-15 03:08:16 +00: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
Nextcloud bot
389c6a1b65
[tx-robot] updated from transifex 2019-08-13 03:08:30 +00:00
Mario Danic
7e63fc9d2a Redo text color
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-08-12 12:38:48 +02:00
Mario Danic
25e5a2909b Use elipsis
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-08-12 12:38:48 +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
Nextcloud bot
de89e7615d
[tx-robot] updated from transifex 2019-08-12 03:09:30 +00:00
Nextcloud bot
1fa1a9d98a
[tx-robot] updated from transifex 2019-08-11 03:12:08 +00:00
Nextcloud bot
9f48a8111d
[tx-robot] updated from transifex 2019-08-10 03:11:37 +00: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
Nextcloud bot
809a6b66ae
[tx-robot] updated from transifex 2019-08-09 03:10:13 +00: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
Nextcloud bot
d0b2db516f
[tx-robot] updated from transifex 2019-08-02 03:11:05 +00: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
Nextcloud bot
233a610a3e
[tx-robot] updated from transifex 2019-08-01 03:14:27 +00: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
48229e3314 Fix #581
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-07-22 12:59:26 +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
Nextcloud bot
885d0552c2
[tx-robot] updated from transifex 2019-07-22 03:12:35 +00: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
Nextcloud bot
87ea461f53
[tx-robot] updated from transifex 2019-07-18 03:07:46 +00:00
Nextcloud bot
5597b5b262
[tx-robot] updated from transifex 2019-07-13 03:11:06 +00:00
Nextcloud bot
a38cb39cba
[tx-robot] updated from transifex 2019-07-12 03:04:52 +00:00
Nextcloud bot
5c3eeb6bf2
[tx-robot] updated from transifex 2019-07-10 03:02:36 +00:00
Nextcloud bot
7c24bcd512
[tx-robot] updated from transifex 2019-07-09 03:00:50 +00:00
Nextcloud bot
ff931069e4
[tx-robot] updated from transifex 2019-07-08 03:00:40 +00:00
Nextcloud bot
72098f4943
[tx-robot] updated from transifex 2019-07-07 03:01:28 +00:00
Nextcloud bot
2837b6226b
[tx-robot] updated from transifex 2019-07-06 03:00:59 +00: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
Nextcloud bot
010850b67a
[tx-robot] updated from transifex 2019-07-05 03:03:27 +00:00
Nextcloud bot
5da8a32312
[tx-robot] updated from transifex 2019-07-04 03:02:15 +00:00
Nextcloud bot
0c57fdef4c
[tx-robot] updated from transifex 2019-07-02 03:00:01 +00:00
Nextcloud bot
942638c17c
[tx-robot] updated from transifex 2019-06-30 03:01:22 +00:00
Nextcloud bot
9900627410
[tx-robot] updated from transifex 2019-06-29 02:59:20 +00:00
Nextcloud bot
4b39e1fd5e
[tx-robot] updated from transifex 2019-06-28 03:01:54 +00:00
Nextcloud bot
23ddbf1491
[tx-robot] updated from transifex 2019-06-27 03:02:46 +00: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
01ee58ea70 Fix #568
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-06-26 09:28:02 +02:00
Mario Danic
101381b591 Fix #572
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-06-26 09:18:10 +02:00
Mario Danic
22711734eb Fix #569
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-06-26 09:14:39 +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
Nextcloud bot
cd0ec1a4fe
[tx-robot] updated from transifex 2019-06-25 03:02:56 +00:00
Nextcloud bot
222d397f47
[tx-robot] updated from transifex 2019-06-24 03:01:52 +00:00
Nextcloud bot
e1db75382f
[tx-robot] updated from transifex 2019-06-22 03:01:26 +00:00
Nextcloud bot
d8d1587776
[tx-robot] updated from transifex 2019-06-20 03:02:04 +00:00
Nextcloud bot
503160be1c
[tx-robot] updated from transifex 2019-06-17 02:59:53 +00:00
Nextcloud bot
c02f820304
[tx-robot] updated from transifex 2019-06-13 02:53:45 +00:00
Nextcloud bot
8c36af3334
[tx-robot] updated from transifex 2019-06-12 02:52:36 +00:00
Nextcloud bot
d99bdbadbc
[tx-robot] updated from transifex 2019-06-11 02:51:34 +00:00
Nextcloud bot
7fd17458aa
[tx-robot] updated from transifex 2019-06-10 02:53:29 +00: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
Nextcloud bot
30497f1174
[tx-robot] updated from transifex 2019-06-02 02:53:15 +00:00
Nextcloud bot
a8b9432b30
[tx-robot] updated from transifex 2019-06-01 02:52:13 +00: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
124fd801a1 Add the actual icons
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-05-29 16:11:27 +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
Nextcloud bot
9cf7891fbc
[tx-robot] updated from transifex 2019-05-29 03:01:46 +00: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
Nextcloud bot
ff7d5c8bab
[tx-robot] updated from transifex 2019-05-20 02:58:32 +00:00
Nextcloud bot
1a81738e90
[tx-robot] updated from transifex 2019-05-14 02:56:27 +00:00
Nextcloud bot
231ecfac21
[tx-robot] updated from transifex 2019-05-09 00:53:24 +00:00
Nextcloud bot
eb13f61a6b
[tx-robot] updated from transifex 2019-05-08 01:10:50 +00:00
Nextcloud bot
07412e1edd
[tx-robot] updated from transifex 2019-05-06 00:55:32 +00:00
Mario Danic
cc96878d52 Fix #527
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-05-03 09:55:21 +02:00