Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java

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());