sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MAM: rework hasMessagesLeft to account for prosody’s missing count

This commit is contained in:
Daniel Gultsch 2018-02-24 10:57:11 +01:00
parent 90ace36b18
commit 4013123279
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
View File

@ -270,12 +270,18 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
query.getConversation().setFirstMamReference(first == null ? null : first.getContent());
}
if (complete || relevant == null || abort) {
boolean done = !query.isCatchup();
if (count != null && !query.isCatchup()) {
try {
done = Integer.parseInt(count) <= query.getTotalCount();
} catch (NumberFormatException e) {
done = false;
boolean done;
if (query.isCatchup()) {
done = false;
} else {
if (count != null) {
try {
done = Integer.parseInt(count) <= query.getTotalCount();
} catch (NumberFormatException e) {
done = false;
}
} else {
done = query.getTotalCount() == 0;
}
}
done = done || (query.getActualMessageCount() == 0 && !query.isCatchup());