contactmodel: buddy subscriptions must check related account

Change-Id: I69a2e9f23b3a4cb5ce33bdcdb69fc2dce853d9f5

src/callbackshandler.cpp

@@ -263,10 +263,9 @@ CallbacksHandler::slotNewBuddySubscription(const QString& accountId,
                                            bool status,
                                            const QString& message)
 {
-    Q_UNUSED(accountId)
     Q_UNUSED(status)
     Q_UNUSED(message)
-    emit newBuddySubscription(uri, status);
+    emit newBuddySubscription(accountId, uri, status);
 }
 
 void

src/callbackshandler.h

@@ -62,10 +62,11 @@ Q_SIGNALS:
                            const MapStringString& payloads);
     /**
      * Connect this signal to get information when a peer is online.
+     * @param accountId  related account.
      * @param contactUri the peer.
      * @param present if the peer is online.
      */
-    void newBuddySubscription(const QString& contactUri, bool present);
+    void newBuddySubscription(const QString& accountId, const QString& contactUri, bool present);
     /**
      * Connect this signal to get information when peer discovery changes.
      * @param contactUri the peer.

src/contactmodel.cpp

@@ -123,10 +123,11 @@ public:
 public Q_SLOTS:
     /**
      * Listen CallbacksHandler when a presence update occurs
+     * @param accountId
      * @param contactUri
      * @param status
      */
-    void slotNewBuddySubscription(const QString& uri, bool status);
+    void slotNewBuddySubscription(const QString& accountId, const QString& uri, bool status);
 
     /**
      * Listen CallbacksHandler when a contact is added
@@ -714,8 +715,12 @@ ContactModelPimpl::fillWithJamiContacts()
 }
 
 void
-ContactModelPimpl::slotNewBuddySubscription(const QString& contactUri, bool status)
+ContactModelPimpl::slotNewBuddySubscription(const QString& accountId,
+                                            const QString& contactUri,
+                                            bool status)
 {
+    if (accountId != linked.owner.id)
+        return;
     {
         std::lock_guard<std::mutex> lk(contactsMtx_);
         auto it = contacts.find(contactUri);