diff options
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationFragment.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index b5c5f592..098285e2 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -683,12 +683,16 @@ public class ConversationFragment extends Fragment { break; } } - for(Message message : this.conversation.getMessages()) { - if (!this.messageList.contains(message)) { - this.messageList.add(message); + if (this.conversation.getMessages().size() == 0) { + this.messageList.clear(); + } else { + for(Message message : this.conversation.getMessages()) { + if (!this.messageList.contains(message)) { + this.messageList.add(message); + } } + updateStatusMessages(); } - updateStatusMessages(); this.messageListAdapter.notifyDataSetChanged(); if (conversation.getMode() == Conversation.MODE_SINGLE) { if (messageList.size() >= 1) { |