diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-03-11 21:34:10 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-03-11 21:34:10 +0100 |
commit | 864bb77883b2f5d9f9122c102faa4af89d589653 (patch) | |
tree | c9d7b675da2b5eb38809dabdd599e43ff0acce3b /src/main/java/eu/siacs/conversations/entities/Conversation.java | |
parent | 8585231be2844ab794cfa63454b1013bae8502f6 (diff) | |
parent | bfc5000b6aa3d401ad80e04c43a6671aa9c2c619 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/eu/siacs/conversations/entities/Message.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 75477d3e..4a9e83a3 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -261,16 +261,12 @@ public class Conversation extends AbstractEntity implements Blockable { return null; } + // TODO Check if this is really necessary public void populateWithMessages(final List<Message> messages) { synchronized (this.messages) { messages.clear(); messages.addAll(this.messages); } - for(Iterator<Message> iterator = messages.iterator(); iterator.hasNext();) { - if (iterator.next().wasMergedIntoPrevious()) { - iterator.remove(); - } - } } @Override |