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

Fix the activity loop

Browse source 
We should stop fetching the moment the activity stream is empty when
fetched. It doesn't matter if the current list is empty.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-11-22 10:40:00 +01:00
parent 528e1bef37
commit b93c762205
No known key found for this signature in database
GPG key ID: F941078878347C0C
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/gui/activitylistmodel.cpp
View file

@ -150,16 +150,12 @@ int ActivityListModel::rowCount(const QModelIndex &) const
return _finalList.count();
}
// current strategy: Fetch 100 items per Account
// ATTENTION: This method is const and thus it is not possible to modify
// the _activityLists hash or so. Doesn't make it easier...
bool ActivityListModel::canFetchMore(const QModelIndex &) const
{
if (_activityLists.count() == 0)
return true;
// We need to be connected to be able to fetch more
if (_accountState && _accountState->isConnected()) {
if (_activityLists.count() == 0 && !_currentlyFetching) {
// If the fetching is reported to be done or we are currently fetching we can't fetch more
if (!_doneFetching && !_currentlyFetching) {
return true;
}
}
@ -177,8 +173,8 @@ void ActivityListModel::startFetchJob()
this, &ActivityListModel::slotActivitiesReceived);
QUrlQuery params;
params.addQueryItem(QLatin1String("page"), QLatin1String("0"));
params.addQueryItem(QLatin1String("pagesize"), QLatin1String("100"));
params.addQueryItem(QLatin1String("start"), QString::number(_currentItem));
params.addQueryItem(QLatin1String("count"), QString::number(100));
job->addQueryParams(params);
_currentlyFetching = true;
@ -192,10 +188,16 @@ void ActivityListModel::slotActivitiesReceived(const QJsonDocument &json, int st
ActivityList list;
auto ast = _accountState;
if (!ast)
if (!ast) {
return;
}
_currentlyFetching = 0;
if (activities.size() == 0) {
_doneFetching = true;
}
_currentlyFetching = false;
_currentItem += activities.size();
foreach (auto activ, activities) {
auto json = activ.toObject();
@ -212,7 +214,7 @@ void ActivityListModel::slotActivitiesReceived(const QJsonDocument &json, int st
list.append(a);
}
_activityLists = list;
_activityLists.append(list);
emit activityJobStatusCode(statusCode);
@ -234,6 +236,7 @@ void ActivityListModel::addNotificationToActivityList(Activity activity) {
void ActivityListModel::removeActivityFromActivityList(int row) {
Activity activity = _finalList.at(row);
removeActivityFromActivityList(activity);
combineActivityLists();
}
void ActivityListModel::addSyncFileItemToActivityList(Activity activity) {
@ -297,10 +300,10 @@ bool ActivityListModel::canFetchActivities() const {
void ActivityListModel::fetchMore(const QModelIndex &)
{
_activityLists = ActivityList();
if (canFetchActivities()) {
startFetchJob();
} else {
_doneFetching = true;
combineActivityLists();
}
}
@ -308,9 +311,13 @@ void ActivityListModel::fetchMore(const QModelIndex &)
void ActivityListModel::slotRefreshActivity()
{
_activityLists.clear();
_doneFetching = false;
_currentItem = 0;
if (canFetchActivities()) {
startFetchJob();
} else {
_doneFetching = true;
combineActivityLists();
}
}
@ -320,5 +327,7 @@ void ActivityListModel::slotRemoveAccount()
_finalList.clear();
_activityLists.clear();
_currentlyFetching = false;
_doneFetching = false;
_currentItem = 0;
}
}

4
src/gui/activitylistmodel.h
View file

@ -75,7 +75,9 @@ private:
ActivityList _notificationErrorsLists;
ActivityList _finalList;
AccountState *_accountState;
bool _currentlyFetching = true;
bool _currentlyFetching = false;
bool _doneFetching = false;
int _currentItem = 0;
};
}
#endif // ACTIVITYLISTMODEL_H