From ebea6d9d650062bc3d9e1631a46fec44f25d9171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= Date: Mon, 23 Jan 2023 16:49:45 -0500 Subject: [PATCH] contactmodel: track presence after accepting request This was broken when passing to only conversation's requests with an un-needed condition Change-Id: Ibe422474037c60ede21425b016017615d1bbf0f5 --- src/libclient/contactmodel.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/libclient/contactmodel.cpp b/src/libclient/contactmodel.cpp index c5e9e551..7e84c1ca 100644 --- a/src/libclient/contactmodel.cpp +++ b/src/libclient/contactmodel.cpp @@ -782,16 +782,9 @@ ContactModelPimpl::slotContactAdded(const QString& accountId, if (accountId != linked.owner.id) return; auto contact = contacts.find(contactUri); - if (contact != contacts.end()) { - if (contact->profileInfo.type == profile::Type::PENDING) { - Q_EMIT behaviorController.trustRequestTreated(linked.owner.id, contactUri); - } else if (contact->profileInfo.type == profile::Type::JAMI && !contact->isBanned - && confirmed) { - // This means that the peer accepted the trust request. We don't need to re-add the - // contact a second time (and this reset the presence to false). - return; - } - } + if (contact != contacts.end() && contact->profileInfo.type == profile::Type::PENDING) + Q_EMIT behaviorController.trustRequestTreated(linked.owner.id, contactUri); + // for jams account we already have profile with avatar, use it to save to vCard bool isJamsAccount = !linked.owner.confProperties.managerUri.isEmpty(); if (isJamsAccount) { @@ -925,7 +918,6 @@ ContactModelPimpl::addToContacts(const QString& contactUri, if (!lrc::api::Lrc::cacheAvatars.load()) contactInfo.profileInfo.avatar.clear(); - // lookup address in case of RING contact if (type == profile::Type::JAMI) { ConfigurationManager::instance().lookupAddress(linked.owner.id, "", contactUri); PresenceManager::instance().subscribeBuddy(linked.owner.id, contactUri, !banned);