pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error when gmail feed has no messages.

Browse source
This commit is contained in:
Martin Rotter 2020-08-13 14:39:17 +02:00
parent 252cc59b8d
commit 811d29f643
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/librssguard/services/gmail/network/gmailnetworkfactory.cpp
View file

@ -191,22 +191,24 @@ QList<Message> GmailNetworkFactory::messages(const QString& stream_id, Feed::Sta
QList<Message> more_messages = decodeLiteMessages(messages_data, stream_id, next_page_token); QList<Message> more_messages = decodeLiteMessages(messages_data, stream_id, next_page_token);
QList<Message> full_messages; QList<Message> full_messages;
// Now, we via batch HTTP request obtain full data for each message. if (!more_messages.isEmpty()) {
bool obtained = obtainAndDecodeFullMessages(more_messages, stream_id, full_messages); // Now, we via batch HTTP request obtain full data for each message.
bool obtained = obtainAndDecodeFullMessages(more_messages, stream_id, full_messages);
if (obtained) { if (obtained) {
messages.append(full_messages); messages.append(full_messages);
// New batch of messages was obtained, check if we have enough. // New batch of messages was obtained, check if we have enough.
if (batchSize() > 0 && batchSize() <= messages.size()) { if (batchSize() > 0 && batchSize() <= messages.size()) {
// We have enough messages. // We have enough messages.
break; break;
}
} }
} else {
else {
error = Feed::Status::NetworkError; error = Feed::Status::NetworkError;
return messages; return messages;
}
} }
} }
else { else {