Граф коммитов

2111 Коммитов

Автор SHA1 Сообщение Дата
Daniel Calviño Sánchez 7ecb3ffd81 Make acceptance test for two users chatting more robust
The chat between two users was tested by a sequence of one user sending
a message and immediately after that the other user sending another
message. Most of the time the messages were processed in the server in
the order in which they were sent, but sometimes it could happen that a
previous message took longer than usual to get to the server and then
the next message from the other user was processed before it; in those
cases the test failed due to the messages not matching the expected
order. Now each user waits for the last message of the other user to be
received before sending the next message.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-09 18:23:02 +02:00
Joas Schilling 380971899e
Merge pull request #891 from nextcloud/change-delete-room-message
Change deleted room message.
2018-05-09 16:32:48 +02:00
Ivan Sein 64c53ffda5 Update acceptance test.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-05-09 14:56:39 +02:00
Ivan Sein 62bc6f75ff Change deleted room message.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-05-09 14:41:42 +02:00
Joas Schilling 2f367a8c30
Merge pull request #863 from nextcloud/bugfix/862/reset-audio-video-panel
Reset audio and video control panel.
2018-05-09 14:33:10 +02:00
Joachim Bauch f6c32a309f
Move loading of chat messages to signaling class.
No functional changes yet, but this will allow later to use the standalone
signaling backend to notify clients about new chat messages without having
to poll (see #624).

Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-09 12:17:08 +02:00
Ivan Sein 90e028ac86
Merge pull request #874 from nextcloud/fix-ui-when-leaving-current-call
Stop ping and signaling when the room was deleted
2018-05-09 11:22:56 +02:00
Ivan Sein c322163d1f
Merge pull request #866 from nextcloud/bugfix/865/stop-refreshing-participant-list-when-a-guest-is-chatting
Stop refreshing participant list when a guest is chatting
2018-05-09 11:19:52 +02:00
Joas Schilling 391f32f3f0
Stop ping and signaling when the room was deleted
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-09 10:35:59 +02:00
Joas Schilling d53f01777c
Merge pull request #872 from nextcloud/fix-ui-when-leaving-current-call
Fix UI when leaving current call
2018-05-09 10:09:40 +02:00
Joachim Bauch 296082f42f
Merge pull request #869 from nextcloud/standalone-signaling-remove-sessions
Notify standalone signaling server about sessions to remove from room.
2018-05-09 10:08:02 +02:00
Ivan Sein d49060a9d0
Merge pull request #871 from nextcloud/fix-chat-view-when-leaving-current-room
Fix chat view when leaving current room
2018-05-09 09:54:17 +02:00
Daniel Calviño Sánchez 264b412a65 Fix UI when leaving current call
When the chat view is shown in the main view the call UI (videos and
screens) is hidden using a CSS trick. However, when there is no chat
view in the main view the elements for videos and screens were always
visible. Those elements are initially "empty", but once the user joins a
call they are filled with contents (like the icon to mute the own audio,
or the avatar of the speaking user). As the elements were always visible
the call UI was shown in the main view after a room was left (either
explicitly or implicitly, for example, if the moderator deleted the
room), as in those cases there is no chat view hidding them.

Besides that, the empty content element was hidden when joining a call
but never shown back again. Due to that when a room was left after
joining a call the empty content element was also missing.

Now the videos, screens and empty content are explicitly shown or hidden
as needed when the user joins a call, leaves a call, or leaves a room,
just like it is done with the chat view.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-09 05:00:27 +02:00
Daniel Calviño Sánchez 213bbeb0cb Add acceptance tests for leaving the current room
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-09 04:53:42 +02:00
Daniel Calviño Sánchez 4b97806e89 Check empty content text in addition to its visibility
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-09 04:52:11 +02:00
Daniel Calviño Sánchez 164333e053 Make looking for the active conversation list item more robust
In order to check if certain conversation is the active conversation
the element for the active conversation list item with the given name
was found and then it was verified that it was visible; waiting for the
element to be visible using the implicit wait made to find the element
is a valid approach if the element is always visible when it exists in
the DOM. However, during the lapse between removing/deleting the
conversation and getting the updated conversation list from the server
the element may be hidden but exist in the DOM. Due to that it has to be
explicitly waited for the element to be visible.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-09 01:23:14 +02:00
Ivan Sein a3bfff0827
Merge pull request #870 from nextcloud/initial-guest-name
Make sure user is in a room before the guest name is set.
2018-05-08 16:12:51 +02:00
Joachim Bauch 172cbd64cb
Make sure user is in a room before the guest name is set.
Depending on timings it could happen that the guest name was set before
the room token was known (resulting in `null` in the url) or before the
user has joined the room (so setting the name got rejected).

Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 15:40:52 +02:00
Joas Schilling baad12b270
hmm
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-08 14:43:39 +02:00
Joachim Bauch c12363fd9a
Notify standalone signaling server about sessions to remove from room.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 14:41:49 +02:00
Ivan Sein e21d86040f
Merge pull request #868 from nextcloud/own-event-participantlist-changed
Use dedicated event name to trigger when refreshing the participant list
2018-05-08 14:22:49 +02:00
Joas Schilling 7ab8302c81
Merge pull request #867 from nextcloud/unpromote-speaker-on-remove
Unpromote latest speaker if no users remain in call when removing video.
2018-05-08 14:02:06 +02:00
Joachim Bauch b1ee96b5e4
Use dedicated event name to trigger when refreshing the participant list.
This avoids a conflict (introduced by #864) with the existing ´usersChanged`
event which is triggered when the `inCall` status of a user has changed.

Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 13:49:53 +02:00
Joas Schilling 1af0e1e94c
Also set $dispatchEvent to false
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-08 13:23:59 +02:00
Daniel Calviño Sánchez 86d2d66eb0 Fix chat view when leaving current room
When explicitly leaving the current room through the room list view the
chat view was detached. However, as the internal state of the
Application object (which manages the placement of the chat view) was
not updated the chat view was always hidden from that point on until the
page was reloaded.

Moreover, as the chat view was detached only when explicitly leaving the
current room the chat view was not hidden for other users in the room if
it was deleted by a moderator.

As the "leaveCurrentRoom" event is triggered in the room channel when
the current room is left, either explicitly or implicitly, now the
Application object listens to that event and hides the chat view as
needed when it is received.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-08 13:23:23 +02:00
Daniel Calviño Sánchez 8902a703b9 Rename event to a more accurate name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-08 13:23:23 +02:00
Joachim Bauch 33123ba8ec
Unpromote latest speaker if no users remain in call when removing video.
If the same user joins the call again, the video would otherwise not be
promoted automatically because the id is still stored in `latestSpeakerId`.

Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 13:22:32 +02:00
Joas Schilling 964c2fadcc
Do not update the participant list twice
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-08 13:08:20 +02:00
Joas Schilling 2b4e48c4bc
Merge pull request #864 from nextcloud/standalone-signaling-fixes
Various standalone signaling fixes.
2018-05-08 12:59:33 +02:00
Joas Schilling cfd449871a
Only update the guest name when it really changes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-08 12:50:39 +02:00
Ivan Sein c1cb7df5aa
Merge pull request #856 from nextcloud/bugfix/849/deleting-of-one2one-conversations
Do not show "remove from list" option for one2one conversations
2018-05-08 11:54:49 +02:00
Joachim Bauch 98b429e8d5
Notify standalone signaling backend when a guest name is changed.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 11:41:22 +02:00
Joachim Bauch 0321133f11
Defer joining rooms until signaling server is connected.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 11:41:22 +02:00
Joachim Bauch f8ffe4bb25
Only register hooks for active signaling backend.
Otherwise messages like `refresh-participant-list` could be stored in the
database even if standalone signaling is used.

Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 11:41:22 +02:00
Joachim Bauch 3f31e02786
Load participant list if users left/joined through standalone signaling.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 11:41:21 +02:00
Nextcloud bot 4c9d7e749c
[tx-robot] updated from transifex 2018-05-08 00:33:15 +00:00
Ivan Sein e4be2469c8 Reset audio and video control panel.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-05-07 17:45:47 +02:00
Ivan Sein 4764e16e7c
Merge pull request #854 from nextcloud/bugfix/850/join-the-call-after-media-access-was-done
Join the call only aftrer media access was done
2018-05-07 13:07:24 +02:00
Ivan Sein c8fe13b819
Merge pull request #861 from nextcloud/bugfix/858/no-error-when-calling-empty-room
Don't try to calculate the height of no comment
2018-05-07 10:07:33 +02:00
Joas Schilling 92cb0ee7a8
Should specify a parameter if you use it
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-07 09:52:45 +02:00
Joas Schilling 58b744704c
Don't try to calculate the height of no comment
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-07 09:01:25 +02:00
Nextcloud bot 1e2679afe2
[tx-robot] updated from transifex 2018-05-06 00:33:13 +00:00
Nextcloud bot 5d0c123b4c
[tx-robot] updated from transifex 2018-05-05 00:33:18 +00:00
Joas Schilling c768846f8e
Do not show "remove from list" option for one2one conversations
We always delete the room anyway

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-04 14:45:47 +02:00
Joas Schilling eda4c29f98
Merge pull request #852 from nextcloud/bugfix/817/no-guest-display-name
Fix empty guest display name
2018-05-04 11:17:31 +02:00
Joas Schilling 6072261cac
Join the call only aftrer media access was done
When we delayed the media access, we were all fast with testing.
Before this patch, when there was already at least one user in the
call and you took longer to accept the media request than webrtc
took to init everything, you would always send a black video signal
and no sound, because the data was not there, when connections were
established with the other users. Now we first request the media and
send the join call to the server afterwards.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-04 11:01:46 +02:00
Ivan Sein 5d962c22a1 Fix check for guest's display name.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-05-04 10:56:18 +02:00
Nextcloud bot 5ec84c875d
[tx-robot] updated from transifex 2018-05-04 00:34:40 +00:00
Ivan Sein e59a669dd4
Merge pull request #845 from nextcloud/feature/noid/limit-unread-counter-to-99plus
Limit unread message counter to "99+"
2018-05-03 13:11:30 +02:00
Joas Schilling ffb65b468e
Limit unread message counter to "99+"
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-03 11:18:22 +02:00