mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(src/components/sip-addresses/SipAddressesModel): better code (SipAddressesModel::addOrUpdateSipAddress)

Browse source
This commit is contained in:
Ronan Abhamon 2017-01-11 16:43:45 +01:00
parent c2efb388fc
commit 0988bb934b
3 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/src/app/App.hpp
View file

@ -16,7 +16,6 @@ class App : public QApplication {
Q_OBJECT;
public:
QQmlEngine *getEngine () {
return &m_engine;
}

36
tests/src/components/sip-addresses/SipAddressesModel.cpp
View file

@ -188,20 +188,30 @@ void SipAddressesModel::handleContactRemoved (const ContactModel *contact) {
removeContactOfSipAddress(sip_address.toString());
}
void SipAddressesModel::addOrUpdateSipAddress (
QVariantMap &map,
ContactModel *contact,
const shared_ptr<linphone::ChatMessage> &message
) {
if (contact) {
map["contact"] = QVariant::fromValue(contact);
updateObservers(map["sipAddress"].toString(), contact);
}
if (message) {
map["timestamp"] = QDateTime::fromMSecsSinceEpoch(message->getTime() * 1000);
map["unreadMessagesCount"] = message->getChatRoom()->getUnreadMessagesCount();
}
}
void SipAddressesModel::addOrUpdateSipAddress (
const QString &sip_address,
ContactModel *contact,
const std::shared_ptr<linphone::ChatMessage> &message
const shared_ptr<linphone::ChatMessage> &message
) {
auto it = m_sip_addresses.find(sip_address);
if (it != m_sip_addresses.end()) {
if (contact) {
(*it)["contact"] = QVariant::fromValue(contact);
updateObservers(sip_address, contact);
}
if (message)
(*it)["timestamp"] = QDateTime::fromMSecsSinceEpoch(message->getTime() * 1000);
addOrUpdateSipAddress(*it, contact, message);
int row = m_refs.indexOf(&(*it));
Q_ASSERT(row != -1);
@ -212,14 +222,7 @@ void SipAddressesModel::addOrUpdateSipAddress (
QVariantMap map;
map["sipAddress"] = sip_address;
if (contact) {
map["contact"] = QVariant::fromValue(contact);
updateObservers(sip_address, contact);
}
if (message)
map["timestamp"] = QDateTime::fromMSecsSinceEpoch(message->getTime() * 1000);
addOrUpdateSipAddress(map, contact, message);
int row = m_refs.count();
@ -273,6 +276,7 @@ void SipAddressesModel::initSipAddresses () {
QVariantMap map;
map["sipAddress"] = sip_address;
map["timestamp"] = QDateTime::fromMSecsSinceEpoch(history.back()->getTime() * 1000);
map["unreadMessagesCount"] = chat_room->getUnreadMessagesCount();
m_sip_addresses[sip_address] = map;
}

7
tests/src/components/sip-addresses/SipAddressesModel.hpp
View file

@ -37,11 +37,18 @@ private:
void handleContactAdded (ContactModel *contact);
void handleContactRemoved (const ContactModel *contact);
void addOrUpdateSipAddress (
QVariantMap &map,
ContactModel *contact,
const std::shared_ptr<linphone::ChatMessage> &message
);
void addOrUpdateSipAddress (
const QString &sip_address,
ContactModel *contact = nullptr,
const std::shared_ptr<linphone::ChatMessage> &message = std::shared_ptr<linphone::ChatMessage>()
);
void removeContactOfSipAddress (const QString &sip_address);
void initSipAddresses ();