Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
liblinphone
Commits
2ec2f603
Commit
2ec2f603
authored
Aug 09, 2018
by
Matthieu Tanon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow creation of ConferenceSecurityEvent without faultyDevice
parent
72ddd774
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
6 deletions
+25
-6
src/chat/encryption/lime-v2.cpp
src/chat/encryption/lime-v2.cpp
+1
-2
src/event-log/conference/conference-security-event.cpp
src/event-log/conference/conference-security-event.cpp
+16
-2
src/event-log/conference/conference-security-event.h
src/event-log/conference/conference-security-event.h
+8
-2
No files found.
src/chat/encryption/lime-v2.cpp
View file @
2ec2f603
...
...
@@ -175,8 +175,7 @@ ChatMessageModifier::Result LimeV2::processOutgoingMessage (const shared_ptr<Cha
lWarning
()
<<
"Sending encrypted message to multidevice participant, message rejected"
;
ConferenceSecurityEvent
::
SecurityAlertType
securityAlertType
=
ConferenceSecurityEvent
::
SecurityAlertType
::
MultideviceParticipant
;
IdentityAddress
noFaultyDevice
;
shared_ptr
<
ConferenceSecurityEvent
>
securityEvent
=
make_shared
<
ConferenceSecurityEvent
>
(
time
(
nullptr
),
chatRoom
->
getConferenceId
(),
securityAlertType
,
noFaultyDevice
);
shared_ptr
<
ConferenceSecurityEvent
>
securityEvent
=
make_shared
<
ConferenceSecurityEvent
>
(
time
(
nullptr
),
chatRoom
->
getConferenceId
(),
securityAlertType
);
shared_ptr
<
ClientGroupChatRoom
>
confListener
=
static_pointer_cast
<
ClientGroupChatRoom
>
(
chatRoom
);
confListener
->
onSecurityAlert
(
securityEvent
);
...
...
src/event-log/conference/conference-security-event.cpp
View file @
2ec2f603
...
...
@@ -40,7 +40,7 @@ ConferenceSecurityEvent::ConferenceSecurityEvent (
time_t
creationTime
,
const
ConferenceId
&
conferenceId
,
SecurityAlertType
securityAlertType
,
IdentityAddress
faultyDevice
const
IdentityAddress
&
faultyDevice
)
:
ConferenceEvent
(
*
new
ConferenceSecurityEventPrivate
,
Type
::
ConferenceSecurityAlert
,
...
...
@@ -52,12 +52,26 @@ ConferenceSecurityEvent::ConferenceSecurityEvent (
d
->
faultyDevice
=
faultyDevice
;
}
ConferenceSecurityEvent
::
ConferenceSecurityEvent
(
time_t
creationTime
,
const
ConferenceId
&
conferenceId
,
SecurityAlertType
securityAlertType
)
:
ConferenceEvent
(
*
new
ConferenceSecurityEventPrivate
,
Type
::
ConferenceSecurityAlert
,
creationTime
,
conferenceId
)
{
L_D
();
d
->
securityAlertType
=
securityAlertType
;
}
ConferenceSecurityEvent
::
SecurityAlertType
ConferenceSecurityEvent
::
getSecurityAlertType
()
const
{
L_D
();
return
d
->
securityAlertType
;
}
const
IdentityAddress
ConferenceSecurityEvent
::
getFaultyDevice
()
const
{
const
IdentityAddress
&
ConferenceSecurityEvent
::
getFaultyDevice
()
const
{
L_D
();
return
d
->
faultyDevice
;
}
...
...
src/event-log/conference/conference-security-event.h
View file @
2ec2f603
...
...
@@ -48,11 +48,17 @@ public:
time_t
creationTime
,
const
ConferenceId
&
conferenceId
,
SecurityAlertType
securityAlertType
,
IdentityAddress
faultyDevice
const
IdentityAddress
&
faultyDevice
);
ConferenceSecurityEvent
(
time_t
creationTime
,
const
ConferenceId
&
conferenceId
,
SecurityAlertType
securityAlertType
);
SecurityAlertType
getSecurityAlertType
()
const
;
const
IdentityAddress
getFaultyDevice
()
const
;
const
IdentityAddress
&
getFaultyDevice
()
const
;
private:
L_DECLARE_PRIVATE
(
ConferenceSecurityEvent
);
...
...
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