Commit Graph

62 Commits

Author SHA1 Message Date
Daniel Calviño Sánchez
4086499a32
Remove special method to request offers
As the "requestoffer" message is just a signaling message the generic
method can be used instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-12-27 14:28:57 +01:00
Daniel Calviño Sánchez
e1eca7764f
Replace wrapper with actual message in external signaling server
NCMessageWrapper is used only for messages sent and received by the
internal signaling server. However, it is unused by the external
signaling server, except for getting the NCSignalingMessage, which is
the common message for both signaling servers.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-12-27 14:28:55 +01:00
Daniel Calviño Sánchez
c4c64df5a6 Remove no longer needed code after removing EventBus message
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-12-23 20:44:41 +01:00
Daniel Calviño Sánchez
5e224c5a24 Use listener for participant list messages
Note that the thread used to handle the participant list messages from
the external signaling server does not change; the EventBus subscriber
mode was "BACKGROUND", but as the message was posted from a WebSocket
handler, which runs in a worker thread rather than in the main thread,
the subscriber was executed in the same thread as the poster.

Also note that the removed "userId" remark was not fully accurate;
although some external signaling messages do actually use "userid" those
currently handled to process the users do not, they always use "userId"
(as documented in the SignalingMessageReceiver).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-12-23 20:44:41 +01:00
Daniel Calviño Sánchez
c8e77c3d3b Split message receiver for internal and external signaling servers
Note that the thread used to handle and notify messages from the
external signaling server does not change; the EventBus subscriber mode
was "BACKGROUND", but as the message was posted from a WebSocket
handler, which runs in a worker thread rather than in the main thread,
the subscriber was executed in the same thread as the poster.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-12-23 20:44:41 +01:00
Daniel Calviño Sánchez
969c08ea79
Use comparison operator rather than equals for enums in WebRTC code
Fixes SPP_EQUALS_ON_ENUM issue from SpotBugs.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-11-14 11:29:52 +01:00
Tim Krüger
dda5a9e3da
Define 'BundleKeys' as 'const'
During the migration from Java to Kotlin this was not done and resulted
in

    BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY()

instead of

    BundleKeys.KEY_CALL_VOICE_ONLY

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-26 11:41:10 +02:00
Andy Scherzinger
fde2667fe7
Migrate Call Activity and used classes/methods from requery to room
Resolves #2216

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-14 18:19:43 +02:00
Andy Scherzinger
993e50dbdb
rename variable to reflect its collection type
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-18 15:37:42 +02:00
Andy Scherzinger
a617f10473
Migrate participant to kotlin data class
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-16 23:06:29 +02:00
Tim Krüger
e52b2d8b7f
Add null checks and extract constants
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-05 13:06:15 +02:00
Tim Krüger
4f5a344a20
Add handling for "event.participants.update.all"
In case a moderator of a restricted room ends the call for all
participants a update participants event with the field 'all=true' will
be thrown by the HPB.

    {
      "type": "event"
      "event": {
        "target": "participants",
        "type": "update",
        "update": [
          "roomid": "the-room-id",
          "incall": new-incall-state,
          "all": true
        ]
      }
    }

In that case the call can be ended directly without handling every
single participant.

Resolves: #1881

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-04 13:49:04 +02:00
Andy Scherzinger
deac2059ff
improve lint/detekt
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:11 +02:00
Marcel Hibbe
8381e0b541
add logging for calls
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-22 22:41:17 +01:00
Marcel Hibbe
bebf716da7
temporarily disable logging to file
see issue
https://github.com/nextcloud/talk-android/issues/1376

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-06-30 14:24:53 +02:00
Joas Schilling
97117eb90c
Use the correct signaling information and user+ticket for "Join via link" as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-05-12 16:21:55 +02:00
Joas Schilling
79be753493
Fix some more getUserId() calls
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-05-10 11:35:17 +02:00
Joas Schilling
dde79b5671
Fix joining a call
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-05-10 11:35: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
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
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
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
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
6e68f41d1f Improve reconnections & Avatar handling
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-06-06 12:33:12 +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
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
455601b5a6 Reformat
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-02-15 01:49:57 +01:00
Mario Danic
0ff737d4fd Fix screensharing for MCU
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2019-01-10 12:43:14 +01:00
Mario Danic
54405c603c Fix MCU completely 2018-11-10 00:22:59 +01:00
Mario Danic
1e055568bc Fix a bug with init a hashmap 2018-11-09 22:42:14 +01:00
Mario Danic
142ceb12e2 Fix various issues & started working on notification levels 2018-11-06 22:58:14 +01:00
Mario Danic
98cabbfc11 Fix nickname & fonts 2018-10-29 10:27:38 +01:00
Mario Danic
769e478874 Scope methods properly 2018-10-26 10:49:51 +02:00
Mario Danic
e5532a5842 Fix #337 and closing websocket connections 2018-10-26 10:47:59 +02:00
Mario Danic
269b879ee4 Send bye when deleting message 2018-10-26 10:07:45 +02:00
Mario Danic
dc24506aec Better restarts for websocket 2018-10-25 13:04:14 +02:00
Mario Danic
f0017a2a39 Implemented proper resume 2018-10-25 01:22:26 +02:00
Mario Danic
3ec2480848 Improve websocket connection management 2018-10-25 00:56:01 +02:00
Mario Danic
91d0d829e0 Fix a few bugs 2018-10-25 00:28:48 +02:00
Mario Danic
ce5f1706b9 Clean ups & More progress towards #206 2018-10-23 21:46:22 +02:00
Mario Danic
6e4d93a5c1 Change param name 2018-10-18 12:10:28 +02:00
Mario Danic
102f259f2a Fix mute message 2018-10-17 23:48:21 +02:00
Mario Danic
ade92c0344 New updates 2018-10-17 23:27:12 +02:00