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
5adb1f04
Commit
5adb1f04
authored
Mar 02, 2018
by
Sylvain Berfini
🎩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed useless use_cpim rc param
parent
bb2c51f2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
9 deletions
+2
-9
src/chat/chat-message/chat-message.cpp
src/chat/chat-message/chat-message.cpp
+2
-5
tester/cpim-tester.cpp
tester/cpim-tester.cpp
+0
-3
tester/group_chat_tester.c
tester/group_chat_tester.c
+0
-1
No files found.
src/chat/chat-message/chat-message.cpp
View file @
5adb1f04
...
...
@@ -663,11 +663,8 @@ void ChatMessagePrivate::send () {
if
((
currentSendStep
&
ChatMessagePrivate
::
Step
::
Cpim
)
==
ChatMessagePrivate
::
Step
::
Cpim
)
{
lInfo
()
<<
"Cpim step already done, skipping"
;
}
else
{
int
defaultValue
=
!!
lp_config_get_string
(
core
->
getCCore
()
->
config
,
"misc"
,
"conference_factory_uri"
,
nullptr
);
if
(
lp_config_get_int
(
core
->
getCCore
()
->
config
,
"sip"
,
"use_cpim"
,
defaultValue
)
==
1
)
{
CpimChatMessageModifier
ccmm
;
ccmm
.
encode
(
q
->
getSharedFromThis
(),
errorCode
);
}
CpimChatMessageModifier
ccmm
;
ccmm
.
encode
(
q
->
getSharedFromThis
(),
errorCode
);
currentSendStep
|=
ChatMessagePrivate
::
Step
::
Cpim
;
}
}
...
...
tester/cpim-tester.cpp
View file @
5adb1f04
...
...
@@ -402,7 +402,6 @@ static int fake_im_encryption_engine_process_outgoing_message_cb(LinphoneImEncry
static
void
cpim_chat_message_modifier_base
(
bool_t
use_multipart
)
{
LinphoneCoreManager
*
marie
=
linphone_core_manager_new
(
"marie_rc"
);
LinphoneCoreManager
*
pauline
=
linphone_core_manager_new
(
"pauline_tcp_rc"
);
LpConfig
*
config
=
linphone_core_get_config
(
marie
->
lc
);
// We use a fake encryption engine just to check the internal content type during the sending/receiving process
LinphoneImEncryptionEngine
*
marie_imee
=
linphone_im_encryption_engine_new
();
...
...
@@ -414,8 +413,6 @@ static void cpim_chat_message_modifier_base(bool_t use_multipart) {
linphone_core_set_im_encryption_engine
(
marie
->
lc
,
marie_imee
);
linphone_core_set_im_encryption_engine
(
pauline
->
lc
,
pauline_imee
);
lp_config_set_int
(
config
,
"sip"
,
"use_cpim"
,
1
);
IdentityAddress
paulineAddress
(
linphone_address_as_string_uri_only
(
pauline
->
identity
));
shared_ptr
<
AbstractChatRoom
>
marieRoom
=
marie
->
lc
->
cppPtr
->
getOrCreateBasicChatRoom
(
paulineAddress
);
marieRoom
->
allowCpim
(
true
);
...
...
tester/group_chat_tester.c
View file @
5adb1f04
...
...
@@ -135,7 +135,6 @@ static void configure_core_for_conference (LinphoneCore *core, const char* usern
char
*
factoryUri
=
linphone_address_as_string
(
factoryAddr
);
linphone_core_set_conference_factory_uri
(
core
,
factoryUri
);
bctbx_free
(
factoryUri
);
linphone_config_set_int
(
linphone_core_get_config
(
core
),
"sip"
,
"use_cpim"
,
1
);
linphone_core_set_linphone_specs
(
core
,
"groupchat"
);
}
...
...
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