Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
b8b82f7f
Commit
b8b82f7f
authored
Dec 05, 2017
by
Benjamin REIS
Browse files
keep fixing fetch of chat room
parent
f04c4a40
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
src/chat/chat-room/client-group-chat-room.cpp
src/chat/chat-room/client-group-chat-room.cpp
+3
-2
src/chat/chat-room/client-group-chat-room.h
src/chat/chat-room/client-group-chat-room.h
+1
-1
src/db/main-db.cpp
src/db/main-db.cpp
+2
-2
No files found.
src/chat/chat-room/client-group-chat-room.cpp
View file @
b8b82f7f
...
...
@@ -99,15 +99,16 @@ RemoteConference(core, me, nullptr) {
ClientGroupChatRoom
::
ClientGroupChatRoom
(
const
shared_ptr
<
Core
>
&
core
,
const
IdentityAddress
&
peerAddress
,
const
ChatRoomId
&
chatRoomId
,
shared_ptr
<
Participant
>
&
me
,
const
string
&
subject
,
list
<
shared_ptr
<
Participant
>>
&&
participants
,
unsigned
int
lastNotifyId
)
:
ChatRoom
(
*
new
ClientGroupChatRoomPrivate
,
core
,
C
hatRoomId
(
peerAddress
,
me
->
getAddress
())
),
)
:
ChatRoom
(
*
new
ClientGroupChatRoomPrivate
,
core
,
c
hatRoomId
),
RemoteConference
(
core
,
me
->
getAddress
(),
nullptr
)
{
L_D_T
(
RemoteConference
,
dConference
);
const
IdentityAddress
&
peerAddress
=
chatRoomId
.
getPeerAddress
();
dConference
->
focus
=
make_shared
<
Participant
>
(
peerAddress
);
dConference
->
conferenceAddress
=
peerAddress
;
dConference
->
subject
=
subject
;
...
...
src/chat/chat-room/client-group-chat-room.h
View file @
b8b82f7f
...
...
@@ -41,7 +41,7 @@ public:
ClientGroupChatRoom
(
const
std
::
shared_ptr
<
Core
>
&
core
,
const
IdentityAddress
&
peerAddress
,
const
ChatRoomId
&
chatRoomId
,
std
::
shared_ptr
<
Participant
>
&
me
,
const
std
::
string
&
subject
,
std
::
list
<
std
::
shared_ptr
<
Participant
>>
&&
participants
,
...
...
src/db/main-db.cpp
View file @
b8b82f7f
...
...
@@ -191,7 +191,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
soci
::
session
*
session
=
dbSession
.
getBackendSession
<
soci
::
session
>
();
*
session
<<
"DELETE FROM chat_message_content WHERE event_id=:eventId"
,
soci
::
use
(
eventId
);
//TODO: remove file content if exists
//*session << "DELETE FROM chat_message_file_content WHERE chat_message_content_id=:messageContentId", soci::use(messageContentId);
...
...
@@ -1924,7 +1924,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
}
chatRoom
=
make_shared
<
ClientGroupChatRoom
>
(
core
,
chatRoomId
.
getPeerAddress
()
,
chatRoomId
,
me
,
subject
,
move
(
participants
),
...
...
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