From a3cc5f0d173fce2702871904fac1f8b0de35c72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anthony=20L=C3=A9onard?=
<anthony.leonard@savoirfairelinux.com>
Date: Thu, 4 May 2017 14:57:50 -0400
Subject: [PATCH] remove remaining userChosenAccount
One occurence of userChosenAccount() was left which was crashing the
application when sending a contact request to a ContactMethod without
account linked to it.
Moreover, this is a deprecated method which is now totally removed
from the client.
Change-Id: I46a938c7bf4ac8a3212a2a7a2f7de80a647d956d
Reviewed-by: Olivier Soldano <olivier.soldano@savoirfairelinux.com>
---
sendcontactrequestwidget.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sendcontactrequestwidget.cpp b/sendcontactrequestwidget.cpp
index 79d66cc..24dd33c 100644
--- a/sendcontactrequestwidget.cpp
+++ b/sendcontactrequestwidget.cpp
@@ -23,6 +23,7 @@
#include "ui_sendcontactrequestwidget.h"
#include "account.h"
#include "accountmodel.h"
+#include "availableaccountmodel.h"
#include "recentmodel.h"
#include "contactmethod.h"
#include "phonedirectorymodel.h"
@@ -63,8 +64,10 @@ void SendContactRequestWidget::sendCR(const QModelIndex& nodeIdx)
cm->account()->sendContactRequest(cm);
} else {
qDebug() << "no account linked to contact method";
- cm->setAccount(AccountModel::instance().userChosenAccount());
- cm->account()->sendContactRequest(cm);
+ auto idx = AvailableAccountModel::instance().selectionModel()->currentIndex();
+ if (idx.isValid()) {
+ cm->setAccount(idx.data(static_cast<int>(Ring::Role::Object)).value<Account*>());
+ cm->account()->sendContactRequest(cm);
+ }
}
- //emit sendCRclicked();
}
--
GitLab