diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2017-01-25 18:35:22 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2017-01-25 18:35:22 +0100 |
commit | 40ee1a0bfcf2ef15063838a087c9f051c004dc0f (patch) | |
tree | f074fc4bc5bca50d92b65bdbdc65e61dfbc1c230 /src/main/java/eu/siacs/conversations/services | |
parent | a86b2fefd9722ba9a64a67520d52f19a69bdc64e (diff) |
reset messagesLoaded when changing retention settings
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/MessageArchiveService.java | 1 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java index 92ba7591..8e4b95b7 100644 --- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java +++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java @@ -113,7 +113,6 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded { query.reference = conversation.getFirstMamReference(); Log.d(Config.LOGTAG,"setting mam reference"); } - Log.d(Config.LOGTAG,"checking max of "+start+" end "+mXmppConnectionService.getAutomaticMessageDeletionDate()); query.start = Math.max(start,mXmppConnectionService.getAutomaticMessageDeletionDate()); if (start > end) { return null; diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 9005d8c3..f53d62d3 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -933,6 +933,10 @@ public class XmppConnectionService extends Service { } private void expireOldMessages() { + expireOldMessages(false); + } + + public void expireOldMessages(final boolean resetHasMessagesLeftOnServer) { mLastExpiryRun.set(SystemClock.elapsedRealtime()); mDatabaseExecutor.execute(new Runnable() { @Override @@ -943,6 +947,10 @@ public class XmppConnectionService extends Service { synchronized (XmppConnectionService.this.conversations) { for (Conversation conversation : XmppConnectionService.this.conversations) { conversation.expireOldMessages(timestamp); + if (resetHasMessagesLeftOnServer) { + conversation.messagesLoaded.set(true); + conversation.setHasMessagesLeftOnServer(true); + } } } updateConversationUi(); |