From 5ef2824ec4a8481579b9c1fc398dbd2410579726 Mon Sep 17 00:00:00 2001
From: Houmin <weihoumin@gmail.com>
Date: Sat, 13 May 2017 11:40:37 +0800
Subject: [PATCH] Account: do not hardcode trust request key values
Use the DRing::Account::TrustRequest constants instead
Change-Id: I0f6e1e71c21fe689f071abe6d3ae5afed9a71926
Reviewed-by: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
---
src/account.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/account.cpp b/src/account.cpp
index fad9f2ac..7346f106 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);
}
}
--
GitLab