{
}
+QVariantList ClientBacklogManager::requestBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional) {
+ _buffersRequested << bufferId;
+ return BacklogManager::requestBacklog(bufferId, first, last, limit, additional);
+}
+
void ClientBacklogManager::receiveBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional, QVariantList msgs) {
Q_UNUSED(first) Q_UNUSED(last) Q_UNUSED(limit) Q_UNUSED(additional)
_requester = new FixedBacklogRequester(this);
};
- _requester->requestBacklog();
+ _requester->requestInitialBacklog();
if(_requester->isBuffering()) {
updateProgress(0, _requester->totalBuffers());
}
BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList &bufferIds) {
BufferIdList newBuffers;
+ QSet<BufferId> availableBuffers = Client::networkModel()->allBufferIds().toSet();
foreach(BufferId bufferId, bufferIds) {
- if(!_buffersRequested.contains(bufferId))
- newBuffers << bufferId;
+ if(_buffersRequested.contains(bufferId) || !availableBuffers.contains(bufferId))
+ continue;
+ newBuffers << bufferId;
}
- _buffersRequested += bufferIds.toSet();
return newBuffers;
}
void ClientBacklogManager::checkForBacklog(const QList<BufferId> &bufferIds) {
- Q_ASSERT(_requester);
+ if(!_requester) {
+ // during client start up this message is to be expected in some situations.
+ qDebug() << "ClientBacklogManager::checkForBacklog(): no active backlog requester (yet?).";
+ return;
+ }
switch(_requester->type()) {
case BacklogRequester::GlobalUnread:
break;