From 198b3954ae83774d9061550c016268f88d8c392d Mon Sep 17 00:00:00 2001
From: Arne <arne@monocles.de>
Date: Mon, 20 Apr 2026 16:34:37 -0400
Subject: [PATCH] Further clean up jump to searched message

(cherry picked from commit e8d62b34e4de5c138869538a0670e06258443358)
---
 .../conversations/entities/Conversation.java  | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 2c050df86b15da79451af620c406861cb6ad3ab0..c19fc2e632125f414be7fc8c2d19ac4520e91f63 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -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();