Change summary
src/main/java/eu/siacs/conversations/entities/Conversation.java | 33 --
1 file changed, 1 insertion(+), 32 deletions(-)
Detailed changes
@@ -1618,13 +1618,6 @@ public class Conversation extends AbstractEntity
synchronized (this.messages) {
List<Message> properListToAdd;
- if (fromPagination && !historyPartMessages.isEmpty() && checkIsMergeable(messages)) {
- historyPartMessages.addAll(messages);
- messages = filterExisted(historyPartMessages);
- index = 0;
- jumpToLatest();
- }
-
if (fromPagination && !historyPartMessages.isEmpty()) {
properListToAdd = historyPartMessages;
} else {
@@ -1671,12 +1664,7 @@ public class Conversation extends AbstractEntity
public void jumpToHistoryPart(List<Message> messages) {
historyPartMessages.clear();
-
- if (checkIsMergeable(messages)) {
- addAll(0, filterExisted(messages), false);
- } else {
- historyPartMessages.addAll(messages);
- }
+ historyPartMessages.addAll(messages);
}
public void jumpToLatest() {
@@ -1687,25 +1675,6 @@ public class Conversation extends AbstractEntity
return !historyPartMessages.isEmpty();
}
- private boolean checkIsMergeable(List<Message> messages) {
- if (messages.isEmpty()) return true;
- return findDuplicateMessage(messages.get(messages.size() - 1)) != null;
- }
-
- private List<Message> filterExisted(List<Message> messages) {
- if (messages.isEmpty()) return Collections.emptyList();
-
- List<Message> result = new ArrayList<>();
-
- for (Message m : messages) {
- if (findDuplicateMessage(m) == null) {
- result.add(m);
- }
- }
-
- return result;
- }
-
private void untieMessages() {
for (Message message : this.messages) {
message.untie();