Commit Graph

24 Commits

Author SHA1 Message Date
Marcel Hibbe
a632765cce
set values to not nullable in ConversationEntity.kt wherever this makes sense
remove roomId from Conversation (deprecated. only token should be used)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-08-12 16:47:06 +02:00
Andy Scherzinger
3eabf9bb83
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-03-29 12:55:12 +01:00
Marcel Hibbe
591d6dc3e8
remove conductor
- replace remaining controllers with activities
- remove conductor lib
- modify some code related to account management and conductor

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-11-23 13:26:01 +01:00
Marcel Hibbe
8e93a1936b show call time and hint for one-hour call
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-07-28 18:02:37 +02:00
Marcel Hibbe
8f3a3570e9
Add logging for websockets
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-07-13 13:32:43 +02:00
Andy Scherzinger
7230f81cf5
Migrate conversations list and next hop controllers to use the room user entity
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-13 00:22:03 +02:00
Marcel Hibbe
d4d23c1855
set calling/dialing state by ApplicationWideCurrentRoomHolder
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01: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
6e68f41d1f Improve reconnections & Avatar handling
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-06-06 12:33:12 +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
455601b5a6 Reformat
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-02-15 01:49:57 +01:00
Mario Danic
dc24506aec Better restarts for websocket 2018-10-25 13:04:14 +02:00
Mario Danic
088a21e4b9 Fix #315 2018-10-06 06:22:22 +02:00
Mario Danic
bd2820c90e First step to AndroidX migration 2018-10-02 22:34:00 +02:00
Mario Danic
e514c24316 Back to regular inject :(
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-08-23 14:43:25 +02:00
Mario Danic
f9af8dc2a4 Fix retrofit magic
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-08-18 09:57:05 +02:00
Mario Danic
63c2063de6 More progress on moving to new Retrofit impl
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-08-11 07:38:57 +02:00
Mario Danic
4ea5f2e226 Fix #279
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-08-10 22:20:38 +02:00
Mario Danic
7aa4743a32 Start using new api holder for jobs
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-08-10 22:09:06 +02:00
Mario Danic
57c2858737 Start implementing different approach to retrofit
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-08-10 15:19:29 +02:00
Mario Danic
8b22f4c65b Improvements for #223
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-08-02 08:14:23 +02:00
Mario Danic
8dba5aa889 Fix in-the-same-conversation detection
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-07-29 20:42:13 +02:00
Mario Danic
aed03980af Show notification if app is not in foreground
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-19 22:39:43 +02:00