diff --git a/src/account.cpp b/src/account.cpp index fad9f2aca2c8b85d3ede7efaffab5e4858334fff..7346f10657c7037cd94cc89cf49c602d915213ed 100644 --- a/src/account.cpp +++ b/src/account.cpp @@ -145,12 +145,14 @@ Account* Account::buildExistingAccountFromId(const QByteArray& _accountId) if (a->protocol() == Account::Protocol::RING) { const VectorMapStringString& pending_tr {ConfigurationManager::instance().getTrustRequests(a->id())}; for (const auto& tr_info : pending_tr) { - auto payload = tr_info["payload"]; + auto payload = tr_info[DRing::Account::TrustRequest::PAYLOAD]; auto peer = VCardUtils::mapToPersonFromIncomingContactRequest(VCardUtils::toHashMap(payload.toUtf8()), - tr_info["from"]); - - a->pendingContactRequestModel()->d_ptr->addRequest(new ContactRequest(a, peer, tr_info["from"], - tr_info["received"].toInt())); + tr_info[DRing::Account::TrustRequest::FROM]); + auto contactRequest = new ContactRequest(a, + peer, + tr_info[DRing::Account::TrustRequest::FROM], + tr_info[DRing::Account::TrustRequest::RECEIVED].toInt()); + a->pendingContactRequestModel()->d_ptr->addRequest(contactRequest); } }