Commit graph

1102 commits

Author SHA1 Message Date
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