Commit 3308fe27 authored by Matthieu Tanon's avatar Matthieu Tanon

More renaming

parent 8aea0dec
......@@ -782,7 +782,7 @@ void ChatMessagePrivate::send () {
}
}
// If message already sent by LIMEv2 synchronous encryption, do not send another one
// If message already sent by LIME X3DH synchronous encryption, do not send another one
if ((currentSendStep &ChatMessagePrivate::Step::Sent) == ChatMessagePrivate::Step::Sent) {
lInfo() << "Send step already done, skipping";
return;
......
......@@ -128,7 +128,7 @@ LimeX3dhEncryptionEngine::LimeX3dhEncryptionEngine (
_dbAccess = dbAccess;
auto cCore = core->getCCore();
limeManager = unique_ptr<LimeManager>(new LimeManager(dbAccess, prov, core));
lastLimeUpdate = linphone_config_get_int(cCore->config, "lime", "last_lime_update_time", 0);
lastLimeUpdate = linphone_config_get_int(cCore->config, "lime", "last_update_time", 0);
x3dhServerUrl = linphone_config_get_string(linphone_core_get_config(cCore), "lime", "x3dh_server_url", "");
if (x3dhServerUrl.empty())
lError() << "LIME X3DH server URL unavailable for encryption engine";
......@@ -290,7 +290,7 @@ ChatMessageModifier::Result LimeX3dhEncryptionEngine::processOutgoingMessage (
delete content;
}
} else {
lError() << "Lime operation failed: " << errorMessage;
lError() << "LIME X3DH operation failed: " << errorMessage;
errorCode = 503; // IO Error
*result = ChatMessageModifier::Result::Error;
}
......@@ -416,7 +416,7 @@ void LimeX3dhEncryptionEngine::update () {
LinphoneConfig *lpconfig = linphone_core_get_config(getCore()->getCCore());
limeManager->update(callback);
lp_config_set_int(lpconfig, "lime", "last_lime_update_time", (int)lastLimeUpdate);
lp_config_set_int(lpconfig, "lime", "last_update_time", (int)lastLimeUpdate);
}
bool LimeX3dhEncryptionEngine::isEncryptionEnabledForFileTransfer (const shared_ptr<AbstractChatRoom> &chatRoom) {
......@@ -791,13 +791,13 @@ void LimeX3dhEncryptionEngine::onRegistrationStateChanged (
lime::limeCallback callback = setLimeCallback(operation.str());
LinphoneConfig *lpconfig = linphone_core_get_config(linphone_proxy_config_get_core(cfg));
lastLimeUpdate = linphone_config_get_int(lpconfig, "lime", "last_lime_update_time", -1);
lastLimeUpdate = linphone_config_get_int(lpconfig, "lime", "last_update_time", -1);
try {
// create user if not exist
limeManager->create_user(localDeviceId, x3dhServerUrl, curve, callback);
lastLimeUpdate = ms_time(NULL);
lp_config_set_int(lpconfig, "lime", "last_lime_update_time", (int)lastLimeUpdate);
lp_config_set_int(lpconfig, "lime", "last_update_time", (int)lastLimeUpdate);
} catch (const exception &e) {
lInfo() << e.what() << " while creating lime user";
......
......@@ -88,18 +88,18 @@ set(RC_FILES
rcfiles/account_creator_rc
rcfiles/assistant_create.rc
rcfiles/carddav_rc
rcfiles/chloe_lime_v2_rc
rcfiles/chloe_lime_x3dh_rc
rcfiles/chloe_rc
rcfiles/conference_focus_rc
rcfiles/empty_rc
rcfiles/friends_rc
rcfiles/laure_call_logs_rc
rcfiles/laure_lime_v2_rc
rcfiles/laure_lime_x3dh_rc
rcfiles/laure_rc_udp
rcfiles/laure_tcp_rc
rcfiles/marie_early_rc
rcfiles/marie_h264_rc
rcfiles/marie_lime_v2_rc
rcfiles/marie_lime_x3dh_rc
rcfiles/marie_nat64_rc
rcfiles/marie_quality_reporting_rc
rcfiles/marie_rc
......@@ -128,7 +128,7 @@ set(RC_FILES
rcfiles/pauline_alt_rc
rcfiles/pauline_as_friend_rc
rcfiles/pauline_h264_rc
rcfiles/pauline_lime_v2_rc
rcfiles/pauline_lime_x3dh_rc
rcfiles/pauline_nat64_rc
rcfiles/pauline_rc
rcfiles/pauline_rc_rtcp_xr
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment