sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

check for deleted files when loading more messages from history

This commit is contained in:
iNPUTmice 2015-01-19 11:23:05 +01:00
parent 7af588c8b3
commit 100ba6e7e7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -940,6 +940,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
List<Message> messages = databaseBackend.getMessages(conversation, 50,timestamp); List<Message> messages = databaseBackend.getMessages(conversation, 50,timestamp);
if (messages.size() > 0) { if (messages.size() > 0) {
conversation.addAll(0, messages); conversation.addAll(0, messages);
checkDeletedFiles(conversation);
callback.onMoreMessagesLoaded(messages.size(), conversation); callback.onMoreMessagesLoaded(messages.size(), conversation);
} else if (conversation.hasMessagesLeftOnServer() } else if (conversation.hasMessagesLeftOnServer()
&& account.isOnlineAndConnected() && account.isOnlineAndConnected()
@ -949,7 +950,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
query.setCallback(callback); query.setCallback(callback);
} }
callback.informUser(R.string.fetching_history_from_server); callback.informUser(R.string.fetching_history_from_server);
} }
} }
}).start(); }).start();
} }
@ -1028,6 +1029,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
} }
} }
} }
checkDeletedFiles(conversation);
this.conversations.add(conversation); this.conversations.add(conversation);
updateConversationUi(); updateConversationUi();
return conversation; return conversation;