Skip to content
Snippets Groups Projects
Commit 8230fb86 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

adapters: handle injecting lrcinstance with zero accounts

Change-Id: I1ec652c60620cf4e7e1caad7fd00ddf1aa40d64d
parent 01cf3f93
No related branches found
No related tags found
No related merge requests found
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
ConversationListModel::ConversationListModel(LRCInstance* instance, QObject* parent) ConversationListModel::ConversationListModel(LRCInstance* instance, QObject* parent)
: ConversationListModelBase(instance, parent) : ConversationListModelBase(instance, parent)
{ {
if (!model_)
return;
connect( connect(
model_, model_,
&ConversationModel::beginInsertRows, &ConversationModel::beginInsertRows,
......
...@@ -99,8 +99,6 @@ ConversationsAdapter::ConversationsAdapter(SystemTray* systemTray, ...@@ -99,8 +99,6 @@ ConversationsAdapter::ConversationsAdapter(SystemTray* systemTray,
Q_EMIT convSrcModel_->dataChanged(index, index); Q_EMIT convSrcModel_->dataChanged(index, index);
}); });
updateConversationFilterData();
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
// notification responses // notification responses
connect(systemTray_, connect(systemTray_,
...@@ -188,15 +186,8 @@ ConversationsAdapter::onCurrentAccountIdChanged() ...@@ -188,15 +186,8 @@ ConversationsAdapter::onCurrentAccountIdChanged()
{ {
lrcInstance_->deselectConversation(); lrcInstance_->deselectConversation();
convSrcModel_.reset(new ConversationListModel(lrcInstance_));
convModel_->bindSourceModel(convSrcModel_.get());
searchSrcModel_.reset(new SearchResultsListModel(lrcInstance_));
searchModel_->bindSourceModel(searchSrcModel_.get());
connectConversationModel(); connectConversationModel();
updateConversationFilterData();
set_currentTypeFilter(lrcInstance_->getCurrentAccountInfo().profileInfo.type); set_currentTypeFilter(lrcInstance_->getCurrentAccountInfo().profileInfo.type);
} }
...@@ -502,6 +493,14 @@ ConversationsAdapter::connectConversationModel(bool updateFilter) ...@@ -502,6 +493,14 @@ ConversationsAdapter::connectConversationModel(bool updateFilter)
if (updateFilter) { if (updateFilter) {
currentTypeFilter_ = profile::Type::INVALID; currentTypeFilter_ = profile::Type::INVALID;
} }
convSrcModel_.reset(new ConversationListModel(lrcInstance_));
convModel_->bindSourceModel(convSrcModel_.get());
searchSrcModel_.reset(new SearchResultsListModel(lrcInstance_));
searchModel_->bindSourceModel(searchSrcModel_.get());
updateConversationFilterData();
return true; return true;
} }
......
...@@ -210,19 +210,34 @@ LRCInstance::getConversationFromCallId(const QString& callId, const QString& acc ...@@ -210,19 +210,34 @@ LRCInstance::getConversationFromCallId(const QString& callId, const QString& acc
ConversationModel* ConversationModel*
LRCInstance::getCurrentConversationModel() LRCInstance::getCurrentConversationModel()
{ {
return getCurrentAccountInfo().conversationModel.get(); try {
const auto& accInfo = getCurrentAccountInfo();
return accInfo.conversationModel.get();
} catch (...) {
return nullptr;
}
} }
NewCallModel* NewCallModel*
LRCInstance::getCurrentCallModel() LRCInstance::getCurrentCallModel()
{ {
return getCurrentAccountInfo().callModel.get(); try {
const auto& accInfo = getCurrentAccountInfo();
return accInfo.callModel.get();
} catch (...) {
return nullptr;
}
} }
ContactModel* ContactModel*
LRCInstance::getCurrentContactModel() LRCInstance::getCurrentContactModel()
{ {
return getCurrentAccountInfo().contactModel.get(); try {
const auto& accInfo = getCurrentAccountInfo();
return accInfo.contactModel.get();
} catch (...) {
return nullptr;
}
} }
const QString& const QString&
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment