Commit a3cc5f0d authored by Anthony Léonard's avatar Anthony Léonard Committed by Olivier SOLDANO

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: default avatarOlivier Soldano <olivier.soldano@savoirfairelinux.com>
parent 7c63032e
......@@ -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();
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment