aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2015-01-19 11:23:05 +0100
committeriNPUTmice <daniel@gultsch.de>2015-01-19 11:23:05 +0100
commit100ba6e7e775c4253a0ed3b58ff26aa7431e5ba2 (patch)
treeb301fcf6d3efd28a50c66e852b886fe1172a4e1f /src
parent7af588c8b3965c99a672727c7232cbdb7aa08330 (diff)
check for deleted files when loading more messages from history
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index abe93183..dc292d5b 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -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;