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
5460eefe
Commit
5460eefe
authored
Sep 05, 2018
by
Erwan Croze
👋🏻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new filter for OneToOne chat room
parent
844f1b95
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
0 deletions
+26
-0
src/chat/chat-room/client-group-chat-room.cpp
src/chat/chat-room/client-group-chat-room.cpp
+23
-0
src/chat/chat-room/client-group-chat-room.h
src/chat/chat-room/client-group-chat-room.h
+3
-0
No files found.
src/chat/chat-room/client-group-chat-room.cpp
View file @
5460eefe
...
...
@@ -375,6 +375,29 @@ void ClientGroupChatRoom::deleteFromDb () {
d
->
chatRoomListener
->
onChatRoomDeleteRequested
(
getSharedFromThis
());
}
list
<
shared_ptr
<
EventLog
>>
ClientGroupChatRoom
::
getHistory
(
int
nLast
)
const
{
L_D
();
return
getCore
()
->
getPrivate
()
->
mainDb
->
getHistory
(
getConferenceId
(),
nLast
,
(
d
->
capabilities
&
Capabilities
::
OneToOne
)
?
MainDb
::
Filter
::
ConferenceChatMessageSecurityFilter
:
MainDb
::
FilterMask
({
MainDb
::
Filter
::
ConferenceChatMessageFilter
,
MainDb
::
Filter
::
ConferenceInfoNoDeviceFilter
})
);
}
list
<
shared_ptr
<
EventLog
>>
ClientGroupChatRoom
::
getHistoryRange
(
int
begin
,
int
end
)
const
{
L_D
();
return
getCore
()
->
getPrivate
()
->
mainDb
->
getHistoryRange
(
getConferenceId
(),
begin
,
end
,
(
d
->
capabilities
&
Capabilities
::
OneToOne
)
?
MainDb
::
Filter
::
ConferenceChatMessageSecurityFilter
:
MainDb
::
FilterMask
({
MainDb
::
Filter
::
ConferenceChatMessageFilter
,
MainDb
::
Filter
::
ConferenceInfoNoDeviceFilter
})
);
}
void
ClientGroupChatRoom
::
addParticipant
(
const
IdentityAddress
&
addr
,
const
CallSessionParams
*
params
,
bool
hasMedia
)
{
L_D
();
...
...
src/chat/chat-room/client-group-chat-room.h
View file @
5460eefe
...
...
@@ -80,6 +80,9 @@ public:
void
deleteFromDb
()
override
;
std
::
list
<
std
::
shared_ptr
<
EventLog
>>
getHistory
(
int
nLast
)
const
override
;
std
::
list
<
std
::
shared_ptr
<
EventLog
>>
getHistoryRange
(
int
begin
,
int
end
)
const
override
;
void
addParticipant
(
const
IdentityAddress
&
addr
,
const
CallSessionParams
*
params
,
bool
hasMedia
)
override
;
void
addParticipants
(
const
std
::
list
<
IdentityAddress
>
&
addresses
,
const
CallSessionParams
*
params
,
bool
hasMedia
)
override
;
...
...
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