avoid adding entry in RecentModel after an incoming ContactRequest

- when we get an incoming ContactRequest we build a Person from the
vcard nested in the payload. We next set this Person object to a
ContactMethod which trigger the signal contactChanged. When this
signal is emitted, RecentModel adds an entry.

- this patch adds a check before adding an entry in the RecentModel,
if the current changed is for an actual contact or a ContactRequest.
In last case, it doesn't create a new entry.

Change-Id: I82c03ade965e65f5e32cdc7ecf81b527c4c3aeee
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>

src/accountmodel.cpp

@@ -470,11 +470,12 @@ void AccountModelPrivate::slotIncomingContactRequest(const QString& accountId, c
       return;
    }
 
-   auto contactMethod = PhoneDirectoryModel::instance().getNumber(ringID, a);
-   auto person = VCardUtils::mapToPersonFromReceivedProfile(contactMethod, payload);
-
-   ContactRequest* r = new ContactRequest(a, person, ringID, time);
+   /* do not pass a person before the contact request was added to his model */
+   ContactRequest* r = new ContactRequest(a, nullptr, ringID, time);
    a->pendingContactRequestModel()->d_ptr->addRequest(r);
+
+   auto contactMethod = PhoneDirectoryModel::instance().getNumber(ringID, a);
+   r->setPeer(VCardUtils::mapToPersonFromReceivedProfile(contactMethod, payload));
 }
 
 ///Known Ring devices have changed

src/pendingcontactrequestmodel.cpp

@@ -27,6 +27,7 @@
 #include "private/pendingcontactrequestmodel_p.h"
 #include "person.h"
 #include "contactmethod.h"
+#include "uri.h"
 
 PendingContactRequestModelPrivate::PendingContactRequestModelPrivate(PendingContactRequestModel* p) : q_ptr(p)
 {}
@@ -161,3 +162,13 @@ void PendingContactRequestModelPrivate::removeRequest(ContactRequest* r)
    m_lRequests.removeAt(index);
    q_ptr->endRemoveRows();
 }
+
+ContactRequest*
+PendingContactRequestModel::findContactRequestFrom(const ContactMethod* cm) const
+{
+    auto iter = std::find_if(d_ptr->m_lRequests.begin(), d_ptr->m_lRequests.end(),
+                             [&](ContactRequest* r){ return r->certificate()->remoteId() == cm->uri(); });
+    if (iter != std::end(d_ptr->m_lRequests))
+        return *iter;
+    return nullptr;
+}

src/pendingcontactrequestmodel.h

@@ -23,6 +23,7 @@
 class Account;
 class PendingContactRequestModelPrivate;
 class ContactRequest;
+class ContactMethod;
 
 /**
  * List the pending (incoming) trust request for an account
@@ -51,6 +52,9 @@ public:
    virtual bool          setData     ( const QModelIndex& index, const QVariant &value, int role)       override;
    virtual QHash<int,QByteArray> roleNames() const override;
 
+   // Helper
+   ContactRequest* findContactRequestFrom(const ContactMethod* cm) const;
+
 private:
    explicit PendingContactRequestModel(Account* a);
    virtual ~PendingContactRequestModel();

src/recentmodel.cpp

@@ -41,6 +41,7 @@
 #include "contactrequest.h"
 #include "certificate.h"
 #include "availableaccountmodel.h"
+#include "pendingcontactrequestmodel.h"
 
 struct CallGroup
 {
@@ -775,7 +776,10 @@ void RecentModelPrivate::slotContactChanged(ContactMethod* contactMethod, const
     // TODO: implement for when the Person of the CM changes, ie: oldPerson != nullptr
     Q_UNUSED(oldPerson)
 
-    if (!newPerson) return;
+    if (not newPerson
+        or /* avoid to add en entry in recent model when a person was built for a contact request */
+        contactMethod->account()->pendingContactRequestModel()->findContactRequestFrom(contactMethod))
+        return;
 
     // make sure the Person node exists first, then move any children of the CM nodes
     slotLastUsedTimeChanged(newPerson, newPerson->lastUsedTime());