diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-03-10 23:03:19 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-03-10 23:03:19 +0100 |
commit | 8585231be2844ab794cfa63454b1013bae8502f6 (patch) | |
tree | 65126dbebd698c0358b2d499be9e16c3ae8d8f5f /src/main/java/eu/siacs/conversations/ui/listeners/ConversationSwipeRefreshListener.java | |
parent | 07c2aba59b0ec0fd492621406d08ce33e23ad7ad (diff) | |
parent | 27c9c0aa21e3ec1a5801f6c3279caf0cd4fe9248 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/listeners/ConversationSwipeRefreshListener.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/listeners/ConversationSwipeRefreshListener.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/listeners/ConversationSwipeRefreshListener.java b/src/main/java/eu/siacs/conversations/ui/listeners/ConversationSwipeRefreshListener.java index 9d508357..5ef2eea7 100644 --- a/src/main/java/eu/siacs/conversations/ui/listeners/ConversationSwipeRefreshListener.java +++ b/src/main/java/eu/siacs/conversations/ui/listeners/ConversationSwipeRefreshListener.java @@ -52,10 +52,9 @@ public class ConversationSwipeRefreshListener implements SwipyRefreshLayout.OnRe long lastSessionEstablished = this.getTimestampOfLastSessionEstablished(activity.getSelectedConversation()); long lastReceivedMessage = this.getTimestampOfLastReceivedOrTransmittedMessage(); long startTimestamp = Math.min(lastSessionEstablished, lastReceivedMessage); - MessageArchiveService.Query query = activity.xmppConnectionService.getMessageArchiveService().query(activity.getSelectedConversation(), startTimestamp, System.currentTimeMillis()); + MessageArchiveService.Query query = activity.xmppConnectionService.getMessageArchiveService().query(activity.getSelectedConversation(), startTimestamp, System.currentTimeMillis(), this.listener); if (query != null) { this.listener.setLoadHistory(false); - query.setCallback(this.listener); } else { Logging.d("mam", "no query built - no messages loaded"); this.listener.onMoreMessagesLoaded(0, activity.getSelectedConversation()); |