Commit 8686e904 authored by Matthieu Tanon's avatar Matthieu Tanon

Clean code

parent 65fff776
......@@ -145,7 +145,7 @@ ChatMessageModifier::Result LimeX3DHEncryptionEngine::processOutgoingMessage (
) {
// We use a shared_ptr here due to non synchronism with the lambda in the encrypt method
shared_ptr<ChatMessageModifier::Result> result = make_shared<ChatMessageModifier::Result>(ChatMessageModifier::Result::Suspended);
shared_ptr<AbstractChatRoom> chatRoom = message->getChatRoom();
shared_ptr<AbstractChatRoom> chatRoom = message->getChatRoom();
const string &localDeviceId = chatRoom->getLocalAddress().asString();
const IdentityAddress &peerAddress = chatRoom->getPeerAddress();
shared_ptr<const string> recipientUserId = make_shared<const string>(peerAddress.getAddressWithoutGruu().asString());
......@@ -726,10 +726,6 @@ void LimeX3DHEncryptionEngine::cleanDb () {
remove(_dbAccess.c_str());
}
void LimeX3DHEncryptionEngine::onNetworkReachable (bool sipNetworkReachable, bool mediaNetworkReachable) {
// TODO Work in progress
}
std::shared_ptr<BelleSipLimeManager> LimeX3DHEncryptionEngine::getLimeManager () {
return belleSipLimeManager;
}
......@@ -745,6 +741,8 @@ lime::limeCallback LimeX3DHEncryptionEngine::setLimeCallback (string operation)
return callback;
}
void LimeX3DHEncryptionEngine::onNetworkReachable (bool sipNetworkReachable, bool mediaNetworkReachable) {}
void LimeX3DHEncryptionEngine::onRegistrationStateChanged (
LinphoneProxyConfig *cfg,
LinphoneRegistrationState state,
......
......@@ -79,6 +79,7 @@ public:
lime::CurveId getCurveId () const;
// EncryptionEngine overrides
ChatMessageModifier::Result processIncomingMessage (
const std::shared_ptr<ChatMessage> &message,
int &errorCode
......@@ -148,6 +149,7 @@ public:
void cleanDb () override;
// CoreListener overrides
void onNetworkReachable (
bool sipNetworkReachable,
bool mediaNetworkReachable
......
......@@ -60,7 +60,7 @@ AbstractChatRoom::SecurityLevel ParticipantDevice::getSecurityLevel () const {
auto encryptionEngine = getCore()->getEncryptionEngine();
if (encryptionEngine)
return encryptionEngine->getSecurityLevel(mGruu.asString());
return AbstractChatRoom::SecurityLevel::ClearText; // Undefined / Unknown
return AbstractChatRoom::SecurityLevel::ClearText;
}
ostream &operator<< (ostream &stream, ParticipantDevice::State state) {
......
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