From 5a60dab1d5ead7a94d9d86cecc563210fed4b4bf Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 17 May 2017 21:58:46 +0200 Subject: use mam reference instead of timestamp --- src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java') diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index a2c837ea0..c451015cf 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -77,6 +77,7 @@ import de.pixart.messenger.utils.CryptoHelper; import de.pixart.messenger.utils.GeoHelper; import de.pixart.messenger.utils.Patterns; import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xmpp.mam.MamReference; import ezvcard.Ezvcard; import ezvcard.VCard; import nl.changer.audiowife.AudioWife; @@ -745,16 +746,16 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } private void loadMoreMessages(Conversation conversation) { - conversation.setLastClearHistory(0); + conversation.setLastClearHistory(0, null); activity.xmppConnectionService.updateConversation(conversation); conversation.setHasMessagesLeftOnServer(true); conversation.setFirstMamReference(null); - long timestamp = conversation.getLastMessageTransmitted(); + long timestamp = conversation.getLastMessageTransmitted().getTimestamp(); if (timestamp == 0) { timestamp = System.currentTimeMillis(); } conversation.messagesLoaded.set(true); - MessageArchiveService.Query query = activity.xmppConnectionService.getMessageArchiveService().query(conversation, 0, timestamp, false); + MessageArchiveService.Query query = activity.xmppConnectionService.getMessageArchiveService().query(conversation, new MamReference(0), timestamp, false); if (query != null) { Toast.makeText(activity, R.string.fetching_history_from_server, Toast.LENGTH_LONG).show(); } else { -- cgit v1.2.3