From c282ef464565afd66b7a4a0d6c59162d71d9a6fe Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 19 Sep 2014 21:09:54 +0200
Subject: scroll fixes

---
 src/eu/siacs/conversations/services/XmppConnectionService.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/eu/siacs/conversations/services')

diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index a8900f71d..03f81d9ae 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -819,15 +819,15 @@ public class XmppConnectionService extends Service {
 			}
 		});
 	}
-
-	public List<Message> getMoreMessages(Conversation conversation,
-			long timestamp) {
+	
+	public int loadMoreMessages(Conversation conversation, long timestamp) {
 		List<Message> messages = databaseBackend.getMessages(conversation, 50,
 				timestamp);
 		for (Message message : messages) {
 			message.setConversation(conversation);
 		}
-		return messages;
+		conversation.getMessages().addAll(0, messages);
+		return messages.size();
 	}
 
 	public List<Account> getAccounts() {
-- 
cgit v1.2.3