~singpolyma/cheogram-android

100ba6e7e775c4253a0ed3b58ff26aa7431e5ba2 — iNPUTmice 9 years ago 7af588c
check for deleted files when loading more messages from history
1 files changed, 3 insertions(+), 1 deletions(-)

M src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
M src/main/java/eu/siacs/conversations/services/XmppConnectionService.java => src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +3 -1
@@ 940,6 940,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
				List<Message> messages = databaseBackend.getMessages(conversation, 50,timestamp);
				if (messages.size() > 0) {
					conversation.addAll(0, messages);
					checkDeletedFiles(conversation);
					callback.onMoreMessagesLoaded(messages.size(), conversation);
				} else if (conversation.hasMessagesLeftOnServer()
						&& account.isOnlineAndConnected()


@@ 949,7 950,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
						query.setCallback(callback);
					}
					callback.informUser(R.string.fetching_history_from_server);
						}
				}
			}
		}).start();
	}


@@ 1028,6 1029,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
					}
				}
			}
			checkDeletedFiles(conversation);
			this.conversations.add(conversation);
			updateConversationUi();
			return conversation;