Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liblinphone
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
10
Issues
10
List
Board
Labels
Milestones
Merge Requests
21
Merge Requests
21
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
External Wiki
External Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
BC
public
liblinphone
Commits
b72d736d
Commit
b72d736d
authored
Oct 02, 2018
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rejoining a one-to-one chat room with a device that is in the Left state.
parent
ca25c5ad
Pipeline
#381
failed with stage
in 0 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
server-group-chat-room.cpp
src/chat/chat-room/server-group-chat-room.cpp
+13
-4
No files found.
src/chat/chat-room/server-group-chat-room.cpp
View file @
b72d736d
...
...
@@ -526,10 +526,18 @@ void ServerGroupChatRoomPrivate::addParticipantDevice (const shared_ptr<Particip
L_Q_T
(
LocalConference
,
qConference
);
shared_ptr
<
ParticipantDevice
>
device
=
participant
->
getPrivate
()
->
findDevice
(
deviceAddress
);
if
(
device
)
{
if
(
device
->
getState
()
==
ParticipantDevice
::
State
::
Joining
)
inviteDevice
(
device
);
else
if
(
device
->
getState
()
==
ParticipantDevice
::
State
::
Leaving
)
byeDevice
(
device
);
lInfo
()
<<
q
<<
": Adding participant device that is currently in state ["
<<
device
->
getState
()
<<
"]"
;
switch
(
device
->
getState
())
{
case
ParticipantDevice
:
:
State
::
Joining
:
case
ParticipantDevice
:
:
State
::
Left
:
inviteDevice
(
device
);
break
;
case
ParticipantDevice
:
:
State
::
Leaving
:
byeDevice
(
device
);
break
;
default
:
break
;
}
}
else
if
(
findFilteredParticipant
(
participant
->
getAddress
()))
{
// Add device only if participant is not currently being removed
device
=
participant
->
getPrivate
()
->
addDevice
(
deviceAddress
);
...
...
@@ -621,6 +629,7 @@ void ServerGroupChatRoomPrivate::inviteDevice (const shared_ptr<ParticipantDevic
shared_ptr
<
CallSession
>
session
=
device
->
getSession
();
if
(
session
&&
(
session
->
getDirection
()
==
LinphoneCallIncoming
))
return
;
// Do not try to invite the device that is currently creating the chat room
device
->
setState
(
ParticipantDevice
::
State
::
Joining
);
if
(
!
session
||
(
session
->
getState
()
==
CallSession
::
State
::
End
)
||
(
session
->
getState
()
==
CallSession
::
State
::
Error
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment