Commit 970c9f72 authored by Matthieu Tanon's avatar Matthieu Tanon

Various renamings

parent 475f6607
......@@ -56,7 +56,7 @@ class LINPHONE_PUBLIC ChatMessage : public Object, public CoreAccessor {
friend class MainDbPrivate;
friend class RealTimeTextChatRoomPrivate;
friend class ServerGroupChatRoomPrivate;
friend class LimeX3DHEncryptionEngine;
friend class LimeX3dhEncryptionEngine;
public:
L_OVERRIDE_SHARED_FROM_THIS(ChatMessage);
......
......@@ -35,7 +35,7 @@ class LINPHONE_PUBLIC ClientGroupChatRoom : public ChatRoom, public RemoteConfer
friend class ClientGroupToBasicChatRoomPrivate;
friend class Core;
friend class CorePrivate;
friend class LimeX3DHEncryptionEngine;
friend class LimeX3dhEncryptionEngine;
friend class MediaSessionPrivate;
public:
......
......@@ -55,9 +55,9 @@ inline std::vector<uint8_t> decodeBase64 (const std::string &input) {
return output;
}
class BelleSipLimeManager : public lime::LimeManager {
class LimeManager : public lime::LimeManager {
public:
BelleSipLimeManager (const std::string &db_access, belle_http_provider_t *prov, LinphoneCore *lc);
LimeManager (const std::string &db_access, belle_http_provider_t *prov, std::shared_ptr<Core> core); // LinphoneCore *lc
private:
static void processIoError (void *data, const belle_sip_io_error_event_t *event) noexcept;
......@@ -65,15 +65,15 @@ private:
static void processAuthRequested (void *data, belle_sip_auth_event_t *event) noexcept;
};
class LimeX3DHEncryptionEngine : public EncryptionEngine, public CoreListener {
class LimeX3dhEncryptionEngine : public EncryptionEngine, public CoreListener {
public:
LimeX3DHEncryptionEngine (
LimeX3dhEncryptionEngine (
const std::string &db_access,
belle_http_provider_t *prov,
const std::shared_ptr<Core> core
);
std::shared_ptr<BelleSipLimeManager> getLimeManager ();
std::shared_ptr<LimeManager> getLimeManager ();
lime::limeCallback setLimeCallback (std::string operation);
std::string getX3dhServerUrl () const;
lime::CurveId getCurveId () const;
......@@ -162,7 +162,7 @@ public:
) override;
private:
std::shared_ptr<BelleSipLimeManager> belleSipLimeManager;
std::shared_ptr<LimeManager> limeManager;
std::time_t lastLimeUpdate;
std::string x3dhServerUrl;
std::string _dbAccess;
......
......@@ -42,7 +42,7 @@ class Participant : public Object {
friend class ClientGroupChatRoom;
friend class ClientGroupChatRoomPrivate;
friend class Conference;
friend class LimeX3DHEncryptionEngine;
friend class LimeX3dhEncryptionEngine;
friend class LocalConference;
friend class LocalConferenceCall;
friend class LocalConferenceCallPrivate;
......
......@@ -213,13 +213,13 @@ void Core::enableLimeX3dh (bool enable) {
d->imee.release();
if (d->imee == nullptr) {
LimeX3DHEncryptionEngine *engine;
LimeX3dhEncryptionEngine *engine;
LinphoneConfig *lpconfig = linphone_core_get_config(getCCore());
string filename = lp_config_get_string(lpconfig, "lime", "x3dh_db_path", "x3dh.c25519.sqlite3");
string dbAccess = getDataPath() + filename;
belle_http_provider_t *prov = linphone_core_get_http_provider(getCCore());
engine = new LimeX3DHEncryptionEngine(dbAccess, prov, getSharedFromThis());
engine = new LimeX3dhEncryptionEngine(dbAccess, prov, getSharedFromThis());
setEncryptionEngine(engine);
d->registerListener(engine);
......
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