aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2019-12-12 19:44:54 +0100
committerChristian Schneppe <christian.schneppe@pix-art.de>2019-12-12 19:44:54 +0100
commit3a6c10bbe3e088f481b2cdf4e5cd2ce309e7df29 (patch)
tree7433482673a7ea0a393f163218e20f733bdd3074
parentfe080ef77a0578c7b8ec751a47918400647cfbba (diff)
increase mam messages catchup and don't abort on MAM_MAX_MESSAGES
-rw-r--r--src/main/java/de/pixart/messenger/Config.java2
-rw-r--r--src/main/java/de/pixart/messenger/services/MessageArchiveService.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java
index ee1f30ebf..de423634a 100644
--- a/src/main/java/de/pixart/messenger/Config.java
+++ b/src/main/java/de/pixart/messenger/Config.java
@@ -137,7 +137,7 @@ public final class Config {
public static final boolean USE_LMC_VERSION_1_1 = true;
- public static final long MAM_MAX_CATCHUP = MILLISECONDS_IN_DAY * 5;
+ public static final long MAM_MAX_CATCHUP = MILLISECONDS_IN_DAY * 30;
public static final int MAM_MAX_MESSAGES = 750;
public static final ChatState DEFAULT_CHATSTATE = ChatState.ACTIVE;
diff --git a/src/main/java/de/pixart/messenger/services/MessageArchiveService.java b/src/main/java/de/pixart/messenger/services/MessageArchiveService.java
index c9c0c0672..ec4c56e1c 100644
--- a/src/main/java/de/pixart/messenger/services/MessageArchiveService.java
+++ b/src/main/java/de/pixart/messenger/services/MessageArchiveService.java
@@ -333,7 +333,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
String count = set == null ? null : set.findChildContent("count");
Element first = set == null ? null : set.findChild("first");
Element relevant = query.getPagingOrder() == PagingOrder.NORMAL ? last : first;
- boolean abort = (!query.isCatchup() && query.getTotalCount() >= Config.PAGE_SIZE) || query.getTotalCount() >= Config.MAM_MAX_MESSAGES;
+ boolean abort = (!query.isCatchup() && query.getTotalCount() >= Config.PAGE_SIZE); // || query.getTotalCount() >= Config.MAM_MAX_MESSAGES;
if (query.getConversation() != null) {
query.getConversation().setFirstMamReference(first == null ? null : first.getContent());
}