aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/services
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-19 21:09:54 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-19 21:09:54 +0200
commitc282ef464565afd66b7a4a0d6c59162d71d9a6fe (patch)
treee746e974fa6bb01a32f8c1173c70d5714200951c /src/eu/siacs/conversations/services
parent1d23c7e7fbe146a956d55077a99f357d41b6a502 (diff)
scroll fixes
Diffstat (limited to 'src/eu/siacs/conversations/services')
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java8
1 files changed, 4 insertions, 4 deletions
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() {