mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 05:15:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

ActivityWidget: Always combine the final activity list.

Browse source 
In cases where the activity app is not activated on the server, the
returned list of activities is empty, so it is better this way.
This commit is contained in:
Klaas Freitag 2015-11-17 14:44:48 +01:00
parent 7ba88cc9e3
commit 1cdf0e8597
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gui/activitywidget.cpp
View file

@ -151,6 +151,7 @@ void ActivityListModel::startFetchJob(AccountState* s)
job->addQueryParams(params);
_currentlyFetching.insert(s);
qDebug() << "Start fetching activities for " << s->account()->displayName();
job->start();
}
@ -179,20 +180,7 @@ void ActivityListModel::slotActivitiesReceived(const QVariantMap& json)
_activityLists[ai] = list;
// if all activity lists were received, assemble the whole list
// otherwise wait until the others are finished
bool allAreHere = true;
foreach( ActivityList list, _activityLists.values() ) {
if( list.count() == 0 ) {
allAreHere = false;
break;
}
}
// FIXME: Be more efficient,
if( allAreHere ) {
combineActivityLists();
}
combineActivityLists();
}