mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed useless use_cpim rc param

Browse source
This commit is contained in:
Sylvain Berfini 2018-03-02 18:00:53 +01:00
parent bb2c51f2ca
commit 5adb1f04c3
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/chat/chat-message/chat-message.cpp
View file

@ -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;
}
}

3
tester/cpim-tester.cpp
View file

@ -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);

1
tester/group_chat_tester.c
View file

@ -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");
}