Commit Graph

587 Commits

Author SHA1 Message Date
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
92e56cdef2 Improve MCU re-connection magic
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-05-27 18:32:27 +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
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 Đ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
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
f3877b4bb5 Fix #494
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-04-11 10:59:36 +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
ad3b440e88 Progress with setting chip avatars
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-04-10 09:41:13 +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
e1edf954e9 Fix a menu issue
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-04-07 21:25:21 +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
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
ae8ff9d1e5 Fix #511
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-31 16:37:16 +02:00
Mario Danic
562d6f2f57 Fix #503
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-31 14:16:30 +02:00
Mario Danic
deee62c2d8 Fix #386
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-26 13:46:49 +01:00
Mario Danic
0454d13085 Adjust logic for one2one rooms
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-26 12:04:14 +01:00
Mario Đanić
364480ccf4
Merge pull request #493 from nextcloud/improve-mentions
Improve mentions
2019-03-05 21:50:47 +01:00
Mario Danic
ccce05e164 Fix #159
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-05 21:49:53 +01:00
Mario Danic
b35a1c0758 Improve coloring
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-05 21:06:16 +01:00
Mario Danic
f4508bc4fe Improve mention
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-05 14:31:13 +01:00
Mario Danic
d6a7a2ff94 First batch of mention changes
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-05 14:13:57 +01:00
Mario Danic
8007a95755 Implement confirmation dialog for delete in conversations list
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 15:10:18 +01:00
Mario Danic
3f58e260c0 Fix #483
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 12:55:46 +01:00
Mario Danic
649df4ef07 Fix delete in conversation info
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 12:44:29 +01:00
Mario Danic
e936bf7479 Fix #486
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 12:12:25 +01:00
Mario Danic
d8e6b9f6ef Fix #487
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 11:47:50 +01:00
Mario Danic
252a37e0e8 Hide other options in conversation info
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 10:15:00 +01:00
Mario Danic
857aa24e08 Fix #485
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 09:41:38 +01:00
Mario Danic
f9a14c4a92 Begin working on improved leave & delete
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 09:07:13 +01:00
Mario Danic
52d522ed37 Improve code further with some conditionals & audio handling
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 08:50:39 +01:00
Mario Danic
2fb58e8cab Improve orientation detection for Power management
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 08:50:39 +01:00
Mario Danic
90a099b04e Fix #480, Fix #188
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 08:50:39 +01:00
Mario Danic
171ea65fde Fix bugs
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 08:50:39 +01:00
Mario Danic
183c7afd5d Implement leave & delete in conversation info
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-03-04 08:50:39 +01:00
Mario Danic
5ea99c8201 Fix #442
Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
2019-02-22 15:05:12 +01:00
Mario Danic
f5e7ad6a33 Fix #473
Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java
2019-02-22 15:04:27 +01:00