commit ac6698cc9b7526b3eb4c4a3c20345d1364bb9978
author Nicolas Jager <nicolas.jager@savoirfairelinux.com> Wed Jan 17 14:32:35 2018 -0500
committer Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Tue Jan 23 15:38:13 2018 -0500
tree 2f11bb7ab8d686ef78593f499a63395c44b52e16
parent 3807d98398a7f4bdf4341c527540ed36aee5034c

fix : accept_incoming_call

- in case we accept a contact request during an incoming call we
  must pass a conversation uid to makePermanent not a contactUri.

Change-Id: I73106e73ee76781910b20e54c7e4a1aa7e22a000
Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>

src/incomingcallview.cpp

diff --git a/src/incomingcallview.cpp b/src/incomingcallview.cpp
index 3b0f8a2..0273712 100644
--- a/src/incomingcallview.cpp
+++ b/src/incomingcallview.cpp
@@ -125,7 +125,7 @@
         auto contact = priv->accountContainer_->info.contactModel->getContact(contactUri);
         // If the contact is pending, we should accept its request
         if (contact.profileInfo.type == lrc::api::profile::Type::PENDING)
-            priv->accountContainer_->info.conversationModel->makePermanent(contactUri);
+            priv->accountContainer_->info.conversationModel->makePermanent(priv->conversation_->uid);
         // Accept call
         priv->accountContainer_->info.callModel->accept(priv->conversation_->callId);
     } catch (const std::out_of_range&) {