Commit 1a4126c0 authored by Matthieu Tanon's avatar Matthieu Tanon

Rename faulty device methods

parent 5733e7e7
......@@ -156,7 +156,7 @@ LINPHONE_PUBLIC LinphoneSecurityEventType linphone_event_log_get_security_event_
* @param[in] event_log A #LinphoneEventLog object.
* @return The address of the faulty device.
*/
LINPHONE_PUBLIC LinphoneAddress *linphone_event_log_get_security_event_faulty_device (const LinphoneEventLog *event_log);
LINPHONE_PUBLIC LinphoneAddress *linphone_event_log_get_security_event_faulty_device_address (const LinphoneEventLog *event_log);
// -----------------------------------------------------------------------------
// ConferenceSubjectEvent.
......
......@@ -332,14 +332,14 @@ LINPHONE_PUBLIC LinphoneSecurityEventType linphone_event_log_get_security_event_
return eventType;
}
LINPHONE_PUBLIC LinphoneAddress *linphone_event_log_get_security_event_faulty_device (const LinphoneEventLog *event_log) {
LINPHONE_PUBLIC LinphoneAddress *linphone_event_log_get_security_event_faulty_device_address (const LinphoneEventLog *event_log) {
if (!isConferenceSecurityType(linphone_event_log_get_type(event_log)))
return nullptr;
return linphone_address_new(
static_pointer_cast<const LinphonePrivate::ConferenceSecurityEvent>(
L_GET_CPP_PTR_FROM_C_OBJECT(event_log)
)->getFaultyDevice().asString().c_str()
)->getFaultyDeviceAddress().asString().c_str()
);
}
......
......@@ -748,7 +748,7 @@ void ClientGroupChatRoom::onSecurityEvent (const shared_ptr<ConferenceSecurityEv
shared_ptr<ConferenceSecurityEvent> cleanEvent = nullptr;
// Remove faulty device if its address is invalid
IdentityAddress faultyDevice = event->getFaultyDevice();
IdentityAddress faultyDevice = event->getFaultyDeviceAddress();
if (!faultyDevice.isValid()) {
cleanEvent = make_shared<ConferenceSecurityEvent>(
event->getCreationTime(),
......
......@@ -982,7 +982,7 @@ long long MainDbPrivate::insertConferenceSecurityEvent (const shared_ptr<EventLo
return -1;
const int &securityEventType = int(static_pointer_cast<ConferenceSecurityEvent>(eventLog)->getSecurityEventType());
const string &faultyDevice = static_pointer_cast<ConferenceSecurityEvent>(eventLog)->getFaultyDevice().asString();
const string &faultyDevice = static_pointer_cast<ConferenceSecurityEvent>(eventLog)->getFaultyDeviceAddress().asString();
// insert security event into new table "conference_security_event"
soci::session *session = dbSession.getBackendSession();
......
......@@ -71,7 +71,7 @@ ConferenceSecurityEvent::SecurityEventType ConferenceSecurityEvent::getSecurityE
return d->securityEventType;
}
const IdentityAddress &ConferenceSecurityEvent::getFaultyDevice () const {
const IdentityAddress &ConferenceSecurityEvent::getFaultyDeviceAddress () const {
L_D();
return d->faultyDevice;
}
......
......@@ -50,7 +50,7 @@ public:
);
SecurityEventType getSecurityEventType () const;
const IdentityAddress &getFaultyDevice () const;
const IdentityAddress &getFaultyDeviceAddress () const;
private:
L_DECLARE_PRIVATE(ConferenceSecurityEvent);
......
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