diff options
author | steckbrief <steckbrief@chefmail.de> | 2019-07-07 22:42:06 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2019-07-07 22:42:06 +0200 |
commit | 811f3b092608b7c17982823b28c950489d0345e0 (patch) | |
tree | aac22cd7b960082752aa1b6a01fe793bf5dfb695 /src/main/java/de/pixart/messenger/entities/Conversation.java | |
parent | abde267e5c1abc02ef1130f5ffd058199582926d (diff) |
implements FS#277: Remove 'Message merge'
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities/Conversation.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index b3e92fba2..77cf2dea8 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -418,11 +418,6 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl messages.clear(); messages.addAll(this.messages); } - for (Iterator<Message> iterator = messages.iterator(); iterator.hasNext(); ) { - if (iterator.next().wasMergedIntoPrevious()) { - iterator.remove(); - } - } } @Override |